Commit f5239253 authored by Keith Bennett's avatar Keith Bennett

Merge tag 'v1.5.13' into devel

Version v1.5.13

# gpg: Signature made Fri 28 Jul 12:35:09 2017 BST
# gpg:                using RSA key DB4F7D61DB1CE84F
# gpg: Good signature from "Keith Bennett <k.bennett@warwick.ac.uk>" [ultimate]
# gpg:                 aka "Keith Bennett <dr.keith.bennett@gmail.com>" [ultimate]
parents e1ce4a51 101e72be
Pipeline #2295 failed with stage
in 0 seconds
...@@ -39,7 +39,7 @@ D = -D ...@@ -39,7 +39,7 @@ D = -D
# PGI # PGI
# === # ===
ifeq ($(strip $(COMPILER)),pgi) ifeq ($(strip $(COMPILER)),pgi)
FFLAGS = -O2 -g -Mvect -Munroll FFLAGS = -O2 -Mvect -Munroll
ifeq ($(strip $(MODE)),debug) ifeq ($(strip $(MODE)),debug)
FFLAGS = -O0 -g -C -Ktrap=denorm -Mbounds -Mchkfpstk -Mdepchk -Mstandard FFLAGS = -O0 -g -C -Ktrap=denorm -Mbounds -Mchkfpstk -Mdepchk -Mstandard
endif endif
...@@ -126,7 +126,7 @@ endif ...@@ -126,7 +126,7 @@ endif
# g95 # g95
# ======== # ========
ifeq ($(strip $(COMPILER)),g95) ifeq ($(strip $(COMPILER)),g95)
FFLAGS = -O3 -g FFLAGS = -O3
ifeq (debug,$(findstring debug,$(MODE))) ifeq (debug,$(findstring debug,$(MODE)))
FFLAGS = -O0 -g -Wall -Wimplicit-none -ftrace=full -fbounds-check -fzero FFLAGS = -O0 -g -Wall -Wimplicit-none -ftrace=full -fbounds-check -fzero
endif endif
...@@ -141,7 +141,7 @@ endif ...@@ -141,7 +141,7 @@ endif
# IBM Bluegene # IBM Bluegene
# ============ # ============
ifeq ($(strip $(COMPILER)),ibm) ifeq ($(strip $(COMPILER)),ibm)
FFLAGS = -O5 -g -qhot -qipa # Optimised FFLAGS = -O5 -qhot -qipa # Optimised
ifeq ($(strip $(MODE)),debug) ifeq ($(strip $(MODE)),debug)
FFLAGS = -O0 -C -g -qfullpath -qinfo #-qkeepparm -qflttrap \ FFLAGS = -O0 -C -g -qfullpath -qinfo #-qkeepparm -qflttrap \
-qnosmp -qxflag=dvz -Q! -qnounwind -qnounroll # Debug -qnosmp -qxflag=dvz -Q! -qnounwind -qnounroll # Debug
...@@ -159,7 +159,7 @@ endif ...@@ -159,7 +159,7 @@ endif
# HECToR # HECToR
# ======== # ========
ifeq ($(strip $(COMPILER)),hector) ifeq ($(strip $(COMPILER)),hector)
FFLAGS = -O3 -g FFLAGS = -O3
ifeq ($(strip $(MODE)),debug) ifeq ($(strip $(MODE)),debug)
FFLAGS = -O0 -g -ea -ec -eC -eD -eI -en -hfp_trap -Ktrap=fp -m0 -M1438,7413 FFLAGS = -O0 -g -ea -ec -eC -eD -eI -en -hfp_trap -Ktrap=fp -m0 -M1438,7413
endif endif
......
Markdown is supported
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