Skip to content

Commit

Permalink
Merge branch 'master.dev' into 'master'
Browse files Browse the repository at this point in the history
Release 2.8.0

See merge request piclas/piclas!661
  • Loading branch information
pnizenkov committed Oct 15, 2022
2 parents a582f47 + 8ed3470 commit a20e175
Show file tree
Hide file tree
Showing 454 changed files with 14,716 additions and 8,060 deletions.
2 changes: 1 addition & 1 deletion .githooks/pre-commit
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#==================================================================================================================================
# Copyright (c) 2010 - 2022 Prof. Claus-Dieter Munz and Prof. Stefanos Fasoulas
#
# This file is part of PICLas (gitlab.com/piclas/piclas). PICLas is free software: you can redistribute it and/or modify
# This file is part of PICLas (piclas.boltzplatz.eu/piclas/piclas). PICLas is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3
# of the License, or (at your option) any later version.
#
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -77,3 +77,6 @@ CMakeFiles/

# doxygen build folder
doxygen/

# unit test
unitTests/bin/
47 changes: 37 additions & 10 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ build:
stage: build
script:
- mkdir -p build ; cd build
- git clone git@gitlab.com:reggie2.0/reggie2.0.git reggie
- git clone git@piclas.boltzplatz.eu:reggie2.0/reggie2.0.git reggie
#- cmake .. -DLIBS_BUILD_HDF5=OFF -DPICLAS_BUILD_POSTI=ON -DPOSTI_BUILD_SUPERB=ON -DPICLAS_READIN_CONSTANTS=ON ; $GENERATOR -j all
- cmake -GNinja .. -DLIBS_BUILD_HDF5=OFF -DPICLAS_BUILD_POSTI=ON -DPOSTI_BUILD_SUPERB=ON -DPICLAS_READIN_CONSTANTS=ON ; ninja -j0 all

Expand All @@ -207,7 +207,7 @@ build_maxwell:
stage: build
script:
- mkdir -p build_maxwell ; cd build_maxwell
- git clone git@gitlab.com:reggie2.0/reggie2.0.git reggie
- git clone git@piclas.boltzplatz.eu:reggie2.0/reggie2.0.git reggie
- cmake .. -DPICLAS_DEBUG_MEMORY=ON -DPICLAS_PARTICLES=OFF -DLIBS_BUILD_HDF5=OFF -DPICLAS_READIN_CONSTANTS=ON ; $GENERATOR -j $NCORES all

build_poisson:
Expand All @@ -229,11 +229,11 @@ build_poisson:
stage: build
script:
- mkdir -p build_poisson_release ; cd build_poisson_release
- git clone git@gitlab.com:reggie2.0/reggie2.0.git reggie
- git clone git@piclas.boltzplatz.eu:reggie2.0/reggie2.0.git reggie
- cmake .. -DCMAKE_BUILD_TYPE=Release -DPICLAS_EQNSYSNAME=poisson -DPICLAS_CODE_ANALYZE=ON -DPICLAS_TIMEDISCMETHOD=RK3 -DLIBS_BUILD_HDF5=OFF ; $GENERATOR -j $NCORES all
- cd ..
- mkdir -p build_poisson_debug ; cd build_poisson_debug
- git clone [email protected]:reggie2.0/reggie2.0.git reggie
- cp -r ../build_poisson_release/reggie .
- cmake .. -DCMAKE_BUILD_TYPE=Debug -DPICLAS_EQNSYSNAME=poisson -DPICLAS_CODE_ANALYZE=ON -DPICLAS_TIMEDISCMETHOD=RK3 -DLIBS_BUILD_HDF5=OFF ; $GENERATOR -j $NCORES all

build_hopr:
Expand All @@ -252,6 +252,38 @@ build_hopr:
rules:
- if: '$DO_WEEKLY'

build_no_git:
tags:
- withmodules-concurrent
stage: build
script:
- echo " Installing branch $CI_COMMIT_REF_NAME without git"
- git clone --depth=1 --branch=$CI_COMMIT_REF_NAME [email protected]:piclas/piclas.git piclas-no-git
- rm -rf piclas-no-git/.git* ; cd piclas-no-git ; ls -la
- mkdir build_ ; cd build_ ;
- cmake .. -DLIBS_BUILD_HDF5=OFF
- $GENERATOR -j $NCORES all
rules:
- if: '$DO_WEEKLY'

