Merge branch 'master' into APIUtils

Makefile

@@ -26,7 +26,10 @@ FPE_TRAP ?= zero
 AR          = ar
 FC          = gfortran
 CC          = g++
-FCFLAGS     = -Wall -O2 -fno-automatic -fbounds-check -ffpe-trap=$(FPE_TRAP) -cpp -D"DATA_DIRECTORY='$(DATA_DIR)'"
+
+FFPE_TRAPS  ?= zero
+FCFLAGS     = -Wall -O2 -fno-automatic -fbounds-check -ffpe-trap=$(FFPE_TRAPS) -cpp -D"DATA_DIRECTORY='$(DATA_DIR)'"
+
 CCFLAGS     = -std=gnu++17
 
 UNAME_S := $(shell uname -s)
@@ -91,7 +94,7 @@ SHARED_LIB  = $(OBJ_DIR)/$(TC_LIB)
 ## C interface library:
 ## =================
 C_SRC       = Thermochimica-c.C Thermochimica-cxx.C
-C_OBJ       = $(C_SRC:.C=.o) 
+C_OBJ       = $(C_SRC:.C=.o)
 C_LNK       = $(addprefix $(OBJ_DIR)/,$(C_OBJ))
 TC-C_LIB    = libthermoc.a
 C_LIB  		= $(OBJ_DIR)/$(TC-C_LIB)
@@ -237,6 +240,7 @@ test: all dailytest
 ## DEBUG:
 ## ===========
 setdebug:
-	$(eval FCFLAGS = -Wall -O0 -g -fno-automatic -fbounds-check -ffpe-trap=$(FPE_TRAP) -D"DATA_DIRECTORY='$(DATA_DIR)'")
+
+	$(eval FCFLAGS = -Wall -O0 -g -fno-automatic -fbounds-check -ffpe-trap=$(FFPE_TRAPS) -D"DATA_DIRECTORY='$(DATA_DIR)'")
 
 debug: setdebug all dailytest