From cc8bf5d0327979e45cdbb051b6490ddd40dd565b Mon Sep 17 00:00:00 2001
From: dqwu <wuda@mcs.anl.gov>
Date: Thu, 10 Jul 2025 11:00:13 -0500
Subject: [PATCH 1/4] Set io_type in MPAS streams based on the CIME settings

Replace hard-coded pnetcdf or netcdf values in streams.ocean and
streams.seaice with ocn_pio_typename or ice_pio_typename from the
CIME settings.
---
 components/mpas-ocean/cime_config/buildnml  | 72 ++++-----------------
 components/mpas-seaice/cime_config/buildnml | 26 ++------
 2 files changed, 19 insertions(+), 79 deletions(-)

diff --git a/components/mpas-ocean/cime_config/buildnml b/components/mpas-ocean/cime_config/buildnml
index 30682163e965..06ca8ae479f6 100755
--- a/components/mpas-ocean/cime_config/buildnml
+++ b/components/mpas-ocean/cime_config/buildnml
@@ -568,21 +568,13 @@ 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") \
-                    or ocn_grid.startswith("RRSwISC6"):
-                lines.append('                  io_type="pnetcdf,cdf5"')
-            else:
-                lines.append('                  io_type="{}"'.format(ocn_pio_typename))
+            lines.append('                  io_type="{}"'.format(ocn_pio_typename))
 
             lines.append('                  filename_template="{}/ocn/mpas-o/{}/{}.{}.nc"'.format(din_loc_root, ocn_mask, ic_prefix, ic_date))
             lines.append('/>')
             lines.append('<immutable_stream name="input"')
             lines.append('                  type="input"')
-            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))
+            lines.append('                  io_type="{}"'.format(ocn_pio_typename))
 
             lines.append('                  input_interval="initial_only"')
             lines.append('                  filename_template="{}"'.format(input_file))
@@ -600,11 +592,7 @@ 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") \
-                    or ocn_grid.startswith("RRSwISC6"):
-                lines.append('                  io_type="pnetcdf,cdf5"')
-            else:
-                lines.append('                  io_type="{}"'.format(ocn_pio_typename))
+            lines.append('                  io_type="{}"'.format(ocn_pio_typename))
 
             lines.append('                  filename_template="{}.mpaso{}.rst.$Y-$M-$D_$S.nc"'.format(casename, inst_string))
             lines.append('                  filename_interval="output_interval"')
@@ -620,11 +608,7 @@ 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") \
-                    or ocn_grid.startswith("RRSwISC6"):
-                lines.append('        io_type="pnetcdf,cdf5"')
-            else:
-                lines.append('        io_type="{}"'.format(ocn_pio_typename))
+            lines.append('        io_type="{}"'.format(ocn_pio_typename))
 
             lines.append('        filename_template="{}.mpaso{}.hist.$Y-$M-$D_$S.nc"'.format(casename, inst_string))
             lines.append('        filename_interval="00-01-00_00:00:00"')
@@ -809,7 +793,7 @@ def buildnml(case, caseroot, compname):
             lines.append('')
             lines.append('<stream name="globalStatsOutput"')
             lines.append('        type="output"')
-            lines.append('        io_type="netcdf"')
+            lines.append('        io_type="{}"'.format(ocn_pio_typename))
             lines.append('        filename_template="{}.mpaso{}.hist.am.globalStats.$Y-$M-$D.nc"'.format(casename, inst_string))
             lines.append('        filename_interval="00-01-00_00:00:00"')
             lines.append('        reference_time="01-01-01_00:00:00"')
@@ -835,7 +819,7 @@ def buildnml(case, caseroot, compname):
             lines.append('')
             lines.append('<stream name="surfaceAreaWeightedAveragesOutput"')
             lines.append('        type="output"')
-            lines.append('        io_type="netcdf"')
+            lines.append('        io_type="{}"'.format(ocn_pio_typename))
             lines.append('        filename_template="{}.mpaso{}.hist.am.surfaceAreaWeightedAverages.$Y-$M-$D.nc"'.format(casename, inst_string))
             lines.append('        filename_interval="00-01-00_00:00:00"')
             lines.append('        reference_time="01-01-01_00:00:00"')
@@ -932,11 +916,7 @@ 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") \
-                    or ocn_grid.startswith("RRSwISC6"):
-                lines.append('        io_type="pnetcdf,cdf5"')
-            else:
-                lines.append('        io_type="{}"'.format(ocn_pio_typename))
+            lines.append('        io_type="{}"'.format(ocn_pio_typename))
 
             lines.append('        filename_template="{}.mpaso{}.hist.am.eddyProductVariables.$Y-$M-$D.nc"'.format(casename, inst_string))
             lines.append('        filename_interval="00-01-00_00:00:00"')
@@ -1012,7 +992,7 @@ def buildnml(case, caseroot, compname):
                 lines.append('<stream name="waveOutput"')
                 lines.append('        type="output"')
                 lines.append('        precision="single"')
-                lines.append('        io_type="pnetcdf"')
+                lines.append('        io_type="{}"'.format(ocn_pio_typename))
                 lines.append('        filename_template="{}.mpaso{}.waveOutput.$Y-$M-$D_$h.$m.$s.nc"'.format(casename, inst_string))
                 lines.append('        filename_interval="00-01-00_00:00:00"')
                 lines.append('        reference_time="01-01-01_00:00:00"')
@@ -1318,11 +1298,7 @@ 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") \
-                    or ocn_grid.startswith("RRSwISC6"):
-                lines.append('        io_type="pnetcdf,cdf5"')
-            else:
-                lines.append('        io_type="{}"'.format(ocn_pio_typename))
+            lines.append('        io_type="{}"'.format(ocn_pio_typename))
 
             lines.append('        useMissingValMask="true"')
             lines.append('        filename_template="{}.mpaso{}.hist.am.timeSeriesStatsMonthly.$Y-$M-$D.nc"'.format(casename, inst_string))
@@ -1554,11 +1530,7 @@ 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") \
-                    or ocn_grid.startswith("RRSwISC6"):
-                lines.append('        io_type="pnetcdf,cdf5"')
-            else:
-                lines.append('        io_type="{}"'.format(ocn_pio_typename))
+            lines.append('        io_type="{}"'.format(ocn_pio_typename))
 
             lines.append('        useMissingValMask="true"')
             lines.append('        filename_template="{}.mpaso{}.hist.am.timeSeriesStatsMonthlyMax.$Y-$M-$D.nc"'.format(casename, inst_string))
@@ -1620,11 +1592,7 @@ 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") \
-                    or ocn_grid.startswith("RRSwISC6"):
-                lines.append('        io_type="pnetcdf,cdf5"')
-            else:
-                lines.append('        io_type="{}"'.format(ocn_pio_typename))
+            lines.append('        io_type="{}"'.format(ocn_pio_typename))
 
             lines.append('        useMissingValMask="true"')
             lines.append('        filename_template="{}.mpaso{}.hist.am.timeSeriesStatsMonthlyMin.$Y-$M-$D.nc"'.format(casename, inst_string))
@@ -1727,11 +1695,7 @@ 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") \
-                    or ocn_grid.startswith("RRSwISC6"):
-                lines.append('        io_type="pnetcdf,cdf5"')
-            else:
-                lines.append('        io_type="{}"'.format(ocn_pio_typename))
+            lines.append('        io_type="{}"'.format(ocn_pio_typename))
 
             lines.append('        filename_template="{}.mpaso{}.rst.am.timeSeriesStatsMonthly.$Y-$M-$D_$S.nc"'.format(casename, inst_string))
             lines.append('        filename_interval="output_interval"')
@@ -1744,11 +1708,7 @@ 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") \
-                    or ocn_grid.startswith("RRSwISC6"):
-                lines.append('        io_type="pnetcdf,cdf5"')
-            else:
-                lines.append('        io_type="{}"'.format(ocn_pio_typename))
+            lines.append('        io_type="{}"'.format(ocn_pio_typename))
 
             lines.append('        filename_template="{}.mpaso{}.rst.am.timeSeriesStatsMonthlyMax.$Y-$M-$D_$S.nc"'.format(casename, inst_string))
             lines.append('        filename_interval="output_interval"')
@@ -1761,11 +1721,7 @@ 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") \
-                    or ocn_grid.startswith("RRSwISC6"):
-                lines.append('        io_type="pnetcdf,cdf5"')
-            else:
-                lines.append('        io_type="{}"'.format(ocn_pio_typename))
+            lines.append('        io_type="{}"'.format(ocn_pio_typename))
 
             lines.append('        filename_template="{}.mpaso{}.rst.am.timeSeriesStatsMonthlyMin.$Y-$M-$D_$S.nc"'.format(casename, inst_string))
             lines.append('        filename_interval="output_interval"')
