Skip to content

Commit 9b8df13

Browse files
wpbonelliwpbonelli
committed
rebuild makefiles
1 parent 0e52233 commit 9b8df13

File tree

6 files changed

+54
-53
lines changed

6 files changed

+54
-53
lines changed

‎make/makedefaults

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@ OPTLEVEL ?= -O2
5757
# set the fortran flags
5858
ifeq ($(detected_OS), Windows)
5959
ifeq ($(FC), gfortran)
60-
FFLAGS ?= -static -fbacktrace $(OS_macro) -fall-intrinsics -Wtabs -Wline-truncation -Wunused-label -Wunused-variable -pedantic -std=f2008 -Wcharacter-truncation -cpp
60+
FFLAGS ?= -static -fbacktrace -ffpe-summary=overflow -ffpe-trap=overflow,zero,invalid -fall-intrinsics -pedantic -Wcharacter-truncation $(OS_macro) -Wtabs -Wline-truncation -Wunused-label -Wunused-variable -std=f2008 -cpp
6161
endif
6262
else
6363
ifeq ($(FC), gfortran)
64-
FFLAGS ?= -fbacktrace $(OS_macro) -fall-intrinsics -Wtabs -Wline-truncation -Wunused-label -Wunused-variable -pedantic -std=f2008 -Wcharacter-truncation -cpp
64+
FFLAGS ?= -fbacktrace -ffpe-summary=overflow -ffpe-trap=overflow,zero,invalid -fall-intrinsics -pedantic -Wcharacter-truncation $(OS_macro) -Wtabs -Wline-truncation -Wunused-label -Wunused-variable -std=f2008 -cpp
6565
endif
6666
ifeq ($(FC), $(filter $(FC), ifort mpiifort))
6767
FFLAGS ?= -no-heap-arrays -fpe0 -traceback -Qdiag-disable:7416 -Qdiag-disable:7025 -Qdiag-disable:5268 -fpp

‎make/makefile

Lines changed: 38 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -4,43 +4,43 @@
44
include ./makedefaults
55

