Skip to content

GitLab

Commit 01212e63 authored by Robert Schweppe's avatar Robert Schweppe
Browse files

- update the moduleLoadScripts to refrence the new repo / removed the old folder 

- updated the locations of the cmake scripts to the new repo
parent 863d09ec
Pipeline #20932 failed with stages
in 5 minutes and 39 seconds
Hide whitespace changes
Inline Side-by-side
.gitlab-ci.yml
View file @ 01212e63
......@@ -211,7 +211,7 @@ build-nag62-debug:
variables:
<<: *debug_vars
<<: *no_test_vars
MODULE_LOAD_SCRIPT: moduleLoadScripts/eve.nagfor62
MODULE_LOAD_SCRIPT: hpc-module-loads/eve.nagfor62
CMAKE_FLAGS: '-DCMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX=64 -DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTING=OFF'
<<: *build_template
......@@ -219,7 +219,7 @@ build-gfortran64MPI-debug:
variables:
<<: *debug_vars
<<: *no_test_vars
MODULE_LOAD_SCRIPT: moduleLoadScripts/eve.gfortran64MPI
MODULE_LOAD_SCRIPT: hpc-module-loads/eve.gfortran64MPI
CMAKE_FLAGS: '-DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTING=OFF'
<<: *build_template
......@@ -227,7 +227,7 @@ build-gfortran73MPI-debug:
variables:
<<: *debug_vars
<<: *no_test_vars
MODULE_LOAD_SCRIPT: moduleLoadScripts/eve.gfortran73MPI
MODULE_LOAD_SCRIPT: hpc-module-loads/eve.gfortran73MPI
CMAKE_FLAGS: '-DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTING=OFF'
<<: *build_template
......@@ -235,7 +235,7 @@ build-gfortran83-debug:
variables:
<<: *debug_vars
<<: *no_test_vars
MODULE_LOAD_SCRIPT: moduleLoadScripts/eve.gfortran83
MODULE_LOAD_SCRIPT: hpc-module-loads/eve.gfortran83
CMAKE_FLAGS: '-DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTING=OFF'
<<: *build_template
......@@ -243,7 +243,7 @@ build-gfortran83MPI-debug:
variables:
<<: *debug_vars
<<: *no_test_vars
MODULE_LOAD_SCRIPT: moduleLoadScripts/eve.gfortran83MPI
MODULE_LOAD_SCRIPT: hpc-module-loads/eve.gfortran83MPI
CMAKE_FLAGS: '-DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTING=OFF'
<<: *build_template
......@@ -251,7 +251,7 @@ build-gfortran102-debug:
variables:
<<: *debug_vars
<<: *no_test_vars
MODULE_LOAD_SCRIPT: moduleLoadScripts/eve.gfortran102
MODULE_LOAD_SCRIPT: hpc-module-loads/eve.gfortran102
CMAKE_FLAGS: '-DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTING=OFF'
<<: *build_template
......@@ -259,7 +259,7 @@ build-gfortran102MPI-debug:
variables:
<<: *debug_vars
<<: *no_test_vars
MODULE_LOAD_SCRIPT: moduleLoadScripts/eve.gfortran102MPI
MODULE_LOAD_SCRIPT: hpc-module-loads/eve.gfortran102MPI
CMAKE_FLAGS: '-DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTING=OFF'
<<: *build_template
......@@ -267,7 +267,7 @@ build-intel18-debug:
variables:
<<: *debug_vars
<<: *no_test_vars
MODULE_LOAD_SCRIPT: moduleLoadScripts/eve.intel18
MODULE_LOAD_SCRIPT: hpc-module-loads/eve.intel18
CMAKE_FLAGS: '-DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTING=OFF'
<<: *build_template
......@@ -275,7 +275,7 @@ build-intel19-debug:
variables:
<<: *debug_vars
<<: *no_test_vars
MODULE_LOAD_SCRIPT: moduleLoadScripts/eve.intel19
MODULE_LOAD_SCRIPT: hpc-module-loads/eve.intel19
CMAKE_FLAGS: '-DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTING=OFF'
<<: *build_template
......@@ -283,7 +283,7 @@ build-intel19MPI-debug:
variables:
<<: *debug_vars
<<: *no_test_vars
MODULE_LOAD_SCRIPT: moduleLoadScripts/eve.intel19MPI
MODULE_LOAD_SCRIPT: hpc-module-loads/eve.intel19MPI
CMAKE_FLAGS: '-DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTING=OFF'
<<: *build_template
......@@ -292,7 +292,7 @@ build-nag62-release:
variables:
<<: *release_vars
<<: *no_test_vars
MODULE_LOAD_SCRIPT: moduleLoadScripts/eve.nagfor62
MODULE_LOAD_SCRIPT: hpc-module-loads/eve.nagfor62
CMAKE_FLAGS: '-DCMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX=64 -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF'
<<: *build_template
......@@ -300,7 +300,7 @@ build-gfortran64MPI-release:
variables:
<<: *release_vars
<<: *no_test_vars
MODULE_LOAD_SCRIPT: moduleLoadScripts/eve.gfortran64MPI
MODULE_LOAD_SCRIPT: hpc-module-loads/eve.gfortran64MPI
CMAKE_FLAGS: '-DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF'
<<: *build_template
......@@ -308,7 +308,7 @@ build-gfortran73MPI-release:
variables:
<<: *release_vars
<<: *no_test_vars
MODULE_LOAD_SCRIPT: moduleLoadScripts/eve.gfortran73MPI
MODULE_LOAD_SCRIPT: hpc-module-loads/eve.gfortran73MPI
CMAKE_FLAGS: '-DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF'
<<: *build_template
......@@ -316,7 +316,7 @@ build-gfortran83-release:
variables:
<<: *release_vars
<<: *no_test_vars
MODULE_LOAD_SCRIPT: moduleLoadScripts/eve.gfortran83
MODULE_LOAD_SCRIPT: hpc-module-loads/eve.gfortran83
CMAKE_FLAGS: '-DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF'
<<: *build_template
......@@ -324,7 +324,7 @@ build-gfortran83MPI-release:
variables:
<<: *release_vars
<<: *no_test_vars
MODULE_LOAD_SCRIPT: moduleLoadScripts/eve.gfortran83MPI
MODULE_LOAD_SCRIPT: hpc-module-loads/eve.gfortran83MPI
CMAKE_FLAGS: '-DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF'
<<: *build_template
......@@ -332,7 +332,7 @@ build-gfortran102-release:
variables:
<<: *release_vars
<<: *no_test_vars
MODULE_LOAD_SCRIPT: moduleLoadScripts/eve.gfortran102
MODULE_LOAD_SCRIPT: hpc-module-loads/eve.gfortran102
CMAKE_FLAGS: '-DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF'
<<: *build_template
......@@ -340,7 +340,7 @@ build-gfortran102MPI-release:
variables:
<<: *release_vars
<<: *no_test_vars
MODULE_LOAD_SCRIPT: moduleLoadScripts/eve.gfortran102MPI
MODULE_LOAD_SCRIPT: hpc-module-loads/eve.gfortran102MPI
CMAKE_FLAGS: '-DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF'
<<: *build_template
......@@ -348,7 +348,7 @@ build-intel18-release:
variables:
<<: *release_vars
<<: *no_test_vars
MODULE_LOAD_SCRIPT: moduleLoadScripts/eve.intel18
MODULE_LOAD_SCRIPT: hpc-module-loads/eve.intel18
CMAKE_FLAGS: '-DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF'
<<: *build_template
......@@ -356,7 +356,7 @@ build-intel19-release:
variables:
<<: *release_vars
<<: *no_test_vars
MODULE_LOAD_SCRIPT: moduleLoadScripts/eve.intel19
MODULE_LOAD_SCRIPT: hpc-module-loads/eve.intel19
CMAKE_FLAGS: '-DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF'
<<: *build_template
......@@ -364,7 +364,7 @@ build-intel19MPI-release:
variables:
<<: *release_vars
<<: *no_test_vars
MODULE_LOAD_SCRIPT: moduleLoadScripts/eve.intel19MPI
MODULE_LOAD_SCRIPT: hpc-module-loads/eve.intel19MPI
CMAKE_FLAGS: '-DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF'
<<: *build_template
......@@ -376,7 +376,7 @@ valgrind-gfortran64MPI-debug:
- job: build-gfortran64MPI-debug
variables:
<<: *debug_vars
MODULE_LOAD_SCRIPT: moduleLoadScripts/eve.gfortran64MPI
MODULE_LOAD_SCRIPT: hpc-module-loads/eve.gfortran64MPI
<<: *valgrind_template
valgrind-gfortran73MPI-debug:
......@@ -384,7 +384,7 @@ valgrind-gfortran73MPI-debug:
- job: build-gfortran73MPI-debug
variables:
<<: *debug_vars
MODULE_LOAD_SCRIPT: moduleLoadScripts/eve.gfortran73MPI
MODULE_LOAD_SCRIPT: hpc-module-loads/eve.gfortran73MPI
<<: *valgrind_template
valgrind-gfortran83-debug:
......@@ -392,7 +392,7 @@ valgrind-gfortran83-debug:
- job: build-gfortran83-debug
variables:
<<: *debug_vars
MODULE_LOAD_SCRIPT: moduleLoadScripts/eve.gfortran83
MODULE_LOAD_SCRIPT: hpc-module-loads/eve.gfortran83
<<: *valgrind_template
### # Valgrind not available for Intel and NAG
......@@ -402,7 +402,7 @@ valgrind-gfortran83-debug:
# artifacts: true
# variables:
# <<: *debug_vars
# MODULE_LOAD_SCRIPT: moduleLoadScripts/eve.intel19
# MODULE_LOAD_SCRIPT: hpc-module-loads/eve.intel19
# <<: *valgrind_template
#
# valgrind-nag62-debug:
......@@ -411,7 +411,7 @@ valgrind-gfortran83-debug:
# artifacts: true
# variables:
# <<: *debug_vars
# MODULE_LOAD_SCRIPT: moduleLoadScripts/eve.nagfor62
# MODULE_LOAD_SCRIPT: hpc-module-loads/eve.nagfor62
# <<: *valgrind_template
#################
......@@ -424,7 +424,7 @@ test-nag62-debug:
artifacts: false
variables:
<<: *debug_vars
MODULE_LOAD_SCRIPT: moduleLoadScripts/eve.nagfor62
MODULE_LOAD_SCRIPT: hpc-module-loads/eve.nagfor62
CMAKE_FLAGS: '-DCMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX=64 -DCMAKE_BUILD_TYPE=Debug'
<<: *test_template
......@@ -434,7 +434,7 @@ test-nag62-release:
artifacts: false
variables:
<<: *release_vars
MODULE_LOAD_SCRIPT: moduleLoadScripts/eve.nagfor62
MODULE_LOAD_SCRIPT: hpc-module-loads/eve.nagfor62
CMAKE_FLAGS: '-DCMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX=64 -DCMAKE_BUILD_TYPE=Release'
<<: *test_template
......@@ -444,7 +444,7 @@ test-gfortran83MPI-release:
artifacts: false
variables:
<<: *release_vars
MODULE_LOAD_SCRIPT: moduleLoadScripts/eve.gfortran83MPI
MODULE_LOAD_SCRIPT: hpc-module-loads/eve.gfortran83MPI
CMAKE_FLAGS: '-DCMAKE_BUILD_TYPE=Release'
<<: *test_template
......@@ -454,7 +454,7 @@ test-gfortran73MPI-release:
artifacts: false
variables:
<<: *release_vars
MODULE_LOAD_SCRIPT: moduleLoadScripts/eve.gfortran73MPI
MODULE_LOAD_SCRIPT: hpc-module-loads/eve.gfortran73MPI
CMAKE_FLAGS: '-DCMAKE_BUILD_TYPE=Release'
<<: *test_template
......@@ -464,7 +464,7 @@ test-gfortran73MPI-debug:
artifacts: false
variables:
<<: *debug_vars
MODULE_LOAD_SCRIPT: moduleLoadScripts/eve.gfortran73MPI
MODULE_LOAD_SCRIPT: hpc-module-loads/eve.gfortran73MPI
CMAKE_FLAGS: '-DCMAKE_BUILD_TYPE=Debug'
<<: *test_template
......@@ -474,7 +474,7 @@ test-gfortran83-release:
artifacts: false
variables:
<<: *release_vars
MODULE_LOAD_SCRIPT: moduleLoadScripts/eve.gfortran83
MODULE_LOAD_SCRIPT: hpc-module-loads/eve.gfortran83
CMAKE_FLAGS: '-DCMAKE_BUILD_TYPE=Release'
<<: *test_template
......@@ -484,7 +484,7 @@ test-intel18-release:
artifacts: false
variables:
<<: *release_vars
MODULE_LOAD_SCRIPT: moduleLoadScripts/eve.intel18
MODULE_LOAD_SCRIPT: hpc-module-loads/eve.intel18
CMAKE_FLAGS: '-DCMAKE_BUILD_TYPE=Release'
<<: *test_template
......@@ -494,7 +494,7 @@ test-intel19-release:
artifacts: false
variables:
<<: *release_vars
MODULE_LOAD_SCRIPT: moduleLoadScripts/eve.intel19
MODULE_LOAD_SCRIPT: hpc-module-loads/eve.intel19
CMAKE_FLAGS: '-DCMAKE_BUILD_TYPE=Release'
<<: *test_template
......@@ -504,7 +504,7 @@ test-intel19MPI-release:
artifacts: false
variables:
<<: *release_vars
MODULE_LOAD_SCRIPT: moduleLoadScripts/eve.intel19MPI
MODULE_LOAD_SCRIPT: hpc-module-loads/eve.intel19MPI
CMAKE_FLAGS: '-DCMAKE_BUILD_TYPE=Release'
<<: *test_template
......@@ -518,7 +518,7 @@ coverage-gcc73:
variables:
<<: *debug_vars
<<: *coverage_vars
MODULE_LOAD_SCRIPT: moduleLoadScripts/eve.gfortran73MPI
MODULE_LOAD_SCRIPT: hpc-module-loads/eve.gfortran73MPI
CMAKE_FLAGS: '-DCMAKE_BUILD_TYPE=Debug -DCMAKE_WITH_COVERAGE=ON'
<<: *coverage_template
......
CMakeLists.txt
View file @ 01212e63
cmake_minimum_required(VERSION 3.14)
# check version file
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake-modules)
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake-modules)
# get version and date from files (version.txt and version_date.txt)
include(version)
get_version(MPR_VER MPR_VER_DEV MPR_DATE)
......@@ -45,17 +45,6 @@ set(EXECUTABLE_NAME "${CMAKE_PROJECT_NAME}_runner")
add_executable(${EXECUTABLE_NAME} ./src/main.f90)
target_link_libraries(${EXECUTABLE_NAME} PUBLIC mpr)
# ifort and gfortran need the flag -cpp to interpret definitions like -DMRM2MHM
# the nag compiler is not able to interpret the flag -cpp but can interpret these definitions anyway
# so we check whether the compiler is able to use the flag -cpp
# for that we need the module CheckFortranCompilerFlag
include(CheckFortranCompilerFlag)
CHECK_Fortran_COMPILER_FLAG("-cpp" CPP_FLAG)
# if the flag exists, we add it to the compilation flags
if (CPP_FLAG)
target_compile_options(${EXECUTABLE_NAME} PUBLIC "-cpp")
endif()
set_target_properties ( ${EXECUTABLE_NAME}
PROPERTIES
COMPILE_FLAGS "${CMAKE_Fortran_FLAGS}"
......
moduleLoadScripts/ces255m.gfortran81 deleted 100644 → 0
View file @ 863d09ec
export FC=gfortran
export PFUNIT_DIR="/usr/local/pfunit-4.0.0-gfortran/PFUNIT-4.1/cmake"
export "NETCDF_DIR=/usr/local/netcdf-fortran-4.5.3_gcc-9.3/bin"
moduleLoadScripts/ces255m.gfortran93 deleted 100644 → 0
View file @ 863d09ec
export FC=/usr/local/openmpi-4.0.3_gcc-9.3/bin/mpifort
export PFUNIT_DIR="/usr/local/pFUnit-4.0.0_openmpi-4.0.3_gcc-9.3/PFUNIT-4.1/cmake"
export NETCDF_DIR="/usr/local/netcdf-c-4.7.4_hdf5-1.10.6_openmpi-4.0.3_gcc-9.3"
export NETCDF_FORTRAN_DIR="/usr/local/netcdf-fortran-4.5.3_netcdf-c-4.7.4_hdf5-1.10.6_openmpi-4.0.3_gcc-9.3"
moduleLoadScripts/ces255m.nagfor70 deleted 100644 → 0
View file @ 863d09ec
export FC=nagfor
export PFUNIT_DIR="/usr/local/pFUnit-4.0.0_nagfor-7.0/PFUNIT-4.1/cmake"
export NETCDF_DIR="/usr/local/netcdf-fortran-4.4.4-nagfor/bin/"
moduleLoadScripts/eve.gfortran102 deleted 100644 → 0
View file @ 863d09ec
module purge
module load foss/2020b
module load netCDF-Fortran
module load CMake
module use /global/apps/modulefiles
module load python_env_mpr
module load pFUnit/4.2.0_foss2020b
export NETCDF_DIR="$EBROOTNETCDF"
export NETCDF_FORTRAN_DIR="$EBROOTNETCDFMINFORTRAN"
export FC=gfortran
moduleLoadScripts/eve.gfortran102MPI deleted 100644 → 0
View file @ 863d09ec
module purge
module load foss/2020b
module load netCDF-Fortran
module load CMake
module use /global/apps/modulefiles
module load python_env_mpr
module load pFUnit/4.2.0_foss2020b
export NETCDF_DIR="$EBROOTNETCDF"
export NETCDF_FORTRAN_DIR="$EBROOTNETCDFMINFORTRAN"
export FC=mpifort
moduleLoadScripts/eve.gfortran64MPI deleted 100644 → 0
View file @ 863d09ec
module purge
module load foss/2018a
module load netCDF-Fortran
module load CMake
module use /global/apps/modulefiles
module load python_env_mpr
export NETCDF_DIR="$EBROOTNETCDF"
export NETCDF_FORTRAN_DIR="$EBROOTNETCDFMINFORTRAN"
export FC=mpifort
moduleLoadScripts/eve.gfortran73MPI deleted 100644 → 0
View file @ 863d09ec
module purge
module load foss/2018b
module load netCDF-Fortran
module load CMake
module use /global/apps/modulefiles
module load python_env_mpr
module load pFUnit/4.2.0_foss2018b
export NETCDF_DIR="$EBROOTNETCDF"
export NETCDF_FORTRAN_DIR="$EBROOTNETCDFMINFORTRAN"
export FC=mpifort
moduleLoadScripts/eve.gfortran83 deleted 100644 → 0
View file @ 863d09ec
module purge
module load foss/2019b
module load netCDF-Fortran
module load CMake
module use /global/apps/modulefiles
module load python_env_mpr
module load pFUnit/4.0.0_foss_2019b
export NETCDF_DIR="$EBROOTNETCDF"
export NETCDF_FORTRAN_DIR="$EBROOTNETCDFMINFORTRAN"
export FC=gfortran
moduleLoadScripts/eve.gfortran83MPI deleted 100644 → 0
View file @ 863d09ec
module purge
module load foss/2019b
module load netCDF-Fortran
module load CMake
module use /global/apps/modulefiles
module load python_env_mpr
module load pFUnit/4.0.0_foss_2019b
export NETCDF_DIR="$EBROOTNETCDF"
export NETCDF_FORTRAN_DIR="$EBROOTNETCDFMINFORTRAN"
export FC=mpifort
moduleLoadScripts/eve.intel18 deleted 100644 → 0
View file @ 863d09ec
module purge
module load iomkl/2018b
module load netCDF-Fortran
module load CMake
module use /global/apps/modulefiles
module load python_env_mpr
module load pFUnit/4.2.0_ifort18.0.3
export NETCDF_DIR="$EBROOTNETCDF"
export NETCDF_FORTRAN_DIR="$EBROOTNETCDFMINFORTRAN"
export FC=ifort
moduleLoadScripts/eve.intel19 deleted 100644 → 0
View file @ 863d09ec
module purge
module load iomkl/2020a
module load netCDF-Fortran
module load CMake
module use /global/apps/modulefiles
module load python_env_mpr
module load pFUnit/4.2.0_ifort19.1.1.217
export NETCDF_DIR="$EBROOTNETCDF"
export NETCDF_FORTRAN_DIR="$EBROOTNETCDFMINFORTRAN"
export FC=ifort
moduleLoadScripts/eve.intel19MPI deleted 100644 → 0
View file @ 863d09ec
module purge
module load iomkl/2020a
module load netCDF-Fortran
module load CMake
module use /global/apps/modulefiles
module load python_env_mpr
module load pFUnit/4.2.0_ifort19.1.1.217
export NETCDF_DIR="$EBROOTNETCDF"
export NETCDF_FORTRAN_DIR="$EBROOTNETCDFMINFORTRAN"
export FC=mpifort
moduleLoadScripts/eve.nagfor62 deleted 100644 → 0
View file @ 863d09ec
module purge
module load NAGfor
module load netcdf-fortran/4.4.5-1
module load CMake
module use /global/apps/modulefiles
module load python_env_mpr
module load pFUnit/4.1.3_nagfor-6.2
export FC=nagfor
# the Eve guys did not set it properly, so we need to do that manually
# you also need to pass -DCMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX=64 to cmake as there are lib64 folders
export NETCDF_DIR="$EBROOTNETCDF"
export NETCDF_FORTRAN_DIR="/software/netcdf-fortran/4.4.5-1"
moduleLoadScripts/eve.pgi19 deleted 100644 → 0
View file @ 863d09ec
module purge
module load PGI/19.10-GCC-8.3.0-2.32
module load netcdf-fortran/4.5.2-PGI-19.10-GCC-8.3.0-2.32-1
module load CMake
module use /global/apps/modulefiles
module load python_env_mpr
export NETCDF_DIR="$EBROOTNETCDF"
export NETCDF_FORTRAN_DIR="/software/netcdf-fortran/4.5.2-PGI-19.10-GCC-8.3.0-2.32-1"
export FC=pgfortran
moduleLoadScripts/juwels.gfortranMPI deleted 100644 → 0
View file @ 863d09ec
# source ~/source_code/loadscripts/bashsetup
module purge
module load GCC ParaStationMPI
module load netCDF-Fortran/4.4.4
module load CMake
export FC=mpif90
moduleLoadScripts/juwels.intelMPI deleted 100644 → 0
View file @ 863d09ec
# source ~/source_code/loadscripts/bashsetup
module purge
module load Intel ParaStationMPI
module load netCDF-Fortran/4.4.5
module load CMake
export FC=mpif90
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment