Merge branch 'origin/maint-3.0' into next (PR #6777)

Bring changes from maint-3.0 to master. These include Modifications to pe-layouts on anvil and improv for v3 cases. Several updates to the moab coupler including: Simplify the land grid instantiation for moab driver fix errors related to aream initialization for rof model Add a moab coupler developer test suite and fix bugs found by that suite [BFB]
E3SM-Project · Nov 25, 2024 · 5d50ba3 · 5d50ba3
2 parents 0a645be + 0e747dc
commit 5d50ba3
Show file tree

Hide file tree

Showing 17 changed files with 798 additions and 669 deletions.
diff --git a/.github/workflows/e3sm-gh-ci-cime-tests.yml b/.github/workflows/e3sm-gh-ci-cime-tests.yml
@@ -2,7 +2,9 @@ name: gh
 
 on:
   pull_request:
-    branches: [ master ]
+    branches: 
+      - master
+      - maint-3.0
     paths:
       # first, yes to these
       - '.github/workflows/e3sm-gh-ci-cime-tests.yml'

diff --git a/.github/workflows/e3sm-gh-ci-w-cime-tests.yml b/.github/workflows/e3sm-gh-ci-w-cime-tests.yml
@@ -2,7 +2,9 @@ name: gh-w
 
 on:
   pull_request:
-    branches: [ master ]
+    branches: 
+      - master
+      - maint-3.0
     paths-ignore:
       - 'mkdocs.yaml'
       - 'docs/**'

diff --git a/cime_config/allactive/config_pesall.xml b/cime_config/allactive/config_pesall.xml
@@ -1169,14 +1169,14 @@
       <pes compset="any" pesize="any">
         <comment>improv: any compset on ne30np4 grid</comment>
         <ntasks>
-          <ntasks_atm>-4</ntasks_atm>
-          <ntasks_lnd>-4</ntasks_lnd>
-          <ntasks_rof>-4</ntasks_rof>
-          <ntasks_ice>-4</ntasks_ice>
-          <ntasks_ocn>-4</ntasks_ocn>
-          <ntasks_cpl>-4</ntasks_cpl>
-          <ntasks_glc>-4</ntasks_glc>
-          <ntasks_wav>-4</ntasks_wav>
+          <ntasks_atm>-6</ntasks_atm>
+          <ntasks_lnd>-6</ntasks_lnd>
+          <ntasks_rof>-6</ntasks_rof>
+          <ntasks_ice>-6</ntasks_ice>
+          <ntasks_ocn>-6</ntasks_ocn>
+          <ntasks_cpl>-6</ntasks_cpl>
+          <ntasks_glc>-6</ntasks_glc>
+          <ntasks_wav>-6</ntasks_wav>
         </ntasks>
       </pes>
       <pes compset=".*EAM.+ELM.+MPASSI.+SGLC.+SWAV.+BGC.*" pesize="any">
@@ -2065,6 +2065,21 @@
         </rootpe>
       </pes>
     </mach>
+    <mach name="improv">
+      <pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SGLC.+SWAV.+" pesize="S">
+        <comment>improv+allactive: RRM-WCYCL on 6 nodes</comment>
+        <ntasks>
+          <ntasks_atm>-6</ntasks_atm>
+          <ntasks_lnd>-6</ntasks_lnd>
+          <ntasks_rof>-6</ntasks_rof>
+          <ntasks_ice>-6</ntasks_ice>
+          <ntasks_ocn>-6</ntasks_ocn>
+          <ntasks_cpl>-6</ntasks_cpl>
+          <ntasks_glc>-6</ntasks_glc>
+          <ntasks_wav>-6</ntasks_wav>
+        </ntasks>
+      </pes>
+    </mach>
     <mach name="chrysalis">
       <pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SGLC.+SWAV.+" pesize="T">
         <comment> cmod016b64x1 s=2.4 </comment>

diff --git a/cime_config/machines/config_machines.xml b/cime_config/machines/config_machines.xml
@@ -2858,7 +2858,7 @@
       <env name="PATH">/lcrc/group/e3sm/soft/improv/pnetcdf/1.12.3/gcc-12.3.0/openmpi-4.1.6/bin:/lcrc/group/e3sm/soft/improv/netcdf-fortran/4.6.1b/gcc-12.3.0/openmpi-4.1.6/bin:/lcrc/group/e3sm/soft/improv/netcdf-c/4.9.2b/gcc-12.3.0/openmpi-4.1.6/bin:/lcrc/group/e3sm/soft/improv/openmpi/4.1.6/gcc-12.3.0/bin:/lcrc/group/e3sm/soft/perl/improv/bin:$ENV{PATH}</env>
       <env name="LD_LIBRARY_PATH">$SHELL{lp=/lcrc/group/e3sm/soft/improv/netlib-lapack/3.12.0/gcc-12.3.0:/lcrc/group/e3sm/soft/improv/pnetcdf/1.12.3/gcc-12.3.0/openmpi-4.1.6/lib:/lcrc/group/e3sm/soft/improv/netcdf-fortran/4.6.1b/gcc-12.3.0/openmpi-4.1.6/lib:/lcrc/group/e3sm/soft/improv/netcdf-c/4.9.2b/gcc-12.3.0/openmpi-4.1.6/lib:/opt/pbs/lib:/lcrc/group/e3sm/soft/improv/openmpi/4.1.6/gcc-12.3.0/lib; if [ -z "$LD_LIBRARY_PATH" ]; then echo $lp; else echo "$lp:$LD_LIBRARY_PATH"; fi}</env>
       <env name="MOAB_ROOT">$SHELL{if [ -z "$MOAB_ROOT" ]; then echo /lcrc/soft/climate/moab/improv/gnu; else echo "$MOAB_ROOT"; fi}</env>
-      <env name="OMPI_MCA_sharedfp">^lockedfile</env>
+      <env name="OMPI_MCA_sharedfp">^lockedfile,individual</env>
     </environment_variables>
     <environment_variables BUILD_THREADED="TRUE">
       <env name="OMP_STACKSIZE">128M</env>

diff --git a/cime_config/testmods_dirs/config_pes_tests.xml b/cime_config/testmods_dirs/config_pes_tests.xml
@@ -161,31 +161,41 @@
         </ntasks>
       </pes>
       <pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SGLC.+SWAV.+_SESP$" pesize="any">
-        <comment>tests+anvil: --compset WCYCL* --res ne30pg2_IcoswISC30E3r5 on 16 nodes pure-MPI </comment>
+        <comment>tests+anvil: --compset WCYCL* --res ne30pg2_IcoswISC30E3r5 on 25 nodes pure-MPI </comment>
         <ntasks>
-          <ntasks_atm>396</ntasks_atm>
-          <ntasks_lnd>396</ntasks_lnd>
-          <ntasks_rof>396</ntasks_rof>
-          <ntasks_ice>396</ntasks_ice>
-          <ntasks_ocn>180</ntasks_ocn>
-          <ntasks_cpl>396</ntasks_cpl>
+          <ntasks_atm>675</ntasks_atm>
+          <ntasks_lnd>324</ntasks_lnd>
+          <ntasks_rof>324</ntasks_rof>
+          <ntasks_ice>360</ntasks_ice>
+          <ntasks_ocn>216</ntasks_ocn>
+          <ntasks_cpl>684</ntasks_cpl>
         </ntasks>
         <rootpe>
-          <rootpe_ocn>396</rootpe_ocn>
+          <rootpe_atm>0</rootpe_atm>
+          <rootpe_lnd>360</rootpe_lnd>
+          <rootpe_rof>360</rootpe_rof>
+          <rootpe_ice>0</rootpe_ice>
+          <rootpe_ocn>684</rootpe_ocn>
+          <rootpe_cpl>0</rootpe_cpl>
         </rootpe>
       </pes>
       <pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+SGLC_SWAV_SIAC_SESP_BGC.*" pesize="any">
         <comment>tests+anvil: --compset BGC* --res ne30pg2_r05_IcoswISC30E3r5 on 30 nodes pure-MPI </comment>
         <ntasks>
           <ntasks_atm>675</ntasks_atm>
-          <ntasks_lnd>684</ntasks_lnd>
-          <ntasks_rof>684</ntasks_rof>
-          <ntasks_ice>684</ntasks_ice>
-          <ntasks_ocn>396</ntasks_ocn>
+          <ntasks_lnd>324</ntasks_lnd>
+          <ntasks_rof>324</ntasks_rof>
+          <ntasks_ice>360</ntasks_ice>
+          <ntasks_ocn>216</ntasks_ocn>
           <ntasks_cpl>684</ntasks_cpl>
         </ntasks>
         <rootpe>
+          <rootpe_atm>0</rootpe_atm>
+          <rootpe_lnd>360</rootpe_lnd>
+          <rootpe_rof>360</rootpe_rof>
+          <rootpe_ice>0</rootpe_ice>
           <rootpe_ocn>684</rootpe_ocn>
+          <rootpe_cpl>0</rootpe_cpl>
         </rootpe>
       </pes>
     </mach>
@@ -203,6 +213,17 @@
           <ntasks_cpl>-6</ntasks_cpl>
         </ntasks>
       </pes>
+      <pes compset="EAM.+ELM.+DOCN." pesize="any">
+        <comment>"tests+anvil, F compset, 6 nodes"</comment>
+        <ntasks>
+          <ntasks_atm>-16</ntasks_atm>
+          <ntasks_lnd>-16</ntasks_lnd>
+          <ntasks_rof>-16</ntasks_rof>
+          <ntasks_ice>-16</ntasks_ice>
+          <ntasks_ocn>-16</ntasks_ocn>
+          <ntasks_cpl>-16</ntasks_cpl>
+        </ntasks>
+      </pes>
     </mach>
   </grid>
   <grid name="oi%IcoswISC30.*">
@@ -241,17 +262,17 @@
     </mach>
     <mach name="anvil">
       <pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SWAV.+" pesize="any">
-        <comment>tests+anvil: --compset WCYCL1850 --res northamericax4v1pg2_WC14to60E2r3 on 64 nodes pure-MPI, 2.133 sypd </comment>
+        <comment>tests+anvil: --compset WCYCL1850 --res northamericax4v1pg2_WC14to60E2r3 on 69 nodes pure-MPI, 2.046 sypd </comment>
         <ntasks>
-          <ntasks_atm>1800</ntasks_atm>
-          <ntasks_lnd>1800</ntasks_lnd>
-          <ntasks_rof>1800</ntasks_rof>
-          <ntasks_ice>1800</ntasks_ice>
+          <ntasks_atm>1980</ntasks_atm>
+          <ntasks_lnd>1980</ntasks_lnd>
+          <ntasks_rof>1980</ntasks_rof>
+          <ntasks_ice>1944</ntasks_ice>
           <ntasks_ocn>504</ntasks_ocn>
-          <ntasks_cpl>1800</ntasks_cpl>
+          <ntasks_cpl>1980</ntasks_cpl>
         </ntasks>
         <rootpe>
-          <rootpe_ocn>1800</rootpe_ocn>
+          <rootpe_ocn>1980</rootpe_ocn>
         </rootpe>
       </pes>
     </mach>

diff --git a/cime_config/tests.py b/cime_config/tests.py
@@ -765,6 +765,19 @@
         )
     },
 