66
# Define the source file directories
7-
SOURCEDIR1=..\src
8-
SOURCEDIR2=..\src\Distributed
9-
SOURCEDIR3=..\src\Exchange
10-
SOURCEDIR4=..\src\Idm
11-
SOURCEDIR5=..\src\Idm\selector
12-
SOURCEDIR6=..\src\Model
13-
SOURCEDIR7=..\src\Model\Connection
14-
SOURCEDIR8=..\src\Model\Discretization
15-
SOURCEDIR9=..\src\Model\Geometry
16-
SOURCEDIR10=..\src\Model\GroundWaterEnergy
17-
SOURCEDIR11=..\src\Model\GroundWaterFlow
18-
SOURCEDIR12=..\src\Model\GroundWaterTransport
19-
SOURCEDIR13=..\src\Model\ModelUtilities
20-
SOURCEDIR14=..\src\Model\ParticleTracking
21-
SOURCEDIR15=..\src\Model\SurfaceWaterFlow
22-
SOURCEDIR16=..\src\Model\TransportModel
23-
SOURCEDIR17=..\src\Solution
24-
SOURCEDIR18=..\src\Solution\LinearMethods
25-
SOURCEDIR19=..\src\Solution\ParticleTracker
26-
SOURCEDIR20=..\src\Solution\PETSc
27-
SOURCEDIR21=..\src\Timing
28-
SOURCEDIR22=..\src\Utilities
29-
SOURCEDIR23=..\src\Utilities\ArrayRead
30-
SOURCEDIR24=..\src\Utilities\Idm
31-
SOURCEDIR25=..\src\Utilities\Idm\mf6blockfile
32-
SOURCEDIR26=..\src\Utilities\Libraries
33-
SOURCEDIR27=..\src\Utilities\Libraries\blas
34-
SOURCEDIR28=..\src\Utilities\Libraries\daglib
35-
SOURCEDIR29=..\src\Utilities\Libraries\rcm
36-
SOURCEDIR30=..\src\Utilities\Libraries\sparsekit
37-
SOURCEDIR31=..\src\Utilities\Libraries\sparskit2
38-
SOURCEDIR32=..\src\Utilities\Matrix
39-
SOURCEDIR33=..\src\Utilities\Memory
40-
SOURCEDIR34=..\src\Utilities\Observation
41-
SOURCEDIR35=..\src\Utilities\OutputControl
42-
SOURCEDIR36=..\src\Utilities\TimeSeries
43-
SOURCEDIR37=..\src\Utilities\Vector
7+
SOURCEDIR1=../src
8+
SOURCEDIR2=../src/Idm
9+
SOURCEDIR3=../src/Idm/selector
10+
SOURCEDIR4=../src/Exchange
11+
SOURCEDIR5=../src/Distributed
12+
SOURCEDIR6=../src/Solution
13+
SOURCEDIR7=../src/Solution/LinearMethods
14+
SOURCEDIR8=../src/Solution/ParticleTracker
15+
SOURCEDIR9=../src/Solution/PETSc
16+
SOURCEDIR10=../src/Timing
17+
SOURCEDIR11=../src/Utilities
18+
SOURCEDIR12=../src/Utilities/Idm
19+
SOURCEDIR13=../src/Utilities/Idm/mf6blockfile
20+
SOURCEDIR14=../src/Utilities/TimeSeries
21+
SOURCEDIR15=../src/Utilities/Memory
22+
SOURCEDIR16=../src/Utilities/OutputControl
23+
SOURCEDIR17=../src/Utilities/ArrayRead
24+
SOURCEDIR18=../src/Utilities/Libraries
25+
SOURCEDIR19=../src/Utilities/Libraries/rcm
26+
SOURCEDIR20=../src/Utilities/Libraries/blas
27+
SOURCEDIR21=../src/Utilities/Libraries/sparskit2
28+
SOURCEDIR22=../src/Utilities/Libraries/daglib
29+
SOURCEDIR23=../src/Utilities/Libraries/sparsekit
30+
SOURCEDIR24=../src/Utilities/Vector
31+
SOURCEDIR25=../src/Utilities/Matrix
32+
SOURCEDIR26=../src/Utilities/Observation
33+
SOURCEDIR27=../src/Model
34+
SOURCEDIR28=../src/Model/Connection
35+
SOURCEDIR29=../src/Model/ParticleTracking
36+
SOURCEDIR30=../src/Model/SurfaceWaterFlow
37+
SOURCEDIR31=../src/Model/GroundWaterTransport
38+
SOURCEDIR32=../src/Model/ModelUtilities
39+
SOURCEDIR33=../src/Model/GroundWaterFlow
40+
SOURCEDIR34=../src/Model/Discretization
41+
SOURCEDIR35=../src/Model/TransportModel
42+
SOURCEDIR36=../src/Model/Geometry
43+
SOURCEDIR37=../src/Model/GroundWaterEnergy
4444

4545
VPATH = \
4646
${SOURCEDIR1} \
@@ -413,6 +413,7 @@ $(OBJDIR)/exg-swfgwf.o \
413413
$(OBJDIR)/exg-gwfprt.o \
414414
$(OBJDIR)/exg-gwfgwt.o \
415415
$(OBJDIR)/exg-gwfgwe.o \
416+
$(OBJDIR)/ExchangeRegistrar.o \
416417
$(OBJDIR)/VirtualDataManager.o \
417418
$(OBJDIR)/Mapper.o \
418419
$(OBJDIR)/IdmMf6File.o \

