Stages/2024: PDAF-related updates and fixes (#43)

Updates and bugfixes in the component models - ParFlow: Update to version `v3.13.0` and add PDAF-fixes producing new tag `v3.13.0-pdaf` (https://github.com/HPSCTerrSys/parflow/releases/tag/v3.13.0-pdaf) - CLM3.5: Bugfix and new tag `tsmp-patches-v0.3` (https://github.com/HPSCTerrSys/CLM3.5/releases/tag/tsmp-patches-v0.3) - PDAF: Update with general developments.
HPSCTerrSys · Dec 2, 2024 · 2f285d6 · 2f285d6
1 parent 157ebdc
commit 2f285d6
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -9,7 +9,7 @@
 [submodule "models/parflow_pdaf"]
 	path = models/parflow_pdaf
 	url = https://github.com/HPSCTerrSys/parflow
-	branch = tsmp-pdaf
+	branch = tsmp-pdaf-patched
 [submodule "models/pdaf"]
 	path = models/pdaf
 	url = https://github.com/HPSCTerrSys/pdaf.git

diff --git a/README.md b/README.md
@@ -94,7 +94,7 @@ git clone -b v3.12.0 https://github.com/parflow/parflow.git models/parflow
 PARFLOW_SRC=`realpath models/parflow`
 
 # ParFlow (PDAF-patched)
-git clone -b v3.12.0-tsmp https://github.com/HPSCTerrSys/parflow models/parflow_pdaf
+git clone -b v3.13.0-pdaf https://github.com/HPSCTerrSys/parflow models/parflow_pdaf
 PARFLOW_SRC=`realpath models/parflow_pdaf`
 
 # CLM3.5

diff --git a/models/CLM3.5 b/models/CLM3.5
diff --git a/models/parflow_pdaf b/models/parflow_pdaf
diff --git a/models/pdaf b/models/pdaf
+3 −3		interface/framework/init_dim_obs_f_pdaf.F90
+16 −114		interface/framework/init_dim_obs_l_pdaf.F90
+3 −3		interface/framework/init_dim_obs_pdaf.F90
+2 −2		interface/framework/localize_covar_pdaf.F90
+1 −1		interface/model/clm3_5/enkf_clm_mod.F90
+1 −1		interface/model/clm5_0/enkf_clm_mod_5.F90
+1 −1		interface/model/eclm/enkf_clm_mod_5.F90
+1 −1		interface/model/parflow/enkf_parflow.h