Merge pull request #2416 from ekluzek/merge-b4bdev-20240307

Merge b4bdev 20240307
ESCOMP · Mar 13, 2024 · ccbdeb0 · ccbdeb0
2 parents 194635c + 94795ed
commit ccbdeb0
Show file tree

Hide file tree

Showing 79 changed files with 1,329 additions and 281 deletions.
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -30,3 +30,4 @@ d866510188d26d51bcd6d37239283db690af7e82
 8a168bb0895f4f2421608dd2589398e13a6663e6
 183fc26a6691bbdf87f515dc47924a64be3ced9b
 6fccf682eaf718615407d9bacdd3903b8786a03d
+2500534eb0a83cc3aff94b30fb62e915054030bf
diff --git a/Externals.cfg b/Externals.cfg
@@ -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]
@@ -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
@@ -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
@@ -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
@@ -98,4 +98,4 @@ tag = v1.0.8
 required = False
 
 [externals_description]
-schema_version = 1.0.0
+schema_version = 1.0.0
diff --git a/bld/unit_testers/build-namelist_test.pl b/bld/unit_testers/build-namelist_test.pl
@@ -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 );
 
@@ -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";
 }
@@ -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 );
@@ -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'} );
    }
@@ -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'}) ) {
@@ -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'}) ) {
@@ -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'}) ) {
@@ -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'}) ) {
@@ -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'} );
    }
 
@@ -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'}) ) {
@@ -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'}) ) {
@@ -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'}) ) {
@@ -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" );

diff --git a/cime_config/testdefs/ExpectedTestFails.xml b/cime_config/testdefs/ExpectedTestFails.xml
@@ -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">
@@ -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>
@@ -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>

diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml
@@ -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"/>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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"/>
@@ -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>