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

Jump to bottom

Add new RRS6to18E3r6 ocean and sea-ice mesh #88

Closed
wants to merge 3 commits into from
Closed

Add new RRS6to18E3r6 ocean and sea-ice mesh #88

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
7c93ab6
Add RRS6to18E3r6 to MPAS-Ocean and -Seaice
xylar Dec 12, 2023
5bc2298
Add RRS6to18E3r6 to ELM
xylar Dec 12, 2023
6ef25ed
Update the partition files for ocean and ice
xylar Apr 5, 2024
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
2 changes: 1 addition & 1 deletion 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 @@ -1424,7 +1424,7 @@ Representative concentration pathway for future scenarios [radiative forcing at

<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,IcoswISC30E3r5">
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,IcoswISC30E3r5,RRS6to18E3r6">
Land mask description
</entry>

Expand Down
10 changes: 10 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 @@ -53,6 +53,7 @@
<config_dt ocn_grid="FRISwISC04to60E3r1">'00:04:00'</config_dt>
<config_dt ocn_grid="FRISwISC02to60E3r1">'00:02:00'</config_dt>
<config_dt ocn_grid="FRISwISC01to60E3r1">'00:01:00'</config_dt>
<config_dt ocn_grid="RRS6to18E3r6">'00:05:00'</config_dt>
<config_time_integrator>'split_explicit_ab2'</config_time_integrator>
<config_number_of_time_levels>2</config_number_of_time_levels>

Expand Down Expand Up @@ -81,6 +82,7 @@
<config_hmix_scaleWithMesh ocn_grid="FRISwISC04to60E3r1">.true.</config_hmix_scaleWithMesh>
<config_hmix_scaleWithMesh ocn_grid="FRISwISC02to60E3r1">.true.</config_hmix_scaleWithMesh>
<config_hmix_scaleWithMesh ocn_grid="FRISwISC01to60E3r1">.true.</config_hmix_scaleWithMesh>
<config_hmix_scaleWithMesh ocn_grid="RRS6to18E3r6">.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 Down Expand Up @@ -144,6 +146,7 @@
<config_mom_del4 ocn_grid="FRISwISC04to60E3r1">4.37e08</config_mom_del4>
<config_mom_del4 ocn_grid="FRISwISC02to60E3r1">5.46e07</config_mom_del4>
<config_mom_del4 ocn_grid="FRISwISC01to60E3r1">6.83e06</config_mom_del4>
<config_mom_del4 ocn_grid="RRS6to18E3r6">3.2e09</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 All @@ -160,6 +163,7 @@
<config_use_Redi ocn_grid="oRRS30to10v3wLI">.false.</config_use_Redi>
<config_use_Redi ocn_grid="oRRS18to6v3">.false.</config_use_Redi>
<config_use_Redi ocn_grid="oRRS15to5">.false.</config_use_Redi>
<config_use_Redi ocn_grid="RRS6to18E3r6">.false.</config_use_Redi>
<config_Redi_closure>'constant'</config_Redi_closure>
<config_Redi_constant_kappa>400.0</config_Redi_constant_kappa>
<config_Redi_constant_kappa ocn_forcing="datm_forced_restoring">400.0</config_Redi_constant_kappa>
Expand Down Expand Up @@ -197,6 +201,7 @@
<config_use_GM ocn_grid="oRRS30to10v3wLI">.false.</config_use_GM>
<config_use_GM ocn_grid="oRRS18to6v3">.false.</config_use_GM>
<config_use_GM ocn_grid="oRRS15to5">.false.</config_use_GM>
<config_use_GM ocn_grid="RRS6to18E3r6">.false.</config_use_GM>
<config_GM_closure>'EdenGreatbatch'</config_GM_closure>
<config_GM_closure ocn_grid="EC30to60E2r2">'constant'</config_GM_closure>
<config_GM_closure ocn_grid="WC14to60E2r3">'constant'</config_GM_closure>
Expand Down Expand Up @@ -535,6 +540,7 @@
<config_btr_dt ocn_grid="FRISwISC04to60E3r1">'0000_00:00:05'</config_btr_dt>
<config_btr_dt ocn_grid="FRISwISC02to60E3r1">'0000_00:00:02.5'</config_btr_dt>
<config_btr_dt ocn_grid="FRISwISC01to60E3r1">'0000_00:00:01.25'</config_btr_dt>
<config_btr_dt ocn_grid="RRS6to18E3r6">'0000_00:00:10'</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 @@ -1101,6 +1107,7 @@
<config_AM_mocStreamfunction_enable ocn_grid="FRISwISC04to60E3r1">.true.</config_AM_mocStreamfunction_enable>
<config_AM_mocStreamfunction_enable ocn_grid="FRISwISC02to60E3r1">.true.</config_AM_mocStreamfunction_enable>
<config_AM_mocStreamfunction_enable ocn_grid="FRISwISC01to60E3r1">.true.</config_AM_mocStreamfunction_enable>
<config_AM_mocStreamfunction_enable ocn_grid="RRS6to18E3r6">.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 Expand Up @@ -1187,6 +1194,7 @@
<config_AM_conservationCheck_enable ocn_grid="FRISwISC04to60E3r1">.true.</config_AM_conservationCheck_enable>
<config_AM_conservationCheck_enable ocn_grid="FRISwISC02to60E3r1">.true.</config_AM_conservationCheck_enable>
<config_AM_conservationCheck_enable ocn_grid="FRISwISC01to60E3r1">.true.</config_AM_conservationCheck_enable>
<config_AM_conservationCheck_enable ocn_grid="RRS6to18E3r6">.true.</config_AM_conservationCheck_enable>
<config_AM_conservationCheck_compute_interval>'dt'</config_AM_conservationCheck_compute_interval>
<config_AM_conservationCheck_output_stream>'conservationCheckOutput'</config_AM_conservationCheck_output_stream>
<config_AM_conservationCheck_compute_on_startup>.false.</config_AM_conservationCheck_compute_on_startup>
Expand All @@ -1197,6 +1205,7 @@
<config_AM_conservationCheck_compute_on_startup ocn_grid="FRISwISC04to60E3r1">.true.</config_AM_conservationCheck_compute_on_startup>
<config_AM_conservationCheck_compute_on_startup ocn_grid="FRISwISC02to60E3r1">.true.</config_AM_conservationCheck_compute_on_startup>
<config_AM_conservationCheck_compute_on_startup ocn_grid="FRISwISC01to60E3r1">.true.</config_AM_conservationCheck_compute_on_startup>
<config_AM_conservationCheck_compute_on_startup ocn_grid="RRS6to18E3r6">.true.</config_AM_conservationCheck_compute_on_startup>
<config_AM_conservationCheck_write_on_startup>.false.</config_AM_conservationCheck_write_on_startup>
<config_AM_conservationCheck_write_on_startup ocn_grid="SOwISC12to60E2r4">.true.</config_AM_conservationCheck_write_on_startup>
<config_AM_conservationCheck_write_on_startup ocn_grid="ECwISC30to60E2r1">.true.</config_AM_conservationCheck_write_on_startup>
Expand All @@ -1205,6 +1214,7 @@
<config_AM_conservationCheck_write_on_startup ocn_grid="FRISwISC04to60E3r1">.true.</config_AM_conservationCheck_write_on_startup>
<config_AM_conservationCheck_write_on_startup ocn_grid="FRISwISC02to60E3r1">.true.</config_AM_conservationCheck_write_on_startup>
<config_AM_conservationCheck_write_on_startup ocn_grid="FRISwISC01to60E3r1">.true.</config_AM_conservationCheck_write_on_startup>
<config_AM_conservationCheck_write_on_startup ocn_grid="RRS6to18E3r6">.true.</config_AM_conservationCheck_write_on_startup>
<config_AM_conservationCheck_write_to_logfile>.true.</config_AM_conservationCheck_write_to_logfile>
<config_AM_conservationCheck_restart_stream>'conservationCheckRestart'</config_AM_conservationCheck_restart_stream>

Expand Down
47 changes: 35 additions & 12 deletions components/mpas-ocean/cime_config/buildnml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,18 @@ def buildnml(case, caseroot, compname):
if ocn_ismf == 'data':
data_ismf_file = 'prescribed_ismf_paolo2023.IcoswISC30E3r5.20240227.nc'

elif ocn_grid == 'RRS6to18E3r6':
decomp_date = '20240404'
decomp_prefix = 'partitions/mpas-o.graph.info.'
restoring_file = 'sss.PHC2_monthlyClimatology.RRS6to18E3r6.20240402.nc'
analysis_mask_file = 'RRS6to18E3r6_mocBasinsAndTransects20210623.nc'
ic_date = '20240402'
ic_prefix = 'mpaso.RRS6to18E3r6'
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 Expand Up @@ -478,7 +490,8 @@ def buildnml(case, caseroot, compname):
lines.append('')
lines.append('<immutable_stream name="mesh"')
lines.append(' type="none"')
if ocn_grid.startswith("oRRS1") or ocn_grid.startswith("FRIS"):
if ocn_grid.startswith("oRRS1") or ocn_grid.startswith("FRIS") \
or ocn_grid.startswith("RRSwISC6"):
lines.append(' io_type="pnetcdf,cdf5"')
else:
lines.append(' io_type="{}"'.format(ocn_pio_typename))
Expand All @@ -487,7 +500,8 @@ def buildnml(case, caseroot, compname):
lines.append('/>')
lines.append('<immutable_stream name="input"')
lines.append(' type="input"')
if ocn_grid.startswith("oRRS1") or ocn_grid.startswith("FRIS"):
if ocn_grid.startswith("oRRS1") or ocn_grid.startswith("FRIS") \
or ocn_grid.startswith("RRSwISC6"):
lines.append(' io_type="pnetcdf,cdf5"')
else:
lines.append(' io_type="{}"'.format(ocn_pio_typename))
Expand All @@ -508,7 +522,8 @@ def buildnml(case, caseroot, compname):
lines.append('-->')
lines.append('<immutable_stream name="restart"')
lines.append(' type="input;output"')
if ocn_grid.startswith("oRRS1") or ocn_grid.startswith("FRIS"):
if ocn_grid.startswith("oRRS1") or ocn_grid.startswith("FRIS") \
or ocn_grid.startswith("RRSwISC6"):
lines.append(' io_type="pnetcdf,cdf5"')
else:
lines.append(' io_type="{}"'.format(ocn_pio_typename))
Expand All @@ -527,7 +542,8 @@ def buildnml(case, caseroot, compname):
lines.append('')
lines.append('<stream name="output"')
lines.append(' type="output"')
if ocn_grid.startswith("oRRS1") or ocn_grid.startswith("FRIS"):
if ocn_grid.startswith("oRRS1") or ocn_grid.startswith("FRIS") \
or ocn_grid.startswith("RRSwISC6"):
lines.append(' io_type="pnetcdf,cdf5"')
else:
lines.append(' io_type="{}"'.format(ocn_pio_typename))
Expand Down Expand Up @@ -811,7 +827,8 @@ def buildnml(case, caseroot, compname):
lines.append('<stream name="eddyProductVariablesOutput"')
lines.append(' type="output"')
lines.append(' precision="single"')
if ocn_grid.startswith("oRRS1") or ocn_grid.startswith("FRIS"):
if ocn_grid.startswith("oRRS1") or ocn_grid.startswith("FRIS") \
or ocn_grid.startswith("RRSwISC6"):
lines.append(' io_type="pnetcdf,cdf5"')
else:
lines.append(' io_type="{}"'.format(ocn_pio_typename))
Expand Down Expand Up @@ -1191,7 +1208,8 @@ def buildnml(case, caseroot, compname):
lines.append('<stream name="timeSeriesStatsMonthlyOutput"')
lines.append(' type="output"')
lines.append(' precision="single"')
if ocn_grid.startswith("oRRS1") or ocn_grid.startswith("FRIS"):
if ocn_grid.startswith("oRRS1") or ocn_grid.startswith("FRIS") \
or ocn_grid.startswith("RRSwISC6"):
lines.append(' io_type="pnetcdf,cdf5"')
else:
lines.append(' io_type="{}"'.format(ocn_pio_typename))
Expand Down Expand Up @@ -1237,7 +1255,7 @@ def buildnml(case, caseroot, compname):
lines.append(' <var name="atmosphericPressure"/>')
lines.append(' <var name="normalMLEvelocity"/>')
lines.append(' <var name="vertMLEBolusVelocityTop"/>')
if not ocn_grid.startswith("oRRS1"):
if not (ocn_grid.startswith("oRRS1") or ocn_grid.startswith("RRSwISC6")):
lines.append(' <var name="normalGMBolusVelocity"/>')
lines.append(' <var name="vertGMBolusVelocityTop"/>')
lines.append(' <var name="cGMphaseSpeed"/>')
Expand Down Expand Up @@ -1421,7 +1439,8 @@ def buildnml(case, caseroot, compname):
lines.append('<stream name="timeSeriesStatsMonthlyMaxOutput"')
lines.append(' type="output"')
lines.append(' precision="single"')
if ocn_grid.startswith("oRRS1") or ocn_grid.startswith("FRIS"):
if ocn_grid.startswith("oRRS1") or ocn_grid.startswith("FRIS") \
or ocn_grid.startswith("RRSwISC6"):
lines.append(' io_type="pnetcdf,cdf5"')
else:
lines.append(' io_type="{}"'.format(ocn_pio_typename))
Expand Down Expand Up @@ -1483,7 +1502,8 @@ def buildnml(case, caseroot, compname):
lines.append('<stream name="timeSeriesStatsMonthlyMinOutput"')
lines.append(' type="output"')
lines.append(' precision="single"')
if ocn_grid.startswith("oRRS1") or ocn_grid.startswith("FRIS"):
if ocn_grid.startswith("oRRS1") or ocn_grid.startswith("FRIS") \
or ocn_grid.startswith("RRSwISC6"):
lines.append(' io_type="pnetcdf,cdf5"')
else:
lines.append(' io_type="{}"'.format(ocn_pio_typename))
Expand Down Expand Up @@ -1586,7 +1606,8 @@ def buildnml(case, caseroot, compname):
lines.append('')
lines.append('<stream name="timeSeriesStatsMonthlyRestart"')
lines.append(' type="input;output"')
if ocn_grid.startswith("oRRS1") or ocn_grid.startswith("FRIS"):
if ocn_grid.startswith("oRRS1") or ocn_grid.startswith("FRIS") \
or ocn_grid.startswith("RRSwISC6"):
lines.append(' io_type="pnetcdf,cdf5"')
else:
lines.append(' io_type="{}"'.format(ocn_pio_typename))
Expand All @@ -1602,7 +1623,8 @@ def buildnml(case, caseroot, compname):
lines.append('')
lines.append('<stream name="timeSeriesStatsMonthlyMaxRestart"')
lines.append(' type="input;output"')
if ocn_grid.startswith("oRRS1") or ocn_grid.startswith("FRIS"):
if ocn_grid.startswith("oRRS1") or ocn_grid.startswith("FRIS") \
or ocn_grid.startswith("RRSwISC6"):
lines.append(' io_type="pnetcdf,cdf5"')
else:
lines.append(' io_type="{}"'.format(ocn_pio_typename))
Expand All @@ -1618,7 +1640,8 @@ def buildnml(case, caseroot, compname):
lines.append('')
lines.append('<stream name="timeSeriesStatsMonthlyMinRestart"')
lines.append(' type="input;output"')
if ocn_grid.startswith("oRRS1") or ocn_grid.startswith("FRIS"):
if ocn_grid.startswith("oRRS1") or ocn_grid.startswith("FRIS") \
or ocn_grid.startswith("RRSwISC6"):
lines.append(' io_type="pnetcdf,cdf5"')
else:
lines.append(' io_type="{}"'.format(ocn_pio_typename))
Expand Down
4 changes: 4 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 @@ -29,6 +29,7 @@
<config_dt ice_grid="FRISwISC04to60E3r1">240.0</config_dt>
<config_dt ice_grid="FRISwISC02to60E3r1">120.0</config_dt>
<config_dt ice_grid="FRISwISC01to60E3r1">60.0</config_dt>
<config_dt ice_grid="RRS6to18E3r6">900.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 @@ -88,6 +89,7 @@
<config_initial_latitude_north ice_grid="ARRM10to60E2r1">75.0</config_initial_latitude_north>
<config_initial_latitude_north ice_grid="oRRS30to10v3wLI">85.0</config_initial_latitude_north>
<config_initial_latitude_north ice_grid="oRRS18to6v3">85.0</config_initial_latitude_north>
<config_initial_latitude_north ice_grid="RRS6to18E3r6">85.0</config_initial_latitude_north>
<config_initial_latitude_south>-60.0</config_initial_latitude_south>
<config_initial_latitude_south ice_grid="oEC60to30v3wLI">-75.0</config_initial_latitude_south>
<config_initial_latitude_south ice_grid="ECwISC30to60E1r2">-75.0</config_initial_latitude_south>
Expand All @@ -102,6 +104,7 @@
<config_initial_latitude_south ice_grid="ARRM10to60E2r1">-85.0</config_initial_latitude_south>
<config_initial_latitude_south ice_grid="oRRS30to10v3wLI">-85.0</config_initial_latitude_south>
<config_initial_latitude_south ice_grid="oRRS18to6v3">-85.0</config_initial_latitude_south>
<config_initial_latitude_south ice_grid="RRS6to18E3r6">-85.0</config_initial_latitude_south>
<config_initial_velocity_type>'uniform'</config_initial_velocity_type>
<config_initial_uvelocity>0.0</config_initial_uvelocity>
<config_initial_vvelocity>0.0</config_initial_vvelocity>
Expand Down Expand Up @@ -164,6 +167,7 @@
<config_dynamics_subcycle_number ice_grid="FRISwISC04to60E3r1">1</config_dynamics_subcycle_number>
<config_dynamics_subcycle_number ice_grid="FRISwISC02to60E3r1">1</config_dynamics_subcycle_number>
<config_dynamics_subcycle_number ice_grid="FRISwISC01to60E3r1">1</config_dynamics_subcycle_number>
<config_dynamics_subcycle_number ice_grid="RRS6to18E3r6">2</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
Loading