Commit df746752 authored by laura.gassner's avatar laura.gassner

Merge branch 'thof/DENISE-import_Seitosh'

parents aca39e8a 628f7bb8
doc
bin
header
# This is a file for environment variables used in Makefiles in aff fourier stfinv # this is <Makefile_var>
# ----------------------------------------------------------------------------
#
# Copyright (c) 2015 by Thomas Forbriger (BFO Schiltach)
#
# set variables expected by vendor Makefiles
#
# REVISIONS and CHANGES
# 02/11/2015 V1.0 Thomas Forbriger
#
# ============================================================================
#
# This file is included (via make include statement) by Makefiles in
# aff, fourier, stfinv, and libcseife
#
# Its purpose is to set make variables which are expected by vendor Makefiles.
#
# ============================================================================
LOCINCLUDEDIR=../header # extract relative path to contrib with respect of including Makefile
CONTRIBDIR:=$(abspath $(dir $(lastword $(MAKEFILE_LIST))))
LOCLIBDIR=../bin # ----------------------------------------------------------------------------
LOCBINDIR=../bin # set values required by vendor Makefiles
LOCINCLUDEDIR=$(CONTRIBDIR)/header
TF_WWWBASEDIR=$HOME/public_html/txt/cxx LOCLIBDIR=$(CONTRIBDIR)/bin
LOCBINDIR=$(CONTRIBDIR)/bin
TF_WWWBASEDIR=$(CONTRIBDIR)/doc
TF_BROWSER=firefox TF_BROWSER=firefox
# set Fortran compiler if not yet set in environment
ifeq "$(origin FC)" "default"
FC=/usr/bin/g77-3.3 FC=/usr/bin/g77-3.3
endif
# ----- END OF Makefile_var -----
...@@ -2,7 +2,7 @@ this is <COPYING> ...@@ -2,7 +2,7 @@ this is <COPYING>
============================================================================ ============================================================================
libaff libaff
------ ------
$Id: COPYING 4964 2013-02-01 13:27:42Z lrehor $ $Id$
============================================================================ ============================================================================
Copyright (C) 2002 by Thomas Forbriger and Wolfgang Friederich Copyright (C) 2002 by Thomas Forbriger and Wolfgang Friederich
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* *
* ---------------------------------------------------------------------------- * ----------------------------------------------------------------------------
* *
* $Id: Carray.h 3957 2011-05-16 14:46:43Z tforb $ * $Id$
* \author Thomas Forbriger * \author Thomas Forbriger
* \date 14/05/2011 * \date 14/05/2011
* *
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
#define AFF_CARRAY_H_VERSION \ #define AFF_CARRAY_H_VERSION \
"AFF_CARRAY_H V1.0 " "AFF_CARRAY_H V1.0 "
#define AFF_CARRAY_H_CVSID \ #define AFF_CARRAY_H_CVSID \
"$Id: Carray.h 3957 2011-05-16 14:46:43Z tforb $" "$Id$"
#include<aff/array.h> #include<aff/array.h>
#include<aff/lib/checkedcast.h> #include<aff/lib/checkedcast.h>
......
# this is <Makefile> # this is <Makefile>
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
# $Id: Makefile 4964 2013-02-01 13:27:42Z lrehor $ # $Id$
# #
# Copyright (c) 2002 by Thomas Forbriger (IMG Frankfurt) # Copyright (c) 2002 by Thomas Forbriger (IMG Frankfurt)
# #
...@@ -24,19 +24,10 @@ ...@@ -24,19 +24,10 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# ---- # ----
# #
# A note on header files: # Please have a look at the README file coming along with the source code in
# We extensively comment class declarations within the header files. The # this directory for further notes regarding provided functionality,
# reduce compilation time when using the library code, comments will be # prerequisites and installation.
# stripped from the header files that are exportet. These stripped versions
# are placed in the source code path with name *.h.strip and will be linked to
# INCINSTALLPATH with name *.h.
# #
# Although comment stripping could be done by perl with an elaborate regular
# expression, we prefer the remcmmnt command by Jari Laaksonen. You can find
# the code at
# http://www.eti.pg.gda.pl/KATEDRY/kecs/lab-cpp/snippets/
# If it is not available to you, you should set TF_REMCMMNT=cat (see below)
#
# REVISIONS and CHANGES # REVISIONS and CHANGES
# 06/12/2002 V1.0 Thomas Forbriger # 06/12/2002 V1.0 Thomas Forbriger
# 27/12/2002 V1.1 doxygen reads Fortran code and files generated by f2c # 27/12/2002 V1.1 doxygen reads Fortran code and files generated by f2c
...@@ -52,26 +43,12 @@ ...@@ -52,26 +43,12 @@
# 17/01/2011 V1.9 distinguish library creation and installation # 17/01/2011 V1.9 distinguish library creation and installation
# 27/07/2011 V1.10 give precedence to $LOCINCLUDEDIR over # 27/07/2011 V1.10 give precedence to $LOCINCLUDEDIR over
# $SERVERINCLUDEDIR # $SERVERINCLUDEDIR
# 26/01/2014 eliminate comment stripping
# #
# ============================================================================ # ============================================================================
#
# environment variables
# ---------------------
#
# You will like to set the following 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.
# TF_WWWBASEDIR Defines the path to your personal homepage. That's the
# place where doxygen output will be written too (see
# below).
#
# You will find the installed library header files in $(LOCINCLUDEDIR)/aff
include ../Makefile_var CONTRIBDIR=..
include $(CONTRIBDIR)/Makefile_var
.PHONY: all .PHONY: all
...@@ -113,36 +90,19 @@ SRC=lib/error.cc dump.cc lib/strided.cc lib/stridedstepper.cc \ ...@@ -113,36 +90,19 @@ SRC=lib/error.cc dump.cc lib/strided.cc lib/stridedstepper.cc \
# test programs are placed in a subdirectory # test programs are placed in a subdirectory
TESTS=$(wildcard tests/*.cc) TESTS=$(wildcard tests/*.cc)
# whereever we find a README, we will use it # whereever we find a README, we will use it
README=$(shell find . -name README) README.changelog README.groups README=$(shell find . -name README)
# the frame of doxygen documentation is palced in text files
DOXYTXT=$(shell find . -name doxygen\*.txt)
# place where we will copy header files # place where we will copy header files
INCINSTALLPATH=$(LOCINCLUDEDIR)/aff INCINSTALLPATH=$(LOCINCLUDEDIR)/aff
# place where we will copy the binary library # place where we will copy the binary library
LIBINSTALLPATH=$(LOCLIBDIR) LIBINSTALLPATH=$(LOCLIBDIR)
# name of headers with comments stripped off (these are linked to your include
# directory)
STRIPHEADER=$(addsuffix .strip,$(notdir $(HEADERS)))
# name of installed (exported) header files (these are the names in your # name of installed (exported) header files (these are the names in your
# include directory) # include directory)
INSTHEADER=$(addprefix $(INCINSTALLPATH)/,$(filter-out ./tests/%,$(HEADERS))) INSTHEADER=$(addprefix $(INCINSTALLPATH)/,$(filter-out ./tests/%,$(HEADERS)))
#======================================================================
# comments can be removed from headers
# ------------------------------------
# if defined, empty lines are kept in comment-stripped headers
# to synchronize line numbers (necessary during library debugging)
EMPTYPRINT=1
#EMPTYPRINT=0
# define this to be cat in case you do not have remcmmnt available
ifndef TF_REMCMMNT
TF_REMCMMNT=cat
endif
#REMCMMNT=remcmmnt
#REMCMMNT=cat
#====================================================================== #======================================================================
# compiler and preprocessor flags # compiler and preprocessor flags
# ------------------------------- # -------------------------------
...@@ -158,9 +118,8 @@ CPPFLAGS=$(addprefix -I,$(LOCINCLUDEDIR) $(subst :, ,$(SERVERINCLUDEDIR))) \ ...@@ -158,9 +118,8 @@ CPPFLAGS=$(addprefix -I,$(LOCINCLUDEDIR) $(subst :, ,$(SERVERINCLUDEDIR))) \
# ------- # -------
# files which are to be edited # files which are to be edited
flist: Makefile tests/Makefile doxydoc.cfg $(README) COPYING \ flist: Makefile doxydoc.cfg $(README) COPYING \
$(HEADERS) $(SRC) $(TESTS) $(wildcard doxy*.cfg) \ $(HEADERS) $(SRC) $(TESTS) $(wildcard doxy*.cfg) $(DOXYTXT)
tests/f77common.inc tests/f77procs.f
echo $(filter-out lib/% tests/%,$^) | tr ' ' '\n' | sort > $@ echo $(filter-out lib/% tests/%,$^) | tr ' ' '\n' | sort > $@
echo $(filter lib/%,$^) | tr ' ' '\n' | sort >> $@ echo $(filter lib/%,$^) | tr ' ' '\n' | sort >> $@
echo $(filter tests/%,$^) | tr ' ' '\n' | sort >> $@ echo $(filter tests/%,$^) | tr ' ' '\n' | sort >> $@
...@@ -177,9 +136,7 @@ clean: ; ...@@ -177,9 +136,7 @@ clean: ;
-find . -name \*.bak | xargs --no-run-if-empty /bin/rm -v -find . -name \*.bak | xargs --no-run-if-empty /bin/rm -v
-find . -name \*.o | xargs --no-run-if-empty /bin/rm -v -find . -name \*.o | xargs --no-run-if-empty /bin/rm -v
-find . -name \*.d | xargs --no-run-if-empty /bin/rm -v -find . -name \*.d | xargs --no-run-if-empty /bin/rm -v
-find . -name \*.h.strip | xargs --no-run-if-empty /bin/rm -v -/bin/rm -vf flist *.o install-include *.xxx junk* *.a *.so
-/bin/rm -vf flist *.o install-include libcontxx.a *.xxx junk* *.a *.so
cd tests; $(MAKE) clean
#====================================================================== #======================================================================
# library part # library part
...@@ -218,35 +175,12 @@ include $(patsubst %.cc,%.d,$(SRC)) ...@@ -218,35 +175,12 @@ include $(patsubst %.cc,%.d,$(SRC))
#====================================================================== #======================================================================
# header files # header files
# ------------ # ------------
#
# Since we extensively document the class structures within the header files,
# these should be stripped for the production version (otherwise the compiler
# has to scan all comments on each compile). Stripping is done by the rule
# below and is controlled by the variables TF_REMCMMNT and EMPTYPRINT (see
# above).
# comment stripping
# -----------------
$(call CHECKVARS,TF_REMCMMNT EMPTYPRINT)
# awk rule assumes that the first non-comment line starts with '#'
# and that the first (copyright) comment end with pattern "^ */"
%.h.strip: %.h
awk 'BEGIN {hot=1;} /^ \*\// { if (hot) { hot=2; print; next;} }\
/^#/ { hot=0; } \
{ if (hot==2) { print ""; } else if (hot) { print; } }' $< > $@
$(TF_REMCMMNT) $< | awk 'BEGIN {hot=0;} \
/^ *$$/ { if ((hot) && ($(EMPTYPRINT))) { print ""; } next; } \
/^#/ { hot=1; } { if (hot) print; }' >> $@
#----------------------------------------------------------------------
.PRECIOUS: %.h.strip
$(call CHECKVAR,INCINSTALLPATH) $(call CHECKVAR,INCINSTALLPATH)
$(INCINSTALLPATH)/%.h: %.h.strip $(INCINSTALLPATH)/%.h: %.h
mkdir -vp $(dir $@) @mkdir -vp $(dir $@)
-rm -fv $@ -@rm -fv $@
/bin/cp -vpd $< $@ @/bin/cp -vpd $< $@
# install header files # install header files
.PHONY: install-include .PHONY: install-include
...@@ -292,9 +226,7 @@ DOXYWWWPATH=$(TF_WWWBASEDIR)/libaff ...@@ -292,9 +226,7 @@ DOXYWWWPATH=$(TF_WWWBASEDIR)/libaff
doxyclean: ;/bin/rm -rfv $(TF_WWWBASEDIR)/libaff doxydoc.xxx doxyclean: ;/bin/rm -rfv $(TF_WWWBASEDIR)/libaff doxydoc.xxx
DOXYSRC=$(README) $(HEADERS) $(SRC) \ DOXYSRC=$(DOXYTXT) $(HEADERS) $(SRC)
tests/f77procs.P tests/f77procs.f \
tests/f77common.inc tests/f77common_com.P
# create doxygen intermediate configuration # create doxygen intermediate configuration
PWD=$(shell env pwd) PWD=$(shell env pwd)
...@@ -326,36 +258,6 @@ kdocview: kdoc; $(TF_BROWSER) file:$(KDOCDIR)/index.html & ...@@ -326,36 +258,6 @@ kdocview: kdoc; $(TF_BROWSER) file:$(KDOCDIR)/index.html &
showsections: $(README) showsections: $(README)
egrep -n '\\subsection|\\section|\\page' $^ egrep -n '\\subsection|\\section|\\page' $^
#======================================================================
# delegate test targets
# ---------------------
tests/%.P:
cd tests; echo "#############################"; $(MAKE) $(notdir $@)
tests/f2ctest: tests/f77test.cc install-include libaff.a
cd tests; echo "#############################"; $(MAKE) $(notdir $@)
tests/%: tests/%.cc install-include libaff.a
cd tests; echo "#############################"; $(MAKE) $(notdir $@)
tests/bin%: tests/bin%.cc install-include libaff.a
cd tests; echo "#############################"; $(MAKE) $(notdir $@)
tests/%.run: tests/%
echo "#############################"
$< $(ARG)
/bin/rm -fv $< $<.o
# after each modification to the library this target should be used
compile-tests: \
tests/shapetest.run \
tests/reprtest.run \
tests/arraytest.run \
tests/operatortest.run \
tests/helpertest.run \
tests/f77test.run
#====================================================================== #======================================================================
# create package # create package
# -------------- # --------------
......
This diff is collapsed.
this is <README>
============================================================================
aff
---
$Id$
============================================================================
This directory contains source code for the library aff. It was exportet
from TF_Software to DENISE. DENISE is hosted in the Trac-/svn-project
FWI_elastic (http://gpitrsvn.gpi.uni-karlsruhe.de/repos/FWI_elastic/DENISE).
See COPYING for copyright and license information.
Exports:
Each time this source code is exported to DENISE the current version is
tagged. The directory containing the tagged version is named by the day
of the export (yyyymmdd) and can be found in
http://gpitrsvn.gpi.uni-karlsruhe.de/repos/TFSoftware/export/aff.
19/10/2011 First export of the version tagged in 20111019
01/02/2013 Export of version tagged in 20130201
----- END OF README -----
#
# SIK Auswahl fuer FF library
#
*.c *.h *.f ?akefile *.inc *.cc *.tcc
#
# when working with m4
*.m4 *.fpp
#
README*
#
# there are CVS working directories
CVS
#
# doxygen configuration
*.cfg
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* *
* ---------------------------------------------------------------------------- * ----------------------------------------------------------------------------
* *
* $Id: array.h 4004 2011-06-21 19:28:23Z tforb $ * $Id$
* \author Thomas Forbriger * \author Thomas Forbriger
* \since 08/12/2002 * \since 08/12/2002
* *
...@@ -136,7 +136,7 @@ ...@@ -136,7 +136,7 @@
#define AFF_ARRAY_H_VERSION \ #define AFF_ARRAY_H_VERSION \
"AFF_ARRAY_H V1.2" "AFF_ARRAY_H V1.2"
#define AFF_ARRAY_H_CVSID \ #define AFF_ARRAY_H_CVSID \
"$Id: array.h 4004 2011-06-21 19:28:23Z tforb $" "$Id$"
#include <aff/lib/sharedheap.h> #include <aff/lib/sharedheap.h>
#include <aff/lib/strided.h> #include <aff/lib/strided.h>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* *
* ---------------------------------------------------------------------------- * ----------------------------------------------------------------------------
* *
* $Id: arrayoperators.h 3957 2011-05-16 14:46:43Z tforb $ * $Id$
* \author Thomas Forbriger * \author Thomas Forbriger
* \date 10/02/2004 * \date 10/02/2004
* *
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
#define AFF_ARRAYOPERATORS_H_VERSION \ #define AFF_ARRAYOPERATORS_H_VERSION \
"AFF_ARRAYOPERATORS_H V1.0 " "AFF_ARRAYOPERATORS_H V1.0 "
#define AFF_ARRAYOPERATORS_H_CVSID \ #define AFF_ARRAYOPERATORS_H_CVSID \
"$Id: arrayoperators.h 3957 2011-05-16 14:46:43Z tforb $" "$Id$"
#include<aff/array.h> #include<aff/array.h>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* *
* ---------------------------------------------------------------------------- * ----------------------------------------------------------------------------
* *
* $Id: converters.h 3957 2011-05-16 14:46:43Z tforb $ * $Id$
* \author Thomas Forbriger * \author Thomas Forbriger
* \date 15/05/2011 * \date 15/05/2011
* *
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
#define AFF_CONVERTERS_H_VERSION \ #define AFF_CONVERTERS_H_VERSION \
"AFF_CONVERTERS_H V1.0 " "AFF_CONVERTERS_H V1.0 "
#define AFF_CONVERTERS_H_CVSID \ #define AFF_CONVERTERS_H_CVSID \
"$Id: converters.h 3957 2011-05-16 14:46:43Z tforb $" "$Id$"
#include<aff/array.h> #include<aff/array.h>
#include<aff/series.h> #include<aff/series.h>
......
...@@ -89,9 +89,7 @@ WARN_LOGFILE = ...@@ -89,9 +89,7 @@ WARN_LOGFILE =
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
INPUT = ./ INPUT = ./
INPUT_ENCODING = UTF-8 INPUT_ENCODING = UTF-8
FILE_PATTERNS = README \ FILE_PATTERNS = doxygen*.txt \
README.changelog \
README.groups \
*.h \ *.h \
*.cc *.cc
RECURSIVE = YES RECURSIVE = YES
......
/*! \file README.changelog /*! \file doxygen.changelog.txt
* \brief ChangeLog for C++ containers for numbers (libaff) * \brief ChangeLog for C++ containers for numbers (libaff)
* *
* ---------------------------------------------------------------------------- * ----------------------------------------------------------------------------
* *
* $Id: README.changelog 4964 2013-02-01 13:27:42Z lrehor $ * $Id$
* *
* Copyright (c) 2002 by Thomas Forbriger (IMG Frankfurt) * Copyright (c) 2002 by Thomas Forbriger (IMG Frankfurt)
* *
...@@ -31,13 +31,14 @@ ...@@ -31,13 +31,14 @@
* *
* REVISIONS and CHANGES * REVISIONS and CHANGES
* - 17/12/2002 V1.0 Thomas Forbriger * - 17/12/2002 V1.0 Thomas Forbriger
* - 12/06/2013 V1.1 renamed file
* *
* ============================================================================ * ============================================================================
*/ */
/*! \page page_changelog ChangeLog (AFF) /*! \page page_changelog ChangeLog (AFF)
$Id: README.changelog 4964 2013-02-01 13:27:42Z lrehor $ $Id$
\sa \ref page_project_status \sa \ref page_project_status
...@@ -290,7 +291,7 @@ ...@@ -290,7 +291,7 @@
/*! \page page_project_status Project status (AFF) /*! \page page_project_status Project status (AFF)
$Id: README.changelog 4964 2013-02-01 13:27:42Z lrehor $ $Id$
\sa \ref page_changelog \sa \ref page_changelog
...@@ -521,4 +522,4 @@ ...@@ -521,4 +522,4 @@
</TABLE> </TABLE>
*/ */
// ----- END OF README.changelog ----- // ----- END OF doxygen.changelog.txt -----
/*! \file libaff/README.groups /*! \file libaff/doxygen.groups.txt
* \brief groups in libaff * \brief groups in libaff
* *
* ---------------------------------------------------------------------------- * ----------------------------------------------------------------------------
* *
* $Id: README.groups 4964 2013-02-01 13:27:42Z lrehor $ * $Id$
* *
* Copyright (c) 2011 by Thomas Forbriger (BFO) * Copyright (c) 2011 by Thomas Forbriger (BFO)
* *
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
* *
* REVISIONS and CHANGES * REVISIONS and CHANGES
* - 15/05/2011 V1.0 Thomas Forbriger * - 15/05/2011 V1.0 Thomas Forbriger
* - 12/06/2013 V1.1 renamed file
* *
\todo \todo
...@@ -132,4 +133,4 @@ ...@@ -132,4 +133,4 @@
/*======================================================================*/ /*======================================================================*/
// ----- END OF README.groups ----- // ----- END OF doxygen.groups.txt -----
This diff is collapsed.
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* *
* ---------------------------------------------------------------------------- * ----------------------------------------------------------------------------
* *
* $Id: dump.cc 3117 2010-08-12 12:07:25Z tforb $ * $Id$
* \author Thomas Forbriger * \author Thomas Forbriger
* \date 12/12/2002 * \date 12/12/2002
* *
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
#define AFF_DUMP_CC_VERSION \ #define AFF_DUMP_CC_VERSION \
"AFF_DUMP_CC V1.1" "AFF_DUMP_CC V1.1"
#define AFF_DUMP_CC_CVSID \ #define AFF_DUMP_CC_CVSID \
"$Id: dump.cc 3117 2010-08-12 12:07:25Z tforb $" "$Id$"
#include <aff/lib/dump_strided.h> #include <aff/lib/dump_strided.h>
#include <aff/lib/error.h> #include <aff/lib/error.h>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* *
* ---------------------------------------------------------------------------- * ----------------------------------------------------------------------------
* *
* $Id: dump.h 3084 2010-08-10 16:01:03Z tforb $ * $Id$
* \author Thomas Forbriger * \author Thomas Forbriger
* \date 12/12/2002 * \date 12/12/2002
* *
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
#define AFF_DUMP_H_VERSION \ #define AFF_DUMP_H_VERSION \
"AFF_DUMP_H V1.3"