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 travis data download to zenodo, update conda macos Macros file CFLAGS_HOST #424

Merged
merged 2 commits into from
Mar 30, 2020
Merged

Update travis data download to zenodo, update conda macos Macros file CFLAGS_HOST #424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
105384a
update conda macos Macros file to address older versions of sdk in se…
apcraig Mar 27, 2020
21bb90c
update travis data download to zenodo
apcraig Mar 27, 2020
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
8 changes: 4 additions & 4 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ addons:

install:
# Fetch CICE grid files and initial conditions
- "wget ftp://ftp.cgd.ucar.edu/archive/Model-Data/CICE/CICE_data_ic_grid.tar.gz &&
tar xvfz CICE_data_ic_grid.tar.gz -C ~"
- "wget https://zenodo.org/record/3728358/files/CICE_data_gx3_grid_ic-20200320.tar.gz &&
tar xvfz CICE_data_gx3_grid_ic-20200320.tar.gz -C ~"

# Fetch forcing data
- "wget ftp://ftp.cgd.ucar.edu/archive/Model-Data/CICE/CICE_data_forcing_gx3_all.tar.gz &&
tar xvfz CICE_data_forcing_gx3_all.tar.gz -C ~"
- "wget https://zenodo.org/record/3728362/files/CICE_data_gx3_forcing_NCAR_bulk-20200320.tar.gz &&
tar xvfz CICE_data_gx3_forcing_NCAR_bulk-20200320.tar.gz -C ~"

# Mirror entire data folder
#- "lftp ftp://anonymous:[email protected]@ftp.cgd.ucar.edu
Expand Down
7 changes: 6 additions & 1 deletion configuration/scripts/machines/Macros.conda_macos
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,12 @@ LD:= $(FC)
MODDIR += -I$(CONDA_PREFIX)/include

# Location of the system C header files (required on recent macOS to compile makdep)
CFLAGS_HOST = -isysroot$(shell xcrun --show-sdk-path)
SDKPATH = $(shell xcrun --show-sdk-path)
ifeq ($(strip $(SDKPATH)),)
CFLAGS_HOST :=
else
CFLAGS_HOST = -isysroot $(SDKPATH)
endif

# Libraries to be passed to the linker
SLIBS := -L$(CONDA_PREFIX)/lib -lnetcdf -lnetcdff
Expand Down
2 changes: 1 addition & 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 @@ -671,7 +671,7 @@ If you prefer that some or all of the CICE directories be located somewhere else

Note: if you wish, you can also create a complete machine port for your computer by leveraging the conda configuration as a starting point. See :ref:`porting`.

Next, create the "cice" conda environment from the ``environment.yml`` file:
Next, create the "cice" conda environment from the ``environment.yml`` file in the CICE source code repository. You will need to clone CICE to run the following command:

.. code-block:: bash

Expand Down