Merge pull request #290 from EinsteinToolkit/eschnett/harden

CI: Harden executables
EinsteinToolkit · Jun 9, 2024 · a6de8f2 · a6de8f2
2 parents 66d358d + 95263da
commit a6de8f2
Show file tree

Hide file tree

Showing 24 changed files with 184 additions and 76 deletions.
diff --git a/CarpetX/src/driver.cxx b/CarpetX/src/driver.cxx
@@ -1405,10 +1405,10 @@ GHExt::PatchData::LevelData::GroupData::GroupData(
     robin_values.resize(numvars, 0);
 
   amrex::BCRec bcrec;
-  for (int d = 0; d < dim; ++d) {
-    for (int f = 0; f < dim; ++f) {
+  for (int f = 0; f < 2; ++f) {
+    for (int d = 0; d < dim; ++d) {
       const auto bc =
-          ghext->patchdata.at(patch).symmetries[d][f] == symmetry_t::periodic
+          ghext->patchdata.at(patch).symmetries[f][d] == symmetry_t::periodic
               ? amrex::BCType::int_dir
               : amrex::BCType::ext_dir;
       if (f == 0)

diff --git a/TestODESolvers2/schedule.ccl b/TestODESolvers2/schedule.ccl
@@ -7,26 +7,28 @@ STORAGE: state rhs error order
 SCHEDULE TestODESolvers2_Initial AT initial
 {
   LANG: C
-  WRITES: state(everywhere)
+  WRITES: state(interior)
+  SYNC: state
 } "Initialize state vector"
 
 SCHEDULE TestODESolvers2_RHS IN ODESolvers_RHS
 {
   LANG: C
-  READS: state(everywhere)
-  WRITES: rhs(everywhere)
+  READS: state(interior)
+  WRITES: rhs(interior)
 } "RHS function"
 
-# SCHEDULE TestODESolvers2_Boundary AT poststep
-# {
-#   LANG: C
-#   OPTIONS: global
-#   SYNC: state
-# } "Apply boundary conditions to state vector"
+SCHEDULE TestODESolvers2_Boundary IN ODESolvers_PostStep
+{
+  LANG: C
+  OPTIONS: global
+  SYNC: state
+} "Apply boundary conditions to state vector"
 
 SCHEDULE TestODESolvers2_Error AT analysis
 {
   LANG: C
-  READS: state(everywhere)
-  WRITES: error(everywhere) order(everywhere)
+  READS: state(interior)
+  WRITES: error(interior) order(interior)
+  SYNC: error order
 } "Calculate error in state vector"
diff --git a/TestODESolvers2/src/odes.cxx b/TestODESolvers2/src/odes.cxx
@@ -38,20 +38,20 @@ extern "C" void TestODESolvers2_Initial(CCTK_ARGUMENTS) {
   const Loop::GF3D<CCTK_REAL, 1, 1, 1> exp1_(cctkGH, exp1);
   const Loop::GF3D<CCTK_REAL, 1, 1, 1> exp2_(cctkGH, exp2);
 
-  Loop::loop_all<1, 1, 1>(cctkGH, [&](const Loop::PointDesc &p) {
+  Loop::loop_int<1, 1, 1>(cctkGH, [&](const Loop::PointDesc &p) {
     time_(p.I) = cctk_time;
     poly_(p.I) = pow(1 + cctk_time, porder);
     exp1_(p.I) = exp(cctk_time);
     exp2_(p.I) = exp(cctk_time / 2);
   });
 }
 
-// extern "C" void TestODESolvers2_Boundary(CCTK_ARGUMENTS) {
-//   DECLARE_CCTK_ARGUMENTS_TestODESolvers2_Boundary;
-//   DECLARE_CCTK_PARAMETERS;
-//
-//   // do nothing
-// }
+extern "C" void TestODESolvers2_Boundary(CCTK_ARGUMENTS) {
+  DECLARE_CCTK_ARGUMENTS_TestODESolvers2_Boundary;
+  DECLARE_CCTK_PARAMETERS;
+
+  // do nothing
+}
 
 extern "C" void TestODESolvers2_RHS(CCTK_ARGUMENTS) {
   DECLARE_CCTK_ARGUMENTS_TestODESolvers2_RHS;
@@ -66,7 +66,7 @@ extern "C" void TestODESolvers2_RHS(CCTK_ARGUMENTS) {
   const Loop::GF3D<CCTK_REAL, 1, 1, 1> exp1_rhs_(cctkGH, exp1_rhs);
   const Loop::GF3D<CCTK_REAL, 1, 1, 1> exp2_rhs_(cctkGH, exp2_rhs);
 
-  Loop::loop_all<1, 1, 1>(cctkGH, [&](const Loop::PointDesc &p) {
+  Loop::loop_int<1, 1, 1>(cctkGH, [&](const Loop::PointDesc &p) {
     if (porder > 0)
       if (abs(time_(p.I) - cctk_time) >
           10 * numeric_limits<CCTK_REAL>::epsilon())
@@ -92,7 +92,7 @@ extern "C" void TestODESolvers2_Error(CCTK_ARGUMENTS) {
   const Loop::GF3D<CCTK_REAL, 1, 1, 1> poly_err_(cctkGH, poly_err);
   const Loop::GF3D<CCTK_REAL, 1, 1, 1> exp_order_(cctkGH, exp_order);
 
-  Loop::loop_all<1, 1, 1>(cctkGH, [&](const Loop::PointDesc &p) {
+  Loop::loop_int<1, 1, 1>(cctkGH, [&](const Loop::PointDesc &p) {
     time_err_(p.I) = time_(p.I) - cctk_time;
     poly_err_(p.I) = poly_(p.I) - pow(1 + cctk_time, porder);
     if (cctk_iteration == 0) {

diff --git a/TestODESolvers2/test/test-constant.par b/TestODESolvers2/test/test-constant.par
@@ -24,6 +24,13 @@ CarpetX::blocking_factor_z = 1
 
 CarpetX::ghost_size = 0
 
+CarpetX::boundary_x = "dirichlet"
+CarpetX::boundary_y = "dirichlet"
+CarpetX::boundary_z = "dirichlet"
+CarpetX::boundary_upper_x = "dirichlet"
+CarpetX::boundary_upper_y = "dirichlet"
+CarpetX::boundary_upper_z = "dirichlet"
+
 CarpetX::dtfac = 1.0
 Cactus::cctk_itlast = 1
 

diff --git a/TestODESolvers2/test/test-dp87.par b/TestODESolvers2/test/test-dp87.par
@@ -24,6 +24,13 @@ CarpetX::blocking_factor_z = 1
 
 CarpetX::ghost_size = 0
 
+CarpetX::boundary_x = "dirichlet"
+CarpetX::boundary_y = "dirichlet"
+CarpetX::boundary_z = "dirichlet"
+CarpetX::boundary_upper_x = "dirichlet"
+CarpetX::boundary_upper_y = "dirichlet"
+CarpetX::boundary_upper_z = "dirichlet"
+
 CarpetX::dtfac = 1.0
 Cactus::cctk_itlast = 1
 

diff --git a/TestODESolvers2/test/test-euler.par b/TestODESolvers2/test/test-euler.par
@@ -24,6 +24,13 @@ CarpetX::blocking_factor_z = 1
 
 CarpetX::ghost_size = 0
 
+CarpetX::boundary_x = "dirichlet"
+CarpetX::boundary_y = "dirichlet"
+CarpetX::boundary_z = "dirichlet"
+CarpetX::boundary_upper_x = "dirichlet"
+CarpetX::boundary_upper_y = "dirichlet"
+CarpetX::boundary_upper_z = "dirichlet"
+
 CarpetX::dtfac = 1.0
 Cactus::cctk_itlast = 1
 

diff --git a/TestODESolvers2/test/test-rk2.par b/TestODESolvers2/test/test-rk2.par
@@ -24,6 +24,13 @@ CarpetX::blocking_factor_z = 1
 
 CarpetX::ghost_size = 0
 
+CarpetX::boundary_x = "dirichlet"
+CarpetX::boundary_y = "dirichlet"
+CarpetX::boundary_z = "dirichlet"
+CarpetX::boundary_upper_x = "dirichlet"
+CarpetX::boundary_upper_y = "dirichlet"
+CarpetX::boundary_upper_z = "dirichlet"
+
 CarpetX::dtfac = 1.0
 Cactus::cctk_itlast = 1
 

diff --git a/TestODESolvers2/test/test-rk3.par b/TestODESolvers2/test/test-rk3.par
@@ -24,6 +24,13 @@ CarpetX::blocking_factor_z = 1
 
 CarpetX::ghost_size = 0
 
+CarpetX::boundary_x = "dirichlet"
+CarpetX::boundary_y = "dirichlet"
+CarpetX::boundary_z = "dirichlet"
+CarpetX::boundary_upper_x = "dirichlet"
+CarpetX::boundary_upper_y = "dirichlet"
+CarpetX::boundary_upper_z = "dirichlet"
+
 CarpetX::dtfac = 1.0
 Cactus::cctk_itlast = 1
 

diff --git a/TestODESolvers2/test/test-rk4.par b/TestODESolvers2/test/test-rk4.par
@@ -24,6 +24,13 @@ CarpetX::blocking_factor_z = 1
 
 CarpetX::ghost_size = 0
 
+CarpetX::boundary_x = "dirichlet"
+CarpetX::boundary_y = "dirichlet"
+CarpetX::boundary_z = "dirichlet"
+CarpetX::boundary_upper_x = "dirichlet"
+CarpetX::boundary_upper_y = "dirichlet"
+CarpetX::boundary_upper_z = "dirichlet"
+
 CarpetX::dtfac = 1.0
 Cactus::cctk_itlast = 1
 

diff --git a/TestODESolvers2/test/test-rkf78.par b/TestODESolvers2/test/test-rkf78.par
@@ -24,6 +24,13 @@ CarpetX::blocking_factor_z = 1
 
 CarpetX::ghost_size = 0
 
+CarpetX::boundary_x = "dirichlet"
+CarpetX::boundary_y = "dirichlet"
+CarpetX::boundary_z = "dirichlet"
+CarpetX::boundary_upper_x = "dirichlet"
+CarpetX::boundary_upper_y = "dirichlet"
+CarpetX::boundary_upper_z = "dirichlet"
+
 CarpetX::dtfac = 1.0
 Cactus::cctk_itlast = 1
 

diff --git a/TestODESolvers2/test/test-ssprk3.par b/TestODESolvers2/test/test-ssprk3.par
@@ -24,6 +24,13 @@ CarpetX::blocking_factor_z = 1
 
 CarpetX::ghost_size = 0
 
+CarpetX::boundary_x = "dirichlet"
+CarpetX::boundary_y = "dirichlet"
+CarpetX::boundary_z = "dirichlet"
+CarpetX::boundary_upper_x = "dirichlet"
+CarpetX::boundary_upper_y = "dirichlet"
+CarpetX::boundary_upper_z = "dirichlet"
+
 CarpetX::dtfac = 1.0
 Cactus::cctk_itlast = 1
 

diff --git a/scripts/actions-cpu-real32.cfg b/scripts/actions-cpu-real32.cfg
@@ -14,10 +14,14 @@ FPP = cpp
 FC = gfortran
 F90 = gfortran
 
-CFLAGS = -pipe -g -std=gnu11
-CXXFLAGS = -pipe -g -std=gnu++17
+# Note: Use -fhardened for GCC14
+# Note: GCC 13.2 with -ftrivial-auto-var-init=pattern mis-compiles (?) C++ lambdas
+
+CFLAGS = -D_FORTIFY_SOURCE=3 -D_GLIBCXX_ASSERTIONS -fPIE -fcf-protection=full -fstack-clash-protection -fstack-protector-strong -ftrivial-auto-var-init=pattern -g -march=x86-64-v3 -pie -pipe -std=gnu11
+CXXFLAGS = -D_FORTIFY_SOURCE=3 -D_GLIBCXX_ASSERTIONS -fPIE -fcf-protection=full -fstack-clash-protection -fstack-protector-strong -g -march=x86-64-v3 -pie -pipe -std=gnu++17
 FPPFLAGS = -traditional
-F90FLAGS = -pipe -g -fcray-pointer -ffixed-line-length-none
+F90FLAGS = -fPIE -fcf-protection=full -fcray-pointer -ffixed-line-length-none -finit-character=65 -finit-integer=42424242 -finit-real=nan -fstack-clash-protection -fstack-protector-strong -g -march=x86-64-v3 -pie -pipe
+LDFLAGS = -L/usr/lib/x86_64-linux-gnu -Wl,-rpath,/usr/local/lib -Wl,-z,relro,-z,now
 
 C_LINE_DIRECTIVES = yes
 F_LINE_DIRECTIVES = yes
@@ -31,12 +35,12 @@ CPP_DEBUG_FLAGS = -DCARPET_DEBUG
 C_DEBUG_FLAGS = -fbounds-check -fsanitize=undefined -fstack-protector-all -ftrapv
 CXX_DEBUG_FLAGS = -fbounds-check -fsanitize=undefined -fstack-protector-all -ftrapv
 FPP_DEBUG_FLAGS = -DCARPET_DEBUG
-F90_DEBUG_FLAGS = -fcheck=bounds,do,mem,pointer,recursion -finit-character=65 -finit-integer=42424242 -finit-real=nan -fsanitize=undefined -fstack-protector-all -ftrapv
+F90_DEBUG_FLAGS = -fcheck=bounds,do,mem,pointer,recursion -fsanitize=undefined -fstack-protector-all -ftrapv
 
 OPTIMISE = yes
-C_OPTIMISE_FLAGS = -O3 -fcx-limited-range -fexcess-precision=fast -ffp-contract=fast -fno-math-errno -fno-rounding-math -fno-signaling-nans -funsafe-math-optimizations
-CXX_OPTIMISE_FLAGS = -O3 -fcx-limited-range -fexcess-precision=fast -ffp-contract=fast -fno-math-errno -fno-rounding-math -fno-signaling-nans -funsafe-math-optimizations
-F90_OPTIMISE_FLAGS = -O3 -fcx-limited-range -fexcess-precision=fast -ffp-contract=fast -fno-math-errno -fno-rounding-math -fno-signaling-nans -funsafe-math-optimizations
+C_OPTIMISE_FLAGS = -O3 -fcx-limited-range -fexcess-precision=fast -ffp-contract=fast -fno-math-errno -fno-rounding-math -fno-signaling-nans
+CXX_OPTIMISE_FLAGS = -O3 -fcx-limited-range -fexcess-precision=fast -ffp-contract=fast -fno-math-errno -fno-rounding-math -fno-signaling-nans
+F90_OPTIMISE_FLAGS = -O3 -fcx-limited-range -fexcess-precision=fast -ffp-contract=fast -fno-math-errno -fno-rounding-math -fno-signaling-nans
 
 OPENMP = yes
 CPP_OPENMP_FLAGS = -fopenmp

diff --git a/scripts/actions-cpu-real32.ini b/scripts/actions-cpu-real32.ini
@@ -29,6 +29,9 @@ disabled-thorns = <<EOT
     ExternalLibraries/LAPACK
     ExternalLibraries/LORENE
     ExternalLibraries/PAPI
+    # Builds too slowly
+    SpacetimeX/Weyl
+        SpacetimeX/SphericalHarmonics
 EOT
 enabled-thorns = <<EOT
     CactusTest/TestAllTypes

diff --git a/scripts/actions-cpu-real32.run b/scripts/actions-cpu-real32.run
@@ -32,12 +32,14 @@ env | sort >SIMFACTORY/ENVIRONMENT
 echo "Starting:"
 export CACTUS_STARTTIME=$(date +%s)
 
-time                                            \
-    mpiexec                                     \
-    -n @NUM_PROCS@                              \
-    @EXECUTABLE@ -L 3 @PARFILE@                 \
-    >stdout.txt                                 \
-    2>stderr.txt
+# time                                            \
+#     mpiexec                                     \
+#     -n @NUM_PROCS@                              \
+#     @EXECUTABLE@ -L 3 @PARFILE@                 \
+#     >stdout.txt                                 \
+#     2>stderr.txt
+
+time mpiexec -n @NUM_PROCS@ @EXECUTABLE@ -L 3 @PARFILE@
 
 echo "Stopping:"
 date

diff --git a/scripts/actions-cpu-real64.cfg b/scripts/actions-cpu-real64.cfg
@@ -14,10 +14,14 @@ FPP = cpp
 FC = gfortran
 F90 = gfortran
 
-CFLAGS = -pipe -g -std=gnu11
-CXXFLAGS = -pipe -g -std=gnu++17
+# Note: Use -fhardened for GCC14
+# Note: GCC 13.2 with -ftrivial-auto-var-init=pattern mis-compiles (?) C++ lambdas
+
+CFLAGS = -D_FORTIFY_SOURCE=3 -D_GLIBCXX_ASSERTIONS -fPIE -fcf-protection=full -fstack-clash-protection -fstack-protector-strong -ftrivial-auto-var-init=pattern -g -march=x86-64-v3 -pie -pipe -std=gnu11
+CXXFLAGS = -D_FORTIFY_SOURCE=3 -D_GLIBCXX_ASSERTIONS -fPIE -fcf-protection=full -fstack-clash-protection -fstack-protector-strong -g -march=x86-64-v3 -pie -pipe -std=gnu++17
 FPPFLAGS = -traditional
-F90FLAGS = -pipe -g -fcray-pointer -ffixed-line-length-none
+F90FLAGS = -fPIE -fcf-protection=full -fcray-pointer -ffixed-line-length-none -finit-character=65 -finit-integer=42424242 -finit-real=nan -fstack-clash-protection -fstack-protector-strong -g -march=x86-64-v3 -pie -pipe
+LDFLAGS = -L/usr/lib/x86_64-linux-gnu -Wl,-rpath,/usr/local/lib -Wl,-z,relro,-z,now
 
 C_LINE_DIRECTIVES = yes
 F_LINE_DIRECTIVES = yes
@@ -31,12 +35,12 @@ CPP_DEBUG_FLAGS = -DCARPET_DEBUG
 C_DEBUG_FLAGS = -fbounds-check -fsanitize=undefined -fstack-protector-all -ftrapv
 CXX_DEBUG_FLAGS = -fbounds-check -fsanitize=undefined -fstack-protector-all -ftrapv
 FPP_DEBUG_FLAGS = -DCARPET_DEBUG
-F90_DEBUG_FLAGS = -fcheck=bounds,do,mem,pointer,recursion -finit-character=65 -finit-integer=42424242 -finit-real=nan -fsanitize=undefined -fstack-protector-all -ftrapv
+F90_DEBUG_FLAGS = -fcheck=bounds,do,mem,pointer,recursion -fsanitize=undefined -fstack-protector-all -ftrapv
 
 OPTIMISE = yes
-C_OPTIMISE_FLAGS = -O3 -fcx-limited-range -fexcess-precision=fast -ffp-contract=fast -fno-math-errno -fno-rounding-math -fno-signaling-nans -funsafe-math-optimizations
-CXX_OPTIMISE_FLAGS = -O3 -fcx-limited-range -fexcess-precision=fast -ffp-contract=fast -fno-math-errno -fno-rounding-math -fno-signaling-nans -funsafe-math-optimizations
-F90_OPTIMISE_FLAGS = -O3 -fcx-limited-range -fexcess-precision=fast -ffp-contract=fast -fno-math-errno -fno-rounding-math -fno-signaling-nans -funsafe-math-optimizations
+C_OPTIMISE_FLAGS = -O3 -fcx-limited-range -fexcess-precision=fast -ffp-contract=fast -fno-math-errno -fno-rounding-math -fno-signaling-nans
+CXX_OPTIMISE_FLAGS = -O3 -fcx-limited-range -fexcess-precision=fast -ffp-contract=fast -fno-math-errno -fno-rounding-math -fno-signaling-nans
+F90_OPTIMISE_FLAGS = -O3 -fcx-limited-range -fexcess-precision=fast -ffp-contract=fast -fno-math-errno -fno-rounding-math -fno-signaling-nans
 
 OPENMP = yes
 CPP_OPENMP_FLAGS = -fopenmp

diff --git a/scripts/actions-cpu-real64.ini b/scripts/actions-cpu-real64.ini
@@ -26,6 +26,9 @@ disabled-thorns = <<EOT
     ExternalLibraries/LAPACK
     ExternalLibraries/LORENE
     ExternalLibraries/PAPI
+    # Builds too slowly
+    SpacetimeX/Weyl
+        SpacetimeX/SphericalHarmonics
 EOT
 enabled-thorns = <<EOT
     CactusTest/TestAllTypes

diff --git a/scripts/actions-cpu-real64.run b/scripts/actions-cpu-real64.run
@@ -32,12 +32,14 @@ env | sort >SIMFACTORY/ENVIRONMENT
 echo "Starting:"
 export CACTUS_STARTTIME=$(date +%s)
 
-time                                            \
-    mpiexec                                     \
-    -n @NUM_PROCS@                              \
-    @EXECUTABLE@ -L 3 @PARFILE@                 \
-    >stdout.txt                                 \
-    2>stderr.txt
+# time                                            \
+#     mpiexec                                     \
+#     -n @NUM_PROCS@                              \
+#     @EXECUTABLE@ -L 3 @PARFILE@                 \
+#     >stdout.txt                                 \
+#     2>stderr.txt
+
+time mpiexec -n @NUM_PROCS@ @EXECUTABLE@ -L 3 @PARFILE@
 
 echo "Stopping:"
 date

diff --git a/scripts/actions-cuda-real32.cfg b/scripts/actions-cuda-real32.cfg
@@ -48,9 +48,9 @@ FPP_DEBUG_FLAGS = -DCARPET_DEBUG
 F90_DEBUG_FLAGS = -fcheck=bounds,do,mem,pointer,recursion -finit-character=65 -finit-integer=42424242 -finit-real=nan -fsanitize=undefined -fstack-protector-all -ftrapv
 
 OPTIMISE = yes
-C_OPTIMISE_FLAGS = -O3 -fcx-limited-range -fexcess-precision=fast -ffp-contract=fast -fno-math-errno -fno-rounding-math -fno-signaling-nans -funsafe-math-optimizations
-CXX_OPTIMISE_FLAGS = -O3 -fcx-limited-range -fexcess-precision=fast -ffp-contract=fast -fno-math-errno -fno-rounding-math -fno-signaling-nans -funsafe-math-optimizations
-F90_OPTIMISE_FLAGS = -O3 -fcx-limited-range -fexcess-precision=fast -ffp-contract=fast -fno-math-errno -fno-rounding-math -fno-signaling-nans -funsafe-math-optimizations
+C_OPTIMISE_FLAGS = -O3 -fcx-limited-range -fexcess-precision=fast -ffp-contract=fast -fno-math-errno -fno-rounding-math -fno-signaling-nans
+CXX_OPTIMISE_FLAGS = -O3 -fcx-limited-range -fexcess-precision=fast -ffp-contract=fast -fno-math-errno -fno-rounding-math -fno-signaling-nans
+F90_OPTIMISE_FLAGS = -O3 -fcx-limited-range -fexcess-precision=fast -ffp-contract=fast -fno-math-errno -fno-rounding-math -fno-signaling-nans
 
 OPENMP = yes
 CPP_OPENMP_FLAGS = -fopenmp

diff --git a/scripts/actions-cuda-real32.run b/scripts/actions-cuda-real32.run
@@ -32,12 +32,14 @@ env | sort >SIMFACTORY/ENVIRONMENT
 echo "Starting:"
 export CACTUS_STARTTIME=$(date +%s)
 
-time                                            \
-    mpiexec                                     \
-    -n @NUM_PROCS@                              \
-    @EXECUTABLE@ -L 3 @PARFILE@                 \
-    >stdout.txt                                 \
-    2>stderr.txt
+# time                                            \
+#     mpiexec                                     \
+#     -n @NUM_PROCS@                              \
+#     @EXECUTABLE@ -L 3 @PARFILE@                 \
+#     >stdout.txt                                 \
+#     2>stderr.txt
+
+time mpiexec -n @NUM_PROCS@ @EXECUTABLE@ -L 3 @PARFILE@
 
 echo "Stopping:"
 date

diff --git a/scripts/actions-cuda-real64.cfg b/scripts/actions-cuda-real64.cfg
@@ -48,9 +48,9 @@ FPP_DEBUG_FLAGS = -DCARPET_DEBUG
 F90_DEBUG_FLAGS = -fcheck=bounds,do,mem,pointer,recursion -finit-character=65 -finit-integer=42424242 -finit-real=nan -fsanitize=undefined -fstack-protector-all -ftrapv
 
 OPTIMISE = yes
-C_OPTIMISE_FLAGS = -O3 -fcx-limited-range -fexcess-precision=fast -ffp-contract=fast -fno-math-errno -fno-rounding-math -fno-signaling-nans -funsafe-math-optimizations
-CXX_OPTIMISE_FLAGS = -O3 -fcx-limited-range -fexcess-precision=fast -ffp-contract=fast -fno-math-errno -fno-rounding-math -fno-signaling-nans -funsafe-math-optimizations
-F90_OPTIMISE_FLAGS = -O3 -fcx-limited-range -fexcess-precision=fast -ffp-contract=fast -fno-math-errno -fno-rounding-math -fno-signaling-nans -funsafe-math-optimizations
+C_OPTIMISE_FLAGS = -O3 -fcx-limited-range -fexcess-precision=fast -ffp-contract=fast -fno-math-errno -fno-rounding-math -fno-signaling-nans
+CXX_OPTIMISE_FLAGS = -O3 -fcx-limited-range -fexcess-precision=fast -ffp-contract=fast -fno-math-errno -fno-rounding-math -fno-signaling-nans
+F90_OPTIMISE_FLAGS = -O3 -fcx-limited-range -fexcess-precision=fast -ffp-contract=fast -fno-math-errno -fno-rounding-math -fno-signaling-nans
 
 OPENMP = yes
 CPP_OPENMP_FLAGS = -fopenmp