Skip to content

Add glofas #351

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

Draft
wants to merge 6 commits into
base: main
Choose a base branch
from
Draft

Add glofas #351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f092a21
Initial changes for CROCODILE
mnlevy1981 Aug 27, 2024
3bab164
Merge tag 'cdeps1.0.57' into crocodile
mnlevy1981 Nov 18, 2024
8cb087a
Glofas streamentry
manishvenu Aug 22, 2025
fde35ca
Merge remote-tracking branch 'crocodile/runoff' into add_glofas
mnlevy1981 Aug 29, 2025
042dfad
Consistent ordering of modifiers
mnlevy1981 Aug 29, 2025
2b3ecec
Update to most recent glofas
mnlevy1981 Oct 11, 2025
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
6 changes: 4 additions & 2 deletions drof/cime_config/config_component.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
-->

<description modifier_mode="1">
<desc rof="DROF[%NULL][%NYF][%IAF][%IAFAIS00][%IAFAIS45][%IAFAIS55][%CPLHIST][%JRA][%JRA-1p4-2018][%JRA-1p4-2018-AIS0ICE][%JRA-1p4-2018-AIS0LIQ][%JRA-1p4-2018-AIS0ROF][%JRA-1p5-2023][%JRA-RYF8485][%JRA-RYF9091][%JRA-RYF0304]">Data runoff model</desc>
<desc rof="DROF[%NULL][%NYF][%IAF][%IAFAIS00][%IAFAIS45][%IAFAIS55][%CPLHIST][%JRA][%JRA-1p4-2018][%JRA-1p4-2018-AIS0ICE][%JRA-1p4-2018-AIS0LIQ][%JRA-1p4-2018-AIS0ROF][%JRA-1p5-2023][%JRA-RYF8485][%JRA-RYF9091][%JRA-RYF0304][%GLOFAS]">Data runoff model</desc>
<desc option="NULL" >NULL mode</desc>
<desc option="NYF" >COREv2 normal year forcing:</desc>
<desc option="IAF" >COREv2 interannual year forcing:</desc>
Expand All @@ -30,6 +30,7 @@
<desc option="JRA-RYF8485">JRA55 Repeat Year Forcing v1.3 1984-1985</desc>
<desc option="JRA-RYF9091">JRA55 Repeat Year Forcing v1.3 1990-1991</desc>
<desc option="JRA-RYF0304">JRA55 Repeat Year Forcing v1.3 2003-2004</desc>
<desc option="GLOFAS">GLOFAS Regional domain</desc>
</description>

<entry id="COMP_ROF">
Expand All @@ -43,9 +44,10 @@

<entry id="DROF_MODE">
<type>char</type>
<valid_values>CPLHIST,DIATREN_ANN_RX1,DIATREN_IAF_RX1,DIATREN_IAF_AIS00_RX1,DIATREN_IAF_AIS45_RX1,DIATREN_IAF_AIS55_RX1,IAF_JRA,IAF_JRA_1p4_2018,IAF_JRA_1p4_2018_AIS0ICE,IAF_JRA_1p4_2018_AIS0LIQ,IAF_JRA_1p4_2018_AIS0ROF,IAF_JRA_1p5_2023,RYF8485_JRA,RYF9091_JRA,RYF0304_JRA,NULL</valid_values>
<valid_values>CPLHIST,DIATREN_ANN_RX1,DIATREN_IAF_RX1,DIATREN_IAF_AIS00_RX1,DIATREN_IAF_AIS45_RX1,DIATREN_IAF_AIS55_RX1,IAF_JRA,IAF_JRA_1p4_2018,IAF_JRA_1p4_2018_AIS0ICE,IAF_JRA_1p4_2018_AIS0LIQ,IAF_JRA_1p4_2018_AIS0ROF,IAF_JRA_1p5_2023,RYF8485_JRA,RYF9091_JRA,RYF0304_JRA,GLOFAS,NULL</valid_values>
<default_value>DIATREN_ANN_RX1</default_value>
<values match="last">
<value compset="_DROF%GLOFAS">GLOFAS</value>
<value compset="_DROF%NULL">NULL</value>
<value compset="_DROF%NYF" >DIATREN_ANN_RX1</value>
<value compset="_DROF%NYFAIS00" >DIATREN_ANN_AIS00_RX1</value>
Expand Down
3 changes: 2 additions & 1 deletion drof/cime_config/namelist_definition_drof.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
<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>
<value drof_mode="GLOFAS" >rof.glofas</value>
</values>
</entry>

Expand All @@ -45,7 +46,7 @@
</values>
</entry>

<entry id="model_meshfile">
<entry id="model_meshfile">
<type>char</type>
<category>streams</category>
<input_pathname>abs</input_pathname>
Expand Down
31 changes: 31 additions & 0 deletions drof/cime_config/stream_definition_drof.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -635,4 +635,35 @@
<stream_readmode>single</stream_readmode>
</stream_entry>

<stream_entry name="rof.glofas">
<stream_meshfile>
<meshfile>$DIN_LOC_ROOT/ocn/mom/croc/rof/glofas/dis24/GLOFAS_esmf_mesh_v4.nc</meshfile>
</stream_meshfile>
<stream_datafiles>
<file first_year="1979" last_year="2024">$DIN_LOC_ROOT/ocn/mom/croc/rof/glofas/dis24/merged_yearly_nc3_files/GloFAS_%y.nc</file>
</stream_datafiles>
<stream_datavars>
<var>runoff Forr_rofl</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>1979</stream_year_align>
<stream_year_first>1979</stream_year_first>
<stream_year_last>2024</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_data>