Merge remote-tracking branch 'escomp/master' into snicar_allupdate

Resolved conflicts:
src/main/controlMod.F90

.config_files.xml

@@ -5,31 +5,31 @@
 <entry_id>
 
   <!-- This is the same as the default entry in
-       cime/config/cesm/config_files.xml except for the value for CTSM:
-       In a standalone CTSM checkout, COMP_ROOT_DIR_LND is $SRCROOT
+       cime/config/cesm/config_files.xml except for the value for CLM:
+       In a standalone CLM checkout, COMP_ROOT_DIR_LND is $SRCROOT
        rather than $SRCROOT/components/clm.
 
        However, because of the way overrides are handled, we need to
        re-specify the full information here rather than just overriding
-       the value for CTSM.
+       the value for CLM.
   -->
   <entry id="COMP_ROOT_DIR_LND">
     <type>char</type>
     <default_value>unset</default_value>
     <values>
-      <value component="clm"       >$SRCROOT</value>
-      <value component="ctsm"      >$SRCROOT</value>
-      <value component="dlnd" comp_interface="mct">$SRCROOT/components/cpl7/components/data_comps_mct/dlnd</value>
-      <value component="dlnd" comp_interface="nuopc">$SRCROOT/components/cdeps/dlnd</value>
-      <value component="slnd"  comp_interface="mct"     >$SRCROOT/components/cpl7/components/stub_comps_mct/slnd</value>
-      <value component="xlnd" comp_interface="mct"      >$SRCROOT/components/cpl7/components/xcpl_comps_mct/xlnd</value>
-      <value component="slnd"  comp_interface="nuopc"    >$CIMEROOT/src/components/stub_comps_nuopc/slnd</value>
-      <value component="xlnd"  comp_interface="nuopc"    >$CIMEROOT/src/components/xcpl_comps_nuopc/xlnd</value>
+      <value component="clm"                         >$SRCROOT</value>
+      <value component="slim"                        >$SRCROOT/components/slim/</value>
+      <value component="dlnd" comp_interface="mct"   >$SRCROOT/components/cpl7/components/data_comps_$COMP_INTERFACE/dlnd</value>
+      <value component="dlnd" comp_interface="nuopc" >$SRCROOT/components/cdeps/dlnd</value>
+      <value component="slnd" comp_interface="mct"   >$SRCROOT/components/cpl7/components/stub_comps_$COMP_INTERFACE/slnd</value>
+      <value component="slnd" comp_interface="nuopc" >$CIMEROOT/CIME/non_py/src/components/stub_comps_$COMP_INTERFACE/slnd</value>
+      <value component="xlnd" comp_interface="mct"   >$SRCROOT/components/cpl7/components/xcpl_comps_$COMP_INTERFACE/xlnd</value>
+      <value component="xlnd" comp_interface="nuopc" >$CIMEROOT/CIME/non_py/src/components/xcpl_comps_$COMP_INTERFACE/xlnd</value>
     </values>
     <group>case_comps</group>
     <file>env_case.xml</file>
     <desc>Root directory of the case land model component  </desc>
-    <schema>$CIMEROOT/config/xml_schemas/config_compsets.xsd</schema>
+    <schema>$CIMEROOT/CIME/data/config/xml_schemas/config_compsets.xsd</schema>
   </entry>
 
 </entry_id>

.git-blame-ignore-revs

@@ -0,0 +1,9 @@
+# Ran python directory through black python formatter
+4cd83cb3ee6d85eb909403487abf5eeaf4d98911
+0aa2957c1f8603c63fa30b11295c06cfddff44a5
+2cdb380febb274478e84cd90945aee93f29fa2e6
+e44dc469439e02e9ee582dab274d890ebdfab104
+565e7bcacbb0bba20ff80d680d8ad769676641c6
+b88e1cd1b28e3609684c79a2ec0e88f26cfc362b
+51c102c5df2e0ef971b5f8eeeb477567899af63a
+7dacad70e74e2ec97f6492d4e7a3cb5dd498bcd7

.github/workflows/black.yml

@@ -0,0 +1,21 @@
+name: black check on push and PR
+#
+# Run the python formatting in check mode
+#
+on: [push, pull_request]
+
+jobs:
+  black-check:
+     runs-on: ubuntu-latest
+     steps:
+        # Checkout the code
+        - uses: actions/checkout@v2
+        # Use the latest stable version of the github action
+        - uses: psf/black@stable
+          with:
+             # Use options and version identical to the conda environment
+             # Using pyproject.toml makes sure this testing is consistent with our python directory testing
+             options: "--check --config python/pyproject.toml"
+             src:     "./python"
+             # Version should be coordinated with the ctsm_pylib conda environment under the python directory
+             version: "22.3.0"

.gitignore

@@ -1,8 +1,8 @@
 # directories checked out by manage_externals, and other files created
 # by manage_externals
 manage_externals.log
+ccs_config
 /src/fates/
-/tools/site_and_regional/PTCLM/
 /cime/
 /components/
 /libraries/
