From 674d6adaa9062df8c549d598218008b98b7c5996 Mon Sep 17 00:00:00 2001
From: Jon Wolfe <jonbob@lanl.gov>
Date: Tue, 10 Sep 2024 11:21:19 -0500
Subject: [PATCH 1/3] Add grid support for ERA5r025 configurations

---
 cime_config/config_grids.xml                  | 67 +++++++++++++++++++
 .../elm/cime_config/config_compsets.xml       |  5 ++
 2 files changed, 72 insertions(+)

diff --git a/cime_config/config_grids.xml b/cime_config/config_grids.xml
index 0f1c3512ec8a..3e47fd4d754d 100755
--- a/cime_config/config_grids.xml
+++ b/cime_config/config_grids.xml
@@ -1979,6 +1979,26 @@
       <mask>IcoswISC30E3r5</mask>
     </model_grid>
 
+    <model_grid alias="ERA5r025_r05_IcoswISC30E3r5_gis1to10r02" compset="_MALI">
+      <grid name="atm">ERA5r025</grid>
+      <grid name="lnd">r05</grid>
+      <grid name="ocnice">IcoswISC30E3r5</grid>
+      <grid name="rof">r05</grid>
+      <grid name="glc">mpas.gis1to10kmR2</grid>
+      <grid name="wav">null</grid>
+      <mask>IcoswISC30E3r5</mask>
+    </model_grid>
+
+    <model_grid alias="ERA5r025_r025_IcoswISC30E3r5_gis1to10r02" compset="_MALI">
+      <grid name="atm">ERA5r025</grid>
+      <grid name="lnd">r025</grid>
+      <grid name="ocnice">IcoswISC30E3r5</grid>
+      <grid name="rof">r025</grid>
+      <grid name="glc">mpas.gis1to10kmR2</grid>
+      <grid name="wav">null</grid>
+      <mask>IcoswISC30E3r5</mask>
+    </model_grid>
+
     <model_grid alias="ne120pg2_r0125_EC30to60E2r2_gis1to10" compset="_MALI">
       <grid name="atm">ne120np4.pg2</grid>
       <grid name="lnd">r0125</grid>
@@ -2801,6 +2821,14 @@
       <desc>TL319 is JRA lat/lon grid:</desc>
     </domain>
 
+    <domain name="ERA5r025">
+      <nx>1440</nx>
+      <ny>721</ny>
+      <file grid="atm|lnd" mask="IcoswISC30E3r5">$DIN_LOC_ROOT/share/domains/domain.lnd.ERA5r025_IcoswISC30E3r5.240903.nc</file>
+      <file grid="ice|ocn" mask="IcoswISC30E3r5">$DIN_LOC_ROOT/share/domains/domain.ocn.ERA5r025_IcoswISC30E3r5.240903.nc</file>
+      <desc>ERA5r025 is the lat/lon cap grid used by ERA5 data:</desc>
+    </domain>
+
     <!--=====================================================================-->
     <!--=====================================================================-->
     <!-- SE grid domains -->
@@ -4732,6 +4760,38 @@
        <map name="LND2ATM_SMAPNAME">cpl/gridmaps/TL319/map_r05_to_TL319_traave.20240212.nc</map>
     </gridmap>
 
