Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed environment variables in Makefiles... #54

Merged
merged 1 commit into from
Jul 30, 2013
Merged

Fixed environment variables in Makefiles... #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions src/2d/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# Makefile for Clawpack code in this directory.
# This version only sets the local files and frequently changed
# options, and then includes the standard makefile pointed to by CLAWMAKE.
CLAWMAKE = $(CLAWUTIL)/src/Makefile.common
CLAWMAKE = $(CLAW)/clawutil/src/Makefile.common

# See the above file for details and a list of make options, or type
# make .help
Expand All @@ -17,13 +17,8 @@ CLAWMAKE = $(CLAWUTIL)/src/Makefile.common
# an f90 compiler such as gfortran.

# Environment variable FC should be set to fortran compiler, e.g. gfortran
FC ?= gfortran # default if not set as environment variable
# Add any desired compiler flags such as -g here:
# INTEL ifort flags
#FFLAGS ?= -g -C -CB -CU -fpe0 -ftrapuv
# gfortran flags
# #FFLAGS = -g -fbounds-check -ffpe-trap=invalid,overflow,zero

FFLAGS ?=

CLAW_LIB = $(shell pwd)

Expand Down
8 changes: 4 additions & 4 deletions tests/acoustics-example1/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Makefile for Clawpack code in this directory.
# This version only sets the local files and frequently changed
# options, and then includes the standard makefile pointed to by CLAWMAKE.
CLAWMAKE = $(CLAWUTIL)/src/Makefile.common
CLAWMAKE = $(CLAW)/clawutil/src/Makefile.common

# See the above file for details and a list of make options, or type
# make .help
Expand All @@ -23,9 +23,9 @@ OVERWRITE ?= True # False ==> make a copy of OUTDIR first
RESTART ?= False # Should = clawdata.restart in setrun

# Environment variable FC should be set to fortran compiler, e.g. gfortran
FC ?= gfortran # default if not set as environment variable
# Add any desired compiler flags such as -g here:
FFLAGS ?= -O2 -fopenmp

# Compiler flags can be specified here or set as an environment variable
FFLAGS ?=

# ---------------------------------
# List of sources for this program:
Expand Down
11 changes: 4 additions & 7 deletions tests/annulus/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Makefile for Clawpack code in this directory.
# This version only sets the local files and frequently changed
# options, and then includes the standard makefile pointed to by CLAWMAKE.
CLAWMAKE = $(CLAWUTIL)/src/Makefile.common
CLAWMAKE = $(CLAW)/clawutil/src/Makefile.common

# See the above file for details and a list of make options, or type
# make .help
Expand All @@ -23,13 +23,10 @@ OVERWRITE ?= True # False ==> make a copy of OUTDIR first
RESTART ?= False # Should = clawdata.restart in setrun

# Environment variable FC should be set to fortran compiler, e.g. gfortran
FC ?= gfortran # default if not set as environment variable

# Add any desired compiler flags such as -g here:
FFLAGS ?= -O2 -fopenmp
#FFLAGS = -W -Wall -fbounds-check -ffpe-trap=zero,overflow,invalid -g
# intel ifort flags
# FFLAGS = -g -C -CB -CU -fpe0 -ftrapuv
# Compiler flags can be specified here or set as an environment variable
FFLAGS ?=


# ---------------------------------
# List of sources for this program:
Expand Down
12 changes: 5 additions & 7 deletions tests/burgers_pwconst/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Makefile for Clawpack code in this directory.
# This version only sets the local files and frequently changed
# options, and then includes the standard makefile pointed to by CLAWMAKE.
CLAWMAKE = $(CLAWUTIL)/src/Makefile.common
CLAWMAKE = $(CLAW)/clawutil/src/Makefile.common

# See the above file for details and a list of make options, or type
# make .help
Expand All @@ -23,12 +23,10 @@ OVERWRITE ?= True # False ==> make a copy of OUTDIR first
RESTART ?= False # Should = clawdata.restart in setrun

