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

[FEATURE] (librefpar): provide new library

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.

[MERGE] (trunk): merge commit e4d5c527ba2c2596a3e2c5df0e51150d4 into trunk

e4d5c52 2014-09-24 11:39:21 +0200 Thomas Forbriger <Thomas.Forbriger@kit.edu>
 [WP][DOC] (librefpar): correct typo
 src/libs/librefpar/README | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

e2207e1 2014-09-24 11:32:15 +0200 Thomas Forbriger <Thomas.Forbriger@kit.edu>
 [WP][DOC] (librefpar): add proper README
 src/libs/librefpar/README | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

a8d0c68 2014-09-24 11:28:11 +0200 Thomas Forbriger <Thomas.Forbriger@kit.edu>
 [WP][DOC] (librefpar): add proper COPYING file
 src/libs/librefpar/COPYING | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

8f3950b 2014-09-24 11:23:18 +0200 Thomas Forbriger <Thomas.Forbriger@kit.edu>
 [WP] (librefpar): adjust refmet
 src/synt/ref/refmet/Makefile     | 30 +++++++++++++-----------------
 src/synt/ref/refmet/README       |  1 +
 src/synt/ref/refmet/sub/Makefile |  5 ++---
 src/synt/ref/refmet/sub/README   | 14 +++++++++-----
 4 files changed, 25 insertions(+), 25 deletions(-)

89d2177 2014-09-24 11:15:07 +0200 Thomas Forbriger <Thomas.Forbriger@kit.edu>
 [WP] (librefpar): include librefpar in collection of libraries
 src/README.dependencies    |  6 ++++++
 src/libs/Makefile          |  2 ++
 src/libs/README            |  2 ++
 src/libs/README.librefread | 12 ------------
 4 files changed, 10 insertions(+), 12 deletions(-)

8dc08bd 2014-09-24 11:11:31 +0200 Thomas Forbriger <Thomas.Forbriger@kit.edu>
 [WP] (librefpar): compile library
 src/libs/librefpar/Makefile | 46 +++++++++++----------------------------------
 1 file changed, 11 insertions(+), 35 deletions(-)

ccb0333 2014-09-24 11:07:07 +0200 Thomas Forbriger <Thomas.Forbriger@kit.edu>
 [WP] (librefpar): move source code
 src/libs/librefpar/refmet_comments.f      | 110 ++++++++++++
 src/libs/librefpar/refmet_intro.f         |  67 ++++++++
 src/libs/librefpar/refmet_rmod.f          | 162 ++++++++++++++++++
 src/libs/librefpar/refmet_rrcv.f          | 182 ++++++++++++++++++++
 src/libs/librefpar/refmet_rsource.f       | 276 ++++++++++++++++++++++++++++++
 src/synt/ref/refmet/sub/refmet_comments.f | 110 ------------
 src/synt/ref/refmet/sub/refmet_intro.f    |  67 --------
 src/synt/ref/refmet/sub/refmet_rmod.f     | 162 ------------------
 src/synt/ref/refmet/sub/refmet_rrcv.f     | 182 --------------------
 src/synt/ref/refmet/sub/refmet_rsource.f  | 276 ------------------------------
 10 files changed, 797 insertions(+), 797 deletions(-)

3d58a00 2014-09-24 11:03:12 +0200 Thomas Forbriger <Thomas.Forbriger@kit.edu>
 [WP] (librefpar): rename librefread to librefpar
 src/libs/librefpar/COPYING   |  30 ++++++++++
 src/libs/librefpar/Makefile  | 137 +++++++++++++++++++++++++++++++++++++++++++
 src/libs/librefpar/README    |  34 +++++++++++
 src/libs/librefread/COPYING  |  30 ----------
 src/libs/librefread/Makefile | 137 -------------------------------------------
 src/libs/librefread/README   |  34 -----------
 6 files changed, 201 insertions(+), 201 deletions(-)

e7d1603 2014-09-24 11:01:26 +0200 Thomas Forbriger <Thomas.Forbriger@kit.edu>
 [WP] (librefread): add framework for new library package
 src/libs/librefread/COPYING  |  30 ++++++++++
 src/libs/librefread/Makefile | 137 +++++++++++++++++++++++++++++++++++++++++++
 src/libs/librefread/README   |  34 +++++++++++
 3 files changed, 201 insertions(+)

