Skip to content

Commit

Permalink
Merge branch 'master' into use_pio_env
Browse files Browse the repository at this point in the history
  • Loading branch information
@jedwards4b
jedwards4b authored Jun 2, 2022
2 parents 2b321d5 + 3d35554 commit c8f0877
Show file tree
Hide file tree
Showing 3 changed files with 102 additions and 0 deletions.
3 changes: 3 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,6 @@
*.exe
*.out
*.app

# ignore pycache
__pycache__
3 changes: 3 additions & 0 deletions drof/cime_config/namelist_definition_drof.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@
<value drof_mode="DIATREN_IAF_AIS55_RX1">rof.diatren_iaf_ais55_rx1</value>
<value drof_mode="IAF_JRA_1p4_2018" >rof.iaf_jra_1p4_2018</value>
<value drof_mode="IAF_JRA" >rof.iaf_jra</value>
<value drof_mode="RYF8485_JRA" >rof.ryf8485_jra</value>
<value drof_mode="RYF9091_JRA" >rof.ryf9091_jra</value>
<value drof_mode="RYF0304_JRA" >rof.ryf0304_jra</value>
</values>
</entry>

Expand Down
96 changes: 96 additions & 0 deletions drof/cime_config/stream_definition_drof.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -475,6 +475,102 @@
<stream_readmode>single</stream_readmode>
</stream_entry>

<stream_entry name="rof.ryf8485_jra">
<stream_meshfile>
<meshfile>$DIN_LOC_ROOT/lnd/dlnd7/JRA55/JRA.v1.4.runoff.1958_ESMFmesh_cdf5_20201020.nc</meshfile>
</stream_meshfile>
<stream_datafiles>
<file first_year="1984" last_year="1984">$DIN_LOC_ROOT/lnd/dlnd7/JRA55/RAF_8485.JRA.v1.3.runoff.180404.nc</file>
</stream_datafiles>
<stream_datavars>
<var>rofl Forr_rofl</var>
<var>rofi Forr_rofi</var>
</stream_datavars>
<stream_lev_dimname>null</stream_lev_dimname>
<stream_mapalgo>
<mapalgo>bilinear</mapalgo>
</stream_mapalgo>
<stream_vectors>null</stream_vectors>
<stream_year_align>1</stream_year_align>
<stream_year_first>1984</stream_year_first>
<stream_year_last>1984</stream_year_last>
<stream_offset>0</stream_offset>
<stream_tintalgo>
<tintalgo>upper</tintalgo>
</stream_tintalgo>
<stream_taxmode>
<taxmode>cycle</taxmode>
</stream_taxmode>
<stream_dtlimit>
<dtlimit>3.0</dtlimit>
</stream_dtlimit>
<stream_readmode>single</stream_readmode>
</stream_entry>

<stream_entry name="rof.ryf9091_jra">
<stream_meshfile>
<meshfile>$DIN_LOC_ROOT/lnd/dlnd7/JRA55/JRA.v1.4.runoff.1958_ESMFmesh_cdf5_20201020.nc</meshfile>
</stream_meshfile>
<stream_datafiles>
<file first_year="1990" last_year="1990">$DIN_LOC_ROOT/lnd/dlnd7/JRA55/RAF_9091.JRA.v1.3.runoff.180404.nc</file>
</stream_datafiles>
<stream_datavars>
<var>rofl Forr_rofl</var>
<var>rofi Forr_rofi</var>
</stream_datavars>
<stream_lev_dimname>null</stream_lev_dimname>
<stream_mapalgo>
<mapalgo>bilinear</mapalgo>
</stream_mapalgo>
<stream_vectors>null</stream_vectors>
<stream_year_align>1</stream_year_align>
<stream_year_first>1990</stream_year_first>
<stream_year_last>1990</stream_year_last>
<stream_offset>0</stream_offset>
<stream_tintalgo>
<tintalgo>upper</tintalgo>
</stream_tintalgo>
<stream_taxmode>
<taxmode>cycle</taxmode>
</stream_taxmode>
<stream_dtlimit>
<dtlimit>3.0</dtlimit>
</stream_dtlimit>
<stream_readmode>single</stream_readmode>
</stream_entry>

<stream_entry name="rof.ryf0304_jra">
<stream_meshfile>
<meshfile>$DIN_LOC_ROOT/lnd/dlnd7/JRA55/JRA.v1.4.runoff.1958_ESMFmesh_cdf5_20201020.nc</meshfile>
</stream_meshfile>
<stream_datafiles>
<file first_year="2003" last_year="2003">$DIN_LOC_ROOT/lnd/dlnd7/JRA55/RAF_0304.JRA.v1.3.runoff.180404.nc</file>
</stream_datafiles>
<stream_datavars>
<var>rofl Forr_rofl</var>
<var>rofi Forr_rofi</var>
</stream_datavars>
<stream_lev_dimname>null</stream_lev_dimname>
<stream_mapalgo>
<mapalgo>bilinear</mapalgo>
</stream_mapalgo>
<stream_vectors>null</stream_vectors>
<stream_year_align>1</stream_year_align>
<stream_year_first>2003</stream_year_first>
<stream_year_last>2003</stream_year_last>
<stream_offset>0</stream_offset>
<stream_tintalgo>
<tintalgo>upper</tintalgo>
</stream_tintalgo>
<stream_taxmode>
<taxmode>cycle</taxmode>
</stream_taxmode>
<stream_dtlimit>
<dtlimit>3.0</dtlimit>
</stream_dtlimit>
<stream_readmode>single</stream_readmode>
</stream_entry>

<stream_entry name="rof.cplhist">
<stream_meshfile>
<meshfile>$ROF_DOMAIN_MESH</meshfile>
Expand Down

0 comments on commit c8f0877

Please sign in to comment.