Skip to content
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

Add new ECwISC30to60E3r1 mesh #58

Closed
wants to merge 5 commits into from
Closed

Add new ECwISC30to60E3r1 mesh #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c50c9f6
Add ECwISC30to60E3r1 mesh to MPAS-Ocean
xylar Aug 15, 2023
41c604e
Add ECwISC30to60E3r1 mesh to MPAS-Seaice
xylar Aug 15, 2023
1112fce
Add ECwISC30to60E3r1 to ELM definitions
xylar Aug 17, 2023
31a6fdc
Add mapping and domain files for the new ECwISC30to60E3r1 mesh
xylar Aug 15, 2023
ed2f1a2
Fix ELM xml file
xylar Aug 29, 2023
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
85 changes: 83 additions & 2 deletions cime_config/config_grids.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,6 +399,16 @@
<mask>ECwISC30to60E2r1</mask>
</model_grid>

<model_grid alias="T62_ECwISC30to60E3r1" compset="(DATM|XATM|SATM)">
<grid name="atm">T62</grid>
<grid name="lnd">T62</grid>
<grid name="ocnice">ECwISC30to60E3r1</grid>
<grid name="rof">rx1</grid>
<grid name="glc">null</grid>
<grid name="wav">null</grid>
<mask>ECwISC30to60E3r1</mask>
</model_grid>

<model_grid alias="TL319_oEC60to30v3" compset="(DATM|XATM|SATM)">
<grid name="atm">TL319</grid>
<grid name="lnd">TL319</grid>
Expand Down Expand Up @@ -509,6 +519,16 @@
<mask>ECwISC30to60E2r1</mask>
</model_grid>

<model_grid alias="TL319_ECwISC30to60E3r1" compset="(DATM|XATM|SATM)">
<grid name="atm">TL319</grid>
<grid name="lnd">TL319</grid>
<grid name="ocnice">ECwISC30to60E3r1</grid>
<grid name="rof">JRA025</grid>
<grid name="glc">null</grid>
<grid name="wav">null</grid>
<mask>ECwISC30to60E3r1</mask>
</model_grid>

<model_grid alias="TL319_oRRS18to6v3" compset="(DATM|XATM|SATM)">
<grid name="atm">TL319</grid>
<grid name="lnd">TL319</grid>
Expand Down Expand Up @@ -1183,6 +1203,16 @@
<mask>ECwISC30to60E2r1</mask>
</model_grid>

<model_grid alias="ne30pg2_ECwISC30to60E3r1">
<grid name="atm">ne30np4.pg2</grid>
<grid name="lnd">ne30np4.pg2</grid>
<grid name="ocnice">ECwISC30to60E3r1</grid>
<grid name="rof">r05</grid>
<grid name="glc">null</grid>
<grid name="wav">null</grid>
<mask>ECwISC30to60E3r1</mask>
</model_grid>

<model_grid alias="northamericax4v1_r0125_northamericax4v1" compset="(DOCN|XOCN|SOCN|AQP1)">
<grid name="atm">ne0np4_northamericax4v1</grid>
<grid name="lnd">r0125</grid>
Expand Down Expand Up @@ -2293,6 +2323,7 @@
<file grid="atm|lnd" mask="WCAtl12to45E2r4">$DIN_LOC_ROOT/share/domains/domain.lnd.T62_WCAtl12to45E2r4.210318.nc</file>
<file grid="atm|lnd" mask="SOwISC12to60E2r4">$DIN_LOC_ROOT/share/domains/domain.lnd.T62_SOwISC12to60E2r4.210119.nc</file>
<file grid="atm|lnd" mask="ECwISC30to60E2r1">$DIN_LOC_ROOT/share/domains/domain.lnd.T62_ECwISC30to60E2r1.201007.nc</file>
<file grid="atm|lnd" mask="ECwISC30to60E3r1">$DIN_LOC_ROOT/share/domains/domain.lnd.T62_ECwISC30to60E3r1.230817.nc</file>
<desc>T62 is Gaussian grid:</desc>
</domain>

