Removed "-ip" for Intel compilers.

Removed "-ip" for Intel compilers.
Removed "-Drestrict=...".
Removed "-ffast-math".
Removed "-malign-double" for C and C++.

darcs-hash:20020908183835-07bb3-5782d1fe20ae58a6af5fc02378a12aba07777afe.gz

4 files changed, 21 insertions, 21 deletions

diff --git a/Carpet/Carpet/options/carpet-harpo-gcc b/Carpet/Carpet/options/carpet-harpo-gcc
index 31ca9544d..ba494a449 100644
--- a/Carpet/Carpet/options/carpet-harpo-gcc
+++ b/Carpet/Carpet/options/carpet-harpo-gcc
@@ -1,4 +1,4 @@
-# $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/options/carpet-harpo-gcc,v 1.3 2002/05/05 22:16:56 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/options/carpet-harpo-gcc,v 1.4 2002/09/08 20:38:35 schnetter Exp $
 
 CC			= gcc
 CXX			= g++
@@ -19,8 +19,8 @@ F90FLAGS		=
 
 C_OPTIMISE_FLAGS	= -O3 -funroll-loops
 CXX_OPTIMISE_FLAGS	= -O3 -funroll-loops
-F90_OPTIMISE_FLAGS	= -O3 -funroll-loops
-F77_OPTIMISE_FLAGS	= -O3 -funroll-loops
+F90_OPTIMISE_FLAGS	= -O3 -funroll-loops -malign-double
+F77_OPTIMISE_FLAGS	= -O3 -funroll-loops -malign-double
 
 C_WARN_FLAGS		= -Wall -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wstrict-prototypes -Wmissing-declarations -Winline
 CXX_WARN_FLAGS		= -Wall -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wstrict-prototypes -Wmissing-declarations -Winline
diff --git a/Carpet/Carpet/options/carpet-lilypond-gcc32 b/Carpet/Carpet/options/carpet-lilypond-gcc32
index cd08fd561..1c1150869 100644
--- a/Carpet/Carpet/options/carpet-lilypond-gcc32
+++ b/Carpet/Carpet/options/carpet-lilypond-gcc32
@@ -1,4 +1,4 @@
-# $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/options/carpet-lilypond-gcc32,v 1.1 2002/08/30 15:34:28 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/options/carpet-lilypond-gcc32,v 1.2 2002/09/08 20:38:35 schnetter Exp $
 
 CPP			= /home/eschnett/gcc32/bin/cpp -traditional -DCARPET_REAL
 CC			= /home/eschnett/gcc32/bin/gcc
@@ -12,10 +12,10 @@ F77FLAGS		= -fmessage-length=0
 F90FLAGS		= -fmessage-length=0
 LDFLAGS			= -Wl,-rpath,/home/eschnett/gcc32/lib
 
-C_OPTIMISE_FLAGS	= -O2 -ffast-math -funroll-loops -march=pentiumpro
-CXX_OPTIMISE_FLAGS	= -O2 -ffast-math -funroll-loops -march=pentiumpro
-F90_OPTIMISE_FLAGS	= -O2 -ffast-math -funroll-loops -march=pentiumpro -malign-double
-F77_OPTIMISE_FLAGS	= -O2 -ffast-math -funroll-loops -march=pentiumpro -malign-double
+C_OPTIMISE_FLAGS	= -O2 -funroll-loops -march=pentiumpro
+CXX_OPTIMISE_FLAGS	= -O2 -funroll-loops -march=pentiumpro
+F90_OPTIMISE_FLAGS	= -O2 -funroll-loops -march=pentiumpro -malign-double
+F77_OPTIMISE_FLAGS	= -O2 -funroll-loops -march=pentiumpro -malign-double
 
 C_WARN_FLAGS		= -Wall -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wstrict-prototypes -Wmissing-declarations
 CXX_WARN_FLAGS		= -Wall -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wstrict-prototypes -Wmissing-declarations
