From ab87c57ec8d936e90e2e23a8101e69e7c090fe61 Mon Sep 17 00:00:00 2001 From: Dusan Jovic Date: Tue, 1 Apr 2025 14:01:51 +0000 Subject: [PATCH 1/5] Add ufs_tracing --- mediator/med.F90 | 29 ++++++++++++++++++++++++++++ mediator/med_phases_history_mod.F90 | 9 +++++++++ mediator/med_phases_ocnalb_mod.F90 | 3 +++ mediator/med_phases_post_atm_mod.F90 | 5 ++++- mediator/med_phases_post_ice_mod.F90 | 5 ++++- mediator/med_phases_post_ocn_mod.F90 | 5 ++++- mediator/med_phases_post_wav_mod.F90 | 5 ++++- mediator/med_phases_prep_atm_mod.F90 | 3 +++ mediator/med_phases_prep_ice_mod.F90 | 3 +++ mediator/med_phases_prep_ocn_mod.F90 | 5 +++++ mediator/med_phases_prep_wav_mod.F90 | 5 +++++ mediator/med_phases_restart_mod.F90 | 6 ++++++ 12 files changed, 79 insertions(+), 4 deletions(-) diff --git a/mediator/med.F90 b/mediator/med.F90 index 89cc2f917..bb0261a43 100644 --- a/mediator/med.F90 +++ b/mediator/med.F90 @@ -52,6 +52,8 @@ module MED use esmFldsExchange_hafs_mod , only : esmFldsExchange_hafs use med_phases_profile_mod , only : med_phases_profile_finalize + use ufs_trace_mod + implicit none private @@ -85,6 +87,7 @@ subroutine SetServices(gcomp, rc) use ESMF , only: ESMF_SUCCESS, ESMF_GridCompSetEntryPoint use ESMF , only: ESMF_METHOD_INITIALIZE, ESMF_METHOD_RUN use ESMF , only: ESMF_GridComp, ESMF_MethodRemove + use ESMF , only: ESMF_VM, ESMF_VMGet, ESMF_GridCompGet use NUOPC , only: NUOPC_CompDerive, NUOPC_CompSetEntryPoint, NUOPC_CompSpecialize, NUOPC_NoOP use NUOPC_Mediator , only: mediator_routine_SS => SetServices use NUOPC_Mediator , only: mediator_routine_Run => routine_Run @@ -131,6 +134,8 @@ subroutine SetServices(gcomp, rc) type(ESMF_GridComp) :: gcomp integer, intent(out) :: rc + type(ESMF_VM) :: vm + integer :: localPet ! local variables character(len=*), parameter :: subname = '('//__FILE__//':SetServices)' !----------------------------------------------------------- @@ -138,6 +143,15 @@ subroutine SetServices(gcomp, rc) rc = ESMF_SUCCESS if (profile_memory) call ESMF_VMLogMemInfo("Entering "//trim(subname)) + call ESMF_GridCompGet(gcomp, vm=vm, rc=rc) + if (ChkErr(rc,__LINE__,u_FILE_u)) return + call ESMF_VMGet(vm, localPet=localPet, rc=rc) + if (ChkErr(rc,__LINE__,u_FILE_u)) return + maintask = .false. + if (localPet == 0) maintask=.true. + if (maintask) call ufs_trace_init() + if (maintask) call ufs_trace("cmeps", "SetServices", "B") + !------------------ ! the NUOPC model component mediator_routine_SS will register the generic methods !------------------ @@ -553,6 +567,7 @@ subroutine SetServices(gcomp, rc) if (profile_memory) call ESMF_VMLogMemInfo("Leaving "//trim(subname)) + if (maintask) call ufs_trace("cmeps", "SetServices", "E") end subroutine SetServices !----------------------------------------------------------------------------- @@ -590,6 +605,7 @@ subroutine InitializeP0(gcomp, importState, exportState, clock, rc) call ESMF_LogWrite(trim(subname)//": called", ESMF_LOGMSG_INFO) if (profile_memory) call ESMF_VMLogMemInfo("Entering "//trim(subname)) + if (maintask) call ufs_trace("cmeps", "InitializeP0", "B") call ESMF_GridCompGet(gcomp, vm=vm, rc=rc) if (ChkErr(rc,__LINE__,u_FILE_u)) return call ESMF_VMGet(vm, localPet=localPet, rc=rc) @@ -660,6 +676,8 @@ subroutine InitializeP0(gcomp, importState, exportState, clock, rc) if (profile_memory) call ESMF_VMLogMemInfo("Leaving "//trim(subname)) call ESMF_LogWrite(trim(subname)//": done", ESMF_LOGMSG_INFO) + if (maintask) call ufs_trace("cmeps", "InitializeP0", "E") + end subroutine InitializeP0 !----------------------------------------------------------------------- @@ -699,6 +717,7 @@ subroutine AdvertiseFields(gcomp, importState, exportState, clock, rc) character(len=*), parameter :: subname = '('//__FILE__//':AdvertiseFields)' !----------------------------------------------------------- + if (maintask) call ufs_trace("cmeps", "AdvertiseFields", "B") call ESMF_LogWrite(trim(subname)//": called", ESMF_LOGMSG_INFO) rc = ESMF_SUCCESS if (profile_memory) call ESMF_VMLogMemInfo("Entering "//trim(subname)) @@ -978,6 +997,7 @@ subroutine AdvertiseFields(gcomp, importState, exportState, clock, rc) if (profile_memory) call ESMF_VMLogMemInfo("Leaving "//trim(subname)) call ESMF_LogWrite(trim(subname)//": done", ESMF_LOGMSG_INFO) + if (maintask) call ufs_trace("cmeps", "AdvertiseFields", "E") end subroutine AdvertiseFields !----------------------------------------------------------------------------- @@ -1004,6 +1024,7 @@ subroutine RealizeFieldsWithTransferProvided(gcomp, importState, exportState, cl integer :: n character(len=*), parameter :: subname = '('//__FILE__//':RealizeFieldsWithTransferProvided)' !----------------------------------------------------------- + if (maintask) call ufs_trace("cmeps", "RealizeFieldsWithTransferProvided", "B") call ESMF_LogWrite(trim(subname)//": called", ESMF_LOGMSG_INFO) rc = ESMF_SUCCESS @@ -1041,6 +1062,7 @@ subroutine RealizeFieldsWithTransferProvided(gcomp, importState, exportState, cl if (profile_memory) call ESMF_VMLogMemInfo("Leaving "//trim(subname)) call ESMF_LogWrite(trim(subname)//": done", ESMF_LOGMSG_INFO) + if (maintask) call ufs_trace("cmeps", "RealizeFieldsWithTransferProvided", "E") end subroutine RealizeFieldsWithTransferProvided @@ -1065,6 +1087,7 @@ subroutine ModifyDecompofMesh(gcomp, importState, exportState, clock, rc) integer :: n1 character(len=*), parameter :: subname = '('//__FILE__//':ModifyDecompofMesh)' !----------------------------------------------------------- + if (maintask) call ufs_trace("cmeps", "ModifyDecompofMesh", "B") call ESMF_LogWrite(trim(subname)//": called", ESMF_LOGMSG_INFO) rc = ESMF_SUCCESS @@ -1093,6 +1116,7 @@ subroutine ModifyDecompofMesh(gcomp, importState, exportState, clock, rc) enddo if (profile_memory) call ESMF_VMLogMemInfo("Leaving "//trim(subname)) call ESMF_LogWrite(trim(subname)//": done", ESMF_LOGMSG_INFO) + if (maintask) call ufs_trace("cmeps", "ModifyDecompofMesh", "E") contains !- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1393,6 +1417,7 @@ subroutine RealizeFieldsWithTransferAccept(gcomp, importState, exportState, cloc integer :: n1 character(len=*), parameter :: subname = '('//__FILE__//':RealizeFieldsWithTransferAccept)' !----------------------------------------------------------- + if (maintask) call ufs_trace("cmeps", "RealizeFieldsWithTransferAccept", "B") call ESMF_LogWrite(trim(subname)//": called", ESMF_LOGMSG_INFO) @@ -1432,6 +1457,7 @@ subroutine RealizeFieldsWithTransferAccept(gcomp, importState, exportState, cloc if (profile_memory) call ESMF_VMLogMemInfo("Leaving "//trim(subname)) call ESMF_LogWrite(trim(subname)//": done", ESMF_LOGMSG_INFO) + if (maintask) call ufs_trace("cmeps", "RealizeFieldsWithTransferAccept", "E") contains !- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1657,6 +1683,7 @@ subroutine DataInitialize(gcomp, rc) character(len=CX) :: msgString character(len=*), parameter :: subname = '('//__FILE__//':DataInitialize)' !----------------------------------------------------------- + if (maintask) call ufs_trace("cmeps", "DataInitialize", "B") call ESMF_LogWrite(trim(subname)//": called", ESMF_LOGMSG_INFO) rc = ESMF_SUCCESS @@ -1965,6 +1992,7 @@ subroutine DataInitialize(gcomp, rc) ! the correct timestamps, which also indicates that the actual ! data has been transferred reliably, and CMEPS can safely use it. + if (maintask) call ufs_trace("cmeps", "DataInitialize", "E") RETURN endif ! end first_call if-block @@ -2256,6 +2284,7 @@ subroutine DataInitialize(gcomp, rc) call ESMF_LogWrite(trim(subname)//": done", ESMF_LOGMSG_INFO) endif + if (maintask) call ufs_trace("cmeps", "DataInitialize", "E") end subroutine DataInitialize !----------------------------------------------------------------------------- diff --git a/mediator/med_phases_history_mod.F90 b/mediator/med_phases_history_mod.F90 index 6859a6c9a..12a4fa0d2 100644 --- a/mediator/med_phases_history_mod.F90 +++ b/mediator/med_phases_history_mod.F90 @@ -24,6 +24,7 @@ module med_phases_history_mod use med_io_mod , only : med_io_write, med_io_wopen, med_io_enddef, med_io_close use perf_mod , only : t_startf, t_stopf use pio , only : file_desc_t + use ufs_trace_mod implicit none private @@ -189,6 +190,7 @@ subroutine med_phases_history_write(gcomp, rc) !--------------------------------------- rc = ESMF_SUCCESS + if (maintask) call ufs_trace("cmeps", "med_phases_history_write", "B") call t_startf('MED:'//subname) ! Get the internal state @@ -378,6 +380,7 @@ subroutine med_phases_history_write(gcomp, rc) call t_stopf('MED:'//subname) + if (maintask) call ufs_trace("cmeps", "med_phases_history_write", "E") end subroutine med_phases_history_write !=============================================================================== @@ -415,6 +418,7 @@ subroutine med_phases_history_write_med(gcomp, rc) character(len=*), parameter :: subname='(med_phases_history_write_med)' !--------------------------------------- rc = ESMF_SUCCESS + if (maintask) call ufs_trace("cmeps", "med_phases_history_write_med", "B") ! Get the internal state nullify(is_local%wrap) @@ -521,6 +525,7 @@ subroutine med_phases_history_write_med(gcomp, rc) end if ! end of if-write_now block end if ! end of if-active block + if (maintask) call ufs_trace("cmeps", "med_phases_history_write_med", "E") end subroutine med_phases_history_write_med !=============================================================================== @@ -562,6 +567,7 @@ subroutine med_phases_history_write_lnd2glc(gcomp, fldbun_lnd, rc, fldbun_glc) !--------------------------------------- rc = ESMF_SUCCESS + if (maintask) call ufs_trace("cmeps", "med_phases_history_write_lnd2glc", "B") ! Get the internal state nullify(is_local%wrap) @@ -650,6 +656,7 @@ subroutine med_phases_history_write_lnd2glc(gcomp, fldbun_lnd, rc, fldbun_glc) call med_io_close(io_file, rc=rc) if (ChkErr(rc,__LINE__,u_FILE_u)) return + if (maintask) call ufs_trace("cmeps", "med_phases_history_write_lnd2glc", "E") end subroutine med_phases_history_write_lnd2glc !=============================================================================== @@ -663,6 +670,7 @@ subroutine med_phases_history_write_comp(gcomp, compid, rc) integer , intent(out) :: rc !--------------------------------------- rc = ESMF_SUCCESS + if (maintask) call ufs_trace("cmeps", "med_phases_history_write_comp", "B") call med_phases_history_write_comp_inst(gcomp, compid, instfiles(compid), rc=rc) if (ChkErr(rc,__LINE__,u_FILE_u)) return @@ -671,6 +679,7 @@ subroutine med_phases_history_write_comp(gcomp, compid, rc) call med_phases_history_write_comp_aux(gcomp, compid, auxcomp(compid), rc=rc) if (ChkErr(rc,__LINE__,u_FILE_u)) return + if (maintask) call ufs_trace("cmeps", "med_phases_history_write_comp", "E") end subroutine med_phases_history_write_comp !=============================================================================== diff --git a/mediator/med_phases_ocnalb_mod.F90 b/mediator/med_phases_ocnalb_mod.F90 index 18d709cdd..7933bb6bf 100644 --- a/mediator/med_phases_ocnalb_mod.F90 +++ b/mediator/med_phases_ocnalb_mod.F90 @@ -11,6 +11,7 @@ module med_phases_ocnalb_mod use shr_orb_mod , only : shr_orb_cosz, shr_orb_decl use shr_orb_mod , only : shr_orb_params, SHR_ORB_UNDEF_INT, SHR_ORB_UNDEF_REAL use shr_log_mod , only : shr_log_unit + use ufs_trace_mod implicit none private @@ -315,6 +316,7 @@ subroutine med_phases_ocnalb_run(gcomp, rc) !--------------------------------------- rc = ESMF_SUCCESS + if (maintask) call ufs_trace("cmeps", "med_phases_ocnalb_run", "B") ! Determine main task call ESMF_GridCompGet(gcomp, vm=vm, rc=rc) @@ -508,6 +510,7 @@ subroutine med_phases_ocnalb_run(gcomp, rc) end if call t_stopf('MED:'//subname) + if (maintask) call ufs_trace("cmeps", "med_phases_ocnalb_run", "E") end subroutine med_phases_ocnalb_run !=============================================================================== diff --git a/mediator/med_phases_post_atm_mod.F90 b/mediator/med_phases_post_atm_mod.F90 index 333497a69..155952899 100644 --- a/mediator/med_phases_post_atm_mod.F90 +++ b/mediator/med_phases_post_atm_mod.F90 @@ -28,13 +28,14 @@ subroutine med_phases_post_atm(gcomp, rc) use ESMF , only : ESMF_GridComp, ESMF_GridCompGet, ESMF_FieldBundleGet use ESMF , only : ESMF_LogWrite, ESMF_LOGMSG_INFO, ESMF_SUCCESS use med_kind_mod , only : CX=>SHR_KIND_CX, CS=>SHR_KIND_CS, CL=>SHR_KIND_CL, R8=>SHR_KIND_R8 - use med_internalstate_mod , only : InternalState + use med_internalstate_mod , only : InternalState, maintask use med_phases_history_mod, only : med_phases_history_write_comp use med_map_mod , only : med_map_field_packed use med_constants_mod , only : dbug_flag => med_constants_dbug_flag use med_utils_mod , only : chkerr => med_utils_ChkErr use med_internalstate_mod , only : compocn, compatm, compice, complnd, compwav use perf_mod , only : t_startf, t_stopf + use ufs_trace_mod ! input/output variables type(ESMF_GridComp) :: gcomp @@ -47,6 +48,7 @@ subroutine med_phases_post_atm(gcomp, rc) !------------------------------------------------------------------------------- rc = ESMF_SUCCESS + if (maintask) call ufs_trace("cmeps", "med_phases_post_atm", "B") call t_startf('MED:'//subname) if (dbug_flag > 20) then @@ -126,6 +128,7 @@ subroutine med_phases_post_atm(gcomp, rc) end if call t_stopf('MED:'//subname) + if (maintask) call ufs_trace("cmeps", "med_phases_post_atm", "E") end subroutine med_phases_post_atm end module med_phases_post_atm_mod diff --git a/mediator/med_phases_post_ice_mod.F90 b/mediator/med_phases_post_ice_mod.F90 index 739369525..6d1dc0785 100644 --- a/mediator/med_phases_post_ice_mod.F90 +++ b/mediator/med_phases_post_ice_mod.F90 @@ -28,10 +28,11 @@ subroutine med_phases_post_ice(gcomp, rc) use med_methods_mod , only : FB_diagnose => med_methods_FB_diagnose use med_map_mod , only : med_map_field_packed use med_fraction_mod , only : med_fraction_set - use med_internalstate_mod , only : InternalState + use med_internalstate_mod , only : InternalState, maintask use med_phases_history_mod, only : med_phases_history_write_comp use med_internalstate_mod , only : compice, compocn, compwav use perf_mod , only : t_startf, t_stopf + use ufs_trace_mod ! input/output variables type(ESMF_GridComp) :: gcomp @@ -43,6 +44,7 @@ subroutine med_phases_post_ice(gcomp, rc) character(len=*),parameter :: subname='(med_phases_post_ice)' !------------------------------------------------------------------------------- + if (maintask) call ufs_trace("cmeps", "med_phases_post_ice", "B") call t_startf('MED:'//subname) rc = ESMF_SUCCESS @@ -99,6 +101,7 @@ subroutine med_phases_post_ice(gcomp, rc) call ESMF_LogWrite(subname//' done', ESMF_LOGMSG_INFO) end if + if (maintask) call ufs_trace("cmeps", "med_phases_post_ice", "E") end subroutine med_phases_post_ice end module med_phases_post_ice_mod diff --git a/mediator/med_phases_post_ocn_mod.F90 b/mediator/med_phases_post_ocn_mod.F90 index b253de664..20dd39408 100644 --- a/mediator/med_phases_post_ocn_mod.F90 +++ b/mediator/med_phases_post_ocn_mod.F90 @@ -26,11 +26,12 @@ subroutine med_phases_post_ocn(gcomp, rc) use med_utils_mod , only : chkerr => med_utils_ChkErr use med_constants_mod , only : dbug_flag => med_constants_dbug_flag use med_map_mod , only : med_map_field_packed - use med_internalstate_mod , only : InternalState + use med_internalstate_mod , only : InternalState, maintask use med_internalstate_mod , only : compice, compocn, compwav use med_phases_history_mod , only : med_phases_history_write_comp use med_phases_prep_glc_mod , only : med_phases_prep_glc_accum_ocn use perf_mod , only : t_startf, t_stopf + use ufs_trace_mod ! input/output variables type(ESMF_GridComp) :: gcomp @@ -43,6 +44,7 @@ subroutine med_phases_post_ocn(gcomp, rc) !--------------------------------------- rc = ESMF_SUCCESS + if (maintask) call ufs_trace("cmeps", "med_phases_post_ocn", "B") call t_startf('MED:'//subname) if (dbug_flag > 20) then @@ -101,6 +103,7 @@ subroutine med_phases_post_ocn(gcomp, rc) end if call t_stopf('MED:'//subname) + if (maintask) call ufs_trace("cmeps", "med_phases_post_ocn", "E") end subroutine med_phases_post_ocn end module med_phases_post_ocn_mod diff --git a/mediator/med_phases_post_wav_mod.F90 b/mediator/med_phases_post_wav_mod.F90 index 50592012c..2b6556926 100644 --- a/mediator/med_phases_post_wav_mod.F90 +++ b/mediator/med_phases_post_wav_mod.F90 @@ -23,10 +23,11 @@ subroutine med_phases_post_wav(gcomp, rc) use med_utils_mod , only : chkerr => med_utils_ChkErr use med_methods_mod , only : FB_diagnose => med_methods_FB_diagnose use med_map_mod , only : med_map_field_packed - use med_internalstate_mod , only : InternalState + use med_internalstate_mod , only : InternalState, maintask use med_internalstate_mod , only : compwav, compatm, compocn, compice use med_phases_history_mod, only : med_phases_history_write_comp use perf_mod , only : t_startf, t_stopf + use ufs_trace_mod ! input/output variables type(ESMF_GridComp) :: gcomp @@ -38,6 +39,7 @@ subroutine med_phases_post_wav(gcomp, rc) character(len=*),parameter :: subname='(med_phases_post_wav)' !------------------------------------------------------------------------------- + if (maintask) call ufs_trace("cmeps", "med_phases_post_wav", "B") call t_startf('MED:'//subname) rc = ESMF_SUCCESS @@ -97,6 +99,7 @@ subroutine med_phases_post_wav(gcomp, rc) call ESMF_LogWrite(subname//' done', ESMF_LOGMSG_INFO) end if + if (maintask) call ufs_trace("cmeps", "med_phases_post_wav", "E") end subroutine med_phases_post_wav end module med_phases_post_wav_mod diff --git a/mediator/med_phases_prep_atm_mod.F90 b/mediator/med_phases_prep_atm_mod.F90 index bcdf2ea42..e2660ef20 100644 --- a/mediator/med_phases_prep_atm_mod.F90 +++ b/mediator/med_phases_prep_atm_mod.F90 @@ -23,6 +23,7 @@ module med_phases_prep_atm_mod use perf_mod , only : t_startf, t_stopf use med_phases_aofluxes_mod, only : med_aofluxes_map_xgrid2agrid_output use med_phases_aofluxes_mod, only : med_aofluxes_map_ogrid2agrid_output + use ufs_trace_mod implicit none private @@ -60,6 +61,7 @@ subroutine med_phases_prep_atm(gcomp, rc) character(len=*),parameter :: subname='(med_phases_prep_atm)' !------------------------------------------------------------------------------- + if (maintask) call ufs_trace("cmeps", "med_phases_prep_atm", "B") call t_startf('MED:'//subname) rc = ESMF_SUCCESS @@ -248,6 +250,7 @@ subroutine med_phases_prep_atm(gcomp, rc) end if call t_stopf('MED:'//subname) + if (maintask) call ufs_trace("cmeps", "med_phases_prep_atm", "E") end subroutine med_phases_prep_atm !----------------------------------------------------------------------------- diff --git a/mediator/med_phases_prep_ice_mod.F90 b/mediator/med_phases_prep_ice_mod.F90 index 524313622..f2c937876 100644 --- a/mediator/med_phases_prep_ice_mod.F90 +++ b/mediator/med_phases_prep_ice_mod.F90 @@ -42,6 +42,7 @@ subroutine med_phases_prep_ice(gcomp, rc) use med_internalstate_mod , only : coupling_mode use esmFlds , only : med_fldList_GetFldListTo use perf_mod , only : t_startf, t_stopf + use ufs_trace_mod ! input/output variables type(ESMF_GridComp) :: gcomp @@ -60,6 +61,7 @@ subroutine med_phases_prep_ice(gcomp, rc) character(len=*),parameter :: subname='(med_phases_prep_ice)' !--------------------------------------- + if (maintask) call ufs_trace("cmeps", "med_phases_prep_ice", "B") call t_startf('MED:'//subname) if (dbug_flag > 5) then @@ -159,6 +161,7 @@ subroutine med_phases_prep_ice(gcomp, rc) endif call t_stopf('MED:'//subname) + if (maintask) call ufs_trace("cmeps", "med_phases_prep_ice", "E") end subroutine med_phases_prep_ice end module med_phases_prep_ice_mod diff --git a/mediator/med_phases_prep_ocn_mod.F90 b/mediator/med_phases_prep_ocn_mod.F90 index 246ec5866..3c867bc71 100644 --- a/mediator/med_phases_prep_ocn_mod.F90 +++ b/mediator/med_phases_prep_ocn_mod.F90 @@ -23,6 +23,7 @@ module med_phases_prep_ocn_mod use esmFlds , only : med_fldList_GetfldListTo, med_fldlist_type use med_internalstate_mod , only : compocn, compatm, compice, coupling_mode use perf_mod , only : t_startf, t_stopf + use ufs_trace_mod implicit none private @@ -105,6 +106,7 @@ subroutine med_phases_prep_ocn_accum(gcomp, rc) character(len=*), parameter :: subname='(med_phases_prep_ocn_accum)' !--------------------------------------- + if (maintask) call ufs_trace("cmeps", "med_phases_prep_ocn_accum", "B") call t_startf('MED:'//subname) if (dbug_flag > 20) then call ESMF_LogWrite(subname//' called', ESMF_LOGMSG_INFO) @@ -267,6 +269,7 @@ subroutine med_phases_prep_ocn_accum(gcomp, rc) end if call t_stopf('MED:'//subname) + if (maintask) call ufs_trace("cmeps", "med_phases_prep_ocn_accum", "E") end subroutine med_phases_prep_ocn_accum !----------------------------------------------------------------------------- @@ -289,6 +292,7 @@ subroutine med_phases_prep_ocn_avg(gcomp, rc) !--------------------------------------- rc = ESMF_SUCCESS + if (maintask) call ufs_trace("cmeps", "med_phases_prep_ocn_avg", "B") call t_startf('MED:'//subname) if (dbug_flag > 20) then @@ -342,6 +346,7 @@ subroutine med_phases_prep_ocn_avg(gcomp, rc) call t_stopf('MED:'//subname) first_call = .false. + if (maintask) call ufs_trace("cmeps", "med_phases_prep_ocn_avg", "E") end subroutine med_phases_prep_ocn_avg !----------------------------------------------------------------------------- diff --git a/mediator/med_phases_prep_wav_mod.F90 b/mediator/med_phases_prep_wav_mod.F90 index 93755d59c..de0288e2e 100644 --- a/mediator/med_phases_prep_wav_mod.F90 +++ b/mediator/med_phases_prep_wav_mod.F90 @@ -21,6 +21,7 @@ module med_phases_prep_wav_mod use esmFlds , only : med_fldList_GetfldListTo use med_internalstate_mod , only : compatm, compwav use perf_mod , only : t_startf, t_stopf + use ufs_trace_mod implicit none private @@ -85,6 +86,7 @@ subroutine med_phases_prep_wav_accum(gcomp, rc) character(len=*), parameter :: subname='(med_phases_prep_wav_accum)' !--------------------------------------- + if (maintask) call ufs_trace("cmeps", "med_phases_prep_wav_accum", "B") call t_startf('MED:'//subname) if (dbug_flag > 20) then call ESMF_LogWrite(subname//' called', ESMF_LOGMSG_INFO) @@ -148,6 +150,7 @@ subroutine med_phases_prep_wav_accum(gcomp, rc) end if call t_stopf('MED:'//subname) + if (maintask) call ufs_trace("cmeps", "med_phases_prep_wav_accum", "E") end subroutine med_phases_prep_wav_accum !----------------------------------------------------------------------------- @@ -169,6 +172,7 @@ subroutine med_phases_prep_wav_avg(gcomp, rc) !--------------------------------------- rc = ESMF_SUCCESS + if (maintask) call ufs_trace("cmeps", "med_phases_prep_wav_avg", "B") call t_startf('MED:'//subname) if (dbug_flag > 20) then @@ -220,5 +224,6 @@ subroutine med_phases_prep_wav_avg(gcomp, rc) end if call t_stopf('MED:'//subname) + if (maintask) call ufs_trace("cmeps", "med_phases_prep_wav_avg", "E") end subroutine med_phases_prep_wav_avg end module med_phases_prep_wav_mod diff --git a/mediator/med_phases_restart_mod.F90 b/mediator/med_phases_restart_mod.F90 index 3248f5ee4..3b04eb288 100644 --- a/mediator/med_phases_restart_mod.F90 +++ b/mediator/med_phases_restart_mod.F90 @@ -17,6 +17,8 @@ module med_phases_restart_mod #ifndef CESMCOUPLED use shr_is_restart_fh_mod, only : init_is_restart_fh, is_restart_fh, is_restart_fh_type #endif + use ufs_trace_mod + implicit none private @@ -193,6 +195,7 @@ subroutine med_phases_restart_write(gcomp, rc) character(len=*), parameter :: subname='(med_phases_restart_write)' !--------------------------------------- + if (maintask) call ufs_trace("cmeps", "med_phases_restart_write", "B") call t_startf('MED:'//subname) if (dbug_flag > 5) then call ESMF_LogWrite(trim(subname)//": called", ESMF_LOGMSG_INFO) @@ -489,6 +492,7 @@ subroutine med_phases_restart_write(gcomp, rc) endif call t_stopf('MED:'//subname) + if (maintask) call ufs_trace("cmeps", "med_phases_restart_write", "E") end subroutine med_phases_restart_write !=============================================================================== @@ -525,6 +529,7 @@ subroutine med_phases_restart_read(gcomp, rc) logical :: isPresent character(len=*), parameter :: subname='(med_phases_restart_read)' !--------------------------------------- + if (maintask) call ufs_trace("cmeps", "med_phases_restart_read", "B") call t_startf('MED:'//subname) call ESMF_LogWrite(trim(subname)//": called", ESMF_LOGMSG_INFO) rc = ESMF_SUCCESS @@ -644,6 +649,7 @@ subroutine med_phases_restart_read(gcomp, rc) call ESMF_LogWrite(trim(subname)//": done", ESMF_LOGMSG_INFO) call t_stopf('MED:'//subname) + if (maintask) call ufs_trace("cmeps", "med_phases_restart_read", "E") end subroutine med_phases_restart_read !=============================================================================== From ee60f0433728ab26ddef1a56212b0e58a855f3df Mon Sep 17 00:00:00 2001 From: Dusan Jovic Date: Wed, 10 Sep 2025 13:55:27 +0000 Subject: [PATCH 2/5] Conditional compilation of ufs_tracing --- mediator/med.F90 | 32 ++++++++++++++++++++++++++++ mediator/med_phases_history_mod.F90 | 18 ++++++++++++++++ mediator/med_phases_ocnalb_mod.F90 | 6 ++++++ mediator/med_phases_post_atm_mod.F90 | 6 ++++++ mediator/med_phases_post_ice_mod.F90 | 6 ++++++ mediator/med_phases_post_ocn_mod.F90 | 6 ++++++ mediator/med_phases_post_wav_mod.F90 | 6 ++++++ mediator/med_phases_prep_atm_mod.F90 | 6 ++++++ mediator/med_phases_prep_ice_mod.F90 | 6 ++++++ mediator/med_phases_prep_ocn_mod.F90 | 10 +++++++++ mediator/med_phases_prep_wav_mod.F90 | 10 +++++++++ mediator/med_phases_restart_mod.F90 | 10 +++++++++ 12 files changed, 122 insertions(+) diff --git a/mediator/med.F90 b/mediator/med.F90 index 981c027ae..128a8d787 100644 --- a/mediator/med.F90 +++ b/mediator/med.F90 @@ -52,7 +52,9 @@ module MED use esmFldsExchange_hafs_mod , only : esmFldsExchange_hafs use med_phases_profile_mod , only : med_phases_profile_finalize use shr_log_mod , only : shr_log_error +#ifdef UFS_TRACING use ufs_trace_mod +#endif implicit none private @@ -149,8 +151,10 @@ subroutine SetServices(gcomp, rc) if (ChkErr(rc,__LINE__,u_FILE_u)) return maintask = .false. if (localPet == 0) maintask=.true. +#ifdef UFS_TRACING if (maintask) call ufs_trace_init() if (maintask) call ufs_trace("cmeps", "SetServices", "B") +#endif !------------------ ! the NUOPC model component mediator_routine_SS will register the generic methods @@ -567,7 +571,9 @@ subroutine SetServices(gcomp, rc) if (profile_memory) call ESMF_VMLogMemInfo("Leaving "//trim(subname)) +#ifdef UFS_TRACING if (maintask) call ufs_trace("cmeps", "SetServices", "E") +#endif end subroutine SetServices !----------------------------------------------------------------------------- @@ -605,7 +611,9 @@ subroutine InitializeP0(gcomp, importState, exportState, clock, rc) call ESMF_LogWrite(trim(subname)//": called", ESMF_LOGMSG_INFO) if (profile_memory) call ESMF_VMLogMemInfo("Entering "//trim(subname)) +#ifdef UFS_TRACING if (maintask) call ufs_trace("cmeps", "InitializeP0", "B") +#endif call ESMF_GridCompGet(gcomp, vm=vm, rc=rc) if (ChkErr(rc,__LINE__,u_FILE_u)) return call ESMF_VMGet(vm, localPet=localPet, rc=rc) @@ -676,7 +684,9 @@ subroutine InitializeP0(gcomp, importState, exportState, clock, rc) if (profile_memory) call ESMF_VMLogMemInfo("Leaving "//trim(subname)) call ESMF_LogWrite(trim(subname)//": done", ESMF_LOGMSG_INFO) +#ifdef UFS_TRACING if (maintask) call ufs_trace("cmeps", "InitializeP0", "E") +#endif end subroutine InitializeP0 @@ -717,7 +727,9 @@ subroutine AdvertiseFields(gcomp, importState, exportState, clock, rc) character(len=*), parameter :: subname = '('//__FILE__//':AdvertiseFields)' !----------------------------------------------------------- +#ifdef UFS_TRACING if (maintask) call ufs_trace("cmeps", "AdvertiseFields", "B") +#endif call ESMF_LogWrite(trim(subname)//": called", ESMF_LOGMSG_INFO) rc = ESMF_SUCCESS if (profile_memory) call ESMF_VMLogMemInfo("Entering "//trim(subname)) @@ -997,7 +1009,9 @@ subroutine AdvertiseFields(gcomp, importState, exportState, clock, rc) if (profile_memory) call ESMF_VMLogMemInfo("Leaving "//trim(subname)) call ESMF_LogWrite(trim(subname)//": done", ESMF_LOGMSG_INFO) +#ifdef UFS_TRACING if (maintask) call ufs_trace("cmeps", "AdvertiseFields", "E") +#endif end subroutine AdvertiseFields !----------------------------------------------------------------------------- @@ -1024,7 +1038,9 @@ subroutine RealizeFieldsWithTransferProvided(gcomp, importState, exportState, cl integer :: n character(len=*), parameter :: subname = '('//__FILE__//':RealizeFieldsWithTransferProvided)' !----------------------------------------------------------- +#ifdef UFS_TRACING if (maintask) call ufs_trace("cmeps", "RealizeFieldsWithTransferProvided", "B") +#endif call ESMF_LogWrite(trim(subname)//": called", ESMF_LOGMSG_INFO) rc = ESMF_SUCCESS @@ -1062,7 +1078,9 @@ subroutine RealizeFieldsWithTransferProvided(gcomp, importState, exportState, cl if (profile_memory) call ESMF_VMLogMemInfo("Leaving "//trim(subname)) call ESMF_LogWrite(trim(subname)//": done", ESMF_LOGMSG_INFO) +#ifdef UFS_TRACING if (maintask) call ufs_trace("cmeps", "RealizeFieldsWithTransferProvided", "E") +#endif end subroutine RealizeFieldsWithTransferProvided @@ -1087,7 +1105,9 @@ subroutine ModifyDecompofMesh(gcomp, importState, exportState, clock, rc) integer :: n1 character(len=*), parameter :: subname = '('//__FILE__//':ModifyDecompofMesh)' !----------------------------------------------------------- +#ifdef UFS_TRACING if (maintask) call ufs_trace("cmeps", "ModifyDecompofMesh", "B") +#endif call ESMF_LogWrite(trim(subname)//": called", ESMF_LOGMSG_INFO) rc = ESMF_SUCCESS @@ -1116,7 +1136,9 @@ subroutine ModifyDecompofMesh(gcomp, importState, exportState, clock, rc) enddo if (profile_memory) call ESMF_VMLogMemInfo("Leaving "//trim(subname)) call ESMF_LogWrite(trim(subname)//": done", ESMF_LOGMSG_INFO) +#ifdef UFS_TRACING if (maintask) call ufs_trace("cmeps", "ModifyDecompofMesh", "E") +#endif contains !- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1414,7 +1436,9 @@ subroutine RealizeFieldsWithTransferAccept(gcomp, importState, exportState, cloc integer :: n1 character(len=*), parameter :: subname = '('//__FILE__//':RealizeFieldsWithTransferAccept)' !----------------------------------------------------------- +#ifdef UFS_TRACING if (maintask) call ufs_trace("cmeps", "RealizeFieldsWithTransferAccept", "B") +#endif call ESMF_LogWrite(trim(subname)//": called", ESMF_LOGMSG_INFO) @@ -1454,7 +1478,9 @@ subroutine RealizeFieldsWithTransferAccept(gcomp, importState, exportState, cloc if (profile_memory) call ESMF_VMLogMemInfo("Leaving "//trim(subname)) call ESMF_LogWrite(trim(subname)//": done", ESMF_LOGMSG_INFO) +#ifdef UFS_TRACING if (maintask) call ufs_trace("cmeps", "RealizeFieldsWithTransferAccept", "E") +#endif contains !- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1679,7 +1705,9 @@ subroutine DataInitialize(gcomp, rc) character(len=CX) :: msgString character(len=*), parameter :: subname = '('//__FILE__//':DataInitialize)' !----------------------------------------------------------- +#ifdef UFS_TRACING if (maintask) call ufs_trace("cmeps", "DataInitialize", "B") +#endif call ESMF_LogWrite(trim(subname)//": called", ESMF_LOGMSG_INFO) rc = ESMF_SUCCESS @@ -1988,7 +2016,9 @@ subroutine DataInitialize(gcomp, rc) ! the correct timestamps, which also indicates that the actual ! data has been transferred reliably, and CMEPS can safely use it. +#ifdef UFS_TRACING if (maintask) call ufs_trace("cmeps", "DataInitialize", "E") +#endif RETURN endif ! end first_call if-block @@ -2280,7 +2310,9 @@ subroutine DataInitialize(gcomp, rc) call ESMF_LogWrite(trim(subname)//": done", ESMF_LOGMSG_INFO) endif +#ifdef UFS_TRACING if (maintask) call ufs_trace("cmeps", "DataInitialize", "E") +#endif end subroutine DataInitialize !----------------------------------------------------------------------------- diff --git a/mediator/med_phases_history_mod.F90 b/mediator/med_phases_history_mod.F90 index e38efb76f..d6e97c6c4 100644 --- a/mediator/med_phases_history_mod.F90 +++ b/mediator/med_phases_history_mod.F90 @@ -24,7 +24,9 @@ module med_phases_history_mod use perf_mod , only : t_startf, t_stopf use pio , only : file_desc_t use shr_log_mod , only : shr_log_error +#ifdef UFS_TRACING use ufs_trace_mod +#endif implicit none private @@ -190,7 +192,9 @@ subroutine med_phases_history_write(gcomp, rc) !--------------------------------------- rc = ESMF_SUCCESS +#ifdef UFS_TRACING if (maintask) call ufs_trace("cmeps", "med_phases_history_write", "B") +#endif call t_startf('MED:'//subname) ! Get the internal state @@ -386,7 +390,9 @@ subroutine med_phases_history_write(gcomp, rc) call t_stopf('MED:'//subname) +#ifdef UFS_TRACING if (maintask) call ufs_trace("cmeps", "med_phases_history_write", "E") +#endif end subroutine med_phases_history_write !=============================================================================== @@ -424,7 +430,9 @@ subroutine med_phases_history_write_med(gcomp, rc) character(len=*), parameter :: subname='(med_phases_history_write_med)' !--------------------------------------- rc = ESMF_SUCCESS +#ifdef UFS_TRACING if (maintask) call ufs_trace("cmeps", "med_phases_history_write_med", "B") +#endif ! Get the internal state nullify(is_local%wrap) @@ -531,7 +539,9 @@ subroutine med_phases_history_write_med(gcomp, rc) end if ! end of if-write_now block end if ! end of if-active block +#ifdef UFS_TRACING if (maintask) call ufs_trace("cmeps", "med_phases_history_write_med", "E") +#endif end subroutine med_phases_history_write_med !=============================================================================== @@ -573,7 +583,9 @@ subroutine med_phases_history_write_lnd2glc(gcomp, fldbun_lnd, rc, fldbun_glc) !--------------------------------------- rc = ESMF_SUCCESS +#ifdef UFS_TRACING if (maintask) call ufs_trace("cmeps", "med_phases_history_write_lnd2glc", "B") +#endif ! Get the internal state nullify(is_local%wrap) @@ -662,7 +674,9 @@ subroutine med_phases_history_write_lnd2glc(gcomp, fldbun_lnd, rc, fldbun_glc) call med_io_close(io_file, rc=rc) if (ChkErr(rc,__LINE__,u_FILE_u)) return +#ifdef UFS_TRACING if (maintask) call ufs_trace("cmeps", "med_phases_history_write_lnd2glc", "E") +#endif end subroutine med_phases_history_write_lnd2glc !=============================================================================== @@ -676,7 +690,9 @@ subroutine med_phases_history_write_comp(gcomp, compid, rc) integer , intent(out) :: rc !--------------------------------------- rc = ESMF_SUCCESS +#ifdef UFS_TRACING if (maintask) call ufs_trace("cmeps", "med_phases_history_write_comp", "B") +#endif call med_phases_history_write_comp_inst(gcomp, compid, instfiles(compid), rc=rc) if (ChkErr(rc,__LINE__,u_FILE_u)) return @@ -685,7 +701,9 @@ subroutine med_phases_history_write_comp(gcomp, compid, rc) call med_phases_history_write_comp_aux(gcomp, compid, auxcomp(compid), rc=rc) if (ChkErr(rc,__LINE__,u_FILE_u)) return +#ifdef UFS_TRACING if (maintask) call ufs_trace("cmeps", "med_phases_history_write_comp", "E") +#endif end subroutine med_phases_history_write_comp !=============================================================================== diff --git a/mediator/med_phases_ocnalb_mod.F90 b/mediator/med_phases_ocnalb_mod.F90 index efe6f9adf..aa717973f 100644 --- a/mediator/med_phases_ocnalb_mod.F90 +++ b/mediator/med_phases_ocnalb_mod.F90 @@ -11,7 +11,9 @@ module med_phases_ocnalb_mod use shr_orb_mod , only : shr_orb_cosz, shr_orb_decl use shr_orb_mod , only : shr_orb_params, SHR_ORB_UNDEF_INT, SHR_ORB_UNDEF_REAL use shr_log_mod , only : shr_log_unit, shr_log_error +#ifdef UFS_TRACING use ufs_trace_mod +#endif implicit none private @@ -315,7 +317,9 @@ subroutine med_phases_ocnalb_run(gcomp, rc) !--------------------------------------- rc = ESMF_SUCCESS +#ifdef UFS_TRACING if (maintask) call ufs_trace("cmeps", "med_phases_ocnalb_run", "B") +#endif ! Determine main task call ESMF_GridCompGet(gcomp, vm=vm, rc=rc) @@ -509,7 +513,9 @@ subroutine med_phases_ocnalb_run(gcomp, rc) end if call t_stopf('MED:'//subname) +#ifdef UFS_TRACING if (maintask) call ufs_trace("cmeps", "med_phases_ocnalb_run", "E") +#endif end subroutine med_phases_ocnalb_run !=============================================================================== diff --git a/mediator/med_phases_post_atm_mod.F90 b/mediator/med_phases_post_atm_mod.F90 index 155952899..86f64fb03 100644 --- a/mediator/med_phases_post_atm_mod.F90 +++ b/mediator/med_phases_post_atm_mod.F90 @@ -35,7 +35,9 @@ subroutine med_phases_post_atm(gcomp, rc) use med_utils_mod , only : chkerr => med_utils_ChkErr use med_internalstate_mod , only : compocn, compatm, compice, complnd, compwav use perf_mod , only : t_startf, t_stopf +#ifdef UFS_TRACING use ufs_trace_mod +#endif ! input/output variables type(ESMF_GridComp) :: gcomp @@ -48,7 +50,9 @@ subroutine med_phases_post_atm(gcomp, rc) !------------------------------------------------------------------------------- rc = ESMF_SUCCESS +#ifdef UFS_TRACING if (maintask) call ufs_trace("cmeps", "med_phases_post_atm", "B") +#endif call t_startf('MED:'//subname) if (dbug_flag > 20) then @@ -128,7 +132,9 @@ subroutine med_phases_post_atm(gcomp, rc) end if call t_stopf('MED:'//subname) +#ifdef UFS_TRACING if (maintask) call ufs_trace("cmeps", "med_phases_post_atm", "E") +#endif end subroutine med_phases_post_atm end module med_phases_post_atm_mod diff --git a/mediator/med_phases_post_ice_mod.F90 b/mediator/med_phases_post_ice_mod.F90 index 6d1dc0785..12764c100 100644 --- a/mediator/med_phases_post_ice_mod.F90 +++ b/mediator/med_phases_post_ice_mod.F90 @@ -32,7 +32,9 @@ subroutine med_phases_post_ice(gcomp, rc) use med_phases_history_mod, only : med_phases_history_write_comp use med_internalstate_mod , only : compice, compocn, compwav use perf_mod , only : t_startf, t_stopf +#ifdef UFS_TRACING use ufs_trace_mod +#endif ! input/output variables type(ESMF_GridComp) :: gcomp @@ -44,7 +46,9 @@ subroutine med_phases_post_ice(gcomp, rc) character(len=*),parameter :: subname='(med_phases_post_ice)' !------------------------------------------------------------------------------- +#ifdef UFS_TRACING if (maintask) call ufs_trace("cmeps", "med_phases_post_ice", "B") +#endif call t_startf('MED:'//subname) rc = ESMF_SUCCESS @@ -101,7 +105,9 @@ subroutine med_phases_post_ice(gcomp, rc) call ESMF_LogWrite(subname//' done', ESMF_LOGMSG_INFO) end if +#ifdef UFS_TRACING if (maintask) call ufs_trace("cmeps", "med_phases_post_ice", "E") +#endif end subroutine med_phases_post_ice end module med_phases_post_ice_mod diff --git a/mediator/med_phases_post_ocn_mod.F90 b/mediator/med_phases_post_ocn_mod.F90 index 20dd39408..0e0b89335 100644 --- a/mediator/med_phases_post_ocn_mod.F90 +++ b/mediator/med_phases_post_ocn_mod.F90 @@ -31,7 +31,9 @@ subroutine med_phases_post_ocn(gcomp, rc) use med_phases_history_mod , only : med_phases_history_write_comp use med_phases_prep_glc_mod , only : med_phases_prep_glc_accum_ocn use perf_mod , only : t_startf, t_stopf +#ifdef UFS_TRACING use ufs_trace_mod +#endif ! input/output variables type(ESMF_GridComp) :: gcomp @@ -44,7 +46,9 @@ subroutine med_phases_post_ocn(gcomp, rc) !--------------------------------------- rc = ESMF_SUCCESS +#ifdef UFS_TRACING if (maintask) call ufs_trace("cmeps", "med_phases_post_ocn", "B") +#endif call t_startf('MED:'//subname) if (dbug_flag > 20) then @@ -103,7 +107,9 @@ subroutine med_phases_post_ocn(gcomp, rc) end if call t_stopf('MED:'//subname) +#ifdef UFS_TRACING if (maintask) call ufs_trace("cmeps", "med_phases_post_ocn", "E") +#endif end subroutine med_phases_post_ocn end module med_phases_post_ocn_mod diff --git a/mediator/med_phases_post_wav_mod.F90 b/mediator/med_phases_post_wav_mod.F90 index 2b6556926..205e66e67 100644 --- a/mediator/med_phases_post_wav_mod.F90 +++ b/mediator/med_phases_post_wav_mod.F90 @@ -27,7 +27,9 @@ subroutine med_phases_post_wav(gcomp, rc) use med_internalstate_mod , only : compwav, compatm, compocn, compice use med_phases_history_mod, only : med_phases_history_write_comp use perf_mod , only : t_startf, t_stopf +#ifdef UFS_TRACING use ufs_trace_mod +#endif ! input/output variables type(ESMF_GridComp) :: gcomp @@ -39,7 +41,9 @@ subroutine med_phases_post_wav(gcomp, rc) character(len=*),parameter :: subname='(med_phases_post_wav)' !------------------------------------------------------------------------------- +#ifdef UFS_TRACING if (maintask) call ufs_trace("cmeps", "med_phases_post_wav", "B") +#endif call t_startf('MED:'//subname) rc = ESMF_SUCCESS @@ -99,7 +103,9 @@ subroutine med_phases_post_wav(gcomp, rc) call ESMF_LogWrite(subname//' done', ESMF_LOGMSG_INFO) end if +#ifdef UFS_TRACING if (maintask) call ufs_trace("cmeps", "med_phases_post_wav", "E") +#endif end subroutine med_phases_post_wav end module med_phases_post_wav_mod diff --git a/mediator/med_phases_prep_atm_mod.F90 b/mediator/med_phases_prep_atm_mod.F90 index e2660ef20..9ed769247 100644 --- a/mediator/med_phases_prep_atm_mod.F90 +++ b/mediator/med_phases_prep_atm_mod.F90 @@ -23,7 +23,9 @@ module med_phases_prep_atm_mod use perf_mod , only : t_startf, t_stopf use med_phases_aofluxes_mod, only : med_aofluxes_map_xgrid2agrid_output use med_phases_aofluxes_mod, only : med_aofluxes_map_ogrid2agrid_output +#ifdef UFS_TRACING use ufs_trace_mod +#endif implicit none private @@ -61,7 +63,9 @@ subroutine med_phases_prep_atm(gcomp, rc) character(len=*),parameter :: subname='(med_phases_prep_atm)' !------------------------------------------------------------------------------- +#ifdef UFS_TRACING if (maintask) call ufs_trace("cmeps", "med_phases_prep_atm", "B") +#endif call t_startf('MED:'//subname) rc = ESMF_SUCCESS @@ -250,7 +254,9 @@ subroutine med_phases_prep_atm(gcomp, rc) end if call t_stopf('MED:'//subname) +#ifdef UFS_TRACING if (maintask) call ufs_trace("cmeps", "med_phases_prep_atm", "E") +#endif end subroutine med_phases_prep_atm !----------------------------------------------------------------------------- diff --git a/mediator/med_phases_prep_ice_mod.F90 b/mediator/med_phases_prep_ice_mod.F90 index 988d3bddb..1d4a8758e 100644 --- a/mediator/med_phases_prep_ice_mod.F90 +++ b/mediator/med_phases_prep_ice_mod.F90 @@ -41,7 +41,9 @@ subroutine med_phases_prep_ice(gcomp, rc) use med_internalstate_mod , only : coupling_mode use esmFlds , only : med_fldList_GetFldListTo use perf_mod , only : t_startf, t_stopf +#ifdef UFS_TRACING use ufs_trace_mod +#endif ! input/output variables type(ESMF_GridComp) :: gcomp @@ -60,7 +62,9 @@ subroutine med_phases_prep_ice(gcomp, rc) character(len=*),parameter :: subname='(med_phases_prep_ice)' !--------------------------------------- +#ifdef UFS_TRACING if (maintask) call ufs_trace("cmeps", "med_phases_prep_ice", "B") +#endif call t_startf('MED:'//subname) if (dbug_flag > 5) then @@ -160,7 +164,9 @@ subroutine med_phases_prep_ice(gcomp, rc) endif call t_stopf('MED:'//subname) +#ifdef UFS_TRACING if (maintask) call ufs_trace("cmeps", "med_phases_prep_ice", "E") +#endif end subroutine med_phases_prep_ice end module med_phases_prep_ice_mod diff --git a/mediator/med_phases_prep_ocn_mod.F90 b/mediator/med_phases_prep_ocn_mod.F90 index b70f2b0cb..d9c4fed6c 100644 --- a/mediator/med_phases_prep_ocn_mod.F90 +++ b/mediator/med_phases_prep_ocn_mod.F90 @@ -23,7 +23,9 @@ module med_phases_prep_ocn_mod use esmFlds , only : med_fldList_GetfldListTo, med_fldlist_type use med_internalstate_mod , only : compocn, compatm, compice, coupling_mode use perf_mod , only : t_startf, t_stopf +#ifdef UFS_TRACING use ufs_trace_mod +#endif implicit none private @@ -105,7 +107,9 @@ subroutine med_phases_prep_ocn_accum(gcomp, rc) character(len=*), parameter :: subname='(med_phases_prep_ocn_accum)' !--------------------------------------- +#ifdef UFS_TRACING if (maintask) call ufs_trace("cmeps", "med_phases_prep_ocn_accum", "B") +#endif call t_startf('MED:'//subname) if (dbug_flag > 20) then call ESMF_LogWrite(subname//' called', ESMF_LOGMSG_INFO) @@ -268,7 +272,9 @@ subroutine med_phases_prep_ocn_accum(gcomp, rc) end if call t_stopf('MED:'//subname) +#ifdef UFS_TRACING if (maintask) call ufs_trace("cmeps", "med_phases_prep_ocn_accum", "E") +#endif end subroutine med_phases_prep_ocn_accum !----------------------------------------------------------------------------- @@ -291,7 +297,9 @@ subroutine med_phases_prep_ocn_avg(gcomp, rc) !--------------------------------------- rc = ESMF_SUCCESS +#ifdef UFS_TRACING if (maintask) call ufs_trace("cmeps", "med_phases_prep_ocn_avg", "B") +#endif call t_startf('MED:'//subname) if (dbug_flag > 20) then @@ -345,7 +353,9 @@ subroutine med_phases_prep_ocn_avg(gcomp, rc) call t_stopf('MED:'//subname) first_call = .false. +#ifdef UFS_TRACING if (maintask) call ufs_trace("cmeps", "med_phases_prep_ocn_avg", "E") +#endif end subroutine med_phases_prep_ocn_avg !----------------------------------------------------------------------------- diff --git a/mediator/med_phases_prep_wav_mod.F90 b/mediator/med_phases_prep_wav_mod.F90 index fffad87c1..d756a379d 100644 --- a/mediator/med_phases_prep_wav_mod.F90 +++ b/mediator/med_phases_prep_wav_mod.F90 @@ -21,7 +21,9 @@ module med_phases_prep_wav_mod use esmFlds , only : med_fldList_GetfldListTo use med_internalstate_mod , only : compatm, compwav use perf_mod , only : t_startf, t_stopf +#ifdef UFS_TRACING use ufs_trace_mod +#endif implicit none private @@ -85,7 +87,9 @@ subroutine med_phases_prep_wav_accum(gcomp, rc) character(len=*), parameter :: subname='(med_phases_prep_wav_accum)' !--------------------------------------- +#ifdef UFS_TRACING if (maintask) call ufs_trace("cmeps", "med_phases_prep_wav_accum", "B") +#endif call t_startf('MED:'//subname) if (dbug_flag > 20) then call ESMF_LogWrite(subname//' called', ESMF_LOGMSG_INFO) @@ -149,7 +153,9 @@ subroutine med_phases_prep_wav_accum(gcomp, rc) end if call t_stopf('MED:'//subname) +#ifdef UFS_TRACING if (maintask) call ufs_trace("cmeps", "med_phases_prep_wav_accum", "E") +#endif end subroutine med_phases_prep_wav_accum !----------------------------------------------------------------------------- @@ -171,7 +177,9 @@ subroutine med_phases_prep_wav_avg(gcomp, rc) !--------------------------------------- rc = ESMF_SUCCESS +#ifdef UFS_TRACING if (maintask) call ufs_trace("cmeps", "med_phases_prep_wav_avg", "B") +#endif call t_startf('MED:'//subname) if (dbug_flag > 20) then @@ -223,6 +231,8 @@ subroutine med_phases_prep_wav_avg(gcomp, rc) end if call t_stopf('MED:'//subname) +#ifdef UFS_TRACING if (maintask) call ufs_trace("cmeps", "med_phases_prep_wav_avg", "E") +#endif end subroutine med_phases_prep_wav_avg end module med_phases_prep_wav_mod diff --git a/mediator/med_phases_restart_mod.F90 b/mediator/med_phases_restart_mod.F90 index e549a6891..7105e776a 100644 --- a/mediator/med_phases_restart_mod.F90 +++ b/mediator/med_phases_restart_mod.F90 @@ -19,7 +19,9 @@ module med_phases_restart_mod use shr_is_restart_fh_mod , only : log_restart_fh #endif use shr_log_mod , only : shr_log_error +#ifdef UFS_TRACING use ufs_trace_mod +#endif implicit none private @@ -199,7 +201,9 @@ subroutine med_phases_restart_write(gcomp, rc) character(len=*), parameter :: subname='(med_phases_restart_write)' !--------------------------------------- +#ifdef UFS_TRACING if (maintask) call ufs_trace("cmeps", "med_phases_restart_write", "B") +#endif call t_startf('MED:'//subname) if (dbug_flag > 5) then call ESMF_LogWrite(trim(subname)//": called", ESMF_LOGMSG_INFO) @@ -510,7 +514,9 @@ subroutine med_phases_restart_write(gcomp, rc) endif call t_stopf('MED:'//subname) +#ifdef UFS_TRACING if (maintask) call ufs_trace("cmeps", "med_phases_restart_write", "E") +#endif end subroutine med_phases_restart_write !=============================================================================== @@ -546,7 +552,9 @@ subroutine med_phases_restart_read(gcomp, rc) character(ESMF_MAXSTR) :: restart_pfile ! Local path to restart pointer filename character(len=*), parameter :: subname='(med_phases_restart_read)' !--------------------------------------- +#ifdef UFS_TRACING if (maintask) call ufs_trace("cmeps", "med_phases_restart_read", "B") +#endif call t_startf('MED:'//subname) call ESMF_LogWrite(trim(subname)//": called", ESMF_LOGMSG_INFO) rc = ESMF_SUCCESS @@ -665,7 +673,9 @@ subroutine med_phases_restart_read(gcomp, rc) call ESMF_LogWrite(trim(subname)//": done", ESMF_LOGMSG_INFO) call t_stopf('MED:'//subname) +#ifdef UFS_TRACING if (maintask) call ufs_trace("cmeps", "med_phases_restart_read", "E") +#endif end subroutine med_phases_restart_read !=============================================================================== From 09cf1ee494c75c8de6028bb0cacd2ba638114b5f Mon Sep 17 00:00:00 2001 From: Dusan Jovic Date: Mon, 22 Sep 2025 20:18:05 +0000 Subject: [PATCH 3/5] Add med_ufs_trace_wrapper.F90 and remove all UFS_TRACING ifdefs --- mediator/CMakeLists.txt | 3 +- mediator/med.F90 | 66 +++++++--------------------- mediator/med_phases_history_mod.F90 | 36 ++++----------- mediator/med_phases_ocnalb_mod.F90 | 13 ++---- mediator/med_phases_post_atm_mod.F90 | 12 ++--- mediator/med_phases_post_ice_mod.F90 | 12 ++--- mediator/med_phases_post_ocn_mod.F90 | 12 ++--- mediator/med_phases_post_wav_mod.F90 | 12 ++--- mediator/med_phases_prep_atm_mod.F90 | 12 ++--- mediator/med_phases_prep_ice_mod.F90 | 12 ++--- mediator/med_phases_prep_ocn_mod.F90 | 20 +++------ mediator/med_phases_prep_wav_mod.F90 | 20 +++------ mediator/med_phases_restart_mod.F90 | 20 +++------ mediator/med_ufs_trace_wrapper.F90 | 38 ++++++++++++++++ 14 files changed, 103 insertions(+), 185 deletions(-) create mode 100644 mediator/med_ufs_trace_wrapper.F90 diff --git a/mediator/CMakeLists.txt b/mediator/CMakeLists.txt index 80be3d2e8..36d5db290 100644 --- a/mediator/CMakeLists.txt +++ b/mediator/CMakeLists.txt @@ -16,7 +16,8 @@ set(SRCFILES esmFldsExchange_cesm_mod.F90 med_fraction_mod.F90 med_phases_post_ocn_mod.F90 med_phases_ocnalb_mod.F90 med_phases_post_atm_mod.F90 med_phases_post_ice_mod.F90 med_phases_post_lnd_mod.F90 med_phases_post_glc_mod.F90 - med_phases_post_rof_mod.F90 med_phases_post_wav_mod.F90) + med_phases_post_rof_mod.F90 med_phases_post_wav_mod.F90 + med_ufs_trace_wrapper.F90) foreach(FILE ${SRCFILES}) if(EXISTS "${CASEROOT}/SourceMods/src.cmeps/${FILE}") diff --git a/mediator/med.F90 b/mediator/med.F90 index 128a8d787..617fd1a43 100644 --- a/mediator/med.F90 +++ b/mediator/med.F90 @@ -52,9 +52,7 @@ module MED use esmFldsExchange_hafs_mod , only : esmFldsExchange_hafs use med_phases_profile_mod , only : med_phases_profile_finalize use shr_log_mod , only : shr_log_error -#ifdef UFS_TRACING - use ufs_trace_mod -#endif + use med_ufs_trace_wrapper_mod implicit none private @@ -151,10 +149,8 @@ subroutine SetServices(gcomp, rc) if (ChkErr(rc,__LINE__,u_FILE_u)) return maintask = .false. if (localPet == 0) maintask=.true. -#ifdef UFS_TRACING - if (maintask) call ufs_trace_init() - if (maintask) call ufs_trace("cmeps", "SetServices", "B") -#endif + if (maintask) call ufs_trace_init_wrapper() + if (maintask) call ufs_trace_wrapper("cmeps", "SetServices", "B") !------------------ ! the NUOPC model component mediator_routine_SS will register the generic methods @@ -571,9 +567,7 @@ subroutine SetServices(gcomp, rc) if (profile_memory) call ESMF_VMLogMemInfo("Leaving "//trim(subname)) -#ifdef UFS_TRACING - if (maintask) call ufs_trace("cmeps", "SetServices", "E") -#endif + if (maintask) call ufs_trace_wrapper("cmeps", "SetServices", "E") end subroutine SetServices !----------------------------------------------------------------------------- @@ -611,9 +605,7 @@ subroutine InitializeP0(gcomp, importState, exportState, clock, rc) call ESMF_LogWrite(trim(subname)//": called", ESMF_LOGMSG_INFO) if (profile_memory) call ESMF_VMLogMemInfo("Entering "//trim(subname)) -#ifdef UFS_TRACING - if (maintask) call ufs_trace("cmeps", "InitializeP0", "B") -#endif + if (maintask) call ufs_trace_wrapper("cmeps", "InitializeP0", "B") call ESMF_GridCompGet(gcomp, vm=vm, rc=rc) if (ChkErr(rc,__LINE__,u_FILE_u)) return call ESMF_VMGet(vm, localPet=localPet, rc=rc) @@ -684,9 +676,7 @@ subroutine InitializeP0(gcomp, importState, exportState, clock, rc) if (profile_memory) call ESMF_VMLogMemInfo("Leaving "//trim(subname)) call ESMF_LogWrite(trim(subname)//": done", ESMF_LOGMSG_INFO) -#ifdef UFS_TRACING - if (maintask) call ufs_trace("cmeps", "InitializeP0", "E") -#endif + if (maintask) call ufs_trace_wrapper("cmeps", "InitializeP0", "E") end subroutine InitializeP0 @@ -727,9 +717,7 @@ subroutine AdvertiseFields(gcomp, importState, exportState, clock, rc) character(len=*), parameter :: subname = '('//__FILE__//':AdvertiseFields)' !----------------------------------------------------------- -#ifdef UFS_TRACING - if (maintask) call ufs_trace("cmeps", "AdvertiseFields", "B") -#endif + if (maintask) call ufs_trace_wrapper("cmeps", "AdvertiseFields", "B") call ESMF_LogWrite(trim(subname)//": called", ESMF_LOGMSG_INFO) rc = ESMF_SUCCESS if (profile_memory) call ESMF_VMLogMemInfo("Entering "//trim(subname)) @@ -1009,9 +997,7 @@ subroutine AdvertiseFields(gcomp, importState, exportState, clock, rc) if (profile_memory) call ESMF_VMLogMemInfo("Leaving "//trim(subname)) call ESMF_LogWrite(trim(subname)//": done", ESMF_LOGMSG_INFO) -#ifdef UFS_TRACING - if (maintask) call ufs_trace("cmeps", "AdvertiseFields", "E") -#endif + if (maintask) call ufs_trace_wrapper("cmeps", "AdvertiseFields", "E") end subroutine AdvertiseFields !----------------------------------------------------------------------------- @@ -1038,9 +1024,7 @@ subroutine RealizeFieldsWithTransferProvided(gcomp, importState, exportState, cl integer :: n character(len=*), parameter :: subname = '('//__FILE__//':RealizeFieldsWithTransferProvided)' !----------------------------------------------------------- -#ifdef UFS_TRACING - if (maintask) call ufs_trace("cmeps", "RealizeFieldsWithTransferProvided", "B") -#endif + if (maintask) call ufs_trace_wrapper("cmeps", "RealizeFieldsWithTransferProvided", "B") call ESMF_LogWrite(trim(subname)//": called", ESMF_LOGMSG_INFO) rc = ESMF_SUCCESS @@ -1078,9 +1062,7 @@ subroutine RealizeFieldsWithTransferProvided(gcomp, importState, exportState, cl if (profile_memory) call ESMF_VMLogMemInfo("Leaving "//trim(subname)) call ESMF_LogWrite(trim(subname)//": done", ESMF_LOGMSG_INFO) -#ifdef UFS_TRACING - if (maintask) call ufs_trace("cmeps", "RealizeFieldsWithTransferProvided", "E") -#endif + if (maintask) call ufs_trace_wrapper("cmeps", "RealizeFieldsWithTransferProvided", "E") end subroutine RealizeFieldsWithTransferProvided @@ -1105,9 +1087,7 @@ subroutine ModifyDecompofMesh(gcomp, importState, exportState, clock, rc) integer :: n1 character(len=*), parameter :: subname = '('//__FILE__//':ModifyDecompofMesh)' !----------------------------------------------------------- -#ifdef UFS_TRACING - if (maintask) call ufs_trace("cmeps", "ModifyDecompofMesh", "B") -#endif + if (maintask) call ufs_trace_wrapper("cmeps", "ModifyDecompofMesh", "B") call ESMF_LogWrite(trim(subname)//": called", ESMF_LOGMSG_INFO) rc = ESMF_SUCCESS @@ -1136,9 +1116,7 @@ subroutine ModifyDecompofMesh(gcomp, importState, exportState, clock, rc) enddo if (profile_memory) call ESMF_VMLogMemInfo("Leaving "//trim(subname)) call ESMF_LogWrite(trim(subname)//": done", ESMF_LOGMSG_INFO) -#ifdef UFS_TRACING - if (maintask) call ufs_trace("cmeps", "ModifyDecompofMesh", "E") -#endif + if (maintask) call ufs_trace_wrapper("cmeps", "ModifyDecompofMesh", "E") contains !- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1436,9 +1414,7 @@ subroutine RealizeFieldsWithTransferAccept(gcomp, importState, exportState, cloc integer :: n1 character(len=*), parameter :: subname = '('//__FILE__//':RealizeFieldsWithTransferAccept)' !----------------------------------------------------------- -#ifdef UFS_TRACING - if (maintask) call ufs_trace("cmeps", "RealizeFieldsWithTransferAccept", "B") -#endif + if (maintask) call ufs_trace_wrapper("cmeps", "RealizeFieldsWithTransferAccept", "B") call ESMF_LogWrite(trim(subname)//": called", ESMF_LOGMSG_INFO) @@ -1478,9 +1454,7 @@ subroutine RealizeFieldsWithTransferAccept(gcomp, importState, exportState, cloc if (profile_memory) call ESMF_VMLogMemInfo("Leaving "//trim(subname)) call ESMF_LogWrite(trim(subname)//": done", ESMF_LOGMSG_INFO) -#ifdef UFS_TRACING - if (maintask) call ufs_trace("cmeps", "RealizeFieldsWithTransferAccept", "E") -#endif + if (maintask) call ufs_trace_wrapper("cmeps", "RealizeFieldsWithTransferAccept", "E") contains !- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1705,9 +1679,7 @@ subroutine DataInitialize(gcomp, rc) character(len=CX) :: msgString character(len=*), parameter :: subname = '('//__FILE__//':DataInitialize)' !----------------------------------------------------------- -#ifdef UFS_TRACING - if (maintask) call ufs_trace("cmeps", "DataInitialize", "B") -#endif + if (maintask) call ufs_trace_wrapper("cmeps", "DataInitialize", "B") call ESMF_LogWrite(trim(subname)//": called", ESMF_LOGMSG_INFO) rc = ESMF_SUCCESS @@ -2016,9 +1988,7 @@ subroutine DataInitialize(gcomp, rc) ! the correct timestamps, which also indicates that the actual ! data has been transferred reliably, and CMEPS can safely use it. -#ifdef UFS_TRACING - if (maintask) call ufs_trace("cmeps", "DataInitialize", "E") -#endif + if (maintask) call ufs_trace_wrapper("cmeps", "DataInitialize", "E") RETURN endif ! end first_call if-block @@ -2310,9 +2280,7 @@ subroutine DataInitialize(gcomp, rc) call ESMF_LogWrite(trim(subname)//": done", ESMF_LOGMSG_INFO) endif -#ifdef UFS_TRACING - if (maintask) call ufs_trace("cmeps", "DataInitialize", "E") -#endif + if (maintask) call ufs_trace_wrapper("cmeps", "DataInitialize", "E") end subroutine DataInitialize !----------------------------------------------------------------------------- diff --git a/mediator/med_phases_history_mod.F90 b/mediator/med_phases_history_mod.F90 index d6e97c6c4..25798807f 100644 --- a/mediator/med_phases_history_mod.F90 +++ b/mediator/med_phases_history_mod.F90 @@ -24,9 +24,7 @@ module med_phases_history_mod use perf_mod , only : t_startf, t_stopf use pio , only : file_desc_t use shr_log_mod , only : shr_log_error -#ifdef UFS_TRACING - use ufs_trace_mod -#endif + use med_ufs_trace_wrapper_mod implicit none private @@ -192,9 +190,7 @@ subroutine med_phases_history_write(gcomp, rc) !--------------------------------------- rc = ESMF_SUCCESS -#ifdef UFS_TRACING - if (maintask) call ufs_trace("cmeps", "med_phases_history_write", "B") -#endif + if (maintask) call ufs_trace_wrapper("cmeps", "med_phases_history_write", "B") call t_startf('MED:'//subname) ! Get the internal state @@ -390,9 +386,7 @@ subroutine med_phases_history_write(gcomp, rc) call t_stopf('MED:'//subname) -#ifdef UFS_TRACING - if (maintask) call ufs_trace("cmeps", "med_phases_history_write", "E") -#endif + if (maintask) call ufs_trace_wrapper("cmeps", "med_phases_history_write", "E") end subroutine med_phases_history_write !=============================================================================== @@ -430,9 +424,7 @@ subroutine med_phases_history_write_med(gcomp, rc) character(len=*), parameter :: subname='(med_phases_history_write_med)' !--------------------------------------- rc = ESMF_SUCCESS -#ifdef UFS_TRACING - if (maintask) call ufs_trace("cmeps", "med_phases_history_write_med", "B") -#endif + if (maintask) call ufs_trace_wrapper("cmeps", "med_phases_history_write_med", "B") ! Get the internal state nullify(is_local%wrap) @@ -539,9 +531,7 @@ subroutine med_phases_history_write_med(gcomp, rc) end if ! end of if-write_now block end if ! end of if-active block -#ifdef UFS_TRACING - if (maintask) call ufs_trace("cmeps", "med_phases_history_write_med", "E") -#endif + if (maintask) call ufs_trace_wrapper("cmeps", "med_phases_history_write_med", "E") end subroutine med_phases_history_write_med !=============================================================================== @@ -583,9 +573,7 @@ subroutine med_phases_history_write_lnd2glc(gcomp, fldbun_lnd, rc, fldbun_glc) !--------------------------------------- rc = ESMF_SUCCESS -#ifdef UFS_TRACING - if (maintask) call ufs_trace("cmeps", "med_phases_history_write_lnd2glc", "B") -#endif + if (maintask) call ufs_trace_wrapper("cmeps", "med_phases_history_write_lnd2glc", "B") ! Get the internal state nullify(is_local%wrap) @@ -674,9 +662,7 @@ subroutine med_phases_history_write_lnd2glc(gcomp, fldbun_lnd, rc, fldbun_glc) call med_io_close(io_file, rc=rc) if (ChkErr(rc,__LINE__,u_FILE_u)) return -#ifdef UFS_TRACING - if (maintask) call ufs_trace("cmeps", "med_phases_history_write_lnd2glc", "E") -#endif + if (maintask) call ufs_trace_wrapper("cmeps", "med_phases_history_write_lnd2glc", "E") end subroutine med_phases_history_write_lnd2glc !=============================================================================== @@ -690,9 +676,7 @@ subroutine med_phases_history_write_comp(gcomp, compid, rc) integer , intent(out) :: rc !--------------------------------------- rc = ESMF_SUCCESS -#ifdef UFS_TRACING - if (maintask) call ufs_trace("cmeps", "med_phases_history_write_comp", "B") -#endif + if (maintask) call ufs_trace_wrapper("cmeps", "med_phases_history_write_comp", "B") call med_phases_history_write_comp_inst(gcomp, compid, instfiles(compid), rc=rc) if (ChkErr(rc,__LINE__,u_FILE_u)) return @@ -701,9 +685,7 @@ subroutine med_phases_history_write_comp(gcomp, compid, rc) call med_phases_history_write_comp_aux(gcomp, compid, auxcomp(compid), rc=rc) if (ChkErr(rc,__LINE__,u_FILE_u)) return -#ifdef UFS_TRACING - if (maintask) call ufs_trace("cmeps", "med_phases_history_write_comp", "E") -#endif + if (maintask) call ufs_trace_wrapper("cmeps", "med_phases_history_write_comp", "E") end subroutine med_phases_history_write_comp !=============================================================================== diff --git a/mediator/med_phases_ocnalb_mod.F90 b/mediator/med_phases_ocnalb_mod.F90 index aa717973f..c0ef30bf9 100644 --- a/mediator/med_phases_ocnalb_mod.F90 +++ b/mediator/med_phases_ocnalb_mod.F90 @@ -11,9 +11,8 @@ module med_phases_ocnalb_mod use shr_orb_mod , only : shr_orb_cosz, shr_orb_decl use shr_orb_mod , only : shr_orb_params, SHR_ORB_UNDEF_INT, SHR_ORB_UNDEF_REAL use shr_log_mod , only : shr_log_unit, shr_log_error -#ifdef UFS_TRACING - use ufs_trace_mod -#endif + use med_ufs_trace_wrapper_mod + implicit none private @@ -317,9 +316,7 @@ subroutine med_phases_ocnalb_run(gcomp, rc) !--------------------------------------- rc = ESMF_SUCCESS -#ifdef UFS_TRACING - if (maintask) call ufs_trace("cmeps", "med_phases_ocnalb_run", "B") -#endif + if (maintask) call ufs_trace_wrapper("cmeps", "med_phases_ocnalb_run", "B") ! Determine main task call ESMF_GridCompGet(gcomp, vm=vm, rc=rc) @@ -513,9 +510,7 @@ subroutine med_phases_ocnalb_run(gcomp, rc) end if call t_stopf('MED:'//subname) -#ifdef UFS_TRACING - if (maintask) call ufs_trace("cmeps", "med_phases_ocnalb_run", "E") -#endif + if (maintask) call ufs_trace_wrapper("cmeps", "med_phases_ocnalb_run", "E") end subroutine med_phases_ocnalb_run !=============================================================================== diff --git a/mediator/med_phases_post_atm_mod.F90 b/mediator/med_phases_post_atm_mod.F90 index 86f64fb03..85801796f 100644 --- a/mediator/med_phases_post_atm_mod.F90 +++ b/mediator/med_phases_post_atm_mod.F90 @@ -35,9 +35,7 @@ subroutine med_phases_post_atm(gcomp, rc) use med_utils_mod , only : chkerr => med_utils_ChkErr use med_internalstate_mod , only : compocn, compatm, compice, complnd, compwav use perf_mod , only : t_startf, t_stopf -#ifdef UFS_TRACING - use ufs_trace_mod -#endif + use med_ufs_trace_wrapper_mod ! input/output variables type(ESMF_GridComp) :: gcomp @@ -50,9 +48,7 @@ subroutine med_phases_post_atm(gcomp, rc) !------------------------------------------------------------------------------- rc = ESMF_SUCCESS -#ifdef UFS_TRACING - if (maintask) call ufs_trace("cmeps", "med_phases_post_atm", "B") -#endif + if (maintask) call ufs_trace_wrapper("cmeps", "med_phases_post_atm", "B") call t_startf('MED:'//subname) if (dbug_flag > 20) then @@ -132,9 +128,7 @@ subroutine med_phases_post_atm(gcomp, rc) end if call t_stopf('MED:'//subname) -#ifdef UFS_TRACING - if (maintask) call ufs_trace("cmeps", "med_phases_post_atm", "E") -#endif + if (maintask) call ufs_trace_wrapper("cmeps", "med_phases_post_atm", "E") end subroutine med_phases_post_atm end module med_phases_post_atm_mod diff --git a/mediator/med_phases_post_ice_mod.F90 b/mediator/med_phases_post_ice_mod.F90 index 12764c100..dc21549d5 100644 --- a/mediator/med_phases_post_ice_mod.F90 +++ b/mediator/med_phases_post_ice_mod.F90 @@ -32,9 +32,7 @@ subroutine med_phases_post_ice(gcomp, rc) use med_phases_history_mod, only : med_phases_history_write_comp use med_internalstate_mod , only : compice, compocn, compwav use perf_mod , only : t_startf, t_stopf -#ifdef UFS_TRACING - use ufs_trace_mod -#endif + use med_ufs_trace_wrapper_mod ! input/output variables type(ESMF_GridComp) :: gcomp @@ -46,9 +44,7 @@ subroutine med_phases_post_ice(gcomp, rc) character(len=*),parameter :: subname='(med_phases_post_ice)' !------------------------------------------------------------------------------- -#ifdef UFS_TRACING - if (maintask) call ufs_trace("cmeps", "med_phases_post_ice", "B") -#endif + if (maintask) call ufs_trace_wrapper("cmeps", "med_phases_post_ice", "B") call t_startf('MED:'//subname) rc = ESMF_SUCCESS @@ -105,9 +101,7 @@ subroutine med_phases_post_ice(gcomp, rc) call ESMF_LogWrite(subname//' done', ESMF_LOGMSG_INFO) end if -#ifdef UFS_TRACING - if (maintask) call ufs_trace("cmeps", "med_phases_post_ice", "E") -#endif + if (maintask) call ufs_trace_wrapper("cmeps", "med_phases_post_ice", "E") end subroutine med_phases_post_ice end module med_phases_post_ice_mod diff --git a/mediator/med_phases_post_ocn_mod.F90 b/mediator/med_phases_post_ocn_mod.F90 index 0e0b89335..7a777e84b 100644 --- a/mediator/med_phases_post_ocn_mod.F90 +++ b/mediator/med_phases_post_ocn_mod.F90 @@ -31,9 +31,7 @@ subroutine med_phases_post_ocn(gcomp, rc) use med_phases_history_mod , only : med_phases_history_write_comp use med_phases_prep_glc_mod , only : med_phases_prep_glc_accum_ocn use perf_mod , only : t_startf, t_stopf -#ifdef UFS_TRACING - use ufs_trace_mod -#endif + use med_ufs_trace_wrapper_mod ! input/output variables type(ESMF_GridComp) :: gcomp @@ -46,9 +44,7 @@ subroutine med_phases_post_ocn(gcomp, rc) !--------------------------------------- rc = ESMF_SUCCESS -#ifdef UFS_TRACING - if (maintask) call ufs_trace("cmeps", "med_phases_post_ocn", "B") -#endif + if (maintask) call ufs_trace_wrapper("cmeps", "med_phases_post_ocn", "B") call t_startf('MED:'//subname) if (dbug_flag > 20) then @@ -107,9 +103,7 @@ subroutine med_phases_post_ocn(gcomp, rc) end if call t_stopf('MED:'//subname) -#ifdef UFS_TRACING - if (maintask) call ufs_trace("cmeps", "med_phases_post_ocn", "E") -#endif + if (maintask) call ufs_trace_wrapper("cmeps", "med_phases_post_ocn", "E") end subroutine med_phases_post_ocn end module med_phases_post_ocn_mod diff --git a/mediator/med_phases_post_wav_mod.F90 b/mediator/med_phases_post_wav_mod.F90 index 205e66e67..dbe74ee22 100644 --- a/mediator/med_phases_post_wav_mod.F90 +++ b/mediator/med_phases_post_wav_mod.F90 @@ -27,9 +27,7 @@ subroutine med_phases_post_wav(gcomp, rc) use med_internalstate_mod , only : compwav, compatm, compocn, compice use med_phases_history_mod, only : med_phases_history_write_comp use perf_mod , only : t_startf, t_stopf -#ifdef UFS_TRACING - use ufs_trace_mod -#endif + use med_ufs_trace_wrapper_mod ! input/output variables type(ESMF_GridComp) :: gcomp @@ -41,9 +39,7 @@ subroutine med_phases_post_wav(gcomp, rc) character(len=*),parameter :: subname='(med_phases_post_wav)' !------------------------------------------------------------------------------- -#ifdef UFS_TRACING - if (maintask) call ufs_trace("cmeps", "med_phases_post_wav", "B") -#endif + if (maintask) call ufs_trace_wrapper("cmeps", "med_phases_post_wav", "B") call t_startf('MED:'//subname) rc = ESMF_SUCCESS @@ -103,9 +99,7 @@ subroutine med_phases_post_wav(gcomp, rc) call ESMF_LogWrite(subname//' done', ESMF_LOGMSG_INFO) end if -#ifdef UFS_TRACING - if (maintask) call ufs_trace("cmeps", "med_phases_post_wav", "E") -#endif + if (maintask) call ufs_trace_wrapper("cmeps", "med_phases_post_wav", "E") end subroutine med_phases_post_wav end module med_phases_post_wav_mod diff --git a/mediator/med_phases_prep_atm_mod.F90 b/mediator/med_phases_prep_atm_mod.F90 index 9ed769247..b2e6a6b99 100644 --- a/mediator/med_phases_prep_atm_mod.F90 +++ b/mediator/med_phases_prep_atm_mod.F90 @@ -23,9 +23,7 @@ module med_phases_prep_atm_mod use perf_mod , only : t_startf, t_stopf use med_phases_aofluxes_mod, only : med_aofluxes_map_xgrid2agrid_output use med_phases_aofluxes_mod, only : med_aofluxes_map_ogrid2agrid_output -#ifdef UFS_TRACING - use ufs_trace_mod -#endif + use med_ufs_trace_wrapper_mod implicit none private @@ -63,9 +61,7 @@ subroutine med_phases_prep_atm(gcomp, rc) character(len=*),parameter :: subname='(med_phases_prep_atm)' !------------------------------------------------------------------------------- -#ifdef UFS_TRACING - if (maintask) call ufs_trace("cmeps", "med_phases_prep_atm", "B") -#endif + if (maintask) call ufs_trace_wrapper("cmeps", "med_phases_prep_atm", "B") call t_startf('MED:'//subname) rc = ESMF_SUCCESS @@ -254,9 +250,7 @@ subroutine med_phases_prep_atm(gcomp, rc) end if call t_stopf('MED:'//subname) -#ifdef UFS_TRACING - if (maintask) call ufs_trace("cmeps", "med_phases_prep_atm", "E") -#endif + if (maintask) call ufs_trace_wrapper("cmeps", "med_phases_prep_atm", "E") end subroutine med_phases_prep_atm !----------------------------------------------------------------------------- diff --git a/mediator/med_phases_prep_ice_mod.F90 b/mediator/med_phases_prep_ice_mod.F90 index 1d4a8758e..f5342c33a 100644 --- a/mediator/med_phases_prep_ice_mod.F90 +++ b/mediator/med_phases_prep_ice_mod.F90 @@ -41,9 +41,7 @@ subroutine med_phases_prep_ice(gcomp, rc) use med_internalstate_mod , only : coupling_mode use esmFlds , only : med_fldList_GetFldListTo use perf_mod , only : t_startf, t_stopf -#ifdef UFS_TRACING - use ufs_trace_mod -#endif + use med_ufs_trace_wrapper_mod ! input/output variables type(ESMF_GridComp) :: gcomp @@ -62,9 +60,7 @@ subroutine med_phases_prep_ice(gcomp, rc) character(len=*),parameter :: subname='(med_phases_prep_ice)' !--------------------------------------- -#ifdef UFS_TRACING - if (maintask) call ufs_trace("cmeps", "med_phases_prep_ice", "B") -#endif + if (maintask) call ufs_trace_wrapper("cmeps", "med_phases_prep_ice", "B") call t_startf('MED:'//subname) if (dbug_flag > 5) then @@ -164,9 +160,7 @@ subroutine med_phases_prep_ice(gcomp, rc) endif call t_stopf('MED:'//subname) -#ifdef UFS_TRACING - if (maintask) call ufs_trace("cmeps", "med_phases_prep_ice", "E") -#endif + if (maintask) call ufs_trace_wrapper("cmeps", "med_phases_prep_ice", "E") end subroutine med_phases_prep_ice end module med_phases_prep_ice_mod diff --git a/mediator/med_phases_prep_ocn_mod.F90 b/mediator/med_phases_prep_ocn_mod.F90 index d9c4fed6c..f26921fc0 100644 --- a/mediator/med_phases_prep_ocn_mod.F90 +++ b/mediator/med_phases_prep_ocn_mod.F90 @@ -23,9 +23,7 @@ module med_phases_prep_ocn_mod use esmFlds , only : med_fldList_GetfldListTo, med_fldlist_type use med_internalstate_mod , only : compocn, compatm, compice, coupling_mode use perf_mod , only : t_startf, t_stopf -#ifdef UFS_TRACING - use ufs_trace_mod -#endif + use med_ufs_trace_wrapper_mod implicit none private @@ -107,9 +105,7 @@ subroutine med_phases_prep_ocn_accum(gcomp, rc) character(len=*), parameter :: subname='(med_phases_prep_ocn_accum)' !--------------------------------------- -#ifdef UFS_TRACING - if (maintask) call ufs_trace("cmeps", "med_phases_prep_ocn_accum", "B") -#endif + if (maintask) call ufs_trace_wrapper("cmeps", "med_phases_prep_ocn_accum", "B") call t_startf('MED:'//subname) if (dbug_flag > 20) then call ESMF_LogWrite(subname//' called', ESMF_LOGMSG_INFO) @@ -272,9 +268,7 @@ subroutine med_phases_prep_ocn_accum(gcomp, rc) end if call t_stopf('MED:'//subname) -#ifdef UFS_TRACING - if (maintask) call ufs_trace("cmeps", "med_phases_prep_ocn_accum", "E") -#endif + if (maintask) call ufs_trace_wrapper("cmeps", "med_phases_prep_ocn_accum", "E") end subroutine med_phases_prep_ocn_accum !----------------------------------------------------------------------------- @@ -297,9 +291,7 @@ subroutine med_phases_prep_ocn_avg(gcomp, rc) !--------------------------------------- rc = ESMF_SUCCESS -#ifdef UFS_TRACING - if (maintask) call ufs_trace("cmeps", "med_phases_prep_ocn_avg", "B") -#endif + if (maintask) call ufs_trace_wrapper("cmeps", "med_phases_prep_ocn_avg", "B") call t_startf('MED:'//subname) if (dbug_flag > 20) then @@ -353,9 +345,7 @@ subroutine med_phases_prep_ocn_avg(gcomp, rc) call t_stopf('MED:'//subname) first_call = .false. -#ifdef UFS_TRACING - if (maintask) call ufs_trace("cmeps", "med_phases_prep_ocn_avg", "E") -#endif + if (maintask) call ufs_trace_wrapper("cmeps", "med_phases_prep_ocn_avg", "E") end subroutine med_phases_prep_ocn_avg !----------------------------------------------------------------------------- diff --git a/mediator/med_phases_prep_wav_mod.F90 b/mediator/med_phases_prep_wav_mod.F90 index d756a379d..805a0ba90 100644 --- a/mediator/med_phases_prep_wav_mod.F90 +++ b/mediator/med_phases_prep_wav_mod.F90 @@ -21,9 +21,7 @@ module med_phases_prep_wav_mod use esmFlds , only : med_fldList_GetfldListTo use med_internalstate_mod , only : compatm, compwav use perf_mod , only : t_startf, t_stopf -#ifdef UFS_TRACING - use ufs_trace_mod -#endif + use med_ufs_trace_wrapper_mod implicit none private @@ -87,9 +85,7 @@ subroutine med_phases_prep_wav_accum(gcomp, rc) character(len=*), parameter :: subname='(med_phases_prep_wav_accum)' !--------------------------------------- -#ifdef UFS_TRACING - if (maintask) call ufs_trace("cmeps", "med_phases_prep_wav_accum", "B") -#endif + if (maintask) call ufs_trace_wrapper("cmeps", "med_phases_prep_wav_accum", "B") call t_startf('MED:'//subname) if (dbug_flag > 20) then call ESMF_LogWrite(subname//' called', ESMF_LOGMSG_INFO) @@ -153,9 +149,7 @@ subroutine med_phases_prep_wav_accum(gcomp, rc) end if call t_stopf('MED:'//subname) -#ifdef UFS_TRACING - if (maintask) call ufs_trace("cmeps", "med_phases_prep_wav_accum", "E") -#endif + if (maintask) call ufs_trace_wrapper("cmeps", "med_phases_prep_wav_accum", "E") end subroutine med_phases_prep_wav_accum !----------------------------------------------------------------------------- @@ -177,9 +171,7 @@ subroutine med_phases_prep_wav_avg(gcomp, rc) !--------------------------------------- rc = ESMF_SUCCESS -#ifdef UFS_TRACING - if (maintask) call ufs_trace("cmeps", "med_phases_prep_wav_avg", "B") -#endif + if (maintask) call ufs_trace_wrapper("cmeps", "med_phases_prep_wav_avg", "B") call t_startf('MED:'//subname) if (dbug_flag > 20) then @@ -231,8 +223,6 @@ subroutine med_phases_prep_wav_avg(gcomp, rc) end if call t_stopf('MED:'//subname) -#ifdef UFS_TRACING - if (maintask) call ufs_trace("cmeps", "med_phases_prep_wav_avg", "E") -#endif + if (maintask) call ufs_trace_wrapper("cmeps", "med_phases_prep_wav_avg", "E") end subroutine med_phases_prep_wav_avg end module med_phases_prep_wav_mod diff --git a/mediator/med_phases_restart_mod.F90 b/mediator/med_phases_restart_mod.F90 index 7105e776a..1a83a64ae 100644 --- a/mediator/med_phases_restart_mod.F90 +++ b/mediator/med_phases_restart_mod.F90 @@ -19,9 +19,7 @@ module med_phases_restart_mod use shr_is_restart_fh_mod , only : log_restart_fh #endif use shr_log_mod , only : shr_log_error -#ifdef UFS_TRACING - use ufs_trace_mod -#endif + use med_ufs_trace_wrapper_mod implicit none private @@ -201,9 +199,7 @@ subroutine med_phases_restart_write(gcomp, rc) character(len=*), parameter :: subname='(med_phases_restart_write)' !--------------------------------------- -#ifdef UFS_TRACING - if (maintask) call ufs_trace("cmeps", "med_phases_restart_write", "B") -#endif + if (maintask) call ufs_trace_wrapper("cmeps", "med_phases_restart_write", "B") call t_startf('MED:'//subname) if (dbug_flag > 5) then call ESMF_LogWrite(trim(subname)//": called", ESMF_LOGMSG_INFO) @@ -514,9 +510,7 @@ subroutine med_phases_restart_write(gcomp, rc) endif call t_stopf('MED:'//subname) -#ifdef UFS_TRACING - if (maintask) call ufs_trace("cmeps", "med_phases_restart_write", "E") -#endif + if (maintask) call ufs_trace_wrapper("cmeps", "med_phases_restart_write", "E") end subroutine med_phases_restart_write !=============================================================================== @@ -552,9 +546,7 @@ subroutine med_phases_restart_read(gcomp, rc) character(ESMF_MAXSTR) :: restart_pfile ! Local path to restart pointer filename character(len=*), parameter :: subname='(med_phases_restart_read)' !--------------------------------------- -#ifdef UFS_TRACING - if (maintask) call ufs_trace("cmeps", "med_phases_restart_read", "B") -#endif + if (maintask) call ufs_trace_wrapper("cmeps", "med_phases_restart_read", "B") call t_startf('MED:'//subname) call ESMF_LogWrite(trim(subname)//": called", ESMF_LOGMSG_INFO) rc = ESMF_SUCCESS @@ -673,9 +665,7 @@ subroutine med_phases_restart_read(gcomp, rc) call ESMF_LogWrite(trim(subname)//": done", ESMF_LOGMSG_INFO) call t_stopf('MED:'//subname) -#ifdef UFS_TRACING - if (maintask) call ufs_trace("cmeps", "med_phases_restart_read", "E") -#endif + if (maintask) call ufs_trace_wrapper("cmeps", "med_phases_restart_read", "E") end subroutine med_phases_restart_read !=============================================================================== diff --git a/mediator/med_ufs_trace_wrapper.F90 b/mediator/med_ufs_trace_wrapper.F90 new file mode 100644 index 000000000..bfdee39a3 --- /dev/null +++ b/mediator/med_ufs_trace_wrapper.F90 @@ -0,0 +1,38 @@ +module med_ufs_trace_wrapper_mod + +#ifdef UFS_TRACE + use ufs_trace_mod, only: ufs_trace_init, ufs_trace, ufs_trace_finalize +#endif + + implicit none + + private + + public ufs_trace_init_wrapper + public ufs_trace_wrapper + public ufs_trace_finalize_wrapper + +contains + + subroutine ufs_trace_init_wrapper() +#ifdef UFS_TRACE + call ufs_trace_init +#endif + return + end subroutine ufs_trace_init_wrapper + + subroutine ufs_trace_wrapper(component, routine, ph) + character(len=*), intent(in) :: component, routine, ph +#ifdef UFS_TRACE + call ufs_trace(component, routine, ph) +#endif + return + end subroutine ufs_trace_wrapper + + subroutine ufs_trace_finalize_wrapper() +#ifdef UFS_TRACE + call ufs_trace_finalize +#endif + end subroutine ufs_trace_finalize_wrapper + +end module med_ufs_trace_wrapper_mod From 9098970f0dc00eab9577411e9ed077f3c968325d Mon Sep 17 00:00:00 2001 From: Dusan Jovic Date: Mon, 22 Sep 2025 20:23:56 +0000 Subject: [PATCH 4/5] Fix 'tracing' ccpp macro. Should be UFS_TRACING not UFS_TRACE --- mediator/med_ufs_trace_wrapper.F90 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mediator/med_ufs_trace_wrapper.F90 b/mediator/med_ufs_trace_wrapper.F90 index bfdee39a3..8a0415a95 100644 --- a/mediator/med_ufs_trace_wrapper.F90 +++ b/mediator/med_ufs_trace_wrapper.F90 @@ -1,6 +1,6 @@ module med_ufs_trace_wrapper_mod -#ifdef UFS_TRACE +#ifdef UFS_TRACING use ufs_trace_mod, only: ufs_trace_init, ufs_trace, ufs_trace_finalize #endif @@ -15,7 +15,7 @@ module med_ufs_trace_wrapper_mod contains subroutine ufs_trace_init_wrapper() -#ifdef UFS_TRACE +#ifdef UFS_TRACING call ufs_trace_init #endif return @@ -23,14 +23,14 @@ end subroutine ufs_trace_init_wrapper subroutine ufs_trace_wrapper(component, routine, ph) character(len=*), intent(in) :: component, routine, ph -#ifdef UFS_TRACE +#ifdef UFS_TRACING call ufs_trace(component, routine, ph) #endif return end subroutine ufs_trace_wrapper subroutine ufs_trace_finalize_wrapper() -#ifdef UFS_TRACE +#ifdef UFS_TRACING call ufs_trace_finalize #endif end subroutine ufs_trace_finalize_wrapper From cd2e5fb96ee6fe91b1a33cd8f4d434cd0ec649c2 Mon Sep 17 00:00:00 2001 From: Dusan Jovic Date: Tue, 23 Sep 2025 13:44:10 +0000 Subject: [PATCH 5/5] Add the only clause for all med_ufs_trace_wrapper_mod use statements --- mediator/med.F90 | 2 +- mediator/med_phases_history_mod.F90 | 2 +- mediator/med_phases_ocnalb_mod.F90 | 2 +- mediator/med_phases_post_atm_mod.F90 | 2 +- mediator/med_phases_post_ice_mod.F90 | 2 +- mediator/med_phases_post_ocn_mod.F90 | 2 +- mediator/med_phases_post_wav_mod.F90 | 2 +- mediator/med_phases_prep_atm_mod.F90 | 2 +- mediator/med_phases_prep_ice_mod.F90 | 2 +- mediator/med_phases_prep_ocn_mod.F90 | 2 +- mediator/med_phases_prep_wav_mod.F90 | 2 +- mediator/med_phases_restart_mod.F90 | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/mediator/med.F90 b/mediator/med.F90 index 617fd1a43..2e59cf8a9 100644 --- a/mediator/med.F90 +++ b/mediator/med.F90 @@ -52,7 +52,7 @@ module MED use esmFldsExchange_hafs_mod , only : esmFldsExchange_hafs use med_phases_profile_mod , only : med_phases_profile_finalize use shr_log_mod , only : shr_log_error - use med_ufs_trace_wrapper_mod + use med_ufs_trace_wrapper_mod, only : ufs_trace_init_wrapper, ufs_trace_wrapper, ufs_trace_finalize_wrapper implicit none private diff --git a/mediator/med_phases_history_mod.F90 b/mediator/med_phases_history_mod.F90 index 25798807f..030725654 100644 --- a/mediator/med_phases_history_mod.F90 +++ b/mediator/med_phases_history_mod.F90 @@ -24,7 +24,7 @@ module med_phases_history_mod use perf_mod , only : t_startf, t_stopf use pio , only : file_desc_t use shr_log_mod , only : shr_log_error - use med_ufs_trace_wrapper_mod + use med_ufs_trace_wrapper_mod, only : ufs_trace_wrapper implicit none private diff --git a/mediator/med_phases_ocnalb_mod.F90 b/mediator/med_phases_ocnalb_mod.F90 index c0ef30bf9..5f247192d 100644 --- a/mediator/med_phases_ocnalb_mod.F90 +++ b/mediator/med_phases_ocnalb_mod.F90 @@ -11,7 +11,7 @@ module med_phases_ocnalb_mod use shr_orb_mod , only : shr_orb_cosz, shr_orb_decl use shr_orb_mod , only : shr_orb_params, SHR_ORB_UNDEF_INT, SHR_ORB_UNDEF_REAL use shr_log_mod , only : shr_log_unit, shr_log_error - use med_ufs_trace_wrapper_mod + use med_ufs_trace_wrapper_mod, only : ufs_trace_wrapper implicit none private diff --git a/mediator/med_phases_post_atm_mod.F90 b/mediator/med_phases_post_atm_mod.F90 index 85801796f..52651951a 100644 --- a/mediator/med_phases_post_atm_mod.F90 +++ b/mediator/med_phases_post_atm_mod.F90 @@ -35,7 +35,7 @@ subroutine med_phases_post_atm(gcomp, rc) use med_utils_mod , only : chkerr => med_utils_ChkErr use med_internalstate_mod , only : compocn, compatm, compice, complnd, compwav use perf_mod , only : t_startf, t_stopf - use med_ufs_trace_wrapper_mod + use med_ufs_trace_wrapper_mod, only : ufs_trace_wrapper ! input/output variables type(ESMF_GridComp) :: gcomp diff --git a/mediator/med_phases_post_ice_mod.F90 b/mediator/med_phases_post_ice_mod.F90 index dc21549d5..ff2ca2dca 100644 --- a/mediator/med_phases_post_ice_mod.F90 +++ b/mediator/med_phases_post_ice_mod.F90 @@ -32,7 +32,7 @@ subroutine med_phases_post_ice(gcomp, rc) use med_phases_history_mod, only : med_phases_history_write_comp use med_internalstate_mod , only : compice, compocn, compwav use perf_mod , only : t_startf, t_stopf - use med_ufs_trace_wrapper_mod + use med_ufs_trace_wrapper_mod, only : ufs_trace_wrapper ! input/output variables type(ESMF_GridComp) :: gcomp diff --git a/mediator/med_phases_post_ocn_mod.F90 b/mediator/med_phases_post_ocn_mod.F90 index 7a777e84b..cba5ce7b2 100644 --- a/mediator/med_phases_post_ocn_mod.F90 +++ b/mediator/med_phases_post_ocn_mod.F90 @@ -31,7 +31,7 @@ subroutine med_phases_post_ocn(gcomp, rc) use med_phases_history_mod , only : med_phases_history_write_comp use med_phases_prep_glc_mod , only : med_phases_prep_glc_accum_ocn use perf_mod , only : t_startf, t_stopf - use med_ufs_trace_wrapper_mod + use med_ufs_trace_wrapper_mod, only : ufs_trace_wrapper ! input/output variables type(ESMF_GridComp) :: gcomp diff --git a/mediator/med_phases_post_wav_mod.F90 b/mediator/med_phases_post_wav_mod.F90 index dbe74ee22..34b0d1677 100644 --- a/mediator/med_phases_post_wav_mod.F90 +++ b/mediator/med_phases_post_wav_mod.F90 @@ -27,7 +27,7 @@ subroutine med_phases_post_wav(gcomp, rc) use med_internalstate_mod , only : compwav, compatm, compocn, compice use med_phases_history_mod, only : med_phases_history_write_comp use perf_mod , only : t_startf, t_stopf - use med_ufs_trace_wrapper_mod + use med_ufs_trace_wrapper_mod, only : ufs_trace_wrapper ! input/output variables type(ESMF_GridComp) :: gcomp diff --git a/mediator/med_phases_prep_atm_mod.F90 b/mediator/med_phases_prep_atm_mod.F90 index b2e6a6b99..6fe283928 100644 --- a/mediator/med_phases_prep_atm_mod.F90 +++ b/mediator/med_phases_prep_atm_mod.F90 @@ -23,7 +23,7 @@ module med_phases_prep_atm_mod use perf_mod , only : t_startf, t_stopf use med_phases_aofluxes_mod, only : med_aofluxes_map_xgrid2agrid_output use med_phases_aofluxes_mod, only : med_aofluxes_map_ogrid2agrid_output - use med_ufs_trace_wrapper_mod + use med_ufs_trace_wrapper_mod, only : ufs_trace_wrapper implicit none private diff --git a/mediator/med_phases_prep_ice_mod.F90 b/mediator/med_phases_prep_ice_mod.F90 index f5342c33a..baaed9ff1 100644 --- a/mediator/med_phases_prep_ice_mod.F90 +++ b/mediator/med_phases_prep_ice_mod.F90 @@ -41,7 +41,7 @@ subroutine med_phases_prep_ice(gcomp, rc) use med_internalstate_mod , only : coupling_mode use esmFlds , only : med_fldList_GetFldListTo use perf_mod , only : t_startf, t_stopf - use med_ufs_trace_wrapper_mod + use med_ufs_trace_wrapper_mod, only : ufs_trace_wrapper ! input/output variables type(ESMF_GridComp) :: gcomp diff --git a/mediator/med_phases_prep_ocn_mod.F90 b/mediator/med_phases_prep_ocn_mod.F90 index f26921fc0..ebb6e99a9 100644 --- a/mediator/med_phases_prep_ocn_mod.F90 +++ b/mediator/med_phases_prep_ocn_mod.F90 @@ -23,7 +23,7 @@ module med_phases_prep_ocn_mod use esmFlds , only : med_fldList_GetfldListTo, med_fldlist_type use med_internalstate_mod , only : compocn, compatm, compice, coupling_mode use perf_mod , only : t_startf, t_stopf - use med_ufs_trace_wrapper_mod + use med_ufs_trace_wrapper_mod, only : ufs_trace_wrapper implicit none private diff --git a/mediator/med_phases_prep_wav_mod.F90 b/mediator/med_phases_prep_wav_mod.F90 index 805a0ba90..4f36c8df1 100644 --- a/mediator/med_phases_prep_wav_mod.F90 +++ b/mediator/med_phases_prep_wav_mod.F90 @@ -21,7 +21,7 @@ module med_phases_prep_wav_mod use esmFlds , only : med_fldList_GetfldListTo use med_internalstate_mod , only : compatm, compwav use perf_mod , only : t_startf, t_stopf - use med_ufs_trace_wrapper_mod + use med_ufs_trace_wrapper_mod, only : ufs_trace_wrapper implicit none private diff --git a/mediator/med_phases_restart_mod.F90 b/mediator/med_phases_restart_mod.F90 index 1a83a64ae..350fbe8ce 100644 --- a/mediator/med_phases_restart_mod.F90 +++ b/mediator/med_phases_restart_mod.F90 @@ -19,7 +19,7 @@ module med_phases_restart_mod use shr_is_restart_fh_mod , only : log_restart_fh #endif use shr_log_mod , only : shr_log_error - use med_ufs_trace_wrapper_mod + use med_ufs_trace_wrapper_mod, only : ufs_trace_wrapper implicit none private