Merge remote-tracking branch 'upstream/master' into emc/develop

README.md

@@ -11,21 +11,19 @@ CICE is a computationally efficient model for simulating the growth, melting, an
 This repository contains the files and code needed to run the CICE sea ice numerical model starting with version 6. CICE is maintained by the CICE Consortium. 
 Versions prior to v6 are found in the [CICE-svn-trunk repository](https://github.com/CICE-Consortium/CICE-svn-trunk).
 
-CICE consists of a top level driver and dynamical core plus the [Icepack column physics code][icepack], which is included in CICE as a Git submodule.  Because Icepack is a submodule of CICE, Icepack and CICE development are handled independently with respect to the GitHub repositories even though development and testing may be done together.  
+CICE consists of a top level driver and dynamical core plus the [Icepack][icepack] column physics code], which is included in CICE as a Git submodule.  Because Icepack is a submodule of CICE, Icepack and CICE development are handled independently with respect to the GitHub repositories even though development and testing may be done together.  
 
 [icepack]: https://github.com/CICE-Consortium/Icepack
 
-The first point of contact with the CICE Consortium is the [Consortium Community Forum][forum]. 
+The first point of contact with the CICE Consortium is the Consortium Community [Forum][forum]. 
 This forum is monitored by Consortium members and also opened to the whole community.
 Please do not use our issue tracker for general support questions.
 
-[doc-resources]: https://github.com/CICE-Consortium/About-Us/wiki/Resource-Index#model-documentation
-[doc-running]: https://cice-consortium-cice.readthedocs.io/en/master/user_guide/ug_running.html
 [forum]: https://xenforo.cgd.ucar.edu/cesm/forums/cice-consortium.146/
 
 If you expect to make any changes to the code, we recommend that you first fork both the CICE and Icepack repositories. 
 In order to incorporate your developments into the Consortium code it is imperative you follow the guidance for Pull Requests and requisite testing.
-Head over to our [Contribution guide][contributing] to learn more about how you can help improve CICE.
+Head over to our [Contributing][contributing] guide to learn more about how you can help improve CICE.
 
 [contributing]: https://github.com/CICE-Consortium/About-Us/wiki/Contributing
 

cicecore/cicedynB/general/ice_init.F90

@@ -213,7 +213,7 @@ subroutine input_data
         oceanmixed_ice, restore_ice,     restore_ocn,   trestore,       &
         precip_units,   default_season,  wave_spec_type,nfreq,          &
         atm_data_type,  ocn_data_type,   bgc_data_type, fe_data_type,   &
-        ice_data_type,  wave_spec_file,                                 &
+        ice_data_type,  wave_spec_file,  restart_coszen,                &
         fyear_init,     ycycle,                                         &
         atm_data_dir,   ocn_data_dir,    bgc_data_dir,                  &
         atm_data_format, ocn_data_format, rotate_wind,                  &

configuration/scripts/ice_in

@@ -182,6 +182,7 @@
     wave_spec_type  = 'none'
     wave_spec_file  = 'unknown_wave_spec_file'
     nfreq           = 25
+    restart_coszen  = .false.
     restore_ice     = .false.
     restore_ocn     = .false.
     trestore        =  90

doc/source/user_guide/ug_case_settings.rst

@@ -126,7 +126,7 @@ setup_nml
    "``histfreq_n``", "integer array", "frequency history output is written with ``histfreq``", "1,1,1,1,1"
    "``history_dir``", "string", "path to history output directory", "'./'"
    "``history_file``", "string", "output file for history", "'iceh'"
-   "``history_format``", "``default``", "read/write restart files in default format", "``default``"
+   "``history_format``", "``default``", "read/write history files in default format", "``default``"
    "", "``pio_pnetcdf``", "read/write restart files with pnetcdf in pio", ""
    "``history_precision``", "integer", "history file precision: 4 or 8 byte", "4"
    "``ice_ic``", "``default``", "latitude and sst dependent initial condition", "``default``"
@@ -452,6 +452,7 @@ forcing_nml
    "", "``mm_per_month``", "", ""
    "", "``mm_per_sec``", "(same as MKS units)", ""
    "", "``m_per_sec``", "", ""
+   "``restart_coszen``", "logical", "read/write coszen in restart files", "``.false.``"
    "``restore_ocn``", "logical", "restore sst to data", "``.false.``"
    "``restore_ice``", "logical", "restore ice state along lateral boundaries", "``.false.``"
    "``tfrz_option``", "``linear_salt``", "linear functino of salinity (ktherm=1)", "``mushy``"