Skip to content

Commit 8e14ff7

Browse files
jonbobjonbob
committed
Merge branch 'jonbob/grids/add-era5r025-configurations' (PR #6683)
Add ERA5r025 configurations Adds new configurations for: * ERA5r025_r05_IcoswISC30E3r5_gis1to10r02 * ERA5r025_r025_IcoswISC30E3r5_gis1to10r02 to be used with a new IGERA5ELM_MLI compset that is active ELM, MOSART and MALI plus datm using ERA5 forcing data [BFB]
2 parents a62230a + 9059431 commit 8e14ff7

File tree

3 files changed

+76
-0
lines changed

3 files changed

+76
-0
lines changed

‎cime_config/config_grids.xml‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2029,6 +2029,26 @@
20292029
<mask>IcoswISC30E3r5</mask>
20302030
</model_grid>
20312031

2032+
<model_grid alias="ERA5r025_r05_IcoswISC30E3r5_gis1to10r02" compset="_MALI">
2033+
<grid name="atm">ERA5r025</grid>
2034+
<grid name="lnd">r05</grid>
2035+
<grid name="ocnice">IcoswISC30E3r5</grid>
2036+
<grid name="rof">r05</grid>
2037+
<grid name="glc">mpas.gis1to10kmR2</grid>
2038+
<grid name="wav">null</grid>
2039+
<mask>IcoswISC30E3r5</mask>
2040+
</model_grid>
2041+
2042+
<model_grid alias="ERA5r025_r025_IcoswISC30E3r5_gis1to10r02" compset="_MALI">
2043+
<grid name="atm">ERA5r025</grid>
2044+
<grid name="lnd">r025</grid>
2045+
<grid name="ocnice">IcoswISC30E3r5</grid>
2046+
<grid name="rof">r025</grid>
2047+
<grid name="glc">mpas.gis1to10kmR2</grid>
2048+
<grid name="wav">null</grid>
2049+
<mask>IcoswISC30E3r5</mask>
2050+
</model_grid>
2051+
20322052
<model_grid alias="ne120pg2_r0125_EC30to60E2r2_gis1to10" compset="_MALI">
20332053
<grid name="atm">ne120np4.pg2</grid>
20342054
<grid name="lnd">r0125</grid>
@@ -2864,6 +2884,14 @@
28642884
<desc>TL319 is JRA lat/lon grid:</desc>
28652885
</domain>
28662886

2887+
<domain name="ERA5r025">
2888+
<nx>1440</nx>
2889+
<ny>721</ny>
2890+
<file grid="atm|lnd" mask="IcoswISC30E3r5">$DIN_LOC_ROOT/share/domains/domain.lnd.ERA5r025_IcoswISC30E3r5.240903.nc</file>
2891+
<file grid="ice|ocn" mask="IcoswISC30E3r5">$DIN_LOC_ROOT/share/domains/domain.ocn.ERA5r025_IcoswISC30E3r5.240903.nc</file>
2892+
<desc>ERA5r025 is the lat/lon cap grid used by ERA5 data:</desc>
2893+
</domain>
2894+
28672895
<!--=====================================================================-->
28682896
<!--=====================================================================-->
28692897
<!-- SE grid domains -->
@@ -4848,6 +4876,38 @@
48484876
<map name="LND2ATM_SMAPNAME">cpl/gridmaps/TL319/map_r05_to_TL319_traave.20240212.nc</map>
48494877
</gridmap>
48504878

4879+
<gridmap atm_grid="ERA5r025" ocn_grid="IcoswISC30E3r5">
4880+
<map name="ATM2OCN_FMAPNAME">cpl/gridmaps/ERA5r025/map_ERA5r025_to_IcoswISC30E3r5_traave.20240903.nc</map>
4881+
<map name="ATM2OCN_SMAPNAME">cpl/gridmaps/ERA5r025/map_ERA5r025_to_IcoswISC30E3r5-nomask_trbilin.20240903.nc</map>
4882+
<map name="ATM2OCN_VMAPNAME">cpl/gridmaps/ERA5r025/map_ERA5r025_to_IcoswISC30E3r5_esmfpatch.20240903.nc</map>
4883+
<map name="OCN2ATM_FMAPNAME">cpl/gridmaps/IcoswISC30E3r5/map_IcoswISC30E3r5_to_ERA5r025_traave.20240903.nc</map>
4884+
<map name="OCN2ATM_SMAPNAME">cpl/gridmaps/IcoswISC30E3r5/map_IcoswISC30E3r5_to_ERA5r025_traave.20240903.nc</map>
4885+
</gridmap>
4886+
4887+
<gridmap atm_grid="ERA5r025" lnd_grid="r05">
4888+
<map name="ATM2LND_FMAPNAME">cpl/gridmaps/ERA5r025/map_ERA5r025_to_r05_traave.20240905.nc</map>
4889+
<map name="ATM2LND_SMAPNAME">cpl/gridmaps/ERA5r025/map_ERA5r025_to_r05_esmfbilin.20240907.nc</map>
4890+
<map name="LND2ATM_FMAPNAME">cpl/gridmaps/r05/map_r05_to_ERA5r025_traave.20240905.nc</map>
4891+
<map name="LND2ATM_SMAPNAME">cpl/gridmaps/r05/map_r05_to_ERA5r025_traave.20240905.nc</map>
4892+
</gridmap>
4893+
4894+
<gridmap atm_grid="ERA5r025" rof_grid="r05">
4895+
<map name="ATM2ROF_FMAPNAME">cpl/gridmaps/ERA5r025/map_ERA5r025_to_r05_traave.20240905.nc</map>
4896+
<map name="ATM2ROF_SMAPNAME">cpl/gridmaps/ERA5r025/map_ERA5r025_to_r05_esmfbilin.20240907.nc</map>
4897+
</gridmap>
4898+
4899+
<gridmap atm_grid="ERA5r025" lnd_grid="r025">
4900+
<map name="ATM2LND_FMAPNAME">cpl/gridmaps/ERA5r025/map_ERA5r025_to_r025_traave.20240903.nc</map>
4901+
<map name="ATM2LND_SMAPNAME">cpl/gridmaps/ERA5r025/map_ERA5r025_to_r025_trbilin.20240903.nc</map>
4902+
<map name="LND2ATM_FMAPNAME">cpl/gridmaps/r025/map_r025_to_ERA5r025_traave.20240903.nc</map>
4903+
<map name="LND2ATM_SMAPNAME">cpl/gridmaps/r025/map_r025_to_ERA5r025_traave.20240903.nc</map>
4904+
</gridmap>
4905+
4906+
<gridmap atm_grid="ERA5r025" rof_grid="r025">
4907+
<map name="ATM2ROF_FMAPNAME">cpl/gridmaps/ERA5r025/map_ERA5r025_to_r025_traave.20240903.nc</map>
4908+
<map name="ATM2ROF_SMAPNAME">cpl/gridmaps/ERA5r025/map_ERA5r025_to_r025_trbilin.20240903.nc</map>
4909+
</gridmap>
4910+
48514911
<gridmap atm_grid="T31" ocn_grid="gx3v7">
48524912
<map name="ATM2OCN_FMAPNAME">cpl/cpl6/map_T31_to_gx3v7_aave_da_090903.nc</map>
48534913
<map name="ATM2OCN_SMAPNAME">cpl/cpl6/map_T31_to_gx3v7_patch_090903.nc</map>
@@ -5780,6 +5840,13 @@
57805840
<map name="GLC2LND_SMAPNAME">cpl/gridmaps/mpas.gis1to10km/map_gis1to10kmR2_to_r05_traave.20240403.nc</map>
57815841
</gridmap>
57825842

5843+
<gridmap glc_grid="mpas.gis1to10kmR2" lnd_grid="r025">
5844+
<map name="LND2GLC_FMAPNAME">cpl/gridmaps/r025/map_r025_to_gis1to10kmR2_traave.20240903.nc</map>
5845+
<map name="LND2GLC_SMAPNAME">cpl/gridmaps/r025/map_r025_to_gis1to10kmR2_trbilin.20240903.nc</map>
5846+
<map name="GLC2LND_FMAPNAME">cpl/gridmaps/mpas.gis1to10km/map_gis1to10kmR2_to_r025_traave.20240903.nc</map>
5847+
<map name="GLC2LND_SMAPNAME">cpl/gridmaps/mpas.gis1to10km/map_gis1to10kmR2_to_r025_traave.20240903.nc</map>
5848+
</gridmap>
5849+
57835850
<gridmap glc_grid="mpas.gis1to10kmR2" lnd_grid="ne30np4.pg2">
57845851
<map name="LND2GLC_FMAPNAME">cpl/gridmaps/ne30pg2/map_ne30pg2_to_gis1to10kmR2_traave.20240403.nc</map>
57855852
<map name="LND2GLC_SMAPNAME">cpl/gridmaps/ne30pg2/map_ne30pg2_to_gis1to10kmR2_trbilin.20240403.nc</map>

‎components/elm/bld/namelist_files/namelist_defaults.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -369,6 +369,8 @@ lnd/clm2/surfdata_map/surfdata_ne256np4_simyr2010_c220518.nc</fsurdat>
369369
lnd/clm2/surfdata_map/surfdata_ne256np4_simyr2010_c220518.nc</fsurdat>
370370
<fsurdat hgrid="r05" sim_year="2000" >
371371
lnd/clm2/surfdata_map/surfdata_0.5x0.5_simyr2000_c200624.nc</fsurdat>
372+
<fsurdat hgrid="r025" sim_year="2000" >
373+
lnd/clm2/surfdata_map/surfdata_r025_simyr1980_c240920.nc</fsurdat>
372374
<fsurdat hgrid="r0125" sim_year="2000" use_crop=".false." >
373375
lnd/clm2/surfdata_map/surfdata_0.125x0.125_simyr2000_c190730.nc</fsurdat>
374376

@@ -622,6 +624,7 @@ this mask will have smb calculated over the entire global land surface
622624
<fglcmask hgrid="0.9x1.25" glc_grid="mpas.ais20km">lnd/clm2/griddata/glcmaskdata_0.9x1.25_60S.nc</fglcmask>
623625
<fglcmask hgrid="r05" glc_grid="mpas.gis20km">lnd/clm2/griddata/glcmaskdata_0.5x0.5_GIS_AIS.nc</fglcmask>
624626
<fglcmask hgrid="r05" glc_grid="mpas.gis1to10km">lnd/clm2/griddata/glcmaskdata_0.5x0.5_GIS_AIS.nc</fglcmask>
627+
<fglcmask hgrid="r025" glc_grid="mpas.gis1to10km">lnd/clm2/griddata/glcmaskdata_r025_GIS_AIS.20240910.nc</fglcmask>
625628
<fglcmask hgrid="r0125" glc_grid="mpas.gis1to10km">lnd/clm2/griddata/glcmaskdata_r0125_GIS_AIS.210407.nc</fglcmask>
626629
<fglcmask hgrid="ne30np4.pg2" glc_grid="mpas.gis1to10km">lnd/clm2/griddata/glcmaskdata_ne30pg2_GIS_AIS.210407.nc</fglcmask>
627630

@@ -632,6 +635,7 @@ this mask will have smb calculated over the entire global land surface
632635
<flndtopo hgrid="48x96" >lnd/clm2/griddata/topodata_48x96_USGS_070110.nc</flndtopo>
633636
<flndtopo hgrid="r05" use_cn=".false.">lnd/clm2/surfdata_map/surfdata_0.5x0.5_simyr1850_c200609.nc</flndtopo>
634637
<flndtopo hgrid="r05" use_cn=".true.">lnd/clm2/surfdata_map/surfdata_0.5x0.5_simyr1850_c211019.nc</flndtopo>
638+
<flndtopo hgrid="r025" >lnd/clm2/surfdata_map/surfdata_0.25x0.25_simyr1850_c240125.nc</flndtopo>
635639
<flndtopo hgrid="r0125" >lnd/clm2/surfdata_map/surfdata_0.125x0.125_simyr1850_c190730.nc</flndtopo>
636640
<flndtopo hgrid="ne30np4.pg2" >lnd/clm2/surfdata_map/surfdata_ne30pg2_simyr1850_c210402.nc</flndtopo>
637641

‎components/elm/cime_config/config_compsets.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -972,6 +972,11 @@
972972
<lname>2000_DATM%QIA_ELM%SP_SICE_SOCN_MOSART_MALI_SWAV</lname>
973973
</compset>
974974

975+
<compset>
976+
<alias>IGERA5ELM_MLI</alias>
977+
<lname>2000_DATM%ERA5_ELM%SP_SICE_SOCN_MOSART_MALI_SWAV</lname>
978+
</compset>
979+
975980
<compset>
976981
<alias>I1PTELM</alias>
977982
<lname>2000_DATM%1PT_ELM%SP_SICE_SOCN_MOSART_SGLC_SWAV</lname>

0 commit comments

Comments
 (0)