Expand Down Expand Up @@ -2335,6 +2366,8 @@
<file grid="ice|ocn" mask="SOwISC12to60E2r4">$DIN_LOC_ROOT/share/domains/domain.ocn.TL319_SOwISC12to60E2r4.210119.nc</file>
<file grid="atm|lnd" mask="ECwISC30to60E2r1">$DIN_LOC_ROOT/share/domains/domain.lnd.TL319_ECwISC30to60E2r1.201007.nc</file>
<file grid="ice|ocn" mask="ECwISC30to60E2r1">$DIN_LOC_ROOT/share/domains/domain.ocn.TL319_ECwISC30to60E2r1.201007.nc</file>
<file grid="atm|lnd" mask="ECwISC30to60E3r1">$DIN_LOC_ROOT/share/domains/domain.lnd.TL319_ECwISC30to60E3r1.230817.nc</file>
<file grid="ice|ocn" mask="ECwISC30to60E3r1">$DIN_LOC_ROOT/share/domains/domain.ocn.TL319_ECwISC30to60E3r1.230817.nc</file>
<file grid="atm|lnd" mask="oRRS18to6v3">$DIN_LOC_ROOT/share/domains/domain.lnd.TL319_oRRS18to6v3.220124.nc</file>
<file grid="ice|ocn" mask="oRRS18to6v3">$DIN_LOC_ROOT/share/domains/domain.ocn.TL319_oRRS18to6v3.220124.nc</file>
<desc>TL319 is JRA lat/lon grid:</desc>
Expand Down Expand Up @@ -2440,6 +2473,8 @@
<file grid="ice|ocn" mask="ECwISC30to60E2r1">$DIN_LOC_ROOT/share/domains/domain.ocn.ne30pg2_ECwISC30to60E2r1.201007.nc</file>
<file grid="atm|lnd" mask="oRRS18to6v3">$DIN_LOC_ROOT/share/domains/domain.lnd.ne30pg2_oRRS18to6v3.211101.nc</file>
<file grid="ice|ocn" mask="oRRS18to6v3">$DIN_LOC_ROOT/share/domains/domain.ocn.ne30pg2_oRRS18to6v3.211101.nc</file>
<file grid="atm|lnd" mask="ECwISC30to60E3r1">$DIN_LOC_ROOT/share/domains/domain.lnd.ne30pg2_ECwISC30to60E3r1.230817.nc</file>
<file grid="ice|ocn" mask="ECwISC30to60E3r1">$DIN_LOC_ROOT/share/domains/domain.ocn.ne30pg2_ECwISC30to60E3r1.230817.nc</file>
<file grid="atm|lnd" mask="gx1v6">$DIN_LOC_ROOT/share/domains/domain.lnd.ne30pg2_gx1v6.190806.nc</file>
<file grid="ice|ocn" mask="gx1v6">$DIN_LOC_ROOT/share/domains/domain.ocn.ne30pg2_gx1v6.190806.nc</file>
<desc>ne30np4.pg2 is Spectral Elem 1-deg grid w/ 2x2 FV physics grid per element:</desc>
Expand Down Expand Up @@ -2579,7 +2614,7 @@





<!--=====================================================================-->
<!--=====================================================================-->
Expand Down Expand Up @@ -2705,6 +2740,13 @@
<desc>ECwISC30to60E2r1 is a MPAS ocean grid generated with the jigsaw/compass process using the eddy closure density function that has 30 km gridcells at the equator, 60 km at mid-latitudes, and 35 km at high latitudes. Additionally, it has ocean in ice-shelf cavities:</desc>
</domain>

