Merge branch 'master.dev' into 'master'

Release 1.6.3

See merge request piclas/piclas!338

.gitignore

@@ -25,3 +25,7 @@ userguide.pdf
 developerguide.pdf
 *.pvsm
 core
+piclas
+*.out
+userblock.tmp
+*f90.orig

.gitlab-ci.yml

@@ -101,11 +101,13 @@ stages:
     expire_in: 1 day
     when: on_failure
     paths:
-      - build_gnu_poisson
+      - build_gnu_poisson_release
+      - build_gnu_poisson_debug
   cache:
     key: "${CI_COMMIT_REF_SLUG}-GNU-POI"
     paths:
-      - build_gnu_poisson
+      - build_gnu_poisson_release
+      - build_gnu_poisson_debug
     policy: pull
 
 .template: &defaults_intel_poisson
@@ -174,17 +176,23 @@ build_gnu_poisson:
     expire_in: 1 day
     when: on_failure
     paths:
-      - build_gnu_poisson
+      - build_gnu_poisson_release
+      - build_gnu_poisson_debug
   cache:
     key: "${CI_COMMIT_REF_SLUG}-GNU-POI"
     paths:
-      - build_gnu_poisson
+      - build_gnu_poisson_release
+      - build_gnu_poisson_debug
     policy: push
   stage: build
   script:
-    - mkdir -p build_gnu_poisson ; cd build_gnu_poisson
+    - mkdir -p build_gnu_poisson_release ; cd build_gnu_poisson_release
     - git clone [email protected]:reggie2.0/reggie2.0.git reggie
-    - cmake .. -DPICLAS_EQNSYSNAME=poisson -DPICLAS_TIMEDISCMETHOD=RK3 -DPICLAS_BUILD_HDF5=OFF ; make -j all
+    - cmake .. -DCMAKE_BUILD_TYPE=Release -DPICLAS_EQNSYSNAME=poisson -DPICLAS_TIMEDISCMETHOD=RK3 -DPICLAS_BUILD_HDF5=OFF ; make -j all
+    - cd ..
+    - mkdir -p build_gnu_poisson_debug ; cd build_gnu_poisson_debug
+    - git clone [email protected]:reggie2.0/reggie2.0.git reggie
+    - cmake .. -DCMAKE_BUILD_TYPE=Debug -DPICLAS_EQNSYSNAME=poisson -DPICLAS_TIMEDISCMETHOD=RK3 -DPICLAS_BUILD_HDF5=OFF ; make -j all
 
 # ----------------------------------------------------------------------------------------------------------------------------------------------------
 # Stage "reggie_checkin": Run most simple reggie with previous builds on check-in
@@ -211,7 +219,8 @@ gnu_poisson:
   tags:
     - withmodules-concurrent
   script:
-    - cd build_gnu_poisson ; python ./reggie/reggie.py ../regressioncheck/checks/CHE_poisson/poisson -e ./bin/piclas
+    - cd build_gnu_poisson_release ; python ./reggie/reggie.py ../regressioncheck/checks/CHE_poisson/poisson -e ./bin/piclas
+    - cd ../build_gnu_poisson_debug ; python ./reggie/reggie.py ../regressioncheck/checks/CHE_poisson/poisson -e ./bin/piclas
 
 # ----------------------------------------------------------------------------------------------------------------------------------------------------
 # Stage "reggie_feature_checkin": Run most simple reggie features with previous builds on check-in (must be very fast)

CMakeLists.txt

@@ -628,13 +628,15 @@ function(add_exec target)
   ADD_CUSTOM_COMMAND(TARGET ${target} POST_BUILD COMMAND ${CMAKE_COMMAND} -E cmake_echo_color --cyan "SUCCESS: ${TARGETUP} BUILD COMPLETE!")
 endfunction()
 
-FUNCTION(add_lib target)
+FUNCTION(add_lib_shared target)
   ADD_LIBRARY(${target} SHARED ${ARGN})
   TARGET_LINK_LIBRARIES(${target} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/userblock.o libpiclasstatic userblocklib stacksizelib ${linkedlibs})
   SET_TARGET_PROPERTIES(${target} PROPERTIES PREFIX ""
                                              COMPILE_FLAGS ${PICLAS_COMPILE_FLAGS}
                                              LINKER_LANGUAGE Fortran)
-  INSTALL(PROGRAMS ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${target} DESTINATION bin)
+  INSTALL(TARGETS ${target} LIBRARY PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
+                                                GROUP_READ GROUP_EXECUTE
+                                                WORLD_READ WORLD_EXECUTE)
   STRING(TOUPPER ${target} TARGETUP)
   ADD_CUSTOM_COMMAND(TARGET ${target} POST_BUILD COMMAND ${CMAKE_COMMAND} -E cmake_echo_color --cyan "SUCCESS: ${TARGETUP} BUILD COMPLETE!")
 ENDFUNCTION()
@@ -767,7 +769,7 @@ SET_TARGET_PROPERTIES(stacksizelib PROPERTIES LINKER_LANGUAGE C
 
 
 # we link the statically built libs
-add_lib(libpiclasshared ./src/piclaslib.f90)
+add_lib_shared(libpiclasshared ./src/piclaslib.f90)
 SET_TARGET_PROPERTIES(libpiclasshared PROPERTIES OUTPUT_NAME "libpiclas")
 ADD_DEPENDENCIES(libpiclasshared libpiclasstatic userblocklib stacksizelib ${INTERNALLIBS})
 add_exec(piclas ./src/piclas.f90)
@@ -822,7 +824,6 @@ ADD_CUSTOM_COMMAND(TARGET piclas     POST_BUILD COMMAND echo \"alias piclas='${C
 # Install
 # =========================================================================
 INSTALL(FILES    ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/configuration.cmake ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/userblock.txt DESTINATION bin)
-
 # =========================================================================
 # Ctags
 # =========================================================================
@@ -833,6 +834,12 @@ IF(PICLAS_CTAGS)
   FOREACH(item ${EQNS_WO_ACTUAL})
      SET(EXLUDES "--exclude=src/equations/${item}/*" ${EXLUDES})
   ENDFOREACH()
+  MESSAGE(STATUS "Ctags excluding: ${EXLUDES}")
+  # ctags options:
+  # -R   Equivalent to --recurse.
+  # -f <name>
+  #    Write tags to specified file. Value of "-" writes tags to stdout
+  #    ["tags"; or "TAGS" when -e supplied].
   ADD_CUSTOM_COMMAND(OUTPUT ctags.txt COMMAND cd ${CMAKE_CURRENT_SOURCE_DIR} && ctags -R -f ctags.txt ${EXLUDES} src)
   ADD_CUSTOM_TARGET(tags DEPENDS ctags.txt)
   FIND_PROGRAM(CTAGS_PATH ctags)