Commit a0f5b9c9 authored by hrchilds's avatar hrchilds

Update from March 31, 2005

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@442 18c085ea-50e0-402c-830e-de6fd14e8384
parent 81c154cf
......@@ -111,6 +111,10 @@
# Mark C. Miller, Tue Mar 22 08:54:39 PST 2005
# Added cat of output from make clean in data dir to /dev/null
#
# Jeremy Meredith, Thu Mar 31 18:25:45 PST 2005
# Made MPICH for Linux to the beginning of the path. (Putting it at the
# beginning helps us avoid LAM.)
#
# ----------------------------------------------------------------------------
# list of users who want email every night with the log file
......@@ -180,7 +184,7 @@ fi
umask 002
DISPLAY=elysium:0
export DISPLAY
PATH=/home/visit/bin:/data_vobs/VisIt/clearcase_bin:/home/visit/clearcase_bin:/usr/atria/bin:/usr/security/bin:/sbin:/usr/sbin:/usr/bsd:/usr/local/bin:/usr/bin:/bin:/etc:/usr/bin/X11:/usr/local/X11:/usr/etc:/usr/lib:/usr/atria/bin:/usr/ccs/bin:/usr/SUNWspro/bin:/usr/gapps/mpich/1.2.4/SunOS/serial/default/debug/bin:.
PATH=/misc/gapps/mpich/1.2.4/Linux/serial/64/debug/bin:/home/visit/bin:/data_vobs/VisIt/clearcase_bin:/home/visit/clearcase_bin:/usr/atria/bin:/usr/security/bin:/sbin:/usr/sbin:/usr/bsd:/usr/local/bin:/usr/bin:/bin:/etc:/usr/bin/X11:/usr/local/X11:/usr/etc:/usr/lib:/usr/atria/bin:/usr/ccs/bin:/usr/SUNWspro/bin:.
export PATH
# rebuild visit
......
......@@ -92,6 +92,9 @@ avtFeatureEdgesFilter::~avtFeatureEdgesFilter()
// the ghost zones ourselves to do what used to be done from within the
// feature edges filter.
//
// Hank Childs, Thu Mar 31 11:16:23 PST 2005
// Fix problem with single cell case ['6105].
//
// ****************************************************************************
vtkDataSet *
......@@ -117,7 +120,7 @@ avtFeatureEdgesFilter::ExecuteData(vtkDataSet *inDS, int, string)
// VTK doesn't do a good job with 1-cell feature edges, so just do it
// ourselves.
//
int i;
int i, j;
vtkCell *cell = inDS->GetCell(0);
vtkPolyData *output = vtkPolyData::New();
......@@ -131,8 +134,10 @@ avtFeatureEdgesFilter::ExecuteData(vtkDataSet *inDS, int, string)
vtkPoints *pts = vtkPoints::New();
pts->SetNumberOfPoints(npts);
outPD->CopyAllocate(inPD, npts);
std::vector<int> origId(npts, -1);
for (i = 0 ; i < npts ; i++)
{
origId[i] = ids->GetId(i);
outPD->CopyData(inPD, ids->GetId(i), i);
float pt[3];
inDS->GetPoint(ids->GetId(i), pt);
......@@ -148,8 +153,18 @@ avtFeatureEdgesFilter::ExecuteData(vtkDataSet *inDS, int, string)
vtkCell *edge = cell->GetEdge(i);
vtkIdList *edge_ids = edge->GetPointIds();
int line[2];
line[0] = edge_ids->GetId(0);
line[1] = edge_ids->GetId(1);
int origId0 = edge_ids->GetId(0);
int origId1 = edge_ids->GetId(1);
int newId0 = 0, newId1 = 0;
for (j = 0 ; j < npts ; j++)
{
if (origId0 == origId[j])
newId0 = j;
if (origId1 == origId[j])
newId1 = j;
}
line[0] = newId0;
line[1] = newId1;
lines->InsertNextCell(2, line);
}
......
......@@ -233,6 +233,10 @@ avtRayTracer::SetGradientBackgroundColors(const float bg1[3],
// Hank Childs, Sun Mar 13 11:16:20 PST 2005
// Fix memory leak.
//
// Hank Childs, Tue Mar 29 16:19:19 PST 2005
// If the image is large, force divisions of 512x512, even if we should
// theoretically have enough memory to cover it.
//
// ****************************************************************************
void
......@@ -341,6 +345,13 @@ avtRayTracer::Execute(void)
int numDivisions = (int) sqrt((double) numTiles);
if (numDivisions < 1)
numDivisions = 1;
int altNumDiv = (int)(screen[0] / 700.) + 1;
if (altNumDiv > numDivisions)
numDivisions = altNumDiv;
altNumDiv = (int)(screen[1] / 700.) + 1;
if (altNumDiv > numDivisions)
numDivisions = altNumDiv;
int IStep = screen[0] / numDivisions;
int JStep = screen[1] / numDivisions;
avtImage_p whole_image;
......
......@@ -54,14 +54,6 @@ PYVERSION=python2.1
##
CXXFLAGS="-Wno-deprecated $CXXFLAGS"
##
## The -Wl,-s flag strips the libraries and executables so they link 10x faster
## But we can still build with -g so it only takes a re-link to get debug info
##
if test -z "$LDFLAGS"; then
LDFLAGS="-Wl,-s $LDFLAGS"
fi
##
## Add parallel arguments.
## (mpich needs -lthread not -lpthread and -lrt (real-time lib))
......
......@@ -36,14 +36,6 @@ fi
PYDIR=$VISITHOME/python/sunos_57
PYVERSION=python2.1
##
## The -Wl,-s flag strips the libraries and executables so they link 10x faster
## But we can still build with -g so it only takes a re-link to get debug info
##
if test -z "$LDFLAGS"; then
LDFLAGS="-Wl,-s $LDFLAGS"
fi
##
## Add pthread arguments.
##
......
......@@ -36,14 +36,6 @@ fi
PYDIR=$VISITHOME/python/sunos_57
PYVERSION=python2.1
##
## The -Wl,-s flag strips the libraries and executables so they link 10x faster
## But we can still build with -g so it only takes a re-link to get debug info
##
if test -z "$LDFLAGS"; then
LDFLAGS="-Wl,-s $LDFLAGS"
fi
##
## Add pthread arguments.
##
......
......@@ -54,14 +54,6 @@ PYVERSION=python2.1
##
CXXFLAGS="-Wno-deprecated $CXXFLAGS"
##
## The -Wl,-s flag strips the libraries and executables so they link 10x faster
## But we can still build with -g so it only takes a re-link to get debug info
##
if test -z "$LDFLAGS"; then
LDFLAGS="-Wl,-s $LDFLAGS"
fi
##
## Add parallel arguments.
## (mpich needs -lthread not -lpthread and -lrt (real-time lib))
......
......@@ -3,6 +3,7 @@
// ************************************************************************* */
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <visit_writer.h>
......
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