diff --git a/Carpet/Carpet/options/carpet-lilypond-ic b/Carpet/Carpet/options/carpet-lilypond-ic
index b5669b3c2..853238237 100644
--- a/Carpet/Carpet/options/carpet-lilypond-ic
+++ b/Carpet/Carpet/options/carpet-lilypond-ic
@@ -1,4 +1,4 @@
-# $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/options/carpet-lilypond-ic,v 1.4 2002/05/22 15:03:40 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/options/carpet-lilypond-ic,v 1.5 2002/09/08 20:38:36 schnetter Exp $
 
 CPP		= cpp -traditional -DCARPET_REAL
 CC		= icc
@@ -11,11 +11,11 @@ LIBDIRS		=
 LIBS		= intrins IEPCF90 F90 imf m irc cxa cprts cxa
 
 # basic
-CFLAGS		= -DCARPET_REAL -align -c99 -restrict
-CXXFLAGS	= -DCARPET_REAL -align -c99 -restrict
+CFLAGS		= -DCARPET_REAL -align -c99
+CXXFLAGS	= -DCARPET_REAL -align -c99
 F90FLAGS	= -DCARPET_REAL -align -w95
 F77FLAGS	= -DCARPET_REAL -align -w95
-LDFLAGS		= -DCARPET_REAL -align -c99 -restrict -g
+LDFLAGS		= -DCARPET_REAL -align -c99 -g
 
 # debugging
 DEBUG		= yes
@@ -33,10 +33,10 @@ F90_WARN_FLAGS	=
 
 # optimisation
 OPTIMISE		= yes
-C_OPTIMISE_FLAGS	= -O3 -ip -tpp6 -xiM
-CXX_OPTIMISE_FLAGS	= -O3 -ip -tpp6 -xiM
-F77_OPTIMISE_FLAGS	= -O3 -ip -tpp6 -xiM
-F90_OPTIMISE_FLAGS	= -O3 -ip -tpp6 -xiM
+C_OPTIMISE_FLAGS	= -O3 -tpp6 -xiM
+CXX_OPTIMISE_FLAGS	= -O3 -tpp6 -xiM
+F77_OPTIMISE_FLAGS	= -O3 -tpp6 -xiM
+F90_OPTIMISE_FLAGS	= -O3 -tpp6 -xiM
 
 # HDF
 HDF5		= YES
diff --git a/Carpet/Carpet/options/carpet-lilypond-ic7 b/Carpet/Carpet/options/carpet-lilypond-ic7
index d8c7a8722..687db2c49 100644
--- a/Carpet/Carpet/options/carpet-lilypond-ic7
+++ b/Carpet/Carpet/options/carpet-lilypond-ic7
@@ -1,4 +1,4 @@
-# $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/options/carpet-lilypond-ic7,v 1.1 2002/08/30 16:18:42 schnetter Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/options/carpet-lilypond-ic7,v 1.2 2002/09/08 20:38:36 schnetter Exp $
 
 CPP		= cpp -traditional -DCARPET_REAL
 CC		= /opt/intel/compiler70/ia32/bin/icc
@@ -33,10 +33,10 @@ F90_WARN_FLAGS	=
 
 # optimisation
 OPTIMISE		= yes
-C_OPTIMISE_FLAGS	= -O3 -ip -tpp6 -xiM
-CXX_OPTIMISE_FLAGS	= -O3 -ip -tpp6 -xiM
-F77_OPTIMISE_FLAGS	= -O3 -ip -tpp6 -xiM
-F90_OPTIMISE_FLAGS	= -O3 -ip -tpp6 -xiM
+C_OPTIMISE_FLAGS	= -O3 -tpp6 -xiM
+CXX_OPTIMISE_FLAGS	= -O3 -tpp6 -xiM
+F77_OPTIMISE_FLAGS	= -O3 -tpp6 -xiM
+F90_OPTIMISE_FLAGS	= -O3 -tpp6 -xiM
 
 # HDF
 HDF5		= YES