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

Update gx1prod, Icepack, version number #629

Merged
merged 4 commits into from
Sep 1, 2021
Merged

Update gx1prod, Icepack, version number #629

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
a421362
update gx1prod, update version number to 6.3
apcraig Aug 31, 2021
6f57b34
Merge branch 'master' of https://github.com/cice-consortium/cice into…
apcraig Aug 31, 2021
4bf0159
update Icepack
apcraig Aug 31, 2021
e9d7a9c
update gx1prod15 to start at 1995
apcraig Sep 1, 2021
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
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.2.0
CICE 6.3.0
4 changes: 2 additions & 2 deletions configuration/scripts/options/set_nml.gx1prod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
year_init = 2005
use_leap_years = .true.
npt_unit = 'y'
npt = 1
npt = 4
dumpfreq = 'm'
dumpfreq_base = 'zero'
fyear_init = 2005
ycycle = 5
ycycle = 4
ocn_data_dir = 'ICE_MACHINE_INPUTDATA/CICE_data/forcing/gx1/CESM/MONTHLY/'
use_bathymetry = .true.
seabed_stress = .true.
Expand Down
19 changes: 19 additions & 0 deletions configuration/scripts/options/set_nml.gx1prod15
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
year_init = 1995
use_leap_years = .true.
npt_unit = 'y'
npt = 15
dumpfreq = 'm'
dumpfreq_base = 'zero'
fyear_init = 1995
ycycle = 16
ocn_data_dir = 'ICE_MACHINE_INPUTDATA/CICE_data/forcing/gx1/CESM/MONTHLY/'
use_bathymetry = .true.
seabed_stress = .true.
seabed_stress_method = 'LKD'
ocn_data_type = 'ncar'
ocn_data_format = 'nc'
oceanmixed_ice = .true.
oceanmixed_file = 'ocean_forcing_clim_2D_gx1.20210330.nc'
tr_brine = .true.
f_taubx = 'm'
f_tauby = 'm'
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.2.0'
version = u'6.3.0'
# The full version, including alpha/beta/rc tags.
version = u'6.2.0'
version = u'6.3.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 icepack
Open in desktop
Submodule icepack updated 24 files
+1 −1 .github/workflows/test-icepack.yml
+1 −1 .travis.yml
+1 −1 columnphysics/version.txt
+10 −1 configuration/driver/icedrv_RunMod.F90
+2 −0 configuration/driver/icedrv_calendar.F90
+423 −0 configuration/driver/icedrv_history.F90
+84 −25 configuration/driver/icedrv_init.F90
+4 −4 configuration/driver/icedrv_init_column.F90
+9 −7 configuration/scripts/Makefile
+4 −0 configuration/scripts/icepack.build
+1 −0 configuration/scripts/icepack_in
+4 −9 configuration/scripts/machines/Macros.badger_intel
+6 −0 configuration/scripts/machines/Macros.conda_macos
+9 −1 configuration/scripts/machines/env.badger_intel
+2 −0 configuration/scripts/machines/environment.yml
+1 −0 configuration/scripts/options/set_env.ionetcdf
+1 −0 configuration/scripts/options/set_nml.ionetcdf
+1 −1 configuration/scripts/setup_run_dirs.csh
+2 −0 configuration/scripts/tests/io_suite.ts
+2 −2 doc/source/conf.py
+1 −0 doc/source/icepack_index.rst
+3 −1 doc/source/user_guide/ug_case_settings.rst
+27 −3 doc/source/user_guide/ug_implementation.rst
+6 −1 doc/source/user_guide/ug_running.rst