From ea2a9360f4d0c22bbe5260aaf1b06a8cd692a135 Mon Sep 17 00:00:00 2001
From: jayeshkrishna <jayesh@mcs.anl.gov>
Date: Wed, 24 Jul 2024 16:08:08 -0500
Subject: [PATCH 1/2] Changing default NetCDF format to CDF5

Changing the default NetCDF file format from CDF2 (64bit_offset)
to CDF5 (64bit_data).

The CDF5 format gets rid of limitations (for all practical
purposes) on NetCDF variable size imposed by the older CDF2
file format. Also note that all E3SM run scripts already
explicitly set the NetCDF file format to CDF5/64bit_data for all
production runs.
---
 driver-mct/cime_config/config_component.xml  | 20 ++++++++++----------
 driver-moab/cime_config/config_component.xml | 20 ++++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/driver-mct/cime_config/config_component.xml b/driver-mct/cime_config/config_component.xml
index 5b5126af8930..271c13139555 100644
--- a/driver-mct/cime_config/config_component.xml
+++ b/driver-mct/cime_config/config_component.xml
@@ -2655,16 +2655,16 @@
     https://www.unidata.ucar.edu/software/netcdf/docs/data_type.html
     </desc>
     <values>
-      <value compclass="ATM">64bit_offset</value>
-      <value compclass="CPL">64bit_offset</value>
-      <value compclass="OCN">64bit_offset</value>
-      <value compclass="WAV">64bit_offset</value>
-      <value compclass="GLC">64bit_offset</value>
-      <value compclass="ICE">64bit_offset</value>
-      <value compclass="ROF">64bit_offset</value>
-      <value compclass="LND">64bit_offset</value>
-      <value compclass="ESP">64bit_offset</value>
-      <value compclass="IAC">64bit_offset</value>
+      <value compclass="ATM">64bit_data</value>
+      <value compclass="CPL">64bit_data</value>
+      <value compclass="OCN">64bit_data</value>
+      <value compclass="WAV">64bit_data</value>
+      <value compclass="GLC">64bit_data</value>
+      <value compclass="ICE">64bit_data</value>
+      <value compclass="ROF">64bit_data</value>
+      <value compclass="LND">64bit_data</value>
+      <value compclass="ESP">64bit_data</value>
+      <value compclass="IAC">64bit_data</value>
     </values>
   </entry>
 
diff --git a/driver-moab/cime_config/config_component.xml b/driver-moab/cime_config/config_component.xml
index be0ee0fbd776..0f21eeb02097 100644
--- a/driver-moab/cime_config/config_component.xml
+++ b/driver-moab/cime_config/config_component.xml
@@ -2647,16 +2647,16 @@
     https://www.unidata.ucar.edu/software/netcdf/docs/data_type.html
     </desc>
     <values>
-      <value compclass="ATM">64bit_offset</value>
-      <value compclass="CPL">64bit_offset</value>
-      <value compclass="OCN">64bit_offset</value>
-      <value compclass="WAV">64bit_offset</value>
-      <value compclass="GLC">64bit_offset</value>
-      <value compclass="ICE">64bit_offset</value>
-      <value compclass="ROF">64bit_offset</value>
-      <value compclass="LND">64bit_offset</value>
-      <value compclass="ESP">64bit_offset</value>
-      <value compclass="IAC">64bit_offset</value>
+      <value compclass="ATM">64bit_data</value>
+      <value compclass="CPL">64bit_data</value>
+      <value compclass="OCN">64bit_data</value>
+      <value compclass="WAV">64bit_data</value>
+      <value compclass="GLC">64bit_data</value>
+      <value compclass="ICE">64bit_data</value>
+      <value compclass="ROF">64bit_data</value>
+      <value compclass="LND">64bit_data</value>
+      <value compclass="ESP">64bit_data</value>
+      <value compclass="IAC">64bit_data</value>
     </values>
   </entry>
 

From 3758fdf6b02def31551d9c4642d963d458e0a545 Mon Sep 17 00:00:00 2001
From: jayeshkrishna <jayesh@mcs.anl.gov>
Date: Thu, 1 Aug 2024 21:59:29 -0500
Subject: [PATCH 2/2] Upgrading to SCORPIO v1.6.5

SCORPIO v1.6.5 includes the following changes/fixes,

* Fix to support CDF5 file format when PnetCDF is not available

This upgrade fixes runtime issues when writing large variables
using the CDF5 file format on machines (like mappy) that do not
have support for PnetCDF
---
 externals/scorpio | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/externals/scorpio b/externals/scorpio
index 34422f362e9e..804f87c48fc9 160000
--- a/externals/scorpio
+++ b/externals/scorpio
@@ -1 +1 @@
-Subproject commit 34422f362e9e83b5bc5e013b5992fc2555d02ece
+Subproject commit 804f87c48fc9013009307b806d1aff2afa3a0d7c