Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
fc4972e
Update to what we expect cesm2_3_beta17 externals will be, fixing #2351
ekluzek Feb 21, 2024
44929cb
Squashed 'manage_externals/' changes from 7b6d92ef6..0f884bfec
ekluzek Feb 21, 2024
2063748
Merge commit '44929cb871313730678ab52a3fd6a7e22d25dc5b' into b4b-dev
ekluzek Feb 21, 2024
c395267
Update expected fails to remove tests that I now expect to pass
ekluzek Feb 21, 2024
19d39d9
Add back intel/debug with mpi-serial tests on Derecho as they should …
ekluzek Feb 21, 2024
76c23ec
Changes to remove difference in CGD conda environment vs Derecho, als…
ekluzek Feb 21, 2024
df6d9af
Fix queue for Derecho which should be unspecified, the derecho queues…
ekluzek Feb 22, 2024
d40ccf4
Merge tag 'ctsm5.1.dev169' into merge-master-20240222
samsrabin Feb 22, 2024
69f3cc7
Merge pull request #2383 from samsrabin/merge-master-20240222
samsrabin Feb 22, 2024
5f5e12e
Update to a cime branch that fixes the ERI test issues
ekluzek Feb 23, 2024
001829b
Update to the tag on the CESM branch of cime that fixes the ERI problem
ekluzek Feb 23, 2024
7cf25f5
Merge remote-tracking branch 'escomp/b4b-dev' into cesm23beta17externlas
ekluzek Feb 23, 2024
43c58e2
conf.py: Change add_stylesheet() to add_css_file().
samsrabin Feb 26, 2024
82db210
Fix a table in Methane tech note.
samsrabin Feb 26, 2024
ca6237a
Include tillage page in Running Special Cases.
samsrabin Feb 26, 2024
76e2d70
Update Running With Tillage to reflect default "low" setting.
samsrabin Feb 26, 2024
f50a634
Merge pull request #2389 from samsrabin/docs-update-20240226
samsrabin Feb 26, 2024
6b66e68
Run 'git lfs install' in 'make fetch-images'.
samsrabin Feb 29, 2024
14ad3e3
Fix filenames in running-special-cases/.
samsrabin Feb 29, 2024
c858aed
Remove duplicates of mpi-serial DEBUG tests for Derecho with intel AN…
ekluzek Mar 5, 2024
321dcc3
Merge remote-tracking branch 'escomp/b4b-dev' into cesm23beta17externlas
ekluzek Mar 5, 2024
c5a2d53
Merge pull request #2394 from samsrabin/fetch-images-installs-git-lfs
samsrabin Mar 5, 2024
c1cca33
Merge branch 'b4b-dev' of github.com:ESCOMP/CTSM into cesm23beta17ext…
ekluzek Mar 5, 2024
851cc2e
Merge pull request #2385 from ekluzek/cesm23beta17externlas
ekluzek Mar 5, 2024
0dd117d
Tech Note: Update and simplify text in Harvest section.
samsrabin Mar 2, 2024
bf2244d
Explain reasoning behind default 50% residue removal.
samsrabin Mar 2, 2024
96369dd
Clarify units of biofuel_harvfrac.
samsrabin Mar 2, 2024
ac6a415
Mention residue removal in "changes since CLM5."
samsrabin Mar 2, 2024
dac9bad
Merge pull request #2396 from samsrabin/explain-residue-removal-50pct
samsrabin Mar 6, 2024
395fdc2
Merge tag 'ctsm5.1.dev171' into merge-b4bdev-20240307
ekluzek Mar 7, 2024
16049e6
Fix the number of tests
ekluzek Mar 8, 2024
99d5424
Turn off the user_nl_clm_real_parameter files and testing for it as n…
ekluzek Mar 9, 2024
6812720
Save the current directory at setup and return to it before deleting …
ekluzek Mar 7, 2024
20e3e7a
Update to cime branch tag that fixes the LILAC python test problem
ekluzek Mar 12, 2024
605addb
Simple check for removing current directory resolving #2412 in a simp…
ekluzek Mar 13, 2024
26481f2
Add some extra checking
ekluzek Mar 13, 2024
2500534
Run through black
ekluzek Mar 13, 2024
29c4fb9
Add black commit to blame list
ekluzek Mar 13, 2024
94795ed
Update Change files
ekluzek Mar 13, 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
1 change: 1 addition & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,4 @@ d866510188d26d51bcd6d37239283db690af7e82
8a168bb0895f4f2421608dd2589398e13a6663e6
183fc26a6691bbdf87f515dc47924a64be3ced9b
6fccf682eaf718615407d9bacdd3903b8786a03d
2500534eb0a83cc3aff94b30fb62e915054030bf
18 changes: 9 additions & 9 deletions Externals.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,22 @@ required = True
local_path = components/cism
protocol = git
repo_url = https://github.com/ESCOMP/CISM-wrapper
tag = cismwrap_2_1_96
tag = cismwrap_2_1_97
externals = Externals_CISM.cfg
required = True