+    "e3sm_moab_dev" : {
+        "time"  : "01:00:00",
+        "tests" : (
+            "ERS_Vmoab_Ld3.ne4pg2_oQU480.WCYCL1850NS",
+            "ERS_Vmoab_Ld3.ne4pg2_oQU480.F1850",
+            "ERS_Vmoab_Ld3.ne4pg2_ne4pg2.I1850CNPRDCTCBCTOP",
+            "ERS_Vmoab_Ld3.T62_oQU240wLI.GMPAS-IAF",
+            "ERS_Vmoab_Ld3.T62_oQU120.CMPASO-NYF",
+            "ERS_Vmoab_Ld3.r05_r05.RMOSGPCC",
+        )
+    },
+
+
 
     "e3sm_gpuacc" : {
         "tests"    : (

diff --git a/components/data_comps/dice/src/ice_comp_mct.F90 b/components/data_comps/dice/src/ice_comp_mct.F90
@@ -79,16 +79,6 @@ subroutine ice_init_mct( EClock, cdata, x2i, i2x, NLFilename )
     logical           :: scmMode = .false.         ! single column mode
     real(R8)          :: scmLat  = shr_const_SPVAL ! single column lat
     real(R8)          :: scmLon  = shr_const_SPVAL ! single column lon
-#ifdef HAVE_MOAB
-    character(CL)        :: filePath ! generic file path
-    character(CL)        :: fileName ! generic file name
-    character(CS)        :: timeName ! domain file: time variable name
-    character(CS)        :: lonName  ! domain file: lon  variable name
-    character(CS)        :: latName  ! domain file: lat  variable name
-    character(CS)        :: hgtName  ! domain file: hgt  variable name
-    character(CS)        :: maskName ! domain file: mask variable name
-    character(CS)        :: areaName ! domain file: area variable name
-#endif
     character(*), parameter :: subName = "(ice_init_mct) "
     !-------------------------------------------------------------------------------
 
@@ -171,12 +161,9 @@ subroutine ice_init_mct( EClock, cdata, x2i, i2x, NLFilename )
 
 #ifdef HAVE_MOAB
     if (my_task == master_task) then
-       call shr_stream_getDomainInfo(SDICE%stream(1), filePath,fileName,timeName,lonName, &
-               latName,hgtName,maskName,areaName)
-       call shr_stream_getFile(filePath,fileName)
        ! send path of ice domain to MOAB coupler.
-       call seq_infodata_PutData( infodata, ice_domain=fileName)
-       write(logunit,*), ' filename: ', filename
+       write(logunit,*), ' file used for ice domain ', SDICE%domainFile
+       call seq_infodata_PutData( infodata, ice_domain=SDICE%domainFile)
     endif
 #endif
     !----------------------------------------------------------------------------