diff --git a/components/mpas-seaice/cime_config/buildnml b/components/mpas-seaice/cime_config/buildnml
index 68ba3075a44a..5498d5173fbc 100755
--- a/components/mpas-seaice/cime_config/buildnml
+++ b/components/mpas-seaice/cime_config/buildnml
@@ -487,21 +487,13 @@ def buildnml(case, caseroot, compname):
             lines.append('<streams>')
             lines.append('<immutable_stream name="mesh"')
             lines.append('                  type="none"')
-            if ice_grid.startswith("oRRS1") or ice_grid.startswith("FRIS") \
-                    or ice_grid.startswith("RRSwISC6"):
-                lines.append('                  io_type="pnetcdf,cdf5"')
-            else:
-                lines.append('                  io_type="{}"'.format(ice_pio_typename))
+            lines.append('                  io_type="{}"'.format(ice_pio_typename))
 
             lines.append('                  filename_template="mesh_variables.nc" />')
             lines.append('')
             lines.append('<immutable_stream name="input"')
             lines.append('                  type="input"')
-            if ice_grid.startswith("oRRS1") or ice_grid.startswith("FRIS") \
-                    or ice_grid.startswith("RRSwISC6"):
-                lines.append('                  io_type="pnetcdf,cdf5"')
-            else:
-                lines.append('                  io_type="{}"'.format(ice_pio_typename))
+            lines.append('                  io_type="{}"'.format(ice_pio_typename))
 
             lines.append('                  filename_interval="none"')
             lines.append('                  filename_template="{}"'.format(input_file))
@@ -520,11 +512,7 @@ def buildnml(case, caseroot, compname):
             lines.append('')
             lines.append('<immutable_stream name="restart"')
             lines.append('                  type="input;output"')
-            if ice_grid.startswith("oRRS1") or ice_grid.startswith("FRIS") \
-                    or ice_grid.startswith("RRSwISC6"):
-                lines.append('                  io_type="pnetcdf,cdf5"')
-            else:
-                lines.append('                  io_type="{}"'.format(ice_pio_typename))
+            lines.append('                  io_type="{}"'.format(ice_pio_typename))
 
             lines.append('                  filename_template="{}.mpassi{}.rst.$Y-$M-$D_$S.nc"'.format(casename, inst_string))
             lines.append('                  filename_interval="output_interval"')
@@ -537,11 +525,7 @@ def buildnml(case, caseroot, compname):
             if ice_ic_mode == 'spunup':
                 lines.append('<immutable_stream name="restart_ic"')
                 lines.append('                  type="input"')
-                if ice_grid.startswith("oRRS1") or ice_grid.startswith("FRIS") \
-                        or ice_grid.startswith("RRSwISC6"):
-                        lines.append('                  io_type="pnetcdf,cdf5"')
-                else:
-                    lines.append('                  io_type="{}"'.format(ice_pio_typename))
+                lines.append('                  io_type="{}"'.format(ice_pio_typename))
 
                 lines.append('                  filename_template="{}"'.format(input_file))
                 lines.append('                  filename_interval="none"')
@@ -1005,7 +989,7 @@ def buildnml(case, caseroot, compname):
 
                 lines.append('<stream name="pointwiseStatsOutput"')
                 lines.append('        type="output"')
-                lines.append('        io_type="netcdf"')
+                lines.append('        io_type="{}"'.format(ice_pio_typename))
                 lines.append('        filename_template="pointwiseStats.$Y-$M-$D.nc"')
                 lines.append('        filename_interval="00-01-00_00:00:00"')
                 lines.append('        reference_time="01-01-01_00:00:00"')

From 7f85a01c7a3653fca5dc1f9765d7413221d0d912 Mon Sep 17 00:00:00 2001
From: dqwu <wuda@mcs.anl.gov>
Date: Fri, 11 Jul 2025 11:50:10 -0500
Subject: [PATCH 2/4] Handle ADIOS mesh I/O types in MPAS framework

Add support for adios and adiosc mesh I/O types to ensure they are
recognized correctly instead of defaulting to pnetcdf.
---
 components/mpas-albany-landice/driver/glc_comp_mct.F  | 4 ++++
 components/mpas-framework/src/driver/mpas_subdriver.F | 4 ++++
 components/mpas-ocean/driver/ocn_comp_mct.F           | 4 ++++
 components/mpas-seaice/driver/ice_comp_mct.F          | 4 ++++
 4 files changed, 16 insertions(+)

diff --git a/components/mpas-albany-landice/driver/glc_comp_mct.F b/components/mpas-albany-landice/driver/glc_comp_mct.F
index b26e79712a44..6f014b793e61 100644
--- a/components/mpas-albany-landice/driver/glc_comp_mct.F
+++ b/components/mpas-albany-landice/driver/glc_comp_mct.F
@@ -475,6 +475,10 @@ end subroutine xml_stream_get_attributes
        mesh_iotype = MPAS_IO_NETCDF
     else if (trim(iotype) == 'netcdf4') then
        mesh_iotype = MPAS_IO_NETCDF4
+    else if (trim(iotype) == 'adios') then
+       mesh_iotype = MPAS_IO_ADIOS
+    else if (trim(iotype) == 'adiosc') then
+       mesh_iotype = MPAS_IO_ADIOSC
     else
        mesh_iotype = MPAS_IO_PNETCDF
     end if
diff --git a/components/mpas-framework/src/driver/mpas_subdriver.F b/components/mpas-framework/src/driver/mpas_subdriver.F
index 6db64e7dcf3d..11863a06c168 100644
--- a/components/mpas-framework/src/driver/mpas_subdriver.F
+++ b/components/mpas-framework/src/driver/mpas_subdriver.F
@@ -285,6 +285,10 @@ end subroutine xml_stream_get_attributes
          mesh_iotype = MPAS_IO_NETCDF
       else if (trim(iotype) == 'netcdf4') then
          mesh_iotype = MPAS_IO_NETCDF4
+      else if (trim(iotype) == 'adios') then
+         mesh_iotype = MPAS_IO_ADIOS
+      else if (trim(iotype) == 'adiosc') then
+         mesh_iotype = MPAS_IO_ADIOSC
       else
          mesh_iotype = MPAS_IO_PNETCDF
       end if
diff --git a/components/mpas-ocean/driver/ocn_comp_mct.F b/components/mpas-ocean/driver/ocn_comp_mct.F
index 1187d2a26a23..dfa14b009940 100644
--- a/components/mpas-ocean/driver/ocn_comp_mct.F
+++ b/components/mpas-ocean/driver/ocn_comp_mct.F
@@ -539,6 +539,10 @@ end subroutine xml_stream_get_attributes
        mesh_iotype = MPAS_IO_NETCDF
     else if (trim(iotype) == 'netcdf4') then
        mesh_iotype = MPAS_IO_NETCDF4
+    else if (trim(iotype) == 'adios') then
+       mesh_iotype = MPAS_IO_ADIOS
+    else if (trim(iotype) == 'adiosc') then
+       mesh_iotype = MPAS_IO_ADIOSC
     else
        mesh_iotype = MPAS_IO_PNETCDF
     end if
diff --git a/components/mpas-seaice/driver/ice_comp_mct.F b/components/mpas-seaice/driver/ice_comp_mct.F
index 0948e8e3526c..ae9aae4b2186 100644
--- a/components/mpas-seaice/driver/ice_comp_mct.F
+++ b/components/mpas-seaice/driver/ice_comp_mct.F
@@ -552,6 +552,10 @@ end subroutine xml_stream_get_attributes
        mesh_iotype = MPAS_IO_NETCDF
     else if (trim(iotype) == 'netcdf4') then
        mesh_iotype = MPAS_IO_NETCDF4
+    else if (trim(iotype) == 'adios') then
+       mesh_iotype = MPAS_IO_ADIOS
+    else if (trim(iotype) == 'adiosc') then
+       mesh_iotype = MPAS_IO_ADIOSC
     else
        mesh_iotype = MPAS_IO_PNETCDF
     end if

From fa61a1db0d875813c5e3b09a4959ee41cf7a45f3 Mon Sep 17 00:00:00 2001
From: dqwu <wuda@mcs.anl.gov>
Date: Sun, 13 Jul 2025 10:52:12 -0500
Subject: [PATCH 3/4] Use CDF-5 format for pnetcdf via PIO_NETCDF_FORMAT in
 MPAS streams