SVN Path:     http://gpitrsvn.gpi.uni-karlsruhe.de/repos/TFSoftware/trunk
SVN Revision: 5656
SVN UUID:     67feda4a-a26e-11df-9d6e-31afc202ad0c
parents 675616a1 e2608c4c
......@@ -230,6 +230,12 @@ Fortran 77 libraries
libraries: libttsynt.a
external dependencies: -
internal dependencies: -
librefpar
libraries: librefpar.a
language: Fortran 77
external dependencies: -
internal dependencies: -
checked: 24.09.2014 (tforb)
C libraries
-----------
......
......@@ -57,6 +57,7 @@
# 12/01/2010 V1.3 provide target install for consistency
# 31/01/2014 added libtsioxx, re-ordered flist entries
# 10/02/2014 thof: use new package installation scheme with install.sh
# 24/09/2014 thof: add librefpar
#
# ============================================================================
#
......@@ -78,6 +79,7 @@ LIBDIRS= \
libts \
libtsxx \
libfapidxx \
librefpar \
libgrrefsub \
libwrefsub \
librheology \
......
......@@ -58,6 +58,8 @@ Actively maintained libraries
C++ code for time series filters.
libttsynt:
TTSYNT —- synthetic traveltimes for dipping refractors
librefpar:
Read reflectivity parameter files
libwrefsub:
Synthetics Fourier-Bessel expansion coefficients for models with water
layer
......
this is <README.librefread>
============================================================================
note regarding librefread
-------------------------
$Id: $
============================================================================
19/01/2001 by Thomas Forbriger (IMGF Frankfurt)
notice: librefread.a may be compiled and installed from src/synt/ref/refmet
----- END OF README.librefread -----
this is <COPYING>
============================================================================
librefpar: read reflectivity parameter files
--------------------------------------------
libs/librefpar
=========================================================================
Copyright (c) 1996, 2005, 2014 by Thomas Forbriger (BFO Schiltach)
The source code and other files in this directory are part of librefpar which
compiles to the binary library librefpar.a. librefpar is a library supporting
parameter files as used by the reflectivity code refmet.
librefpar is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
----- END OF COPYING -----
This is a legacy version of the repository. It may be incomplete as well as
inconsistent. See README.history for details. For the old stock of the
repository copyright and licence conditions apply as specified for versions
commited after 2015-03-01. Use recent versions as a base for new development.
The legacy version is only stored to keep a record of history.
# this is <Makefile>
# ----------------------------------------------------------------------------
# $Id$
#
# Copyright (c) 2014 by Thomas Forbriger (BFO Schiltach)
#
# Makefile for librefread
#
# ----
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# ----
#
# Please have a look at the README file coming along with the source code in
# this directory for further notes regarding provided functionality,
# prerequisites and installation.
#
# REVISIONS and CHANGES
# 24/09/2014 V1.0 Thomas Forbriger
#
# ============================================================================
#
LIBRARIES=librefpar.a
.PHONY: all
all: install
# efa.doc still uses deprecated tcl script
.PHONY: doc
doc:
.PHONY: install
install: $(addprefix $(LOCLIBDIR)/,$(LIBRARIES))
$(LOCLIBDIR)/%: install-include %
mkdir -pv $(LOCLIBDIR)
/bin/mv -fv $(word 2,$^) $(LOCLIBDIR)
.PHONY: reinstall
reinstall:
$(MAKE) clean
$(MAKE) install
.PHONY: install-include
install-include:
#----------------------------------------------------------------------
flist: Makefile $(wildcard *.f) README COPYING
echo $^ | tr ' ' '\n' | sort > $@
.PHONY: edit
edit: flist; vim $<
.PHONY: clean
clean: ;
-find . -name \*.bak | xargs --no-run-if-empty /bin/rm -v
-/bin/rm -vf flist *.o *.a *.d
CHECKVAR=$(if $($(1)),,$(error ERROR: missing variable $(1)))
CHECKVARS=$(foreach var,$(1),$(call CHECKVAR,$(var)))
$(call CHECKVARS,LOCINCLUDEDIR LOCLIBDIR)
FLAGS += $(MYFLAGS)
FFLAGS += -Wall -ff2c -ffixed-line-length-0 -fno-backslash $(FLAGS) \
-fimplicit-none -pedantic
CFLAGS += -O3 $(FLAGS)
LDFLAGS+=$(addprefix -L,$(LOCLIBDIR) $(subst :, ,$(SERVERLIBDIR)))
CPPFLAGS+=$(addprefix -I,$(LOCINCLUDEDIR) $(subst :, ,$(SERVERINCLUDEDIR))) \
$(FLAGS)
#----------------------------------------------------------------------
LIBSRC=refmet_rmod.f refmet_rsource.f refmet_rrcv.f \
refmet_intro.f refmet_comments.f
LIBOBS=$(patsubst %.s,%.o,$(LIBSRC))
#----------------------------------------------------------------------
%.o: %.f
$(FC) -O2 -o $@ -c $< $(FFLAGS)
librefpar.a: $(LIBOBS)
ar rcv librefpar.a $(LIBOBS)
ranlib librefpar.a
#---------------------------------------------------------------------
# create package
# --------------
ifdef TF_MAKEPKG
.PHONY: package
package: $(TF_MAKEPKG)
$(MAKE) -f $< \
PACKAGE=librefpar \
PACKAGEEXPORT="trunk/src/libs/librefpar:src" \
PACKAGETARGETS="src:install:" \
PACKAGELIBS="-"
endif
# ----- END OF Makefile -----
this is <README>
============================================================================
librefpar: read reflectivity parameter files
--------------------------------------------
libs/librefpar
============================================================================
For compilation instructions see README.1st in the root directory of the tar-ball or
http://gpitrsvn.gpi.uni-karlsruhe.de:8000/TFSoftware/wiki/docs/installation
librefpar reads parameter files used to configure the reflectivity program
refmet. Some of these files are used by other programs too. For this reason
the file reading subroutines are provided separate from the refmet code in
this library. Until 24/09/2014 the code was part of the refmet package.
Installation
------------
environment variables:
LOCINCLUDEDIR Defines the path where header files will be copied for
usage in your own projects. You will pass this path to
the precompiler with the -I option.
LOCLIBDIR Defines the path where the binary library will be
placed.
make all installs headers, binary libraries and documentation
See also README.compile
Dependencies
------------
external dependencies: -
internal dependencies: -
============================================================================
The home of this software suite is
http://gpitrsvn.gpi.uni-karlsruhe.de:8000/TFSoftware/wiki/trunk/src/libs/librefpar
Please send bug reports and suggestions to
Thomas.Forbriger@kit.edu
----- END OF README -----
......@@ -31,6 +31,8 @@
# check environment
# discard package creation
# 14/01/2011 V1.4 implemented refmetx with libfapidxx interface
# 24/09/2014 thof: part of the code in librefread is moved to librefpar,
# a dedicated library in the collection of libraries
#
# ============================================================================
#
......@@ -90,22 +92,16 @@ LDFLAGS=$(addprefix -L,$(LOCLIBDIR) $(subst :, ,$(SERVERLIBDIR))) $(STATIC)
CPPFLAGS=$(addprefix -I,$(LOCINCLUDEDIR) $(subst :, ,$(SERVERINCLUDEDIR))) \
$(FLAGS)
REAMPOBS=refmet_basinf.o refmet_rmod.o refmet_rmain.o refmet_rsource.o refmet_rrcv.o
REAMPOBS=refmet_basinf.o
REFMETOBS=refmet_output.o refmet_preptrace.o refmet_wtrace.o lmath.o\
refmet_basinf.o refmet_rmain.o refmet_rmod.o refmet_rsource.o refmet_rrcv.o\
refmet_intro.o refmet_comments.o
refmet_basinf.o refmet_rmain.o
REFMUOBS=main/ref2mu.o
REFMATOBS=refmat_basinf.o refmet_rmain.o refmet_rmod.o\
refmet_rsource.o refmet_intro.o refmet_comments.o
REFMATOBS=refmat_basinf.o refmet_rmain.o
RESUSOBS=refmet_output.o refmet_preptrace.o refmet_wtrace.o lmath.o\
resus_basinf.o refmet_rmain.o refmet_rsource.o refmet_rrcv.o\
refmet_intro.o refmet_comments.o
resus_basinf.o refmet_rmain.o
RESUSNOBS=refmet_output.o refmet_preptrace.o refmet_wtrace.o lmath.o\
resusnoise_basinf.o refmet_rmain.o refmet_rsource.o refmet_rrcv.o\
refmet_intro.o refmet_comments.o
GRESYSUB=main/gresy.o sub/refmet_rrcv.o
LIBREFMETOBS=$(addprefix sub/,refmet_basinf.o refmet_rmain.o refmet_rmod.o \
refmet_rsource.o refmet_rrcv.o refmet_intro.o refmet_comments.o)
resusnoise_basinf.o refmet_rmain.o
LIBREFMETOBS=$(addprefix sub/,refmet_basinf.o refmet_rmain.o)
.PHONY: install-include
install-include:
......@@ -121,20 +117,20 @@ matbau: %: main/%.o
$(FC) $< -o $@ $(LDFLAGS)
grema: %: main/%.o sub/refmet_rrcv.o
$(FC) $(FFLAGS) $^ -o $@ -lrefread -ltf -lsff \
$(FC) $(FFLAGS) $^ -o $@ -lrefpar -lrefread -ltf -lsff \
$(LDFLAGS)
refmatsh refmat resus refmet:
$(FC) $^ -o $@ -lsff -lemod -ltf \
$(FC) $^ -o $@ -lrefpar -lsff -lemod -ltf \
$(LDFLAGS) $(FFLAGS)
refmetx:
$(FC) $^ -o $@ -lemod -ltf \
$(FC) $^ -o $@ -lrefpar -lemod -ltf \
-lfapidxx -ldatrwxx -lsffxx -lgsexx -ltime++ -laff \
$(LDFLAGS) $(FFLAGS)
resusnoise:
$(FC) $^ -o $@ -lsff -lemod -ltf -lgsl -lgslcblas \
$(FC) $^ -o $@ -lrefpar -lsff -lemod -ltf -lgsl -lgslcblas \
$(LDFLAGS) $(FFLAGS)
librefread.a: $(LIBREFMETOBS)
......@@ -164,7 +160,7 @@ fullpackage: $(TF_MAKEPKG)
PACKAGE=refmetwithlibs \
PACKAGEEXPORT="trunk/src/synt/ref/refmet:src" \
PACKAGETARGETS="src:all" \
PACKAGELIBS="libemod libsff libtf libsffu libts libaff libtime libgsexx libsffxx libdatrwxx libfapidxx"
PACKAGELIBS="librefpar libemod libsff libtf libsffu libts libaff libtime libgsexx libsffxx libdatrwxx libfapidxx"
endif
# ----- END OF Makefile -----
......@@ -95,6 +95,7 @@ Dependencies:
libtf
libtime (libtime, libtime++)
libemod
librefpar
librefread (Part of refmet)
============================================================================
......
......@@ -25,6 +25,7 @@
# REVISIONS and CHANGES
# 15/09/2008 V1.0 Thomas Forbriger
# use gfortran
# 24/09/2014 thof: move part of the source code to librefpar
#
# ============================================================================
#
......@@ -77,9 +78,7 @@ install-include:
#----------------------------------------------------------------------
LIBREFMETOBS=refmet_basinf.o refmet_rmain.o refmet_rmod.o refmet_rsource.o\
refmet_rrcv.o\
refmet_intro.o refmet_comments.o
LIBREFMETOBS=refmet_basinf.o refmet_rmain.o
librefread.a: $(LIBREFMETOBS)
ar rcv librefread.a $(LIBREFMETOBS)
......
......@@ -16,8 +16,8 @@ Source code in this subdirectory:
usage texts for main programs
sub/refmat_basinf.f
sub/refmet_basinf.f
sub/refmet_comments.f
sub/refmet_intro.f
sub/refmet_comments.f (included from librefpar)
sub/refmet_intro.f (included from librefpar)
sub/refmet_preptrace.f
sub/resus_basinf.f
sub/resusnoise_basinf.f
......@@ -31,9 +31,13 @@ Time series output functions
Functions to read configuration files
sub/refmet_rmain.f
sub/refmet_rmod.f
sub/refmet_rrcv.f
sub/refmet_rsource.f
sub/refmet_rmod.f (included from librefpar)
sub/refmet_rrcv.f (included from librefpar)
sub/refmet_rsource.f (included from librefpar)
On 24/09/2014 some of the source files (as indicated above) were moved to a
dedicated library package called librefpar.
============================================================================
......
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