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.

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

PLUMBER2 plumbing (csv file, wrapper script, usermods, and scripts). #2155

Merged
merged 55 commits into from
Apr 19, 2024
Merged
Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
39451d8
Add ncl script that creates PLUMBER2 csv file, and the file itself.
olyson Sep 13, 2023
30df16b
csv file header change.
olyson Sep 13, 2023
5600744
Add PLUMBER2 surface dataset wrapper.
olyson Sep 13, 2023
fe27886
Add PLUMBER2 usermods defaults.
olyson Sep 13, 2023
8ee05b8
Add canopy top and bottom heights.
olyson Oct 4, 2023
1272e58
PLUMBER surface data & usermods
wwieder Oct 5, 2023
b87b359
updaed shell commands
wwieder Oct 5, 2023
1ef7bb4
py script for creating usermods
wwieder Oct 5, 2023
e8c1524
corrected surfdat filename
wwieder Oct 5, 2023
5f9b08c
resolving conflicts
wwieder Oct 5, 2023
b429b63
black formatting
wwieder Oct 6, 2023
38117f9
git ignore black
wwieder Oct 6, 2023
d53f136
remove default history files
wwieder Oct 26, 2023
d6de294
adding datm streams to usermods
wwieder Oct 27, 2023
7e7a485
actual usermod changes
wwieder Oct 27, 2023
1c3ea1c
removing custom O3 years
wwieder Oct 30, 2023
300e83e
updating default datm_stream and vars
wwieder Oct 30, 2023
aac7522
update datm for usermods
wwieder Nov 2, 2023
8d34685
updates plumber2 usermods
wwieder Nov 2, 2023
e24e564
Merge tag 'ctsm5.1.dev168' into PLUMBERcsv
wwieder Feb 21, 2024
f92d802
Changes in response to review and remove print statements
olyson Mar 13, 2024
0620822
History variable changed from QFLX_SUB_SNOW to
olyson Mar 14, 2024
544fffc
Correct instances of xlmchange (should be xmlchange)
olyson Mar 14, 2024
a202a6a
Merge remote-tracking branch 'escomp/b4b-dev' into PLUMBERcsv
ekluzek Mar 20, 2024
666ba3d
Merge remote-tracking branch 'escomp/b4b-dev' into PLUMBERcsv
ekluzek Mar 21, 2024
83df995
Merge remote-tracking branch 'escomp/b4b-dev' into PLUMBERcsv
ekluzek Mar 22, 2024
a7d26c0
updating input data file paths
wwieder Mar 29, 2024
51879ca
Merge pull request #3 from wwieder/PLUMBERcsv
wwieder Mar 29, 2024
c261df6
remove unused line
wwieder Mar 29, 2024
3b09746
Merge pull request #4 from wwieder/PLUMBERcsv
wwieder Apr 1, 2024
c06ce10
close quote on fsurdat
wwieder Apr 1, 2024
394b0ba
more usermod updates
wwieder Apr 1, 2024
d2fa030
Merge pull request #5 from wwieder/PLUMBERcsv
wwieder Apr 1, 2024
3a01490
updates for LAI streams
wwieder Apr 1, 2024
1f4cb01
Merge pull request #6 from wwieder/PLUMBERcsv
wwieder Apr 2, 2024
3591d02
update year_start for actual year
wwieder Apr 9, 2024
55e4683
Merge pull request #7 from wwieder/PLUMBERcsv
wwieder Apr 9, 2024
142343f
inching closer to functional usermods
wwieder Apr 12, 2024
61676c0
starting to add dtlimit for lai streams
wwieder Apr 12, 2024
6dd3b54
bring lai_dtlimit to namelist variable
wwieder Apr 13, 2024
4762186
updating usermods for lai_dtlimit
wwieder Apr 13, 2024
6a4dad8
more usermods for SP/BGG + spin/hist
wwieder Apr 14, 2024
149b95e
extend dtlimit for transient runs
wwieder Apr 15, 2024
ba9b05f
setting CALENDAR correctly for spinup and transient cases
wwieder Apr 15, 2024
362d412
chagnes requested for LAI streams
wwieder Apr 15, 2024
1548c0b
getting lai streams to work for HIST cases
wwieder Apr 15, 2024
7aafb0c
adding a bit to log file
wwieder Apr 15, 2024
4a19a1c
Merge pull request #8 from wwieder/PLUMBERcsv
wwieder Apr 16, 2024
690caa5
Do not handle lai_dtlimit as a string and the code builds again
slevis-lmwg Apr 18, 2024
7c70971
Fix utest error: missing 2 required positional arguments: 'cth' 'cbh'
slevis-lmwg Apr 18, 2024
ba0a3c2
Fix utest error: zip argument must support iteration
slevis-lmwg Apr 18, 2024
f38a5d6
Fix utest errors: various and one still remains
slevis-lmwg Apr 18, 2024
86fbaf6
Fix final utest error; a system test error still fails
slevis-lmwg Apr 18, 2024
ad40afa
Corrections regarding WARNING versus ERROR confusion in unit test
slevis-lmwg Apr 18, 2024
b078a1b
Merge branch 'b4b-dev' into PLUMBERcsv
slevis-lmwg Apr 18, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Ran python directory through black python formatter
b429b63824e09f82e95d2982f14311cbbd8e4a37
4cd83cb3ee6d85eb909403487abf5eeaf4d98911
0aa2957c1f8603c63fa30b11295c06cfddff44a5
2cdb380febb274478e84cd90945aee93f29fa2e6
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../defaults
29 changes: 29 additions & 0 deletions cime_config/usermods_dirs/PLUMBER2/AR-SLu/shell_commands
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
./xmlchange PLUMBER2SITE=AR-SLu
ekluzek marked this conversation as resolved.
Show resolved Hide resolved
./xmlchange PTS_LON=-66.459808
./xmlchange PTS_LAT=-33.464802
./xmlchange RUN_STARTDATE=2010-01-01
./xmlchange DATM_YR_ALIGN=2010
./xmlchange DATM_YR_START=2010
./xmlchange DATM_YR_END=2010
./xmlchange START_TOD=10800
./xmlchange ATM_NCPL=48

