From 5e7b7f0f9ee2efbf597a837e84684c1f77fc9811 Mon Sep 17 00:00:00 2001
From: Nick Szapiro <Nick.Szapiro@noaa.gov>
Date: Fri, 17 May 2024 19:49:00 +0000
Subject: [PATCH] Need ice_prescribed_nml section in ice_in for CICE to know if
 prescribed_ice

---
 tests/default_vars.sh      |  4 ++++
 tests/parm/ice_in.IN       | 12 ++++++++++++
 tests/parm/ice_in_pcice.IN | 12 ------------
 tests/run_test.sh          |  1 -
 4 files changed, 16 insertions(+), 13 deletions(-)
 delete mode 100644 tests/parm/ice_in_pcice.IN

diff --git a/tests/default_vars.sh b/tests/default_vars.sh
index de26653747..12b7a43794 100644
--- a/tests/default_vars.sh
+++ b/tests/default_vars.sh
@@ -1231,6 +1231,10 @@ export AOD_FRQ=060000
 export RESTART_FILE_PREFIX=''
 export RESTART_FILE_SUFFIX_SECS=''
 export RT35D=''
+
+#CDEPS ds2s
+export MESH_DICE=none
+export stream_files_dice=none
 }
 export_35d_run ()
 {
diff --git a/tests/parm/ice_in.IN b/tests/parm/ice_in.IN
index 969599473c..75a8f5a33f 100644
--- a/tests/parm/ice_in.IN
+++ b/tests/parm/ice_in.IN
@@ -385,3 +385,15 @@
 
 &icefields_bgc_nml
 /
+
+&ice_prescribed_nml
+  prescribed_ice_mode = .@[CICE_PRESCRIBED].
+  stream_yearfirst = @[SYEAR]
+  stream_yearlast = @[SYEAR]
+  stream_yearalign = @[SYEAR]
+  stream_varname = "ice_cov"
+  stream_meshfile = "INPUT/@[MESH_DICE]"
+  stream_datafiles = "@[stream_files_dice]"
+  stream_mapalgo = "bilinear"
+  stream_taxmode = "extend"
+/
diff --git a/tests/parm/ice_in_pcice.IN b/tests/parm/ice_in_pcice.IN
deleted file mode 100644
index f5238f025b..0000000000
--- a/tests/parm/ice_in_pcice.IN
+++ /dev/null
@@ -1,12 +0,0 @@
-
-&ice_prescribed_nml
-  prescribed_ice_mode = .true.
-  stream_yearfirst = @[SYEAR]
-  stream_yearlast = @[SYEAR]
-  stream_yearalign = @[SYEAR]
-  stream_varname = "ice_cov"
-  stream_meshfile = "INPUT/@[MESH_DICE]"
-  stream_datafiles = "@[stream_files_dice]"
-  stream_mapalgo = "bilinear"
-  stream_taxmode = "extend"
-/
diff --git a/tests/run_test.sh b/tests/run_test.sh
index 7f2b2fc20c..e2dcb31196 100755
--- a/tests/run_test.sh
+++ b/tests/run_test.sh
@@ -319,7 +319,6 @@ fi
 
 if [[ ${CICE_PRESCRIBED} = 'true' ]]; then
   atparse < "${PATHRT}"/parm/ice_in.IN > ice_in
-  atparse < "${PATHRT}"/parm/ice_in_pcice.IN >> ice_in
 fi
 
 if [[ ${CDEPS_INLINE} = 'true' ]]; then