‎utils/mf5to6/make/makedefaults

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@ OPTLEVEL ?= -O2
5757
# set the fortran flags
5858
ifeq ($(detected_OS), Windows)
5959
ifeq ($(FC), gfortran)
60-
FFLAGS ?= -static -fbacktrace $(OS_macro) -cpp
60+
FFLAGS ?= -static -fbacktrace -ffpe-summary=overflow -ffpe-trap=overflow,zero,invalid $(OS_macro) -cpp
6161
endif
6262
else
6363
ifeq ($(FC), gfortran)
64-
FFLAGS ?= -fbacktrace $(OS_macro) -cpp
64+
FFLAGS ?= -fbacktrace -ffpe-summary=overflow -ffpe-trap=overflow,zero,invalid $(OS_macro) -cpp
6565
endif
6666
ifeq ($(FC), $(filter $(FC), ifort mpiifort))
6767
FFLAGS ?= -no-heap-arrays -fpe0 -traceback -Qdiag-disable:7416 -Qdiag-disable:7025 -Qdiag-disable:5268 -fpp

‎utils/mf5to6/make/makefile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
include ./makedefaults
55

66
# Define the source file directories
7-
SOURCEDIR1=..\src
8-
SOURCEDIR2=..\src\LGR
9-
SOURCEDIR3=..\src\MF2005
10-
SOURCEDIR4=..\src\NWT
11-
SOURCEDIR5=..\src\Preproc
12-
SOURCEDIR6=..\..\..\src\Utilities\Memory
13-
SOURCEDIR7=..\..\..\src\Utilities\TimeSeries
14-
SOURCEDIR8=..\..\..\src\Utilities
7+
SOURCEDIR1=../src
8+
SOURCEDIR2=../src/NWT
9+
SOURCEDIR3=../src/LGR
10+
SOURCEDIR4=../src/Preproc
11+
SOURCEDIR5=../src/MF2005
12+
SOURCEDIR6=../../../src/Utilities/Memory
13+
SOURCEDIR7=../../../src/Utilities/TimeSeries
14+
SOURCEDIR8=../../../src/Utilities
1515

1616
VPATH = \
1717
${SOURCEDIR1} \

‎utils/zonebudget/make/makedefaults

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@ OPTLEVEL ?= -O2
5757
# set the fortran flags
5858
ifeq ($(detected_OS), Windows)
5959
ifeq ($(FC), gfortran)
60-
FFLAGS ?= -static -fbacktrace $(OS_macro) -fall-intrinsics -Wtabs -Wline-truncation -Wunused-label -Wunused-variable -pedantic -std=f2008 -Wcharacter-truncation -cpp
60+
FFLAGS ?= -static -fbacktrace -ffpe-summary=overflow -ffpe-trap=overflow,zero,invalid -fall-intrinsics -pedantic -Wcharacter-truncation $(OS_macro) -Wtabs -Wline-truncation -Wunused-label -Wunused-variable -std=f2008 -cpp
6161
endif
6262
else
6363
ifeq ($(FC), gfortran)
64-
FFLAGS ?= -fbacktrace $(OS_macro) -fall-intrinsics -Wtabs -Wline-truncation -Wunused-label -Wunused-variable -pedantic -std=f2008 -Wcharacter-truncation -cpp
64+
FFLAGS ?= -fbacktrace -ffpe-summary=overflow -ffpe-trap=overflow,zero,invalid -fall-intrinsics -pedantic -Wcharacter-truncation $(OS_macro) -Wtabs -Wline-truncation -Wunused-label -Wunused-variable -std=f2008 -cpp
6565
endif
6666
ifeq ($(FC), $(filter $(FC), ifort mpiifort))
6767
FFLAGS ?= -no-heap-arrays -fpe0 -traceback -Qdiag-disable:7416 -Qdiag-disable:7025 -Qdiag-disable:5268 -fpp

‎utils/zonebudget/make/makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
include ./makedefaults
55

66
# Define the source file directories
7-
SOURCEDIR1=..\src
8-
SOURCEDIR2=..\..\..\src\Utilities
7+
SOURCEDIR1=../src
8+
SOURCEDIR2=../../../src/Utilities
99

1010
VPATH = \
1111
${SOURCEDIR1} \

0 commit comments

Comments
 (0)