Merge pull request #129 from apcraig/tests

update test coverage and test options

cice.setup

@@ -130,8 +130,8 @@ cat << EOF1
 
       Available --set options are in configuration/scripts/options and include:
 EOF1
-      set soptions1 = `ls -1 configuration/scripts/options | grep set_ | sed 's/set_nml.//g' | sed 's/set_env.//g' `
-      set soptions = `echo $soptions1 | fmt -1 | sort `
+      set soptions1 = `ls -1 configuration/scripts/options | grep set_ | sed 's/set_nml.//g' | sed 's/set_env.//g' | sed 's/set_files.//g' `
+      set soptions = `echo $soptions1 | fmt -1 | sort -u `
       foreach sopt ($soptions)
         echo "             $sopt"
       end
@@ -333,7 +333,7 @@ else
     if (-e ${tarray}) then
       cat ${tarray} >> $tsfile
     else if (-e ${tarray}.ts) then
-      cat ${tarray.ts} >> $tsfile
+      cat ${tarray}.ts >> $tsfile
     else 
       if (-e ${ICE_SCRIPTS}/tests/${tarray}.ts) then
         cat ${ICE_SCRIPTS}/tests/${tarray}.ts >> $tsfile
@@ -660,6 +660,23 @@ EOF1
 
     if (${sets} != "") then
       set setsx = `echo ${sets} | sed 's/,/ /g'`
+      set setsxorig = "$setsx"
+      set setsx = ""
+      foreach name ($setsxorig)
+        if (-e ${ICE_SCRIPTS}/options/set_files.${name}) then
+          echo "adding options files from set_files.${name}"
+          echo "`date`${0} adding options files from set_files.${name}" >> ${casedir}/README.case
+          set setsnew = `cat ${ICE_SCRIPTS}/options/set_files.${name}`
+          foreach nset ($setsnew)
+            if ($nset !~ "#*") then
+              set setsx = "$setsx $nset"
+            endif
+          end
+        else
+          set setsx = "$setsx $name"
+        endif
+      end
+
     else
       set setsx = ""
     endif

cicecore/cicedynB/general/ice_flux.F90

@@ -273,7 +273,7 @@ module ice_flux
          dvidtt, & ! ice volume tendency thermo. (m/s)
          dagedtt,& ! ice age tendency thermo.    (s/s)
          mlt_onset, &! day of year that sfc melting begins
-         frz_onset, &! day of year that freezing begins (congel or frazil)
+         frz_onset = c0, &! day of year that freezing begins (congel or frazil)
          frazil_diag ! frazil ice growth diagnostic (m/step-->cm/day)
 
       real (kind=dbl_kind), &