From f092a2163ef2d2fdede6e37a0f5bce06e029dac3 Mon Sep 17 00:00:00 2001
From: Michael Levy <mike.levy.work@gmail.com>
Date: Tue, 27 Aug 2024 16:50:58 -0600
Subject: [PATCH 1/4] Initial changes for CROCODILE

Was based on cesm2_3_alpha17f, but diffs applied to cesm3_0_alpha03a
---
 drof/cime_config/config_component.xml         |  6 ++--
 drof/cime_config/namelist_definition_drof.xml |  3 +-
 drof/cime_config/stream_definition_drof.xml   | 31 +++++++++++++++++++
 3 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/drof/cime_config/config_component.xml b/drof/cime_config/config_component.xml
index c87e1f1c6..852528bad 100644
--- a/drof/cime_config/config_component.xml
+++ b/drof/cime_config/config_component.xml
@@ -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-RYF8485][%JRA-RYF9091][%JRA-RYF0304]">Data runoff model</desc>
+    <desc rof="DROF[%GLOFAS][%NULL][%NYF][%IAF][%IAFAIS00][%IAFAIS45][%IAFAIS55][%CPLHIST][%JRA][%JRA-1p4-2018][%JRA-1p4-2018-AIS0ICE][%JRA-1p4-2018-AIS0LIQ][%JRA-1p4-2018-AIS0ROF][%JRA-RYF8485][%JRA-RYF9091][%JRA-RYF0304]">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>
@@ -29,6 +29,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">
@@ -42,9 +43,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,RYF8485_JRA,RYF9091_JRA,RYF0304_JRA,NULL</valid_values>
+    <valid_values>GLOFAS,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,RYF8485_JRA,RYF9091_JRA,RYF0304_JRA,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>
diff --git a/drof/cime_config/namelist_definition_drof.xml b/drof/cime_config/namelist_definition_drof.xml
index 88a3493bb..720866c13 100644
--- a/drof/cime_config/namelist_definition_drof.xml
+++ b/drof/cime_config/namelist_definition_drof.xml
@@ -24,6 +24,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>
 
@@ -44,7 +45,7 @@
     </values>
   </entry>
 
-  <entry id="model_meshfile"> 
+  <entry id="model_meshfile">
     <type>char</type>
     <category>streams</category>
     <input_pathname>abs</input_pathname>
diff --git a/drof/cime_config/stream_definition_drof.xml b/drof/cime_config/stream_definition_drof.xml
index d14e5cbbe..b3d8b5ee1 100644
--- a/drof/cime_config/stream_definition_drof.xml
+++ b/drof/cime_config/stream_definition_drof.xml
@@ -315,6 +315,37 @@
     <stream_readmode>single</stream_readmode>
   </stream_entry>
 
+    <stream_entry name="rof.glofas">
+    <stream_meshfile>
+      <meshfile>/glade/work/gmarques/Projects/CROCODILE/NWA12_CESM/mesh/NWA12_mesh_240806.nc</meshfile>
+    </stream_meshfile>
+    <stream_datafiles>
+      <file first_year="2000" last_year="2019">/glade/work/gmarques/Projects/CROCODILE/GloFAS/python/GloFAS_2000_2020_NWA12.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>2000</stream_year_align>
+    <stream_year_first>2000</stream_year_first>
+    <stream_year_last>2019</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.iaf_jra_1p4_2018">
     <stream_meshfile>
       <meshfile>$DIN_LOC_ROOT/lnd/dlnd7/JRA55/JRA.v1.4.runoff.1958_ESMFmesh_cdf5_20201020.nc</meshfile>

From 8cb087ad80db01a4e789994226e71cd65a458092 Mon Sep 17 00:00:00 2001
From: manishvenu <manish.venumuddula@gmail.com>
Date: Fri, 22 Aug 2025 14:23:54 -0600
Subject: [PATCH 2/4] Glofas streamentry

---
 drof/cime_config/stream_definition_drof.xml | 31 +++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/drof/cime_config/stream_definition_drof.xml b/drof/cime_config/stream_definition_drof.xml
index 4b2b7b198..28a090ce2 100644
--- a/drof/cime_config/stream_definition_drof.xml
+++ b/drof/cime_config/stream_definition_drof.xml
@@ -666,4 +666,35 @@
     <stream_readmode>single</stream_readmode>
   </stream_entry>
 
