From 69307cc2f5ab3504a8de97acb56d5b25260d185c Mon Sep 17 00:00:00 2001 From: gmao-jkolassa Date: Tue, 13 Feb 2024 12:22:32 -0500 Subject: [PATCH 1/4] disable Catchment-CN4.5 option for GEOSldas --- src/Applications/LDAS_App/GEOSldas_LDAS.rc | 1 - src/Applications/LDAS_App/ldas_setup | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Applications/LDAS_App/GEOSldas_LDAS.rc b/src/Applications/LDAS_App/GEOSldas_LDAS.rc index 3c290a17..df92fdb0 100644 --- 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 index 12a72d27..87eb9e14 100755 --- 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 From c2ff5fbaf15b2f00d0c2a418da30e0f60e295448 Mon Sep 17 00:00:00 2001 From: gmao-jkolassa Date: Tue, 13 Feb 2024 13:35:23 -0500 Subject: [PATCH 2/4] use GEOSgcm_GridComp branch implementing CN45 disabling --- components.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components.yaml b/components.yaml index fa43e03d..3ac07866 100644 --- 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 From e4fc89fee9934055030dc9534a4de5e40d0cf8e3 Mon Sep 17 00:00:00 2001 From: Rolf Reichle <54944691+gmao-rreichle@users.noreply.github.com> Date: Wed, 14 Feb 2024 19:12:35 -0500 Subject: [PATCH 3/4] Fix error in components.yaml of #707 --- components.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components.yaml b/components.yaml index 3ac07866..fa43e03d 100644 --- 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: feature/jkolassa_disable_cn45 + branch: develop sparse: ./config/GEOSgcm_GridComp_ldas.sparse develop: develop From 2895dc59a24ad649038e876b899ac3771f422694 Mon Sep 17 00:00:00 2001 From: Rolf Reichle Date: Fri, 16 Feb 2024 09:20:09 -0500 Subject: [PATCH 4/4] renamed GEOSldas_GridComp/Shared to GEOSldas_GridComp/LDAS_Shared --- src/Components/GEOSldas_GridComp/CMakeLists.txt | 2 +- .../GEOSldas_GridComp/{Shared => LDAS_Shared}/CMakeLists.txt | 0 .../GEOSldas_GridComp/{Shared => LDAS_Shared}/LDAS_Convert.F90 | 0 .../{Shared => LDAS_Shared}/LDAS_DriverTypes.F90 | 0 .../{Shared => LDAS_Shared}/LDAS_Exceptions.F90 | 0 .../{Shared => LDAS_Shared}/LDAS_PertTypes.F90 | 0 .../{Shared => LDAS_Shared}/LDAS_RepairForcing.F90 | 0 .../{Shared => LDAS_Shared}/LDAS_TileCoordRoutines.F90 | 0 .../{Shared => LDAS_Shared}/LDAS_TileCoordType.F90 | 0 .../{Shared => LDAS_Shared}/LDAS_ensdrv_Globals.F90 | 0 .../{Shared => LDAS_Shared}/LDAS_ensdrv_functions.F90 | 0 .../{Shared => LDAS_Shared}/LDAS_ensdrv_mpi.F90 | 0 .../GEOSldas_GridComp/{Shared => LDAS_Shared}/catch_types.F90 | 0 .../GEOSldas_GridComp/{Shared => LDAS_Shared}/enkf_types.F90 | 0 .../GEOSldas_GridComp/{Shared => LDAS_Shared}/my_lu_decomp.f | 0 .../{Shared => LDAS_Shared}/my_matrix_functions.F90 | 0 .../GEOSldas_GridComp/{Shared => LDAS_Shared}/nr_indexx.f | 0 17 files changed, 1 insertion(+), 1 deletion(-) rename src/Components/GEOSldas_GridComp/{Shared => LDAS_Shared}/CMakeLists.txt (100%) rename src/Components/GEOSldas_GridComp/{Shared => LDAS_Shared}/LDAS_Convert.F90 (100%) rename src/Components/GEOSldas_GridComp/{Shared => LDAS_Shared}/LDAS_DriverTypes.F90 (100%) rename src/Components/GEOSldas_GridComp/{Shared => LDAS_Shared}/LDAS_Exceptions.F90 (100%) rename src/Components/GEOSldas_GridComp/{Shared => LDAS_Shared}/LDAS_PertTypes.F90 (100%) rename src/Components/GEOSldas_GridComp/{Shared => LDAS_Shared}/LDAS_RepairForcing.F90 (100%) rename src/Components/GEOSldas_GridComp/{Shared => LDAS_Shared}/LDAS_TileCoordRoutines.F90 (100%) rename src/Components/GEOSldas_GridComp/{Shared => LDAS_Shared}/LDAS_TileCoordType.F90 (100%) rename src/Components/GEOSldas_GridComp/{Shared => LDAS_Shared}/LDAS_ensdrv_Globals.F90 (100%) rename src/Components/GEOSldas_GridComp/{Shared => LDAS_Shared}/LDAS_ensdrv_functions.F90 (100%) rename src/Components/GEOSldas_GridComp/{Shared => LDAS_Shared}/LDAS_ensdrv_mpi.F90 (100%) rename src/Components/GEOSldas_GridComp/{Shared => LDAS_Shared}/catch_types.F90 (100%) rename src/Components/GEOSldas_GridComp/{Shared => LDAS_Shared}/enkf_types.F90 (100%) rename src/Components/GEOSldas_GridComp/{Shared => LDAS_Shared}/my_lu_decomp.f (100%) rename src/Components/GEOSldas_GridComp/{Shared => LDAS_Shared}/my_matrix_functions.F90 (100%) rename src/Components/GEOSldas_GridComp/{Shared => LDAS_Shared}/nr_indexx.f (100%) diff --git a/src/Components/GEOSldas_GridComp/CMakeLists.txt b/src/Components/GEOSldas_GridComp/CMakeLists.txt index 05ddb49b..d6a7018a 100644 --- 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/src/Components/GEOSldas_GridComp/Shared/CMakeLists.txt b/src/Components/GEOSldas_GridComp/LDAS_Shared/CMakeLists.txt similarity index 100% rename from src/Components/GEOSldas_GridComp/Shared/CMakeLists.txt rename to src/Components/GEOSldas_GridComp/LDAS_Shared/CMakeLists.txt diff --git a/src/Components/GEOSldas_GridComp/Shared/LDAS_Convert.F90 b/src/Components/GEOSldas_GridComp/LDAS_Shared/LDAS_Convert.F90 similarity index 100% rename from src/Components/GEOSldas_GridComp/Shared/LDAS_Convert.F90 rename to src/Components/GEOSldas_GridComp/LDAS_Shared/LDAS_Convert.F90 diff --git a/src/Components/GEOSldas_GridComp/Shared/LDAS_DriverTypes.F90 b/src/Components/GEOSldas_GridComp/LDAS_Shared/LDAS_DriverTypes.F90 similarity index 100% rename from src/Components/GEOSldas_GridComp/Shared/LDAS_DriverTypes.F90 rename to src/Components/GEOSldas_GridComp/LDAS_Shared/LDAS_DriverTypes.F90 diff --git a/src/Components/GEOSldas_GridComp/Shared/LDAS_Exceptions.F90 b/src/Components/GEOSldas_GridComp/LDAS_Shared/LDAS_Exceptions.F90 similarity index 100% rename from src/Components/GEOSldas_GridComp/Shared/LDAS_Exceptions.F90 rename to src/Components/GEOSldas_GridComp/LDAS_Shared/LDAS_Exceptions.F90 diff --git a/src/Components/GEOSldas_GridComp/Shared/LDAS_PertTypes.F90 b/src/Components/GEOSldas_GridComp/LDAS_Shared/LDAS_PertTypes.F90 similarity index 100% rename from src/Components/GEOSldas_GridComp/Shared/LDAS_PertTypes.F90 rename to src/Components/GEOSldas_GridComp/LDAS_Shared/LDAS_PertTypes.F90 diff --git a/src/Components/GEOSldas_GridComp/Shared/LDAS_RepairForcing.F90 b/src/Components/GEOSldas_GridComp/LDAS_Shared/LDAS_RepairForcing.F90 similarity index 100% rename from src/Components/GEOSldas_GridComp/Shared/LDAS_RepairForcing.F90 rename to src/Components/GEOSldas_GridComp/LDAS_Shared/LDAS_RepairForcing.F90 diff --git a/src/Components/GEOSldas_GridComp/Shared/LDAS_TileCoordRoutines.F90 b/src/Components/GEOSldas_GridComp/LDAS_Shared/LDAS_TileCoordRoutines.F90 similarity index 100% rename from src/Components/GEOSldas_GridComp/Shared/LDAS_TileCoordRoutines.F90 rename to src/Components/GEOSldas_GridComp/LDAS_Shared/LDAS_TileCoordRoutines.F90 diff --git a/src/Components/GEOSldas_GridComp/Shared/LDAS_TileCoordType.F90 b/src/Components/GEOSldas_GridComp/LDAS_Shared/LDAS_TileCoordType.F90 similarity index 100% rename from src/Components/GEOSldas_GridComp/Shared/LDAS_TileCoordType.F90 rename to src/Components/GEOSldas_GridComp/LDAS_Shared/LDAS_TileCoordType.F90 diff --git a/src/Components/GEOSldas_GridComp/Shared/LDAS_ensdrv_Globals.F90 b/src/Components/GEOSldas_GridComp/LDAS_Shared/LDAS_ensdrv_Globals.F90 similarity index 100% rename from src/Components/GEOSldas_GridComp/Shared/LDAS_ensdrv_Globals.F90 rename to src/Components/GEOSldas_GridComp/LDAS_Shared/LDAS_ensdrv_Globals.F90 diff --git a/src/Components/GEOSldas_GridComp/Shared/LDAS_ensdrv_functions.F90 b/src/Components/GEOSldas_GridComp/LDAS_Shared/LDAS_ensdrv_functions.F90 similarity index 100% rename from src/Components/GEOSldas_GridComp/Shared/LDAS_ensdrv_functions.F90 rename to src/Components/GEOSldas_GridComp/LDAS_Shared/LDAS_ensdrv_functions.F90 diff --git a/src/Components/GEOSldas_GridComp/Shared/LDAS_ensdrv_mpi.F90 b/src/Components/GEOSldas_GridComp/LDAS_Shared/LDAS_ensdrv_mpi.F90 similarity index 100% rename from src/Components/GEOSldas_GridComp/Shared/LDAS_ensdrv_mpi.F90 rename to src/Components/GEOSldas_GridComp/LDAS_Shared/LDAS_ensdrv_mpi.F90 diff --git a/src/Components/GEOSldas_GridComp/Shared/catch_types.F90 b/src/Components/GEOSldas_GridComp/LDAS_Shared/catch_types.F90 similarity index 100% rename from src/Components/GEOSldas_GridComp/Shared/catch_types.F90 rename to src/Components/GEOSldas_GridComp/LDAS_Shared/catch_types.F90 diff --git a/src/Components/GEOSldas_GridComp/Shared/enkf_types.F90 b/src/Components/GEOSldas_GridComp/LDAS_Shared/enkf_types.F90 similarity index 100% rename from src/Components/GEOSldas_GridComp/Shared/enkf_types.F90 rename to src/Components/GEOSldas_GridComp/LDAS_Shared/enkf_types.F90 diff --git a/src/Components/GEOSldas_GridComp/Shared/my_lu_decomp.f b/src/Components/GEOSldas_GridComp/LDAS_Shared/my_lu_decomp.f similarity index 100% rename from src/Components/GEOSldas_GridComp/Shared/my_lu_decomp.f rename to src/Components/GEOSldas_GridComp/LDAS_Shared/my_lu_decomp.f diff --git a/src/Components/GEOSldas_GridComp/Shared/my_matrix_functions.F90 b/src/Components/GEOSldas_GridComp/LDAS_Shared/my_matrix_functions.F90 similarity index 100% rename from src/Components/GEOSldas_GridComp/Shared/my_matrix_functions.F90 rename to src/Components/GEOSldas_GridComp/LDAS_Shared/my_matrix_functions.F90 diff --git a/src/Components/GEOSldas_GridComp/Shared/nr_indexx.f b/src/Components/GEOSldas_GridComp/LDAS_Shared/nr_indexx.f similarity index 100% rename from src/Components/GEOSldas_GridComp/Shared/nr_indexx.f rename to src/Components/GEOSldas_GridComp/LDAS_Shared/nr_indexx.f