Need ice_prescribed_nml section in ice_in for CICE to know if prescri…

…bed_ice
NickSzapiro-NOAA · May 17, 2024 · 5e7b7f0 · 5e7b7f0
1 parent 50da383
commit 5e7b7f0
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 13 deletions.
diff --git 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
@@ -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
diff --git 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