+    <gridmap atm_grid="ERA5r025" ocn_grid="IcoswISC30E3r5">
+      <map name="ATM2OCN_FMAPNAME">cpl/gridmaps/ERA5r025/map_ERA5r025_to_IcoswISC30E3r5_traave.20240903.nc</map>
+      <map name="ATM2OCN_SMAPNAME">cpl/gridmaps/ERA5r025/map_ERA5r025_to_IcoswISC30E3r5-nomask_trbilin.20240903.nc</map>
+      <map name="ATM2OCN_VMAPNAME">cpl/gridmaps/ERA5r025/map_ERA5r025_to_IcoswISC30E3r5_esmfpatch.20240903.nc</map>
+      <map name="OCN2ATM_FMAPNAME">cpl/gridmaps/IcoswISC30E3r5/map_IcoswISC30E3r5_to_ERA5r025_traave.20240903.nc</map>
+      <map name="OCN2ATM_SMAPNAME">cpl/gridmaps/IcoswISC30E3r5/map_IcoswISC30E3r5_to_ERA5r025_traave.20240903.nc</map>
+    </gridmap>
+
+    <gridmap atm_grid="ERA5r025" lnd_grid="r05">
+       <map name="ATM2LND_FMAPNAME">cpl/gridmaps/ERA5r025/map_ERA5r025_to_r05_traave.20240905.nc</map>
+       <map name="ATM2LND_SMAPNAME">cpl/gridmaps/ERA5r025/map_ERA5r025_to_r05_esmfbilin.20240907.nc</map>
+       <map name="LND2ATM_FMAPNAME">cpl/gridmaps/r05/map_r05_to_ERA5r025_traave.20240905.nc</map>
+       <map name="LND2ATM_SMAPNAME">cpl/gridmaps/r05/map_r05_to_ERA5r025_traave.20240905.nc</map>
+    </gridmap>
+
+    <gridmap atm_grid="ERA5r025" rof_grid="r05">
+       <map name="ATM2ROF_FMAPNAME">cpl/gridmaps/ERA5r025/map_ERA5r025_to_r05_traave.20240905.nc</map>
+       <map name="ATM2ROF_SMAPNAME">cpl/gridmaps/ERA5r025/map_ERA5r025_to_r05_esmfbilin.20240907.nc</map>
+    </gridmap>
+
+    <gridmap atm_grid="ERA5r025" lnd_grid="r025">
+       <map name="ATM2LND_FMAPNAME">cpl/gridmaps/ERA5r025/map_ERA5r025_to_r025_traave.20240903.nc</map>
+       <map name="ATM2LND_SMAPNAME">cpl/gridmaps/ERA5r025/map_ERA5r025_to_r025_trbilin.20240903.nc</map>
+       <map name="LND2ATM_FMAPNAME">cpl/gridmaps/r025/map_r025_to_ERA5r025_traave.20240903.nc</map>
+       <map name="LND2ATM_SMAPNAME">cpl/gridmaps/r025/map_r025_to_ERA5r025_traave.20240903.nc</map>
+    </gridmap>
+
+    <gridmap atm_grid="ERA5r025" rof_grid="r025">
+       <map name="ATM2ROF_FMAPNAME">cpl/gridmaps/ERA5r025/map_ERA5r025_to_r025_traave.20240903.nc</map>
+       <map name="ATM2ROF_SMAPNAME">cpl/gridmaps/ERA5r025/map_ERA5r025_to_r025_trbilin.20240903.nc</map>
+    </gridmap>
+
     <gridmap atm_grid="T31" ocn_grid="gx3v7">
       <map name="ATM2OCN_FMAPNAME">cpl/cpl6/map_T31_to_gx3v7_aave_da_090903.nc</map>
       <map name="ATM2OCN_SMAPNAME">cpl/cpl6/map_T31_to_gx3v7_patch_090903.nc</map>
@@ -5635,6 +5695,13 @@
       <map name="GLC2LND_SMAPNAME">cpl/gridmaps/mpas.gis1to10km/map_gis1to10kmR2_to_r05_traave.20240403.nc</map>
     </gridmap>
  
+    <gridmap glc_grid="mpas.gis1to10kmR2" lnd_grid="r025">
+      <map name="LND2GLC_FMAPNAME">cpl/gridmaps/r025/map_r025_to_gis1to10kmR2_traave.20240903.nc</map>
+      <map name="LND2GLC_SMAPNAME">cpl/gridmaps/r025/map_r025_to_gis1to10kmR2_trbilin.20240903.nc</map>
+      <map name="GLC2LND_FMAPNAME">cpl/gridmaps/mpas.gis1to10km/map_gis1to10kmR2_to_r025_traave.20240903.nc</map>
+      <map name="GLC2LND_SMAPNAME">cpl/gridmaps/mpas.gis1to10km/map_gis1to10kmR2_to_r025_traave.20240903.nc</map>
+    </gridmap>
+ 
     <gridmap glc_grid="mpas.gis1to10kmR2" lnd_grid="ne30np4.pg2">
       <map name="LND2GLC_FMAPNAME">cpl/gridmaps/ne30pg2/map_ne30pg2_to_gis1to10kmR2_traave.20240403.nc</map>
       <map name="LND2GLC_SMAPNAME">cpl/gridmaps/ne30pg2/map_ne30pg2_to_gis1to10kmR2_trbilin.20240403.nc</map>
diff --git a/components/elm/cime_config/config_compsets.xml b/components/elm/cime_config/config_compsets.xml
index 5eed24e49da6..4afbdfbf3a3a 100644
--- a/components/elm/cime_config/config_compsets.xml
+++ b/components/elm/cime_config/config_compsets.xml
@@ -972,6 +972,11 @@
     <lname>2000_DATM%QIA_ELM%SP_SICE_SOCN_MOSART_MALI_SWAV</lname>
   </compset>
 
+  <compset>
+    <alias>IGERA5ELM_MLI</alias>
+    <lname>2000_DATM%ERA5_ELM%SP_SICE_SOCN_MOSART_MALI_SWAV</lname>
+  </compset>
+
   <compset>
     <alias>I1PTELM</alias>
     <lname>2000_DATM%1PT_ELM%SP_SICE_SOCN_MOSART_SGLC_SWAV</lname>