@@ -21,6 +21,7 @@ manage_externals.log
 # editor files
 *.swp
 *~
+.vscode/
 
 # vim files (from https://github.com/github/gitignore/blob/master/Global/Vim.gitignore)
 # Swap
@@ -104,6 +105,13 @@ unit_test_build
 /tools/mkmapdata/regrid.o*
 /tools/mkmapdata/map*.nc
 
+# run_neon output directories
+/tools/site_and_regional/listing.csv
+/tools/site_and_regional/????/
+/tools/site_and_regional/????.ad/
+/tools/site_and_regional/????.postad/
+/tools/site_and_regional/????.transient/
+
 # build output
 *.o
 *.mod

Externals.cfg

@@ -8,7 +8,7 @@ required = True
 local_path = components/cism
 protocol = git
 repo_url = https://github.com/ESCOMP/CISM-wrapper
-tag = cismwrap_2_1_93
+tag = cismwrap_2_1_95
 externals = Externals_CISM.cfg
 required = True
 
@@ -23,7 +23,7 @@ required = True
 local_path = components/mosart
 protocol = git
 repo_url = https://github.com/ESCOMP/MOSART
-tag = mosart1_0_45
+tag = mosart1_0_48
 required = True
 
 [mizuRoute]
@@ -33,37 +33,44 @@ repo_url = https://github.com/nmizukami/mizuRoute
 hash = 34723c2
 required = True
 
+[ccs_config]
+tag = ccs_config_cesm0.0.64
+protocol = git
+repo_url = https://github.com/ESMCI/ccs_config_cesm.git
+local_path = ccs_config
+required = True
+
 [cime]
 local_path = cime
 protocol = git
 repo_url = https://github.com/ESMCI/cime
-tag = branch_tags/cime6.0.12_a01
+tag = cime6.0.108
 required = True
 
 [cmeps]
-tag = cmeps0.13.43
+tag = cmeps0.14.21
 protocol = git
 repo_url = https://github.com/ESCOMP/CMEPS.git
 local_path = components/cmeps
 required = True
 
 [cdeps]
-tag = cdeps0.12.34
+tag = cdeps1.0.13
 protocol = git
 repo_url = https://github.com/ESCOMP/CDEPS.git
 local_path = components/cdeps
 externals =  Externals_CDEPS.cfg
 required = True
 
 [cpl7]
-tag = cpl7.0.7
+tag = cpl77.0.5
 protocol = git
 repo_url = https://github.com/ESCOMP/CESM_CPL7andDataComps
 local_path = components/cpl7
 required = True
 
 [share]
-tag = share1.0.10
+tag = share1.0.17
 protocol = git
 repo_url = https://github.com/ESCOMP/CESM_share
 local_path = share
@@ -77,7 +84,7 @@ local_path = libraries/mct
 required = True
 
 [parallelio]
-tag = pio2_5_4
+tag = pio2_5_10
 protocol = git
 repo_url = https://github.com/NCAR/ParallelIO
 local_path = libraries/parallelio

Externals_CLM.cfg

@@ -2,7 +2,7 @@
 local_path = src/fates
 protocol = git
 repo_url = https://github.com/NGEET/fates
-tag = sci.1.53.0_api.21.0.0
+tag = sci.1.66.1_api.25.5.0
 required = True
 
 [externals_description]

README

@@ -45,6 +45,7 @@ test -------------- CTSM Testing scripts for CTSM offline tools.
 tools ------------- CTSM Offline tools to prepare input datasets and process output.
 cime_config ------- Configuration files of cime for compsets and CTSM settings
 manage_externals -- Script to manage the external source directories
+py_env_create ----- Script to setup the python environment for CTSM python tools using conda
 python ------------ Some python modules mostly for use by run_sys_tests (but could be used elsewhere l
 
 Directory structure only for a CTSM checkout:

README.md

@@ -43,15 +43,19 @@ CTSM code management is provided primarily by:
 Software engineering team:
 - [Erik Kluzek](https://github.com/ekluzek)
 - [Bill Sacks](https://github.com/billsacks)
-- [Mariana Vertenstein](https://github.com/mvertens)
-- [Negin Sobhani](https://github.com/negin513)
 - [Sam Levis](https://github.com/slevisconsulting)
+- [Adrianna Foster](https://github.com/adrifoster)
+- [Sam Rabin](https://github.com/samsrabin)
+- [Greg Lemieux](https://github.com/glemieux)
+- [Ryan Knox](https://github.com/rgknox)
 
 Science team:
 - [Dave Lawrence](https://github.com/dlawrenncar)
 - [Will Wieder](https://github.com/wwieder)
 - [Danica Lombardozzi](https://github.com/danicalombardozzi)
 - [Keith Oleson](https://github.com/olyson)
 - [Sean Swenson](https://github.com/swensosc)
-- [Mike Barlage](https://github.com/barlage)
+- [Jackie Shuman](https://github.com/jkshuman)
+- [Peter Lawrence](https://github.com/lawrencepj1)
 - [Rosie Fisher](https://github.com/rosiealice)
+- Gordon Bonan