Set io_type to 'pnetcdf,cdf5' when PIO_TYPENAME is 'pnetcdf' and
PIO_NETCDF_FORMAT is '64bit_data'. Otherwise, use the standard
PIO_TYPENAME value.
---
 components/mpas-ocean/cime_config/buildnml  | 95 +++++++++++----------
 components/mpas-seaice/cime_config/buildnml | 67 ++++++++-------
 2 files changed, 88 insertions(+), 74 deletions(-)

diff --git a/components/mpas-ocean/cime_config/buildnml b/components/mpas-ocean/cime_config/buildnml
index 06ca8ae479f6..6a127b22c6dd 100755
--- a/components/mpas-ocean/cime_config/buildnml
+++ b/components/mpas-ocean/cime_config/buildnml
@@ -44,6 +44,7 @@ def buildnml(case, caseroot, compname):
     atm_co2_const_val = case.get_value("CCSM_CO2_PPMV")
     ice_bgc           = case.get_value("MPASI_BGC")
     ocn_pio_typename  = case.get_value("OCN_PIO_TYPENAME")
+    ocn_pio_netcdf_format = case.get_value("OCN_PIO_NETCDF_FORMAT")
     ninst_ocn         = case.get_value("NINST_OCN")
     nthrds_ocn        = case.get_value("NTHRDS_OCN")
     ntasks_ocn        = case.get_value("NTASKS_PER_INST_OCN")
@@ -54,6 +55,12 @@ def buildnml(case, caseroot, compname):
     run_reftod        = case.get_value("RUN_REFTOD")
     stream_name       = 'streams.ocean'
 
+    # Use 'pnetcdf,cdf5' when OCN_PIO_NETCDF_FORMAT requests 64-bit data, else use the standard type
+    if ocn_pio_typename.lower() == 'pnetcdf' and ocn_pio_netcdf_format.lower() == '64bit_data':
+        io_type_str = 'pnetcdf,cdf5'
+    else:
+        io_type_str = ocn_pio_typename
+
     mpasoconf_dir = os.path.join(casebuild, "mpasoconf")
 
     if not os.path.isdir(mpasoconf_dir): os.mkdir(mpasoconf_dir)
@@ -568,13 +575,13 @@ def buildnml(case, caseroot, compname):
             lines.append('')
             lines.append('<immutable_stream name="mesh"')
             lines.append('                  type="none"')
-            lines.append('                  io_type="{}"'.format(ocn_pio_typename))
+            lines.append('                  io_type="{}"'.format(io_type_str))
 
             lines.append('                  filename_template="{}/ocn/mpas-o/{}/{}.{}.nc"'.format(din_loc_root, ocn_mask, ic_prefix, ic_date))
             lines.append('/>')
             lines.append('<immutable_stream name="input"')
             lines.append('                  type="input"')
-            lines.append('                  io_type="{}"'.format(ocn_pio_typename))
+            lines.append('                  io_type="{}"'.format(io_type_str))
 
             lines.append('                  input_interval="initial_only"')
             lines.append('                  filename_template="{}"'.format(input_file))
@@ -592,7 +599,7 @@ def buildnml(case, caseroot, compname):
             lines.append('-->')
             lines.append('<immutable_stream name="restart"')
             lines.append('                  type="input;output"')
-            lines.append('                  io_type="{}"'.format(ocn_pio_typename))
+            lines.append('                  io_type="{}"'.format(io_type_str))
 
             lines.append('                  filename_template="{}.mpaso{}.rst.$Y-$M-$D_$S.nc"'.format(casename, inst_string))
             lines.append('                  filename_interval="output_interval"')
@@ -608,7 +615,7 @@ def buildnml(case, caseroot, compname):
             lines.append('')
             lines.append('<stream name="output"')
             lines.append('        type="output"')
-            lines.append('        io_type="{}"'.format(ocn_pio_typename))
+            lines.append('        io_type="{}"'.format(io_type_str))
 
             lines.append('        filename_template="{}.mpaso{}.hist.$Y-$M-$D_$S.nc"'.format(casename, inst_string))
             lines.append('        filename_interval="00-01-00_00:00:00"')
@@ -680,7 +687,7 @@ def buildnml(case, caseroot, compname):
             lines.append('')
             lines.append('<stream name="block_debug_output"')
             lines.append('        type="output"')
-            lines.append('        io_type="{}"'.format(ocn_pio_typename))
+            lines.append('        io_type="{}"'.format(io_type_str))
             lines.append('        filename_template="{}.mpaso{}.output_debug_block_$B.nc"'.format(casename, inst_string))
             lines.append('        reference_time="01-01-01_00:00:00"')
             lines.append('        filename_interval="1000-00-00_00:00:00"')
@@ -705,7 +712,7 @@ def buildnml(case, caseroot, compname):
             if ocn_forcing == 'datm_forced_restoring':
                 lines.append('<stream name="surface_salinity_monthly_data"')
                 lines.append('       type="input"')
-                lines.append('       io_type="{}"'.format(ocn_pio_typename))
+                lines.append('       io_type="{}"'.format(io_type_str))
                 lines.append('       filename_template="{}/ocn/mpas-o/{}/{}"'.format(din_loc_root, ocn_mask, restoring_file))
                 lines.append('       input_interval="none"')
                 lines.append('       packages="activeTracersSurfaceRestoringPKG">')
@@ -718,7 +725,7 @@ def buildnml(case, caseroot, compname):
             if u_tidal_rms_file != '':
                 lines.append('<stream name="tidal_velocity_rms_parameterized"')
                 lines.append('       type="input"')
-                lines.append('       io_type="{}"'.format(ocn_pio_typename))
+                lines.append('       io_type="{}"'.format(io_type_str))
                 lines.append('       filename_template="{}/ocn/mpas-o/{}/{}"'.format(din_loc_root, ocn_mask, u_tidal_rms_file))
                 lines.append('       input_interval="initial_only" ')
                 lines.append('       packages="landIceFluxesPKG">')
@@ -730,7 +737,7 @@ def buildnml(case, caseroot, compname):
             if data_sgr_file != '':
                 lines.append('<stream name="prescribed_subglacial_runoff"')
                 lines.append('       type="input"')
-                lines.append('       io_type="{}"'.format(ocn_pio_typename))
+                lines.append('       io_type="{}"'.format(io_type_str))
                 lines.append(
                     '       filename_template="{}/ocn/mpas-o/{}/{}"'.format(din_loc_root, ocn_mask, data_sgr_file))
                 lines.append('       input_interval="initial_only" ')
@@ -743,7 +750,7 @@ def buildnml(case, caseroot, compname):
             if analysis_mask_file != '':
                 lines.append('<stream name="transectMasksInput"')
                 lines.append('        type="input"')
-                lines.append('        io_type="{}"'.format(ocn_pio_typename))
+                lines.append('        io_type="{}"'.format(io_type_str))
                 lines.append('        filename_template="{}/ocn/mpas-o/{}/{}"'.format(din_loc_root, ocn_mask, analysis_mask_file))
                 lines.append('        input_interval="initial_only">')
                 lines.append('')
@@ -757,7 +764,7 @@ def buildnml(case, caseroot, compname):
                 lines.append('')
                 lines.append('<stream name="regionalMasksInput"')
                 lines.append('        type="input"')
-                lines.append('        io_type="{}"'.format(ocn_pio_typename))
+                lines.append('        io_type="{}"'.format(io_type_str))
                 lines.append('        filename_template="{}/ocn/mpas-o/{}/{}"'.format(din_loc_root, ocn_mask, analysis_mask_file))
                 lines.append('        input_interval="initial_only">')
                 lines.append('')
@@ -771,7 +778,7 @@ def buildnml(case, caseroot, compname):
 
             lines.append('<stream name="mocStreamfunctionOutput"')
             lines.append('        type="output"')
-            lines.append('        io_type="{}"'.format(ocn_pio_typename))
+            lines.append('        io_type="{}"'.format(io_type_str))
             lines.append('        filename_template="{}.mpaso{}.hist.am.mocStreamfunctionOutput.$Y-$M-$D.nc"'.format(casename, inst_string))
             lines.append('        filename_interval="01-00-00_00:00:00"')
             lines.append('        clobber_mode="truncate"')
@@ -793,7 +800,7 @@ def buildnml(case, caseroot, compname):
             lines.append('')
             lines.append('<stream name="globalStatsOutput"')
             lines.append('        type="output"')
-            lines.append('        io_type="{}"'.format(ocn_pio_typename))
+            lines.append('        io_type="{}"'.format(io_type_str))
             lines.append('        filename_template="{}.mpaso{}.hist.am.globalStats.$Y-$M-$D.nc"'.format(casename, inst_string))
             lines.append('        filename_interval="00-01-00_00:00:00"')
             lines.append('        reference_time="01-01-01_00:00:00"')
