change visc_method default to avg_zeta, change alt07 to test avg_stre…

…ngth (CICE-Consortium#744)
ESCOMP · Oct 4, 2022 · d7bd2a9 · d7bd2a9
1 parent 774a1d1
commit d7bd2a9
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 12 deletions.
diff --git a/cice.setup b/cice.setup
@@ -1180,21 +1180,26 @@ echo "-------test--------------"
 echo "${testname_base}"
 cd ${testname_base}
 source ./cice.settings
+set bldstat = 0
 if (\${dobuild} == true) then
    if (\${doreuse} == true) then
      set ciceexe = "../ciceexe.\${ICE_TARGET}.\${ICE_ENVNAME}.\${ICE_COMMDIR}.\${ICE_BLDDEBUG}.\${ICE_THREADED}.\${ICE_IOTYPE}"
      ./cice.build --exe \${ciceexe}
+     set bldstat = \${status}
      if !(-e \${ciceexe}) cp -p \${ICE_RUNDIR}/cice \${ciceexe}
    else
      ./cice.build
+     set bldstat = \${status}
    endif
 endif
-if (\${dosubmit} == true) then
-  set jobid = \`./cice.submit\`
-  echo "\$jobid"
-  echo "\$jobid  \${ICE_TESTNAME}  " >> ../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
 endif
 cd ..
 EOF

diff --git a/cicecore/cicedynB/general/ice_init.F90 b/cicecore/cicedynB/general/ice_init.F90
@@ -404,7 +404,7 @@ subroutine input_data
       Ktens = 0.0_dbl_kind    ! T=Ktens*P (tensile strength: see Konig and Holland, 2010)
       e_yieldcurve = 2.0_dbl_kind  ! VP aspect ratio of elliptical yield curve               
       e_plasticpot = 2.0_dbl_kind  ! VP aspect ratio of elliptical plastic potential
-      visc_method = 'avg_strength' ! calc viscosities at U point: avg_strength, avg_zeta
+      visc_method = 'avg_zeta' ! calc viscosities at U point: avg_strength, avg_zeta
       deltaminEVP = 1e-11_dbl_kind ! minimum delta for viscosities (EVP, Hunke 2001)
       deltaminVP  = 2e-9_dbl_kind  ! minimum delta for viscosities (VP, Hibler 1979)
       capping_method  = 'max'  ! method for capping of viscosities (max=Hibler 1979,sum=Kreyscher2000)
@@ -889,7 +889,7 @@ subroutine input_data
       call broadcast_scalar(Ktens,                master_task)
       call broadcast_scalar(e_yieldcurve,         master_task)
       call broadcast_scalar(e_plasticpot,         master_task)
-      call broadcast_scalar(visc_method,    master_task)
+      call broadcast_scalar(visc_method,          master_task)
       call broadcast_scalar(deltaminEVP,          master_task)
       call broadcast_scalar(deltaminVP,           master_task)
       call broadcast_scalar(capping_method,       master_task)

diff --git a/configuration/scripts/ice_in b/configuration/scripts/ice_in
@@ -147,7 +147,7 @@
     Ktens           = 0.
     e_yieldcurve    = 2.
     e_plasticpot    = 2.
-    visc_method     = 'avg_strength'
+    visc_method     = 'avg_zeta'
     elasticDamp     = 0.36d0
     deltaminEVP     = 1e-11
     deltaminVP      = 2e-9

diff --git a/configuration/scripts/options/set_nml.alt07 b/configuration/scripts/options/set_nml.alt07
@@ -2,5 +2,5 @@ kdyn            = 1
 evp_algorithm   = 'standard_2d'
 ndte            = 300
 capping_method  = 'sum'
-visc_method     = 'avg_zeta'
+visc_method     = 'avg_strength'
 
diff --git a/doc/source/cice_index.rst b/doc/source/cice_index.rst
@@ -738,7 +738,7 @@ either Celsius or Kelvin units).
    "vice(n)", "volume per unit area of ice (in category n)", "m"
    "vicen_init", "ice volume at beginning of timestep", "m"
    "viscosity_dyn", "dynamic viscosity of brine", ":math:`1.79\times 10^{-3}` kg/m/s"
-   "visc_method", "method for calculating viscosities (‘avg_strength’ or ‘avg_zeta’)", "avg_strength"
+   "visc_method", "method for calculating viscosities (‘avg_strength’ or ‘avg_zeta’)", "avg_zeta"
    "vocn", "ocean current in the y-direction", "m/s"
    "vonkar", "von Karman constant", "0.4"
    "vraftn", "volume of rafted ice", "m"

diff --git a/doc/source/user_guide/ug_case_settings.rst b/doc/source/user_guide/ug_case_settings.rst
@@ -488,7 +488,7 @@ dynamics_nml
    "", "``geostropic``", "computed from ocean velocity", ""
    "``threshold_hw``", "real", "Max water depth for grounding (see :cite:`Amundrud04`)", "30."
    "``use_mean_vrel``", "logical", "Use mean of two previous iterations for vrel in VP", "``.true.``"
-   "``visc_method``", "``avg_strength``", "average strength for viscosities on U grid", "``avg_strength``"
+   "``visc_method``", "``avg_strength``", "average strength for viscosities on U grid", "``avg_zeta``"
    "", "``avg_zeta``", "average zeta for viscosities on U grid", ""
    "``yield_curve``", "``ellipse``", "elliptical yield curve", "``ellipse``"
    "", "", "", ""