Commit 197d567b authored by hrchilds's avatar hrchilds

Update from June 16, 2003

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@13 18c085ea-50e0-402c-830e-de6fd14e8384
parent 6e60dcf0
......@@ -405,22 +405,22 @@ More information about building VisIt follows after that.
#
# Build and install it in the visit directory.
#
gunzip visit030508.tar.gz
tar xf visit030508.tar
cd visit030508/config-site
gunzip visit030616.tar.gz
tar xf visit030616.tar
cd visit030616/config-site
echo VISITHOME=`cat ../../visitpath` > `hostname`.conf
cat Template.conf >> `hostname`.conf
cd ..
env CXXFLAGS=-O2 ./configure
make
clearcase_bin/visit-bin-dist -v 1.1.4
clearcase_bin/visit-bin-dist -v 1.1.5
# Use the appropriate install command based on the operating system on
# which you built VisIt.
clearcase_bin/visit-install 1.1.4 aix `cat ../visitpath`
clearcase_bin/visit-install 1.1.4 irix6 `cat ../visitpath`
clearcase_bin/visit-install 1.1.4 linux `cat ../visitpath`
clearcase_bin/visit-install 1.1.4 osf1 `cat ../visitpath`
clearcase_bin/visit-install 1.1.4 sunos5 `cat ../visitpath`
clearcase_bin/visit-install 1.1.5 aix `cat ../visitpath`
clearcase_bin/visit-install 1.1.5 irix6 `cat ../visitpath`
clearcase_bin/visit-install 1.1.5 linux `cat ../visitpath`
clearcase_bin/visit-install 1.1.5 osf1 `cat ../visitpath`
clearcase_bin/visit-install 1.1.5 sunos5 `cat ../visitpath`
When running the configure script you can enable or disable certain dependent
packages. All the configure options are listed at the beginning of the
......
......@@ -17,7 +17,7 @@ Unix:
where
"version" will be 1.1.4 for the current distribution.
"version" will be 1.1.5 for the current distribution.
"platform" will be one of the following: aix, irix6, linux, osf1,
or sunos5 depending on the machine. The one you use should match
......@@ -28,17 +28,17 @@ Unix:
For example
visit-install 1.1.4 irix6 /usr/local/visit
visit-install 1.1.5 irix6 /usr/local/visit
will install the irix6, 1.1.4 version of visit in the directory
will install the irix6, 1.1.5 version of visit in the directory
"/usr/local/visit". Note that you will need to have the file
"visit1_1_4.irix6.tar.gz" present in the current directory for this
"visit1_1_5.irix6.tar.gz" present in the current directory for this
to function properly. You can install multiple binaries into the
same directory. For example, you could then execute
visit-install -a 1.1.4 linux /usr/local/visit
visit-install -a 1.1.5 linux /usr/local/visit
to add a linux, 1.1.4 version of visit to the same directory.
to add a linux, 1.1.5 version of visit to the same directory.
2. Add the bin directory below the installation directory
(/usr/local/visit/bin in our example) to each user's search path.
......@@ -76,15 +76,15 @@ Unix:
Windows:
1. Copy the file visit1.1.4.exe to your desktop.
1. Copy the file visit1.1.5.exe to your desktop.
2. Right click on the visit1.1.4.exe icon using your mouse and selecting
"Extract to folder C:\...\Desktop\visit1.1.4" from the popup menu. A
2. Right click on the visit1.1.5.exe icon using your mouse and selecting
"Extract to folder C:\...\Desktop\visit1.1.5" from the popup menu. A
window will popup as the file is extracted into the directory. Once
the process is complete a "visit1.1.4" directory icon should appear on
the process is complete a "visit1.1.5" directory icon should appear on
your desktop.
3. Double click on the "visit1.1.4" directory icon bringing up a file
3. Double click on the "visit1.1.5" directory icon bringing up a file
system browsing window.
4. Double click on the SETUP icon with the computer display icon to run
......
......@@ -13,8 +13,8 @@ LDFLAGS="-n32 $LDFLAGS"
##
## Report all warnings.
##
CFLAGS="-fullwarn $CFLAGS"
CXXFLAGS="-fullwarn $CXXFLAGS"
CFLAGS="-fullwarn -woff 1424,3625,3649 $CFLAGS"
CXXFLAGS="-fullwarn -woff 1424,3625,3649 $CXXFLAGS"
##
## Build parallel too
......
......@@ -13,8 +13,8 @@ LDFLAGS="-n32 $LDFLAGS"
##
## Report all warnings.
##
CFLAGS="-fullwarn $CFLAGS"
CXXFLAGS="-fullwarn $CXXFLAGS"
CFLAGS="-fullwarn -woff 1424,3625,3649 $CFLAGS"
CXXFLAGS="-fullwarn -woff 1424,3625,3649 $CXXFLAGS"
##
## Build parallel too
......
This diff is collapsed.
......@@ -415,6 +415,9 @@ dnl
dnl Akira Haddox, Thu Jun 12 08:56:16 PDT 2003
dnl Added support for HDF4.
dnl
dnl Eric Brugger, Mon Jun 16 13:22:38 PDT 2003
dnl Only build the BOV database reader if zlib is present.
dnl
dnl --------------------------------------------------------------------------
dnl
......@@ -1119,6 +1122,7 @@ saved_CFLAGS="$CFLAGS"
saved_LDFLAGS="$LDFLAGS"
saved_LIBS="$LIBS"
HAVE_ZLIB="no"
AC_ARG_WITH(zlib,[ --with-zlib=INC,LIB Use the GNU zlib compression],
,withval=yes)
case $withval in
......@@ -1131,6 +1135,7 @@ case $withval in
AC_CHECK_LIB(z, compress2,
ZLIB_LIB="-lz $ZLIB_LIB"
AC_DEFINE(HAVE_LIBZ)
HAVE_ZLIB="yes"
)
;;
no)
......@@ -1152,12 +1157,13 @@ case $withval in
fi
zlib_lib="`echo $withval |cut -f2 -d, -s`"
if test "X" != "$zlb_lib"; then
if test "X" != "$zlib_lib"; then
CPPFLAGS="$CPPFLAGS $ZLIB_INCLUDE"
LDFLAGS="$LDFLAGS -L$zlib_lib"
AC_CHECK_LIB(z, compress2,
ZLIB_LIB="-L$zlib_lib -lz $ZLIB_LIB"
AC_DEFINE(HAVE_LIBZ)
HAVE_ZLIB="yes"
)
LIBS="$saved_LIBS"
LDFLAGS="$saved_LDFLAGS"
......@@ -1167,6 +1173,7 @@ case $withval in
AC_CHECK_LIB(z, compress2,
ZLIB_LIB="-lz $ZLIB_LIB"
AC_DEFINE(HAVE_LIBZ)
HAVE_ZLIB="yes"
)
LIBS="$saved_LIBS"
CPPFLAGS="$saved_CPPFLAGS"
......@@ -1567,6 +1574,15 @@ else
fi
AC_SUBST(SILO_LIB)
dnl
dnl Only build the BOV database reader if zlib is present.
dnl
BOV=""
if test "$HAVE_ZLIB" = "yes"; then
BOV="$""(BOV)"
fi
AC_SUBST(BOV)
dnl
dnl Check for exodus libraries
dnl
......
......@@ -82,16 +82,17 @@ avtKullLiteFileFormat::avtKullLiteFileFormat(const char *fname)
if (a=='M' && b=='K' && c=='F')
{
string a(fname);
char b[1024];
string prefix = "";
int last_slash = a.find_last_of('/');
if (last_slash != string::npos)
prefix = a.substr(0, last_slash + 1);
inf >> a;
inf >> b;
while (inf && !inf.eof())
{
a = prefix + a;
a = prefix + b;
AddFile(a.c_str());
inf >> a;
inf >> b;
}
}
else // We're opening a single file, it's not an index
......@@ -1108,7 +1109,7 @@ OrderWedgePoints(const vector< vector<int> > &nodes, int *points)
{
const int nWedgeFaces = 5;
int i, j;
int i;
//
// First determine that we really have a quad. Also determine the location
......
......@@ -67,7 +67,7 @@ class DATABASE_API avtKullLiteFileFormat : public avtSTMDFileFormat
// Returns true if the string holds to the material string standard:
// Must start with mat_, and must have one other underscore.
inline bool IsMaterialName(const string &str)
inline bool IsMaterialName(const std::string &str)
{
return (str[0] == 'm') && (str[1] == 'a') && (str[2] == 't')
&& (str[3] == '_') && (str.find_last_of('_') != 4);
......@@ -76,7 +76,7 @@ class DATABASE_API avtKullLiteFileFormat : public avtSTMDFileFormat
// Precondition: IsMaterialName(str) is true
// Returns the string contained between mat_ and the last underscore.
// Eg: "pure_gold" in "mat_pure_gold_zones"
inline string GetMaterialName(const string &str)
inline std::string GetMaterialName(const std::string &str)
{ return str.substr(4, str.find_last_of('_') - 4); }
PDBfile *m_pdbFile;
......
......@@ -73,6 +73,9 @@
# Akira Haddox, Thu Jun 12 10:12:47 PDT 2003
# Added Cosmos reader.
#
# Eric Brugger, Mon Jun 16 12:57:17 PDT 2003
# Make the building of the BOV reader optional.
#
##############################################################################
@SET_MAKE@
......@@ -80,18 +83,19 @@
all: message
for dir in $(SUBDIRS); do (cd $$dir && $(MAKE) $@) || exit 1; done
BOV=BOV
EXODUS=Exodus TimeVaryingExodus
HDF5=Tetrad
MILI=Mili
PDB=KullLite
SAF=SAF
SAMPLES=Rect Hex
REQUIRED=BOV Cosmos Curve2D EnSight Lines PLOT3D Point3D STL Silo Spheral VTK WavefrontOBJ
REQUIRED=Cosmos Curve2D EnSight Lines PLOT3D Point3D STL Silo Spheral VTK WavefrontOBJ
OPTIONAL=
SUBDIRS=$(REQUIRED) @DB_OPTIONAL_DIRS@ @EXODUS@ @SAF@ @HDF5@ @PDB@ @MILI@
ALLSUBDIRS=$(REQUIRED) $(EXODUS) $(SAF) $(HDF5) $(MILI) $(PDB) $(SAMPLES)
SUBDIRS=$(REQUIRED) @DB_OPTIONAL_DIRS@ @BOV@ @EXODUS@ @SAF@ @HDF5@ @PDB@ @MILI@
ALLSUBDIRS=$(REQUIRED) $(BOV) $(EXODUS) $(SAF) $(HDF5) $(MILI) $(PDB) $(SAMPLES)
message:
@echo
......
......@@ -21,17 +21,6 @@ const char *avtPoint3DFileFormat::MESHNAME = "points";
using std::string;
using std::vector;
#if defined(_WIN32)
// Define >> for strings since Windows does not seem to have it.
ifstream &operator >> (ifstream &s, string &str)
{
char tmp[1000];
s >> tmp;
str = string(tmp);
return s;
}
#endif
// ****************************************************************************
// Method: avtPoint3DFileFormat constructor
//
......@@ -240,9 +229,9 @@ avtPoint3DFileFormat::ReadData(void)
for (i = 0 ; i < 4 ; i++)
{
string s;
ifile >> s;
varnames.push_back(s);
char buf[1024];
ifile >> buf;
varnames.push_back(buf);
}
char line[1024];
......
......@@ -448,9 +448,9 @@ void vtkSlicer::SliceDataset(vtkDataSet *in_ds, vtkPolyData *out_pd)
cutter->SetCutFunction(plane);
cutter->SetInput(in_ds);
cutter->SetOutput(out_pd);
out_pd->Update();
out_pd->SetSource(NULL);
cutter->Update();
out_pd->ShallowCopy(cutter->GetOutput());
cutter->Delete();
plane->Delete();
......
......@@ -364,8 +364,7 @@ vtkSurfaceFromVolume::ConstructPolyData(vtkPointData *inPD, vtkCellData *inCD,
pt[2] = pts_ptr[idx1]*p + pts_ptr[idx2]*bp;
idx1++; idx2++;
outPts->SetPoint(ptIdx, pt);
outPD->InterpolateEdge(inPD, ptIdx, pe.ptIds[0], pe.ptIds[1],
pe.percent);
outPD->InterpolateEdge(inPD, ptIdx, pe.ptIds[0], pe.ptIds[1], bp);
ptIdx++;
}
}
......@@ -444,8 +443,7 @@ vtkSurfaceFromVolume::ConstructPolyData(vtkPointData *inPD, vtkCellData *inCD,
pt[1] = pt1[1]*p + pt2[1]*bp;
pt[2] = pt1[2]*p + pt2[2]*bp;
outPts->SetPoint(ptIdx, pt);
outPD->InterpolateEdge(inPD, ptIdx, pe.ptIds[0], pe.ptIds[1],
pe.percent);
outPD->InterpolateEdge(inPD, ptIdx, pe.ptIds[0], pe.ptIds[1], bp);
ptIdx++;
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment