Disable CatchmentCNCLM45 model (LSM_CHOICE=3) (#707)

CatchCN-4.5 is no longer supported.
GEOS-ESM · Feb 15, 2024 · 2a3b721 · 2a3b721
2 parents 5e8eeec + c2ff5fb
commit 2a3b721
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/components.yaml b/components.yaml
@@ -48,6 +48,6 @@ MAPL:
 GEOSgcm_GridComp:
   local: ./src/Components/GEOSldas_GridComp/@GEOSgcm_GridComp
   remote: ../GEOSgcm_GridComp.git
-  branch: develop
+  branch: feature/jkolassa_disable_cn45
   sparse: ./config/GEOSgcm_GridComp_ldas.sparse
   develop: develop
diff --git a/src/Applications/LDAS_App/GEOSldas_LDAS.rc b/src/Applications/LDAS_App/GEOSldas_LDAS.rc
@@ -33,7 +33,6 @@ CATCHMENT_SPINUP: 0
 #
 #    1 : Catchment model   (default)
 #    2 : CatchmentCN-CLM4.0
-#    3 : CatchmentCN-CLM4.5
 #
 LSM_CHOICE: 1
 

diff --git a/src/Applications/LDAS_App/ldas_setup b/src/Applications/LDAS_App/ldas_setup
@@ -340,8 +340,9 @@ class LDASsetup:
             self.catch = 'catch'
         if  int(self.rqdExeInp['LSM_CHOICE']) == 2 :
             self.catch = 'catchcnclm40'
-        if  int(self.rqdExeInp['LSM_CHOICE']) == 3 : 
-            self.catch = 'catchcnclm45'
+
+        assert int(self.rqdExeInp['LSM_CHOICE']) <= 2, "\nLSM_CHOICE=3 (Catchment-CN4.5) is no longer supported. Please set LSM_CHOICE to 1 (Catchment) or 2 (Catchment-CN4.0)"
+
         if 'POSTPROC_HIST' not in self.rqdExeInp:
             self.rqdExeInp['POSTPROC_HIST'] = 0