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

Include PRISM precipitation datm streams #219

Merged
merged 20 commits into from
May 3, 2023
Merged

Include PRISM precipitation datm streams #219

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
4ae7d6f
include PRISM precipitation data streams
TeaganKing Feb 21, 2023
400f475
changed name of PRISM PRECIP stream
TeaganKing Mar 7, 2023
7833024
temporary updates for nl and stream changes
TeaganKing Mar 22, 2023
f0942b9
update buildnml
TeaganKing Mar 27, 2023
60a32b7
fix buildnml
TeaganKing Mar 27, 2023
99f4dc3
include third datm stream for NEON
TeaganKing Mar 29, 2023
0f087f5
datafile fix for PRISM_PRECIP
TeaganKing Mar 30, 2023
e6676be
add tests, use in stream nl
TeaganKing Apr 6, 2023
a6ec34f
minor bug
TeaganKing Apr 6, 2023
53b75f0
cleanup logger info
TeaganKing Apr 7, 2023
0cbf0ab
inputdata stream adjustment in xml; CDEPS testdefs/shell commands
TeaganKing Apr 13, 2023
d97ebc3
remove prism test without shell command
TeaganKing Apr 13, 2023
f6f4c22
inputdata updates
TeaganKing Apr 13, 2023
02f3e3a
update to include v3
TeaganKing Apr 14, 2023
36b9b19
remove cdeps tests
TeaganKing Apr 18, 2023
7c2876e
Merge branch 'main' into main
TeaganKing Apr 18, 2023
1a71713
include comment v1
TeaganKing Apr 20, 2023
088436d
Syntax error for the prism data
ekluzek Apr 26, 2023
9c0d3dc
Merge commit '088436d'
ekluzek Apr 26, 2023
cd96aac
buildnml prism version loop comment
TeaganKing Apr 26, 2023
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
1 change: 1 addition & 0 deletions cime_config/stream_cdeps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ def create_stream_xml(self, stream_names, case, streams_xml_file, data_list_file
# endif
# end while
index += 1
line = case.get_resolved_value(line)
lines_input_new.append(line)
#end while

Expand Down
2 changes: 1 addition & 1 deletion datm/cime_config/namelist_definition_datm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
1PT.urbanc_alpha
</value>
<value datm_mode="1PT" model_grid="CLM_USRDAT" neon="True">
NEON.$NEONSITE
NEON.$NEONSITE,NEON.$NEONSITE.PRECIP
</value>
<value datm_mode="1PT" model_grid="CLM_USRDAT">
CLM_USRDAT.$CLM_USRDAT_NAME
Expand Down
40 changes: 39 additions & 1 deletion datm/cime_config/stream_definition_datm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@
<file first_year="$DATM_YR_START" last_year="$DATM_YR_END">$DIN_LOC_ROOT/atm/cdeps/v1/$NEONSITE/%ym.nc</file>
Copy link
Collaborator Author

@TeaganKing TeaganKing Apr 18, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We only have a 'v1' on /glade/p/cesmdata/cseg/inputdata/atm/cdeps. However, should both of the NEON streams (NEON and NEON.PRECIP) be pulling in 'v2' or 'v3' data from the NEON side? @wwieder , this was the potential issue I was referring to in our conversation on Monday.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jedwards4b after discussing with @wwieder , it sounds like this gets overwritten to the latest version elsewhere, but should we update to 'v2'?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess if it's only being overwritten to change v1 to v2 then I would both update this to v2 AND get rid of the code that is overwriting this setting. Make sense?

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just to clarify, we want the feature to continue drawing from the latest version if no version is specified (e.g. some NEON sites have v3 data now!).

I get confused because the run_neon script has a feature that allows users to specify what version is being used, but the cdeps code seems hard coded to v1.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay. I agree that logically makes sense, but I'm not really sure where this actually gets updated, and I think we want to take the latest version (v3 is coming online soon/partially available for one site). For the sake of getting this PR merged and maintaining flexibility, I think it may make the most sense to add a comment to clarify this in CDEPS, and potentially tweak run_neon in the future.

</stream_datafiles>
<stream_datavars>
<var>PRECTmms Faxa_precn</var>
<!-- <var>PRECTmms Faxa_precn</var> --> <!-- COMMENT THIS OUT WHEN RUNNING WITH PRISM-->
<var>FSDS Faxa_swdn </var>
<var>ZBOT Sa_z </var>
<var>TBOT Sa_tbot </var>
Expand Down Expand Up @@ -267,6 +267,44 @@
<stream_readmode>single</stream_readmode>
</stream_entry>


<!-- =================================== -->
<!-- datm_mode NEON.$NEONSITE.PRECIP -->
<!-- =================================== -->

<stream_entry name="NEON.$NEONSITE.PRECIP">
<stream_meshfile>
<meshfile>none</meshfile>
</stream_meshfile>
<stream_datafiles>
<file first_year="2018" last_year="2021">/glade/u/home/tking/neon/prism_$NEONSITE_%y.nc</file>
</stream_datafiles>
<stream_datavars>
<var>PRECIP Faxa_precn</var>
</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