Update Icepack (#590)

Fix error in gx1coreii initial condition filename Update conda macos Macros Add documentation about updating the conda environment
CICE-Consortium · Apr 7, 2021 · 9b51179 · 9b51179
1 parent afc3a58
commit 9b51179
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/configuration/scripts/machines/Macros.conda_macos b/configuration/scripts/machines/Macros.conda_macos
@@ -45,6 +45,7 @@ ifeq ($(strip $(SDKPATH)),)
   CFLAGS_HOST := 
 else
   CFLAGS_HOST = -isysroot $(SDKPATH)
+  LD += -L$(SDKPATH)/usr/lib
 endif
 
 # Libraries to be passed to the linker

diff --git a/configuration/scripts/options/set_nml.gx1coreii b/configuration/scripts/options/set_nml.gx1coreii
@@ -1,7 +1,7 @@
 year_init      = 1997
 use_leap_years = .false.
 use_restart_time = .true.
-ice_ic          = '/glade/p/cesm/pcwg_dev/CICE_data/ic/gx1/iced_gx1_v5.nc'
+ice_ic          = 'ICE_MACHINE_INPUTDATA/CICE_data/ic/gx1/iced_gx1_v5.nc'
 fyear_init      = 2005
 ycycle          = 1
 atm_data_format = 'bin'

diff --git a/doc/source/user_guide/ug_running.rst b/doc/source/user_guide/ug_running.rst
@@ -731,7 +731,14 @@ Next, create the "cice" conda environment from the ``environment.yml`` file in t
 
   conda env create -f configuration/scripts/machines/environment.yml
 
-This step needs to be done only once.
+This step needs to be done only once and will maintain a static conda environment.  To update the conda environment later, use
+
+.. code-block:: bash
+
+  conda env create -f configuration/scripts/machines/environment.yml --force
+
+This will update the conda environment to the latest software versions.
+
 
 .. _using_conda_env:
 

diff --git a/icepack b/icepack