Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move sw_redist, sw_frac, sw_dtemp from thermo to shortwave namelist #540

Merged
merged 4 commits into from
Dec 11, 2020
Merged

Move sw_redist, sw_frac, sw_dtemp from thermo to shortwave namelist #540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
402a585
Move sw_redist, sw_frac, sw_dtemp from thermo to shortwave namelist
apcraig Dec 7, 2020
6d916de
update verbose output in ice_init.F90
apcraig Dec 9, 2020
b6c207c
update verbose output
apcraig Dec 9, 2020
6fb5168
update close_boundaries documentation
apcraig Dec 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
753 changes: 358 additions & 395 deletions cicecore/cicedynB/general/ice_init.F90
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion cicecore/version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
CICE 6.1.3
CICE 6.1.4
6 changes: 3 additions & 3 deletions configuration/scripts/ice_in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
/
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions doc/source/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
7 changes: 3 additions & 4 deletions doc/source/user_guide/ug_case_settings.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'"
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion icepack
Open in desktop
Submodule icepack updated 5 files
+1 −1 columnphysics/version.txt
+4 −4 configuration/driver/icedrv_init.F90
+3 −3 configuration/scripts/icepack_in
+2 −2 doc/source/conf.py
+3 −3 doc/source/user_guide/ug_case_settings.rst