Update travis data download to zenodo, update conda macos Macros file…

… 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

.travis.yml

@@ -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:travis@travis-ci.org@ftp.cgd.ucar.edu 

configuration/scripts/machines/Macros.conda_macos

@@ -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

doc/source/user_guide/ug_running.rst

@@ -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