diff --git a/MAINTENANCE b/MAINTENANCE
index 59c29f1a688682152c24fa6b4a1c79808c17345e..957179910e8ff0a6d28aabbb78edf6d91d4cb1f3 100644
--- a/MAINTENANCE
+++ b/MAINTENANCE
@@ -29,10 +29,14 @@ alberta-1.3/ * |--- 2d/
\ |--- 3d/
\ |--- Common/
\
- \
- \
- \_ configure.ac and other distribution
- files
+ \___ MESHTV/ ___|--- 1d/
+ \ |--- 2d/
+ \ |--- 3d/
+ \ |--- Common/
+ \
+ \_ configure.ac and other distribution
+ files
+
We keep track of the "Makefile.am"s, which are processed by automake
to create "Makefile.in"s. Two exceptions:
@@ -84,6 +88,9 @@ Linear and nonlinear solver routines for ALBERTA.
6) GRAPE
GRAPE interface for ALBERTA
+7) MESHTV
+MeshTV interface for ALBERTA via the Silo library
+
III) External packages
======================
@@ -212,13 +219,11 @@ Step 1)
Step 2)
The next step is to adjust the desired libraries, especially the
ALBERTA libraries. Each ALBERTA library has its own directory of the
- form "ALBERTA[DIM][DIM_OF_WORLD]_[DEBUG=0 or 1][EL_INDEX=nothing or
- 1]" since compilation is different for each library version. If
- these settings are to be changed, make a new directory (as in
- ALBERTA13_0[1]) for example, create a copy of the Makefile.am from
- another directory and adjust the obvious settings like "DIM",
- "DIM_OF_WORLD", etc. The Makefile.am in these directories uses VPATH
- to find sources in src/?d and src/Common.
+ form "ALBERTA[DIM_OF_WORLD]_[DEBUG=0 or 1][EL_INDEX=0 or 1]" since
+ compilation is different for each library version. If
+ these settings are to be changed, make a new directory, and adapt the
+ files "Makefile.am.template" and "generate-alberta-automakefiles.sh" in
+ the top directory.
Step 3)
Make sure you have a recent version of GNU automake, autoconf and
diff --git a/README b/README
index 440a23802efba62334f0aa24b7a3693fbbd783a1..6c9cd0a54fe767f8b4ef8aedafeb25a16f135376 100644
--- a/README
+++ b/README
@@ -16,6 +16,7 @@ II. External Packages (both required and optional packages)
2.) Optional Packages
gltools
GRAPE
+ Silo
alternate compilers
III. Configure Options
@@ -35,7 +36,7 @@ This is ALBERTA Version 1.2. Generic installation instructions can be
found in the file `INSTALL' in this directory. ALBERTA has a web-page
at
- http://www.mathematik.uni-freiburg.de/IAM/ALBERTA
+ http://www.alberta-fem.de/
Please see the file `COPYING' for information about the availability of
ALBERTA.
@@ -59,9 +60,13 @@ alberta-1.2/| |--- 2d/
\ |--- 3d/
\ |--- Common/
\
- \
- \_ configure.ac and other distribution
- files
+ \___ MESHTV/ ___|--- 1d/
+ \ |--- 2d/
+ \ |--- 3d/
+ \ |--- Common/
+ \
+ \_ configure.ac and other distribution
+ files
1) ALBERTA
The main package.
@@ -99,6 +104,14 @@ header file are available on your system (determined at configure
time, use "configure --help" for appropriate command line switches for
"configure").
+7) 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.
+
+The interface is only installed if the Silo library and header files are
+available on your system. See "configure --help" for details.
+
II) External packages
=====================
@@ -216,6 +229,21 @@ GRAPE -- Graphics Programming Environment
http://www.mathematik.uni-freiburg.de/IAM/Research/grape/GENERAL/
+Silo --
+ Silo is a library developed at the Lawrence Livermore National
+ Laboratory to handle portable storage of mesh and function data. It
+ serves as an interface to MeshTV, an open source visualization
+ project also based at the LLNL.
+ If the Silo library is present, the programs alberta_meshtv? are
+ compiled and installed. They can be used to convert ALBERTA meshes
+ and DOF_REAL[_D]_VECS to Silo data files, which can then be
+ visualized using the MeshTV binary.
+
+ MeshTV and Silo are available from
+
+ http://www.llnl.gov/bdiv/meshtv/
+
+
alternate compilers
Many CPU-vendors distribute highly optimizing compilers for
their specific CPU architecture. Often those compilers
@@ -382,11 +410,19 @@ notation (e.g. PREFIX, EPREFIX etc.).
--with-grape-dir=DIR use grape library (and headers) below directory DIR
(no default)
--with-grape-lib=DIR use grape library below directory DIR (default:
- EPREFIX/lib/)
+ PREFIX/lib/)
--with-grape-headers=DIR
use grape include files below directory DIR
(default: PREFIX/include/)
+ --with-silo-dir=DIR use Silo library (and headers) below directory DIR
+ (no default)
+ --with-silo-lib=DIR use Silo library below directory DIR (default:
+ PREFIX/lib/)
+ --with-silo-headers=DIR
+ use Silo include files below directory DIR
+ (default: PREFIX/include/)
+
IV. Compiler flags
==================
diff --git a/configure.ac b/configure.ac
index fd9f6bef7649277dcebd0025e40070b08f39c6ba..f0674954bf95405c6a1d422061d94a4c2d6dadd0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,6 +15,7 @@ AC_CONFIG_FILES([Makefile ALBERTA_UTIL/Makefile
GRAPE/mesh/3d/Makefile
GRAPE/mesh/Common/Makefile
MESHTV/Makefile
+ MESHTV/1d/Makefile
MESHTV/2d/Makefile
MESHTV/3d/Makefile
SOLVER/Makefile SOLVER/src/Makefile
diff --git a/m4/grapeiface.m4 b/m4/grapeiface.m4
index 9b32bdc5dfe11dbddc6af56104f1c6f61d92757c..5bd70282e9602bace9c87296c5aaea244e627a96 100644
--- a/m4/grapeiface.m4
+++ b/m4/grapeiface.m4
@@ -8,12 +8,17 @@ ALBERTA_CHECK_PACKAGE(grape, gr, , ${OPENGL_LIB} ${X_ALL_LIBS}, grape.h,,, optio
AM_CONDITIONAL(GRAPE, test -n "${GRAPE_LIB}")
ALBERTA_LIB_PATH=$prefix/lib
ALBERTA_INCLUDE_PATH='$(top_srcdir)/ALBERTA/src/Common/ -I$(top_srcdir)/ALBERTA_UTIL'
+
+ALBERTA_LIBS_1='$(top_builddir)/ALBERTA/src/ALBERTA1_00/libALBERTA1_00.la $(top_builddir)/SOLVER/src/libcsolver.la $(top_builddir)/ALBERTA_UTIL/libalberta_util.la $(top_builddir)/PLOT_ANSI/src/libPLOTansi.la $(BLAS_ALL_LIB) $(GLTOOLS_ALL_LIB)'
+
ALBERTA_LIBS_2='$(top_builddir)/ALBERTA/src/ALBERTA2_00/libALBERTA2_00.la $(top_builddir)/SOLVER/src/libcsolver.la $(top_builddir)/ALBERTA_UTIL/libalberta_util.la $(top_builddir)/PLOT_ANSI/src/libPLOTansi.la $(BLAS_ALL_LIB) $(GLTOOLS_ALL_LIB)'
+
ALBERTA_LIBS_3='$(top_builddir)/ALBERTA/src/ALBERTA3_00/libALBERTA3_00.la $(top_builddir)/SOLVER/src/libcsolver.la $(top_builddir)/ALBERTA_UTIL/libalberta_util.la $(top_builddir)/PLOT_ANSI/src/libPLOTansi.la $(BLAS_ALL_LIB) $(GLTOOLS_ALL_LIB)'
ALBERTA_DEBUG=
AC_SUBST(ALBERTA_DEBUG)
AC_SUBST(ALBERTA_LIB_PATH)
AC_SUBST(ALBERTA_INCLUDE_PATH)
+AC_SUBST(ALBERTA_LIBS_1)
AC_SUBST(ALBERTA_LIBS_2)
AC_SUBST(ALBERTA_LIBS_3)
dnl