Skip to content

Commit

Permalink
Update travis data download to zenodo, update conda macos Macros file…
Browse files Browse the repository at this point in the history
… CFLAGS_HOST (CICE-Consortium#424)

* update conda macos Macros file to address older versions of sdk in setting CFLAGS_HOST

* update travis data download to zenodo
  • Loading branch information
apcraig authored Mar 30, 2020
1 parent 9040fe2 commit 9ac1863
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 6 deletions.
8 changes: 4 additions & 4 deletions .travis.yml
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
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
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

0 comments on commit 9ac1863

Please sign in to comment.