# Environment variable FC should be set to fortran compiler, e.g. gfortran
FC ?= gfortran # default if not set as environment variable
# Add any desired compiler flags such as -g here:
FFLAGS ?= -O2 -fopenmp
#FFLAGS = -W -Wall -fbounds-check -ffpe-trap=zero,overflow,invalid -g
# intel ifort flags
# FFLAGS = -g -C -CB -CU -fpe0 -ftrapuv

# Compiler flags can be specified here or set as an environment variable
FFLAGS ?=


# ---------------------------------
# List of sources for this program:
Expand Down
11 changes: 4 additions & 7 deletions tests/example1/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Makefile for Clawpack code in this directory.
# This version only sets the local files and frequently changed
# options, and then includes the standard makefile pointed to by CLAWMAKE.
CLAWMAKE = $(CLAWUTIL)/src/Makefile.common
CLAWMAKE = $(CLAW)/clawutil/src/Makefile.common

# See the above file for details and a list of make options, or type
# make .help
Expand All @@ -23,13 +23,10 @@ OVERWRITE ?= True # False ==> make a copy of OUTDIR first
RESTART ?= False # Should = clawdata.restart in setrun

# Environment variable FC should be set to fortran compiler, e.g. gfortran
FC ?= gfortran # default if not set as environment variable

# Add any desired compiler flags such as -g here:
FFLAGS ?= -O2 -fopenmp
#FFLAGS = -W -Wall -fbounds-check -ffpe-trap=zero,overflow,invalid -g
# intel ifort flags
# FFLAGS = -g -C -CB -CU -fpe0 -ftrapuv
# Compiler flags can be specified here or set as an environment variable
FFLAGS ?=


# ---------------------------------
# List of sources for this program:
Expand Down
11 changes: 4 additions & 7 deletions tests/quadrants/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Makefile for Clawpack code in this directory.
# This version only sets the local files and frequently changed
# options, and then includes the standard makefile pointed to by CLAWMAKE.
CLAWMAKE = $(CLAWUTIL)/src/Makefile.common
CLAWMAKE = $(CLAW)/clawutil/src/Makefile.common

# See the above file for details and a list of make options, or type
# make .help
Expand All @@ -23,13 +23,10 @@ OVERWRITE ?= True # False ==> make a copy of OUTDIR first
RESTART ?= True # Should = clawdata.restart in setrun

# Environment variable FC should be set to fortran compiler, e.g. gfortran
FC ?= gfortran # default if not set as environment variable

# Add any desired compiler flags such as -g here:
FFLAGS ?= -O2
#FFLAGS = -W -Wall -fbounds-check -ffpe-trap=zero,overflow,invalid -g
# intel ifort flags
# FFLAGS = -g -C -CB -CU -fpe0 -ftrapuv
# Compiler flags can be specified here or set as an environment variable
FFLAGS ?=



# ---------------------------------
Expand Down
11 changes: 4 additions & 7 deletions tests/shockbubble/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Makefile for Clawpack code in this directory.
# This version only sets the local files and frequently changed
# options, and then includes the standard makefile pointed to by CLAWMAKE.
CLAWMAKE = $(CLAWUTIL)/src/Makefile.common
CLAWMAKE = $(CLAW)/clawutil/src/Makefile.common

# See the above file for details and a list of make options, or type
# make .help
Expand All @@ -23,13 +23,10 @@ OVERWRITE ?= True # False ==> make a copy of OUTDIR first
RESTART ?= False # Should = clawdata.restart in setrun

# Environment variable FC should be set to fortran compiler, e.g. gfortran
FC ?= gfortran # default if not set as environment variable

# Add any desired compiler flags such as -g here:
FFLAGS ?= -O2 -fopenmp
#FFLAGS = -W -Wall -fbounds-check -ffpe-trap=zero,overflow,invalid -g
# intel ifort flags
# FFLAGS = -g -C -CB -CU -fpe0 -ftrapuv
# Compiler flags can be specified here or set as an environment variable
FFLAGS ?=



# ---------------------------------
Expand Down
15 changes: 5 additions & 10 deletions tests/swirl/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Makefile for Clawpack code in this directory.
# This version only sets the local files and frequently changed
# options, and then includes the standard makefile pointed to by CLAWMAKE.
CLAWMAKE = $(CLAWUTIL)/src/Makefile.common
CLAWMAKE = $(CLAW)/clawutil/src/Makefile.common

