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 EC30to60E3r3 ocean and sea-ice mesh #68

Closed
wants to merge 3 commits into from
Closed

Add new EC30to60E3r3 ocean and sea-ice mesh #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0580706
Add EC30to60E3r2 mesh to MPAS-Ocean
xylar Sep 20, 2023
e17f66e
Add EC30to60E3r2 mesh to MPAS-Seaice
xylar Sep 20, 2023
6f846f7
Add EC30to60E2r2 mesh to ELM
xylar Sep 20, 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
32 changes: 16 additions & 16 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 @@ -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,EC30to60E3r2">
Land mask description
</entry>

Expand Down Expand Up @@ -1860,7 +1860,7 @@ Runtime flag to turn on/off variable soil thickness.
<!-- 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 +1869,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 +2010,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
9 changes: 9 additions & 0 deletions components/mpas-ocean/bld/namelist_files/namelist_defaults_mpaso.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
<config_dt ocn_grid="WCAtl12to45E2r4">'00:10:00'</config_dt>
<config_dt ocn_grid="SOwISC12to60E2r4">'00:10:00'</config_dt>
<config_dt ocn_grid="ECwISC30to60E2r1">'00:30:00'</config_dt>
<config_dt ocn_grid="EC30to60E3r2">'00:30:00'</config_dt>
<config_time_integrator>'split_explicit'</config_time_integrator>
<config_number_of_time_levels>2</config_number_of_time_levels>

Expand All @@ -71,6 +72,7 @@
<config_hmix_scaleWithMesh ocn_grid="WCAtl12to45E2r4">.true.</config_hmix_scaleWithMesh>
<config_hmix_scaleWithMesh ocn_grid="SOwISC12to60E2r4">.true.</config_hmix_scaleWithMesh>
<config_hmix_scaleWithMesh ocn_grid="ECwISC30to60E2r1">.true.</config_hmix_scaleWithMesh>
<config_hmix_scaleWithMesh ocn_grid="EC30to60E3r2">.true.</config_hmix_scaleWithMesh>
<config_maxMeshDensity>-1.0</config_maxMeshDensity>
<config_hmix_use_ref_cell_width>.false.</config_hmix_use_ref_cell_width>
<config_hmix_ref_cell_width>30.0e3</config_hmix_ref_cell_width>
Expand All @@ -86,6 +88,7 @@
<config_use_mom_del2 ocn_grid="WCAtl12to45E2r4">.true.</config_use_mom_del2>
<config_use_mom_del2 ocn_grid="SOwISC12to60E2r4">.true.</config_use_mom_del2>
<config_use_mom_del2 ocn_grid="ECwISC30to60E2r1">.true.</config_use_mom_del2>
<config_use_mom_del2 ocn_grid="EC30to60E3r2">.true.</config_use_mom_del2>
<config_mom_del2>10.0</config_mom_del2>
<config_mom_del2 ocn_grid="oEC60to30v3">1000.0</config_mom_del2>
<config_mom_del2 ocn_grid="oEC60to30v3wLI">1000.0</config_mom_del2>
Expand All @@ -95,6 +98,7 @@
<config_mom_del2 ocn_grid="WCAtl12to45E2r4">462.0</config_mom_del2>
<config_mom_del2 ocn_grid="SOwISC12to60E2r4">462.0</config_mom_del2>
<config_mom_del2 ocn_grid="ECwISC30to60E2r1">1000.0</config_mom_del2>
<config_mom_del2 ocn_grid="EC30to60E3r2">1000.0</config_mom_del2>
<config_use_tracer_del2>.false.</config_use_tracer_del2>
<config_tracer_del2>10.0</config_tracer_del2>

