Add floediam, hfrzazilmin namelist and update Icepack

Add floediam and hfrazilmin as CICE namelist.  Requires latest
version of Icepack.  Update documentation.

Icepack has two non bit-for-bit changes including
  - a fix to multiple declarations of floeshape (CICE-Consortium/Icepack#342)
  - a fix to the convergence scheme in icepack_atmo (CICE-Consortium/Icepack#341)

cicecore/cicedynB/general/ice_init.F90

@@ -124,7 +124,7 @@ subroutine input_data
         mu_rdg, hs0, dpscale, rfracmin, rfracmax, pndaspect, hs1, hp1, &
         a_rapid_mode, Rac_rapid_mode, aspect_rapid_mode, dSdt_slow_mode, &
         phi_c_slow_mode, phi_i_mushy, kalg, atmiter_conv, Pstar, Cstar, &
-        sw_frac, sw_dtemp
+        sw_frac, sw_dtemp, floediam, hfrazilmin
 
       integer (kind=int_kind) :: ktherm, kstrength, krdg_partic, krdg_redist, natmiter, &
         kitd, kcatbound
@@ -190,7 +190,8 @@ subroutine input_data
         kitd,           ktherm,          conduct,     ksno,             &
         a_rapid_mode,   Rac_rapid_mode,  aspect_rapid_mode,             &
         dSdt_slow_mode, phi_c_slow_mode, phi_i_mushy,                   &
-        sw_redist,      sw_frac,         sw_dtemp
+        sw_redist,      sw_frac,         sw_dtemp,                      &
+        floediam,       hfrazilmin
 
       namelist /dynamics_nml/ &
         kdyn,           ndte,           revised_evp,    yield_curve,    &
@@ -473,6 +474,9 @@ subroutine input_data
       phi_c_slow_mode   =    0.05_dbl_kind ! critical liquid fraction porosity cutoff
       phi_i_mushy       =    0.85_dbl_kind ! liquid fraction of congelation ice
 
+      floediam          =   300.0_dbl_kind ! min thickness of new frazil ice (m)
+      hfrazilmin        =    0.05_dbl_kind ! effective floe diameter (m)
+
       ! shortwave redistribution in the thermodynamics
       sw_redist = .false.
       sw_frac   = 0.9_dbl_kind
@@ -777,6 +781,8 @@ subroutine input_data
       call broadcast_scalar(n_fed,              master_task)
       call broadcast_scalar(n_fep,              master_task)
       call broadcast_scalar(a_rapid_mode,       master_task)
+      call broadcast_scalar(floediam,           master_task)
+      call broadcast_scalar(hfrazilmin,         master_task)
       call broadcast_scalar(Rac_rapid_mode,     master_task)
       call broadcast_scalar(aspect_rapid_mode,  master_task)
       call broadcast_scalar(dSdt_slow_mode,     master_task)
@@ -1211,7 +1217,7 @@ subroutine input_data
 
          if (tr_fsd) then
             tmpstr2 = ' floe size distribution is enabled'
-         !   write(nu_diag,1002) ' floediam         = ', floediam, ' constant floe diameter'
+            write(nu_diag,1002) ' floediam         = ', floediam, ' constant floe diameter'
          else
             tmpstr2 = ' floe size distribution is disabled'
          endif
@@ -1370,7 +1376,7 @@ subroutine input_data
                write(nu_diag,1007) ' phi_i_mushy      = ', phi_i_mushy,' solid fraction at lower boundary'
             endif
          endif
-         !write(nu_diag,1007) ' hfrazilmin       = ', hfrazilmin,' minimum new frazil ice thickness'
+         write(nu_diag,1007) ' hfrazilmin       = ', hfrazilmin,' minimum new frazil ice thickness'
 
          write(nu_diag,*) ' '
          write(nu_diag,*) ' Radiation'
@@ -1767,6 +1773,7 @@ subroutine input_data
          rfracmin_in=rfracmin, rfracmax_in=rfracmax, pndaspect_in=pndaspect, hs1_in=hs1, hp1_in=hp1, &
          ktherm_in=ktherm, calc_Tsfc_in=calc_Tsfc, conduct_in=conduct, &
          a_rapid_mode_in=a_rapid_mode, Rac_rapid_mode_in=Rac_rapid_mode, &
+         floediam_in=floediam, hfrazilmin_in=hfrazilmin, &
          aspect_rapid_mode_in=aspect_rapid_mode, dSdt_slow_mode_in=dSdt_slow_mode, &
          phi_c_slow_mode_in=phi_c_slow_mode, phi_i_mushy_in=phi_i_mushy, conserv_check_in=conserv_check, &
          wave_spec_type_in = wave_spec_type, &

configuration/scripts/ice_in

@@ -111,6 +111,8 @@
     sw_redist         = .false.
     sw_frac           = 0.9d0
     sw_dtemp          = 0.02d0
+    hfrazilmin        = 0.05d0
+    floediam          = 300.0d0
 /
 
 &dynamics_nml

doc/source/user_guide/ug_case_settings.rst

@@ -330,6 +330,8 @@ thermo_nml
    "``conduct``", "``bubbly``", "conductivity scheme :cite:`Pringle07`", "``bubbly``"
    "", "``MU71``", "conductivity :cite:`Maykut71`", ""
    "``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"
    "``kitd``", "``0``", "delta function ITD approximation", "1"
    "", "``1``", "linear remapping ITD approximation", ""
    "``ksno``", "real", "snow thermal conductivity", "0.3"