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

Updates container libnetcdf #4496

Merged
merged 2 commits into from
Oct 10, 2023
Merged

Updates container libnetcdf #4496

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
8cc377b
Adds linking flags for make
jasonb5 Oct 10, 2023
dea5ede
Updates libnetcdf to 4.9.1
jasonb5 Oct 10, 2023
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
6 changes: 3 additions & 3 deletions docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ FROM condaforge/mambaforge:${MAMBAFORGE_VERSION} AS base
ARG PNETCDF_VERSION=1.12.3
ENV PNETCDF_VERSION=${PNETCDF_VERSION}

ARG LIBNETCDF_VERSION=4.8.1
ARG LIBNETCDF_VERSION=4.9.1
ENV LIBNETCDF_VERSION=${LIBNETCDF_VERSION}

ARG NETCDF_FORTRAN_VERSION=4.6.0
ARG NETCDF_FORTRAN_VERSION=*
ENV NETCDF_FORTRAN_VERSION=${NETCDF_FORTRAN_VERSION}

ARG ESMF_VERSION=8.4.0
ARG ESMF_VERSION=*
ENV ESMF_VERSION=${ESMF_VERSION}

ARG GCC_VERSION=10.*
Expand Down
3 changes: 2 additions & 1 deletion docker/docker.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
string(APPEND CXXFLAGS " -std=c++14")
string(APPEND CXX_LIBS " -lstdc++")
string(APPEND FFLAGS " -I/opt/conda/include")
string(APPEND SLIBS " -L/opt/conda/lib")
# required for grid generation tests that use make
string(APPEND SLIBS " -L/opt/conda/lib -lnetcdf -lnetcdff")
set(MPI_PATH "/opt/conda")
if (CMAKE_Fortran_COMPILER_VERSION VERSION_GREATER_EQUAL 10)
string(APPEND FFLAGS " -fallow-argument-mismatch -fallow-invalid-boz ")
Expand Down