<domain name="ECwISC30to60E3r1">
<nx>237986</nx>
<ny>1</ny>
<file grid="ice|ocn">$DIN_LOC_ROOT/share/domains/domain.ocn.ECwISC30to60E3r1.230817.nc</file>
<desc>ECwISC30to60E3r1 is a MPAS ocean grid generated with the jigsaw/compass process using the eddy closure density function that has 30 km gridcells at the equator, 60 km at mid-latitudes, and 35 km at high latitudes. Additionally, it has ocean in ice-shelf cavities:</desc>
</domain>

<!-- ROF (river) grids-->

<domain name="r2">
Expand Down Expand Up @@ -3189,6 +3231,14 @@
<map name="OCN2ATM_SMAPNAME">cpl/gridmaps/ECwISC30to60E2r1/map_ECwISC30to60E2r1-nomask_to_ne30pg2_mono.201006.nc</map>
</gridmap>

<gridmap atm_grid="ne30np4.pg2" ocn_grid="ECwISC30to60E3r1">
<map name="ATM2OCN_FMAPNAME">cpl/gridmaps/ne30pg2/map_ne30pg2_to_ECwISC30to60E3r1_mono.230817.nc</map>
<map name="ATM2OCN_VMAPNAME">cpl/gridmaps/ne30pg2/map_ne30pg2_to_ECwISC30to60E3r1_bilin.230817.nc</map>
<map name="ATM2OCN_SMAPNAME">cpl/gridmaps/ne30pg2/map_ne30pg2_to_ECwISC30to60E3r1-nomask_bilin.230817.nc</map>
<map name="OCN2ATM_FMAPNAME">cpl/gridmaps/ECwISC30to60E3r1/map_ECwISC30to60E3r1_to_ne30pg2_mono.230817.nc</map>
<map name="OCN2ATM_SMAPNAME">cpl/gridmaps/ECwISC30to60E3r1/map_ECwISC30to60E3r1_to_ne30pg2_mono.230817.nc</map>
</gridmap>

<gridmap atm_grid="ne30np4.pg3" ocn_grid="oEC60to30v3">
<map name="ATM2OCN_FMAPNAME">cpl/gridmaps/ne30pg3/map_ne30pg3_to_oEC60to30v3_mono.200331.nc</map>
<map name="ATM2OCN_VMAPNAME">cpl/gridmaps/ne30pg3/map_ne30pg3_to_oEC60to30v3_bilin.200331.nc</map>
Expand Down Expand Up @@ -3483,7 +3533,7 @@
<map name="OCN2ATM_FMAPNAME">cpl/gridmaps/ne256pg2/map_oRRS18to6v3_to_ne256pg2_nco.200212.nc</map>
<map name="OCN2ATM_SMAPNAME">cpl/gridmaps/ne256pg2/map_oRRS18to6v3_to_ne256pg2_nco.200212.nc</map>
</gridmap>

<gridmap atm_grid="ne256np4.pg2" lnd_grid="r0125">
<!-- 13km atm / 13km land, so use bilin for state -->
<map name="ATM2LND_FMAPNAME">cpl/gridmaps/ne256pg2/map_ne256pg2_to_r0125_mono.200212.nc</map>
Expand Down Expand Up @@ -3892,6 +3942,14 @@
<map name="OCN2ATM_SMAPNAME">cpl/gridmaps/ECwISC30to60E2r1/map_ECwISC30to60E2r1_to_T62_aave.201006.nc</map>
</gridmap>

<gridmap atm_grid="T62" ocn_grid="ECwISC30to60E3r1">
<map name="ATM2OCN_FMAPNAME">cpl/gridmaps/T62/map_T62_to_ECwISC30to60E3r1_mono.230817.nc</map>
<map name="ATM2OCN_SMAPNAME">cpl/gridmaps/T62/map_T62_to_ECwISC30to60E3r1-nomask_bilin.230817.nc</map>
<map name="ATM2OCN_VMAPNAME">cpl/gridmaps/T62/map_T62_to_ECwISC30to60E3r1_patch.230817.nc</map>
<map name="OCN2ATM_FMAPNAME">cpl/gridmaps/ECwISC30to60E3r1/map_ECwISC30to60E3r1_to_T62_mono.230817.nc</map>
<map name="OCN2ATM_SMAPNAME">cpl/gridmaps/ECwISC30to60E3r1/map_ECwISC30to60E3r1_to_T62_mono.230817.nc</map>
</gridmap>

