From 2f611588c20aa7b8bc556d60f35d201875c6b3d7 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Mon, 11 May 2009 00:33:47 +0000 Subject: setup local environment --- bin/Makefile | 10 +++++----- orrs/bin/Makefile | 8 ++++---- orrs/bin/Makefile_DP | 8 ++++---- plotlib/Makefile | 6 +++--- plotlib/config.make | 12 ++++++------ plotlib/config.make.DP | 12 ++++++------ src/pplot.f | 2 +- 7 files changed, 29 insertions(+), 29 deletions(-) diff --git a/bin/Makefile b/bin/Makefile index 568c96c..d910f7d 100644 --- a/bin/Makefile +++ b/bin/Makefile @@ -99,9 +99,9 @@ CFLAGS = -O -DUNDERSCORE #FFLAGS = -g -O0 -C ##-------------------------- ### Intel Fortran Compiler -FC = ifort -FFLAGS = -O -FFLOPT = -O +#FC = ifort +#FFLAGS = -O +#FFLOPT = -O #FTNLIB = -Vaxlib /usr/lib/C-ctype.o /usr/lib/C_name.o /usr/lib/ctype-info.o #FTNLIB = -Vaxlib #FTNLIB = -i_dynamic @@ -112,8 +112,8 @@ FFLAGS = -O -r8 -CB FFLOPT = -O -r8 -CB PLTOBJ = ../plotlib/libPltDP.a -FFLAGS = -O -r8 -ftrapuv -fpe0 -FFLOPT = -O -r8 -ftrapuv -fpe0 +FFLAGS = -O -r8 +FFLOPT = -O -r8 all: $(PROGS) diff --git a/orrs/bin/Makefile b/orrs/bin/Makefile index bd13205..12959f0 100644 --- a/orrs/bin/Makefile +++ b/orrs/bin/Makefile @@ -11,10 +11,10 @@ FTNLIB = #======================================== # Uncomment for Intel Fortran Compiler -FC = ifort -FLG = -O -fpe0 -CB -PLTLIB = -L/usr/X11R6/lib -lX11 -FTNLIB = +#FC = ifort +#FLG = -O -fpe0 -CB +#PLTLIB = -L/usr/X11R6/lib -lX11 +#FTNLIB = # Additional IFC stuff needed on MIT's Athena system #FC = ifc diff --git a/orrs/bin/Makefile_DP b/orrs/bin/Makefile_DP index 782c858..2aa7f9a 100644 --- a/orrs/bin/Makefile_DP +++ b/orrs/bin/Makefile_DP @@ -11,10 +11,10 @@ FTNLIB = #======================================== # Uncomment for Intel Fortran Compiler -FC = ifort -FLG = -O -r8 -PLTLIB = -L/usr/X11R6/lib -lX11 -FTNLIB = +#FC = ifort +#FLG = -O -r8 +#PLTLIB = -L/usr/X11R6/lib -lX11 +#FTNLIB = #======================================== diff --git a/plotlib/Makefile b/plotlib/Makefile index 76bb09f..65a91fe 100644 --- a/plotlib/Makefile +++ b/plotlib/Makefile @@ -35,8 +35,8 @@ #INSTALLDIR= . # Use these to set default library name (overridden in config.make file) -PLTLIB = libPlt.a -#PLTLIB = libPltDP.a +#PLTLIB = libPlt.a +PLTLIB = libPltDP.a ###======================================================== @@ -88,7 +88,7 @@ LINKLIB = -lX11 ### This line includes your compiler/make options ### with definitions for compiler and flags -include ./config.make +include ./config.make.DP ###================================================ diff --git a/plotlib/config.make b/plotlib/config.make index 0870844..5fb4453 100644 --- a/plotlib/config.make +++ b/plotlib/config.make @@ -51,8 +51,8 @@ DEFINE = -DUNDERSCORE ###------------------------------------------------------------------------- ### Uncomment for Linux, using Intel Fortran compiler 8.x -FC = ifort -CC = gcc +#FC = ifort +#CC = gcc # Uncomment to make double-precision version #DP = -r8 @@ -67,12 +67,12 @@ LINKLIB = -L/usr/X11R6/lib -lX11 ###------------------------------------------------------------------------- ### Uncomment for DEC OSF/Alpha -#FC = f77 +FC = f77 # # Uncomment DP to make double-precision version -#DP = -r8 -#CFLAGS = -O4 -float $(DEFINE) -#FFLAGS = -O4 $(DP) +DP = -r8 +CFLAGS = -O4 $(DEFINE) +FFLAGS = -O4 $(DP) # Debug flags #CFLAGS = -O0 -g -float $(DEFINE) #FFLAGS = -O0 -g $(DP) diff --git a/plotlib/config.make.DP b/plotlib/config.make.DP index a49acbf..f0f3480 100644 --- a/plotlib/config.make.DP +++ b/plotlib/config.make.DP @@ -51,8 +51,8 @@ DEFINE = -DUNDERSCORE ###------------------------------------------------------------------------- ### Uncomment for Linux, using Intel Fortran compiler -FC = ifort -CC = gcc +#FC = ifort +#CC = gcc # Uncomment to make double-precision version DP = -r8 @@ -66,12 +66,12 @@ LINKLIB = -L/usr/X11R6/lib -lX11 ###------------------------------------------------------------------------- ### Uncomment for DEC OSF/Alpha -#FC = f77 +FC = f77 # # Uncomment DP to make double-precision version -#DP = -r8 -#CFLAGS = -O4 -float $(DEFINE) -#FFLAGS = -O4 $(DP) +DP = -r8 +CFLAGS = -O4 $(DEFINE) +FFLAGS = -O4 $(DP) # Debug flags #CFLAGS = -O0 -g -float $(DEFINE) #FFLAGS = -O0 -g $(DP) diff --git a/src/pplot.f b/src/pplot.f index 249c4fd..171e6a3 100644 --- a/src/pplot.f +++ b/src/pplot.f @@ -36,7 +36,7 @@ C PROGRAM PPLOT INCLUDE 'PPLOT.INC' C - LOGICAL ERROR, LGETFN + LOGICAL ERROR, LGETFN, LERR REAL RINP(10) REAL CPOLO(NAX,IPTOT,NPX), VPOLO(NAX,2,NPX) C -- cgit v1.2.3