Update CMEPS

.github/pull_request_template.md

@@ -9,7 +9,7 @@ CMEPS Issues Fixed (include github issue #):
 Are changes expected to change answers?
  - [ ] bit for bit
  - [ ] different at roundoff level
- - [ ] more substantial 
+ - [ ] more substantial
 
 Any User Interface Changes (namelist or namelist defaults changes)?
  - [ ] Yes
@@ -42,7 +42,7 @@ Testing performed if application target is UFS-HAFS:
 Hashes used for testing:
 - [ ] CESM:
   - repository to check out: https://github.com/ESCOMP/CESM.git
-  - branch: nuopc_dev
+  - branch:
   - hash:
 - [ ] UFS-coupled, then umbrella repostiory to check out and associated hash:
   - repository to check out:

.github/workflows/bumpversion.yml

@@ -8,13 +8,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-        with:
-          fetch-depth: '0'
       - name: Bump version and push tag
-        uses: anothrNick/github-tag-action@1.26.0
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          WITH_V: true
-          DEFAULT_BUMP: minor
-          RELEASE_BRANCHES: master
-          DRY_RUN: False
+        id: tag_version
+        uses: mathieudutour/github-tag-action@v5.5
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          create_annotated_tag: true
+          default_bump: patch
+          dry_run: false
+          tag_prefix: cmeps

.github/workflows/extbuild.yml

@@ -35,7 +35,9 @@ jobs:
           path: ~/ESMF
           key: ${{ runner.os }}-${{ env.ESMF_VERSION }}-ESMF
       - id: load-env
-        run: sudo apt-get install gfortran wget openmpi-bin netcdf-bin libopenmpi-dev libnetcdf-dev
+        run: |
+          sudo apt-get update
+          sudo apt-get install gfortran wget openmpi-bin netcdf-bin libopenmpi-dev libnetcdf-dev
       - id: build-ESMF
         if: steps.cache-esmf.outputs.cache-hit != 'true'
         run: |

cime_config/buildexe

@@ -39,6 +39,7 @@ def _main_func():
         ocn_model = case.get_value("COMP_OCN")
         atm_model = case.get_value("COMP_ATM")
         gmake_args = get_standard_makefile_args(case)
+        esmf_aware_threading = case.get_value("ESMF_AWARE_THREADING")
 
     # Determine valid components
     valid_comps = []
@@ -73,6 +74,8 @@ def _main_func():
             gmake_args += " {}_PRESENT=FALSE".format(comp)
     if skip_mediator:
         gmake_args += " MED_PRESENT=FALSE"
+    if esmf_aware_threading:
+        gmake_args += " USER_CPPDEFS=-DESMF_AWARE_THREADING"
 
     gmake_args += " IAC_PRESENT=FALSE"
     expect((num_esp is None) or (int(num_esp) == 1), "ESP component restricted to one instance")
@@ -93,6 +96,11 @@ def _main_func():
     makefile = os.path.join(casetools, "Makefile")
     exename = os.path.join(exeroot, cime_model + ".exe")
 
+    # always rebuild file esm.F90 this is because cpp macros in that file may have changed
+    esm = os.path.join(bld_root,"esm.o")
+    if os.path.isfile(esm):
+        os.remove(esm)
+
     # always relink
     if os.path.isfile(exename):
         os.remove(exename)

cime_config/buildnml

@@ -516,6 +516,24 @@ def buildnml(case, caseroot, component):
     if component != "drv":
         raise AttributeError
 
+#   Do a check here of ESMF VERSION, requires 8.1.0 or newer (8.2.0 or newer for esmf_aware_threading)
+    esmf_aware_threading = case.get_value("ESMF_AWARE_THREADING")
+    esmfmkfile = os.getenv("ESMFMKFILE")
+    expect(esmfmkfile and os.path.isfile(esmfmkfile),"ESMFMKFILE not found {}".format(esmfmkfile))
+    with open(esmfmkfile, 'r') as f:
+        major = None
+        minor = None
+        for line in f.readlines():
+            if 'ESMF_VERSION' in line:
+                major = line[-2] if 'MAJOR' in line else major
+                minor = line[-2] if 'MINOR' in line else minor
+        logger.debug("ESMF version major {} minor {}".format(major,minor))
+        expect(int(major) >=8,"ESMF version should be 8.1 or newer")
+        if esmf_aware_threading:
+            expect(int(minor) >= 2, "ESMF version should be 8.2.0 or newer when using ESMF_AWARE_THREADING")
+        else:
+            expect(int(minor) >= 1, "ESMF version should be 8.1.0 or newer")
+
     confdir = os.path.join(case.get_value("CASEBUILD"), "cplconf")
     if not os.path.isdir(confdir):
         os.makedirs(confdir)

cime_config/config_component.xml

@@ -186,6 +186,13 @@
     <desc>username of user who created case</desc>
   </entry>
 
+  <entry id="CASE_HASH">
+    <type>char</type>
+    <group>case_desc</group>
+    <file>env_case.xml</file>
+    <desc>Unique identifier for case</desc>
+  </entry>
+
   <!-- ===================================================================== -->
   <!-- definitions runtimes -->
   <!-- ===================================================================== -->
@@ -798,6 +805,15 @@
     <desc>TRUE implies that at least one of the components is built threaded (DO NOT EDIT)</desc>
   </entry>
 
+  <entry id="ESMF_AWARE_THREADING">
+    <type>logical</type>
+    <valid_values>TRUE,FALSE</valid_values>
+    <default_value>FALSE</default_value>
+    <group>mach_pes</group>
+    <file>env_mach_pes.xml</file>
+    <desc>TRUE indicates that the ESMF Aware threading method is used</desc>
+  </entry>
+
   <entry id="USE_PETSC">
     <type>logical</type>
     <valid_values>TRUE,FALSE</valid_values>
@@ -1183,14 +1199,16 @@
     <desc>glacier (glc) grid - DO NOT EDIT (for experts only)</desc>
   </entry>
 
+  <!-- GLC_NX and GLC_NY are only needed by xglc. These variables do not
+       accommodate multiple ice sheet grids, but that's okay for now,
+       since xglc currently only runs on a single ice sheet grid.-->
   <entry id="GLC_NX">
     <type>integer</type>
     <default_value>0</default_value>
     <group>build_grid</group>
     <file>env_build.xml</file>
     <desc>number of glc cells in i direction - DO NOT EDIT (for experts only)</desc>
   </entry>
-
   <entry id="GLC_NY">
     <type>integer</type>
     <default_value>0</default_value>
@@ -1199,7 +1217,6 @@
     <desc>number of glc cells in j direction - DO NOT EDIT (for experts only)</desc>
   </entry>
 
-
   <entry id="WAV_GRID">
     <type>char</type>
     <default_value>UNSET</default_value>
@@ -1423,22 +1440,6 @@
     <desc>lnd2atm state mapping file</desc>
   </entry>
 
-  <entry id="LND2GLC_FMAPNAME">
-    <type>char</type>
-    <default_value>idmap</default_value>
-    <group>run_domain</group>
-    <file>env_run.xml</file>
-    <desc>lnd2glc flux mapping file</desc>
-  </entry>
-
-  <entry id="LND2GLC_SMAPNAME">
-    <type>char</type>
-    <default_value>idmap</default_value>
-    <group>run_domain</group>
-    <file>env_run.xml</file>
-    <desc>lnd2glc state mapping file</desc>
-  </entry>
-
   <entry id="LND2ROF_FMAPNAME">
     <type>char</type>
     <default_value>idmap</default_value>
@@ -1479,22 +1480,6 @@
     <desc>rof2ocn runoff mapping file</desc>
   </entry>
 
-  <entry id="GLC2LND_FMAPNAME">
-    <type>char</type>
-    <default_value>idmap</default_value>
-    <group>run_domain</group>
-    <file>env_run.xml</file>
-    <desc>glc2lnd flux mapping file</desc>
-  </entry>
-
-  <entry id="GLC2LND_SMAPNAME">
-    <type>char</type>
-    <default_value>idmap</default_value>
-    <group>run_domain</group>
-    <file>env_run.xml</file>
-    <desc>glc2lnd state mapping file</desc>
-  </entry>
-
   <entry id="GLC2ICE_RMAPNAME">
     <type>char</type>
     <default_value>idmap</default_value>

cime_config/config_component_cesm.xml

@@ -35,16 +35,6 @@
     <desc>run DOI</desc>
   </entry>
 
-  <entry id="DRV_THREADING">
-    <type>logical</type>
-    <valid_values>TRUE,FALSE</valid_values>
-    <default_value>FALSE</default_value>
-    <group>run_flags</group>
-    <file>env_run.xml</file>
-    <desc>Turns on component varying thread control in the driver.
-    Used to set the driver namelist variable "drv_threading".</desc>
-  </entry>
-
   <entry id="SAVE_TIMING">
     <type>logical</type>
     <valid_values>TRUE,FALSE</valid_values>
@@ -499,7 +489,8 @@
     <default_value>284.7</default_value>
     <values match="last">
       <value compset="^2000">367.0</value>
-      <value compset="DATM.*POP2%ECO">284.7</value>
+      <value compset="DATM.*_POP2%[^_]*ECO">284.317</value>
+      <value compset="DATM.*_POP2%[^_]*ECOCESM20">284.7</value>
     </values>
     <group>run_co2</group>
     <file>env_run.xml</file>
@@ -540,7 +531,7 @@
     <values match="last">
       <value compset="_CLM.+CISM\d">TRUE</value>
       <!-- Turn on two-way coupling for TG compsets - even though there are no
-	   feedbacks for a TG compset, this will give us additional diagnostics -->
+           feedbacks for a TG compset, this will give us additional diagnostics -->
       <value compset="_DLND.+CISM\d">TRUE</value>
     </values>
     <group>run_glc</group>

cime_config/config_component_ufs.xml

@@ -35,16 +35,6 @@
     <desc>run DOI</desc>
   </entry>
 
-  <entry id="DRV_THREADING">
-    <type>logical</type>
-    <valid_values>TRUE,FALSE</valid_values>
-    <default_value>FALSE</default_value>
-    <group>run_flags</group>
-    <file>env_run.xml</file>
-    <desc>Turns on component varying thread control in the driver.
-    Used to set the driver namelist variable "drv_threading".</desc>
-  </entry>
-
   <entry id="SAVE_TIMING">
     <type>logical</type>
     <valid_values>TRUE,FALSE</valid_values>