<gridmap atm_grid="TL319" ocn_grid="oEC60to30v3">
<map name="ATM2OCN_FMAPNAME">cpl/gridmaps/TL319/map_TL319_to_oEC60to30v3_aave.181203.nc</map>
<map name="ATM2OCN_SMAPNAME">cpl/gridmaps/TL319/map_TL319_to_oEC60to30v3_bilin.181203.nc</map>
Expand Down Expand Up @@ -3980,6 +4038,14 @@
<map name="OCN2ATM_SMAPNAME">cpl/gridmaps/ECwISC30to60E2r1/map_ECwISC30to60E2r1_to_TL319_aave.201006.nc</map>
</gridmap>

<gridmap atm_grid="TL319" ocn_grid="ECwISC30to60E3r1">
<map name="ATM2OCN_FMAPNAME">cpl/gridmaps/TL319/map_TL319_to_ECwISC30to60E3r1_mono.230817.nc</map>
<map name="ATM2OCN_SMAPNAME">cpl/gridmaps/TL319/map_TL319_to_ECwISC30to60E3r1-nomask_bilin.230817.nc</map>
<map name="ATM2OCN_VMAPNAME">cpl/gridmaps/TL319/map_TL319_to_ECwISC30to60E3r1_patch.230817.nc</map>
<map name="OCN2ATM_FMAPNAME">cpl/gridmaps/ECwISC30to60E3r1/map_ECwISC30to60E3r1_to_TL319_mono.230817.nc</map>
<map name="OCN2ATM_SMAPNAME">cpl/gridmaps/ECwISC30to60E3r1/map_ECwISC30to60E3r1_to_TL319_mono.230817.nc</map>
</gridmap>

<gridmap atm_grid="TL319" ocn_grid="oRRS18to6v3">
<map name="ATM2OCN_FMAPNAME">cpl/gridmaps/TL319/map_TL319_to_oRRS18to6v3_aave.220124.nc</map>
<map name="ATM2OCN_SMAPNAME">cpl/gridmaps/TL319/map_TL319_to_oRRS18to6v3_bilin.220124.nc</map>
Expand Down Expand Up @@ -4435,6 +4501,11 @@
<map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_rx1_to_ECwISC30to60E2r1_smoothed.r150e300.201006.nc</map>
</gridmap>

<gridmap ocn_grid="ECwISC30to60E3r1" rof_grid="rx1">
<map name="ROF2OCN_ICE_RMAPNAME">cpl/cpl6/map_rx1_to_ECwISC30to60E3r1_smoothed.r150e300.230817.nc</map>
<map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_rx1_to_ECwISC30to60E3r1_smoothed.r150e300.230817.nc</map>
</gridmap>

<gridmap ocn_grid="oEC60to30v3" rof_grid="JRA025">
<map name="ROF2OCN_ICE_RMAPNAME">cpl/cpl6/map_JRA025_to_oEC60to30v3_smoothed.r150e300.181204.nc</map>
<map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_JRA025_to_oEC60to30v3_smoothed.r150e300.181204.nc</map>
Expand Down Expand Up @@ -4490,6 +4561,11 @@
<map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_JRA025_to_ECwISC30to60E2r1_smoothed.r150e300.201006.nc</map>
</gridmap>

<gridmap ocn_grid="ECwISC30to60E3r1" rof_grid="JRA025">
<map name="ROF2OCN_ICE_RMAPNAME">cpl/cpl6/map_JRA025_to_ECwISC30to60E3r1_smoothed.r150e300.230817.nc</map>
<map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_JRA025_to_ECwISC30to60E3r1_smoothed.r150e300.230817.nc</map>
</gridmap>