build_no_git_libs:
tags:
- withmodules-concurrent
stage: build
script:
- echo " Installing branch $CI_COMMIT_REF_NAME without git but with external libs"
- git clone --depth=1 --branch=$CI_COMMIT_REF_NAME [email protected]:piclas/piclas.git piclas-no-git-but-libs
- rm -rf piclas-no-git-but-libs/.git* ; cd piclas-no-git-but-libs ; ls -la
- mkdir build_ ; cd build_
- cmake .. -DLIBS_BUILD_HDF5=ON -DLIBS_BUILD_MATH_LIB=ON -DLIBS_BUILD_MATH_LIB_VENDOR=OpenBLAS
- echo " Compiling with -DLIBS_BUILD_HDF5=ON -DLIBS_BUILD_MATH_LIB=ON -DLIBS_BUILD_MATH_LIB_VENDOR=OpenBLAS ..."
- $GENERATOR -j $NCORES all &> output.txt
- tail -n 20 output.txt
- rm output.txt
- ls bin/piclas
rules:
- if: '$DO_WEEKLY'

# ----------------------------------------------------------------------------------------------------------------------------------------------------
# Stage "reggie_checkin": Run most simple reggie with previous builds on check-in
# ----------------------------------------------------------------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -641,12 +673,7 @@ github:
script:
- if [ -z "${DO_DEPLOY}" ]; then exit ; fi
- rm -rf piclas_github || true ;
- git clone -b master --single-branch git@gitlab.com:piclas/piclas.git piclas_github ;
- git clone -b master --single-branch git@piclas.boltzplatz.eu:piclas/piclas.git piclas_github ;
- cd piclas_github ;
## - git checkout --orphan orphan_branch v1.0.0 ; # tag v1.0.0 points to f754d8e1e207cb959a81bfb9013bc0f12476c62b
## - git commit -m 'truncated history before v1.0.0' ;
## - git rebase --onto orphan_branch v1.0.0 master ;
## - git branch -D orphan_branch ;
- git remote add piclas-framework [email protected]:piclas-framework/piclas.git ;
- git push --force --follow-tags piclas-framework master ;
# - git push --mirror [email protected]:iagcopple/piclas-framework.git ; cd ../
13 changes: 12 additions & 1 deletion .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,23 @@

version: 2

# Set the version of Python and other tools you might need
build:
os: ubuntu-22.04
tools:
python: "3.10"
jobs:
pre_create_environment:
- echo "Command run at 'pre_create_environment' step"
post_build:
- echo "Command run at 'post_build' step"
- echo `date`

sphinx:
builder: html
configuration: docs/documentation/conf.py

python:
version: 3.7
install:
- requirements: docs/documentation/requirements.txt

Expand Down
12 changes: 9 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ ENDIF()
# =========================================================================
# Git configuration
# =========================================================================
IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git)
# Setup git hooks
SET(PRECOMMIT_FILE ".githooks/pre-commit")
# Check if the pre-commit hooks exits
Expand All @@ -41,6 +42,9 @@ IF (DEFINED HOOKSPATH AND NOT "${HOOKSPATH}" STREQUAL "" AND NOT "${HOOKSPATH}"
# MESSAGE (STATUS "${ESCAPE}[34mCustom hooks path detected. Please ensure to call ${PRECOMMIT_FILE} manually.${ESCAPE}[0m")
MESSAGE (WARNING "Custom git hooks path detected. Please ensure to call ${PRECOMMIT_FILE} manually.")
ENDIF()
ELSE()
MESSAGE(STATUS "git not found")
ENDIF()

# =========================================================================
# Project definition
Expand Down Expand Up @@ -110,11 +114,13 @@ PROJECT(PICLas)
# =========================================================================
# Store the current commit information
# =========================================================================
EXECUTE_PROCESS(COMMAND git rev-parse HEAD OUTPUT_VARIABLE GIT_COMMIT OUTPUT_STRIP_TRAILING_WHITESPACE)
SET(commit ${CMAKE_CURRENT_SOURCE_DIR}/src/commit.h)
MESSAGE(STATUS "Current git commit ${GIT_COMMIT} will be written to ${commit}")
FILE(WRITE ${commit} "! Define the current commit hash. The default must remain empty, i.e., ''. Do not commit the changed file!\n#define GIT_CURRENT_COMMIT ''\n")
EXECUTE_PROCESS(COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/tools/cmake/setCommitHash.sh ${commit})
IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git)
EXECUTE_PROCESS(COMMAND git rev-parse HEAD OUTPUT_VARIABLE GIT_COMMIT OUTPUT_STRIP_TRAILING_WHITESPACE)
MESSAGE(STATUS "Current git commit ${GIT_COMMIT} will be written to ${commit}")
EXECUTE_PROCESS(COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/tools/cmake/setCommitHash.sh ${commit})
ENDIF()

