Move sw_redist, sw_frac, sw_dtemp from thermo to shortwave namelist

cicecore/version.txt

@@ -1 +1 @@
-CICE 6.1.3
+CICE 6.1.4

configuration/scripts/ice_in

@@ -108,9 +108,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
     hfrazilmin        = 0.05d0
     floediam          = 300.0d0
 /
@@ -172,6 +169,9 @@
     dT_mlt          = 1.5
     rsnw_mlt        = 1500.
     kalg            = 0.6
+    sw_redist         = .false.
+    sw_frac           = 0.9d0
+    sw_dtemp          = 0.02d0
 /
 
 &ponds_nml

doc/source/conf.py

@@ -62,9 +62,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = u'6.1.3' 
+version = u'6.1.4' 
 # The full version, including alpha/beta/rc tags.
-version = u'6.1.3' 
+version = u'6.1.4' 
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

doc/source/user_guide/ug_case_settings.rst

@@ -212,7 +212,6 @@ grid_nml
    "``bathymetry_file``", "string", "name of bathymetry file to be read", "‘unknown_bathymetry_file’"
    "``bathymetry_format``", "``default``", "NetCDF depth field", "‘default’"
    "", "``pop``", "pop thickness file in cm in ascii format", ""
-   "``close_boundaries``", "logical", "set land on edges of grid", "``.false.``"
    "``dxrect``", "real", "x-direction grid spacing for rectangular grid in cm", "0.0"
    "``dyrect``", "real", "y-direction grid spacing for rectangular grid in cm", "0.0"
    "``gridcpl_file``", "string", "input file for coupling grid info", "'unknown_gridcpl_file'"
@@ -342,9 +341,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", "redistribute internal shortwave to surface", "``.false.``"
-   "``sw_frac``", "real", "fraction redistributed", "0.9"
-   "``sw_dtemp``", "real", "temperature difference from melt to start redistributing", "0.02"
    "", "", "", ""
 
 .. _dynamics_nml:
@@ -438,6 +434,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", "``ccsm3``"
    "", "``dEdd``", "Delta-Eddington method", ""
+   "``sw_dtemp``", "real", "temperature difference from melt to start redistributing", "0.02"
+   "``sw_frac``", "real", "fraction redistributed", "0.9"
+   "``sw_redist``", "logical", "redistribute internal shortwave to surface", "``.false.``"
    "", "", "", ""
 
 ponds_nml