<gridmap ocn_grid="oRRS18to6v3" rof_grid="JRA025">
<map name="ROF2OCN_ICE_RMAPNAME">cpl/cpl6/map_JRA025_to_oRRS18to6v3_smoothed.r50e100.220124.nc</map>
<map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_JRA025_to_oRRS18to6v3_smoothed.r50e100.220124.nc</map>
Expand Down Expand Up @@ -4570,6 +4646,11 @@
<map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_r05_to_ECwISC30to60E2r1_smoothed.r150e300.201006.nc</map>
</gridmap>

<gridmap ocn_grid="ECwISC30to60E3r1" rof_grid="r05">
<map name="ROF2OCN_ICE_RMAPNAME">cpl/cpl6/map_r05_to_ECwISC30to60E3r1_smoothed.r150e300.230817.nc</map>
<map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_r05_to_ECwISC30to60E3r1_smoothed.r150e300.230817.nc</map>
</gridmap>

<gridmap ocn_grid="WC14to60E2r3" rof_grid="r0125">
<map name="ROF2OCN_ICE_RMAPNAME">cpl/cpl6/map_r0125_to_WC14to60E2r3_smoothed.r150e300.200929.nc</map>
<map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_r0125_to_WC14to60E2r3_smoothed.r150e300.200929.nc</map>
Expand Down
37 changes: 19 additions & 18 deletions components/elm/bld/namelist_files/namelist_definition.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ Toggle to turn on the FATES
</entry>

<entry id="fates_spitfire_mode" type="integer" category="physics"
group="elm_inparm" valid_values="0,1,2,3,4,5", value="0" >
group="elm_inparm" valid_values="0,1,2,3,4,5" value="0" >
Turn on spitfire module to simulate fire by setting fates_spitfire_mode > 0.
Allowed values are:
0 : Simulations of fire are off
Expand Down Expand Up @@ -340,7 +340,7 @@ Toggle to turn on plant hydraulics (only relevant if FATES is on).
</entry>