compset=`./xmlquery COMPSET --value`
CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
TEST=`./xmlquery TEST --value`

# For a transient case run the whole length and do not cycle
if [[ $compset =~ ^HIST ]]; then
# Number of years that can be run for the full transient case
if [[ $TEST != "TRUE" ]]; then
./xmlchange STOP_N=1
fi
fi

# Turn on LAI streams for a SP case
if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2010.nc'" >> user_nl_clm
ekluzek marked this conversation as resolved.
Show resolved Hide resolved
echo "model_year_align_lai=2010" >> user_nl_clm
echo "stream_year_first_lai=2010" >> user_nl_clm
echo "stream_year_last_lai=2010" >> user_nl_clm
fi
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../defaults
29 changes: 29 additions & 0 deletions cime_config/usermods_dirs/PLUMBER2/AT-Neu/shell_commands
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
./xmlchange PLUMBER2SITE=AT-Neu
./xmlchange PTS_LON=11.3175
./xmlchange PTS_LAT=47.116669
./xmlchange RUN_STARTDATE=2001-12-31
./xmlchange DATM_YR_ALIGN=2002
./xmlchange DATM_YR_START=2002
./xmlchange DATM_YR_END=2012
./xmlchange START_TOD=82800
./xmlchange ATM_NCPL=48

compset=`./xmlquery COMPSET --value`
CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
TEST=`./xmlquery TEST --value`

# For a transient case run the whole length and do not cycle
if [[ $compset =~ ^HIST ]]; then
# Number of years that can be run for the full transient case
if [[ $TEST != "TRUE" ]]; then
./xmlchange STOP_N=11
fi
fi

