[cig-commits] r6305 - in seismo/1D/mineos/trunk: . DEMO doc

Mon Mar 19 17:22:02 PDT 2007

Author: leif
Date: 2007-03-19 17:21:00 -0700 (Mon, 19 Mar 2007)
New Revision: 6305

Removed:
   seismo/1D/mineos/trunk/doc/UserManual.pdf
Modified:
   seismo/1D/mineos/trunk/DEMO/DEMO.tar.gz
   seismo/1D/mineos/trunk/DEMO/README
   seismo/1D/mineos/trunk/Makefile.am
   seismo/1D/mineos/trunk/configure.ac
   seismo/1D/mineos/trunk/doc/mineos.lyx
Log:
Minor fixes to configure, Makefile, and RUN_* shell scripts.  Revised
the "Download and Configure" section of the manual.


Modified: seismo/1D/mineos/trunk/DEMO/DEMO.tar.gz
===================================================================
(Binary files differ)

Modified: seismo/1D/mineos/trunk/DEMO/README
===================================================================

--- seismo/1D/mineos/trunk/DEMO/README	2007-03-19 23:49:51 UTC (rev 6304)
+++ seismo/1D/mineos/trunk/DEMO/README	2007-03-20 00:21:00 UTC (rev 6305)
@@ -1,5 +1,5 @@
 
-              DEMO AND TESTIND
+			   DEMO AND TESTING
 
 Step 1. Uncompress and untar the file DEMO.tar.gz with the command
 
@@ -11,7 +11,8 @@
       DEMO1   - pecompiled synthetic seismograms (30 modes);
       DEMO2   - precompiled MINEOS test results;
       DEMO3   - scripts and input data for testing installed
-                MINEOS package. Results must be the same as in
+                MINEOS package. Results should be the same as in
                 DEMO2 directory.
-Step 2. Make visit in the  directories listed above and follow the README
+
+Step 2. Visit the directories listed above and follow the README
         files.

Modified: seismo/1D/mineos/trunk/Makefile.am
===================================================================
--- seismo/1D/mineos/trunk/Makefile.am	2007-03-19 23:49:51 UTC (rev 6304)
+++ seismo/1D/mineos/trunk/Makefile.am	2007-03-20 00:21:00 UTC (rev 6305)
@@ -17,19 +17,19 @@
 ## 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 = minos_bran syndat green eigcon \
 	endi eigen2asc simpledit cucss2sac
 
 # scripts
 
-bin_SCRIPTS = scripts/creat_origin
+dist_bin_SCRIPTS = scripts/creat_origin
 
-# docs
+# demo
 