# See the above file for details and a list of make options, or type
# make .help
Expand All @@ -22,16 +22,11 @@ PLOTDIR = _plots # Directory for plots
OVERWRITE ?= True # False ==> make a copy of OUTDIR first
RESTART ?= False # Should = clawdata.restart in setrun

#FC = ifort
#FFLAGS = -C -CB -CU -fpe1 -ftz -ftrapuv -g -fp-model precise
#FFLAGS = -C -CB -CU -fpe1 -ftrapuv -O2 -fp-model precise -openmp
# Environment variable FC should be set to fortran compiler, e.g. gfortran
FC ?= gfortran # default if not set as environment variable
# Add any desired compiler flags such as -g here:
FFLAGS ?= -O2 -fopenmp
#FFLAGS = -W -Wall -fbounds-check -ffpe-trap=zero,overflow,invalid -g
# intel ifort flags
# FFLAGS = -g -C -CB -CU -fpe0 -ftrapuv

# Compiler flags can be specified here or set as an environment variable
FFLAGS ?=


# ---------------------------------
# List of sources for this program:
Expand Down
16 changes: 5 additions & 11 deletions tests/swirl_regression/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Makefile for Clawpack code in this directory.
# This version only sets the local files and frequently changed
# options, and then includes the standard makefile pointed to by CLAWMAKE.
CLAWMAKE = $(CLAWUTIL)/src/Makefile.common
CLAWMAKE = $(CLAW)/clawutil/src/Makefile.common

# See the above file for details and a list of make options, or type
# make .help
Expand All @@ -22,17 +22,11 @@ PLOTDIR = _plots # Directory for plots
OVERWRITE ?= True # False ==> make a copy of OUTDIR first
RESTART ?= False # Should = clawdata.restart in setrun

#FC = ifort
#FFLAGS = -C -CB -CU -fpe1 -ftz -ftrapuv -g -fp-model precise
#FFLAGS = -C -CB -CU -fpe1 -ftrapuv -O2 -fp-model precise -openmp
# Environment variable FC should be set to fortran compiler, e.g. gfortran
FC ?= gfortran # default if not set as environment variable
# Add any desired compiler flags such as -g here:
#FFLAGS ?= -O2 -fopenmp
FFLAGS ?= -O2
#FFLAGS = -W -Wall -fbounds-check -ffpe-trap=zero,overflow,invalid -g
# intel ifort flags
# FFLAGS = -g -C -CB -CU -fpe0 -ftrapuv

# Compiler flags can be specified here or set as an environment variable
FFLAGS ?=


# ---------------------------------
# List of sources for this program:
Expand Down
13 changes: 5 additions & 8 deletions tests/test_changeFlagging/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Makefile for Clawpack code in this directory.
# This version only sets the local files and frequently changed
# options, and then includes the standard makefile pointed to by CLAWMAKE.
CLAWMAKE = $(CLAWUTIL)/src/Makefile.common
CLAWMAKE = $(CLAW)/clawutil/src/Makefile.common

# See the above file for details and a list of make options, or type
# make .help
Expand All @@ -22,13 +22,10 @@ OVERWRITE ?= True # False ==> make a copy of OUTDIR first
RESTART ?= False # Should = clawdata.restart in setrun

# Environment variable FC should be set to fortran compiler, e.g. gfortran
FC ?= gfortran # default if not set as environment variable

# Add any desired compiler flags such as -g here:
FFLAGS ?= -O2
#FFLAGS = -W -Wall -fbounds-check -ffpe-trap=zero,overflow,invalid -g
# intel ifort flags
# FFLAGS = -g -C -CB -CU -fpe0 -ftrapuv
# Compiler flags can be specified here or set as an environment variable
FFLAGS ?=


# ---------------------------------
# List of sources for this program:
Expand Down Expand Up @@ -155,4 +152,4 @@ SOURCES = \

#-------------------------------------------------------------------
# Include Makefile containing standard definitions and make options:
include $(CLAWMAKE)
include $(CLAWMAKE)