Skip to content

Fix nvhpc issue in #663 by moving chkErr use statement to the module level #668

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

Open
ekluzek wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix nvhpc issue in #663 by moving chkErr use statement to the module level #668

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8dda461
Fix nvhpc test fails, chkErr needed to be higher up at the module lev…
ekluzek Jun 30, 2026
3b1fba9
Add a FATES test for several compilers
ekluzek Jul 1, 2026
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
20 changes: 18 additions & 2 deletions cime_config/testdefs/testlist_drv.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,22 +195,38 @@
<option name="wallclock"> 00:20:00 </option>
</options>
</test>
<test compset="I1850Clm50SpG" grid="f10_f10_mg37" name="ERS_Lm13_P32">
<test compset="I1850Clm50SpG" grid="f10_f10_mg37" name="ERS_Lm13">
<machines>
<machine name="derecho" compiler="nvhpc" category="aux_cmeps"/>
<machine name="izumi" compiler="intel" category="aux_cmeps"/>
</machines>
<options>
<option name="wallclock"> 00:20:00 </option>
<option name="comment">Multi month restart test with CLM-SP and active GLC model CISM"</option>
</options>
</test>
<test compset="I2000Clm50BgcCropRtm" grid="f10_f10_mg37" name="SMS_D_Ld5_P32" testmods="rtm/default">
<test compset="I2000Clm50BgcCropRtm" grid="f10_f10_mg37" name="SMS_D_Ld5" testmods="rtm/default">
<machines>
<machine name="derecho" compiler="gnu" category="aux_cmeps"/>
<machine name="derecho" compiler="intel" category="aux_cmeps"/>
<machine name="derecho" compiler="nvhpc" category="aux_cmeps"/>
<machine name="izumi" compiler="nag" category="aux_cmeps"/>
</machines>
<options>
<option name="wallclock"> 00:20:00 </option>
<option name="comment">DEBUG full CLM BGC-Crop case using RTM with extra RTM output, most compilers"</option>
</options>
</test>
<test compset="I2000Clm60FatesSpRsGs" grid="f45_f45_mg37" name="SMS" testmods="clm-FatesColdSatPhen">
<machines>
<machine name="derecho" compiler="gnu" category="aux_cmeps"/>
<machine name="derecho" compiler="intel" category="aux_cmeps"/>
<machine name="derecho" compiler="nvhpc" category="aux_cmeps"/>
<machine name="izumi" compiler="nag" category="aux_cmeps"/>
</machines>
<options>
<option name="wallclock"> 00:20:00 </option>
<option name="comment">Test of FATES-SP without DEBUG on for most compilers</option>
</options>
</test>

Expand Down
2 changes: 1 addition & 1 deletion mediator/esmFldsExchange_cesm_mod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ module esmFldsExchange_cesm_mod
use med_internalstate_mod , only : mrg_fracname_lnd2atm_state, mrg_fracname_lnd2atm_flux, map_fracname_lnd2atm
use med_internalstate_mod , only : mrg_fracname_lnd2rof, map_fracname_lnd2rof
use med_internalstate_mod , only : mrg_fracname_lnd2glc, map_fracname_lnd2glc
use med_utils_mod , only : chkerr => med_utils_chKerr
use shr_log_mod , only : shr_log_error
use wtracers_mod , only : wtracers_present
use wtracers_mod , only : WTRACERS_SUFFIX
Expand Down Expand Up @@ -121,7 +122,6 @@ subroutine esmFldsExchange_cesm(gcomp, phase, rc)
use ESMF
use NUOPC
use med_kind_mod , only : CX=>SHR_KIND_CX, CS=>SHR_KIND_CS, CL=>SHR_KIND_CL, R8=>SHR_KIND_R8
use med_utils_mod , only : chkerr => med_utils_chkerr
use med_methods_mod , only : fldchk => med_methods_FB_FldChk
use med_internalstate_mod , only : InternalState, logunit, maintask
use med_internalstate_mod , only : compmed, compatm, complnd, compocn
Expand Down
Loading