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

Set ndte=240 and other pre release updates #250

Merged
merged 2 commits into from
Nov 21, 2018
Merged

Set ndte=240 and other pre release updates #250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
49aa19b
update CICE version, set ndte=240, fix uninitialized forcing field bo…
apcraig Nov 21, 2018
c00e67e
update ndte default setting in doc
apcraig Nov 21, 2018
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
4 changes: 4 additions & 0 deletions cicecore/cicedynB/general/ice_forcing.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,10 @@ subroutine alloc_forcing
stat=ierr)
if (ierr/=0) call abort_ice('(alloc_forcing): Out of Memory')

! initialize this, not set in box2001 (and some other forcings?)

cldf = c0

end subroutine alloc_forcing

!=======================================================================
Expand Down
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.0.dev
CICE 6.0.0
2 changes: 1 addition & 1 deletion configuration/scripts/ice_in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@

&dynamics_nml
kdyn = 1
ndte = 120
ndte = 240
revised_evp = .false.
advection = 'remap'
kstrength = 1
Expand Down
1 change: 1 addition & 0 deletions configuration/scripts/machines/Macros.conrad_cray
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ LDFLAGS := -h byteswapio

ifeq ($(ICE_BLDDEBUG), true)
FFLAGS += -O0 -g -Rbcdps
# FFLAGS += -O0 -g -Rbcdps -ei
else
FFLAGS += -O2
endif
Expand Down
1 change: 1 addition & 0 deletions configuration/scripts/machines/Macros.conrad_intel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ FFLAGS_NOOPT:= -O0

ifeq ($(ICE_BLDDEBUG), true)
FFLAGS += -O0 -g -check uninit -check bounds -check pointers -fpe0 -check noarg_temp_created
# FFLAGS += -O0 -g -check uninit -check bounds -check pointers -fpe0 -check noarg_temp_created -init=snan,arrays
else
FFLAGS += -O2
endif
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.0.dev'
version = u'6.0.0'
# The full version, including alpha/beta/rc tags.
version = u'6.0.dev'
version = u'6.0.0'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -259,7 +259,7 @@ Table of namelist options
"", "``1``", "dynamics ON", ""
"``revised_evp``", "true/false", "use revised EVP formulation", ""
"``basalstress``", "true/false", "use bottom basal stress", ""
"``ndte``", "integer", "number of EVP subcycles", "120"
"``ndte``", "integer", "number of EVP subcycles", "240"
"``advection``", "``remap``", "linear remapping advection", "‘remap’"
"", "``upwind``", "donor cell advection", ""
"``kstrength``", "``0``", "ice strength formulation :cite:`Hibler79`", "1"
Expand Down
2 changes: 1 addition & 1 deletion icepack
Open in desktop
Submodule icepack updated 3 files
+1 −1 columnphysics/version.txt
+2 −2 doc/source/conf.py
+0 −2 doc/source/intro/major_updates.rst