Add wave-cice coupling; update to Consortium main (NOAA-EMC#51)

* add wave-ice fields
* initialize aicen_init, which turns up as NaN in calc of floediam
export
* add call to icepack_init_wave to initialize wavefreq and dwavefreq
* update to latest consortium main (PR 752)

cice.setup

@@ -486,6 +486,7 @@ else
 #!/bin/csh -f
 
 set nonomatch && rm -f ciceexe.* && unset nonomatch
+rm -f suite.jobs
 
 set dobuild  = true
 set doreuse  = true
@@ -609,7 +610,7 @@ EOF
     set bfbcomp_tmp = `echo $line | cut -d' ' -f5`
 
     # Append sets from .ts file to the $sets variable
-    set sets = "$sets_base,$sets_tmp"
+    set sets = "$sets_tmp,$sets_base"
 
     # Create a new bfbcomp_base variable to store bfbcomp passed to cice.setup
     # Use bfbcomp_base or bfbcomp_tmp
@@ -730,19 +731,38 @@ EOF
     if (${docase} == 0) then
       set soptions = ""
       # Create sorted array and remove duplicates and "none"
-      set setsarray = `echo ${sets} | sed 's/,/ /g' | fmt -1 | sort -u`
+      set setsarray = `echo ${sets_tmp} | sed 's/,/ /g' | fmt -1 | sort -u`
       if ("${setsarray}" != "") then
         foreach field (${setsarray})
           if (${field} != "none") then
             set soptions = ${soptions}"_"${field}
           endif
         end
       endif
+      # Add options from command line, sort and remove duplicates
+      set soptions_base = ""
+      set setsarray_base = `echo ${sets_base} | sed 's/,/ /g' | fmt -1 | sort -u`
+      if ("${setsarray_base}" != "") then
+        foreach field (${setsarray_base})
+          set soptions = ${soptions}"_"${field}
+          set soptions_base = ${soptions_base}"_"${field}
+        end
+      endif
       # soptions starts with _
       set testname_noid = "${machcomp}_${test}_${grid}_${pesx}${soptions}"
       set testname_base = "${machcomp}_${test}_${grid}_${pesx}${soptions}.${testid}"
       set testname = "${tsdir}/${testname_base}"
       set case = ${testname}
+<<<<<<< HEAD
+=======
+
+      if (${dosuite} == 1) then
+        # Add -s flags in cice.setup to bfbcomp name
+        if ($bfbcomp != ${spval}) then
+          set fbfbcomp = ${machcomp}_${bfbcomp}${soptions_base}
+        endif
+      endif
+>>>>>>> 968a0edc (Add wave-cice coupling; update to Consortium main (#51))
     endif
 
     if (-d ${case}) then
@@ -1061,6 +1081,7 @@ echo "-------test--------------"
 echo "${testname_base}"
 cd ${testname_base}
 source ./cice.settings
+set bldstat = 0
 if (\${dobuild} == true) then
    if (\${doreuse} == true) then
 <<<<<<< HEAD
@@ -1069,15 +1090,28 @@ if (\${dobuild} == true) then
      set ciceexe = "../ciceexe.\${ICE_TARGET}.\${ICE_ENVNAME}.\${ICE_COMMDIR}.\${ICE_BLDDEBUG}.\${ICE_THREADED}.\${ICE_IOTYPE}"
 >>>>>>> 519d3392 (Update CICE to latest Consortium master (#26))
      ./cice.build --exe \${ciceexe}
+     set bldstat = \${status}
      if !(-e \${ciceexe}) cp -p \${ICE_RUNDIR}/cice \${ciceexe}
    else
      ./cice.build
+     set bldstat = \${status}
    endif
 endif
+<<<<<<< HEAD
 if (\${dosubmit} == true) then
   ./cice.submit | tee -a ../suite.jobs
 else if (\${dorun} == true) then
   ./cice.test
+=======
+if (\$bldstat == 0) then
+  if (\${dosubmit} == true) then
+    set jobid = \`./cice.submit\`
+    echo "\$jobid"
+    echo "\$jobid  \${ICE_TESTNAME}  " >> ../suite.jobs
+  else if (\${dorun} == true) then
+    ./cice.test
+  endif
+>>>>>>> 968a0edc (Add wave-cice coupling; update to Consortium main (#51))
 endif
 cd ..
 EOF