Skip to content
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

Jump to bottom

Fix tests incompatitle with L80 and restore tentative config options for SSP #6054

Merged
merged 5 commits into from
Nov 16, 2023
Merged

Fix tests incompatitle with L80 and restore tentative config options for SSP #6054

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
336123b
Fix tests incompatitle with L80 and restore tentative config options …
wlin7 Nov 3, 2023
ae74855
Add default IC (ncdata) for ne120np4 with L80
wlin7 Nov 7, 2023
4951e07
Replace ne11_oQU240 WCYCL1850NS tests with ne4
wlin7 Nov 9, 2023
49e6d68
Change to use ne4pg2_oQU480 for WCYCL1850NS tests
wlin7 Nov 10, 2023
ee14d67
Implement an adaptable index as pver in condidiag nml
wlin7 Nov 14, 2023
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
3 changes: 3 additions & 0 deletions cime_config/testmods_dirs/allactive/wcprodssp/user_nl_eam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,6 @@
fincl5 = 'PRECT','PRECC','TUQ','TVQ','QFLX','SHFLX','U90M','V90M'
fincl6 = 'CLDTOT_ISCCP','MEANCLDALB_ISCCP','MEANTAU_ISCCP','MEANPTOP_ISCCP','MEANTB_ISCCP','CLDTOT_CAL','CLDTOT_CAL_LIQ','CLDTOT_CAL_ICE','CLDTOT_CAL_UN','CLDHGH_CAL','CLDHGH_CAL_LIQ','CLDHGH_CAL_ICE','CLDHGH_CAL_UN','CLDMED_CAL','CLDMED_CAL_LIQ','CLDMED_CAL_ICE','CLDMED_CAL_UN','CLDLOW_CAL','CLDLOW_CAL_LIQ','CLDLOW_CAL_ICE','CLDLOW_CAL_UN'
fincl7 = 'O3', 'PS', 'TROP_P'

! Specify an L80 IC to override eam.i from reference case, which is still for L72
ncdata = '$DIN_LOC_ROOT/atm/cam/inic/homme/eami_mam4_Linoz_ne30np4_L80_c20231010.nc'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it be better for me to generate a L80 version of the file from the reference case?
This is very easy to do, but would still be non-BFB.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was it already from a reference case for v3atm? I thought you did that. If not yet, yes, it would be nice to have. Note this is the same file you created for #5996.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yea, I guess it's fine to use this file. I'm just worried we will forget that this override is in place, but that's probably harmless.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we are moving to L80, the default ncdata should work and not need special namelist overrides.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It sounds like this test requires a reference case (which makes sense) which is not L72. That's why the override is used. The alternative is to remap the reference case data, but then we might still need an override to make sure the correct initial condition file is used (unless we hide the L72 version where CIME won't see it).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, the SSP tests are using a reference case (a restart point of a historical run). Since we don't have v3 historical with L80, and the reference case currently used is from v2, an override is needed for SSP tests to proceed in current code base. Much about the SSP tests will be dated once all are settled.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok reference case hasn't been made yet. Go ahead then with the override.

