Commit f86bdc1a authored by hrchilds's avatar hrchilds

Update from December 6, 2005

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@581 18c085ea-50e0-402c-830e-de6fd14e8384
parent 6c0fd4c2
......@@ -27,18 +27,20 @@ shell prompt.
Mesa 5.0.2 3-D Graphics Library http://www.mesa3d.org/
Python 2.3.3 Scripting Language http://www.python.org
Qt 3.3.1 GUI Toolkit http://www.trolltech.com
Silo 4.4.3 File I/O library http://www.llnl.gov/bdiv/meshtv
ftp://ftp.llnl.gov/pub/visit/3rd_party/silo051121.sh
VTK 20031028 Visualization Toolkit http://www.kitware.com
HDF5 1.6.0 I/O library http://hdf.ncsa.uiuc.edu/HDF5/
Optional Version Description For More Information
======== ======= =========== ====================
HDF5 1.6.0 I/O library http://hdf.ncsa.uiuc.edu/HDF5/
Silo 4.4.3 File I/O library http://www.llnl.gov/bdiv/meshtv
ftp://ftp.llnl.gov/pub/visit/3rd_party/silo051121.sh
Mili 1.09 I/O library (none)
HDF4 2.0 I/O library http://hdf.ncsa.uiuc.edu/release4/obtain.html
netCDF 3.6.0 File I/O library http://www.unidata.ucar.edu/packages/netcdf/
CGNS 2.4 File I/O library http://www.cgns.org
GDAL 1.3.0 GIS reader library http://www.gdal.org
ExodusII 2.0.5 File I/O library http://endo.sandia.gov/SEACAS/Documentation/SEACAS.html
The public version of VisIt has been built with the above listed versions
of the libraries, so it is known to work properly with those versions. For
......@@ -646,7 +648,7 @@ offset = offset + (0x1000 - offset % 0x1000)
offset = 0x2263c000
===============================================================================
Building HDF5 as a prebound dynamic library
Building HDF5 as a prebound dynamic library (optional)
===============================================================================
HDF5 is a data storage library that allows you to efficiently write large
......@@ -687,62 +689,6 @@ offset = offset + (0x1000 - offset % 0x1000)
# Next offset
offset = 0x2274b000
===============================================================================
Building Silo as a prebound dynamic library (optional)
===============================================================================
Silo is a self-describing, machine-independent scientific file format.
Silo is one of the file formats supported by VisIt. Follow the directions
listed below to build Silo. If you have any problems building or installing
Silo, read the INSTALL_NOTES file in the SILO distribution for more
information.
Note that these instructions assume that Silo will be built with HDF5 support.
If you don't want to build Silo with HDF5 support, replace the --with-hdf5=...
with --without-hdf5. The library segment offsets used assume that Silo will be
built with support for HDF5. If you choose to disable HDF5 support, the
offsets will not be affected since the HDF5 version of the Silo library
should be larger.
# Build silo source into an archive library
sh silo051121.sh
cd silo051121
# Set the values of some helper variables (tcsh)
set HDF5INCLUDE=$VISITDIR/hdf5/include
set HDF5LIB=$VISITDIR/hdf5/lib
env CFLAGS="-O2 -fno-common -fPIC" ./configure --disable-sdx --without-readline --without-exodus --with-hdf5=$HDF5INCLUDE,$HDF5LIB
make
# Turn the archive library into a prebound dynamic library
cd lib
mkdir tmplib
cd tmplib
ar -x ../libsilo.a
gcc -dynamiclib -prebind -twolevel_namespace -Wl,-seg1addr,0x2274b000,-install_name,@executable_path/../lib/libsilo.dylib,-compatibility_version,4.4.3,-current_version,4.4.3,-undefined,dynamic_lookup -o ../libsilo.dylib *.o -L$HDF5LIB -lhdf5
cd ..
# Install Silo
mkdir $VISITDIR/silo
mkdir $VISITDIR/silo/include
mkdir $VISITDIR/silo/lib
cp silo/silo/silo.h $VISITDIR/silo/include
cp silo/silo/silo.inc $VISITDIR/silo/include
cp silo/sdx/sdx.h $VISITDIR/silo/include
cp silo/sdx/sdx.inc $VISITDIR/silo/include
cp lib/libsilo.dylib $VISITDIR/silo/lib
cd ..
The next offset after libsilo.dylib, which has an offset of 0x2274b000 and a library
size of 599,372 (0x9254c) bytes is:
# Next offset
offset = 0x2274b000 + int(float(0x9254c) * 1.05)
# Align the offset to 0x1000 byte boundaries
offset = offset + (0x1000 - offset % 0x1000)
# Next offset
offset = 0x227e5000
===============================================================================
Building Mili as a prebound dynamic library (optional)
===============================================================================
......@@ -972,6 +918,103 @@ offset = offset + (0x1000 - offset % 0x1000)
# Next offset
offset = 0x22e43000
===============================================================================
Building Exodus II as a prebound dynamic library (optional)
===============================================================================
EXODUS II is a model developed to store and retrieve data for finite element
analyses. It is used for preprocessing (problem definition), postprocessing
(results visualization), as well as code to code data transfer. An EXODUS II
data file is a random access, machine independent, binary file that is written
and read via C, C++, or Fortran library routines which comprise the Application
Programming Interface. (exodusII is based on netcdf)
# Unpack Exodus II source
tar zxvf exodusii.20010823.tar.gz
cd ACCESS/libraries/exodus/cbind/src
# Build the Exodus II source (note that it requires NetCDF)
set NETCDFLIB=$VISITPATH/netcdf/3.6.0/lib
set NETCDFINC=$VISITPATH/netcdf/3.6.0/include
gcc -O2 -I/usr/include/malloc -I../include -I$NETCDFINC -fno-common -c *.c
# Build a prebound dynamic library
gcc -dynamiclib -prebind -twolevel_namespace -Wl,-seg1addr,0x22e43000,-install_name,@executable_path/../lib/libexoIIv2c.dylib,-compatibility_version,2.0.5,-current_version,2.0.5,-undefined,dynamic_lookup -o libexoIIv2c.dylib *.o -L$NETCDFLIB -lnetcdf
# Install Exodus
mkdir $VISITPATH/exodusII
mkdir $VISITPATH/exodusII/include
mkdir $VISITPATH/exodusII/lib
cp libexoIIv2c.dylib $VISITPATH/exodusII/lib
cp ../include/*.h $VISITPATH/exodusII/include
cp $VISITPATH/netcdf/3.6.0/include/netcdf.h $VISITPATH/exodusII/include
cd ../../../../../
# Next offset
offset = 0x22e43000 + int(float(149480) * 1.05)
# Align the offset to 0x1000 byte boundaries
offset = offset + (0x1000 - offset % 0x1000)
# Next offset
offset = 0x22e6a000
===============================================================================
Building Silo as a prebound dynamic library (optional)
===============================================================================
Silo is a self-describing, machine-independent scientific file format.
Silo is one of the file formats supported by VisIt. Follow the directions
listed below to build Silo. If you have any problems building or installing
Silo, read the INSTALL_NOTES file in the SILO distribution for more
information.
Note that these instructions assume that Silo will be built with HDF5 support.
If you build Silo with HDF5 support then you must have first built HDF5 using
the instructions provided earlier in this document. If you don't want to build
Silo with HDF5 support, replace the --with-hdf5=... with --without-hdf5.
The library segment offsets used assume that Silo will be built with support
for HDF5. If you choose to disable HDF5 support, the offsets will not be
affected since the HDF5 version of the Silo library should be larger.
# Build silo source into an archive library
sh silo051121.sh
cd silo051121
# Set the values of some helper variables (tcsh)
set HDF5INCLUDE=$VISITDIR/hdf5/include
set HDF5LIB=$VISITDIR/hdf5/lib
env CFLAGS="-O2 -fno-common -fPIC" ./configure --disable-sdx --without-readline --without-exodus --with-hdf5=$HDF5INCLUDE,$HDF5LIB
make
# Turn the archive library into a prebound dynamic library
cd lib
mkdir tmplib
cd tmplib
ar -x ../libsilo.a
gcc -dynamiclib -prebind -twolevel_namespace -Wl,-seg1addr,0x33e43000,-install_name,@executable_path/../lib/libsilo.dylib,-compatibility_version,4.4.3,-current_version,4.4.3,-undefined,dynamic_lookup -o ../libsilo.dylib *.o -L$HDF5LIB -lhdf5
cd ..
# Install Silo
mkdir $VISITDIR/silo
mkdir $VISITDIR/silo/include
mkdir $VISITDIR/silo/lib
cp silo/silo/silo.h $VISITDIR/silo/include
cp silo/silo/silo.inc $VISITDIR/silo/include
cp silo/sdx/sdx.h $VISITDIR/silo/include
cp silo/sdx/sdx.inc $VISITDIR/silo/include
cp lib/libsilo.dylib $VISITDIR/silo/lib
cd ..
The next offset after libsilo.dylib, which has an offset of 0x33e43000 and a library
size of 669,216 (0xa3620) bytes is:
# Next offset
offset = 0x33e43000 + int(float(0xa3620) * 1.05)
# Align the offset to 0x1000 byte boundaries
offset = offset + (0x1000 - offset % 0x1000)
# Next offset
offset = 0x33eef000
===============================================================================
Building VisIt with prebinding
===============================================================================
......@@ -982,14 +1025,14 @@ reserve a memory range after the Python library. Suppose all other
libraries that we want can fit in 10Mb. If that assumption becomes invalid,
we can recalculate the offset for the VisIt libraries. The starting address
for the VisIt libraries using the current assumptions would then be:
0x228a0000 + 10Mb
0x33eef000 + 10Mb
# Next offset
offset = 0x228a0000 + 0x2faf080
offset = 0x33eef000 + 0x2faf080
# Align the offset to 0x1000 byte boundaries
offset = offset + (0x1000 - offset % 0x1000)
# Next offset
offset = 0x2322a000
offset = 0x36e9f000
VisIt uses GNU's autoconf system to provide platform independence when
building VisIt in a UNIX environment. Autoconf creates a script called
......
......@@ -45,6 +45,9 @@
# Brad Whitlock, Thu Jun 23 17:12:02 PST 2005
# I made it copy makemoviemain.py
#
# Brad Whitlock, Mon Nov 21 16:57:39 PST 2005
# I made it copy libbz2.{dll,lib}.
#
#------------------------------------------------------------------------------
if(`pwd` != "/data_vobs/VisIt") then
......@@ -156,13 +159,8 @@ foreach hdrdir (Common Filtering Graphics Hybrid IO Imaging Rendering)
end
mkdir include/VTK/MangleMesaInclude
cp $TOPDIR/include/vtk/MangleMesaInclude/*.h include/VTK/MangleMesaInclude
cp $TOPDIR/include/vtk/expat.h include/VTK
#
# Copy the vtkCamera.h header from include/visit to include/VTK since
# our vtkCamera was built into VTK on Windows.
#
rm -f include/VTK/vtkCamera.h
mv include/VisIt/vtkCamera.h include/VTK
#
# Create an include/Mesa directory and copy the Mesa files to it.
......@@ -206,7 +204,7 @@ end
#
foreach buildmode (Debug Release)
cd $VisItDev/bin/$buildmode
foreach DLL (MesaGL.dll hdf5dll.dll osmesa.dll silohdf5.dll sziplib.dll zlib.dll)
foreach DLL (MesaGL.dll hdf5dll.dll osmesa.dll silohdf5.dll sziplib.dll zlib.dll libbz2.dll)
cp $DLL ../MSVC7.Net/$buildmode
end
end
......@@ -237,7 +235,7 @@ cp -R $TOPDIR/windowsbuild/lib .
foreach buildmode (Debug Release)
# Copy import libraries
cd $VisItDev/lib/$buildmode
foreach DLL (MesaGL.lib hdf5dll.lib osmesa.lib silohdf5.lib zlib.lib)
foreach DLL (MesaGL.lib hdf5dll.lib osmesa.lib silohdf5.lib zlib.lib libbz2.lib)
cp $DLL ../MSVC7.Net/$buildmode
end
end
......
......@@ -116,7 +116,10 @@
#
# Brad Whitlock, Fri Nov 18 15:45:58 PST 2005
# Added avtDistanceToBestFitLineFilter.
#
#
# Brad Whitlock, Wed Nov 23 10:36:57 PDT 2005
# Added more libs for Mac linking.
#
##############################################################################
@SET_MAKE@
......@@ -272,9 +275,9 @@ CPPFLAGS=@COMPONENT_CPPFLAGS@ @CPPFLAGS@
SEROBJ=$(SRC:.C=.o)
PAROBJ=$(SRC:.C=_par.o)
LIB=libexpressions
COMMONLIBS=-ldbatts -lavtexceptions -lstate -lcomm -lmisc -lexpr -lparser -lutility -lvisit_vtk -llightweight_visit_vtk
SERLIBS=$(COMMONLIBS) -lpipeline_ser -lavtmath_ser $(VTK_LIBS) $(X_LIBS) @LIBS@
PARLIBS=$(COMMONLIBS) -lpipeline_par -lavtmath_par $(VTK_LIBS) $(X_LIBS) @LIBS@ @SHLIB_MPI_LIBS@
COMMONLIBS=-ldbatts -lavtexceptions -lstate -lcomm -lmisc -lexpr -lparser -lutility -lplugin -lvisit_vtk -llightweight_visit_vtk -lavtview
SERLIBS=$(COMMONLIBS) -lpipeline_ser -lavtmath_ser -ldatabase_ser -lmir_ser $(VTK_LIBS) $(X_LIBS) @LIBS@
PARLIBS=$(COMMONLIBS) -lpipeline_par -lavtmath_par -ldatabase_par -lmir_par $(VTK_LIBS) $(X_LIBS) @LIBS@ @SHLIB_MPI_LIBS@
##
## Standard targets...
......
......@@ -97,7 +97,8 @@ IsovolumeCellReconstructor::ReconstructCell(int cellid_, int celltype_,
// Fill the volume fractions for the current material
for (int n = 0 ; n < nids ; n++)
int n;
for (n = 0 ; n < nids ; n++)
{
nodeVFs[n][matno] = 0.;
if (!allZeros &&
......@@ -117,7 +118,7 @@ IsovolumeCellReconstructor::ReconstructCell(int cellid_, int celltype_,
// Fill the VF's array and calculate the clip case
//
int lookup_case = 0;
for (int n = nids-1 ; n >= 0 ; n--)
for (n = nids-1 ; n >= 0 ; n--)
{
// node is from original mesh
newVFs[n] = nodeVFs[n][matno];
......@@ -198,7 +199,7 @@ IsovolumeCellReconstructor::ReconstructCell(int cellid_, int celltype_,
if (lookup_case != 0)
{
TempCell cell;
for (int n = 0 ; n < nids ; n++)
for (n = 0 ; n < nids ; n++)
{
cell.localids[n] = n;
cell.ids[n] = ids[n];
......@@ -218,7 +219,7 @@ IsovolumeCellReconstructor::ReconstructCell(int cellid_, int celltype_,
// Fake an old cell for now
//
TempCell old;
for (int n = 0 ; n < nids ; n++)
for (n = 0 ; n < nids ; n++)
{
old.localids[n] = n;
old.ids[n] = ids[n];
......
# Copyright 2000 - 2004
# Copyright 2000 - 2005
# The Regents of the University of California.
# All rights reserved.
#
......@@ -75,6 +75,10 @@
# I moved the Exceptions library out of components into common to fix
# the build order so we can prelink on MacOS X.
#
# Brad Whitlock, Wed Nov 23 10:31:24 PDT 2005
# I changed the build order for MacOS X because expressions and queries
# now depend on the database library.
#
##############################################################################
@SET_MAKE@
......@@ -82,7 +86,7 @@
@DIRTARGETS@
SUBDIRS=DBAtts Math Pipeline MIR \
Expressions View Filters Queries Database Plotter FileWriter \
View Filters Database Expressions Queries Plotter FileWriter \
@VISWINDOW@ QtVisWindow
message:
......
......@@ -23,7 +23,7 @@ WindowAttributes avtCallback::windowAtts;
LightList avtCallback::lightList;
bool avtCallback::nowinMode = false;
bool avtCallback::swRendering = true;
bool avtCallback::swRendering = false;
UpdatePlotAttributesCallback avtCallback::updatePlotAttributesCallback = NULL;
void *avtCallback::updatePlotAttributesCallbackArgs
......
......@@ -6,10 +6,11 @@
#if !defined(_WIN32)
// Do not include mangled Mesa on windows until we figure out what to do.
#include <GL/gl_mangle.h>
#include <MangleMesaInclude/gl_mangle.h>
#endif
#define avtOpenGLSurfaceAndWireframeRenderer avtMesaSurfaceAndWireframeRenderer
#define VTK_IMPLEMENT_MESA_CXX
#include "avtOpenGLSurfaceAndWireframeRenderer.C"
......
......@@ -4,11 +4,6 @@
#include "avtOpenGLSurfaceAndWireframeRenderer.h"
#if defined(_WIN32)
#include <windows.h>
#endif
#include <GL/gl.h>
#include <vtkCellArray.h>
#include <vtkCellData.h>
#include <vtkPointData.h>
......@@ -19,6 +14,19 @@
#include <vtkRenderWindow.h>
#include <vtkTriangle.h>
#ifndef VTK_IMPLEMENT_MESA_CXX
#if defined(__APPLE__) && (defined(VTK_USE_CARBON) || defined(VTK_USE_COCOA))
#include <OpenGL/gl.h>
#else
#if defined(_WIN32)
#include <windows.h>
#endif
#include <GL/gl.h>
#endif
#else
#include <GL/gl.h>
#endif
#include <DebugStream.h>
......
......@@ -113,6 +113,9 @@
# Brad Whitlock, Thu Nov 17 10:15:40 PDT 2005
# Added Best Fit Line.
#
# Brad Whitlock, Wed Nov 23 10:35:24 PDT 2005
# Added libs required for Mac linking.
#
##############################################################################
@SET_MAKE@
......@@ -194,9 +197,9 @@ CPPFLAGS=@COMPONENT_CPPFLAGS@ @CPPFLAGS@
SEROBJ=$(SRC:.C=.o)
PAROBJ=$(SRC:.C=_par.o)
LIB=libquery
COMMONLIBS=-ldbatts -lavtexceptions -lstate -lcomm -lmisc -lexpr -lparser -lutility -lavtview -lvisit_vtk -llightweight_visit_vtk
SERLIBS=$(COMMONLIBS) -lpipeline_ser -lavtmath_ser -lavtfilters_ser -lexpressions_ser $(VTK_LIBS) $(X_LIBS) @LIBS@
PARLIBS=$(COMMONLIBS) -lpipeline_par -lavtmath_par -lavtfilters_par -lexpressions_par $(VTK_LIBS) $(X_LIBS) @LIBS@ @SHLIB_MPI_LIBS@
COMMONLIBS=-ldbatts -lavtexceptions -lstate -lcomm -lmisc -lexpr -lparser -lutility -lplugin -lavtview -lvisit_vtk -llightweight_visit_vtk
SERLIBS=$(COMMONLIBS) -lpipeline_ser -lavtmath_ser -lavtfilters_ser -lexpressions_ser -ldatabase_ser -lmir_ser $(VTK_LIBS) $(X_LIBS) @LIBS@
PARLIBS=$(COMMONLIBS) -lpipeline_par -lavtmath_par -lavtfilters_par -lexpressions_par -ldatabase_par -lmir_par $(VTK_LIBS) $(X_LIBS) @LIBS@ @SHLIB_MPI_LIBS@
##
## Standard targets...
......
......@@ -43,6 +43,12 @@ PYVERSION=python2.3
DEFAULT_CGNS_INCLUDE=$VISITHOME/cgns/2.4/include
DEFAULT_CGNS_LIB=$VISITHOME/cgns/2.4/lib
##
## Exodus
##
DEFAULT_EXODUS_INCLUDES=$VISITHOME/exodusII/include
DEFAULT_EXODUS_LIBRARY=$VISITHOME/exodusII/lib
##
## GDAL
##
......
......@@ -309,7 +309,7 @@ ac_includes_default="\
# include <unistd.h>
#endif"
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS TOPDIR PLATFORM_CPPFLAGS CXXFLAGS PARALLEL PARALLEL_CPPFLAGS MPI_LIBS MPI_CC MPI_CXX LIBSTATICPAR LIBSHAREDPAR LIBSHAREDPAR_UPDATEONLY MESA_DIR MESA_INCLUDE MESA_LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT GL_LIBS VTK_DIR VTK_INCLUDES VTK_LIBS VTK_LIGHTWEIGHT_LIBS AVTPREP_SER AVTPREP_PAR CONVERT_SER CONVERT_PAR MAKEMILI_SER MAKEMILI_PAR ENGINE_SER ENGINE_PAR ENGINELIBSER ENGINELIBPAR METADATA_SERVER MDSERVERLIB MDSERVEROBJ VISITPY SCRIPTINGLIB SCRIPTINGOBJ GUI GUILIB GUIOBJ GUIFRAMEWORKS VIEWER VISWINDOW VIEWERLIB VIEWEROBJ VIEWERLIB_SRC VIEWEREXE_SRC ENGINEPROXYDIR ANNOTATION_FLAGS JAVAC JAVA_TARGET JAR JAVAFLAGS JAVAPLUGINFLAGS HELP PLOT_OPTIONAL_DIRS OPERATOR_OPTIONAL_DIRS DB_OPTIONAL_DIRS BUILD_BZIP2 CXX ac_ct_CXX CXXCPP CPP SET_MAKE RANLIB ac_ct_RANLIB MAKEDEPEND OS_RULE EGREP ZLIB_INCLUDE ZLIB_LIB HDF5 HDF5_INCLUDE HDF5_LIB VBT_INCLUDE VBT_LIB SAF SAF_INCLUDE SAF_LIB SILO_INCLUDE SILO_LIB SILO_LIBDIR EXODUS EXODUS_LIBS EXODUS_FLAGS PDB PDB_FLAGS PDB_LIBS PDB_EXEC MILI MILI_FLAGS MILI_LIBS MILI_DIR HDF4 HDF4_FLAGS HDF4_LIBS HDF4_LIBDIR BOXLIB2D BOXLIB2D_INCLUDE BOXLIB2D_LIBS BOXLIB3D BOXLIB3D_INCLUDE BOXLIB3D_LIBS VISUS VISUS_INCLUDE VISUS_LIB NETCDF NETCDF_INCLUDE NETCDF_LIB CGNS CGNS_INCLUDE CGNS_LIB GDAL GDAL_INCLUDE GDAL_LIB GDAL_LIBS ENGINE_CPPFLAGS SILOOBJVTK_CPPFLAGS PREPROCESSOR_CPPFLAGS PREPROCESSOR_PARALLEL_SRC COMPONENT_CPPFLAGS VISIT_VTK_CPPFLAGS VIEWER_CPPFLAGS QT_BIN QT_INCLUDE QT_LIB QT_LIBS QT_LDFLAGS QT_STATICLDFLAGS QT_CXXFLAGS QT_MOC X_LIBS VTKQT_CPPFLAGS VTKQT VTKQT_LIBS PTHREAD_LIB PTHREAD_CXXFLAGS PYDIR PYVERSION PY_INCLUDEDIR PY_CXXFLAGS PY_LDFLAGS PY_LIB PY_CLI_LIB SHLIB_CREATEPROG SHLIB_LIBS SHLIB_SERLIBS SHLIB_PARLIBS SHLIB_MPI_LIBS SHLIB_ILIBS SHLIB_GLIBS SHLIB_VLIBS SHLIB_MLIBS SHLIB_ESERLIBS SHLIB_EPARLIBS SHLIB_SLIBS SHLIB_POSTPROCESS_ILIBS SHLIB_POSTPROCESS_GLIBS SHLIB_POSTPROCESS_VLIBS SHLIB_POSTPROCESS_MLIBS SHLIB_POSTPROCESS_ESERLIBS SHLIB_POSTPROCESS_EPARLIBS SHLIB_POSTPROCESS_SLIBS SHLIB_SOEXT SHLIB_LIBEXT SHLIB_POSTPROCESS SHLIB_POSTPROCESS_SER SHLIB_POSTPROCESS_PAR SHLIB_TMPDIR PREBIND_LIBS ENGINEWRAPSER ENGINEWRAPPAR CREATE_SILO_LINK CREATE_MILI_LINK CREATE_HDF4_LINK CREATE_HDF5_LINK CREATE_NETCDF_LINK CREATE_CGNS_LINK CREATE_GDAL_LINK MG tmpbin tmpinc tmplib plotplugindir operatorplugindir databaseplugindir LIBOBJS LTLIBOBJS'
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS TOPDIR PLATFORM_CPPFLAGS CXXFLAGS PARALLEL PARALLEL_CPPFLAGS MPI_LIBS MPI_CC MPI_CXX LIBSTATICPAR LIBSHAREDPAR LIBSHAREDPAR_UPDATEONLY MESA_DIR MESA_INCLUDE MESA_LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT GL_LIBS VTK_DIR VTK_INCLUDES VTK_LIBS VTK_LIGHTWEIGHT_LIBS AVTPREP_SER AVTPREP_PAR CONVERT_SER CONVERT_PAR MAKEMILI_SER MAKEMILI_PAR ENGINE_SER ENGINE_PAR ENGINELIBSER ENGINELIBPAR METADATA_SERVER MDSERVERLIB MDSERVEROBJ VISITPY SCRIPTINGLIB SCRIPTINGOBJ GUI GUILIB GUIOBJ GUIFRAMEWORKS VIEWER VISWINDOW VIEWERLIB VIEWEROBJ VIEWERLIB_SRC VIEWEREXE_SRC ENGINEPROXYDIR ANNOTATION_FLAGS JAVAC JAVA_TARGET JAR JAVAFLAGS JAVAPLUGINFLAGS HELP PLOT_OPTIONAL_DIRS OPERATOR_OPTIONAL_DIRS DB_OPTIONAL_DIRS BUILD_BZIP2 CXX ac_ct_CXX CXXCPP CPP SET_MAKE RANLIB ac_ct_RANLIB MAKEDEPEND OS_RULE EGREP ZLIB_INCLUDE ZLIB_LIB HDF5 HDF5_INCLUDE HDF5_LIB VBT_INCLUDE VBT_LIB SAF SAF_INCLUDE SAF_LIB SILO_INCLUDE SILO_LIB SILO_LIBDIR EXODUS EXODUS_LIB EXODUS_LIBS EXODUS_FLAGS PDB PDB_FLAGS PDB_LIBS PDB_EXEC MILI MILI_FLAGS MILI_LIBS MILI_DIR HDF4 HDF4_FLAGS HDF4_LIBS HDF4_LIBDIR BOXLIB2D BOXLIB2D_INCLUDE BOXLIB2D_LIBS BOXLIB3D BOXLIB3D_INCLUDE BOXLIB3D_LIBS VISUS VISUS_INCLUDE VISUS_LIB NETCDF NETCDF_INCLUDE NETCDF_LIB CGNS CGNS_INCLUDE CGNS_LIB GDAL GDAL_INCLUDE GDAL_LIB GDAL_LIBS ENGINE_CPPFLAGS SILOOBJVTK_CPPFLAGS PREPROCESSOR_CPPFLAGS PREPROCESSOR_PARALLEL_SRC COMPONENT_CPPFLAGS VISIT_VTK_CPPFLAGS VIEWER_CPPFLAGS QT_BIN QT_INCLUDE QT_LIB QT_LIBS QT_LDFLAGS QT_STATICLDFLAGS QT_CXXFLAGS QT_MOC X_LIBS VTKQT_CPPFLAGS VTKQT VTKQT_LIBS PTHREAD_LIB PTHREAD_CXXFLAGS PYDIR PYVERSION PY_INCLUDEDIR PY_CXXFLAGS PY_LDFLAGS PY_LIB PY_CLI_LIB SHLIB_CREATEPROG SHLIB_LIBS SHLIB_SERLIBS SHLIB_PARLIBS SHLIB_MPI_LIBS SHLIB_ILIBS SHLIB_GLIBS SHLIB_VLIBS SHLIB_MLIBS SHLIB_ESERLIBS SHLIB_EPARLIBS SHLIB_SLIBS SHLIB_POSTPROCESS_ILIBS SHLIB_POSTPROCESS_GLIBS SHLIB_POSTPROCESS_VLIBS SHLIB_POSTPROCESS_MLIBS SHLIB_POSTPROCESS_ESERLIBS SHLIB_POSTPROCESS_EPARLIBS SHLIB_POSTPROCESS_SLIBS SHLIB_SOEXT SHLIB_LIBEXT SHLIB_POSTPROCESS SHLIB_POSTPROCESS_SER SHLIB_POSTPROCESS_PAR SHLIB_TMPDIR PREBIND_LIBS ENGINEWRAPSER ENGINEWRAPPAR CREATE_SILO_LINK CREATE_MILI_LINK CREATE_HDF4_LINK CREATE_HDF5_LINK CREATE_NETCDF_LINK CREATE_CGNS_LINK CREATE_GDAL_LINK CREATE_EXODUS_LINK MG tmpbin tmpinc tmplib plotplugindir operatorplugindir databaseplugindir LIBOBJS LTLIBOBJS'
ac_subst_files='VARIABLES TARGETS DIRTARGETS LIBTARGETS PARLIBTARGETS SOURCE_DEPENDENCIES'
# Initialize some variables set by options.
......@@ -8853,10 +8853,16 @@ fi
EXODUS=""
EXODUS_FLAGS=""
EXODUS_LIBS=""
EXODUS_LIB=""
if test "$exodus_enabled" = "yes"; then
EXODUS="$""(EXODUS)"
EXODUS_FLAGS="$EXODUS_FLAGS -I$exodus_inc"
EXODUS_LIBS="-L$exodus_lib -lexoIIv2c -lnetcdf"
if test "$SHORT_UNAME" = "darwin"; then
EXODUS_LIB="$exodus_lib/libexoIIv2c.dylib"
else
EXODUS_LIB="$exodus_lib/libexoIIv2c.a"
fi
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
else
......@@ -8868,6 +8874,7 @@ fi
#
# See of --with-pdb was specified. Use PDB lite otherwise.
#
......@@ -10663,7 +10670,7 @@ case $SHORT_UNAME in
PREBIND_LIBS="$""(PREBIND_LIBS)"
# Create the address.txt file with the initial offset for the VisIt libraries.
rm -f address.txt linkedit.log
echo "0x2322a000" > address.txt
echo "0x36e9f000" > address.txt
;;
esac
# Set up the defaults
......@@ -10739,10 +10746,10 @@ fi
#
# This helps the Makefile in the lib directory make the right links
# to Silo, Mili, HDF4, HDF5, NETCDF, CGNS, and GDAL. It is only needed
# on MacOS X because on other platforms, these libraries are statically
# linked into the database plugins and on MacOS X they are dynamically
# linked.
# to Silo, Mili, HDF4, HDF5, NETCDF, CGNS, GDAL, and Exodus. It is only
# needed on MacOS X because on other platforms, these libraries are
# statically linked into the database plugins and on MacOS X they are
# dynamically linked.
#
CREATE_SILO_LINK=""
CREATE_MILI_LINK=""
......@@ -10751,6 +10758,7 @@ CREATE_HDF5_LINK=""
CREATE_NETCDF_LINK=""
CREATE_CGNS_LINK=""
CREATE_GDAL_LINK=""
CREATE_EXODUS_LINK=""
case $SHORT_UNAME in
darwin)
if test "$SILO_LIB" != "" ; then
......@@ -10774,6 +10782,9 @@ case $SHORT_UNAME in
if test "$GDAL_LIB" != "" ; then
CREATE_GDAL_LINK="create_gdal_link"
fi
if test "$EXODUS_LIB" != "" ; then
CREATE_EXODUS_LINK="create_exodus_link"
fi
;;
esac
......@@ -10784,6 +10795,7 @@ esac
#
# Check for library functions that can work around, or that we have
# replacements for.
......@@ -17784,6 +17796,7 @@ s,@SILO_INCLUDE@,$SILO_INCLUDE,;t t
s,@SILO_LIB@,$SILO_LIB,;t t
s,@SILO_LIBDIR@,$SILO_LIBDIR,;t t
s,@EXODUS@,$EXODUS,;t t
s,@EXODUS_LIB@,$EXODUS_LIB,;t t
s,@EXODUS_LIBS@,$EXODUS_LIBS,;t t
s,@EXODUS_FLAGS@,$EXODUS_FLAGS,;t t
s,@PDB@,$PDB,;t t
......@@ -17880,6 +17893,7 @@ s,@CREATE_HDF5_LINK@,$CREATE_HDF5_LINK,;t t
s,@CREATE_NETCDF_LINK@,$CREATE_NETCDF_LINK,;t t
s,@CREATE_CGNS_LINK@,$CREATE_CGNS_LINK,;t t
s,@CREATE_GDAL_LINK@,$CREATE_GDAL_LINK,;t t
s,@CREATE_EXODUS_LINK@,$CREATE_EXODUS_LINK,;t t
s,@MG@,$MG,;t t
s,@tmpbin@,$tmpbin,;t t
s,@tmpinc@,$tmpinc,;t t
......
......@@ -2060,16 +2060,23 @@ fi
EXODUS=""
EXODUS_FLAGS=""
EXODUS_LIBS=""
EXODUS_LIB=""
if test "$exodus_enabled" = "yes"; then
EXODUS="$""(EXODUS)"
EXODUS_FLAGS="$EXODUS_FLAGS -I$exodus_inc"
EXODUS_LIBS="-L$exodus_lib -lexoIIv2c -lnetcdf"
if test "$SHORT_UNAME" = "darwin"; then
EXODUS_LIB="$exodus_lib/libexoIIv2c.dylib"
else
EXODUS_LIB="$exodus_lib/libexoIIv2c.a"
fi
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
fi
AC_SUBST(EXODUS)
AC_SUBST(EXODUS_LIB)
AC_SUBST(EXODUS_LIBS)
AC_SUBST(EXODUS_FLAGS)
......@@ -2918,7 +2925,7 @@ case $SHORT_UNAME in
PREBIND_LIBS="$""(PREBIND_LIBS)"
# Create the address.txt file with the initial offset for the VisIt libraries.
rm -f address.txt linkedit.log
echo "0x2322a000" > address.txt
echo "0x36e9f000" > address.txt
;;
esac
# Set up the defaults
......@@ -2991,10 +2998,10 @@ AC_SUBST(ENGINEWRAPPAR)
#
# This helps the Makefile in the lib directory make the right links
# to Silo, Mili, HDF4, HDF5, NETCDF, CGNS, and GDAL. It is only needed
# on MacOS X because on other platforms, these libraries are statically
# linked into the database plugins and on MacOS X they are dynamically
# linked.
# to Silo, Mili, HDF4, HDF5, NETCDF, CGNS, GDAL, and Exodus. It is only
# needed on MacOS X because on other platforms, these libraries are
# statically linked into the database plugins and on MacOS X they are
# dynamically linked.
#
CREATE_SILO_LINK=""
CREATE_MILI_LINK=""
......@@ -3003,6 +3010,7 @@ CREATE_HDF5_LINK=""
CREATE_NETCDF_LINK=""
CREATE_CGNS_LINK=""
CREATE_GDAL_LINK=""
CREATE_EXODUS_LINK=""
case $SHORT_UNAME in
darwin)
if test "$SILO_LIB" != "" ; then
......@@ -3026,6 +3034,9 @@ case $SHORT_UNAME in
if test "$GDAL_LIB" != "" ; then
CREATE_GDAL_LINK="create_gdal_link"
fi
if test "$EXODUS_LIB" != "" ; then
CREATE_EXODUS_LINK="create_exodus_link"
fi
;;
esac
AC_SUBST(CREATE_SILO_LINK)
......@@ -3035,6 +3046,7 @@ AC_SUBST(CREATE_HDF5_LINK)
AC_SUBST(CREATE_NETCDF_LINK)
AC_SUBST(CREATE_CGNS_LINK)
AC_SUBST(CREATE_GDAL_LINK)
AC_SUBST(CREATE_EXODUS_LINK)
#
# Check for library functions that can work around, or that we have
......
......@@ -856,7 +856,11 @@ avtDuneFileFormat::ReadDuneData(const int timestate) {
const string q = "Q(";
const string w = "W(";
const string r = "R(";
#if defined(_WIN32)
const double pi = 3.14159265358979323846;
#else
const double pi = M_PI;
#endif
const double volume_factor = 4.0/3.0 * pi;
const string species = "Species(";
const string material = "Material(";
......
<?xml version="1.0"?>
<Plugin name="PDB" label="PDB" type="database" dbtype="MTSD" version="1.0">
<Extensions> pdb r0000 </Extensions>
<CXXFLAGS> $(PDB_FLAGS) </CXXFLAGS>
<LIBS> $(PDB_LIBS) </LIBS>
<Files components="E,M">avtPDBFileFormat.C MaterialEncoder.C PDBFileObject.C PDBReader.C PF3DFileFormat.C PP_ZFileReader.C PP_Z_STSD_FileFormat.C PP_Z_MTSD_FileFormat.C LEOSFileReader.C LEOSFileFormat.C bow.C fwav.C gzlib.C</Files>
<Plugin name="PDB" type="database" label="PDB" version="1.0" enabled="true" mdspecificcode="true" onlyengine="false" noengine="false" dbtype="MTSD" haswriter="false" hasoptions="false">
<CXXFLAGS>
$(PDB_FLAGS)
</CXXFLAGS>
<LIBS>
$(PDB_LIBS)
</LIBS>
<Extensions>
pdb
r0000
</Extensions>
<Files components="M">
avtPDBFileFormat.C
MaterialEncoder.C
PDBFileObject.C
PDBReader.C
PF3DFileFormat.C
PP_ZFileReader.C
PP_Z_STSD_FileFormat.C
PP_Z_MTSD_FileFormat.C
LEOSFileReader.C
LEOSFileFormat.C
bow.C