From 26cb157e61f35ecfaa8e2f859b2065a09be38dbc Mon Sep 17 00:00:00 2001
From: Jon Wolfe <jonbob@lanl.gov>
Date: Tue, 10 Sep 2024 12:14:31 -0500
Subject: [PATCH 2/3] Add some r025 files used by
 ERA5r025_r025_IcoswISC30E3r5_gis1to10r02

---
 components/elm/bld/namelist_files/namelist_defaults.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/components/elm/bld/namelist_files/namelist_defaults.xml b/components/elm/bld/namelist_files/namelist_defaults.xml
index e76a5647b4e7..cc1bd512e69a 100644
--- a/components/elm/bld/namelist_files/namelist_defaults.xml
+++ b/components/elm/bld/namelist_files/namelist_defaults.xml
@@ -613,6 +613,7 @@ this mask will have smb calculated over the entire global land surface
 <fglcmask hgrid="0.9x1.25" glc_grid="mpas.ais20km">lnd/clm2/griddata/glcmaskdata_0.9x1.25_60S.nc</fglcmask>
 <fglcmask hgrid="r05"      glc_grid="mpas.gis20km">lnd/clm2/griddata/glcmaskdata_0.5x0.5_GIS_AIS.nc</fglcmask>
 <fglcmask hgrid="r05"      glc_grid="mpas.gis1to10km">lnd/clm2/griddata/glcmaskdata_0.5x0.5_GIS_AIS.nc</fglcmask>
+<fglcmask hgrid="r025"     glc_grid="mpas.gis1to10km">lnd/clm2/griddata/glcmaskdata_r025_GIS_AIS.20240910.nc</fglcmask>
 <fglcmask hgrid="r0125"    glc_grid="mpas.gis1to10km">lnd/clm2/griddata/glcmaskdata_r0125_GIS_AIS.210407.nc</fglcmask>
 <fglcmask hgrid="ne30np4.pg2"  glc_grid="mpas.gis1to10km">lnd/clm2/griddata/glcmaskdata_ne30pg2_GIS_AIS.210407.nc</fglcmask>
 
@@ -623,6 +624,7 @@ this mask will have smb calculated over the entire global land surface
 <flndtopo hgrid="48x96"     >lnd/clm2/griddata/topodata_48x96_USGS_070110.nc</flndtopo>
 <flndtopo hgrid="r05"       use_cn=".false.">lnd/clm2/surfdata_map/surfdata_0.5x0.5_simyr1850_c200609.nc</flndtopo>
 <flndtopo hgrid="r05"       use_cn=".true.">lnd/clm2/surfdata_map/surfdata_0.5x0.5_simyr1850_c211019.nc</flndtopo>
+<flndtopo hgrid="r025"      >lnd/clm2/surfdata_map/surfdata_0.25x0.25_simyr1850_c240125.nc</flndtopo>
 <flndtopo hgrid="r0125"     >lnd/clm2/surfdata_map/surfdata_0.125x0.125_simyr1850_c190730.nc</flndtopo>
 <flndtopo hgrid="ne30np4.pg2"      >lnd/clm2/surfdata_map/surfdata_ne30pg2_simyr1850_c210402.nc</flndtopo>
 

From 9059431e06373527939ac1dde50c4c458f87ff43 Mon Sep 17 00:00:00 2001
From: Jon Wolfe <jonbob@lanl.gov>
Date: Fri, 11 Oct 2024 12:31:57 -0500
Subject: [PATCH 3/3] Add an fsurdat file for r025 and year 2000

---
 components/elm/bld/namelist_files/namelist_defaults.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/components/elm/bld/namelist_files/namelist_defaults.xml b/components/elm/bld/namelist_files/namelist_defaults.xml
index cc1bd512e69a..bd058707f765 100644
--- a/components/elm/bld/namelist_files/namelist_defaults.xml
+++ b/components/elm/bld/namelist_files/namelist_defaults.xml
@@ -360,6 +360,8 @@ lnd/clm2/surfdata_map/surfdata_ne256np4_simyr2010_c220518.nc</fsurdat>
 lnd/clm2/surfdata_map/surfdata_ne256np4_simyr2010_c220518.nc</fsurdat>
 <fsurdat hgrid="r05"         sim_year="2000" >
 lnd/clm2/surfdata_map/surfdata_0.5x0.5_simyr2000_c200624.nc</fsurdat>
+<fsurdat hgrid="r025"         sim_year="2000" >
+lnd/clm2/surfdata_map/surfdata_r025_simyr1980_c240920.nc</fsurdat>
 <fsurdat hgrid="r0125"       sim_year="2000" use_crop=".false." >
 lnd/clm2/surfdata_map/surfdata_0.125x0.125_simyr2000_c190730.nc</fsurdat>