4 changes: 2 additions & 2 deletions cime_config/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,12 +288,12 @@
"inherit" : ("e3sm_developer", "e3sm_atm_integration", "e3sm_mmf_integration"),
"time" : "03:00:00",
"tests" : (
"ERS.ne11_oQU240.WCYCL1850NS",
"ERS.ne4pg2_oQU480.WCYCL1850NS",
"SMS_D_Ld1.ne30pg2_EC30to60E2r2.WCYCL1850.allactive-wcprod",
"SMS_D_Ld1.ne30pg2_EC30to60E2r2.WCYCLSSP370.allactive-wcprodssp",
"ERS_Ld3.ne4_oQU240.F2010",
#"ERT_Ld31.ne16_g37.B1850C5",#add this line back in with the new correct compset
"NCK.ne11_oQU240.WCYCL1850NS",
"NCK.ne4pg2_oQU480.WCYCL1850NS",
"PET.f19_g16.X.allactive-mach-pet",
"PET.f45_g37_rx1.A.allactive-mach-pet",
"PET_Ln9_PS.ne30pg2_EC30to60E2r2.WCYCL1850.allactive-mach-pet",
Expand Down
1 change: 1 addition & 0 deletions components/eam/bld/namelist_files/namelist_defaults_eam.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
<ncdata dyn="se" hgrid="ne30np4" nlev="128" ic_ymd="101" >atm/cam/inic/homme/cami_mam3_Linoz_ne30np4_SCREAM_L128_c160214.nc</ncdata>
<ncdata dyn="se" hgrid="ne45np4" nlev="72" ic_ymd="101" >atm/cam/inic/homme/cami_mam3_Linoz_ne45np4_L72_c20200611.nc</ncdata>
<ncdata dyn="se" hgrid="ne120np4" nlev="72" ic_ymd="101" >atm/cam/inic/homme/cami_mam3_Linoz_0000-01-ne120np4_L72_c160318.nc</ncdata>
<ncdata dyn="se" hgrid="ne120np4" nlev="80" ic_ymd="101" >atm/cam/inic/homme/eami_mam4_Linoz_ne120np4_L80_c20231010.nc</ncdata>

<!-- E3SMv3 Atmosphere Initial conditions -->
<ncdata dyn="se" hgrid="ne4np4" nlev="80" ic_ymd="101" >atm/cam/inic/homme/eami_mam4_Linoz_ne4np4_L80_c20231010.nc</ncdata>
Expand Down
1 change: 0 additions & 1 deletion components/eam/cime_config/config_component.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@

<value compset="" >-mach $MACH</value>
<value compset="_EAM" >-phys default</value>
<value compset="_EAM%CMIP6_" >&eamv3_phys_defaults; &eamv3_chem_defaults;</value>
whannah1 marked this conversation as resolved.
Show resolved Hide resolved
<value compset="_EAM%CMIP6-1pctCO2" >&eamv3_phys_defaults; &eamv3_chem_defaults;</value>
<value compset="_EAM%CMIP6-4xCO2" >&eamv3_phys_defaults; &eamv3_chem_defaults;</value>
<value compset="^((?!SSP).)*_EAM%CMIP6_" >&eamv3_phys_defaults; &eamv3_chem_defaults;</value>
Expand Down
2 changes: 1 addition & 1 deletion components/eam/cime_config/testdefs/testmods_dirs/eam/condidiag_dcape/user_nl_eam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
qoi_chkpt = 'RAD', 'PACEND','DYNEND','DEEPCU', 'STCLD',

qoi_name = 'CAPE','dCAPE'
qoi_nver = 1, 72,
qoi_nver = 1, -1,

l_output_state = .true.
l_output_incrm = .false.
Expand Down
4 changes: 2 additions & 2 deletions components/eam/cime_config/testdefs/testmods_dirs/eam/condidiag_rhi/user_nl_eam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
! - condition 2: all grid columns and time steps

metric_name = 'RHI', 'RHI',
metric_nver = 72, 72
metric_nver = -1, -1
metric_cmpr_type = 1, 1
metric_threshold = 125, -1
cnd_eval_chkpt = 'CLDMAC01', 'CLDMAC01'
Expand All @@ -18,7 +18,7 @@
'CLDMAC06','CLDMIC06'

qoi_name = 'RHI', 'Q', 'QSATI'
qoi_nver = 72, 72, 72
qoi_nver = -1, -1, -1

l_output_state = .true.
l_output_incrm = .true.
Expand Down
4 changes: 4 additions & 0 deletions components/eam/src/physics/cam/conditional_diag.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,8 @@ subroutine cnd_diag_readnl(nlfile)

end if
end do
! metric_nver = -1 read in from namelist should be interpreted as pver for flexible configuration
where ( metric_nver(1:ncnd) == -1 ) metric_nver(1:ncnd) = pver

if (any( metric_nver (1:ncnd) <= 0 )) call endrun(subname//' error: need positive metric_nver for each metric_name')
if (any( metric_cmpr_type(1:ncnd) == -99 )) call endrun(subname//' error: need valid metric_cmpr_type for each metric_name')
Expand All @@ -335,6 +337,8 @@ subroutine cnd_diag_readnl(nlfile)
end do
nqoi = ii

! qoi_nver = -1 read in from namelist should be interpreted as pver for flexible configuration
where ( qoi_nver(1:nqoi) == -1 ) qoi_nver(1:nqoi) = pver
if (any(qoi_nver(1:nqoi)<=0)) call endrun(subname//'error: need positive qoi_nver for each qoi_name')

!---------------------------------------------
Expand Down