Skip to content

Commit

Permalink
Update Icepack (#590)
Browse files Browse the repository at this point in the history
Fix error in gx1coreii initial condition filename
Update conda macos Macros
Add documentation about updating the conda environment
  • Loading branch information
apcraig authored Apr 7, 2021
1 parent afc3a58 commit 9b51179
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 3 deletions.
1 change: 1 addition & 0 deletions configuration/scripts/machines/Macros.conda_macos
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion configuration/scripts/options/set_nml.gx1coreii
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
9 changes: 8 additions & 1 deletion doc/source/user_guide/ug_running.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down

0 comments on commit 9b51179

Please sign in to comment.