Merge branch 'develop' into feature/wjiang/new_bcs_structure

GEOS-ESM · Feb 16, 2024 · fbe9f15 · fbe9f15
2 parents 1e80660 + 441ce5a
commit fbe9f15
Show file tree

Hide file tree

Showing 19 changed files with 4 additions and 4 deletions.
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
@@ -345,8 +345,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
 

diff --git a/src/Components/GEOSldas_GridComp/CMakeLists.txt b/src/Components/GEOSldas_GridComp/CMakeLists.txt
@@ -12,6 +12,6 @@ set (alldirs
 esma_add_library(${this}
   SRCS GEOS_LdasGridComp.F90
   SUBCOMPONENTS ${alldirs}
-  SUBDIRS Shared
+  SUBDIRS LDAS_Shared
   DEPENDENCIES GEOSland_GridComp makebcs MAPL
   INCLUDES ${INC_ESMF})
diff --git a/...s/GEOSldas_GridComp/Shared/CMakeLists.txt → ...Sldas_GridComp/LDAS_Shared/CMakeLists.txt b/...s/GEOSldas_GridComp/Shared/CMakeLists.txt → ...Sldas_GridComp/LDAS_Shared/CMakeLists.txt
diff --git a/...GEOSldas_GridComp/Shared/LDAS_Convert.F90 → ...das_GridComp/LDAS_Shared/LDAS_Convert.F90 b/...GEOSldas_GridComp/Shared/LDAS_Convert.F90 → ...das_GridComp/LDAS_Shared/LDAS_Convert.F90
diff --git a/...ldas_GridComp/Shared/LDAS_DriverTypes.F90 → ...GridComp/LDAS_Shared/LDAS_DriverTypes.F90 b/...ldas_GridComp/Shared/LDAS_DriverTypes.F90 → ...GridComp/LDAS_Shared/LDAS_DriverTypes.F90
diff --git a/...Sldas_GridComp/Shared/LDAS_Exceptions.F90 → ..._GridComp/LDAS_Shared/LDAS_Exceptions.F90 b/...Sldas_GridComp/Shared/LDAS_Exceptions.F90 → ..._GridComp/LDAS_Shared/LDAS_Exceptions.F90
diff --git a/...OSldas_GridComp/Shared/LDAS_PertTypes.F90 → ...s_GridComp/LDAS_Shared/LDAS_PertTypes.F90 b/...OSldas_GridComp/Shared/LDAS_PertTypes.F90 → ...s_GridComp/LDAS_Shared/LDAS_PertTypes.F90
diff --git a/...as_GridComp/Shared/LDAS_RepairForcing.F90 → ...idComp/LDAS_Shared/LDAS_RepairForcing.F90 b/...as_GridComp/Shared/LDAS_RepairForcing.F90 → ...idComp/LDAS_Shared/LDAS_RepairForcing.F90
diff --git a/...ridComp/Shared/LDAS_TileCoordRoutines.F90 → ...mp/LDAS_Shared/LDAS_TileCoordRoutines.F90 b/...ridComp/Shared/LDAS_TileCoordRoutines.F90 → ...mp/LDAS_Shared/LDAS_TileCoordRoutines.F90
diff --git a/...as_GridComp/Shared/LDAS_TileCoordType.F90 → ...idComp/LDAS_Shared/LDAS_TileCoordType.F90 b/...as_GridComp/Shared/LDAS_TileCoordType.F90 → ...idComp/LDAS_Shared/LDAS_TileCoordType.F90
diff --git a/...s_GridComp/Shared/LDAS_ensdrv_Globals.F90 → ...dComp/LDAS_Shared/LDAS_ensdrv_Globals.F90 b/...s_GridComp/Shared/LDAS_ensdrv_Globals.F90 → ...dComp/LDAS_Shared/LDAS_ensdrv_Globals.F90
diff --git a/...GridComp/Shared/LDAS_ensdrv_functions.F90 → ...omp/LDAS_Shared/LDAS_ensdrv_functions.F90 b/...GridComp/Shared/LDAS_ensdrv_functions.F90 → ...omp/LDAS_Shared/LDAS_ensdrv_functions.F90
diff --git a/...Sldas_GridComp/Shared/LDAS_ensdrv_mpi.F90 → ..._GridComp/LDAS_Shared/LDAS_ensdrv_mpi.F90 b/...Sldas_GridComp/Shared/LDAS_ensdrv_mpi.F90 → ..._GridComp/LDAS_Shared/LDAS_ensdrv_mpi.F90
diff --git a/.../GEOSldas_GridComp/Shared/catch_types.F90 → ...ldas_GridComp/LDAS_Shared/catch_types.F90 b/.../GEOSldas_GridComp/Shared/catch_types.F90 → ...ldas_GridComp/LDAS_Shared/catch_types.F90
diff --git a/...s/GEOSldas_GridComp/Shared/enkf_types.F90 → ...Sldas_GridComp/LDAS_Shared/enkf_types.F90 b/...s/GEOSldas_GridComp/Shared/enkf_types.F90 → ...Sldas_GridComp/LDAS_Shared/enkf_types.F90
diff --git a/...s/GEOSldas_GridComp/Shared/my_lu_decomp.f → ...Sldas_GridComp/LDAS_Shared/my_lu_decomp.f b/...s/GEOSldas_GridComp/Shared/my_lu_decomp.f → ...Sldas_GridComp/LDAS_Shared/my_lu_decomp.f
diff --git a/...s_GridComp/Shared/my_matrix_functions.F90 → ...dComp/LDAS_Shared/my_matrix_functions.F90 b/...s_GridComp/Shared/my_matrix_functions.F90 → ...dComp/LDAS_Shared/my_matrix_functions.F90
diff --git a/...ents/GEOSldas_GridComp/Shared/nr_indexx.f → ...GEOSldas_GridComp/LDAS_Shared/nr_indexx.f b/...ents/GEOSldas_GridComp/Shared/nr_indexx.f → ...GEOSldas_GridComp/LDAS_Shared/nr_indexx.f