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

Plumber updates #262

Merged
merged 27 commits into from
Aug 16, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
cda4168
preliminary cdeps updatesls
TeaganKing Mar 8, 2024
b784004
namelist def datm update
TeaganKing Mar 8, 2024
8bd6080
Merge branch 'main' into plumber
mvertens Mar 30, 2024
47a0d2b
updates to PLUMBER stream
TeaganKing May 8, 2024
c2ac676
include correct variables in stream
TeaganKing May 9, 2024
13f4594
temporary plumber change for dtlimit
TeaganKing May 9, 2024
d001610
Update if statements for dtlimit in stream_definition_datm.xml
TeaganKing May 15, 2024
8c47b86
Merge branch 'ESCOMP:main' into plumber
TeaganKing Jun 24, 2024
6d4ce9e
Update stream_definition_datm.xml: PLUMBER to PLUMBER2
TeaganKing Jun 26, 2024
b9c2964
Update buildnml PLUMBER --> PLUMBER2
TeaganKing Jul 30, 2024
e3fb72a
Update namelist_definition_datm.xml PLUMBER --> PLUMBER2
TeaganKing Jul 30, 2024
7e687d3
Update stream_definition_datm.xml PLUMBER --> PLUMBER2
TeaganKing Jul 30, 2024
fe1eece
Update stream_cdeps.py PLUMBER --> PLUMBER2
TeaganKing Jul 30, 2024
1f4f5ca
Update stream_definition_datm.xml documentation
TeaganKing Jul 30, 2024
e98991f
Update buildnml to include fix for PLUMBER2.PLUMBER2SITE (with period)
TeaganKing Aug 1, 2024
d564ec9
Update buildnml to separate plumber/neon cases
TeaganKing Aug 1, 2024
b5395f4
Update buildnml to use caseroot to get plumber2 information because p…
TeaganKing Aug 1, 2024
c9b6e57
Update buildnml now that PLUMBER2SITE xmlchange is working
TeaganKing Aug 2, 2024
734d38a
example hard coded start year in stream_definition_datm.xml
TeaganKing Aug 2, 2024
57256a2
Update stream_cdeps.py to avoid CLM_USRDAT.PLUMBER2 stream
TeaganKing Aug 8, 2024
c6d01f6
include xml var for yr_start in filename for plumber2
TeaganKing Aug 8, 2024
e35cb72
implement xml var DATM_YR_START_FILENAME
TeaganKing Aug 13, 2024
0a43861
updates for aux-cdeps tests now passing
TeaganKing Aug 16, 2024
1251a7b
Merge branch 'ESCOMP:main' into plumber
TeaganKing Aug 16, 2024
1797342
Update config_component.xml to address Erik's comment
TeaganKing Aug 16, 2024
ffd4077
Update config_component.xml to use positive 9999
TeaganKing Aug 16, 2024
7e363e7
Add comment to stream_cdeps.py
TeaganKing Aug 16, 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
7 changes: 7 additions & 0 deletions cime_config/stream_cdeps.py
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,12 @@ def create_stream_xml(
{"name": "NEON.NEON_PRECIP.$NEONSITE"},
err_msg="No stream_entry {} found".format(stream_name),
)
elif stream_name.startswith("PLUMBER"):
self.stream_nodes = super(StreamCDEPS, self).get_child(
"stream_entry",
{"name": "PLUMBER.$PLUMBER2SITE"},
err_msg="No stream_entry {} found".format(stream_name),
)
elif stream_name.startswith("CLM_USRDAT."):
self.stream_nodes = super(StreamCDEPS, self).get_child(
"stream_entry",
Expand Down Expand Up @@ -239,6 +245,7 @@ def create_stream_xml(
and ("PRISM" not in stream_name)
):
rundir = case.get_value("RUNDIR")
#TODO: may need to add a similar PLUMBER line
for neon in available_neon_data:
TeaganKing marked this conversation as resolved.
Show resolved Hide resolved
stream_datafiles += (
os.path.join(rundir, "inputdata", "atm", neon)
Expand Down
2 changes: 2 additions & 0 deletions datm/cime_config/buildnml
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,8 @@ def _create_namelists(case, confdir, inst_string, infile, nmlgen, data_list_path
streamlist.append(clm_usrdat_name+"_PRECIP."+neonsite)
if clm_usrdat_name == 'NEON':
streamlist.append(clm_usrdat_name+".NEON_PRECIP."+neonsite)
if clm_usrdat_name == 'PLUMBER':
streamlist.append(clm_usrdat_name+plumber2site)

bias_correct = nmlgen.get_value("bias_correct")
if bias_correct is not None:
Expand Down
3 changes: 3 additions & 0 deletions datm/cime_config/namelist_definition_datm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@
<value datm_mode="1PT" model_grid="CLM_USRDAT" neon="True">
NEON.$NEONSITE
</value>
<value datm_mode="1PT" model_grid="CLM_USRDAT" neon="True">
PLUMBER.$PLUMBER2SITE
</value>
<value datm_mode="1PT" model_grid="CLM_USRDAT">
CLM_USRDAT.$CLM_USRDAT_NAME
</value>
Expand Down
37 changes: 37 additions & 0 deletions datm/cime_config/stream_definition_datm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,43 @@
<stream_readmode>single</stream_readmode>
</stream_entry>


<!-- =================================== -->
<!-- datm_mode PLUMBER.$PLUMBER2SITE -->
<!-- =================================== -->

<stream_entry name="PLUMBER.$PLUMBER2SITE">
<stream_meshfile>
<meshfile>none</meshfile>
</stream_meshfile>
<stream_datafiles>
<file first_year="$DATM_YR_START" last_year="$DATM_YR_END">$DIN_LOC_ROOT/atm/cdeps/PLUMBER2/${NEONSITE}_%y.nc</file>
</stream_datafiles>
<stream_datavars>
<var>PRECIP Faxa_precn</var> # this will probably need updating
TeaganKing marked this conversation as resolved.
Show resolved Hide resolved
</stream_datavars>
<stream_lev_dimname>null</stream_lev_dimname>
<stream_mapalgo>
<mapalgo>none</mapalgo>
</stream_mapalgo>
<stream_vectors>null</stream_vectors>
<stream_year_align>$DATM_YR_ALIGN</stream_year_align>
<stream_year_first>$DATM_YR_START</stream_year_first>
<stream_year_last>$DATM_YR_END</stream_year_last>
<stream_offset>0</stream_offset>
<stream_tintalgo>
<tintalgo>linear</tintalgo>
</stream_tintalgo>
<stream_taxmode>
<taxmode >cycle</taxmode>
<taxmode compset="HIST">limit</taxmode>
</stream_taxmode>
<stream_dtlimit>
<dtlimit>1.5</dtlimit>
</stream_dtlimit>
<stream_readmode>single</stream_readmode>
</stream_entry>

<!-- =================================== -->
<!-- datm_mode CLMGSWP3v1 -->
<!-- =================================== -->
Expand Down
Loading