[rtm]
local_path = components/rtm
protocol = git
repo_url = https://github.com/ESCOMP/RTM
tag = rtm1_0_78
tag = rtm1_0_79
required = True

[mosart]
local_path = components/mosart
protocol = git
repo_url = https://github.com/ESCOMP/MOSART
tag = mosart1_0_48
tag = mosart1_0_49
required = True

[mizuRoute]
Expand All @@ -34,7 +34,7 @@ hash = 34723c2
required = True

[ccs_config]
tag = ccs_config_cesm0.0.84
tag = ccs_config_cesm0.0.92
protocol = git
repo_url = https://github.com/ESMCI/ccs_config_cesm.git
local_path = ccs_config
Expand All @@ -44,18 +44,18 @@ required = True
local_path = cime
protocol = git
repo_url = https://github.com/ESMCI/cime
tag = cime6.0.175
tag = cime6.0.217_httpsbranch03
required = True

[cmeps]
tag = cmeps0.14.43
tag = cmeps0.14.50
protocol = git
repo_url = https://github.com/ESCOMP/CMEPS.git
local_path = components/cmeps
required = True

[cdeps]
tag = cdeps1.0.24
tag = cdeps1.0.28
protocol = git
repo_url = https://github.com/ESCOMP/CDEPS.git
local_path = components/cdeps
Expand All @@ -70,7 +70,7 @@ local_path = components/cpl7
required = True

[share]
tag = share1.0.17
tag = share1.0.18
protocol = git
repo_url = https://github.com/ESCOMP/CESM_share
local_path = share
Expand Down Expand Up @@ -98,4 +98,4 @@ tag = v1.0.8
required = False

