From 8e520507963d019bbff69943eef90f6c43e9c0cb Mon Sep 17 00:00:00 2001
From: George Gayno <George.Gayno@noaa.gov>
Date: Wed, 27 Dec 2023 18:47:41 +0000
Subject: [PATCH] Update new control files for recent changes to 'develop'.

Fixes #1977.
---
 tests/tests/control_p8.v2.sfc      | 6 ++++--
 tests/tests/cpld_control_p8.v2.sfc | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/tests/tests/control_p8.v2.sfc b/tests/tests/control_p8.v2.sfc
index 48344aa680..aadba46d1c 100644
--- a/tests/tests/control_p8.v2.sfc
+++ b/tests/tests/control_p8.v2.sfc
@@ -152,6 +152,8 @@ export DZ_MIN=6
 #required for NML.IN sharing
 export MIN_SEAICE=0.15
 export FRAC_GRID=.true.
+export MOM6_OUTPUT_DIR=./MOM6_OUTPUT
+export MOM6_RESTART_DIR=./RESTART/
 export MOM6_RESTART_SETTING=n
 # P8 (not used for standalone)
 export USE_CICE_ALB=.false.
@@ -174,6 +176,6 @@ export DOGP_SGS_CNV=.true.
 
 export SATMEDMF=.true.
 
-if [[ $MACHINE_ID = cheyenne ]]; then
-  TPN=18
+if [[ " hera orion hercules gaea jet " =~ " ${MACHINE_ID} " ]] ; then
+  ZSTANDARD_LEVEL=5
 fi
diff --git a/tests/tests/cpld_control_p8.v2.sfc b/tests/tests/cpld_control_p8.v2.sfc
index f54d13c6de..1612b044ff 100644
--- a/tests/tests/cpld_control_p8.v2.sfc
+++ b/tests/tests/cpld_control_p8.v2.sfc
@@ -83,6 +83,6 @@ export eps_imesh=2.5e-1
 export FV3_RUN=cpld_control_run.IN
 export V2_SFC_FILE=true
 
-if [[ $MACHINE_ID = cheyenne ]]; then
-  TPN=18
+if [[ $MACHINE_ID = derecho ]]; then
+  TPN=96
 fi