Merge pull request #387 from GEOS-ESM/develop

Sync develop into main
GEOS-ESM · Dec 16, 2022 · c978e81 · c978e81
2 parents a211059 + 3a5907c
commit c978e81
Show file tree

Hide file tree

Showing 13 changed files with 1,655 additions and 578 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,7 +1,7 @@
 version: 2.1
 
 # Anchors to prevent forgetting to update a version
-baselibs_version: &baselibs_version v7.5.0
+baselibs_version: &baselibs_version v7.7.0
 bcs_version: &bcs_version v10.23.0
 
 orbs:

diff --git a/.github/workflows/enforce-labels.yml b/.github/workflows/enforce-labels.yml
@@ -0,0 +1,29 @@
+name: Enforce PR Labels
+
+on:
+  pull_request:
+    types: [opened, labeled, unlabeled, edited, synchronize]
+
+jobs:
+  require-label:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: mheap/github-action-required-labels@v2
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          mode: minimum
+          count: 1
+          labels: "0 diff,0 diff trivial,Non 0-diff,0 diff structural,0-diff trivial,Not 0-diff,0-diff,automatic,0-diff uncoupled"
+          add_comment: true
+  blocking-label:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: mheap/github-action-required-labels@v2
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          mode: exactly
+          count: 0
+          labels: "Contingent - DNA,Needs Lead Approval,Contingent -- Do Not Approve"
+          add_comment: true
diff --git a/AGCM.rc.tmpl b/AGCM.rc.tmpl
@@ -267,13 +267,13 @@ RECORD_REF_TIME: >>>REFTIME<<< >>>FCSTIME<<<
 
 #   ASSIMILATION_CYCLE:  nnnnnn       #  (Default: 21600)
 #   IAU_DIGITAL_FILTER:  YES or NO    #  (Default: YES  )
- 
+
 # Typical MERRA-2 Regular REPLAY Configuration
 # --------------------------------------------
 #M2 REPLAY_ANA_EXPID:   MERRA-2
 #M2 REPLAY_ANA_LOCATION: @M2_REPLAY_ANA_LOCATION
 #M2 REPLAY_MODE: Regular
-#M2 REPLAY_FILE: ana/Y%y4/M%m2/MERRA-2.ana.eta.%y4%m2%d2_%h2z.nc4
+#M2 REPLAY_FILE: ana/MERRA2_all/Y%y4/M%m2/MERRA2.ana.eta.%y4%m2%d2_%h2z.nc4
 # -----------------------------------------------------------------
 
 #   ANA EXPID and LOCATION used for REPLAY
@@ -404,7 +404,7 @@ RECORD_REF_TIME: >>>REFTIME<<< >>>FCSTIME<<<
 ##REPLAY_REF_TIME: >>>ANATIME<<<
 ##REPLAY_REF_TGAP: 001500
 
-#REPLAY_MODE: Intermittent 
+#REPLAY_MODE: Intermittent
 #REPLAY_FILE: /discover/nobackup/projects/gmao/iesa/aerosol/Data/MERRA/iReplay/576x361/Y%y4/M%m2/d5_merra_jan98.bkg.eta.%y4%m2%d2_%h2z.nc4
 #REPLAY_IM:    576            # Required for Intermittent Replay on Cube
 #REPLAY_JM:    361            # Required for Intermittent Replay on Cube
@@ -469,19 +469,19 @@ RECORD_REF_TIME: >>>REFTIME<<< >>>FCSTIME<<<
 DIAGNOSE_PRECIP_TYPE: FALSE
 
 # Choice for Land Surface Model
-#      1 : Catchment 
-#      2 : CatchmentCNCLM40 
-#      3 : CatchmentCNCLM45 
+#      1 : Catchment
+#      2 : CatchmentCNCLM40
+#      3 : CatchmentCNCLM45
 # ------------------------------------------------------------
 LSM_CHOICE: @LSM_CHOICE
 
 # Apply increments from LDAS?
 #      0 : no  (default)
-#      1 : yes 
+#      1 : yes
 # ------------------------------------------------------------
 #LDAS_INCR: 0
 
-# Name of file containing Surface GridComp resource parameters 
+# Name of file containing Surface GridComp resource parameters
 # ------------------------------------------------------------
 # SURFRC: GEOS_SurfaceGridComp.rc
 
@@ -493,8 +493,8 @@ LSM_CHOICE: @LSM_CHOICE
 # *******   The model reads USE_CNNEE from CO2_GridComp.rc *******
 # *******   not from this file.                            *******
 # Atmosphere-Land CO2 coupling
-# ----------------------------	
-# USE_CNNEE: 0 #  options : 0 (default); 1 (Chem uses NNEE from CatchmentCN, NOTE you must add USE_CNNEE: 1 to CO2_GridComp.rc and AMIP/CO2_GridComp.rc,	
+# ----------------------------
+# USE_CNNEE: 0 #  options : 0 (default); 1 (Chem uses NNEE from CatchmentCN, NOTE you must add USE_CNNEE: 1 to CO2_GridComp.rc and AMIP/CO2_GridComp.rc,
 #                           in GOCART/ESMF/GOCART_GridComp/CO2_GridComp/ before you build the model.)
 #
 # ****************************************************************
@@ -730,7 +730,7 @@ TOPO_TRBVAR_FILE:   topo_trbvar.data
 LAI_FILE:                   lai.data
 GREEN_FILE:               green.data
 NDVI_FILE:                 ndvi.data
-TILING_FILE:                tile.bin 
+TILING_FILE:                tile.bin
 VISDF_FILE:                visdf.dat
 NIRDF_FILE:                nirdf.dat
 LNFM_FILE:                 lnfm.data
@@ -840,18 +840,18 @@ USE_SATSIM_MISR:  @MISR_SATSIM
 @COUPLED steady_state_ocean: 0
 @COUPLED OCEAN_PICE_SCALING: 0.0
 
-# For running MOM5 coupled model in dual ocean mode, uncomment three lines below, 
+# For running MOM5 coupled model in dual ocean mode, uncomment three lines below,
 # make sure that regular replay is enabled, proper PRECIP_FILE is chosen,
 # sst.data and fraci.data are pointing to read forcing files on tripolar grid,
-# the run starts at 21z/03z/09z/15z, 
+# the run starts at 21z/03z/09z/15z,
 # HISTORY.rc collections have proper ref_time field
 # ---------------------------------------------------------------------------
 @MOM5#DUAL_OCEAN: 1
 @MOM5#DATA_SST_FILE: sst.data
 @MOM5#DATA_FRT_FILE: fraci.data
 
-@COUPLED 
-@COUPLED # Section for CICE 
+@COUPLED
+@COUPLED # Section for CICE
 @COUPLED # -----------------
 @COUPLED USE_CICE_Thermo: 1
 @COUPLED PRESCRIBED_ICE: 0
@@ -867,5 +867,5 @@ USE_SATSIM_MISR:  @MISR_SATSIM
 @COUPLED ALBICEV: 0.78
 @COUPLED ALBICEI: 0.36
 @COUPLED ALBSNOWV: 0.98
-@COUPLED ALBSNOWI: 0.7 
-@COUPLED MIN_FREEZE_SALINITY: 5.0 
+@COUPLED ALBSNOWI: 0.7
+@COUPLED MIN_FREEZE_SALINITY: 5.0