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

add "polarcap" grid for cesm3 release #2716

Merged
merged 8 commits into from
Oct 30, 2024
Merged

add "polarcap" grid for cesm3 release #2716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
98404d8
added polarcap support for cesm3 release
adamrher Aug 20, 2024
cde3b24
added polarcap support for cesm3 release
adamrher Aug 20, 2024
218865d
Merge remote-tracking branch 'adamrher/ctsm.polarcap' into ctsm.polarcap
slevis-lmwg Oct 28, 2024
5ad106e
Remove clm50 physics support for the POLARCAP grid
slevis-lmwg Oct 28, 2024
7a9eb2c
Rm clm50 test from build-namelist_test; correct syntax error in xml file
slevis-lmwg Oct 28, 2024
a7ef2e5
Rm clm50 test from ctsm_sci test-suite
slevis-lmwg Oct 28, 2024
237b114
Correction to failure phase for four tests in ExpectedTestFails
slevis-lmwg Oct 29, 2024
db72132
Putting back code lost in updates, used in #2805 for tests to pass
slevis-lmwg Oct 29, 2024
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
26 changes: 25 additions & 1 deletion bld/unit_testers/build-namelist_test.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,6 +506,31 @@ sub cat_and_create_namelistinfile {
}
}
print "\n===============================================================================\n";
print "Test setting drv_flds_in fields in CAM, clm60 only";
print "=================================================================================\n";
foreach my $phys ( "clm6_0" ) {
$mode = "-phys $phys CAM_SETS_DRV_FLDS";
&make_config_cache($phys);
foreach my $options (
"--res ne0np4.POLARCAP.ne30x4 --mask tx0.1v2 -bgc sp -use_case 20thC_transient -namelist '&a start_ymd=19790101/' -lnd_tuning_mode ${phys}_cam7.0 --infile empty_user_nl_clm",
) {
&make_env_run( 'LND_SETS_DUST_EMIS_DRV_FLDS'=>"FALSE" );
eval{ system( "$bldnml --envxml_dir . $options > $tempfile 2>&1 " ); };
is( $@, '', "options: $options" );
$cfiles->checkfilesexist( "$options", $mode );
$cfiles->shownmldiff( "default", $mode );
if ( defined($opts{'compare'}) ) {
$cfiles->doNOTdodiffonfile( "$tempfile", "$options", $mode );
$cfiles->dodiffonfile( "lnd_in", "$options", $mode );
$cfiles->comparefiles( "$options", $mode, $opts{'compare'} );
}
if ( defined($opts{'generate'}) ) {
$cfiles->copyfiles( "$options", $mode );
}
&cleanup();
}
}
print "\n===============================================================================\n";
print "Test setting drv_flds_in fields in CAM";
print "=================================================================================\n";
foreach my $phys ( "clm5_0", "clm6_0" ) {
Expand All @@ -515,7 +540,6 @@ sub cat_and_create_namelistinfile {
"--res 1.9x2.5 --mask gx1v7 --bgc sp --use_case 20thC_transient --namelist '&a start_ymd=19790101/' --lnd_tuning_mode ${phys}_cam6.0 --infile empty_user_nl_clm",
"--res 1.9x2.5 --mask gx1v7 --bgc sp --use_case 20thC_transient --namelist '&a start_ymd=19790101/' --lnd_tuning_mode ${phys}_cam7.0 --infile empty_user_nl_clm",
"--res 1.9x2.5 --mask gx1v7 --bgc sp -no-crop --use_case 20thC_transient --namelist '&a start_ymd=19790101/' --lnd_tuning_mode ${phys}_cam7.0 --infile empty_user_nl_clm",
"--res ne0np4.POLARCAP.ne30x4 --mask tx0.1v2 -bgc sp -use_case 20thC_transient -namelist '&a start_ymd=19790101/' -lnd_tuning_mode ${phys}_cam7.0 --infile empty_user_nl_clm",
"--res ne0np4.ARCTIC.ne30x4 --mask tx0.1v2 -bgc sp -use_case 20thC_transient -namelist '&a start_ymd=19790101/' -lnd_tuning_mode ${phys}_cam7.0 --infile empty_user_nl_clm",
"--res ne0np4.ARCTICGRIS.ne30x8 --mask tx0.1v2 -bgc sp -use_case 20thC_transient -namelist '&a start_ymd=19790101/' -lnd_tuning_mode ${phys}_cam7.0 --infile empty_user_nl_clm",
"--res ne0np4CONUS.ne30x8 --mask tx0.1v2 -bgc sp -use_case 20thC_transient -namelist '&a start_ymd=20130101/' -lnd_tuning_mode ${phys}_cam7.0 --infile empty_user_nl_clm",
Expand Down
8 changes: 4 additions & 4 deletions cime_config/testdefs/ExpectedTestFails.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,25 +37,25 @@
</test>

<test name="SMS_Ld5.f09_g17.IHistClm50Sp.derecho_intel.clm-nofire">
<phase name="RUN">
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2784</issue>
</phase>
</test>
<test name="SMS_Ld5.f19_g17.IHistClm50Sp.derecho_intel.clm-nofire">
<phase name="RUN">
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2784</issue>
</phase>
</test>
<test name="SMS_Ld5.f09_g17.IHistClm60Sp.derecho_intel.clm-nofire">
<phase name="RUN">
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2784</issue>
</phase>
</test>
<test name="SMS_Ld5.f19_g17.IHistClm60Sp.derecho_intel.clm-nofire">
<phase name="RUN">
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2784</issue>
</phase>
Expand Down
13 changes: 1 addition & 12 deletions cime_config/testdefs/testlist_clm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2065,24 +2065,13 @@
<option name="comment" >Also --nofireemis because this is a SP compset</option>
</options>
</test>
<test name="SMS_Ln9" grid="ne0POLARCAPne30x4_ne0POLARCAPne30x4_mt12" compset="IHistClm50Sp" testmods="clm/clm50cam7LndTuningMode_1979Start--clm/nofireemis">
<machines>
<machine name="derecho" compiler="intel" category="ctsm_sci"/>
</machines>
<options>
<option name="wallclock">00:20:00</option>
<option name="comment" >Run POLARCAP for transient case starting in 1979 as for AMIP CAM cases (no need to run this high core count test with every tag, but include it in the less frequent ctsm_sci testing)"</option>
<option name="comment" >Clm50 because that is what CAM tests currently; remove when CAM tests for Clm60</option>
<option name="comment" >Also --nofireemis because this is a SP compset</option>
</options>
</test>
<test name="SMS_Ln9" grid="ne0POLARCAPne30x4_ne0POLARCAPne30x4_mt12" compset="IHistClm60Sp" testmods="clm/clm60cam7LndTuningMode_1979Start--clm/nofireemis">
<machines>
<machine name="derecho" compiler="intel" category="ctsm_sci"/>
</machines>
<options>
<option name="wallclock">00:20:00</option>
<option name="comment" >Repeat POLARCAP transient starting in 1979 for Clm60"</option>
<option name="comment" >Run POLARCAP for transient case starting in 1979 as for AMIP CAM cases (no need to run this high core count test with every tag, but include it in the less frequent ctsm_sci testing)"</option>
<option name="comment" >Also --nofireemis because this is a SP compset</option>
</options>
</test>
Expand Down
Loading