@@ -819,7 +826,7 @@ def buildnml(case, caseroot, compname):
             lines.append('')
             lines.append('<stream name="surfaceAreaWeightedAveragesOutput"')
             lines.append('        type="output"')
-            lines.append('        io_type="{}"'.format(ocn_pio_typename))
+            lines.append('        io_type="{}"'.format(io_type_str))
             lines.append('        filename_template="{}.mpaso{}.hist.am.surfaceAreaWeightedAverages.$Y-$M-$D.nc"'.format(casename, inst_string))
             lines.append('        filename_interval="00-01-00_00:00:00"')
             lines.append('        reference_time="01-01-01_00:00:00"')
@@ -836,7 +843,7 @@ def buildnml(case, caseroot, compname):
             lines.append('')
             lines.append('<stream name="waterMassCensusOutput"')
             lines.append('        type="output"')
-            lines.append('        io_type="{}"'.format(ocn_pio_typename))
+            lines.append('        io_type="{}"'.format(io_type_str))
             lines.append('        filename_template="{}.mpaso{}.hist.am.waterMassCensus.$Y-$M-$D.nc"'.format(casename, inst_string))
             lines.append('        filename_interval="00-01-00_00:00:00"')
             lines.append('        reference_time="01-01-01_00:00:00"')
@@ -855,7 +862,7 @@ def buildnml(case, caseroot, compname):
             lines.append('')
             lines.append('<stream name="layerVolumeWeightedAverageOutput"')
             lines.append('        type="output"')
-            lines.append('        io_type="{}"'.format(ocn_pio_typename))
+            lines.append('        io_type="{}"'.format(io_type_str))
             lines.append('        filename_template="{}.mpaso{}.hist.am.layerVolumeWeightedAverage.$Y-$M-$D.nc"'.format(casename, inst_string))
             lines.append('        filename_interval="00-01-00_00:00:00"')
             lines.append('        reference_time="01-01-01_00:00:00"')
@@ -875,7 +882,7 @@ def buildnml(case, caseroot, compname):
             lines.append('')
             lines.append('<stream name="zonalMeanOutput"')
             lines.append('        type="output"')
-            lines.append('        io_type="{}"'.format(ocn_pio_typename))
+            lines.append('        io_type="{}"'.format(io_type_str))
             lines.append('        filename_template="{}.mpaso{}.hist.am.zonalMeans.$Y-$M-$D.nc"'.format(casename, inst_string))
             lines.append('        filename_interval="00-01-00_00:00:00"')
             lines.append('        reference_time="01-01-01_00:00:00"')
@@ -896,7 +903,7 @@ def buildnml(case, caseroot, compname):
             lines.append('')
             lines.append('<stream name="meridionalHeatTransportOutput"')
             lines.append('        type="output"')
-            lines.append('        io_type="{}"'.format(ocn_pio_typename))
+            lines.append('        io_type="{}"'.format(io_type_str))
             lines.append('        filename_template="{}.mpaso{}.hist.am.meridionalHeatTransport.$Y-$M-$D.nc"'.format(casename, inst_string))
             lines.append('        filename_interval="00-01-00_00:00:00"')
             lines.append('        reference_time="01-01-01_00:00:00"')
@@ -916,7 +923,7 @@ def buildnml(case, caseroot, compname):
             lines.append('<stream name="eddyProductVariablesOutput"')
             lines.append('        type="output"')
             lines.append('        precision="single"')
-            lines.append('        io_type="{}"'.format(ocn_pio_typename))
+            lines.append('        io_type="{}"'.format(io_type_str))
 
             lines.append('        filename_template="{}.mpaso{}.hist.am.eddyProductVariables.$Y-$M-$D.nc"'.format(casename, inst_string))
             lines.append('        filename_interval="00-01-00_00:00:00"')
@@ -941,7 +948,7 @@ def buildnml(case, caseroot, compname):
             lines.append('<stream name="highFrequencyOutput"')
             lines.append('        type="output"')
             lines.append('        precision="single"')
-            lines.append('        io_type="{}"'.format(ocn_pio_typename))
+            lines.append('        io_type="{}"'.format(io_type_str))
             lines.append('        filename_template="{}.mpaso{}.hist.am.highFrequencyOutput.$Y-$M-$D_$h.$m.$s.nc"'.format(casename, inst_string))
             lines.append('        filename_interval="00-01-00_00:00:00"')
             lines.append('        reference_time="01-01-01_00:00:00"')
@@ -992,7 +999,7 @@ def buildnml(case, caseroot, compname):
                 lines.append('<stream name="waveOutput"')
                 lines.append('        type="output"')
                 lines.append('        precision="single"')
-                lines.append('        io_type="{}"'.format(ocn_pio_typename))
+                lines.append('        io_type="{}"'.format(io_type_str))
                 lines.append('        filename_template="{}.mpaso{}.waveOutput.$Y-$M-$D_$h.$m.$s.nc"'.format(casename, inst_string))
                 lines.append('        filename_interval="00-01-00_00:00:00"')
                 lines.append('        reference_time="01-01-01_00:00:00"')
@@ -1012,7 +1019,7 @@ def buildnml(case, caseroot, compname):
             lines.append('<stream name="mixedLayerDepthsOutput"')
             lines.append('        type="output"')
             lines.append('        precision="single"')
-            lines.append('        io_type="{}"'.format(ocn_pio_typename))
+            lines.append('        io_type="{}"'.format(io_type_str))
             lines.append('        filename_template="{}.mpaso{}.hist.am.mixedLayerDepths.$Y-$M-$D.nc"'.format(casename, inst_string))
             lines.append('        filename_interval="00-01-00_00:00:00"')
             lines.append('        reference_time="01-01-01_00:00:00"')
@@ -1029,7 +1036,7 @@ def buildnml(case, caseroot, compname):
             lines.append('<stream name="oceanHeatContentOutput"')
             lines.append('        type="output"')
             lines.append('        precision="single"')
-            lines.append('        io_type="{}"'.format(ocn_pio_typename))
+            lines.append('        io_type="{}"'.format(io_type_str))
             lines.append('        filename_template="{}.mpaso{}.hist.am.oceanHeatContent.$Y-$M-$D.nc"'.format(casename, inst_string))
             lines.append('        filename_interval="00-01-00_00:00:00"')
             lines.append('        reference_time="01-01-01_00:00:00"')
@@ -1047,7 +1054,7 @@ def buildnml(case, caseroot, compname):
             lines.append('<stream name="mixedLayerHeatBudgetOutput"')
             lines.append('        type="output"')
             lines.append('        precision="single"')
-            lines.append('        io_type="{}"'.format(ocn_pio_typename))
+            lines.append('        io_type="{}"'.format(io_type_str))
             lines.append('        filename_template="{}.mpaso{}.hist.am.mixedLayerHeatBudget.$Y-$M-$D.nc"'.format(casename, inst_string))
             lines.append('        filename_interval="00-01-00_00:00:00"')
             lines.append('        reference_time="01-01-01_00:00:00"')
@@ -1070,7 +1077,7 @@ def buildnml(case, caseroot, compname):
             lines.append('<stream name="sedimentFluxIndexOutput"')
             lines.append('        type="output"')
             lines.append('        precision="single"')
-            lines.append('        io_type="{}"'.format(ocn_pio_typename))
+            lines.append('        io_type="{}"'.format(io_type_str))
             lines.append('        filename_template="{}.mpaso{}.hist.am.sedimentFluxIndex.$Y-$M-$D.nc"'.format(casename, inst_string))
             lines.append('        filename_interval="00-01-00_00:00:00"')
             lines.append('        reference_time="01-01-01_00:00:00"')
@@ -1088,7 +1095,7 @@ def buildnml(case, caseroot, compname):
             lines.append('<stream name="sedimentTransportOutput"')
             lines.append('        type="output"')
             lines.append('        precision="single"')
-            lines.append('        io_type="{}"'.format(ocn_pio_typename))
+            lines.append('        io_type="{}"'.format(io_type_str))
             lines.append('        filename_template="{}.mpaso{}.hist.am.sedimentTransport.$Y-$M-$D.nc"'.format(casename, inst_string))
             lines.append('        filename_interval="00-01-00_00:00:00"')
             lines.append('        reference_time="01-01-01_00:00:00"')
@@ -1116,7 +1123,7 @@ def buildnml(case, caseroot, compname):
             lines.append('<stream name="harmonicAnalysisOutput"')
             lines.append('        type="output"')
             lines.append('        precision="single"')
-            lines.append('        io_type="{}"'.format(ocn_pio_typename))
+            lines.append('        io_type="{}"'.format(io_type_str))
             lines.append('        filename_template="{}.mpaso{}.hist.am.harmonicAnalysis.$Y-$M-$D.nc"'.format(casename, inst_string))
             lines.append('        filename_interval="00-01-00_00:00:00"')
             lines.append('        reference_time="01-01-01_00:00:00"')
@@ -1145,7 +1152,7 @@ def buildnml(case, caseroot, compname):
             lines.append('')
             lines.append('<stream name="harmonicAnalysisRestart"')
             lines.append('        type="input;output"')
-            lines.append('        io_type="{}"'.format(ocn_pio_typename))
+            lines.append('        io_type="{}"'.format(io_type_str))
             lines.append('        filename_template="{}.mpaso{}.rst.am.harmonicAnalysis.$Y-$M-$D_$S.nc"'.format(casename, inst_string))
             lines.append('        filename_interval="output_interval"')
             lines.append('        clobber_mode="truncate"')
@@ -1161,7 +1168,7 @@ def buildnml(case, caseroot, compname):
             lines.append('')
             lines.append('<stream name="conservationCheckOutput"')
             lines.append('        type="output"')
-            lines.append('        io_type="{}"'.format(ocn_pio_typename))
+            lines.append('        io_type="{}"'.format(io_type_str))
             lines.append('        filename_template="{}.mpaso{}.hist.am.conservationCheck.$Y-$M-$D.nc"'.format(casename, inst_string))
             lines.append('        filename_interval="00-01-00_00:00:00"')
             lines.append('        reference_time="01-01-01_00:00:00"')
@@ -1234,7 +1241,7 @@ def buildnml(case, caseroot, compname):
             lines.append('')
             lines.append('<immutable_stream name="conservationCheckRestart"')
             lines.append('        type="input;output"')
-            lines.append('        io_type="{}"'.format(ocn_pio_typename))
+            lines.append('        io_type="{}"'.format(io_type_str))
             lines.append('        filename_template="{}.mpaso{}.rst.am.conservationCheck.$Y-$M-$D_$S.nc"'.format(casename, inst_string))
             lines.append('        filename_interval="output_interval"')
             lines.append('        clobber_mode="truncate"')
@@ -1247,7 +1254,7 @@ def buildnml(case, caseroot, compname):
             lines.append('<stream name="timeSeriesStatsDailyOutput"')
             lines.append('        type="output"')
             lines.append('        precision="single"')
-            lines.append('        io_type="{}"'.format(ocn_pio_typename))
+            lines.append('        io_type="{}"'.format(io_type_str))
             lines.append('        useMissingValMask="true"')
             lines.append('        filename_template="{}.mpaso{}.hist.am.timeSeriesStatsDaily.$Y-$M-$D.nc"'.format(casename, inst_string))
             lines.append('        filename_interval="00-01-00_00:00:00"')
@@ -1298,7 +1305,7 @@ def buildnml(case, caseroot, compname):
             lines.append('<stream name="timeSeriesStatsMonthlyOutput"')
             lines.append('        type="output"')
             lines.append('        precision="single"')
-            lines.append('        io_type="{}"'.format(ocn_pio_typename))
+            lines.append('        io_type="{}"'.format(io_type_str))
 
             lines.append('        useMissingValMask="true"')
             lines.append('        filename_template="{}.mpaso{}.hist.am.timeSeriesStatsMonthly.$Y-$M-$D.nc"'.format(casename, inst_string))
@@ -1530,7 +1537,7 @@ def buildnml(case, caseroot, compname):
             lines.append('<stream name="timeSeriesStatsMonthlyMaxOutput"')
             lines.append('        type="output"')
             lines.append('        precision="single"')
-            lines.append('        io_type="{}"'.format(ocn_pio_typename))
+            lines.append('        io_type="{}"'.format(io_type_str))
 
             lines.append('        useMissingValMask="true"')
             lines.append('        filename_template="{}.mpaso{}.hist.am.timeSeriesStatsMonthlyMax.$Y-$M-$D.nc"'.format(casename, inst_string))
@@ -1592,7 +1599,7 @@ def buildnml(case, caseroot, compname):
             lines.append('<stream name="timeSeriesStatsMonthlyMinOutput"')
             lines.append('        type="output"')
             lines.append('        precision="single"')
-            lines.append('        io_type="{}"'.format(ocn_pio_typename))
+            lines.append('        io_type="{}"'.format(io_type_str))
 
             lines.append('        useMissingValMask="true"')
             lines.append('        filename_template="{}.mpaso{}.hist.am.timeSeriesStatsMonthlyMin.$Y-$M-$D.nc"'.format(casename, inst_string))
@@ -1654,7 +1661,7 @@ def buildnml(case, caseroot, compname):
             lines.append('<stream name="timeSeriesStatsClimatologyOutput"')
             lines.append('        type="output"')
             lines.append('        precision="single"')
-            lines.append('        io_type="{}"'.format(ocn_pio_typename))
+            lines.append('        io_type="{}"'.format(io_type_str))
             lines.append('        useMissingValMask="true"')
             lines.append('        filename_template="{}.mpaso{}.hist.am.timeSeriesStatsClimatology.$Y-$M-$D.nc"'.format(casename, inst_string))
             lines.append('        filename_interval="00-01-00_00:00:00"')
@@ -1669,7 +1676,7 @@ def buildnml(case, caseroot, compname):
             lines.append('<stream name="timeSeriesStatsCustomOutput"')
             lines.append('        type="output"')
             lines.append('        precision="single"')
-            lines.append('        io_type="{}"'.format(ocn_pio_typename))
+            lines.append('        io_type="{}"'.format(io_type_str))
             lines.append('        useMissingValMask="true"')
             lines.append('        filename_template="{}.mpaso{}.hist.am.timeSeriesStatsCustom.$Y-$M-$D.nc"'.format(casename, inst_string))
             lines.append('        filename_interval="00-01-00_00:00:00"')
@@ -1683,7 +1690,7 @@ def buildnml(case, caseroot, compname):
             lines.append('')
             lines.append('<stream name="timeSeriesStatsDailyRestart"')
             lines.append('        type="input;output"')
-            lines.append('        io_type="{}"'.format(ocn_pio_typename))
+            lines.append('        io_type="{}"'.format(io_type_str))
             lines.append('        filename_template="{}.mpaso{}.rst.am.timeSeriesStatsDaily.$Y-$M-$D_$S.nc"'.format(casename, inst_string))
             lines.append('        filename_interval="output_interval"')
             lines.append('        clobber_mode="truncate"')
@@ -1695,7 +1702,7 @@ def buildnml(case, caseroot, compname):
             lines.append('')
             lines.append('<stream name="timeSeriesStatsMonthlyRestart"')
             lines.append('        type="input;output"')
-            lines.append('        io_type="{}"'.format(ocn_pio_typename))
+            lines.append('        io_type="{}"'.format(io_type_str))
 
             lines.append('        filename_template="{}.mpaso{}.rst.am.timeSeriesStatsMonthly.$Y-$M-$D_$S.nc"'.format(casename, inst_string))
             lines.append('        filename_interval="output_interval"')
@@ -1708,7 +1715,7 @@ def buildnml(case, caseroot, compname):
             lines.append('')
             lines.append('<stream name="timeSeriesStatsMonthlyMaxRestart"')
             lines.append('        type="input;output"')
-            lines.append('        io_type="{}"'.format(ocn_pio_typename))
+            lines.append('        io_type="{}"'.format(io_type_str))
 
             lines.append('        filename_template="{}.mpaso{}.rst.am.timeSeriesStatsMonthlyMax.$Y-$M-$D_$S.nc"'.format(casename, inst_string))
             lines.append('        filename_interval="output_interval"')
@@ -1721,7 +1728,7 @@ def buildnml(case, caseroot, compname):
             lines.append('')
             lines.append('<stream name="timeSeriesStatsMonthlyMinRestart"')
             lines.append('        type="input;output"')
-            lines.append('        io_type="{}"'.format(ocn_pio_typename))
+            lines.append('        io_type="{}"'.format(io_type_str))
 
             lines.append('        filename_template="{}.mpaso{}.rst.am.timeSeriesStatsMonthlyMin.$Y-$M-$D_$S.nc"'.format(casename, inst_string))
             lines.append('        filename_interval="output_interval"')
@@ -1734,7 +1741,7 @@ def buildnml(case, caseroot, compname):
             lines.append('')
             lines.append('<stream name="timeSeriesStatsClimatologyRestart"')
             lines.append('        type="input;output"')
-            lines.append('        io_type="{}"'.format(ocn_pio_typename))
+            lines.append('        io_type="{}"'.format(io_type_str))
             lines.append('        filename_template="{}.mpaso{}.rst.am.timeSeriesStatsClimatology.$Y-$M-$D_$S.nc"'.format(casename, inst_string))
             lines.append('        filename_interval="output_interval"')
             lines.append('        clobber_mode="truncate"')
@@ -1746,7 +1753,7 @@ def buildnml(case, caseroot, compname):
             lines.append('')
             lines.append('<stream name="timeSeriesStatsCustomRestart"')
             lines.append('        type="input;output"')
-            lines.append('        io_type="{}"'.format(ocn_pio_typename))
+            lines.append('        io_type="{}"'.format(io_type_str))
             lines.append('        filename_template="{}.mpaso{}.rst.am.timeSeriesStatsCustom.$Y-$M-$D_$S.nc"'.format(casename, inst_string))
             lines.append('        filename_interval="output_interval"')
             lines.append('        clobber_mode="truncate"')
@@ -1759,7 +1766,7 @@ def buildnml(case, caseroot, compname):
             if eco_forcing_file != '':
                 lines.append('<stream name="ecosys_monthly_flux"')
                 lines.append('        type="input"')
-                lines.append('        io_type="{}"'.format(ocn_pio_typename))
+                lines.append('        io_type="{}"'.format(io_type_str))
                 lines.append('        filename_template="{}/ocn/mpas-o/{}/{}"'.format(din_loc_root, ocn_mask, eco_forcing_file))
                 lines.append('        input_interval="none"')
                 lines.append('        packages="ecosysTracersPKG">')
@@ -1783,7 +1790,7 @@ def buildnml(case, caseroot, compname):
             if data_ismf_file != '':
                 lines.append('<stream name="data_land_ice_fluxes"')
                 lines.append('        type="input"')
-                lines.append('        io_type="{}"'.format(ocn_pio_typename))
+                lines.append('        io_type="{}"'.format(io_type_str))
                 lines.append('        filename_template="{}/ocn/mpas-o/{}/{}"'.format(din_loc_root, ocn_mask, data_ismf_file))
                 lines.append('        input_interval="initial_only"')
                 lines.append('        packages="dataLandIceFluxesPKG">')
@@ -1802,7 +1809,7 @@ def buildnml(case, caseroot, compname):
             lines.append('')
             lines.append('<stream name="forcing"')
             lines.append('        type="none"')
-            lines.append('        io_type="{}"'.format(ocn_pio_typename))
+            lines.append('        io_type="{}"'.format(io_type_str))
             lines.append('        filename_template="{}.mpaso{}.hist.forcing_variables.$Y-$M-$D_$S.nc"'.format(casename, inst_string))
             lines.append('        filename_interval="00-01-00_00:00:00"')
             lines.append('        clobber_mode="truncate">')
diff --git a/components/mpas-seaice/cime_config/buildnml b/components/mpas-seaice/cime_config/buildnml
index 5498d5173fbc..4dc604d30b2b 100755
--- a/components/mpas-seaice/cime_config/buildnml
+++ b/components/mpas-seaice/cime_config/buildnml
@@ -38,6 +38,7 @@ def buildnml(case, caseroot, compname):
     prognostic_mode  = case.get_value("MPASSI_PROGNOSTIC_MODE")
     column_mode      = case.get_value("MPASSI_COLUMN_MODE")
     ice_pio_typename = case.get_value("ICE_PIO_TYPENAME")
+    ice_pio_netcdf_format = case.get_value("ICE_PIO_NETCDF_FORMAT")
     ninst_ice        = case.get_value("NINST_ICE")
     ntasks_ice       = case.get_value("NTASKS_PER_INST_ICE")
     rundir           = case.get_value("RUNDIR")
@@ -49,6 +50,12 @@ def buildnml(case, caseroot, compname):
     atm_ncpl         = case.get_value("ATM_NCPL")
     stream_name      = 'streams.seaice'
 
+    # Use 'pnetcdf,cdf5' when ICE_PIO_NETCDF_FORMAT requests 64-bit data, else use the standard type
+    if ice_pio_typename.lower() == 'pnetcdf' and ice_pio_netcdf_format.lower() == '64bit_data':
+        io_type_str = 'pnetcdf,cdf5'
+    else:
+        io_type_str = ice_pio_typename
+
     mpassiconf_dir = os.path.join(casebuild, "mpassiconf")
 
     if not os.path.isdir(mpassiconf_dir): os.mkdir(mpassiconf_dir)
@@ -487,13 +494,13 @@ def buildnml(case, caseroot, compname):
             lines.append('<streams>')
             lines.append('<immutable_stream name="mesh"')
             lines.append('                  type="none"')
-            lines.append('                  io_type="{}"'.format(ice_pio_typename))
+            lines.append('                  io_type="{}"'.format(io_type_str))
 
             lines.append('                  filename_template="mesh_variables.nc" />')
             lines.append('')
             lines.append('<immutable_stream name="input"')
             lines.append('                  type="input"')
-            lines.append('                  io_type="{}"'.format(ice_pio_typename))
+            lines.append('                  io_type="{}"'.format(io_type_str))
 
             lines.append('                  filename_interval="none"')
             lines.append('                  filename_template="{}"'.format(input_file))
@@ -512,7 +519,7 @@ def buildnml(case, caseroot, compname):
             lines.append('')
             lines.append('<immutable_stream name="restart"')
             lines.append('                  type="input;output"')
-            lines.append('                  io_type="{}"'.format(ice_pio_typename))
+            lines.append('                  io_type="{}"'.format(io_type_str))
 
             lines.append('                  filename_template="{}.mpassi{}.rst.$Y-$M-$D_$S.nc"'.format(casename, inst_string))
             lines.append('                  filename_interval="output_interval"')
@@ -525,7 +532,7 @@ def buildnml(case, caseroot, compname):
             if ice_ic_mode == 'spunup':
                 lines.append('<immutable_stream name="restart_ic"')
                 lines.append('                  type="input"')
-                lines.append('                  io_type="{}"'.format(ice_pio_typename))
+                lines.append('                  io_type="{}"'.format(io_type_str))
 
                 lines.append('                  filename_template="{}"'.format(input_file))
                 lines.append('                  filename_interval="none"')
@@ -534,7 +541,7 @@ def buildnml(case, caseroot, compname):
 
             lines.append('<stream name="output"')
             lines.append('        type="output"')
-            lines.append('        io_type="{}"'.format(ice_pio_typename))
+            lines.append('        io_type="{}"'.format(io_type_str))
             lines.append('        filename_template="{}.mpassi{}.hist.$Y-$M-$D_$S.nc"'.format(casename, inst_string))
             lines.append('        filename_interval="00-01-00_00:00:00"')
             lines.append('        clobber_mode="truncate"')
@@ -554,7 +561,7 @@ def buildnml(case, caseroot, compname):
             lines.append('')
             lines.append('<immutable_stream name="LYqSixHourlyForcing"')
             lines.append('                  type="input"')
-            lines.append('                  io_type="{}"'.format(ice_pio_typename))
+            lines.append('                  io_type="{}"'.format(io_type_str))
             lines.append('                  filename_template="forcing/atmosphere_forcing_six_hourly.$Y.nc"')
             lines.append('                  filename_interval="0001-00-00_00:00:00"')
             lines.append('                  reference_time="2000-01-01_03:00:00"')
@@ -562,56 +569,56 @@ def buildnml(case, caseroot, compname):
             lines.append('')
             lines.append('<immutable_stream name="LYqMonthlyForcing"')
             lines.append('                  type="input"')
-            lines.append('                  io_type="{}"'.format(ice_pio_typename))
+            lines.append('                  io_type="{}"'.format(io_type_str))
             lines.append('                  filename_template="forcing/atmosphere_forcing_monthly.nc"')
             lines.append('                  filename_interval="none"')
             lines.append('                  input_interval="none" />')
             lines.append('')
             lines.append('<immutable_stream name="NCARMonthlySSTForcing"')
             lines.append('                  type="input"')
-            lines.append('                  io_type="{}"'.format(ice_pio_typename))
+            lines.append('                  io_type="{}"'.format(io_type_str))
             lines.append('                  filename_template="forcing/ocean_forcing_monthly.nc"')
             lines.append('                  filename_interval="none"')
             lines.append('                  input_interval="none" />')
             lines.append('')
             lines.append('<immutable_stream name="NCARMonthlyForcing"')
             lines.append('                  type="input"')
-            lines.append('                  io_type="{}"'.format(ice_pio_typename))
+            lines.append('                  io_type="{}"'.format(io_type_str))
             lines.append('                  filename_template="forcing/ocean_forcing_monthly.nc"')
             lines.append('                  filename_interval="none"')
             lines.append('                  input_interval="none" />')
             lines.append('')
             lines.append('<immutable_stream name="StandardAerosolsInput"')
             lines.append('                  type="input"')
-            lines.append('                  io_type="{}"'.format(ice_pio_typename))
+            lines.append('                  io_type="{}"'.format(io_type_str))
             lines.append('                  filename_template="standard_optics_mpas_cice.nc"')
             lines.append('                  filename_interval="none"')
             lines.append('                  input_interval="none" />')
             lines.append('')
             lines.append('<immutable_stream name="ModalAerosolsInput"')
             lines.append('                  type="input"')
-            lines.append('                  io_type="{}"'.format(ice_pio_typename))
+            lines.append('                  io_type="{}"'.format(io_type_str))
             lines.append('                  filename_template="snicar_optics_5bnd_mam_c140303_mpas_cice.nc"')
             lines.append('                  filename_interval="none"')
             lines.append('                  input_interval="none" />')
             lines.append('')
             lines.append('<immutable_stream name="SnowAgingPropertiesInput"')
             lines.append('                  type="input"')
-            lines.append('                  io_type="{}"'.format(ice_pio_typename))
+            lines.append('                  io_type="{}"'.format(io_type_str))
             lines.append('                  filename_template="{}/ice/mpas-seaice/general/snicar_drdt_bst_fit_60_c04262019.nc"'.format(din_loc_root))
             lines.append('                  filename_interval="none"')
             lines.append('                  input_interval="initial_only" />')
             lines.append('')
             lines.append('<immutable_stream name="SnicarInput"')
             lines.append('                  type="input"')
-            lines.append('                  io_type="{}"'.format(ice_pio_typename))
+            lines.append('                  io_type="{}"'.format(io_type_str))
             lines.append('                  filename_template="{}/ice/mpas-seaice/general/snicar_optics_5bnd_snow_and_aerosols.nc"'.format(din_loc_root))
             lines.append('                  filename_interval="none"')
             lines.append('                  input_interval="initial_only" />')
             lines.append('')
             lines.append('<immutable_stream name="ISPOLDailyWOAForcing"')
             lines.append('                  type="input"')
-            lines.append('                  io_type="{}"'.format(ice_pio_typename))
+            lines.append('                  io_type="{}"'.format(io_type_str))
             lines.append('                  filename_template="{}/ice/mpas-cice/general/ISPOLDailyWOAForcing_10132022.nc"'.format(din_loc_root))
             lines.append('                  filename_interval="none"')
             lines.append('                  input_interval="none" />')
@@ -619,7 +626,7 @@ def buildnml(case, caseroot, compname):
             if dust_iron_file != '':
                 lines.append('<immutable_stream name="DustIronMonthlyForcing"')
                 lines.append('                  type="input"')
-                lines.append('                  io_type="{}"'.format(ice_pio_typename))
+                lines.append('                  io_type="{}"'.format(io_type_str))
                 lines.append('                  filename_template="{}/ocn/mpas-o/{}/{}"'.format(din_loc_root, ice_mask, dust_iron_file))
                 lines.append('                  filename_interval="none"')
                 lines.append('                  input_interval="none" />')
@@ -658,7 +665,7 @@ def buildnml(case, caseroot, compname):
             if iceberg_mode == 'data':
                 lines.append('<stream name="dataIcebergForcing"')
                 lines.append('                  type="input"')
-                lines.append('                  io_type="{}"'.format(ice_pio_typename))
+                lines.append('                  io_type="{}"'.format(io_type_str))
                 lines.append('                  filename_template="{}/ice/mpas-seaice/{}/{}"'.format(din_loc_root, ice_mask, data_iceberg_file))
                 lines.append('                  filename_interval="none"')
                 lines.append('                  input_interval="none" >')
@@ -671,7 +678,7 @@ def buildnml(case, caseroot, compname):
 
             lines.append('<stream name="highFrequencyOutput"')
             lines.append('        type="output"')
-            lines.append('        io_type="{}"'.format(ice_pio_typename))
+            lines.append('        io_type="{}"'.format(io_type_str))
             lines.append('        filename_template="{}.mpassi{}.hist.am.highFrequencyOutput.$Y-$M-$D.nc"'.format(casename, inst_string))
             lines.append('        filename_interval="00-01-00_00:00:00"')
             lines.append('        reference_time="01-01-01_00:00:00"')
@@ -686,7 +693,7 @@ def buildnml(case, caseroot, compname):
             lines.append('')
             lines.append('<stream name="regionalStatisticsOutput"')
             lines.append('        type="output"')
-            lines.append('        io_type="{}"'.format(ice_pio_typename))
+            lines.append('        io_type="{}"'.format(io_type_str))
             lines.append('        filename_template="{}.mpassi{}.hist.am.regionalStatistics.$Y.$M.nc"'.format(casename, inst_string))
             lines.append('        filename_interval="00-01-00_00:00:00"')
             lines.append('        reference_time="01-01-01_00:00:00"')
@@ -709,7 +716,7 @@ def buildnml(case, caseroot, compname):
             lines.append('')
             lines.append('<stream name="conservationCheckOutput"')
             lines.append('        type="output"')
-            lines.append('        io_type="{}"'.format(ice_pio_typename))
+            lines.append('        io_type="{}"'.format(io_type_str))
             lines.append('        filename_template="{}.mpassi{}.hist.am.conservationCheck.$Y.nc"'.format(casename, inst_string))
             lines.append('        filename_interval="00-01-00_00:00:00"')
             lines.append('        reference_time="01-01-01_00:00:00"')
@@ -781,7 +788,7 @@ def buildnml(case, caseroot, compname):
             lines.append('')
             lines.append('<immutable_stream name="conservationCheckRestart"')
             lines.append('        type="input;output"')
-            lines.append('        io_type="{}"'.format(ice_pio_typename))
+            lines.append('        io_type="{}"'.format(io_type_str))
             lines.append('        filename_template="{}.mpassi{}.rst.am.conservationCheck.$Y-$M-$D_$S.nc"'.format(casename, inst_string))
             lines.append('        filename_interval="output_interval"')
             lines.append('        clobber_mode="truncate"')
@@ -793,7 +800,7 @@ def buildnml(case, caseroot, compname):
             lines.append('')
             lines.append('<stream name="loadBalanceOutput"')
             lines.append('        type="output"')
-            lines.append('        io_type="{}"'.format(ice_pio_typename))
+            lines.append('        io_type="{}"'.format(io_type_str))
             lines.append('        filename_template="{}.mpassi{}.hist.am.cice_loadBalance.$Y.nc"'.format(casename, inst_string))
             lines.append('        filename_interval="00-01-00_00:00:00"')
             lines.append('        reference_time="01-01-01_00:00:00"')
@@ -808,7 +815,7 @@ def buildnml(case, caseroot, compname):
             lines.append('')
             lines.append('<stream name="maximumIcePresenceOutput"')
             lines.append('        type="output"')
-            lines.append('        io_type="{}"'.format(ice_pio_typename))
+            lines.append('        io_type="{}"'.format(io_type_str))
             lines.append('        filename_template="{}.mpassi{}.hist.am.cice_maximumIcePresence.$Y.nc"'.format(casename, inst_string))
             lines.append('        filename_interval="00-01-00_00:00:00"')
             lines.append('        reference_time="01-01-01_00:00:00"')
@@ -824,7 +831,7 @@ def buildnml(case, caseroot, compname):
             lines.append('<stream name="timeSeriesStatsDailyOutput"')
             lines.append('        type="output"')
             lines.append('        precision="single"')
-            lines.append('        io_type="{}"'.format(ice_pio_typename))
+            lines.append('        io_type="{}"'.format(io_type_str))
             lines.append('        filename_template="{}.mpassi{}.hist.am.timeSeriesStatsDaily.$Y-$M-$D.nc"'.format(casename, inst_string))
             lines.append('        filename_interval="00-01-00_00:00:00"')
             lines.append('        reference_time="01-01-01_00:00:00"')
@@ -841,7 +848,7 @@ def buildnml(case, caseroot, compname):
             lines.append('')
             lines.append('<stream name="timeSeriesStatsDailyRestart"')
             lines.append('        type="input;output"')
