Update gx1prod, Icepack, version number (CICE-Consortium#629)

* update gx1prod, update version number to 6.3 * update Icepack * update gx1prod15 to start at 1995
DeniseWorthen · Sep 1, 2021 · 6e89728 · 6e89728
1 parent cb7d616
commit 6e89728
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 6 deletions.
diff --git a/cicecore/version.txt b/cicecore/version.txt
@@ -1 +1 @@
-CICE 6.2.0
+CICE 6.3.0
diff --git a/configuration/scripts/options/set_nml.gx1prod b/configuration/scripts/options/set_nml.gx1prod
@@ -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.

diff --git a/configuration/scripts/options/set_nml.gx1prod15 b/configuration/scripts/options/set_nml.gx1prod15
@@ -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'
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'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.

diff --git a/icepack b/icepack
+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