From 6e8972816c2b26f80ab88a6c404b56e8429deafc Mon Sep 17 00:00:00 2001
From: Tony Craig <apcraig@users.noreply.github.com>
Date: Wed, 1 Sep 2021 15:07:53 -0700
Subject: [PATCH] Update gx1prod, Icepack, version number (#629)

* update gx1prod, update version number to 6.3

* update Icepack

* update gx1prod15 to start at 1995
---
 cicecore/version.txt                          |  2 +-
 configuration/scripts/options/set_nml.gx1prod |  4 ++--
 .../scripts/options/set_nml.gx1prod15         | 19 +++++++++++++++++++
 doc/source/conf.py                            |  4 ++--
 icepack                                       |  2 +-
 5 files changed, 25 insertions(+), 6 deletions(-)
 create mode 100644 configuration/scripts/options/set_nml.gx1prod15

diff --git a/cicecore/version.txt b/cicecore/version.txt
index cfd991555..04a90ef1a 100644
--- 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
index eca527a64..94e4bbf89 100644
--- 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
new file mode 100644
index 000000000..edbf5e5de
--- /dev/null
+++ 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
index 4cf2f580d..099f65403 100644
--- 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
index 53ffce04d..34c8e688b 160000
--- a/icepack
+++ b/icepack
@@ -1 +1 @@
-Subproject commit 53ffce04d729a3e802b397340c4410126b5b0ac9
+Subproject commit 34c8e688bf7f3008cf84093cd703cf8cfe068eda