<entry id="use_fates_tree_damage" type="logical" category="physics"
group="elm_inparm" valid_values="" value=".false.">
group="elm_inparm" valid_values="" value=".false.">
Toggle to turn on the tree damage module in FATES
(Only relevant if FATES is on)
</entry>
Expand Down Expand Up @@ -1022,7 +1022,7 @@ by getco2_historical.ncl
<!-- -->
<!-- files needed for tools/ncl_scripts -->
<!-- -->
<entry id="faerdep" type="char*256" category="tools"
<entry id="faerdep" type="char*256" category="tools"
input_pathname="abs" group="elmexp" valid_values="" >
Aerosol deposition file name (only used for aerdepregrid.ncl)
</entry>
Expand Down Expand Up @@ -1309,8 +1309,8 @@ Representative concentration pathway for future scenarios [radiative forcing at
</entry>

<entry id="mask" type="char*20" category="default_settings"
group="default_settings"
valid_values="USGS,gx3v7,gx1v6,navy,test,tx0.1v2,tx1v1,T62,TL319,cruncep,oEC60to30v3,oEC60to30v3wLI,ECwISC30to60E1r2,EC30to60E2r2,WC14to60E2r3,WCAtl12to45E2r4,SOwISC12to60E2r4,ECwISC30to60E2r1,oRRS18to6,oRRS18to6v3,oRRS15to5,oARRM60to10,oARRM60to6,ARRM10to60E2r1,oQU480,oQU240,oQU240wLI,oQU120,oRRS30to10v3,oRRS30to10v3wLI,360x720cru,NLDASww3a,NLDAS,tx0.1v2,ICOS10">
group="default_settings"
valid_values="USGS,gx3v7,gx1v6,navy,test,tx0.1v2,tx1v1,T62,TL319,cruncep,oEC60to30v3,oEC60to30v3wLI,ECwISC30to60E1r2,EC30to60E2r2,WC14to60E2r3,WCAtl12to45E2r4,SOwISC12to60E2r4,ECwISC30to60E2r1,oRRS18to6,oRRS18to6v3,oRRS15to5,oARRM60to10,oARRM60to6,ARRM10to60E2r1,oQU480,oQU240,oQU240wLI,oQU120,oRRS30to10v3,oRRS30to10v3wLI,360x720cru,NLDASww3a,NLDAS,tx0.1v2,ICOS10,ECwISC30to60E3r1">
Land mask description
</entry>

Expand Down Expand Up @@ -1823,6 +1823,7 @@ Type of saturation function used in VSFM.
<entry id="vsfm_use_dynamic_linesearch" type="logical" category="default_settings"
group="elm_inparm" valid_values="">
Runtime flag to dynamically modify PETSc SNES linesearch option when VSFM fails to converge before cutting the timestep.
</entry>

<entry id="vsfm_lateral_model_type" type="char*32" category="elm_physics"
group="elm_inparm"
Expand Down Expand Up @@ -1854,13 +1855,13 @@ Runtime flag to turn on/off PETSc based thermal model.
<entry id="use_var_soil_thick" type="logical" category="default_settings"
group="elm_inparm" valid_values="">
Runtime flag to turn on/off variable soil thickness.
</entry
</entry>

<!-- ======================================================================================== -->
<!-- Namelist options for lake water storage -->
<!-- ======================================================================================== -->

<entry id="use_lake_wat_storage" type="logical" category="default_settings"
<entry id="use_lake_wat_storage" type="logical" category="default_settings"
group="elm_inparm" valid_values="">
Runtime flag to turn on/off lake water storage.
</entry>
Expand All @@ -1869,21 +1870,21 @@ Runtime flag to turn on/off lake water storage.
<!-- Namelist options for downscaling from grid to topounit -->
<!-- ======================================================================================== -->

<entry id="use_atm_downscaling_to_topunit"
type="logical"
<entry id="use_atm_downscaling_to_topunit"
type="logical"
category="physics"
group="elm_inparm"
valid_values=".true.,.false."
valid_values=".true.,.false."
value=".false.">
Runtime flag to turn on/off downscaling of atmosphric forcing from grid to topounit.
</entry>
<entry id="precip_downscaling_method"
type="char*32"
<entry id="precip_downscaling_method"
type="char*32"
category="physics"
group="elm_inparm"
valid_values="ERMM,FNM"
group="elm_inparm"
valid_values="ERMM,FNM"
value="ERMM" >
Flag to switch between ERMM (Elevation Range with Maximum Elevation Method) and FNM (Froude Number Method) precipitation downscaling methods.
Flag to switch between ERMM (Elevation Range with Maximum Elevation Method) and FNM (Froude Number Method) precipitation downscaling methods.
</entry>

<!-- ======================================================================================== -->
Expand Down Expand Up @@ -2010,14 +2011,14 @@ Type of snow grain shape

<entry id="snicar_atm_type" type="char*256" category="elm_physics"
group="elm_inparm" valid_values="default,mid-latitude_winter,mid-latitude_summer,sub-Arctic_winter,sub-Arctic_summer,summit_Greenland,high_mountain">
Atmospheric types: 'default' represents the default mid-latitude winter type
without considering SZA dependenece of direct irradiance, and the other types
Atmospheric types: 'default' represents the default mid-latitude winter type
without considering SZA dependenece of direct irradiance, and the other types
explain the SZA dependence of direct irradiance.
</entry>

<entry id="use_dust_snow_internal_mixing" type="logical" category="elm_physics"
group="elm_inparm" valid_values="" value=".false.">
Toggle to turn on the internal mixing of dust-snow.
Toggle to turn on the internal mixing of dust-snow.
</entry>

<!-- ======================================================================================== -->
Expand Down
Loading