[cig-commits] r4038 - in seismo/1D/syndat/trunk: . gfs

leif at geodynamics.org leif at geodynamics.org
Wed Jul 19 20:05:28 PDT 2006


Author: leif
Date: 2006-07-19 20:05:28 -0700 (Wed, 19 Jul 2006)
New Revision: 4038

Added:
   seismo/1D/syndat/trunk/AUTHORS
   seismo/1D/syndat/trunk/INSTALL
   seismo/1D/syndat/trunk/Makefile.am
   seismo/1D/syndat/trunk/NEWS
   seismo/1D/syndat/trunk/README
   seismo/1D/syndat/trunk/configure.ac
   seismo/1D/syndat/trunk/gfs/leolib.col
   seismo/1D/syndat/trunk/gfs/rotated.h
Modified:
   seismo/1D/syndat/trunk/eigcon.f
   seismo/1D/syndat/trunk/gfs/disk2.c
   seismo/1D/syndat/trunk/gfs/ftoc.c
Log:
Added GNU build system, and boilerplate GNU info files.
Got all the programs to build on my Linux system.  I had
to hunt down xvertext-5.0 on the web to replace the missing
"rotated.h".  Also, I whipped-up a replacement for the
missing "leolib.col" include file, based upon an examination
of the surrounding source.  For now, I hard-coded the X11
link flags for 'curse' (maybe there's a good Autoconf
macro for this out there... or not).


Added: seismo/1D/syndat/trunk/AUTHORS
===================================================================
--- seismo/1D/syndat/trunk/AUTHORS	2006-07-20 00:18:23 UTC (rev 4037)
+++ seismo/1D/syndat/trunk/AUTHORS	2006-07-20 03:05:28 UTC (rev 4038)
@@ -0,0 +1,9 @@
+Authors of SynDat.
+
+SynDat          Guy Masters
+                John Woodhouse
+                Freeman Gilbert
+
+Also see the file ChangeLog.
+
+AUTHORS ends here

