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.

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

merge latest master #3

Merged
merged 6 commits into from
Apr 2, 2020
Merged

Commits on Mar 10, 2020

  1. Configuration menu
    Copy the full SHA
    7b43a6f View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2020

  1. Configuration menu
    Copy the full SHA
    771aecb View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2020

  1. Configuration menu
    Copy the full SHA
    6cc0d6b View commit details
    Browse the repository at this point in the history
  2. add Osinski to template

    eclare108213 authored Mar 18, 2020
    Configuration menu
    Copy the full SHA
    5f97e45 View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2020

  1. conda: Macros: add '-L' argument to the linker command (#418)

    On Linux, compiling CICE in serial mode under the conda environment
    currently fails as the linker does not find the NetCDF libraries.
    
    Compiling in parallel mode does work as the MPI compilation wrappers
    seem to pass the necessary flag to the linker under the hood.
    
    Explicitely tell the linker the location of the libraries using the
    `SLIBS` variable in the Macros file. To be on the safe side, also do it
    on macOS.
    phil-blain authored Mar 26, 2020
    Configuration menu
    Copy the full SHA
    9040fe2 View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2020

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

    … CFLAGS_HOST (#424)
    
    * update conda macos Macros file to address older versions of sdk in setting CFLAGS_HOST
    
    * update travis data download to zenodo
    apcraig authored Mar 30, 2020
    Configuration menu
    Copy the full SHA
    9ac1863 View commit details
    Browse the repository at this point in the history