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

moved to gfortran; updated Makefiles and parts of source code

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: 2971
SVN UUID:     67feda4a-a26e-11df-9d6e-31afc202ad0c
parent ed17af50
# this is <Makefile>
# ----------------------------------------------------------------------------
# $Id: Makefile,v 1.6 2002-12-30 13:03:40 forbrig Exp $
# $Id: Makefile,v 1.7 2010-02-10 09:09:53 tforb Exp $
#
# Copyright (c) 2002 by Thomas Forbriger (IMG Frankfurt)
#
......@@ -12,22 +12,41 @@
# REVISIONS and CHANGES
# 01/03/2002 V1.0 Thomas Forbriger
# 30/12/2002 V1.1 added C++ directory
# 09/02/2010 V1.2 transition to gfortran
#
# ============================================================================
#
#
# NOTICE: fallback solution (f2c is default) can be activated by the
# environment variable TF_FALLBACK
# This option will disappear somewhere in the future!
all: install
ifeq ($(TF_FALLBACK),yes)
install: allhere allgremlin
LINLIB=-llapex -lblasex
# LINLIB=-lf2cimslmath
else
install: allhere allgremlin
LINLIB=-llapack -lblas
endif
#
FLAGS += $(MYFLAGS)
BUGGY=
F2CLIB=-lf2c -lm -L${SERVERLIBDIR}
F2CFLAGS=-f -u
PGPLOTLIB=-lf2cpgplot52 -lX11 -L/usr/X11/lib
PGPLOTLIB77=-lpgplot52 -lX11 -L/usr/X11/lib -L${SERVERLIBDIR}
CC=gcc
CFLAGS=-O2 -I${SERVERINCLUDEDIR} -I${LOCINCLUDEDIR}
GFLAG=
FFLAGS += -ff2c -Wall -ffixed-line-length-0 -fno-backslash $(FLAGS)
CFLAGS += -O3 -I${SERVERINCLUDEDIR} -I${LOCINCLUDEDIR} $(FLAGS)
AR=ar
RANLIB=ranlib
ifeq ($(TF_FALLBACK),yes)
.f.o:
f2c $(F2CFLAGS) $<
$(CC) $(CFLAGS) $(<:.f=.c) -c
......@@ -35,6 +54,10 @@ GFLAG=
%.o77: %.f
g77 -O2 -o $@ -c $< -Wall -ffixed-line-length-0 -fno-backslash
else
%.o: %.f
$(FC) -o $@ -c $< $(FFLAGS)
endif
.PHONY: clean edit
......@@ -66,6 +89,7 @@ allgremlin:
(cd libs; make libgin.a)
make gremlin
ifeq ($(TF_FALLBACK),yes)
gremlin: gremlin.o gremlin_help.o
gcc -o gremlin $^ \
-lgin \
......@@ -85,6 +109,27 @@ wgremlin: gremlin.o gremlin_help.o
gredim: gredim.o
gcc -o gredim gredim.o $(GFLAG) $(F2CLIB)
else
gremlin: gremlin.o gremlin_help.o
$(FC) -o gremlin $^ \
-lgin \
-lgrrefsub -lrefread \
$(LINLIB) -ltf -l$(TF_g77_PGPLOT) \
$(BUGGY) -L$(LOCLIBDIR) $(TF_LINK_PGPLOT)
/bin/mv -fv $@ $(LOCBINDIR)
# version using wang code
wgremlin: gremlin.o gremlin_help.o
$(FC) -o $@ $^ \
-lgin \
-lwrefsub -lrefread \
$(LINLIB) -ltf -l$(TF_g77_PGPLOT) \
$(BUGGY) -L$(LOCLIBDIR) $(TF_LINK_PGPLOT)
/bin/mv -fv $@ $(LOCBINDIR)
gredim: gredim.o
$(FC) -o gredim gredim.o $(GFLAG) $(F2CLIB)
endif
#----------------------------------------------------------------------
# C++ interface
......
# this is <Makefile>
# ----------------------------------------------------------------------------
# $Id: Makefile,v 1.3 2003-01-04 21:49:37 forbrig Exp $
# $Id: Makefile,v 1.4 2010-02-10 09:09:53 tforb Exp $
#
# Copyright (c) 2002 by Thomas Forbriger (IMG Frankfurt)
#
......@@ -24,6 +24,7 @@
#
# REVISIONS and CHANGES
# 30/12/2002 V1.0 Thomas Forbriger
# 09/02/2010 V1.1 checked for new compiler
#
# ============================================================================
#
......@@ -127,7 +128,7 @@ LIBOBS=$(patsubst %.cc,%.o,$(SRC))
libgremlin1xx.a: install-include $(LIBOBS)
ar rcv $@ $(LIBOBS)
ranlib $@
cp -vpf $@ $(LIBINSTALLPATH)
/bin/mv -vf $@ $(LIBINSTALLPATH)
#======================================================================
# dependencies
......@@ -203,28 +204,31 @@ install-include: $(INSTHEADER)
# your homepage. The doxyfull directory is just a symbolic link to this
# directory.
#
# documentation part
# ------------------
DOXYWWWPATH=$(WWWBASEDIR)/libgremlin1xx
.PHONY: doxyclean doxyview doxybriefview doxyfullconf doxybriefconf
doxyclean: ;/bin/rm -rfv docfull/* docbrief docfull
doxyclean: ;/bin/rm -rfv docfull/* docbrief/* docfull
DOXYSRC=$(README) $(HEADERS) $(SRC)
DOXYSRC=$(README) $(HEADERS) $(SRC)
doc%/html/index.html: doxy%.cfg $(DOXYSRC)
mkdir -vp $(DOXYWWWPATH)
doc%/html/index.html: doxy%.cfg doxyclean $(DOXYSRC)
mkdir -p $(DOXYWWWPATH)
/bin/rm -rfv $(patsubst doxy%.cfg,doc%,$<)/*
/bin/rm -rfv $(patsubst doxy%.cfg,doc%,$<)
ln -sfv $(DOXYWWWPATH) $(patsubst doxy%.cfg,doc%,$<)
doxygen $<
doxybriefconf doxyfullconf: doxy%conf:
doxywizard $(patsubst doxy%conf,doxy%.cfg,$@)
doxyfull doxybrief: doxy%: doxyclean doc%/html/index.html
doxydoc: doxyfull
doxyfull doxybrief: doxy%: doc%/html/index.html
doxydoc: doxyclean doxyfull
doxyfullview doxybriefview: doxy%view: doxy%
netscape doc$(patsubst doxy%view,%,$@)/html/index.html &
doxyview: doxydoc doxyfullview
$(TF_BROWSER) doc$(patsubst doxy%view,%,$@)/html/index.html &
doxyview: doxyfullview
#======================================================================
# delegate test targets
......
......@@ -3,7 +3,7 @@
*
* ----------------------------------------------------------------------------
*
* $Id: greenspec.cc,v 1.2 2003-01-04 21:49:37 forbrig Exp $
* $Id: greenspec.cc,v 1.3 2010-02-10 09:09:53 tforb Exp $
* \author Thomas Forbriger
* \date 04/01/2003
*
......@@ -13,13 +13,14 @@
*
* REVISIONS and CHANGES
* - 04/01/2003 V1.0 Thomas Forbriger
* - 09/02/2010 V1.1 moved initialization of magic code
*
* ============================================================================
*/
#define TF_GREENSPEC_CC_VERSION \
"TF_GREENSPEC_CC V1.0 "
"TF_GREENSPEC_CC V1.2"
#define TF_GREENSPEC_CC_CVSID \
"$Id: greenspec.cc,v 1.2 2003-01-04 21:49:37 forbrig Exp $"
"$Id: greenspec.cc,v 1.3 2010-02-10 09:09:53 tforb Exp $"
#include <gremlin1/greenspec.h>
#include <tfxx/fortranio.h>
......@@ -29,7 +30,7 @@
namespace gremlin1 {
const char GreenSpectrum::Mcmagic[];
const char GreenSpectrum::Mcmagic[]="1234";
std::istream& operator>>(std::istream& is, GreenSpectrum& green)
{
......
......@@ -3,7 +3,7 @@
*
* ----------------------------------------------------------------------------
*
* $Id: greenspec.h,v 1.3 2003-01-05 20:37:18 forbrig Exp $
* $Id: greenspec.h,v 1.4 2010-02-10 09:09:53 tforb Exp $
* \author Thomas Forbriger
* \date 04/01/2003
*
......@@ -13,6 +13,7 @@
*
* REVISIONS and CHANGES
* - 04/01/2003 V1.0 Thomas Forbriger
* - 09/02/2010 V1.1 moved initialization of magic code
*
* ============================================================================
*/
......@@ -21,9 +22,9 @@
#ifndef TF_GREENSPEC_H_VERSION
#define TF_GREENSPEC_H_VERSION \
"TF_GREENSPEC_H V1.0 "
"TF_GREENSPEC_H V1.1"
#define TF_GREENSPEC_H_CVSID \
"$Id: greenspec.h,v 1.3 2003-01-05 20:37:18 forbrig Exp $"
"$Id: greenspec.h,v 1.4 2010-02-10 09:09:53 tforb Exp $"
#include<aff/array.h>
#include<iostream>
......@@ -35,7 +36,7 @@ namespace gremlin1 {
public:
typedef std::complex<float> Tcvalue;
typedef aff::Array<Tcvalue> Tcarray;
static const char Mcmagic[]="1234";
static const char Mcmagic[];
GreenSpectrum(): Mdp(0.), Mpmin(0.), Mdf(0.), Mfmin(0.), Mgreen(1,1)
{ Mgreen=Tcvalue(0.); }
GreenSpectrum(const double& fmin, const double& fmax, const int& nf,
......
......@@ -3,7 +3,7 @@
*
* ----------------------------------------------------------------------------
*
* $Id: polymodel.cc,v 1.8 2003-01-04 19:17:37 forbrig Exp $
* $Id: polymodel.cc,v 1.9 2010-02-10 09:09:53 tforb Exp $
* \author Thomas Forbriger
* \date 30/12/2002
*
......@@ -17,13 +17,14 @@
* - version with means compiles
* - reinvented value function
* - 04/01/2003 V1.2 correction in calculation of mean values
* - 09/02/2010 V1.3 moved initialization of model identifier
*
* ============================================================================
*/
#define TF_POLYMODEL_CC_VERSION \
"TF_POLYMODEL_CC V1.2"
"TF_POLYMODEL_CC V1.3"
#define TF_POLYMODEL_CC_CVSID \
"$Id: polymodel.cc,v 1.8 2003-01-04 19:17:37 forbrig Exp $"
"$Id: polymodel.cc,v 1.9 2010-02-10 09:09:53 tforb Exp $"
#include <gremlin1/polymodel.h>
#include <tfxx/error.h>
......@@ -39,7 +40,7 @@ namespace gremlin1 {
typedef PolynomialModelFile::Tarray Tarray;
//! define identifier
const char PolynomialModelFile::modversion2[];
const char PolynomialModelFile::modversion2[]="ModVersion 2";
//! define static
const int PolynomialModelFile::norder;
//! define static
......
......@@ -3,7 +3,7 @@
*
* ----------------------------------------------------------------------------
*
* $Id: polymodel.h,v 1.5 2002-12-31 17:20:52 forbrig Exp $
* $Id: polymodel.h,v 1.6 2010-02-10 09:09:53 tforb Exp $
* \author Thomas Forbriger
* \date 30/12/2002
*
......@@ -14,6 +14,7 @@
* REVISIONS and CHANGES
* - 30/12/2002 V1.0 Thomas Forbriger
* - 31/12/2002 V1.1 introduced read access to arrays
* - 09/02/2010 V1.2 moved initialization of model identifier
*
* ============================================================================
*/
......@@ -22,9 +23,9 @@
#ifndef TF_POLYMODEL_H_VERSION
#define TF_POLYMODEL_H_VERSION \
"TF_POLYMODEL_H V1.0"
"TF_POLYMODEL_H V1.2"
#define TF_POLYMODEL_H_CVSID \
"$Id: polymodel.h,v 1.5 2002-12-31 17:20:52 forbrig Exp $"
"$Id: polymodel.h,v 1.6 2010-02-10 09:09:53 tforb Exp $"
#include<iostream>
#include<aff/array.h>
......@@ -52,7 +53,7 @@ namespace gremlin1 {
typedef aff::Array<int> Tiarray;
//! model file identifier
static const char modversion2[]="ModVersion 2";
static const char modversion2[];
//! number of polynomial orders
static const int norder=3;
//! number of physical parameters
......
# this is <libs/Makefile>
# ----------------------------------------------------------------------------
# $Id: Makefile,v 1.10 2002-07-04 15:13:42 forbrig Exp $
# $Id: Makefile,v 1.11 2010-02-10 09:09:53 tforb Exp $
#
# Copyright (c) 2002 by Thomas Forbriger (IMG Frankfurt)
#
......@@ -16,14 +16,33 @@
# 16/04/2002 V1.1 introduced variance version of res_opt
# 03/05/2002 V1.2 introduced external parselect
# 04/07/2002 V1.3 new mseisfk offset removal
# 09/02/2010 V1.4 transition to gfortran
#
# ============================================================================
#
#
# NOTICE: fallback solution (f2c is default) can be activated by the
# environment variable TF_FALLBACK
# This option will disappear somewhere in the future!
all: install
ifeq ($(TF_FALLBACK),yes)
install: libs
else
install: libs
endif
F2CLIB=-lf2c -lm -L${SERVERLIBDIR}
F2CFLAGS=-f -u
CC=gcc
CFLAGS=-O2 -I${SERVERINCLUDEDIR} -I${LOCINCLUDEDIR}
FLAGS += $(MYFLAGS)
FFLAGS += -ff2c -Wall -ffixed-line-length-0 -fno-backslash $(FLAGS)
CFLAGS += -O3 -I${SERVERINCLUDEDIR} -I${LOCINCLUDEDIR} $(FLAGS)
AR=ar
RANLIB=ranlib
DATOBS=dat_cgreen.o dat_cref.o dat_ctt.o dat_dcpc.o dat_dctt.o dat_dmode.o \
dat_famp.o dat_fcamp.o dat_fmamp.o dat_ftt.o dat_rgreen.o dat_rtt.o \
......@@ -58,6 +77,7 @@ OLGPGOBS=
ALLOBS=$(PGOBS) $(PAROBS) $(MODOBS) $(DATOBS) $(INVOBS) $(RESOBS)
ALLOBS77=$(ALLOBS:.o=.o77)
ifeq ($(TF_FALLBACK),yes)
.f.o:
f2c $(F2CFLAGS) $<
$(CC) $(CFLAGS) $(GFLAG) $(<:.f=.c) -c
......@@ -65,6 +85,10 @@ ALLOBS77=$(ALLOBS:.o=.o77)
%.o77: %.f
g77 -O2 -o $@ -c $< -Wall -ffixed-line-length-0 -fno-backslash
else
%.o77: %.f
$(FC) -O2 -o $@ -c $< -Wall $(FFLAGS)
endif
clean:
-/bin/rm *.o *.bak *.o77
......@@ -101,42 +125,42 @@ libs: libginmod.a libgindat.a libgininv.a libginpar.a libginpg.a libgin.a \
libginres.a: $(RESOBS)
ar rcv libginres.a $(RESOBS)
ranlib libginres.a
newlib libginres.a
/bin/mv -fv $@ $(LOCLIBDIR)
libginmod.a: $(MODOBS)
ar rcv libginmod.a $(MODOBS)
ranlib libginmod.a
newlib libginmod.a
/bin/mv -fv $@ $(LOCLIBDIR)
libgindat.a: $(DATOBS)
ar rcv libgindat.a $(DATOBS)
ranlib libgindat.a
newlib libgindat.a
/bin/mv -fv $@ $(LOCLIBDIR)
libgininv.a: $(INVOBS)
ar rcv libgininv.a $(INVOBS)
ranlib libgininv.a
newlib libgininv.a
/bin/mv -fv $@ $(LOCLIBDIR)
libginpar.a: $(PAROBS)
ar rcv libginpar.a $(PAROBS)
ranlib libginpar.a
newlib libginpar.a
/bin/mv -fv $@ $(LOCLIBDIR)
libgin.a: $(PGOBS) $(PAROBS) $(MODOBS) $(DATOBS) $(INVOBS) $(RESOBS)
ar rcv libgin.a $(PGOBS) $(PAROBS) $(MODOBS) $(DATOBS) $(INVOBS) $(RESOBS)
ranlib libgin.a
newlib libgin.a
/bin/mv -fv $@ $(LOCLIBDIR)
libgin77.a: $(ALLOBS77)
ar rcv $@ $^
ranlib $@
newlib $@
/bin/mv -fv $@ $(LOCLIBDIR)
libginpg.a: $(PGOBS)
ar rcv libginpg.a $(PGOBS)
ranlib libginpg.a
newlib libginpg.a
/bin/mv -fv $@ $(LOCLIBDIR)
allgremlin:
make libgin.a
......
c this is <mod_read.f>
c------------------------------------------------------------------------------
cS
c $Id: mod_read.f,v 1.2 2000-04-11 21:39:45 thof Exp $
c $Id: mod_read.f,v 1.3 2010-02-10 09:09:53 tforb Exp $
c
c 24/03/98 by Thomas Forbriger (IfG Stuttgart)
c
......@@ -16,6 +16,7 @@ c 14/01/99 V2.0 follow still set in section that has to be changed
c thus is now one section below
c 03/03/99 V2.1 did not check maximum number of available sections
c 11/04/00 V2.2 call mod_track
c 09/02/10 V2.3 correction in format for reading empty line
c
subroutine mod_read(filename, i)
c
......@@ -70,7 +71,8 @@ c
& 'NOTICE (mod_read): reading ',glqm_nsec,' model sections...'
if (glqm_nsec.gt.glqm_msec) stop 'ERROR (mod_read): too many sections'
do j=1,glqm_nsec
read(lu, '(/f15.7)', err=98, end=97) mdepth(j, i)
read(lu, '(/f15.7)', err=95, end=97) mdepth(j, i)
c print *,mdepth(j,i)
read(lu, fmt=*, err=98, end=97) (glqm_npol(j, k), k=1,glqm_mpar)
c print *,j,(glqm_npol(j, k), k=1,glqm_mpar)
do k=1,glqm_mpar
......@@ -87,9 +89,10 @@ c print *,'isposi ',j,k
if (glqm_npol(j, k).gt.glqm_mpol)
& stop 'ERROR (mod_read): too many coefficients!'
enddo
read(lu, '(1x)', err=98, end=97) comment
read(lu, '(a1)', err=98, end=97) comment
do k=1,glqm_mpol
read(lu, fmt=*, err=98, end=97) (model(k, j, l, i), l=1,glqm_mpar)
c print *, k,(model(k, j, l, i), l=1,glqm_mpar)
enddo
enddo
c
......@@ -213,6 +216,7 @@ c
98 stop 'ERROR (mod_read): reading file'
97 stop 'ERROR (mod_read): reading file - unexpected end'
96 stop 'ERROR (mod_read): closing file'
95 stop 'ERROR (mod_read): reading file: depth'
end
c
c ----- END OF mod_read.f -----
......@@ -110,9 +110,9 @@ c plot box
c
call pgsch(pg_lch)
if (pg_plottitle) then
call pglabel('frequency (Hz)','phase-slowness (s/km)',title)
call pglabel('frequency / Hz','phase-slowness / s km\u-1',title)
else
call pglabel('frequency (Hz)','phase-slowness (s/km)',' ')
call pglabel('frequency / Hz','phase-slowness / s km\u-1',' ')
endif
call pgsch(pg_ch)
c
......
......@@ -51,11 +51,11 @@ c calculate X2 of reference data
X2ref=dat_X2(.true.)
c
c set expected world coordinates
oonumax=1./(numax*(1.-float(nst-1.)/nst))
oonumax=1./(numax*(1.-float(nst-1)/nst))
oonumin=1./numax
call pgswin(.95*oonumin,1.05*oonumax,0.,(1.05*X2ref))
call pgbox('BC',0.0,0,'BC',0.0,0)
call pglab('1/\\gn','\\gx\\u2','find best \\gn')
call pglab('1/\gn','\gx\u2','find best \gn')
c
do i=1,nst
X2(i)=0.
......
c this is <pg_invfix.f>
c------------------------------------------------------------------------------
cS
c $Id: pg_invfix.f,v 1.3 2005-11-15 09:11:37 tforb Exp $
c $Id: pg_invfix.f,v 1.4 2010-02-10 09:09:53 tforb Exp $
c
c 24/03/98 by Thomas Forbriger (IfG Stuttgart)
c
......@@ -165,23 +165,23 @@ c maintain plots
& float(nstep), (x2start-thisx2))
write (title, 51) nu, x2start
call pgs_curve2(curvevp, lq_npts, lq_parimp , lq_x2imp,
& 'iteration', '\\gx\\u2\\d\\dstart\\u-\\gx\\u2',
& 'iteration', '\gx\u2\d\dstart\u-\gx\u2',
& title, .true., .false.)
elseif (mode.eq.3) then
call pgs_addval(lq_npts, glqm_mpts, lq_parimp, lq_x2imp,
& float(nstep),
& float(100.*(refx2-thisx2)/refx2))
& (100.*(refx2-thisx2)/refx2))
write (title, 51) nu, x2start
refx2=thisx2
call pgs_curve2(curvevp, lq_npts, lq_parimp , lq_x2imp,
& 'iteration', '\\gx\\u2\\d change [%]',
& 'iteration', '\gx\u2\d change / per cent',
& title, .true., .false.)
else
call pgs_addval(lq_npts, glqm_mpts, lq_parimp, lq_x2imp,
& float(nstep), (x2start-thisx2))
write (title, 50) nu, x2start, thisx2
call pgs_curve2(0, lq_npts, lq_parimp , lq_x2imp,
& 'iteration', '\\gx\\u2\\d\\dstart\\u-\\gx\\u2',
& 'iteration', '\gx\u2\d\dstart\u-\gx\u2',
& title, .true., .false.)
endif
endif
......@@ -223,9 +223,9 @@ c
if (verb_subaction) print *,'LEAVE pg_invfix'
c
return
50 format('iterative improvement for \\gn=',g7.1,' (\\gx\\u2\\d\\dstart\\u=',
& f10.7,', \\gx\\u2\\d=',f10.7,')')
51 format('iterative improvement for \\gn=',g7.1,' (\\gx\\u2\\d\\dstart\\u=',
50 format('iterative improvement for \\gn=',g7.1,' (\gx\u2\d\dstart\u=',
& f10.7,', \gx\u2\d=',f10.7,')')
51 format('iterative improvement for \gn=',g7.1,' (\gx\u2\d\dstart\u=',
& f6.3,')')
end
c
......
......@@ -78,7 +78,7 @@ c
c
write (title,50) pvar_pdev
call pgenv(pamin, pamax, X2min, X2max, 0, 2)
call pglab('-10*log\\d10\\u(\\gn)', '\\gx\\u2\\d(\\gn)', title)
call pglab('-10*log\d10\u(\gn)', '\gx\u2\d(\gn)', title)
call pgline(nsamp, param, X2)
call pgupdt
c
......
......@@ -135,9 +135,9 @@ c calculate new reference
& 'NOTICE (pg_min): found better estimate'
call pgpage
call pgs_curve(6, nnstep, xstep, stepx2, 'iteration',
& '\\gx\\u2\\d\\dorig\\u-\\gx\\u2')
& '\gx\u2\d\dorig\u-\gx\u2')
call pgs_curve(7, nnnu, nu, x2, 'parameter',
& '\\gx\\u2\\d\\dstart\\u-\\gx\\u2')
& '\gx\u2\d\dstart\u-\gx\u2')
endif
enddo
c
......
......@@ -102,7 +102,7 @@ c
call pgswin(parmin, parmax, maxdepth, mindepth)
if (.not.(takemem)) then
call pgsch(pg_lch)
call pglab('velocity (km/s)','depth (m)',' ')
call pglab('velocity / km s\u-1','depth / m',' ')
call pgsch(pg_ch)
endif
c
......@@ -110,11 +110,11 @@ c
call pgsci(pg_alphacol)
call pgsls(pg_alphals)
if (.not.(takemem))
& call pgmtxt('LV', 2., 1., 0.5, '\\ga')
& call pgmtxt('LV', 2., 1., 0.5, 'v\dP')
call pgsci(pg_betacol)
call pgsls(pg_betals)
if (.not.(takemem))
& call pgmtxt('LV', 2., 0.0, 0.5, '\\gb')
& call pgmtxt('LV', 2., 0.0, 0.5, 'v\dS')
call pgsch(pg_ch)
c
call pgsci(pg_alphacol)
......@@ -185,7 +185,7 @@ c
if (.not.(takemem)) then
call pgbox('BCNTS',0.,0,'BCTS',0.,0)
call pgsch(pg_lch)
call pglab('density (g/cm\\u3\\d)',' ',' ')
call pglab('density / g cm\u-3\d',' ',' ')
call pgsch(pg_ch)
endif
c
......
c this is <pg_opt.f>
c------------------------------------------------------------------------------
cS
c $Id: pg_opt.f,v 1.2 2000-04-10 10:31:18 thof Exp $
c $Id: pg_opt.f,v 1.3 2010-02-10 09:09:53 tforb Exp $
c
c 24/03/98 by Thomas Forbriger (IfG Stuttgart)
c
......@@ -112,11 +112,11 @@ c switch to main device an start curve plot
call pgmon_update(pgmon_l_inner)
write (title, 50) x2start, best_x2
call pgs_curve2(12, npts ,nsteps ,x2step ,
& 'iteration', '\\gx\\u2\\d\\dstart\\u-\\gx\\u2',