-            lines.append('        io_type="{}"'.format(ice_pio_typename))
+            lines.append('        io_type="{}"'.format(io_type_str))
             lines.append('        filename_template="{}.mpassi{}.rst.am.timeSeriesStatsDaily.$Y-$M-$D_$S.nc"'.format(casename, inst_string))
             lines.append('        filename_interval="output_interval"')
             lines.append('        clobber_mode="truncate"')
@@ -854,7 +861,7 @@ def buildnml(case, caseroot, compname):
             lines.append('<stream name="timeSeriesStatsMonthlyOutput"')
             lines.append('        type="output"')
             lines.append('        precision="single"')
-            lines.append('        io_type="{}"'.format(ice_pio_typename))
+            lines.append('        io_type="{}"'.format(io_type_str))
             lines.append('        filename_template="{}.mpassi{}.hist.am.timeSeriesStatsMonthly.$Y-$M-$D.nc"'.format(casename, inst_string))
             lines.append('        filename_interval="00-01-00_00:00:00"')
             lines.append('        reference_time="01-01-01_00:00:00"')
@@ -989,7 +996,7 @@ def buildnml(case, caseroot, compname):
 
                 lines.append('<stream name="pointwiseStatsOutput"')
                 lines.append('        type="output"')
-                lines.append('        io_type="{}"'.format(ice_pio_typename))
+                lines.append('        io_type="{}"'.format(io_type_str))
                 lines.append('        filename_template="pointwiseStats.$Y-$M-$D.nc"')
                 lines.append('        filename_interval="00-01-00_00:00:00"')
                 lines.append('        reference_time="01-01-01_00:00:00"')
@@ -1078,7 +1085,7 @@ def buildnml(case, caseroot, compname):
 
             lines.append('<stream name="timeSeriesStatsMonthlyRestart"')
             lines.append('        type="input;output"')
-            lines.append('        io_type="{}"'.format(ice_pio_typename))
+            lines.append('        io_type="{}"'.format(io_type_str))
             lines.append('        filename_template="{}.mpassi{}.rst.am.timeSeriesStatsMonthly.$Y-$M-$D_$S.nc"'.format(casename, inst_string))
             lines.append('        filename_interval="output_interval"')
             lines.append('        clobber_mode="truncate"')
@@ -1090,7 +1097,7 @@ def buildnml(case, caseroot, compname):
             lines.append('')
             lines.append('<stream name="timeSeriesStatsClimatologyOutput"')
             lines.append('        type="output"')
-            lines.append('        io_type="{}"'.format(ice_pio_typename))
+            lines.append('        io_type="{}"'.format(io_type_str))
             lines.append('        filename_template="{}.mpassi{}.hist.am.timeSeriesStatsClimatology.$Y.nc"'.format(casename, inst_string))
             lines.append('        filename_interval="00-01-00_00:00:00"')
             lines.append('        clobber_mode="truncate"')
@@ -1106,7 +1113,7 @@ def buildnml(case, caseroot, compname):
             lines.append('')
             lines.append('<stream name="timeSeriesStatsClimatologyRestart"')
             lines.append('        type="input;output"')
-            lines.append('        io_type="{}"'.format(ice_pio_typename))
+            lines.append('        io_type="{}"'.format(io_type_str))
             lines.append('        filename_template="{}.mpassi{}.rst.am.timeSeriesStatsClimatology.$Y-$M-$D_$S.nc"'.format(casename, inst_string))
             lines.append('        filename_interval="output_interval"')
             lines.append('        clobber_mode="truncate"')
@@ -1118,7 +1125,7 @@ def buildnml(case, caseroot, compname):
             lines.append('')
             lines.append('<stream name="landIceMasks"')
             lines.append('        type="input"')
-            lines.append('        io_type="{}"'.format(ice_pio_typename))
+            lines.append('        io_type="{}"'.format(io_type_str))
             lines.append('        input_interval="initial_only"')
             lines.append('        filename_template="{}/ice/mpas-seaice/{}/{}.{}.nc">'.format(din_loc_root, ice_mask, grid_prefix, grid_date))
             lines.append('')

From e73d967316bb648d8568e732370bbaa5abf5dff6 Mon Sep 17 00:00:00 2001
From: Jon Wolfe <jonbob@lanl.gov>
Date: Thu, 4 Sep 2025 18:16:08 -0500
Subject: [PATCH 4/4] Extend this to include MALI streams

---
 .../mpas-albany-landice/cime_config/buildnml       | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/components/mpas-albany-landice/cime_config/buildnml b/components/mpas-albany-landice/cime_config/buildnml
index 9cf26ba743f0..f80685eb7064 100755
--- a/components/mpas-albany-landice/cime_config/buildnml
+++ b/components/mpas-albany-landice/cime_config/buildnml
@@ -30,6 +30,8 @@ def buildnml(case, caseroot, compname):
     srcroot           = case.get_value("SRCROOT")
     din_loc_root      = case.get_value("DIN_LOC_ROOT")
     glc_grid          = case.get_value("GLC_GRID")
+    glc_pio_typename  = case.get_value("GLC_PIO_TYPENAME")
+    glc_pio_netcdf_format = case.get_value("GLC_PIO_NETCDF_FORMAT")
     #ninst_glc        = case.get_value("NINST_GLC")
     ninst_glc = 1 # Change if you want multiple instances... though this isn't coded yet.
     ninst_glc_real    = case.get_value("NINST_GLC")
@@ -46,6 +48,12 @@ def buildnml(case, caseroot, compname):
     stream_name       = 'streams.landice'
     albany_input_name = 'albany_input.yaml'
 
+     # Use 'pnetcdf,cdf5' when GLC_PIO_NETCDF_FORMAT requests 64-bit data, else use the standard type
+    if glc_pio_typename.lower() == 'pnetcdf' and glc_pio_netcdf_format.lower() == '64bit_data':
+        io_type_str = 'pnetcdf,cdf5'
+    else:
+        io_type_str = glc_pio_typename
+
     maliconf_dir = os.path.join(casebuild, "maliconf")
 
     if not os.path.isdir(maliconf_dir): os.mkdir(maliconf_dir)
@@ -203,11 +211,13 @@ def buildnml(case, caseroot, compname):
         lines.append('')
         lines.append('    <immutable_stream name="basicmesh"')
         lines.append('                      type="none"')
+        lines.append('                      io_type="{}"'.format(io_type_str))
         lines.append('                      filename_template="not-to-be-used.nc"')
         lines.append('    />')
         lines.append('')
         lines.append('    <immutable_stream name="input"')
         lines.append('                      type="input"')
+        lines.append('                      io_type="{}"'.format(io_type_str))
         lines.append('                      filename_template="{}"'.format(input_file))
         lines.append('                      input_interval="initial_only"/>')
         lines.append('')
@@ -223,6 +233,7 @@ def buildnml(case, caseroot, compname):
         lines.append('    -->')
         lines.append('    <immutable_stream name="restart"')
         lines.append('                      type="input;output"')
+        lines.append('                      io_type="{}"'.format(io_type_str))
         lines.append('                      filename_template="{}.mali.rst.$Y-$M-$D_$S.nc"'.format(casename))
         lines.append('                      filename_interval="output_interval"')
         lines.append('                      clobber_mode="truncate"')
@@ -236,6 +247,7 @@ def buildnml(case, caseroot, compname):
         lines.append('')
         lines.append('    <stream name="output"')
         lines.append('            type="output"')
+        lines.append('            io_type="{}"'.format(io_type_str))
         lines.append('            filename_template="{}.mali.hist.$Y-$M-$D_$S.nc"'.format(casename))
         lines.append('            filename_interval="0001-00-00_00:00:00"')
         lines.append('            clobber_mode="truncate"')
@@ -298,6 +310,7 @@ def buildnml(case, caseroot, compname):
         lines.append('')
         lines.append('<stream name="globalStatsOutput"')
         lines.append('        type="output"')
+        lines.append('        io_type="{}"'.format(io_type_str))
         lines.append('        filename_template="{}.mali.hist.am.$Y-$M-$D_$S.nc"'.format(casename))
         lines.append('        filename_interval="0001-00-00_00:00:00"')
         lines.append('        clobber_mode="truncate"')
@@ -320,6 +333,7 @@ def buildnml(case, caseroot, compname):
             # in MALI data mode, read an input stream with ice thickness monthly
             lines.append('    <stream name="data-mode-input"')
             lines.append('            type="input"')
+            lines.append('            io_type="{}"'.format(io_type_str))
             lines.append(f'            filename_template="{datamode_file}"')
             lines.append('            reference_time="2000-01-01_00:00:00"')
             lines.append('            input_interval="0000-01-00_00:00:00">')