Modifications for bit-for-bit with current main in CICE

- Add "_old" tfrz_options to recover bit-for-bit for some cases
- Move hi_min namelist from forcing_nml to tracer_nml

columnphysics/icepack_therm_shared.F90

@@ -396,15 +396,15 @@ function icepack_sea_freezing_temperature(sss) result(Tf)
 
         character(len=*),parameter :: subname='(icepack_sea_freezing_temperature)'
 
-        if (trim(tfrz_option) == 'mushy') then
+        if (trim(tfrz_option(1:5)) == 'mushy') then
 
            Tf = icepack_liquidus_temperature(sss) ! deg C
 
-        elseif (trim(tfrz_option) == 'linear_salt') then
+        elseif (trim(tfrz_option(1:11)) == 'linear_salt') then
 
            Tf = -depressT * sss ! deg C
 
-        elseif (trim(tfrz_option) == 'constant') then
+        elseif (trim(tfrz_option(1:8)) == 'constant') then
 
            Tf = Tocnfrz
 

columnphysics/icepack_tracers.F90

@@ -7,7 +7,7 @@
       module icepack_tracers
 
       use icepack_kinds
-      use icepack_parameters, only: c0, c1, puny, rhos, rsnw_fall
+      use icepack_parameters, only: c0, c1, puny, rhos, rsnw_fall, Tocnfrz, tfrz_option
       use icepack_warnings, only: warnstr, icepack_warnings_add
       use icepack_warnings, only: icepack_warnings_setabort, icepack_warnings_aborted
 
@@ -1289,7 +1289,18 @@ subroutine icepack_compute_tracers (ntrcr,     trcr_depend,    &
                trcrn(it) = atrcrn(it) / aicen
             else
                trcrn(it) = c0
-               if (it == nt_Tsfc) trcrn(it) = Tf  ! surface temperature
+               if (it == nt_Tsfc) then
+! tcraig, these old options should be deprecated
+! exist for bit-for-bit backwards compatibility in testing
+                  if (tfrz_option == "mushy_old" .or. &
+                      tfrz_option == "linear_salt_old" .or. &
+                      tfrz_option == "constant_old" .or. &
+                      tfrz_option == "minus1p8_old") then
+                     trcrn(it) = Tocnfrz  ! surface temperature
+                  else
+                     trcrn(it) = Tf  ! surface temperature
+                  endif
+               endif
             endif
 
          else

configuration/driver/icedrv_init.F90

@@ -150,7 +150,7 @@ subroutine input_data
         kitd,           ktherm,          ksno,     conduct,             &
         a_rapid_mode,   Rac_rapid_mode,  aspect_rapid_mode,             &
         dSdt_slow_mode, phi_c_slow_mode, phi_i_mushy,                   &
-        floediam,       hfrazilmin,      Tliquidus_max
+        floediam,       hfrazilmin,      Tliquidus_max,    hi_min
 
       namelist /dynamics_nml/ &
         kstrength,      krdg_partic,    krdg_redist,    mu_rdg,         &
@@ -177,7 +177,7 @@ subroutine input_data
         update_ocn_f,    l_mpond_fresh,   ustar_min,       &
         fbot_xfer_type,  oceanmixed_ice,  emissivity,      &
         formdrag,        highfreq,        natmiter,        &
-        atmiter_conv,    calc_dragio,     hi_min,          &
+        atmiter_conv,    calc_dragio,                      &
         tfrz_option,     default_season,  wave_spec_type,  &
         precip_units,    fyear_init,      ycycle,          &
         atm_data_type,   ocn_data_type,   bgc_data_type,   &

configuration/scripts/icepack_in

@@ -37,6 +37,7 @@
 &thermo_nml
     kitd              = 1
     ktherm            = 2
+    hi_min            = 0.01
     ksno              = 0.3d0
     conduct           = 'bubbly'
     a_rapid_mode      =  0.5e-3
@@ -105,7 +106,6 @@
     natmiter        = 5
     atmiter_conv    = 0.0d0
     ustar_min       = 0.0005
-    hi_min          = 0.01
     calc_dragio     = .false.
     emissivity      = 0.985
     fbot_xfer_type  = 'constant'

doc/source/user_guide/ug_case_settings.rst

@@ -209,6 +209,7 @@ thermo_nml
    "``dSdt_slow_mode``", "real", "slow drainage strength parameter m/s/K", "-1.5e-7"
    "``floediam``", "real", "effective floe diameter for lateral melt in m", "300.0"
    "``hfrazilmin``", "real", "min thickness of new frazil ice in m", "0.05"
+   "``hi_min``", "real", "minimum ice thickness allowed for thermo in m", "0.01"
    "``kitd``", "``0``", "delta function ITD approximation", "1"
    "", "``1``", "linear remapping ITD approximation", ""
    "``ksno``", "real", "snow thermal conductivity", "0.3"
@@ -355,7 +356,6 @@ forcing_nml
    "``formdrag``", "logical", "calculate form drag", "``.false.``"
    "``fyear_init``", "integer", "first year of atmospheric forcing data", "1998"
    "``highfreq``", "logical", "high-frequency atmo coupling", "``.false.``"
-   "``hi_min``", "real", "minimum ice thickness allowed for thermo in m", "0.01"
    "``ice_data_file``", "string", "file containing ice opening, closing data", "' '"
    "``l_mpond_fresh``", "``.false.``", "release pond water immediately to ocean", "``.false.``"
    "", "``true``", "retain (topo) pond water until ponds drain", ""