Added: seismo/1D/syndat/trunk/INSTALL
===================================================================
--- seismo/1D/syndat/trunk/INSTALL	2006-07-20 00:18:23 UTC (rev 4037)
+++ seismo/1D/syndat/trunk/INSTALL	2006-07-20 03:05:28 UTC (rev 4038)
@@ -0,0 +1,231 @@
+Installation Instructions
+*************************
+
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004 Free
+Software Foundation, Inc.
+
+This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
+Basic Installation
+==================
+
+These are generic installation instructions.
+
+   The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation.  It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions.  Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+   It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring.  (Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.)
+
+   If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release.  If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+   The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'.  You only need
+`configure.ac' if you want to change it or regenerate `configure' using
+a newer version of `autoconf'.
+
+The simplest way to compile this package is:
+
+  1. `cd' to the directory containing the package's source code and type
+     `./configure' to configure the package for your system.  If you're
+     using `csh' on an old version of System V, you might need to type
+     `sh ./configure' instead to prevent `csh' from trying to execute
+     `configure' itself.
+
+     Running `configure' takes awhile.  While running, it prints some
+     messages telling which features it is checking for.
+
+  2. Type `make' to compile the package.
+
+  3. Optionally, type `make check' to run any self-tests that come with
+     the package.
+
+  4. Type `make install' to install the programs and any data files and
+     documentation.
+
+  5. You can remove the program binaries and object files from the
+     source code directory by typing `make clean'.  To also remove the
+     files that `configure' created (so you can compile the package for
+     a different kind of computer), type `make distclean'.  There is
+     also a `make maintainer-clean' target, but that is intended mainly
+     for the package's developers.  If you use it, you may have to get
+     all sorts of other programs in order to regenerate files that came
+     with the distribution.
+
+Compilers and Options
+=====================
+
+Some systems require unusual options for compilation or linking that the
+`configure' script does not know about.  Run `./configure --help' for
+details on some of the pertinent environment variables.
+
+   You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment.  Here
+is an example:
+
+     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+
+   *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory.  To do this, you must use a version of `make' that
+supports the `VPATH' variable, such as GNU `make'.  `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script.  `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+   If you have to use a `make' that does not support the `VPATH'
+variable, you have to compile the package for one architecture at a
+time in the source code directory.  After you have installed the
+package for one architecture, use `make distclean' before reconfiguring
+for another architecture.
+
+Installation Names
+==================
+
+By default, `make install' will install the package's files in
+`/usr/local/bin', `/usr/local/man', etc.  You can specify an
+installation prefix other than `/usr/local' by giving `configure' the
+option `--prefix=PREFIX'.
+
+   You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files.  If you
+give `configure' the option `--exec-prefix=PREFIX', the package will
+use PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files will still use the regular prefix.
+
+   In addition, if you use an unusual directory layout you can give
+options like `--bindir=DIR' to specify different values for particular
+kinds of files.  Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+   If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System).  The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+   For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Specifying the System Type
+==========================
+
+There may be some features `configure' cannot figure out automatically,
+but needs to determine by the type of machine the package will run on.
+Usually, assuming the package is built to be run on the _same_
+architectures, `configure' can figure that out, but if it prints a
+message saying it cannot guess the machine type, give it the
+`--build=TYPE' option.  TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+     CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+     OS KERNEL-OS
+
+   See the file `config.sub' for the possible values of each field.  If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+   If you are _building_ compiler tools for cross-compiling, you should
+use the `--target=TYPE' option to select the type of system they will
+produce code for.
+
+   If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+If you want to set default values for `configure' scripts to share, you
+can create a site shell script called `config.site' that gives default
+values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists.  Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+Variables not defined in a site shell script can be set in the
+environment passed to `configure'.  However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost.  In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'.  For example:
+
+     ./configure CC=/usr/local2/bin/gcc
+
+will cause the specified gcc to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+`configure' Invocation
+======================
+
+`configure' recognizes the following options to control how it operates.
+
+`--help'
+`-h'
+     Print a summary of the options to `configure', and exit.
+
+`--version'
+`-V'
+     Print the version of Autoconf used to generate the `configure'
+     script, and exit.
+
+`--cache-file=FILE'
+     Enable the cache: use and save the results of the tests in FILE,
+     traditionally `config.cache'.  FILE defaults to `/dev/null' to
+     disable caching.
+
+`--config-cache'
+`-C'
+     Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+     Do not print messages saying which checks are being made.  To
+     suppress all normal output, redirect it to `/dev/null' (any error
+     messages will still be shown).
+
+`--srcdir=DIR'
+     Look for the package's source code in directory DIR.  Usually
+     `configure' can determine that directory automatically.
+
+`configure' also accepts some other, not widely useful, options.  Run
+`configure --help' for more details.
+

Added: seismo/1D/syndat/trunk/Makefile.am
===================================================================
--- seismo/1D/syndat/trunk/Makefile.am	2006-07-20 00:18:23 UTC (rev 4037)
+++ seismo/1D/syndat/trunk/Makefile.am	2006-07-20 03:05:28 UTC (rev 4038)
@@ -0,0 +1,71 @@
+## Process this file with automake to produce Makefile.in
+##
+## SynDat by Guy Masters, John Woodhouse, and Freeman Gilbert
+##
+## 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+##
+
+# $Id: Makefile.am 2452 2005-10-19 20:03:01Z leif $
+
+bin_PROGRAMS = syndat green eigcon \
+	ghead glist gtail iutil \
+	curse
+
+# main programs
+syndat_SOURCES = syndat.f $(gfs) fftsubs.f
+green_SOURCES = green.f $(gfs) fftsubs.f rcode.f
+eigcon_SOURCES = eigcon.f $(gfs)
+
+# GFS utils
+ghead_SOURCES = gfs/ghead.f $(gfs)
+glist_SOURCES = gfs/glist.f $(gfs)
+gtail_SOURCES = gfs/gtail.f $(gfs)
+iutil_SOURCES = gfs/iutil.f $(gfs)
+
+# curse
+curse_SOURCES = gfs/curse.f $(gfs) $(leo)
+curse_LDADD = -L/usr/X11R6/lib -lX11
+
+gfs = \
+	gfs/disk2.c \
+	gfs/gfs.f \
+	gfs/usr.f
+
+leo = \
+	gfs/leolib.c \
+	gfs/psscreendump.f \
+	gfs/scr1.f
+
+# included by leolib.c
+leoinc = \
+	gfs/ftoc.c \
+	gfs/leodraw.c \
+	gfs/leoinp.c \
+	gfs/leotext.c \
+	$(xvertext)
+
+# xvertext 5.0 by Alan Richardson
+xvertext = \
+	gfs/rotated.c \
+	gfs/rotated.h
+
+EXTRA_DIST = \
+	LIST.STA \
+	locale.cmt.big \
+	stations \
+	gfs/gfs.doc \
+	$(leoinc)
+
+## end of Makefile.am

Added: seismo/1D/syndat/trunk/NEWS
===================================================================
--- seismo/1D/syndat/trunk/NEWS	2006-07-20 00:18:23 UTC (rev 4037)
+++ seismo/1D/syndat/trunk/NEWS	2006-07-20 03:05:28 UTC (rev 4038)
@@ -0,0 +1,15 @@
+SynDat NEWS -- history of user-visible changes.  2006-07-19
+
+Please send SynDat bug reports to cig-seismo at geodynamics.org.
+
+
+Version 1.0.0
+
+* SynDat is now distributed under the GNU General Public License.
+  See the file COPYING for copying conditions.
+
+
+Local variables:
+version-control: never
+mode: indented-text
+end:

Added: seismo/1D/syndat/trunk/README
===================================================================
--- seismo/1D/syndat/trunk/README	2006-07-20 00:18:23 UTC (rev 4037)
+++ seismo/1D/syndat/trunk/README	2006-07-20 03:05:28 UTC (rev 4038)
@@ -0,0 +1,8 @@
+We are pleased to announce the version 1 release of SynDat.
+
+See the file INSTALL for building and installation instructions.
+
+Please send all bug reports by electronic mail to:
+    cig-seismo at geodynamics.org
+
+SynDat is free software.  See the file COPYING for copying conditions.

Added: seismo/1D/syndat/trunk/configure.ac
===================================================================
--- seismo/1D/syndat/trunk/configure.ac	2006-07-20 00:18:23 UTC (rev 4037)
+++ seismo/1D/syndat/trunk/configure.ac	2006-07-20 03:05:28 UTC (rev 4038)
@@ -0,0 +1,49 @@
+dnl                                               -*- Autoconf -*-
+dnl Process this file with autoconf to produce a configure script.
+dnl
+dnl SynDat by Guy Masters, John Woodhouse, and Freeman Gilbert
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+dnl
+
+# $Id: configure.ac 2450 2005-10-19 19:34:15Z leif $
+
+AC_PREREQ(2.59)
+AC_INIT([SynDat], [1.0.0], [cig-seismo at geodynamics.org])
+AC_CONFIG_AUX_DIR([./aux-config])
+AC_CONFIG_SRCDIR([syndat.f])
+AC_CONFIG_HEADER([config.h])
+AM_INIT_AUTOMAKE([foreign])
+
+# Checks for programs.
+AC_PROG_F77
+AC_PROG_CC
+if test "$G77" = yes; then
+    FFLAGS="$FFLAGS -fdollar-ok"
+fi
+AC_F77_WRAPPERS
+
+# Checks for libraries.
+
+# Checks for header files.
+
+# Checks for typedefs, structures, and compiler characteristics.
+
+# Checks for library functions.
+
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
+
+dnl end of configure.ac

Modified: seismo/1D/syndat/trunk/eigcon.f
===================================================================
--- seismo/1D/syndat/trunk/eigcon.f	2006-07-20 00:18:23 UTC (rev 4037)
+++ seismo/1D/syndat/trunk/eigcon.f	2006-07-20 03:05:28 UTC (rev 4038)
@@ -35,7 +35,7 @@
 c
       print*,' enter name of model file'
       read(*,'(a)')filen 
-      open(iin,file=filen,status='readonly')
+      open(iin,file=filen,status='old')
       read(iin,101) (ititle(i),i=1,20)
   101 format(20a4)
       read(iin,*) ifanis,tref,ifdeck
@@ -111,7 +111,7 @@
 ccc
       print 40,nhed,model,jcom,nz,atyp,lz,w,q,g,nrad,
      *           rn,wn,accn
-   40 format(i6,x,a8,2i6,x,a4,i4,3g15.5,i6,3g15.5)
+   40 format(i6,1x,a8,2i6,1x,a4,i4,3g15.5,i6,3g15.5)
       print 41,(rout(i),i=1,nrad)
    41 format(5g15.5)
 ccc

Modified: seismo/1D/syndat/trunk/gfs/disk2.c
===================================================================
--- seismo/1D/syndat/trunk/gfs/disk2.c	2006-07-20 00:18:23 UTC (rev 4037)
+++ seismo/1D/syndat/trunk/gfs/disk2.c	2006-07-20 03:05:28 UTC (rev 4038)
@@ -84,7 +84,10 @@
 
 */
 
+#include <sys/types.h>
 #include <sys/stat.h>
+#include <unistd.h>
+#include "config.h"
 
 
 #define   MAXFDS    40  /* the most files allowed in UNIX */
@@ -117,7 +120,7 @@
           int       status;
           int       i;
 
-ggetfil_(mode, lun, name, istat)
+F77_FUNC(ggetfil,GGETFIL)(mode, lun, name, istat)
           int       *mode;
           int       *lun;
           char      *name;
@@ -158,7 +161,7 @@
 }
 
 
-gfrefil_( lun )
+F77_FUNC(gfrefil,GFREFIL)( lun )
         int    *lun;
 
 {
@@ -169,7 +172,7 @@
 }
 
 
-gfilsiz_(name, bsize)
+F77_FUNC(gfilsiz,GFILSIZ)(name, bsize)
           char      *name;
           int       *bsize;
 {
@@ -182,7 +185,7 @@
 }
 
 
-gpodiscb_( lun,  addres)
+F77_FUNC(gpodiscb,GPODISCB)( lun,  addres)
       int     *lun;
       int     *addres;
 
@@ -194,7 +197,7 @@
 }
 
 
-grddiscb_(lun, buffer, n, istat)
+F77_FUNC(grddiscb,GRDDISCB)(lun, buffer, n, istat)
        int     *lun;
        int     *buffer;
        int     *n;
@@ -211,7 +214,7 @@
        return;
 }
 
-gwrdiscb_(lun, buffer, n, istat)
+F77_FUNC(gwrdiscb,GWRDISCB)(lun, buffer, n, istat)
        int     *lun;
        int     *buffer;
        int     *n;

Modified: seismo/1D/syndat/trunk/gfs/ftoc.c
===================================================================
--- seismo/1D/syndat/trunk/gfs/ftoc.c	2006-07-20 00:18:23 UTC (rev 4037)
+++ seismo/1D/syndat/trunk/gfs/ftoc.c	2006-07-20 03:05:28 UTC (rev 4038)
@@ -1,5 +1,9 @@
 /* Simple routines for interfacing Fortran and C. */
 
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+
 int white(k)
 char k;
 /* Tells if it's whitespace or not. */

Added: seismo/1D/syndat/trunk/gfs/leolib.col
===================================================================
--- seismo/1D/syndat/trunk/gfs/leolib.col	2006-07-20 00:18:23 UTC (rev 4037)
+++ seismo/1D/syndat/trunk/gfs/leolib.col	2006-07-20 03:05:28 UTC (rev 4038)
@@ -0,0 +1,12 @@
+/* -*- C -*- */
+
+static char *color_names[] = {
+    "rgb:f/0/0",
+    "rgb:f/f/0",
+    "rgb:0/f/0",
+    "rgb:0/f/f",
+    "rgb:0/0/f",
+    "rgb:f/0/f"
+};
+
+#define number_colors (sizeof(color_names)/sizeof(color_names[0]))

Added: seismo/1D/syndat/trunk/gfs/rotated.h
===================================================================
--- seismo/1D/syndat/trunk/gfs/rotated.h	2006-07-20 00:18:23 UTC (rev 4037)
+++ seismo/1D/syndat/trunk/gfs/rotated.h	2006-07-20 03:05:28 UTC (rev 4038)
@@ -0,0 +1,79 @@
+/* ************************************************************************ */
+
+
+/* Header file for the `xvertext 5.0' routines.
+
+   Copyright (c) 1993 Alan Richardson (mppa3 at uk.ac.sussex.syma) */
+
+
+/* ************************************************************************ */
+
+#ifndef _XVERTEXT_INCLUDED_ 
+#define _XVERTEXT_INCLUDED_
+
+
+#define XV_VERSION      5.0
+#define XV_COPYRIGHT \
+      "xvertext routines Copyright (c) 1993 Alan Richardson"
+
+
+/* ---------------------------------------------------------------------- */
+
+
+/* text alignment */
+
+#define NONE             0
+#define TLEFT            1
+#define TCENTRE          2
+#define TRIGHT           3
+#define MLEFT            4
+#define MCENTRE          5
+#define MRIGHT           6
+#define BLEFT            7
+#define BCENTRE          8
+#define BRIGHT           9
+
+
+/* ---------------------------------------------------------------------- */
+
+/* this shoulf be C++ compliant, thanks to 
+     vlp at latina.inesc.pt (Vasco Lopes Paulo) */
+
+#if defined(__cplusplus) || defined(c_plusplus)
+
+extern "C" {
+float   XRotVersion(char*, int);
+void    XRotSetMagnification(float);
+void    XRotSetBoundingBoxPad(int);
+int     XRotDrawString(Display*, XFontStruct*, float,
+                       Drawable, GC, int, int, char*);
+int     XRotDrawImageString(Display*, XFontStruct*, float,
+                            Drawable, GC, int, int, char*);
+int     XRotDrawAlignedString(Display*, XFontStruct*, float,
+                              Drawable, GC, int, int, char*, int);
+int     XRotDrawAlignedImageString(Display*, XFontStruct*, float,
+                                   Drawable, GC, int, int, char*, int);
+XPoint *XRotTextExtents(Display*, XFontStruct*, float,
+			int, int, char*, int);
+}
+
+#else
+
+extern float   XRotVersion();
+extern void    XRotSetMagnification();
+extern void    XRotSetBoundingBoxPad();
+extern int     XRotDrawString();
+extern int     XRotDrawImageString();
+extern int     XRotDrawAlignedString();
+extern int     XRotDrawAlignedImageString();
+extern XPoint *XRotTextExtents();
+
+#endif /* __cplusplus */
+
+/* ---------------------------------------------------------------------- */
+
+
+#endif /* _XVERTEXT_INCLUDED_ */
+
+
+



More information about the cig-commits mailing list