Commit 9f50793a authored by thomas.forbriger's avatar thomas.forbriger
Browse files

[MERGE] (gremlin|master) Merge branch 'master' into gremlin

Conflicts:
	src/green/gremlin1/Makefile
parents d006c809 d5809e88
...@@ -53,10 +53,25 @@ junk* ...@@ -53,10 +53,25 @@ junk*
*.TT *.TT
*.su *.su
*.sff *.sff
#
# temporary files
*.tmp
*.htmp
#
# automatic prototypes
*.P
#
# secondary LaTeX output
*.aux
*.dvi
*.log
*.toc
*.bbl
*.blg
#
# ignore all source code files, which can automatically be created # ignore all source code files, which can automatically be created
# and which store user specific settings # and which store user specific settings
# ---------------------------------------------------------------- # ----------------------------------------------------------------
src/green/gremlin1/libs/glq_dim.inc src/green/gremlin1/libs/glq_dim.inc
#
# #
# ----- END OF .gitignore ----- # ----- END OF .gitignore -----
this is <CHANGELOG>
============================================================================
Recent development in Seitosh (bug fixes, new features, etc)
------------------------------------------------------------
25.02.2016 (32a3ac206): fix errors in documentation of lisousi
The offset dependent scaling factor was wrong incorrectly specified in the
online documentation.
08.02.2016 (33d32e44b): fix zero-offset scaling issue in refract
refract used to fail in multiple ways is zero-offset traces were to be
scaled with an offset dependent factor. With this commit refract is advanced
to version 4.14 which is robust against zero-offset traces. For scaling
exponents larger than zero any zero offset trace is scaled to a straight
line as is expected to for the scaling definition. Negative exponents are
inhibited.
04.11.2015 (db684f2e1): pamo supports various input file formats
27.10.2015 (b95726e01): Make Seitosh less system specific
Explicitely use /bin/bash and make use of printf (instead of echo command
with non-standard options).
26.10.2015 (e1816be7d): Add step-by-step example for lisousi
19.10.2015 (bfef3205e): Revision of end-user documentation of libstfinv
The end-user documentation supplied by libstfinv is completely revised. New
usage() functions are introduced. Program 'onlinehelp' (source is in
libstfinv/tests/onlinehelp.cc) outputs the new texts. soutifu is updated to
make use of the new usage functions.
21.09.2015 (66d134190): Bug fix in lisousi
Trim convolution result to reasonable index range (784484c40).
19.07.2015 (f58ebd580, 088bc064ba): New options for stuplo
Implement new options for winplot emulation:
-py display positive values only
-n1 n set first sample to plot to n'th sample
for each input time series
-n2 n set last sample to plot to n'th sample
for each input time series
n=0 means: last sample read from file
-ra remove average of each input time series
----- END OF CHANGELOG -----
this is <COPYING>
============================================================================
Copyright, license and disclaimer of warranty
---------------------------------------------
Seitosh (A Seismologist's Tool Shed)
====================================
Seitosh is a collection of software source code. It provides software
libraries and programs for seismic signal processing and the simulation and
inversion of seismic data. Copyright statements and author's names are given
in the COPYING files in the respective subdirectories as well as in the
comments within the files themselves.
The home location of seitosh is https://git.scc.kit.edu/Seitosh/Seitosh
You are invited to fork the project and provide your own contributions.
Most files are published under the terms of the GNU General Public License as
published by the Free Software Foundation. For some of the files specific
licensing conditions apply. Please read the COPYING files in the respective
subdirectories and the comments within the files themselves. A copy of the GNU
General Public License is provided in LICENSE.GPL
See files COPYING.legacy for conditions applying to legacy commits.
Disclaimer of Warranty
======================
The content of this repository 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.
The contents were compiled with due diligence. However, the authors and
distributors of the Seitosh repository shall not assume any liability, neither
expressly nor implied, for the type or correctness of the material offered and
shall not be liable (including liability for indirect loss or loss of profit)
for the material or use of this material. In case contents violate valid legal
regulations, we kindly ask you to inform us immediately. Such we will be able
to remove the site or the respective contents as quickly as possible.
References to External Resources
================================
The contents of this repository contain links to information, data and source
code offered by servers which are not subject to the control and
responsibility of the distributor of Seitosh, be it the original repository or
any fork of it. He shall not assume any responsibility or guarantee for this
information and shall not approve of or support such information in terms of
contents.
Contact
=======
Questions and recommendations regarding the original repository shall be
directed to
Dr. Thomas Forbriger
email: Thomas.Forbriger@kit.edu
Black Forest Observatory (BFO), Heubach 206, 77709 Wolfach, Germany,
Geophysical Institute (GPI), Karlsruhe Institute of Technology (KIT)
Tel.: ++49 (0)7836/2151, Fax.: ++49 (0)7836/955240
http://www.gpi.kit.edu/BFO.php
----- 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.
How to install seitosh
======================
Recommended steps to take
-------------------------
1. Read [src/README.compile](src/README.compile)
which provides a thourough overview of requirements and
environment variables expected by Makefiles.
2. Read [contrib/pgplot/README.pgplot](contrib/pgplot/README.pgplot)
to understand how to install the PGPLOT library, which is
required by programs producing graphical output.
3. Once you feel ready (having installed all required compilers
and external libaries, having set all expected environment
variable) change to directory [src](src) and use the shell
script [src/compile.sh](src/compile.sh) by issuing the
command
compile.sh install
Further resources of information
--------------------------------
* https://git.scc.kit.edu/Seitosh/Seitosh/wikis/home
is the wiki accompanying the repository
* https://git.scc.kit.edu/Seitosh/Seitosh/wikis/doc/PGPLOT
Instructions for the installation of PGPLOT
* http://gpitrsvn.gpi.uni-karlsruhe.de:8000/TFSoftware
is the predecessor of Seitosh
* http://gpitrsvn.gpi.uni-karlsruhe.de:8000/TFSoftware/wiki/trunk
provides documentation for source-code subdirectories; however,
not all of them have been transferred to Seitosh and not all Seitosh
directories are mentioned there
Please check COPYING files in each directory for directory specific licensing
information.
The majority of the contents is published under the GNU GENERAL PUBLIC LICENSE
GNU GENERAL PUBLIC LICENSE GNU GENERAL PUBLIC LICENSE
Version 2, June 1991 Version 2, June 1991
......
# this is <Makefile>
# ----------------------------------------------------------------------------
#
# Copyright (c) 2015 by Thomas Forbriger (BFO Schiltach)
#
# Top level Makefile for Seitosh
#
# REVISIONS and CHANGES
# 28/04/2015 V1.0 Thomas Forbriger
#
# ============================================================================
#
# options to be set for src/compile.sh
COMPILEOPT=--pause
all:
# collect files to be maintained
EDITFILES=$(filter-out src contrib %.bak,$(wildcard *) \
$(shell find src -type f -maxdepth 1) \
$(shell find contrib -type f))
flist: Makefile $(EDITFILES)
echo $(filter-out src/% contrib/%,$^) | tr ' ' '\n' | sort > $@
echo '----' >> $@
echo $(filter src/%,$^) | tr ' ' '\n' | sort >> $@
echo '----' >> $@
echo $(filter contrib/%,$^) | 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
src/compile.sh $(COMPILEOPT) clean
# ======================================================================
# check mandatory environment variable settings
# ---------------------------------------------
CHECKVAR=$(if $($(1)),,$(error ERROR: missing variable $(1)))
CHECKVARS=$(foreach var,$(1),$(call CHECKVAR,$(var)))
$(call CHECKVARS,LOCSCRIPTDIR)
# ======================================================================
# compile and install
#
# install
.PHONY: install
.PHONY: doc
.PHONY: all
doc all: %: ; src/compile.sh $(COMPILEOPT) $@
install: %:
mkdir -pv $(LOCSCRIPTDIR)
/bin/cp -vpd src/compile.sh $(LOCSCRIPTDIR)
/bin/cp -vpd contrib/utilities/checkcopying $(LOCSCRIPTDIR)
/bin/cp -vpd contrib/utilities/checkcopyright $(LOCSCRIPTDIR)
/bin/cp -vpd contrib/utilities/checkgplphrase $(LOCSCRIPTDIR)
/bin/cp -vpd contrib/utilities/checklibs.sh $(LOCSCRIPTDIR)
/bin/cp -vpd contrib/utilities/checklinkedlibs $(LOCSCRIPTDIR)
/bin/cp -vpd contrib/utilities/depcheck.sh $(LOCSCRIPTDIR)
/bin/cp -vpd contrib/utilities/gplphrase $(LOCSCRIPTDIR)
/bin/cp -vpd contrib/utilities/new $(LOCSCRIPTDIR)
/bin/cp -vpd contrib/utilities/systemtype.sh $(LOCSCRIPTDIR)
src/compile.sh $(COMPILEOPT) $@
# ----- END OF Makefile -----
this is <README>
============================================================================
Some information regarding the TFSoftware repository
----------------------------------------------------
$Id$
============================================================================
Preamble
========
This software repository originally was meant for personal use (by Thomas
Forbriger) only. In 2010 it was made available to others in order to share the
code, bug fixes, and extensions. As a consequence parts of this repository are
not yet tailored to be used by a team of developers. This will change in the
future. Currently you will find it in a transitional state.
Copyright notice
================
By committing to this repository your code contributions pretty sure will mix
with existing code in a way that your lines of code and your files and
existing code will become intrinsically tied. Large parts of the code are
licensed under the GPL (GNU GENERAL PUBLIC LICENSE). This will also be the
case for your contributions to these parts. It cannot be foreseen under which
license conditions or in which context other parts of the code will be used in
the future, nor will it be possible to remove your contributions again without
reverting to older revisions of the repository and thus loosing functionality.
For this reason by submitting code to this respository you agree that it may
be used freely together with the existing code and that you pass your economic
rights to the owner of the repository. If you feel uncomfortable with this,
put your code explicitly under the GPL or choose a different option (other
repository) to store your code.
If you like to use parts of the code that do not contain an explicit license
in a context apart from personal (non-commercial) use, you shall first get
into contact with Thomas Forbriger to straighten any copyright issues and
receive his consent.
The subdirectory "3rd" contains third party contributions of which I (Thomas
Forbriger) do not hold the copyright. They are integrated in the respository
for ease of use. Further there are other locations (for historical reasons)
where the repository contains code for which I am not the copyright holder.
By checking out from the repository you agree that you will use this part of
the code only for your personal (non-commercial) use and in agreement with the
individual license conditions of the files.
Disclaimer of Warranty
======================
The content of this repository 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.
The contents were compiled with due diligence. However, Karlsruhe Institute of
Technology shall not assume any liability, neither expressly nor implied, for
the type or correctness of the material offered and shall not be liable
(including liability for indirect loss or loss of profit) for the material or
use of this material. In case contents violate valid legal regulations, we
kindly ask you to inform us immediately. We will then remove the site or the
respective contents as quickly as possible.
References to External Resources
================================
The contents of this repository contain links to information, data and source
code offered by servers which are not subject to the control and
responsibility of the Karlsruhe Institute of Technology. Karlsruhe Institute
of Technology shall not assume any responsibility or guarantee for this
information and shall not approve of or support such information in terms of
contents.
--
| Dr. Thomas Forbriger e-mail: Thomas.Forbriger@kit.edu
| Geophysical Institute, Karlsruhe Institute of Technology (KIT)
| Black Forest Observatory (BFO), Heubach 206, 77709 Wolfach, Germany,
| Tel.: ++49 (0)7836/2151, Fax.: ++49 (0)7836/955240
| http://www.gpi.kit.edu/BFO.php
----- END OF README -----
Seitosh
=======
A Seismologist's Tool Shed
Seitosh is a collection of source code for program libraries
and programs in seismic data processing, seismic data simulation
and inversion. They are kept bundled in one repository due to
their strong interrelation. For further information see the
accompanying [wiki](https://git.scc.kit.edu/Seitosh/Seitosh/wikis/home).
Copyright and License
---------------------
See [COPYING](COPYING) for copyright and license and disclaimer
of warranty. You are invited to fork this project and to provide
your own additions by sending patches or pull requests.
The home of the original Seitosh repository is https://git.scc.kit.edu/Seitosh/Seitosh
Installation
------------
See [INSTALL.md](INSTALL.md) for installation instructions.
Contents
--------
Contents of directories:
- [src](src): All source code, README files describing the installation
process and requiredments, and a shell script supporting the installation
process can be found here.
- [contrib](contrib): Additional files supporting the developers and the
users of the code are provided in this subdirectory.
The files herein are no integral part of the Seitosh source code.
The contents of this repository previously were hosted
in the [TFSoftware](http://gpitrsvn.gpi.uni-karlsruhe.de:8000/TFSoftware)
repository. Not all of the accompanying documentation and
installations instructions have yet been copied from there.
See [README.history](README.history) for the history of
this project.
News
----
Recent development (bug fixes, new features, etc) is reported in
[CHANGELOG](CHANGELOG).
...@@ -9,5 +9,5 @@ ...@@ -9,5 +9,5 @@
# GNU General Public License for more details. # GNU General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software # along with this program. If not, see <http://www.gnu.org/licenses/>.
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
...@@ -139,7 +139,8 @@ include $(patsubst %.cc,%.d,$(SRCFILES)) ...@@ -139,7 +139,8 @@ include $(patsubst %.cc,%.d,$(SRCFILES))
# description and online texts # description and online texts
# ---------------------------- # ----------------------------
%.cc %.h: %_text.txt OBJ=$(patsubst %.cc,%.o,$(SRC) $(patsubst %.txt,%.cc,$(DESCRIPTIONTXT)))
%.cc %.h: %.txt
echo "// DO NOT EDIT: this file is automatically derived from $<" \ echo "// DO NOT EDIT: this file is automatically derived from $<" \
> $(patsubst %.txt,%.h,$<) > $(patsubst %.txt,%.h,$<)
echo "extern char $(patsubst %.txt,%,$<)[];" >> $(patsubst %.txt,%.h,$<) echo "extern char $(patsubst %.txt,%,$<)[];" >> $(patsubst %.txt,%.h,$<)
...@@ -148,10 +149,14 @@ include $(patsubst %.cc,%.d,$(SRCFILES)) ...@@ -148,10 +149,14 @@ include $(patsubst %.cc,%.d,$(SRCFILES))
echo "#include \"$(patsubst %.txt,%.h,$<)\"" >> $(patsubst %.txt,%.cc,$<) echo "#include \"$(patsubst %.txt,%.h,$<)\"" >> $(patsubst %.txt,%.cc,$<)
echo "char $(patsubst %.txt,%,$<)[]=" >> $(patsubst %.txt,%.cc,$<) echo "char $(patsubst %.txt,%,$<)[]=" >> $(patsubst %.txt,%.cc,$<)
echo "{" >> $(patsubst %.txt,%.cc,$<) echo "{" >> $(patsubst %.txt,%.cc,$<)
cat $< | egrep -v '^#' | sed -e 's/"/\\"/g' \ cat $< | egrep -v '^#' | sed -e 's/\\/\\\\/g' | sed -e 's/"/\\"/g' \
| sed -e 's/$$/\\n"/' | sed -e 's/^/ "/'\ | sed -e 's/$$/\\n"/' | sed -e 's/^/ "/'\
>> $(patsubst %.txt,%.cc,$<) >> $(patsubst %.txt,%.cc,$<)
echo "};" >> $(patsubst %.txt,%.cc,$<) echo "};" >> $(patsubst %.txt,%.cc,$<)
include $(patsubst %.txt,%.d,$(DESCRIPTIONTXT))
-/bin/rm -fv $(patsubst %.txt,%.h,$(DESCTXT))
-/bin/rm -fv $(patsubst %.txt,%.cc,$(DESCTXT))
#====================================================================== #======================================================================
# header files # header files
......
this is <README>
============================================================================
files supporting the installation and development of Seitosh
------------------------------------------------------------
directories
-----------
pgplot
Contains material supporting the installation of the PGPLOT library which
is used by Seitosh.
utilities
Shell scripts supporting users and developers of Seitosh.
files
-----
GPLphrase
License phrase to be used in source code file. This file is used by
contrib/gplphrase
Makefile.buildingblocks
Snippets useful when programming Makefiles
README.style-guide
An incomplete (and hardly respected) style guide for Seitosh.
SeitoshBashrc
A template for the bash rc-file to be included in ~/.bashrc
----- END OF README -----
#!/bin/sh #!/bin/sh
# this is <TFbashrc> # this is <SeitoshBashrc>
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
# $Id$
# #
# Copyright (c) 2010 by Thomas Forbriger (BFO Schiltach) # Copyright (c) 2010, 2015 by Thomas Forbriger (BFO Schiltach)
# #
# set environment variable for TF Makefiles # set environment variable for Seitosh Makefiles
# #
# this file should be placed in the home directory as file # this file should be placed in the home directory as file
# ~/.TFbashrc # ~/.SeitoshBashrc
# edit this file to suit your needs # edit this file to suit your needs
# #
# insert the following line into ~/.bashrc # insert the following line into ~/.bashrc
# #
# test -s ~/.TFbashrc && . ~/.TFbashrc || true # test -s ~/.SeitoshBashrc && . ~/.SeitoshBashrc || true
# #
# REVISIONS and CHANGES # REVISIONS and CHANGES
# 15/08/2010 V1.0 Thomas Forbriger # 15/08/2010 V1.0 Thomas Forbriger
...@@ -22,14 +21,10 @@ ...@@ -22,14 +21,10 @@
# 13/10/2010 V1.2 add MATLABBINDIR # 13/10/2010 V1.2 add MATLABBINDIR
# 21/01/2011 V1.3 add TF_EDIT # 21/01/2011 V1.3 add TF_EDIT
# 03/02/2014 V1.4 discard TF_REMCMMNT # 03/02/2014 V1.4 discard TF_REMCMMNT
# 20/05/2015 V1.5 adjust for Seitosh
# #
# ============================================================================ # ============================================================================
# #
# I recommend that you use the following settings for character encoding:
#
## export LANG=de_DE@utf8
## export GDM_LANG=de_DE@utf8
## export LC_MESSAGES=C
# default is: grant write permission only to file owner # default is: grant write permission only to file owner
umask 022 umask 022
...@@ -56,16 +51,13 @@ umask 022 ...@@ -56,16 +51,13 @@ umask 022
## esac ## esac
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
# #
# set standard environment variables (see README.compile) # set standard environment variables (see src/README.compile)
# ------------------------------------------------------- # -----------------------------------------------------------
# set standard locations # set standard locations
export LOCBINDIR=$HOME/bin export LOCBINDIR=$HOME/bin
export LOCLIBDIR=$HOME/lib export LOCLIBDIR=$HOME/lib
export LOCINCLUDEDIR=$HOME/include export LOCINCLUDEDIR=$HOME/include
# additionally we expect all shell scripts in
# (see shell-script trunk/scr/util/news/newscript)
export LOCSCRIPTDIR=$HOME/bin/scripts export LOCSCRIPTDIR=$HOME/bin/scripts
# additional directory for MATLAB executables (mex-files) # additional directory for MATLAB executables (mex-files)
...@@ -97,33 +89,6 @@ export CPPFLAGS="-I$LOCINCLUDEDIR -I$SERVERINCLUDEDIR" ...@@ -97,33 +89,6 @@ export CPPFLAGS="-I$LOCINCLUDEDIR -I$SERVERINCLUDEDIR"
export LDFLAGS="-L$LOCLIBDIR -L$SERVERLIBDIR" export LDFLAGS="-L$LOCLIBDIR -L$SERVERLIBDIR"
export FFLAGS="-ff2c -Wall -ffixed-line-length-0 -fno-backslash" export FFLAGS="-ff2c -Wall -ffixed-line-length-0 -fno-backslash"
# ----------------------------------------------------------------------------
# variables needed by maintainers (not by package users)
# ------------------------------------------------------
# a helpful variable when using TFSoftware
# e.g. you can call
#
# svn switch $SVNTF/branches/anybranch
#
# when switching to another branch <anybranch>
export SVNTF=http://gpitrsvn.gpi.uni-karlsruhe.de/repos/TFSoftware
# path to pure git export repository (used in Makefile.packages - see there)
export GITTFSEXPORT=$HOME/git/TFSoftware.export
# place to drop packages
export TF_PUBLICATIONPATH=$HOME/public_html/download/software
# path of Makefile.packages
# this should be set only for package maintainers
#export TF_MAKEPKG=$HOME/work/src/pakete/Makefile.packages
# used for make edit rules, if desired
#export TF_EDIT="$HOME/work/src/Makefile.buildingblocks \
# $HOME/work/src/README.dependencies \
# $HOME/git/TFSoftware/texts/thof/*.txt"
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
# execution path and man path # execution path and man path
...@@ -223,4 +188,4 @@ alias rm="rm -i -v" ...@@ -223,4 +188,4 @@ alias rm="rm -i -v"
alias cp="cp -i" alias cp="cp -i"
alias mv="mv -i" alias mv="mv -i"
# ----- END OF TFbashrc ----- # ----- END OF SeitoshBashrc -----
this is <README.pgplot> this is <README.pgplot>
============================================================================ ============================================================================
information on PGPLOT usage Quick installation instructions for PGPLOT
---------------------------
$Id: $
============================================================================ ============================================================================