# =========================================================================
# Check IPO support:
Expand Down
47 changes: 34 additions & 13 deletions CMakeListsLib.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,23 +14,26 @@ MARK_AS_ADVANCED(FORCE LIBS_EXTERNAL_LIB_DIR)
# =========================================================================
# Check where the code originates
# =========================================================================
EXECUTE_PROCESS(COMMAND git ls-remote --get-url OUTPUT_VARIABLE GIT_ORIGIN)
IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git)
EXECUTE_PROCESS(COMMAND git ls-remote --get-url OUTPUT_VARIABLE GIT_ORIGIN)

# Strip lead and trailing white space
string(STRIP ${GIT_ORIGIN} GIT_ORIGIN)
# Strip lead and trailing white space
string(STRIP ${GIT_ORIGIN} GIT_ORIGIN)

# Origin pointing to gitlab?
MESSAGE(STATUS "Checking git origin: " ${GIT_ORIGIN})
IF("${GIT_ORIGIN}" MATCHES "gitlab.com")
# Origin pointing to gitlab?
MESSAGE(STATUS "Checking git origin: " ${GIT_ORIGIN})
ENDIF()

IF("${GIT_ORIGIN}" MATCHES "piclas.boltzplatz.eu")
# Checked out using SSH
IF("${GIT_ORIGIN}" MATCHES "^git@")
SET(LIBS_DLPATH "git@gitlab.com:piclas/")
SET(LIBS_DLPATH "git@piclas.boltzplatz.eu:piclas/")
# Checked out using HTTPS
# IF("${GIT_ORIGIN}" MATCHES "^https@")
ELSEIF("${GIT_ORIGIN}" MATCHES "^ssh:")
SET(LIBS_DLPATH "git@gitlab.com:piclas/")
SET(LIBS_DLPATH "git@piclas.boltzplatz.eu:piclas/")
ELSE()
SET(LIBS_DLPATH "https://gitlab.com/piclas/")
SET(LIBS_DLPATH "https://piclas.boltzplatz.eu/piclas/")
ENDIF()
ELSE()
# Select each lib separately
Expand Down Expand Up @@ -141,12 +144,18 @@ IF(NOT LIBS_BUILD_HDF5)
# Build HDF5 in PICLas
ELSE()
# Origin pointing to Github
IF("${GIT_ORIGIN}" MATCHES ".github.com")
IF("${GIT_ORIGIN}" STREQUAL "")
# Use https://github.com/HDFGroup/hdf5.git when using piclas without git
SET (HDF5DOWNLOAD "https://github.com/HDFGroup/hdf5.git")
ELSEIF("${GIT_ORIGIN}" MATCHES ".github.com")
# Use https://github.com/HDFGroup/hdf5.git when using piclas from github.com
SET (HDF5DOWNLOAD "https://github.com/HDFGroup/hdf5.git")
ELSE()
IF("${GIT_ORIGIN}" MATCHES "https://gitlab-ci-token")
# Use https://piclas.boltzplatz.eu/piclas/hdf5.git when gitlab runner needs to download libs
STRING(REGEX REPLACE "/piclas.git" "/hdf5.git" HDF5DOWNLOAD ${GIT_ORIGIN})
ELSE()
# Use https://piclas.boltzplatz.eu/piclas/hdf5.git when using piclas from piclas.boltzplatz.eu
SET (HDF5DOWNLOAD ${LIBS_DLPATH}hdf5.git )
ENDIF()
ENDIF()
Expand Down Expand Up @@ -286,7 +295,7 @@ IF(NOT LIBS_BUILD_MATH_LIB)
ENDIF()