# Turn on LAI streams for a SP case
if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2002-2012.nc'" >> user_nl_clm
echo "model_year_align_lai=2002" >> user_nl_clm
ekluzek marked this conversation as resolved.
Show resolved Hide resolved
echo "stream_year_first_lai=2002" >> user_nl_clm
echo "stream_year_last_lai=2012" >> user_nl_clm
fi
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../defaults
29 changes: 29 additions & 0 deletions cime_config/usermods_dirs/PLUMBER2/AU-ASM/shell_commands
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
./xmlchange PLUMBER2SITE=AU-ASM
./xmlchange PTS_LON=133.24899299999998
./xmlchange PTS_LAT=-22.283001000000002
./xmlchange RUN_STARTDATE=2010-12-31
./xmlchange DATM_YR_ALIGN=2011
./xmlchange DATM_YR_START=2011
./xmlchange DATM_YR_END=2017
./xmlchange START_TOD=54000
./xmlchange ATM_NCPL=48

compset=`./xmlquery COMPSET --value`
CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
TEST=`./xmlquery TEST --value`

# For a transient case run the whole length and do not cycle
if [[ $compset =~ ^HIST ]]; then
# Number of years that can be run for the full transient case
if [[ $TEST != "TRUE" ]]; then
./xmlchange STOP_N=7
fi
fi

# Turn on LAI streams for a SP case
if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2017.nc'" >> user_nl_clm
echo "model_year_align_lai=2011" >> user_nl_clm
echo "stream_year_first_lai=2011" >> user_nl_clm
echo "stream_year_last_lai=2017" >> user_nl_clm
fi
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../defaults
29 changes: 29 additions & 0 deletions cime_config/usermods_dirs/PLUMBER2/AU-Cow/shell_commands
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
./xmlchange PLUMBER2SITE=AU-Cow
./xmlchange PTS_LON=145.427155
./xmlchange PTS_LAT=-16.23819
./xmlchange RUN_STARTDATE=2009-12-31
./xmlchange DATM_YR_ALIGN=2010
./xmlchange DATM_YR_START=2010
./xmlchange DATM_YR_END=2015
./xmlchange START_TOD=50400
./xmlchange ATM_NCPL=48

compset=`./xmlquery COMPSET --value`
CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
TEST=`./xmlquery TEST --value`

# For a transient case run the whole length and do not cycle
if [[ $compset =~ ^HIST ]]; then
# Number of years that can be run for the full transient case
if [[ $TEST != "TRUE" ]]; then
./xmlchange STOP_N=6
fi
fi

# Turn on LAI streams for a SP case
if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2015.nc'" >> user_nl_clm
echo "model_year_align_lai=2010" >> user_nl_clm
echo "stream_year_first_lai=2010" >> user_nl_clm
echo "stream_year_last_lai=2015" >> user_nl_clm
fi
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../defaults
29 changes: 29 additions & 0 deletions cime_config/usermods_dirs/PLUMBER2/AU-Cpr/shell_commands
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
./xmlchange PLUMBER2SITE=AU-Cpr
./xmlchange PTS_LON=140.589127
./xmlchange PTS_LAT=-34.00206
./xmlchange RUN_STARTDATE=2010-12-31
./xmlchange DATM_YR_ALIGN=2011
./xmlchange DATM_YR_START=2011
./xmlchange DATM_YR_END=2017
./xmlchange START_TOD=46800
./xmlchange ATM_NCPL=48

compset=`./xmlquery COMPSET --value`
CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
TEST=`./xmlquery TEST --value`

# For a transient case run the whole length and do not cycle
if [[ $compset =~ ^HIST ]]; then
# Number of years that can be run for the full transient case
if [[ $TEST != "TRUE" ]]; then
./xmlchange STOP_N=7
fi
fi

# Turn on LAI streams for a SP case
if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2017.nc'" >> user_nl_clm
echo "model_year_align_lai=2011" >> user_nl_clm
echo "stream_year_first_lai=2011" >> user_nl_clm
echo "stream_year_last_lai=2017" >> user_nl_clm
fi
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../defaults
29 changes: 29 additions & 0 deletions cime_config/usermods_dirs/PLUMBER2/AU-Ctr/shell_commands
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
./xmlchange PLUMBER2SITE=AU-Ctr
./xmlchange PTS_LON=145.446854
./xmlchange PTS_LAT=-16.103279
./xmlchange RUN_STARTDATE=2009-12-31
./xmlchange DATM_YR_ALIGN=2010
./xmlchange DATM_YR_START=2010
./xmlchange DATM_YR_END=2017
./xmlchange START_TOD=50400
./xmlchange ATM_NCPL=48

compset=`./xmlquery COMPSET --value`
CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
TEST=`./xmlquery TEST --value`

# For a transient case run the whole length and do not cycle
if [[ $compset =~ ^HIST ]]; then
# Number of years that can be run for the full transient case
if [[ $TEST != "TRUE" ]]; then
./xmlchange STOP_N=8
fi
fi

# Turn on LAI streams for a SP case
if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2017.nc'" >> user_nl_clm
echo "model_year_align_lai=2010" >> user_nl_clm
echo "stream_year_first_lai=2010" >> user_nl_clm
echo "stream_year_last_lai=2017" >> user_nl_clm
fi
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../defaults
29 changes: 29 additions & 0 deletions cime_config/usermods_dirs/PLUMBER2/AU-Cum/shell_commands
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
./xmlchange PLUMBER2SITE=AU-Cum
./xmlchange PTS_LON=150.722473
./xmlchange PTS_LAT=-33.613296999999996
./xmlchange RUN_STARTDATE=2012-12-31
./xmlchange DATM_YR_ALIGN=2013
./xmlchange DATM_YR_START=2013
./xmlchange DATM_YR_END=2018
./xmlchange START_TOD=46800
./xmlchange ATM_NCPL=48

compset=`./xmlquery COMPSET --value`
CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
TEST=`./xmlquery TEST --value`

# For a transient case run the whole length and do not cycle
if [[ $compset =~ ^HIST ]]; then
# Number of years that can be run for the full transient case
if [[ $TEST != "TRUE" ]]; then
./xmlchange STOP_N=6
fi
fi

# Turn on LAI streams for a SP case
if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2013-2018.nc'" >> user_nl_clm
echo "model_year_align_lai=2013" >> user_nl_clm
echo "stream_year_first_lai=2013" >> user_nl_clm
echo "stream_year_last_lai=2018" >> user_nl_clm
fi
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../defaults
29 changes: 29 additions & 0 deletions cime_config/usermods_dirs/PLUMBER2/AU-DaP/shell_commands
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
./xmlchange PLUMBER2SITE=AU-DaP
./xmlchange PTS_LON=131.3181
./xmlchange PTS_LAT=-14.0633
./xmlchange RUN_STARTDATE=2008-12-31
./xmlchange DATM_YR_ALIGN=2009
./xmlchange DATM_YR_START=2009
./xmlchange DATM_YR_END=2012
./xmlchange START_TOD=54000
./xmlchange ATM_NCPL=48

compset=`./xmlquery COMPSET --value`
CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
TEST=`./xmlquery TEST --value`

# For a transient case run the whole length and do not cycle
if [[ $compset =~ ^HIST ]]; then
# Number of years that can be run for the full transient case
if [[ $TEST != "TRUE" ]]; then
./xmlchange STOP_N=4
fi
fi

