diff --git a/MAINTENANCE b/MAINTENANCE
index a736897ffd4a1006ce98c5ba342a216add819b04..37ba724f3f1effc67907c59a9fea11c2a37758bb 100644
--- a/MAINTENANCE
+++ b/MAINTENANCE
@@ -80,7 +80,7 @@ II) Package contents
The following subpackages are included in alberta2-2.0:
-1) alberta2
+1) alberta
The main package.
2) demo
diff --git a/README b/README
index 2ad38c9e3f1834cdc2929e20736484325a720cda..eb9cfca0e1356a0d85c99f0fbdf22e5b308d62c4 100644
--- a/README
+++ b/README
@@ -35,8 +35,7 @@ V. Some platform dependent notes and examples
I) Introduction
===============
-This is ALBERTA Version 2.0. Generic installation instructions can be
-found in the file `INSTALL' in this directory. ALBERTA has a web-page
+This is ALBERTA Version 2.0. ALBERTA has a web-page
at
http://www.alberta-fem.de/
@@ -44,48 +43,60 @@ at
Please see the file `COPYING' for information about the availability of
ALBERTA.
-The directory layout
+Generic installation instructions can be found in the file `./INSTALL'
+in this directory. Quick instructions:
+
+./configure --prefix=PREFIX
+make
+make install
+
+This will configure and compile the package and install the entire
+beast in a directory hierarchy below the path-prefix PREFIX, where
+PREFIX defaults to `/usr/local/' if the `--prefix' switch is omitted.
+
+0) The directory layout
Contained in the package are the following sub-packages:
- __________ alberta/ __________ src/ ______|--- 1d/
- / \ |--- 2d/
- / -- doc/ |--- 3d/
- / |--- Nd/
- / |--- Common/
- /_____________ demo/ __ src/ _______|--- 1d/ |--- alberta*/
-alberta-2.0 / |--- 2d/
- \ |--- 3d/
- \ |--- 4d/
- \ |--- 5d/
- \ |--- Common/
- \
- \
- \__________ alberta_util/ ___ src/
- \
+ __________ alberta/ __________ src/ ______|--- 1d/
+ / \ |--- 2d/
+ / -- doc/ |--- 3d/
+ / |--- Common/
+ / |--- alberta2*/
+ /_____________ demo/ __ src/ _______|--- 1d/
+alberta2-2.0 / |--- 2d/
+ \ |--- 3d/
+ \ |--- 4d/
+ \ |--- 5d/
+ \ |--- Common/
+ \
+ \
+ \__________ alberta_util/ ___ src/
\
- \_______ add_ons/ ---- grape/ __ mesh/ ____|--- 2d/
- \ \ |--- 3d/
- \ \ |--- Common/
- \ \
- \ - meshtv/ ___|--- 1d/
- \ \ |--- 2d/
- \ \ |--- 3d/
- \ \ |--- Common/
- \ \
- \ \- geomview/
- \
- \_ configure.ac and other distribution
- files
-
+ \
+ \_______ add_ons/ ---- grape/ __ mesh/ ____|--- 2d/
+ \ \ |--- 3d/
+ \ \ |--- Common/
+ \ \
+ \ - meshtv/ ___|--- 1d/
+ \ \ |--- 2d/
+ \ \ |--- 3d/
+ \ \ |--- Common/
+ \ \
+ \ \- geomview/
+ \
+ \_ configure.ac and other distribution
+ files
+
+1) alberta
The main package.
-2) demo
-The sub-directory demo/ contains a few demonstration programs. After
-running "make install" (see file ./INSTALL) a tar-ball containing all
-demo programs will be installed in PREFIX/share/alberta/. The tar-ball
-can be extracted elsewhere; the make-files contained in the tar-ball
-have appropriate defaults for the location of the (installed) ALBERTA
-libraries and header files.
+2) demo
+The sub-directory `demo/' contains a few demonstration programs. After
+running "make install" (see file `./INSTALL') a tar-ball containing
+all demo programs will be installed in `PREFIX/share/alberta2/'. The
+tar-ball can be extracted elsewhere; the make-files contained in the
+tar-ball have appropriate defaults for the location of the (installed)
+ALBERTA libraries and header files.
3) alberta_util
This package contains the old ALBERTA util.c file, now split into
@@ -99,7 +110,7 @@ can also be used as a stand-alone utility library.
GRAPE interface for ALBERTA. Only for non-parametric FE of dimension 2
and 3. The GRAPE-interface consists of "make" will create
"alberta_grapeXX" and alberta_moviXX" where XX is in {22, 33}. "make
-install" will install those programs below PREFIX/bin.
+install" will install those programs below `PREFIX/bin/'.
The GRAPE interface is only installed when the GRAPE library and
header file are available on your system (determined at configure
@@ -107,9 +118,9 @@ time, use "configure --help" for appropriate command line switches for
"configure").
5) meshtv
-MeshTV interface for ALBERTA. Only for non-parametric FE. The MeshTV interface
-consists of the programs "alberta_meshtvX" with X in {1,2,3}. These are
-installed in PREFIX/bin as well.
+MeshTV interface for ALBERTA. Only for non-parametric FE. The MeshTV
+interface consists of the programs "alberta_meshtvX" with X in
+{1,2,3}. These are installed in `PREFIX/bin/' as well.
The interface is only installed if the Silo library and header files are
available on your system. See "configure --help" for details.
@@ -224,13 +235,16 @@ GMV -- "General Mesh Viewer" is available from
Geomview -- An ancient program, originally from the Geometry Center,
available from
- http://geomview.sourceforge.net/
+ http://sourceforge.net/projects/geomview/
- More-or-less easy to use, demo/src/Common/geomview-graphics.c
- contains an interface from ALBERTA to Geomview. The
- demo-programs for parametric meshes, especially those for
- higher co-dimension, can make use of Geomview. geomview-graphics.c
- does not require any external libraries for linking.
+ `./demo/src/Common/geomview-graphics.c' contains an interface
+ from ALBERTA to Geomview. The demo-programs for parametric
+ meshes, especially those for higher co-dimension, can make use
+ of Geomview. `geomview-graphics.c' does not require any
+ external libraries for linking. You need Geomview version
+ >1.9.0, and -- for the visualization of higher dimensional
+ meshes -- the `gvemod-ndview' add-on. Both are available from
+ SourceForge.
alternate compilers
Many CPU-vendors distribute highly optimizing compilers for
@@ -253,33 +267,29 @@ The remaining (i.e. ALBERTA specific) options are explained here:
1.) Non-standard behavior of ALBERTA
-------------------------------------
-BIG FAT NOTE: the _default_ installation prefix of the ALBERTA-package
-is _NOT_ the default GNU installation prefix which would be
-/usr/local/ on Un*x systems, but it is the build-directory. Of course,
-you can change the default behavior by using the "--prefix=PREFIX"
-switch when running configure (see ./INSTALL). However, the default
-layout is like follows:
-
-When compiling ALBERTA below
-
- /usr/people/claus/alberta-2.0/
+The default installation prefix of the ALBERTA-package is the default
+GNU installation prefix, i.e. `/usr/local/' Of course, you can change
+the default behavior by using the "--prefix=PREFIX" switch when
+running configure (see `./INSTALL'). However, the default layout is
+like follows:
-then the libraries will go to
+The libraries will go to
- /usr/people/claus/alberta-2.0/lib/
+ /usr/local/lib/
the header-files and Makefile.alberta will end up in
- /usr/people/claus/alberta-2.0/include/
+ /usr/local/include/alberta2/
-libtool.alberta will reside in
+The configured libtool-script will reside in
- /usr/people/claus/alberta-1.2/libexec/
+ /usr/local/libexec/alberta2/
-and finally the demo package (under the name alberta-1.2.demo.tar.gz)
-will be copied to
+and finally the demo package (under the name alberta2-VERSION.demo.tar.gz,
+where VERSION denotes the actual version of the alberta2 package) will be
+copied to
- /usr/people/claus/alberta-2.0/share/alberta
+ /usr/local/share/alberta2/
This will be the layout after running "make install".
@@ -641,4 +651,6 @@ PLEASE LEAVE HERE FOR ISPELL:
LocalWords: libtool libalberta PKG GL cxml blas libNAME libPKG dir DIR opengl
LocalWords: EPREFIX gr CFLAGS FFLAGS ggdb fno inline pentium sse OpenDX DOF
LocalWords: mfpmath meshtv geomview MeshTV meshtvX dxtools VECS GMV gmv DOWX
- LocalWords: ALBERTA's libsunperf sunperf lfui lfsu lsunmath SuSE
+ LocalWords: ALBERTA's libsunperf sunperf lfui lfsu lsunmath SuSE gvemod lib
+ LocalWords: ndview SourceForge efence malloc DXL builtin icc xorg gfortran
+ LocalWords: Ubuntu sudo