# Use Lapack/Blas for GNU
FIND_PACKAGE(LAPACK QUIET)
FIND_PACKAGE(LAPACK REQUIRED)
IF (LAPACK_FOUND)
LIST(APPEND linkedlibs ${LAPACK_LIBRARIES})
MESSAGE(STATUS "Compiling with system [BLAS/Lapack]")
Expand All @@ -307,12 +316,18 @@ ELSE()
# Build LAPACK
IF (LIBS_BUILD_MATH_LIB_VENDOR MATCHES "LAPACK")
# Origin pointing to Github
IF("${GIT_ORIGIN}" MATCHES ".github.com")
IF("${GIT_ORIGIN}" STREQUAL "")
# Use https://github.com/Reference-LAPACK/lapack.git when using piclas without git
SET (MATHLIB_DOWNLOAD "https://github.com/Reference-LAPACK/lapack.git")
ELSEIF("${GIT_ORIGIN}" MATCHES ".github.com")
# Use https://github.com/Reference-LAPACK/lapack.git when using piclas from github.com
SET (MATHLIB_DOWNLOAD "https://github.com/Reference-LAPACK/lapack.git")
ELSE()
IF("${GIT_ORIGIN}" MATCHES "https://gitlab-ci-token")
# Use https://piclas.boltzplatz.eu/piclas/lapack.git when gitlab runner needs to download libs
STRING(REGEX REPLACE "/piclas.git" "/lapack.git" MATHLIB_DOWNLOAD ${GIT_ORIGIN})
ELSE()
# Use https://piclas.boltzplatz.eu/piclas/lapack.git when using piclas from piclas.boltzplatz.eu
SET (MATHLIB_DOWNLOAD ${LIBS_DLPATH}lapack.git )
ENDIF()
ENDIF()
Expand All @@ -323,12 +338,18 @@ ELSE()
MARK_AS_ADVANCED(FORCE MATH_LIB_TAG)
# Build OpenBLAS
ELSEIF (LIBS_BUILD_MATH_LIB_VENDOR MATCHES "OpenBLAS")
IF("${GIT_ORIGIN}" MATCHES ".github.com")
IF("${GIT_ORIGIN}" STREQUAL "")
# Use https://github.com/xianyi/OpenBLAS when using piclas without git
SET (MATHLIB_DOWNLOAD "https://github.com/xianyi/OpenBLAS.git")
ELSEIF("${GIT_ORIGIN}" MATCHES ".github.com")
# Use https://github.com/xianyi/OpenBLAS when using piclas from github.com
SET (MATHLIB_DOWNLOAD "https://github.com/xianyi/OpenBLAS.git")
ELSE()
IF("${GIT_ORIGIN}" MATCHES "https://gitlab-ci-token")
# Use https://piclas.boltzplatz.eu/piclas/OpenBLAS.git when gitlab runner needs to download libs
STRING(REGEX REPLACE "/piclas.git" "/OpenBLAS.git" MATHLIB_DOWNLOAD ${GIT_ORIGIN})
ELSE()
# Use https://piclas.boltzplatz.eu/piclas/OpenBLAS.git when using piclas from piclas.boltzplatz.eu
SET (MATHLIB_DOWNLOAD ${LIBS_DLPATH}OpenBLAS.git )
ENDIF()
ENDIF()
Expand Down
49 changes: 37 additions & 12 deletions CMakeListsMachine.txt
Original file line number Diff line number Diff line change
Expand Up @@ -90,12 +90,11 @@ INCLUDE(GNUInstallDirs)
IF ("${CMAKE_HOSTNAME}" MATCHES "login")
MARK_AS_ADVANCED(FORCE C_PATH CXX_PATH Fortran_PATH)