# Turn on LAI streams for a SP case
if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2009-2012.nc'" >> user_nl_clm
echo "model_year_align_lai=2009" >> user_nl_clm
echo "stream_year_first_lai=2009" >> user_nl_clm
echo "stream_year_last_lai=2012" >> user_nl_clm
fi
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../defaults
29 changes: 29 additions & 0 deletions cime_config/usermods_dirs/PLUMBER2/AU-DaS/shell_commands
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
./xmlchange PLUMBER2SITE=AU-DaS
./xmlchange PTS_LON=131.388
./xmlchange PTS_LAT=-14.159282999999999
./xmlchange RUN_STARTDATE=2009-12-31
./xmlchange DATM_YR_ALIGN=2010
./xmlchange DATM_YR_START=2010
./xmlchange DATM_YR_END=2017
./xmlchange START_TOD=54000
./xmlchange ATM_NCPL=48

compset=`./xmlquery COMPSET --value`
CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
TEST=`./xmlquery TEST --value`

# For a transient case run the whole length and do not cycle
if [[ $compset =~ ^HIST ]]; then
# Number of years that can be run for the full transient case
if [[ $TEST != "TRUE" ]]; then
./xmlchange STOP_N=8
fi
fi

# Turn on LAI streams for a SP case
if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2010-2017.nc'" >> user_nl_clm
echo "model_year_align_lai=2010" >> user_nl_clm
echo "stream_year_first_lai=2010" >> user_nl_clm
echo "stream_year_last_lai=2017" >> user_nl_clm
fi
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../defaults
29 changes: 29 additions & 0 deletions cime_config/usermods_dirs/PLUMBER2/AU-Dry/shell_commands
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
./xmlchange PLUMBER2SITE=AU-Dry
./xmlchange PTS_LON=132.370605
./xmlchange PTS_LAT=-15.2588
./xmlchange RUN_STARTDATE=2010-12-31
./xmlchange DATM_YR_ALIGN=2011
./xmlchange DATM_YR_START=2011
./xmlchange DATM_YR_END=2015
./xmlchange START_TOD=54000
./xmlchange ATM_NCPL=48

compset=`./xmlquery COMPSET --value`
CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
TEST=`./xmlquery TEST --value`

# For a transient case run the whole length and do not cycle
if [[ $compset =~ ^HIST ]]; then
# Number of years that can be run for the full transient case
if [[ $TEST != "TRUE" ]]; then
./xmlchange STOP_N=5
fi
fi

# Turn on LAI streams for a SP case
if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2011-2015.nc'" >> user_nl_clm
echo "model_year_align_lai=2011" >> user_nl_clm
echo "stream_year_first_lai=2011" >> user_nl_clm
echo "stream_year_last_lai=2015" >> user_nl_clm
fi
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../defaults
29 changes: 29 additions & 0 deletions cime_config/usermods_dirs/PLUMBER2/AU-Emr/shell_commands
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
./xmlchange PLUMBER2SITE=AU-Emr
./xmlchange PTS_LON=148.474594
./xmlchange PTS_LAT=-23.8587
./xmlchange RUN_STARTDATE=2011-12-31
./xmlchange DATM_YR_ALIGN=2012
./xmlchange DATM_YR_START=2012
./xmlchange DATM_YR_END=2013
./xmlchange START_TOD=50400
./xmlchange ATM_NCPL=48

compset=`./xmlquery COMPSET --value`
CLM_USRDAT_NAME=`./xmlquery CLM_USRDAT_NAME --value`
TEST=`./xmlquery TEST --value`

# For a transient case run the whole length and do not cycle
if [[ $compset =~ ^HIST ]]; then
# Number of years that can be run for the full transient case
if [[ $TEST != "TRUE" ]]; then
./xmlchange STOP_N=2
fi
fi

# Turn on LAI streams for a SP case
if [[ $compset =~ .*CLM[0-9]+%[^_]*SP.* ]]; then
echo "stream_fldfilename_lai='/glade/work/oleson/PLUMBER2/input_files/${PLUMBER2SITE}/LAI_stream_${PLUMBER2SITE}_2012-2013.nc'" >> user_nl_clm
echo "model_year_align_lai=2012" >> user_nl_clm
echo "stream_year_first_lai=2012" >> user_nl_clm
echo "stream_year_last_lai=2013" >> user_nl_clm
fi
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../defaults
Loading