[externals_description]
schema_version = 1.0.0
schema_version = 1.0.0
20 changes: 4 additions & 16 deletions bld/unit_testers/build-namelist_test.pl
Original file line number Diff line number Diff line change
Expand Up @@ -163,10 +163,10 @@ sub cat_and_create_namelistinfile {
#
# Figure out number of tests that will run
#
my $ntests = 1999;
my $ntests = 1549;

if ( defined($opts{'compare'}) ) {
$ntests += 1353;
$ntests += 907;
}
plan( tests=>$ntests );

Expand All @@ -190,8 +190,7 @@ sub cat_and_create_namelistinfile {
&make_config_cache($phys);

my $DOMFILE = "$inputdata_rootdir/atm/datm7/domain.lnd.T31_gx3v7.090928.nc";
my $real_par_file = "user_nl_ctsm_real_parameters";
my $bldnml = "../build-namelist -verbose -csmdata $inputdata_rootdir -configuration clm -structure standard -glc_nec 10 -no-note -output_reals $real_par_file";
my $bldnml = "../build-namelist -verbose -csmdata $inputdata_rootdir -configuration clm -structure standard -glc_nec 10 -no-note";
if ( $opts{'test'} ) {
$bldnml .= " -test";
}
Expand All @@ -201,7 +200,7 @@ sub cat_and_create_namelistinfile {
system( "/bin/rm $tempfile" );
}

my @files = ( "lnd_in", $tempfile, $real_par_file );
my @files = ( "lnd_in", $tempfile );
my $cwd = `pwd`;
chomp( $cwd );
my $cfiles = NMLTest::CompFiles->new( $cwd, @files );
Expand Down Expand Up @@ -269,13 +268,11 @@ sub cat_and_create_namelistinfile {
$cfiles->copyfiles( "most_options", $mode );
# Compare to default
$cfiles->doNOTdodiffonfile( "lnd_in", "default", $mode );
$cfiles->doNOTdodiffonfile( "$real_par_file", "default", $mode );
$cfiles->doNOTdodiffonfile( "$tempfile", "default", $mode );
$cfiles->comparefiles( "default", $mode );
# Compare to baseline
if ( defined($opts{'compare'}) ) {
$cfiles->dodiffonfile( "lnd_in", "most_options", $mode );
$cfiles->dodiffonfile( "$real_par_file", "most_options", $mode );
$cfiles->doNOTdodiffonfile( "$tempfile", "most_options", $mode );
$cfiles->comparefiles( "most_options", $mode, $opts{'compare'} );
}
Expand Down Expand Up @@ -358,7 +355,6 @@ sub cat_and_create_namelistinfile {
}
if ( defined($opts{'compare'}) ) {
$cfiles->doNOTdodiffonfile( "$tempfile", "$base_options $options", $mode );
$cfiles->dodiffonfile( "$real_par_file", "$base_options $options", $mode );
$cfiles->comparefiles( "$base_options $options", $mode, $opts{'compare'} );
}
if ( defined($opts{'generate'}) ) {
Expand Down Expand Up @@ -408,7 +404,6 @@ sub cat_and_create_namelistinfile {
if ( defined($opts{'compare'}) ) {
$cfiles->doNOTdodiffonfile( "$tempfile", "$options", $mode );
$cfiles->dodiffonfile( "lnd_in", "$options", $mode );
$cfiles->dodiffonfile( "$real_par_file", "$options", $mode );
$cfiles->comparefiles( "$options", $mode, $opts{'compare'} );
}
if ( defined($opts{'generate'}) ) {
Expand Down Expand Up @@ -445,7 +440,6 @@ sub cat_and_create_namelistinfile {
if ( defined($opts{'compare'}) ) {
$cfiles->doNOTdodiffonfile( "$tempfile", "$options", $mode );
$cfiles->dodiffonfile( "lnd_in", "$options", $mode );
$cfiles->dodiffonfile( "$real_par_file", "$options", $mode );
$cfiles->comparefiles( "$options", $mode, $opts{'compare'} );
}
if ( defined($opts{'generate'}) ) {
Expand Down Expand Up @@ -486,7 +480,6 @@ sub cat_and_create_namelistinfile {
if ( defined($opts{'compare'}) ) {
$cfiles->doNOTdodiffonfile( "$tempfile", "$options", $mode );
$cfiles->dodiffonfile( "lnd_in", "$options", $mode );
$cfiles->dodiffonfile( "$real_par_file", "$options", $mode );
$cfiles->comparefiles( "$options", $mode, $opts{'compare'} );
}
if ( defined($opts{'generate'}) ) {
Expand Down Expand Up @@ -1388,7 +1381,6 @@ sub cat_and_create_namelistinfile {
$cfiles->shownmldiff( "default", "standard" );
if ( defined($opts{'compare'}) ) {
$cfiles->doNOTdodiffonfile( "$tempfile", "$options", $mode );
$cfiles->dodiffonfile( "$real_par_file", "$options", $mode );
$cfiles->comparefiles( "$options", $mode, $opts{'compare'} );
}

Expand Down Expand Up @@ -1473,7 +1465,6 @@ sub cat_and_create_namelistinfile {
$cfiles->shownmldiff( "default", "standard" );
if ( defined($opts{'compare'}) ) {
$cfiles->doNOTdodiffonfile( "$tempfile", "$options", $mode );
$cfiles->dodiffonfile( "$real_par_file", "$options", $mode );
$cfiles->comparefiles( "$options", $mode, $opts{'compare'} );
}
if ( defined($opts{'generate'}) ) {
Expand Down Expand Up @@ -1547,7 +1538,6 @@ sub cat_and_create_namelistinfile {
$cfiles->shownmldiff( "default", "standard" );
if ( defined($opts{'compare'}) ) {
$cfiles->doNOTdodiffonfile( "$tempfile", "$options", $mode );
$cfiles->dodiffonfile( "$real_par_file", "$options", $mode );
$cfiles->comparefiles( "$options", $mode, $opts{'compare'} );
}
if ( defined($opts{'generate'}) ) {
Expand All @@ -1574,7 +1564,6 @@ sub cat_and_create_namelistinfile {
$cfiles->shownmldiff( "default", "standard" );
if ( defined($opts{'compare'}) ) {
$cfiles->doNOTdodiffonfile( "$tempfile", "$options", $mode );
$cfiles->dodiffonfile( "$real_par_file", "$options", $mode );
$cfiles->comparefiles( "$options", $mode, $opts{'compare'} );
}
if ( defined($opts{'generate'}) ) {
Expand Down Expand Up @@ -1757,7 +1746,6 @@ sub cleanup {
my $type = shift;

print "Cleanup files created\n";
system( "/bin/rm env_run.xml $real_par_file" );
if ( defined($type) ) {
if ( $type eq "config" ) {
system( "/bin/rm config_cache.xml" );
Expand Down
55 changes: 0 additions & 55 deletions cime_config/testdefs/ExpectedTestFails.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,6 @@


<!-- cesm3_dev test suite failures -->
<test name="ERP_D_Ld9.ne30pg3_t232.IHistClm51BgcCrop.derecho_intel.clm-clm51cam6LndTuningMode">
<phase name="RUN">
<status>FAIL</status>
<issue>#2268</issue>
</phase>
</test>

<!-- aux_clm test suite failures -->
<test name="SMS_D_Ld1_Mmpi-serial_Vmct.f45_f45_mg37.I2000Clm50SpRs.izumi_gnu.clm-ptsRLA">
Expand All @@ -58,41 +52,6 @@
</phase>
</test>

<test name="FUNITCTSM_P1x1.f10_f10_mg37.I2000Clm50Sp.derecho_intel">
<phase name="RUN">
<status>FAIL</status>
<issue>ESMCI/ccs_config_cesm#131</issue>
</phase>
</test>

<test name="ERS_D_Mmpi-serial_Ld5.5x5_amazon.I2000Clm50FatesRs.derecho_intel.clm-FatesCold">
<phase name="MODEL_BUILD">
<status>FAIL</status>
<issue>ESMCI/ccs_config_cesm#130</issue>
</phase>
</test>

<test name="ERS_D_Mmpi-serial_Ld5.5x5_amazon.I2000Clm51FatesRs.derecho_intel.clm-FatesCold">
<phase name="MODEL_BUILD">
<status>FAIL</status>
<issue>ESMCI/ccs_config_cesm#130</issue>
</phase>
</test>

<test name="SMS_D_Ld1_Mmpi-serial.f45_f45_mg37.I2000Clm50SpRs.derecho_intel.clm-ptsRLA">
<phase name="MODEL_BUILD">
<status>FAIL</status>
<issue>ESMCI/ccs_config_cesm#130</issue>
</phase>
</test>

<test name="SMS_D_Lm1_Mmpi-serial.CLM_USRDAT.I1PtClm50SpRs.derecho_intel.clm-USUMB_nuopc">
<phase name="MODEL_BUILD">
<status>FAIL</status>
<issue>ESMCI/ccs_config_cesm#130</issue>
</phase>
</test>

<test name="SMS_Ld10_D_Mmpi-serial.CLM_USRDAT.I1PtClm51Bgc.derecho_gnu.clm-default--clm-NEON-NIWO">
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
Expand Down Expand Up @@ -199,20 +158,6 @@
</phase>
</test>

<test name="ERS_D_Mmpi-serial_Ld5.1x1_brazil.I2000Clm50FatesCruRsGs.derecho_intel.clm-FatesCold">
<phase name="MODEL_BUILD">
<status>FAIL</status>
<issue>ESMCI/ccs_config_cesm#130</issue>
</phase>
</test>

<test name="SMS_Lm3_D_Mmpi-serial.1x1_brazil.I2000Clm50FatesCruRsGs.derecho_intel.clm-FatesColdHydro">
<phase name="MODEL_BUILD">
<status>FAIL</status>
<issue>ESMCI/ccs_config_cesm#130</issue>
</phase>
</test>

<test name="ERS_D_Ld30.f45_f45_mg37.I2000Clm50FatesCruRsGs.izumi_nag.clm-FatesColdPRT2">
<phase name="RUN">
<status>PEND</status>
Expand Down
37 changes: 0 additions & 37 deletions cime_config/testdefs/testlist_clm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1984,12 +1984,8 @@
<test name="SMS_D_Ld1_Mmpi-serial" grid="f45_f45_mg37" compset="I2000Clm50SpRs" testmods="clm/ptsRLA">
<machines>
<machine name="cheyenne" compiler="intel" category="aux_clm"/>
<!-- Until Derecho works with intel/Debug use gnu
<machine name="derecho" compiler="intel" category="aux_clm"/>
<machine name="derecho" compiler="intel" category="prealpha"/>
-->
<machine name="derecho" compiler="gnu" category="aux_clm"/>
<machine name="derecho" compiler="gnu" category="prealpha"/>
<machine name="izumi" compiler="gnu" category="aux_clm"/>
<machine name="izumi" compiler="nag" category="aux_clm"/>
<machine name="cheyenne" compiler="intel" category="prealpha"/>
Expand Down Expand Up @@ -2108,9 +2104,6 @@
</test>
<test name="SMS_Ld10_D_Mmpi-serial" grid="CLM_USRDAT" compset="I1PtClm51Bgc" testmods="clm/default--clm/NEON/NIWO">
<machines>
<!-- Until Derecho works with intel/Debug use gnu
<machine name="derecho" compiler="intel" category="aux_clm"/>
-->
<machine name="derecho" compiler="gnu" category="aux_clm"/>
<machine name="izumi" compiler="nag" category="aux_clm"/>
</machines>
Expand All @@ -2123,10 +2116,7 @@
<test name="SMS_Ld10_D_Mmpi-serial" grid="CLM_USRDAT" compset="I1PtClm51SpRs" testmods="clm/default--clm/NEON/TOOL">
<machines>
<machine name="izumi" compiler="nag" category="aux_clm"/>
<!-- Until Derecho works with intel/Debug use gnu
<machine name="derecho" compiler="intel" category="aux_clm"/>
-->
<machine name="derecho" compiler="gnu" category="aux_clm"/>
</machines>
<options>
<option name="wallclock">00:20:00</option>
Expand All @@ -2137,9 +2127,6 @@
<test name="SMS_Ld10_D_Mmpi-serial" grid="CLM_USRDAT" compset="I1PtClm51Bgc" testmods="clm/NEON/MOAB--clm/PRISM">
<machines>
<machine name="izumi" compiler="nag" category="aux_clm"/>
<!-- Until Derecho works with intel/Debug use gnu
<machine name="derecho" compiler="intel" category="aux_clm"/>
-->
<machine name="derecho" compiler="gnu" category="aux_clm"/>
</machines>
<options>
Expand Down Expand Up @@ -2174,12 +2161,8 @@

<test name="SMS_Ld10_D_Mmpi-serial" grid="CLM_USRDAT" compset="I1PtClm51Fates" testmods="clm/FatesFireLightningPopDens--clm/NEON/FATES/NIWO">
<machines>
<!-- Until Derecho works with intel/Debug use gnu
<machine name="derecho" compiler="intel" category="aux_clm"/>
<machine name="derecho" compiler="intel" category="fates"/>
-->
<machine name="derecho" compiler="gnu" category="aux_clm"/>
<machine name="derecho" compiler="gnu" category="fates"/>
<machine name="izumi" compiler="nag" category="aux_clm"/>
<machine name="izumi" compiler="nag" category="fates"/>
</machines>
Expand All @@ -2193,10 +2176,6 @@
<machines>
<machine name="izumi" compiler="nag" category="aux_clm"/>
<machine name="izumi" compiler="nag" category="fates"/>
<!-- Until Derecho works with intel/Debug use gnu
<machine name="derecho" compiler="intel" category="aux_clm"/>
<machine name="derecho" compiler="intel" category="fates"/>
-->
<machine name="derecho" compiler="gnu" category="aux_clm"/>
<machine name="derecho" compiler="gnu" category="fates"/>
</machines>
Expand All @@ -2209,10 +2188,7 @@
<test name="SMS_D_Lm1_Mmpi-serial" grid="CLM_USRDAT" compset="I1PtClm50SpRs" testmods="clm/USUMB_nuopc">
<machines>
<machine name="cheyenne" compiler="intel" category="aux_clm"/>
<!-- Have one mpi-serial DEBUG intel test that is expected to fail-->
<machine name="derecho" compiler="intel" category="aux_clm"/>
<!-- Also have the gnu test that should pass -->
<machine name="derecho" compiler="gnu" category="aux_clm"/>
</machines>
<options>
<option name="wallclock">00:20:00</option>
Expand Down Expand Up @@ -2604,10 +2580,6 @@
<machines>
<machine name="cheyenne" compiler="intel" category="aux_clm"/>
<machine name="cheyenne" compiler="intel" category="prebeta"/>
<!-- Until Derecho works with intel/Debug use gnu
<machine name="derecho" compiler="intel" category="aux_clm"/>
<machine name="derecho" compiler="intel" category="prebeta"/>
-->
<machine name="derecho" compiler="gnu" category="aux_clm"/>
<machine name="derecho" compiler="gnu" category="prebeta"/>
</machines>
Expand All @@ -2627,10 +2599,7 @@
<test name="ERS_D_Mmpi-serial_Ld5" grid="5x5_amazon" compset="I2000Clm51FatesRs" testmods="clm/FatesCold">
<machines>
<machine name="cheyenne" compiler="intel" category="aux_clm"/>
<!-- Until Derecho works with intel/Debug use gnu
<machine name="derecho" compiler="intel" category="aux_clm"/>
-->
<machine name="derecho" compiler="gnu" category="aux_clm"/>
</machines>
<options>
<option name="wallclock">00:20:00</option>
Expand Down Expand Up @@ -2965,9 +2934,6 @@
<test name="ERS_D_Mmpi-serial_Ld5" grid="1x1_brazil" compset="I2000Clm50FatesCruRsGs" testmods="clm/FatesCold">
<machines>
<machine name="cheyenne" compiler="intel" category="fates"/>
<!-- Until Derecho works with intel/Debug use gnu
<machine name="derecho" compiler="intel" category="fates"/>
-->
<machine name="derecho" compiler="gnu" category="fates"/>
<machine name="izumi" compiler="nag" category="fates"/>
<machine name="lawrencium-lr3" compiler="intel" category="fates"/>
Expand All @@ -2994,10 +2960,7 @@
<machines>
<machine name="izumi" compiler="intel" category="aux_clm"/>
<machine name="cheyenne" compiler="intel" category="fates"/>
<!-- Until Derecho works with intel/Debug use gnu
<machine name="derecho" compiler="intel" category="fates"/>
-->
<machine name="derecho" compiler="gnu" category="fates"/>
<machine name="izumi" compiler="nag" category="fates"/>
</machines>
<options>
Expand Down
Loading