Intel compiler + MPI support, cleaned makefiles, template bash environment setup...#551
Merged
einola merged 6 commits intonansencenter:developfrom Aug 12, 2021
Merged
Intel compiler + MPI support, cleaned makefiles, template bash environment setup...#551einola merged 6 commits intonansencenter:developfrom
einola merged 6 commits intonansencenter:developfrom
Conversation
Update to neXtSIMv2
…h` & `env_compile_intel_linux.bash`
…h` & `env_compile_intel_linux.bash`
I needed to include the environment variables CXX etc in the Dockerfile using the ENV command. With these changes the model now compiles in Docker.
einola
approved these changes
Aug 12, 2021
Member
einola
left a comment
There was a problem hiding this comment.
Minor changes to get Dockerfile working. Tested in docker too (one-winter run).
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Modifications / new stuff for this pull request
All
Makefileshave been modified so they take the following variables from the user environment, they are not defined anymore in a hard-coded way as before...List of environment variables that must be set for
Makefilesto do their job:NEXTSIMDIRCXXCCFCCFLAGS, minimal, ex:"-O3 -fPIC"; many other flags remain in theMakefiles, but not these!CXXFLAGS, minimal, ex:"-O3 -pthread -fPIC -fopenmp"; many other flags remain in theMakefiles, but not these!MPI_DIR, ex:"/usr"for OpenMPI on LinuxMPI_LIB_DIR, normally:=${MPI_DIR}/libMPI_INC_DIR, normally:=${MPI_DIR}/includeNETCDF_DIRNETCDF_CXX_DIR, normally:=${NETCDF_DIR}GMSH_DIRBOOST_DIRBOOST_INCDIR, normally:=${BOOST_DIR}/include/boostBOOST_LIBDIR, normally:=${BOOST_DIR}/libTo make it easy
Added two template
bashscripts to be sourced to set these variables according to your machine/architecture:env_compile_gnu_linux.bashfor Gnu/GCC/OpenMPI on Linuxenv_compile_intel_linux.bashfor Intel compilers and Intel MPI on LinuxSo that prior to using the
makecommand, in the terminal:. ./env_compile_gnu_linux.bash/laurent