From 8d5b78a87336cbf9e86abf03ab5e8f0bb99fbfe3 Mon Sep 17 00:00:00 2001
From: Nicholas Szapiro <149816583+NickSzapiro-NOAA@users.noreply.github.com>
Date: Mon, 12 Aug 2024 21:05:11 -0400
Subject: [PATCH 1/2] feature branch cmeps in .gitmodules

---
 .gitmodules | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index a3775fc12d..1a818df8b3 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -16,8 +16,8 @@
   branch = develop
 [submodule "CMEPS"]
   path = CMEPS-interface/CMEPS
-  url = https://github.com/NOAA-EMC/CMEPS
-  branch = emc/develop
+  url = https://github.com/DeniseWorthen/CMEPS
+  branch = feature/fixaux
 [submodule "HYCOM"]
   path = HYCOM-interface/HYCOM
   url = https://github.com/NOAA-EMC/HYCOM-src

From 6f3e9be36ed3975640196daaf686591547a1b025 Mon Sep 17 00:00:00 2001
From: Nick Szapiro <Nick.Szapiro@noaa.gov>
Date: Tue, 13 Aug 2024 04:41:27 +0000
Subject: [PATCH 2/2] Use auxiliary history instead of mediator history files

---
 CMEPS-interface/CMEPS                |  2 +-
 tests/fv3_conf/cpld_docn_dice.IN     |  6 ++----
 tests/parm/ufs.configure.s2s_esmf.IN | 18 ++++++++++++++----
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/CMEPS-interface/CMEPS b/CMEPS-interface/CMEPS
index f13e16e414..d90a4f0e1f 160000
--- a/CMEPS-interface/CMEPS
+++ b/CMEPS-interface/CMEPS
@@ -1 +1 @@
-Subproject commit f13e16e414e115e268b2dd300b665e628e5f2429
+Subproject commit d90a4f0e1f8bffccc2d6ab4cbd2613a1d8a15e4b
diff --git a/tests/fv3_conf/cpld_docn_dice.IN b/tests/fv3_conf/cpld_docn_dice.IN
index b2ad8bc18c..771b04dadb 100644
--- a/tests/fv3_conf/cpld_docn_dice.IN
+++ b/tests/fv3_conf/cpld_docn_dice.IN
@@ -6,10 +6,8 @@ if [[ ${OPNREQ_TEST} == true ]]; then
 fi
 
 #CDEPS data files
-#cp @[INPUTDATA_ROOT]/DOCN_DICE_cplhist/ufs.cpld.cpl*.nc INPUT
-module load nco
-ncrcat ../${DEP_RUN}${SUFFIX}/ufs.cpld.cpl.hi.ice*nc ./INPUT/ufs.cpld.cpl.hi.ice.nc
-ncrcat ../${DEP_RUN}${SUFFIX}/ufs.cpld.cpl.hi.ocn*nc ./INPUT/ufs.cpld.cpl.hi.ocn.nc
+cp ../${DEP_RUN}${SUFFIX}/*ice.1h.aux*nc ./INPUT/ufs.cpld.cpl.hi.ice.nc
+cp ../${DEP_RUN}${SUFFIX}/*ocn.1h.aux*nc ./INPUT/ufs.cpld.cpl.hi.ocn.nc
 
 #CDEPS fix files - same for ocn/ice
 cp @[INPUTDATA_ROOT]/CICE_FIX/@[OCNRES]/mesh.mx@[OCNRES].nc INPUT
diff --git a/tests/parm/ufs.configure.s2s_esmf.IN b/tests/parm/ufs.configure.s2s_esmf.IN
index 3161e4891f..999731d927 100644
--- a/tests/parm/ufs.configure.s2s_esmf.IN
+++ b/tests/parm/ufs.configure.s2s_esmf.IN
@@ -97,10 +97,20 @@ MED_attributes::
       coupling_mode = @[CPLMODE]
       pio_rearranger = @[pio_rearranger]
       ocean_albedo_limit = @[ocean_albedo_limit]
-      history_n_ice_inst = @[MED_history_n]
-      history_option_ice_inst = nhours
-      history_n_ocn_inst = @[MED_history_n]
-      history_option_ocn_inst = nhours
+      histaux_ice2med_file1_auxname = ice.1h.aux
+      histaux_ice2med_file1_doavg = .false.
+      histaux_ice2med_file1_enabled = .true.
+      histaux_ice2med_file1_flds = all
+      histaux_ice2med_file1_history_n = @[MED_history_n]
+      histaux_ice2med_file1_history_option = nhours
+      histaux_ice2med_file1_ntperfile = 9999
+      histaux_ocn2med_file1_auxname = ocn.1h.aux
+      histaux_ocn2med_file1_doavg = .false.
+      histaux_ocn2med_file1_enabled = .true.
+      histaux_ocn2med_file1_flds = all
+      histaux_ocn2med_file1_history_n = @[MED_history_n]
+      histaux_ocn2med_file1_history_option = nhours
+      histaux_ocn2med_file1_ntperfile = 9999
 ::
 
 ALLCOMP_attributes::