Commit ac3f246c authored by thomas.forbriger's avatar thomas.forbriger Committed by thomas.forbriger
Browse files

pending problem with gfortran 4.1

This is a legacy commit from before 2015-03-01.
It may be incomplete as well as inconsistent.
See COPYING.legacy and README.history for details.


SVN Path:     http://gpitrsvn.gpi.uni-karlsruhe.de/repos/TFSoftware/trunk
SVN Revision: 2941
SVN UUID:     67feda4a-a26e-11df-9d6e-31afc202ad0c
parent 0c066cb8
# this is <Makefile>
# ----------------------------------------------------------------------------
# $Id: Makefile,v 1.14 2009-11-27 10:50:04 tforb Exp $
# $Id: Makefile,v 1.15 2009-11-27 11:06:43 tforb Exp $
#
# Copyright (c) 2007 by Thomas Forbriger (BFO Schiltach)
#
......@@ -79,7 +79,10 @@ PGPLOTLIB77=-lpgplot52 -lX11 -L/usr/X11/lib -L${SERVERLIBDIR}
CC=gcc
CFLAGS=-O2 -I${SERVERINCLUDEDIR} -I${LOCINCLUDEDIR}
GFLAG=
FFLAGS += -ff2c -Wall -ffixed-line-length-none $(FLAGS) -frecord-marker=4
#FFLAGS += -ff2c -Wall -ffixed-line-length-none $(FLAGS) -frecord-marker=4
# setting binary markers to 4 for gfortran 4.1 prevents reading the PGPLOT
# FONT file
FFLAGS += -ff2c -Wall -ffixed-line-length-none $(FLAGS)
ifeq ($(TF_FALLBACK),yes)
F2CLIB=-lf2c -lm -L${SERVERLIBDIR}
......
# this is <Makefile>
# ----------------------------------------------------------------------------
# $Id: Makefile,v 1.10 2008-09-15 15:17:01 tforb Exp $
# $Id: Makefile,v 1.11 2009-11-27 11:05:53 tforb Exp $
#
# Copyright (c) 2007 by Thomas Forbriger (BFO Schiltach)
#
......@@ -64,7 +64,10 @@ FORTRANLIB=$(TF_LINK_FORTRAN)
FLAGS += $(MYFLAGS)
CFLAGS += -O2 $(FLAGS)
FFLAGS += -ff2c -Wall -ffixed-line-length-none $(FLAGS)
#FFLAGS += -ff2c -Wall -ffixed-line-length-none $(FLAGS) -frecord-marker=4
# setting binary markers to 4 for gfortran 4.1 prevents reading the PGPLOT
# FONT file
FFLAGS += -ff2c -Wall -ffixed-line-length-none $(FLAGS)
# use STATIC=-static to produce statically linked binaries
STATIC=
......@@ -131,8 +134,8 @@ else
@rm $(<:.f=.c)
%.o: %.f; $(FC) -c -o $@ $< $(FFLAGS)
grepg: $(GREBOBS)
$(FC) $(FFLAGS) $(LDFLAGS) $^ -o $@ \
-ltf $(PGPLOT77LIB)
$(FC) $(FFLAGS) $^ -o $@ \
-ltf $(PGPLOT77LIB) $(LDFLAGS)
/bin/mv -fv $@ $(LOCBINDIR)
endif
......
c this is file <grepg.f>
c======================================================================
c $Id: grepg.f,v 1.38 2009-10-08 11:40:10 tforb Exp $
c $Id: grepg.f,v 1.39 2009-11-27 11:05:53 tforb Exp $
c
c GREPG.F
c
......@@ -131,7 +131,7 @@ c program version:
character*120 CVS_VERSION
parameter(CVS_VERSION=
& '$Id: grepg.f,v 1.38 2009-10-08 11:40:10 tforb Exp $')
& '$Id: grepg.f,v 1.39 2009-11-27 11:05:53 tforb Exp $')
c declare variables for io
character*80 filename
......@@ -1533,6 +1533,9 @@ c check byte sex
isgabor=.false.
iskspec=.false.
read(lu, err=98, end=97) inmagic
if (debug) then
print *,'DEBUG: read magic number: ',inmagic,incmagic
endif
call tf_bytesex(cmagic, inmagic, cpu, match)
if (cpu.eq.1) then
print *,'running on Intel...'
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment