Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Icepack, minor fixes from prerelease testing #590

Merged
merged 1 commit into from
Apr 7, 2021
Merged

Update Icepack, minor fixes from prerelease testing #590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions configuration/scripts/machines/Macros.conda_macos
View file
Open in desktop
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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm a little curious about why this is suddenly needed, but I guess something changed in the conda-forge toolchain...

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know. This is what I had to do on my new mac running 11.2.1. I hadn't been able to run the conda macos before on this machine (although I had quickly tried before). I also had to make sure I updated my conda environment because I had an older install that had the omp bug. The extra LD could be a bug in the underlying conda setup, but I personally don't really know enough to be sure.

endif

# Libraries to be passed to the linker
Expand Down
2 changes: 1 addition & 1 deletion configuration/scripts/options/set_nml.gx1coreii
View file
Open in desktop
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
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion icepack
Open in desktop
Submodule icepack updated 3 files
+5 −5 .github/workflows/test-icepack.yml
+1 −0 configuration/scripts/machines/Macros.conda_macos
+5 −5 configuration/scripts/tests/report_results.csh