-nobase_data_DATA = doc/tex/Figures/* doc/tex/*.tex doc/UserManual.pdf
-data_DATA = DEMO/DEMO.tar.gz DEMO/README
+dist_pkgdata_DATA = \
+	doc/mineos.pdf \
+	DEMO/DEMO.tar.gz \
+	DEMO/README
 
 # main programs
 
@@ -49,6 +49,7 @@
 	fdb/fdb_wfdisc.h \
 	fdb/fdb_eigen.h \
 	fdb/swapn.c
+
 # time utils
 time = \
 	time/time.f
@@ -59,10 +60,4 @@
 cucss2sac_SOURCES = utils/cucss2sac.c utils/swap.c utils/cucss2sac.h
 eigen2asc_SOURCES = utils/eigen2asc.f $(fdb) $(time)
 
-EXTRA_DIST = \
-	scripts \
-	doc \
-	DEMO/DEMO.tar.gz \
-	DEMO/README
-
 ## end of Makefile.am

Modified: seismo/1D/mineos/trunk/configure.ac
===================================================================
--- seismo/1D/mineos/trunk/configure.ac	2007-03-19 23:49:51 UTC (rev 6304)
+++ seismo/1D/mineos/trunk/configure.ac	2007-03-20 00:21:00 UTC (rev 6305)
@@ -21,7 +21,7 @@
 # $Id: configure.ac 2450 2005-10-19 19:34:15Z leif $
 
 AC_PREREQ(2.59)
-AC_INIT([MINEOS], [1.0.0], [cig-seismo at geodynamics.org])
+AC_INIT([mineos], [1.0.0], [cig-seismo at geodynamics.org])
 AC_CONFIG_AUX_DIR([./aux-config])
 AC_CONFIG_SRCDIR([syndat.f])
 AC_CONFIG_HEADER([config.h])
@@ -30,9 +30,6 @@
 # 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.

Deleted: seismo/1D/mineos/trunk/doc/UserManual.pdf
===================================================================
(Binary files differ)

Modified: seismo/1D/mineos/trunk/doc/mineos.lyx
===================================================================
--- seismo/1D/mineos/trunk/doc/mineos.lyx	2007-03-19 23:49:51 UTC (rev 6304)
+++ seismo/1D/mineos/trunk/doc/mineos.lyx	2007-03-20 00:21:00 UTC (rev 6305)
@@ -1,4 +1,4 @@
-#LyX 1.4.3 created this file. For more info see http://www.lyx.org/
+#LyX 1.4.2 created this file. For more info see http://www.lyx.org/
 \lyxformat 245
 \begin_document
 \begin_header
@@ -1108,7 +1108,8 @@
 \end_layout
 
 \begin_layout Enumerate
-Download the tar file from the CIG website or SVN (Subversion) server
+Download the source package from the CIG website, or check-out the source
+ from the SVN (Subversion) server
 \end_layout
 
 \begin_deeper
@@ -1118,20 +1119,40 @@
 
 \end_inset
 
-, OR
+ and download the source package.
+ Extract the source from the tar file:
 \end_layout
 
+\begin_layout LyX-Code
+gunzip -c mineos-1.0.0.tar.gz | tar xf -
+\end_layout
+
+\begin_layout LyX-Code
+cd mineos-1.0.0
+\end_layout
+
+\begin_layout Standard
+~ OR ~
+\end_layout
+
 \begin_layout Itemize
-Check out from the Subversion server:
+Check out the source from the Subversion server:
 \end_layout
 
 \begin_layout LyX-Code
-svn co http://svn@geodynamics.org/cig/seismo/1D/mineos/trunk
+svn co http://svn@geodynamics.org/cig/seismo/1D/mineos/trunk mineos
 \end_layout
 
+\begin_layout LyX-Code
+cd mineos
+\end_layout
+
 \end_deeper
 \begin_layout Enumerate
-Run ``autoreconf -i'' to unpack configure scripts
+If you checked-out the source using Subversion, run ``autoreconf -i'' to
+ generate the 'configure' script and related files.
+ (Skip this step if you downloaded the source package.
+ The resulting files are included in the tar file.)
 \end_layout
 
 \begin_deeper
@@ -1141,16 +1162,12 @@
 
 \end_deeper
 \begin_layout Enumerate
-Run configure
+Run ``configure''
 \end_layout
 
 \begin_deeper
 \begin_layout LyX-Code
-./configure --prefix=/home/
-\emph on
-YourHomeDirectory
-\emph default
-/mineos-bin
+./configure --prefix=$HOME/cig
 \end_layout
 
 \end_deeper
@@ -1175,28 +1192,41 @@
 
 \end_deeper
 \begin_layout Enumerate
-Untar the DEMO directory to access the provided input files
+Untar the DEMO tar file to access the provided input files
 \end_layout
 
 \begin_deeper
 \begin_layout LyX-Code
-tar -ztvf DEMO/DEMO.tar.gz
+cd DEMO
 \end_layout
 
+\begin_layout LyX-Code
+gunzip -c DEMO.tar.gz | tar xf -
+\end_layout
+
 \end_deeper
 \begin_layout Enumerate
-Now you can run one of the demo input files, e.g., 
+Now you can run using the demo input files.
+ For example, under the Bash shell: 
 \end_layout
 
 \begin_deeper
 \begin_layout LyX-Code
-/home/
-\emph on
-YourHomeDirectory
-\emph default
-/mineos-bin/bin/minos_bran < prem_noocean.txt
+
 \end_layout
 
+\begin_layout LyX-Code
+export PATH=$HOME/cig/bin:$PATH
+\end_layout
+
+\begin_layout LyX-Code
+cd DEMO3
+\end_layout
+
+\begin_layout LyX-Code
+./RUN_MINEOS.sh prem_noocean
+\end_layout
+
 \end_deeper
 \begin_layout Section
 Support

