Skip to content

Bug fixes for CESM 1850 mct/nuopc validation #195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jedwards4b merged 5 commits into from
Jun 1, 2021
Merged

Bug fixes for CESM 1850 mct/nuopc validation #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
275b1a4
fix initial diag counter
jedwards4b May 11, 2021
26da4e3
Merge remote-tracking branch 'jedwards/diag_counter_fix' into feature…
May 16, 2021
801724f
updated run sequence to fix diag problem for wmelt
May 16, 2021
f5a4123
fixes for memory leak
Jun 1, 2021
924b466
remove debug print statement
jedwards4b Jun 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions cime_config/runseq/runseq_general.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@ def gen_runseq(case, coupling_times):

runseq.add_action("MED med_phases_prep_ice" , med_to_ice)
runseq.add_action("MED -> ICE :remapMethod=redist" , med_to_ice)
runseq.add_action("MED med_phases_diag_ice_med2ice" , run_ice and diag_mode)

runseq.add_action("MED med_phases_prep_wav" , med_to_wav)
runseq.add_action("MED -> WAV :remapMethod=redist" , med_to_wav)
Expand Down Expand Up @@ -132,27 +131,28 @@ def gen_runseq(case, coupling_times):

runseq.add_action("LND -> MED :remapMethod=redist" , run_lnd)
runseq.add_action("MED med_phases_post_lnd" , run_lnd)
runseq.add_action("MED med_phases_diag_lnd" , run_lnd and diag_mode)
runseq.add_action("MED med_phases_diag_rof" , run_rof and diag_mode)
runseq.add_action("MED med_phases_diag_ice_ice2med" , run_ice and diag_mode)
runseq.add_action("MED med_phases_diag_glc" , run_glc and diag_mode)

runseq.add_action("ICE -> MED :remapMethod=redist" , run_ice)
runseq.add_action("MED med_phases_diag_ice_ice2med" , run_ice and diag_mode)
runseq.add_action("MED med_phases_post_ice" , run_ice)

runseq.add_action("MED med_phases_prep_atm" , med_to_atm)
runseq.add_action("MED -> ATM :remapMethod=redist" , med_to_atm)
runseq.add_action("ATM" , run_atm)
runseq.add_action("ATM -> MED :remapMethod=redist" , run_atm)
runseq.add_action("MED med_phases_post_atm" , run_atm)
runseq.add_action("MED med_phases_diag_atm" , run_atm and diag_mode)
runseq.add_action("MED med_phases_diag_ice_med2ice" , run_ice and diag_mode)

runseq.add_action("WAV -> MED :remapMethod=redist", run_wav)
runseq.add_action("MED med_phases_post_wav" , run_wav)

runseq.add_action("ROF -> MED :remapMethod=redist", run_rof and not rof_outer_loop)
runseq.add_action("MED med_phases_post_rof" , run_rof and not rof_outer_loop)

runseq.add_action("MED med_phases_diag_atm" , run_atm and diag_mode)
runseq.add_action("MED med_phases_diag_lnd" , run_lnd and diag_mode)
runseq.add_action("MED med_phases_diag_rof" , run_rof and diag_mode)
runseq.add_action("MED med_phases_diag_glc" , run_glc and diag_mode)
runseq.add_action("MED med_phases_diag_accum" , diag_mode)
runseq.add_action("MED med_phases_diag_print" , diag_mode)

Expand Down
7 changes: 4 additions & 3 deletions mediator/med.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -664,7 +664,7 @@ subroutine InitializeIPDv03p1(gcomp, importState, exportState, clock, rc)
! TransferOfferGeomObject Attribute.

use ESMF , only : ESMF_GridComp, ESMF_State, ESMF_Clock, ESMF_SUCCESS, ESMF_LogFoundAllocError
use ESMF , only : ESMF_StateIsCreated
use ESMF , only : ESMF_StateIsCreated
use ESMF , only : ESMF_LogMsg_Info, ESMF_LogWrite
use ESMF , only : ESMF_END_ABORT, ESMF_Finalize
use NUOPC , only : NUOPC_AddNamespace, NUOPC_Advertise, NUOPC_AddNestedState
Expand Down Expand Up @@ -2435,7 +2435,8 @@ subroutine DataInitialize(gcomp, rc)
!---------------------------------------
call med_diag_init(gcomp, rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
call med_diag_zero('all', rc=rc)
call med_diag_zero(mode='all', rc=rc)

if (ChkErr(rc,__LINE__,u_FILE_u)) return

!---------------------------------------
Expand Down Expand Up @@ -2492,7 +2493,7 @@ subroutine DataInitialize(gcomp, rc)
end if

call med_phases_profile(gcomp, rc)

if (ChkErr(rc,__LINE__,u_FILE_u)) return
else ! Not all done
call NUOPC_CompAttributeSet(gcomp, name="InitializeDataComplete", value="false", rc=rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
Expand Down
Loading