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

support for catchcn ensemble run #584

Merged
merged 17 commits into from
Oct 18, 2022
Merged

support for catchcn ensemble run #584

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
337b1c3
enable catchcn ensemble run and export more variables
weiyuan-jiang Sep 22, 2022
12d176d
adjust component for testing
weiyuan-jiang Sep 22, 2022
86e7de0
get CNFROOTC from ENSAVG grid comp
weiyuan-jiang Sep 28, 2022
9d4ac2d
change ensid suffix from xxxx to _exxxx
weiyuan-jiang Sep 28, 2022
7cea883
change ens_id_string to _exxxx
weiyuan-jiang Sep 30, 2022
c24b96f
additional modifications of previous commit:
gmao-rreichle Sep 30, 2022
5e6dc8c
revised comment line about ensid string in GEOS_MetForceGridComp.F90
gmao-rreichle Sep 30, 2022
78cc7d5
change ens_id_width back to the meaning of "width of digit"
weiyuan-jiang Oct 3, 2022
99d4140
fix some trivial errors
weiyuan-jiang Oct 3, 2022
864e822
fix id_string in landpert
weiyuan-jiang Oct 5, 2022
3d0c007
minor changes.
weiyuan-jiang Oct 5, 2022
e5d4b65
add options for GetPointer when a variabe is missing
weiyuan-jiang Oct 5, 2022
a045efd
add 2 to ens_id_width for "_e"
weiyuan-jiang Oct 6, 2022
f1bd407
minimal clean-up of comments and range checks re. ens_id_width
gmao-rreichle Oct 6, 2022
1e50d2f
Merge branch 'develop' into feature/wjiang/catchcn_ensemble_new
gmao-rreichle Oct 12, 2022
ebe8948
add comments about provenance of CatchCN variables
gmao-rreichle Oct 13, 2022
3437c07
updating components.yaml for merge into develop
gmao-rreichle Oct 18, 2022
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
5 changes: 3 additions & 2 deletions components.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,13 @@ GMAO_Shared:
MAPL:
local: ./src/Shared/@MAPL
remote: ../MAPL.git
tag: v2.25.0
#tag: v2.25.0
branch: feature/wjiang/add_all_exports
develop: develop

GEOSgcm_GridComp:
local: ./src/Components/GEOSldas_GridComp/@GEOSgcm_GridComp
remote: ../GEOSgcm_GridComp.git
branch: develop
branch: feature/wjiang/catchcn_ensemble
sparse: ./config/GEOSgcm_GridComp_ldas.sparse
develop: develop
7 changes: 7 additions & 0 deletions src/Applications/LDAS_App/process_hist.csh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,13 @@ endif
if($NENS > 1) then
set GridComp = ENSAVG
sed -i 's|VEGDYN|'VEGDYN0000'|g' $HISTRC
sed -i 's|CATCHCNCLM45|'CATCHCNCLM450000'|g' $HISTRC
sed -i 's|TP1|'TSOIL1TILE'|g' $HISTRC
sed -i 's|TP2|'TSOIL2TILE'|g' $HISTRC
sed -i 's|TP3|'TSOIL3TILE'|g' $HISTRC
sed -i 's|TP4|'TSOIL4TILE'|g' $HISTRC
sed -i 's|TP5|'TSOIL5TILE'|g' $HISTRC
sed -i 's|TP6|'TSOIL6TILE'|g' $HISTRC
# sed -i 's|DATAATM|'DATAATM0000'|g' $HISTRC
endif

Expand Down
Loading