From 35b1e33c431012c38d04ea39905adf54c7bf0d33 Mon Sep 17 00:00:00 2001
From: Rahul Mahajan <aerorahul@users.noreply.github.com>
Date: Tue, 14 Nov 2023 17:13:04 -0500
Subject: [PATCH] additional template variables for CICE namelist

---
 tests/default_vars.sh      | 15 +++++++++++++++
 tests/parm/ice_in_template | 16 ++++++++--------
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/tests/default_vars.sh b/tests/default_vars.sh
index 580698fd10..3b567de835 100755
--- a/tests/default_vars.sh
+++ b/tests/default_vars.sh
@@ -658,8 +658,22 @@ export PRINT_DIFF_PGR=.false.
 export coupling_interval_fast_sec=0
 }
 
+# Defaults for the CICE6 model
+export_cice6() {
+export CICE_NPT=999
+export CICE_RESTART_DIR="./RESTART/"
+export CICE_RESTART_FILE="iced"
+export CICE_HISTFREQ_N="0, 0, 6, 1, 1"
+export CICE_HISTORY_DIR="./history/"
+export CICE_INCOND_DIR="./history/"
+export CICE_TR_POND_LVL=".true."
+export CICE_RESTART_POND_LVL=".false."
+}
+
 export_cpl ()
 {
+export_cice6
+
 export FV3=true
 export S2S=true
 export HAFS=false
@@ -953,6 +967,7 @@ export LIST_FILES=""
 }
 export_datm_cdeps ()
 {
+export_cice6
 export FV3=false
 export S2S=false
 export HAFS=false
diff --git a/tests/parm/ice_in_template b/tests/parm/ice_in_template
index aefa58b563..062b03a384 100644
--- a/tests/parm/ice_in_template
+++ b/tests/parm/ice_in_template
@@ -6,7 +6,7 @@
     day_init       = @[SDAY]
     sec_init       = @[SECS]
     dt             = @[DT_CICE]
-    npt            = 999
+    npt            = @[CICE_NPT]
     ndtd           = 1
     runtype        = '@[CICERUNTYPE]'
     runid          = '@[RUNID]'
@@ -18,8 +18,8 @@
     lcdf64         = .false.
     numin          = 21
     numax          = 89
-    restart_dir    = './RESTART/'
-    restart_file   = 'iced'
+    restart_dir    = '@[CICE_RESTART_DIR]'
+    restart_file   = '@[CICE_RESTART_FILE]'
     pointer_file   = './ice.restart_file'
     dumpfreq       = '@[DUMPFREQ]'
     dumpfreq_n     = @[DUMPFREQ_N]
@@ -35,12 +35,12 @@
     latpnt(2)      = -65.
     lonpnt(2)      = -45.
     histfreq       = 'm','d','h','x','x'
-    histfreq_n     =  0 , 0 , 6 , 1 , 1
+    histfreq_n     = @[CICE_HISTFREQ_N]
     hist_avg       = @[CICE_HIST_AVG]
-    history_dir    = './history/'
+    history_dir    = '@[CICE_HISTORY_DIR]'
     history_file   = 'iceh'
     write_ic       = .true.
-    incond_dir     = './history/'
+    incond_dir     = '@[CICE_INCOND_DIR]'
     incond_file    = 'iceh_ic'
     version_name   = 'CICE_6.0.2'
 /
@@ -71,8 +71,8 @@
     restart_lvl  = .false.
     tr_pond_topo = .false.
     restart_pond_topo = .false.
-    tr_pond_lvl  = .true.
-    restart_pond_lvl  = .false.
+    tr_pond_lvl  = @[CICE_TR_POND_LVL]
+    restart_pond_lvl  = @[CICE_RESTART_POND_LVL]
     tr_aero      = .false.
     restart_aero = .false.
     tr_fsd       = .false.