# HAWK and SuperMUC name their login nodes identically, so use OS distribution to identify
FIND_PROGRAM(LSB_RELEASE_EXEC lsb_release)
EXECUTE_PROCESS(COMMAND ${LSB_RELEASE_EXEC} -is OUTPUT_VARIABLE LSB_RELEASE_ID_SHORT OUTPUT_STRIP_TRAILING_WHITESPACE)
MARK_AS_ADVANCED(FORCE LSB_RELEASE_EXEC)
# HAWK and SuperMUC name their login nodes identically, so use the Fully Qualified Domain Name (FQDN) to identify
CMAKE_HOST_SYSTEM_INFORMATION(RESULT FQDN QUERY FQDN)
MARK_AS_ADVANCED(FORCE FQDN)
# HLRS HAWK
IF (LSB_RELEASE_ID_SHORT MATCHES "CentOS")
IF (FQDN MATCHES "hawk.hww.hlrs.de")
MESSAGE(STATUS "Compiling on Hawk")
# Overwrite compiler target architecture
IF (CMAKE_Fortran_COMPILER_ID MATCHES "GNU" OR CMAKE_Fortran_COMPILER_ID MATCHES "Flang")
Expand All @@ -106,7 +105,7 @@ IF ("${CMAKE_HOSTNAME}" MATCHES "login")
# Use AMD Optimized Lapack/BLAS
# SET(BLA_VENDOR "FLAME")
# SuperMUC
ELSEIF (LSB_RELEASE_ID_SHORT MATCHES "SUSE")
ELSEIF (FQDN MATCHES "sng.lrz.de")
MESSAGE(STATUS "Compiling on SuperMUC")
# Overwrite compiler target architecture
IF (CMAKE_Fortran_COMPILER_ID MATCHES "GNU" OR CMAKE_Fortran_COMPILER_ID MATCHES "Flang")
Expand Down Expand Up @@ -163,6 +162,32 @@ ELSE()
ENDIF()
ENDIF()

# =========================================================================
# CHECK SUPPORT FOR VARIOUS FORTRAN (2003,2008) FEATURES
# =========================================================================
INCLUDE(CheckFortranSourceCompiles)
CHECK_FORTRAN_SOURCE_COMPILES(
"MODULE F03MOD
IMPLICIT NONE
PRIVATE
CONTAINS
! Check for MOVE_ALLOC feature
SUBROUTINE F03_MOVE_ALLOC()
REAL,ALLOCATABLE::a(:,:),b(:,:)
ALLOCATE(a(3,3))
CALL MOVE_ALLOC(a,b)
END SUBROUTINE F03_MOVE_ALLOC
END MODULE F03MOD

PROGRAM F03PROG
END"
Fortran2003Check
SRC_EXT F90)

IF(NOT Fortran2003Check)
MESSAGE(FATAL_ERROR "Failed to compile basic Fortran2003 programm! Please ensure your compiler is up-to-date!")
ENDIF()

MESSAGE(STATUS "Compiling with [${CMAKE_Fortran_COMPILER_ID}] (v${CMAKE_Fortran_COMPILER_VERSION}) fortran compiler using [${PICLAS_INSTRUCTION}] instruction")

# =========================================================================
Expand All @@ -177,16 +202,16 @@ IF (CMAKE_Fortran_COMPILER_ID MATCHES "GNU")
# set Flags (disable lto type warnings due to false positives with MATMUL, which is a known bug)
IF (NOT DEFINED C_FLAGS_INITIALIZED )
SET (C_FLAGS_INITIALIZED "yes" CACHE INTERNAL "Flag if compiler flags are already initialized" )
SET (CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fdefault-real-8 -fdefault-double-8 -fbackslash -ffree-line-length-0 -finit-real=snan -finit-integer=snan -Wno-lto-type-mismatch -DGNU")
SET (CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fdefault-real-8 -fdefault-double-8 -fbackslash -ffree-line-length-0 -finit-real=snan -finit-integer=snan -Wno-lto-type-mismatch -lstdc++ -DGNU")
IF(PICLAS_EXTRAE)
SET (CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -finstrument-functions")
SET (CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -finstrument-functions")
ENDIF(PICLAS_EXTRAE)
ENDIF()
SET (CMAKE_Fortran_FLAGS_NITRO "${CMAKE_Fortran_FLAGS} -Ofast ${PICLAS_INSTRUCTION}")
SET (CMAKE_Fortran_FLAGS_RELEASE "${CMAKE_Fortran_FLAGS} -O3 ${PICLAS_INSTRUCTION} -fstack-arrays")
SET (CMAKE_Fortran_FLAGS_PROFILE "${CMAKE_Fortran_FLAGS} -pg -O3 ${PICLAS_INSTRUCTION} -fstack-arrays")
SET (CMAKE_Fortran_FLAGS_DEBUG "${CMAKE_Fortran_FLAGS} -g -Og -ggdb3 -ffpe-trap=invalid -fbounds-check -fbacktrace -Wall")
SET (CMAKE_Fortran_FLAGS_SANITIZE "${CMAKE_Fortran_FLAGS} -g -Og -ggdb3 -ffpe-trap=invalid,zero,overflow,denorm -fbounds-check -fbacktrace -Wall -fsanitize=address,undefined,leak -fno-omit-frame-pointer -Wc-binding-type -Wuninitialized -pedantic")
SET (CMAKE_Fortran_FLAGS_SANITIZE "${CMAKE_Fortran_FLAGS} -g -Og -ggdb3 -ffpe-trap=invalid,zero,overflow,denorm -fbounds-check -fbacktrace -Wall -fsanitize=address,undefined,leak -fno-omit-frame-pointer -Wc-binding-type -Wuninitialized -pedantic")
# Compile flags depend on the generator
IF(NOT "${CMAKE_GENERATOR}" MATCHES "Ninja")
# add flags only for compiling not linking!
Expand All @@ -200,7 +225,7 @@ ELSEIF (CMAKE_Fortran_COMPILER_ID MATCHES "Flang")
# set Flags
IF (NOT DEFINED C_FLAGS_INITIALIZED )
SET (C_FLAGS_INITIALIZED "yes" CACHE INTERNAL "Flag if compiler flags are already initialized" )
SET (CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fdefault-real-8 -std=f2008 -DFLANG")
SET (CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fdefault-real-8 -std=f2008 -lstdc++ -DFLANG")
ENDIF()
SET (CMAKE_Fortran_FLAGS_RELEASE "${CMAKE_Fortran_FLAGS} -O3 ${PICLAS_INSTRUCTION} -finline-functions ")
SET (CMAKE_Fortran_FLAGS_PROFILE "${CMAKE_Fortran_FLAGS} -pg -O3 ${PICLAS_INSTRUCTION} -finline-functions ")
Expand All @@ -218,7 +243,7 @@ ELSEIF (CMAKE_Fortran_COMPILER_ID MATCHES "Intel")
# set Flags
IF (NOT DEFINED C_FLAGS_INITIALIZED )
SET (C_FLAGS_INITIALIZED "yes" CACHE INTERNAL "Flag if compiler flags are already initialized" )
SET (CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -r8 -i4 -traceback -warn all -shared-intel -DINTEL")
SET (CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -r8 -i4 -traceback -warn all -shared-intel -lstdc++ -DINTEL")
ENDIF()
SET (CMAKE_Fortran_FLAGS_RELEASE "${CMAKE_Fortran_FLAGS} -O3 ${PICLAS_INSTRUCTION} -qopt-report0 -qopt-report-phase=vec -no-prec-div")
SET (CMAKE_Fortran_FLAGS_PROFILE "${CMAKE_Fortran_FLAGS} -p -O3 ${PICLAS_INSTRUCTION} -qopt-report0 -qopt-report-phase=vec -no-prec-div")
Expand All @@ -236,7 +261,7 @@ ELSEIF (CMAKE_Fortran_COMPILER_ID MATCHES "Cray")
# set Flags
IF (NOT DEFINED C_FLAGS_INITIALIZED )
SET (C_FLAGS_INITIALIZED "yes" CACHE INTERNAL "Flag if compiler flags are already initialized" )
SET (CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -f free -s real64 -em -DCRAY")
SET (CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -f free -s real64 -em -lstdc++ -DCRAY")
ENDIF()
SET (CMAKE_Fortran_FLAGS_RELEASE "${CMAKE_Fortran_FLAGS} -O2 -hfp3 -p . -rm")
SET (CMAKE_Fortran_FLAGS_PROFILE "${CMAKE_Fortran_FLAGS} -O2 -hfp3 -h profile_generate -p . -rm")
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ support the project by citing our publications given in [REFERENCE.md](REFERENCE
## Documentation and Installation

The documentation of PICLas can be found in the [User Guide](https://piclas.readthedocs.io/), where the installation procedure is
described in [Chapter 2](https://piclas.readthedocs.io/en/latest/installation.html).
described in [Chapter 2](https://piclas.readthedocs.io/en/latest/userguide/installation.html).

## Regression Testing

Expand Down
Loading

0 comments on commit a20e175

Please sign in to comment.