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 RRSwISC6to18E3r5 ocean and sea-ice mesh #6447

Merged
merged 5 commits into from
Jun 14, 2024
Merged

Add new RRSwISC6to18E3r5 ocean and sea-ice mesh #6447

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7977c37
Add RRSwISC6to18E3r5 to MPAS-Ocean and -Seaice
xylar Dec 12, 2023
6707aa6
Add RRSwISC6to18E3r5 to ELM
xylar Dec 12, 2023
d7d700d
Update the partition files for ocean and ice
xylar Apr 5, 2024
a4f20f9
Add mapping and domain files for RRSwISC6to18E3r5 mesh
jonbob Jun 4, 2024
fc123ed
Update defaults for RRSwISC6to18E3r5 to match ongoing tests
jonbob Jun 13, 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
173 changes: 157 additions & 16 deletions cime_config/config_grids.xml
View file
Open in desktop

Large diffs are not rendered by default.

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 @@ -1423,7 +1423,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,IcosXISC30E3r7">
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,IcosXISC30E3r7,RRSwISC6to18E3r5">
Land mask description
</entry>

Expand Down
16 changes: 16 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 @@ -54,6 +54,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="RRSwISC6to18E3r5">'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 @@ -83,6 +84,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="RRSwISC6to18E3r5">.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 @@ -149,6 +151,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="RRSwISC6to18E3r5">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 @@ -165,6 +168,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="RRSwISC6to18E3r5">.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 @@ -203,6 +207,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="RRSwISC6to18E3r5">.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 @@ -399,6 +404,7 @@
<config_land_ice_flux_mode ocn_grid="FRISwISC04to60E3r1">'pressure_only'</config_land_ice_flux_mode>
<config_land_ice_flux_mode ocn_grid="FRISwISC02to60E3r1">'pressure_only'</config_land_ice_flux_mode>
<config_land_ice_flux_mode ocn_grid="FRISwISC01to60E3r1">'pressure_only'</config_land_ice_flux_mode>
<config_land_ice_flux_mode ocn_grid="RRSwISC6to18E3r5">'pressure_only'</config_land_ice_flux_mode>
<config_land_ice_flux_formulation>'Jenkins'</config_land_ice_flux_formulation>
<config_land_ice_flux_useHollandJenkinsAdvDiff>.false.</config_land_ice_flux_useHollandJenkinsAdvDiff>
<config_land_ice_flux_attenuation_coefficient>10.0</config_land_ice_flux_attenuation_coefficient>
Expand All @@ -417,6 +423,7 @@
<config_land_ice_flux_explicit_topDragCoeff ocn_grid="FRISwISC04to60E3r1">4.48e-3</config_land_ice_flux_explicit_topDragCoeff>
<config_land_ice_flux_explicit_topDragCoeff ocn_grid="FRISwISC02to60E3r1">4.48e-3</config_land_ice_flux_explicit_topDragCoeff>
<config_land_ice_flux_explicit_topDragCoeff ocn_grid="FRISwISC01to60E3r1">4.48e-3</config_land_ice_flux_explicit_topDragCoeff>
<config_land_ice_flux_explicit_topDragCoeff ocn_grid="RRSwISC6to18E3r5">4.48e-3</config_land_ice_flux_explicit_topDragCoeff>
<config_land_ice_flux_ISOMIP_gammaT>1e-4</config_land_ice_flux_ISOMIP_gammaT>
<config_land_ice_flux_rms_tidal_velocity>5e-2</config_land_ice_flux_rms_tidal_velocity>
<config_land_ice_flux_jenkins_heat_transfer_coefficient>0.011</config_land_ice_flux_jenkins_heat_transfer_coefficient>
Expand All @@ -430,6 +437,7 @@
<config_land_ice_flux_jenkins_heat_transfer_coefficient ocn_grid="FRISwISC04to60E3r1">0.00295</config_land_ice_flux_jenkins_heat_transfer_coefficient>
<config_land_ice_flux_jenkins_heat_transfer_coefficient ocn_grid="FRISwISC02to60E3r1">0.00295</config_land_ice_flux_jenkins_heat_transfer_coefficient>
<config_land_ice_flux_jenkins_heat_transfer_coefficient ocn_grid="FRISwISC01to60E3r1">0.00295</config_land_ice_flux_jenkins_heat_transfer_coefficient>
<config_land_ice_flux_jenkins_heat_transfer_coefficient ocn_grid="RRSwISC6to18E3r5">0.00295</config_land_ice_flux_jenkins_heat_transfer_coefficient>
<config_land_ice_flux_jenkins_salt_transfer_coefficient>3.1e-4</config_land_ice_flux_jenkins_salt_transfer_coefficient>
<config_land_ice_flux_jenkins_salt_transfer_coefficient ocn_grid="oEC60to30v3wLI">8.42e-5</config_land_ice_flux_jenkins_salt_transfer_coefficient>
<config_land_ice_flux_jenkins_salt_transfer_coefficient ocn_grid="ECwISC30to60E1r2">8.42e-5</config_land_ice_flux_jenkins_salt_transfer_coefficient>
Expand All @@ -441,6 +449,7 @@
<config_land_ice_flux_jenkins_salt_transfer_coefficient ocn_grid="FRISwISC04to60E3r1">8.42e-5</config_land_ice_flux_jenkins_salt_transfer_coefficient>
<config_land_ice_flux_jenkins_salt_transfer_coefficient ocn_grid="FRISwISC02to60E3r1">8.42e-5</config_land_ice_flux_jenkins_salt_transfer_coefficient>
<config_land_ice_flux_jenkins_salt_transfer_coefficient ocn_grid="FRISwISC01to60E3r1">8.42e-5</config_land_ice_flux_jenkins_salt_transfer_coefficient>
<config_land_ice_flux_jenkins_salt_transfer_coefficient ocn_grid="RRSwISC6to18E3r5">8.42e-5</config_land_ice_flux_jenkins_salt_transfer_coefficient>

<!-- advection -->
<config_vert_advection_method>'flux-form'</config_vert_advection_method>
Expand Down Expand Up @@ -469,6 +478,7 @@
<config_implicit_top_drag_coeff ocn_grid="FRISwISC04to60E3r1">4.48e-3</config_implicit_top_drag_coeff>
<config_implicit_top_drag_coeff ocn_grid="FRISwISC02to60E3r1">4.48e-3</config_implicit_top_drag_coeff>
<config_implicit_top_drag_coeff ocn_grid="FRISwISC01to60E3r1">4.48e-3</config_implicit_top_drag_coeff>
<config_implicit_top_drag_coeff ocn_grid="RRSwISC6to18E3r5">4.48e-3</config_implicit_top_drag_coeff>
<config_loglaw_bottom_roughness>1.0e-3</config_loglaw_bottom_roughness>
<config_loglaw_layer_depth_max>10.0</config_loglaw_layer_depth_max>
<config_loglaw_bottom_drag_min>2.5e-3</config_loglaw_bottom_drag_min>
Expand Down Expand Up @@ -555,6 +565,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="RRSwISC6to18E3r5">'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 @@ -601,6 +612,7 @@
<config_check_ssh_consistency ocn_grid="FRISwISC04to60E3r1">.false.</config_check_ssh_consistency>
<config_check_ssh_consistency ocn_grid="FRISwISC02to60E3r1">.false.</config_check_ssh_consistency>
<config_check_ssh_consistency ocn_grid="FRISwISC01to60E3r1">.false.</config_check_ssh_consistency>
<config_check_ssh_consistency ocn_grid="RRSwISC6to18E3r5">.false.</config_check_ssh_consistency>
<config_filter_btr_mode>.false.</config_filter_btr_mode>
<config_prescribe_velocity>.false.</config_prescribe_velocity>
<config_prescribe_thickness>.false.</config_prescribe_thickness>
Expand Down Expand Up @@ -1126,6 +1138,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="RRSwISC6to18E3r5">.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 @@ -1213,6 +1226,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="RRSwISC6to18E3r5">.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 @@ -1224,6 +1238,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="RRSwISC6to18E3r5">.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 @@ -1233,6 +1248,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="RRSwISC6to18E3r5">.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
49 changes: 37 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 @@ -365,6 +365,20 @@ def buildnml(case, caseroot, compname):
ic_date = '20240314'
ic_prefix = 'mpaso.IcosXISC30E3r7.rstFromPiControlSpinup-chrysalis'

elif ocn_grid == 'RRSwISC6to18E3r5':
decomp_date = '20240404'
decomp_prefix = 'partitions/mpas-o.graph.info.'
restoring_file = 'sss.PHC2_monthlyClimatology.RRSwISC6to18E3r5.20240327.nc'
analysis_mask_file = 'RRSwISC6to18E3r5_mocBasinsAndTransects20210623.nc'
ic_date = '20240327'
ic_prefix = 'mpaso.RRSwISC6to18E3r5'
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.")
if ocn_ismf == 'data':
data_ismf_file = 'prescribed_ismf_paolo2023.RRSwISC6to18E3r5.20240327.nc'


#--------------------------------------------------------------------
# Set OCN_FORCING = datm_forced_restoring if restoring file is available
#--------------------------------------------------------------------
Expand Down Expand Up @@ -491,7 +505,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 @@ -500,7 +515,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 @@ -521,7 +537,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 @@ -540,7 +557,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 @@ -826,7 +844,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 @@ -1206,7 +1225,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 @@ -1252,7 +1272,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 @@ -1438,7 +1458,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 @@ -1502,7 +1523,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 @@ -1607,7 +1629,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 @@ -1623,7 +1646,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 @@ -1639,7 +1663,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
Loading