Expand All @@ -119,6 +123,7 @@
<config_mom_del4 ocn_grid="WCAtl12to45E2r4">1.18e10</config_mom_del4>
<config_mom_del4 ocn_grid="SOwISC12to60E2r4">1.18e10</config_mom_del4>
<config_mom_del4 ocn_grid="ECwISC30to60E2r1">1.2e11</config_mom_del4>
<config_mom_del4 ocn_grid="EC30to60E3r2">1.2e11</config_mom_del4>
<config_mom_del4_div_factor>1.0</config_mom_del4_div_factor>
<config_use_tracer_del4>.false.</config_use_tracer_del4>
<config_tracer_del4>0.0</config_tracer_del4>
Expand Down Expand Up @@ -173,6 +178,7 @@
<config_GM_closure ocn_grid="WCAtl12to45E2r4">'constant'</config_GM_closure>
<config_GM_closure ocn_grid="SOwISC12to60E2r4">'N2_dependent'</config_GM_closure>
<config_GM_closure ocn_grid="ECwISC30to60E2r1">'N2_dependent'</config_GM_closure>
<config_GM_closure ocn_grid="EC30to60E3r2">'constant'</config_GM_closure>
<config_GM_constant_kappa>900.0</config_GM_constant_kappa>
<config_GM_constant_kappa ocn_forcing="datm_forced_restoring" ocn_grid="oEC60to30v3wLI">600.0</config_GM_constant_kappa>
<config_GM_constant_kappa ocn_forcing="datm_forced_restoring" ocn_grid="ECwISC30to60E1r2">600.0</config_GM_constant_kappa>
Expand All @@ -181,6 +187,7 @@
<config_GM_constant_kappa ocn_forcing="datm_forced_restoring" ocn_grid="WCAtl12to45E2r4">600.0</config_GM_constant_kappa>
<config_GM_constant_kappa ocn_forcing="datm_forced_restoring" ocn_grid="SOwISC12to60E2r4">600.0</config_GM_constant_kappa>
<config_GM_constant_kappa ocn_forcing="datm_forced_restoring" ocn_grid="ECwISC30to60E2r1">600.0</config_GM_constant_kappa>
<config_GM_constant_kappa ocn_forcing="datm_forced_restoring" ocn_grid="EC30to60E3r2">600.0</config_GM_constant_kappa>
<config_GM_constant_bclModeSpeed>0.3</config_GM_constant_bclModeSpeed>
<config_GM_minBclModeSpeed_method>'constant'</config_GM_minBclModeSpeed_method>
<config_GM_spatially_variable_min_kappa>300.0</config_GM_spatially_variable_min_kappa>
Expand Down Expand Up @@ -456,6 +463,7 @@
<config_btr_dt ocn_grid="WCAtl12to45E2r4">'0000_00:00:15'</config_btr_dt>
<config_btr_dt ocn_grid="SOwISC12to60E2r4">'0000_00:00:15'</config_btr_dt>
<config_btr_dt ocn_grid="ECwISC30to60E2r1">'0000_00:01:00'</config_btr_dt>
<config_btr_dt ocn_grid="EC30to60E3r2">'0000_00:01:00'</config_btr_dt>
<config_n_btr_cor_iter>2</config_n_btr_cor_iter>
<config_vel_correction>.true.</config_vel_correction>
<config_btr_subcycle_loop_factor>2</config_btr_subcycle_loop_factor>
Expand Down Expand Up @@ -1012,6 +1020,7 @@
<config_AM_mocStreamfunction_enable ocn_grid="WCAtl12to45E2r4">.true.</config_AM_mocStreamfunction_enable>
<config_AM_mocStreamfunction_enable ocn_grid="SOwISC12to60E2r4">.true.</config_AM_mocStreamfunction_enable>
<config_AM_mocStreamfunction_enable ocn_grid="ECwISC30to60E2r1">.true.</config_AM_mocStreamfunction_enable>
<config_AM_mocStreamfunction_enable ocn_grid="EC30to60E3r2">.true.</config_AM_mocStreamfunction_enable>
<config_AM_mocStreamfunction_compute_interval>'0000-00-00_01:00:00'</config_AM_mocStreamfunction_compute_interval>
<config_AM_mocStreamfunction_output_stream>'mocStreamfunctionOutput'</config_AM_mocStreamfunction_output_stream>
<config_AM_mocStreamfunction_compute_on_startup>.true.</config_AM_mocStreamfunction_compute_on_startup>
Expand Down
11 changes: 11 additions & 0 deletions components/mpas-ocean/cime_config/buildnml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,17 @@ def buildnml(case, caseroot, compname):
if ocn_ismf == 'data':
data_ismf_file = 'prescribed_ismf_adusumilli2020.ECwISC30to60E2r1.230429.nc'

elif ocn_grid == 'EC30to60E3r2':
decomp_date = '20230920'
decomp_prefix = 'partitions/mpas-o.graph.info.'
restoring_file = 'sss.PHC2_monthlyClimatology.EC30to60E3r2.20230920.nc'
analysis_mask_file = 'EC30to60E3r2_mocBasinsAndTransects20210623.nc'
ic_date = '20230920'
ic_prefix = 'mpaso.EC30to60E3r2'
if ocn_ic_mode == 'spunup':
logger.warning("WARNING: The specified compset is requesting ocean ICs spunup from a G-case")
logger.warning(" But no file available for this grid.")

#--------------------------------------------------------------------
# Set OCN_FORCING = datm_forced_restoring if restoring file is available
#--------------------------------------------------------------------
Expand Down
2 changes: 2 additions & 0 deletions components/mpas-seaice/bld/namelist_files/namelist_defaults_mpassi.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
<config_dt ice_grid="WCAtl12to45E2r4">1800.0</config_dt>
<config_dt ice_grid="SOwISC12to60E2r4">1800.0</config_dt>
<config_dt ice_grid="ECwISC30to60E2r1">1800.0</config_dt>
<config_dt ice_grid="EC30to60E3r2">1800.0</config_dt>
<config_calendar_type>'noleap'</config_calendar_type>
<config_start_time>'2000-01-01_00:00:00'</config_start_time>
<config_stop_time>'none'</config_stop_time>
Expand Down Expand Up @@ -140,6 +141,7 @@
<config_dynamics_subcycle_number ice_grid="WCAtl12to45E2r4">1</config_dynamics_subcycle_number>
<config_dynamics_subcycle_number ice_grid="SOwISC12to60E2r4">1</config_dynamics_subcycle_number>
<config_dynamics_subcycle_number ice_grid="ECwISC30to60E2r1">1</config_dynamics_subcycle_number>
<config_dynamics_subcycle_number ice_grid="EC30to60E3r2">1</config_dynamics_subcycle_number>
<config_rotate_cartesian_grid>true</config_rotate_cartesian_grid>
<config_include_metric_terms>true</config_include_metric_terms>
<config_elastic_subcycle_number>120</config_elastic_subcycle_number>
Expand Down
9 changes: 9 additions & 0 deletions components/mpas-seaice/cime_config/buildnml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,15 @@ def buildnml(case, caseroot, compname):
# Below is just a placeholder
grid_prefix = 'seaice.ICOS10_80Layer.restartFromChrysalis'

elif ice_grid == 'EC30to60E3r2':
grid_date = '20230920'
grid_prefix = 'mpassi.EC30to60E3r2'
decomp_date = '20230920'
decomp_prefix = 'partitions/mpas-seaice.graph.info.'
data_iceberg_file = 'Iceberg_Climatology_Merino.EC30to60E3r2.20230920.nc'
if ice_ic_mode == 'spunup':
logger.warning("WARNING: The specified compset is requesting seaice ICs spunup from a G-case")
logger.warning(" But no file available for this grid.")

#--------------------------------------------------------------------
# Set the initial file
Expand Down