Move sw_redist, sw_frac, sw_dtemp from thermo namelist to shortwave n…

…amelist (#343) * move sw_redist, sw_frac, sw_dtemp from thermo namelist to shortwave namelist in the icepack driver. Update the version in preparation for next minor release. * update documentation
CICE-Consortium · Dec 7, 2020 · 3ca0dda · 3ca0dda
1 parent 77c523e
commit 3ca0dda
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/columnphysics/version.txt b/columnphysics/version.txt
@@ -1 +1 @@
-ICEPACK 1.2.3
+ICEPACK 1.2.4
diff --git a/configuration/driver/icedrv_init.F90 b/configuration/driver/icedrv_init.F90
@@ -135,7 +135,6 @@ 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,                   &
-        sw_redist,      sw_frac,         sw_dtemp,                      &
         floediam,       hfrazilmin
 
       namelist /dynamics_nml/ &
@@ -146,6 +145,7 @@ subroutine input_data
         shortwave,      albedo_type,                                    &
         albicev,        albicei,         albsnowv,      albsnowi,       &
         ahmax,          R_ice,           R_pnd,         R_snw,          &
+        sw_redist,      sw_frac,         sw_dtemp,                      &
         dT_mlt,         rsnw_mlt,        kalg
 
       namelist /ponds_nml/ &
@@ -543,6 +543,9 @@ subroutine input_data
          write(nu_diag,1000) ' albsnowi                  = ', albsnowi
          write(nu_diag,1000) ' ahmax                     = ', ahmax
          endif
+         write(nu_diag,1010) ' sw_redist                 = ', sw_redist
+         write(nu_diag,1005) ' sw_frac                   = ', sw_frac
+         write(nu_diag,1005) ' sw_dtemp                  = ', sw_dtemp
 
          write(nu_diag,1000) ' rfracmin                  = ', rfracmin
          write(nu_diag,1000) ' rfracmax                  = ', rfracmax
@@ -566,9 +569,6 @@ subroutine input_data
          write(nu_diag,1005) ' phi_c_slow_mode           = ', phi_c_slow_mode
          write(nu_diag,1005) ' phi_i_mushy               = ', phi_i_mushy
          endif
-         write(nu_diag,1010) ' sw_redist                 = ', sw_redist
-         write(nu_diag,1005) ' sw_frac                   = ', sw_frac
-         write(nu_diag,1005) ' sw_dtemp                  = ', sw_dtemp
 
          write(nu_diag,1030) ' atmbndy                   = ', &
                                trim(atmbndy)

diff --git a/configuration/scripts/icepack_in b/configuration/scripts/icepack_in
@@ -44,9 +44,6 @@
     dSdt_slow_mode    = -5.0e-8
     phi_c_slow_mode   =    0.05
     phi_i_mushy       =    0.85
-    sw_redist         = .false.
-    sw_frac           = 0.9d0
-    sw_dtemp          = 0.02d0
     floediam          = 300.0d0
     hfrazilmin        = 0.05d0
 /
@@ -65,6 +62,9 @@
     dT_mlt          = 1.5
     rsnw_mlt        = 1500.
     kalg            = 0.6
+    sw_redist       = .false.
+    sw_frac         = 0.9d0
+    sw_dtemp        = 0.02d0
 /
 
 &ponds_nml

diff --git a/doc/source/conf.py b/doc/source/conf.py
@@ -62,9 +62,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = u'1.2.3' 
+version = u'1.2.4' 
 # The full version, including alpha/beta/rc tags.
-version = u'1.2.3' 
+version = u'1.2.4' 
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/doc/source/user_guide/ug_case_settings.rst b/doc/source/user_guide/ug_case_settings.rst
@@ -211,9 +211,6 @@ thermo_nml
    "``phi_c_slow_mode``", ":math:`0<\phi_c < 1`", "critical liquid fraction", "0.05"
    "``phi_i_mushy``", ":math:`0<\phi_i < 1`", "solid fraction at lower boundary", "0.85"
    "``Rac_rapid_mode``", "real", "critical Rayleigh number", "10.0"
-   "``sw_redist``", "logical", "shortwave redistribution", ".false."
-   "``sw_frac``", "real", "fraction of shortwave redistribution", "0.9"
-   "``sw_dtemp``", "real", "temperature from melt for sw_redist", "0.02"
    "", "", "", ""
 
 dynamics_nml
@@ -257,6 +254,9 @@ shortwave_nml
    "``R_snw``", "real", "tuning parameter for snow (broadband albedo) from Delta-Eddington shortwave", "1.5"
    "``shortwave``", "``ccsm3``", "NCAR CCSM3 shortwave distribution method", "``dEdd``"
    "", "``dEdd``", "Delta-Eddington method", ""
+   "``sw_dtemp``", "real", "temperature from melt for sw_redist", "0.02"
+   "``sw_frac``", "real", "fraction of shortwave redistribution", "0.9"
+   "``sw_redist``", "logical", "shortwave redistribution", ".false."
    "", "", "", ""
 
 ponds_nml