Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 15 commits into from
Dec 2, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
9437b30
update CLM3.5 with Stages/2024 fixes
jjokella Nov 26, 2024
f21be93
Merge branch 'stages-2024' into stages-2024-clm3.5
jjokella Nov 27, 2024
29f0665
Merge branch 'stages-2024' into stages-2024-clm3.5
jjokella Nov 28, 2024
4640afc
update `parflow_pdaf` to `v3.13.0-pdaf`
jjokella Nov 28, 2024
3b95657
update `parflow_pdaf` with bugfixes
jjokella Nov 28, 2024
8bdb073
update `parflow_pdaf` with bugfix
jjokella Nov 28, 2024
106dc72
update `pdaf` with `origin_local` definition fix
jjokella Nov 28, 2024
0168c45
ParFlow-PDAF: Set `-DUSE_PDAF=True` for PDAF-ParFlow-builds
jjokella Nov 28, 2024
7f390c3
update `parflow_pdaf` with `USE_PDAF` fix
jjokella Nov 29, 2024
2935952
update `parflow_pdaf` with `USE_PDAF` fix II
jjokella Nov 29, 2024
9583b43
update `parflow_pdaf` with `USE_PDAF` fix III
jjokella Nov 29, 2024
be0057a
BuildPDAFMODEL: Add `-DUSE_PDAF`
jjokella Nov 29, 2024
e2b03ab
udpate `parflow` revert back to before `USE_PDAF`
jjokella Nov 29, 2024
8e2f393
Comment out `USE_PDAF` flag for PDAFMODEL
jjokella Dec 2, 2024
637739e
remove any mention to `USE_PDAF`
jjokella Dec 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion models/CLM3.5
Open in desktop
Submodule CLM3.5 updated 1 files
+3 −3 src/utils/timing/gptl.c
2 changes: 1 addition & 1 deletion models/parflow_pdaf
Open in desktop
Submodule parflow_pdaf updated 1272 files
2 changes: 1 addition & 1 deletion models/pdaf
Open in desktop
Submodule pdaf updated 8 files
+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