+    <stream_entry name="rof.glofas">
+    <stream_meshfile>
+      <meshfile>/glade/u/home/manishrv/documents/croc/dev/gustavo_glorys/stuff_for_final_run/runoff_mapping/GLOFAS_esmf_mesh_v3.nc</meshfile>
+    </stream_meshfile>
+    <stream_datafiles>
+      <file>/glade/u/home/manishrv/documents/croc/dev/gustavo_glorys/stuff_for_final_run/runoff_mapping/GloFAS_2000_2019_merged_v2.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>2000</stream_year_align>
+    <stream_year_first>2000</stream_year_first>
+    <stream_year_last>2019</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>

From 042dfad8e5645be937ed4517bcae67ae1da7127e Mon Sep 17 00:00:00 2001
From: Michael Levy <mike.levy.work@gmail.com>
Date: Fri, 29 Aug 2025 15:31:52 -0600
Subject: [PATCH 3/4] Consistent ordering of modifiers

I also removed a rof.globas entry that was actually on the wrong grid
---
 drof/cime_config/config_component.xml       |  4 +--
 drof/cime_config/stream_definition_drof.xml | 31 ---------------------
 2 files changed, 2 insertions(+), 33 deletions(-)

diff --git a/drof/cime_config/config_component.xml b/drof/cime_config/config_component.xml
index 0253dc4ba..7c0ce7b25 100644
--- a/drof/cime_config/config_component.xml
+++ b/drof/cime_config/config_component.xml
@@ -13,7 +13,7 @@
   -->
 
   <description modifier_mode="1">
-    <desc rof="DROF[%GLOFAS][%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>
@@ -44,7 +44,7 @@
 
   <entry id="DROF_MODE">
     <type>char</type>
-    <valid_values>GLOFAS,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>
diff --git a/drof/cime_config/stream_definition_drof.xml b/drof/cime_config/stream_definition_drof.xml
index 28a090ce2..807ae9f95 100644
--- a/drof/cime_config/stream_definition_drof.xml
+++ b/drof/cime_config/stream_definition_drof.xml
@@ -315,37 +315,6 @@
     <stream_readmode>single</stream_readmode>
   </stream_entry>
 
-    <stream_entry name="rof.glofas">
-    <stream_meshfile>
-      <meshfile>/glade/work/gmarques/Projects/CROCODILE/NWA12_CESM/mesh/NWA12_mesh_240806.nc</meshfile>
-    </stream_meshfile>
-    <stream_datafiles>
-      <file first_year="2000" last_year="2019">/glade/work/gmarques/Projects/CROCODILE/GloFAS/python/GloFAS_2000_2020_NWA12.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>2000</stream_year_align>
-    <stream_year_first>2000</stream_year_first>
-    <stream_year_last>2019</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.iaf_jra_1p4_2018">
     <stream_meshfile>
       <meshfile>$DIN_LOC_ROOT/lnd/dlnd7/JRA55/JRA.v1.4.runoff.1958_ESMFmesh_cdf5_20201020.nc</meshfile>

From 2b3ececa50b77646ebfe8733c6689182fb5be316 Mon Sep 17 00:00:00 2001
From: Michael Levy <mike.levy.work@gmail.com>
Date: Sat, 11 Oct 2025 08:41:04 -0600
Subject: [PATCH 4/4] Update to most recent glofas

---
 drof/cime_config/stream_definition_drof.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drof/cime_config/stream_definition_drof.xml b/drof/cime_config/stream_definition_drof.xml
index 807ae9f95..41d120a05 100644
--- a/drof/cime_config/stream_definition_drof.xml
+++ b/drof/cime_config/stream_definition_drof.xml
@@ -637,10 +637,10 @@
 
     <stream_entry name="rof.glofas">
     <stream_meshfile>
-      <meshfile>/glade/u/home/manishrv/documents/croc/dev/gustavo_glorys/stuff_for_final_run/runoff_mapping/GLOFAS_esmf_mesh_v3.nc</meshfile>
+      <meshfile>$DIN_LOC_ROOT/ocn/mom/croc/rof/glofas/dis24/GLOFAS_esmf_mesh_v4.nc</meshfile>
     </stream_meshfile>
     <stream_datafiles>
-      <file>/glade/u/home/manishrv/documents/croc/dev/gustavo_glorys/stuff_for_final_run/runoff_mapping/GloFAS_2000_2019_merged_v2.nc</file>
+      <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>
@@ -650,9 +650,9 @@
       <mapalgo>bilinear</mapalgo>
     </stream_mapalgo>
     <stream_vectors>null</stream_vectors>
-    <stream_year_align>2000</stream_year_align>
-    <stream_year_first>2000</stream_year_first>
-    <stream_year_last>2019</stream_year_last>
+    <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>