Commit 10d3ab01 authored by hrchilds's avatar hrchilds

Update from May 12, 2005

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@467 18c085ea-50e0-402c-830e-de6fd14e8384
parent 833cecb9
......@@ -541,14 +541,14 @@ cp lib/libsilo.dylib $VISITDIR/silo/lib
cd ..
The next offset after libsilo.dylib, which has an offset of 0x22714000 and a library
size of 595,036 (0x9145c) bytes is:
size of 599,372 (0x9254c) bytes is:
# Next offset
offset = 0x22714000 + int(float(0x9145c) * 1.05)
offset = 0x22714000 + int(float(0x9254c) * 1.05)
# Align the offset to 0x1000 byte boundaries
offset = offset + (0x1000 - offset % 0x1000)
# Next offset
offset = 0x227ad000
offset = 0x227ae000
===============================================================================
Building Mili as a prebound dynamic library
......@@ -570,8 +570,8 @@ the Mili's src directory
CC=gcc
CFLAGS = -I. -O2 -fno-common -fPIC
MILI_LDFLAGS=-Wl,-seg1addr,0x227b0000 -L. -lgahl
GAHL_LDFLAGS=-Wl,-seg1addr,0x227ad000
MILI_LDFLAGS=-Wl,-seg1addr,0x227b1000 -L. -lgahl
GAHL_LDFLAGS=-Wl,-seg1addr,0x227ae000
LDFLAGS=-dynamiclib -prebind -twolevel_namespace -Wl,-install_name,@executable_path/../lib/$@
.SUFFIXES : .o .c
MILI_SRC=mili.c direc.c param.c io.c util.c dep.c svar.c srec.c mesh_u.c wrap_c.c io_mem.c eprtf.c sarray.c
......@@ -598,15 +598,15 @@ cp mili.h $VISITPATH/mili
cp mili_enum.h $VISITPATH/mili
cd ../..
The next offset after libmili.dylib, which has an offset of 0x227b0000 and
The next offset after libmili.dylib, which has an offset of 0x227b1000 and
a library size of 109,556 (0x1abf4) bytes is:
# Next offset
offset = 0x227b0000 + int(float(0x1abf4) * 1.05)
offset = 0x227b1000 + int(float(0x1abf4) * 1.05)
# Align the offset to 0x1000 byte boundaries
offset = offset + (0x1000 - offset % 0x1000)
# Next offset
offset = 0x227cd000
offset = 0x227ce000
==============================================================================
Building HDF4 as a prebound dynamic library
......@@ -634,7 +634,7 @@ cd hdf/src
mkdir tmp
cd tmp
ar -x ../libdf.a
gcc -dynamiclib -prebind -twolevel_namespace -o libdf.dylib *.o -L$VISITPATH/jpeg/lib -ljpeg -lz -Wl,-seg1addr,0x227cd000,-install_name,@executable_path/../lib/libdf.dylib,-compatibility_version,2.0,-current_version,2.0
gcc -dynamiclib -prebind -twolevel_namespace -o libdf.dylib *.o -L$VISITPATH/jpeg/lib -ljpeg -lz -Wl,-seg1addr,0x227ce000,-install_name,@executable_path/../lib/libdf.dylib,-compatibility_version,2.0,-current_version,2.0
mkdir $VISITPATH/hdf4
mkdir $VISITPATH/hdf4/lib
mkdir $VISITPATH/hdf4/include
......@@ -645,7 +645,7 @@ cd ../../../mfhdf/libsrc
mkdir tmp
cd tmp
ar -x ../libmfhdf.a
gcc -dynamiclib -prebind -twolevel_namespace -o libmfhdf.dylib *.o L$VISITPATH/jpeg/lib -L$VISITPATH/hdf4/lib -ljpeg -ldf -Wl,-seg1addr,0x2286000,-install_name,@executable_path/../lib/libmfhdf.dylib,-compatibility_version,2.0,-current_version,2.0
gcc -dynamiclib -prebind -twolevel_namespace -o libmfhdf.dylib *.o L$VISITPATH/jpeg/lib -L$VISITPATH/hdf4/lib -ljpeg -ldf -Wl,-seg1addr,0x22865000,-install_name,@executable_path/../lib/libmfhdf.dylib,-compatibility_version,2.0,-current_version,2.0
mv libmfhdf.dylib $VISITPATH/hdf4/lib
cd ../../..
......
......@@ -200,6 +200,9 @@
# Jeremy Meredith, Mon Apr 25 10:48:08 PDT 2005
# Added some basic multi-compiler support.
#
# Brad Whitlock, Thu May 12 11:30:24 PDT 2005
# Added code to copy MacOS X address computation script and address file.
#
#------------------------------------------------------------------------------
set DataFiles = "TRUE"
......@@ -648,7 +651,11 @@ cp $VisItDir/exe/mpeg_encode $bindir
cp $VisItDir/bin/makemovie.py $bindir
# copy surfcomp
cp $VisItDir/exe/surfcomp $bindir
# Copy MacOS X address computation script and address file.
cp $VisItDir/bin/linkedit.py $bindir
if(-e $VisItDir/address.txt) then
cp $VisItDir/address.txt distribution/visit/$Version/$visitbindir/
endif
#
# Make symlinks for the programs
......
......@@ -2448,6 +2448,9 @@ avtRectilinearDomainBoundaries::ExchangeMesh(vector<int> domainNum,
// Do not create domain-processor map, since that requires communication
// and cannot be used with dynamic load balancing.
//
// Brad Whitlock, Tue May 10 15:08:21 PST 2005
// Fixed for win32.
//
// ****************************************************************************
void
......@@ -2462,9 +2465,9 @@ avtStructuredDomainBoundaries::CreateGhostNodes(vector<int> domainNum,
// trick because the rest of the routine does not care which domains
// are on which processors -- only that we are using them.
//
int ntotaldomains = wholeBoundary.size();
int i, ntotaldomains = wholeBoundary.size();
vector<int> domain2proc(ntotaldomains, -1);
for (int i = 0 ; i < allDomains.size() ; i++)
for (i = 0 ; i < allDomains.size() ; i++)
{
if (domain2proc[allDomains[i]] < 0)
domain2proc[allDomains[i]] = 0;
......@@ -2472,7 +2475,7 @@ avtStructuredDomainBoundaries::CreateGhostNodes(vector<int> domainNum,
CreateCurrentDomainBoundaryInformation(domain2proc);
for (int i = 0 ; i < domainNum.size() ; i++)
for (i = 0 ; i < domainNum.size() ; i++)
{
int dom = domainNum[i];
Boundary *bi = &boundary[dom];
......
......@@ -115,6 +115,9 @@
# Brad Whitlock, Wed Jan 5 09:25:20 PDT 2005
# Added -lexpr for MacOS X.
#
# Brad Whitlock, Fri Apr 29 12:07:54 PDT 2005
# Moved -lmir to -lmir_ser, -lmir_par for parallel MacOS X build.
#
##############################################################################
@SET_MAKE@
......@@ -158,9 +161,9 @@ CPPFLAGS=-I../../include @COMPONENT_CPPFLAGS@ @CPPFLAGS@
SEROBJ=$(SRC:.C=.o)
PAROBJ=$(SRC:.C=_par.o)
LIB=libdatabase
COMMONLIBS=-ldbatts -lavtexceptions -lstate -lcomm -lmisc -lplugin -lexpr -lparser -lutility -lmir -lvisit_vtk -llightweight_visit_vtk
SERLIBS=$(COMMONLIBS) -lpipeline_ser -lavtmath_ser $(VTK_LIBS)
PARLIBS=$(COMMONLIBS) -lpipeline_par -lavtmath_par $(VTK_LIBS) @SHLIB_MPI_LIBS@
COMMONLIBS=-ldbatts -lavtexceptions -lstate -lcomm -lmisc -lplugin -lexpr -lparser -lutility -lvisit_vtk -llightweight_visit_vtk
SERLIBS=$(COMMONLIBS) -lmir_ser -lpipeline_ser -lavtmath_ser $(VTK_LIBS)
PARLIBS=$(COMMONLIBS) -lmir_par -lpipeline_par -lavtmath_par $(VTK_LIBS) @SHLIB_MPI_LIBS@
##
## Standard targets...
......
......@@ -40,6 +40,9 @@
# Brad Whitlock, Wed Jan 5 09:25:20 PDT 2005
# Added -lexpr for MacOS X.
#
# Brad Whitlock, Fri Apr 29 11:35:19 PDT 2005
# I made it be ser/par for parallel build on MacOS X.
#
##############################################################################
##
......@@ -56,20 +59,23 @@ SRC=avtImageFileWriter.C avtDatasetFileWriter.C avtFileWriter.C
CPPFLAGS=-I../../include/visit @COMPONENT_CPPFLAGS@ @CPPFLAGS@
OBJ=$(SRC:.C=.o)
SEROBJ=$(SRC:.C=.o)
PAROBJ=$(SRC:.C=_par.o)
LIB=libavtwriter
LIBS=-ldbatts -lpipeline_ser -lavtmath_ser -lavtexceptions -lvisit_vtk -llightweight_visit_vtk -lmisc -lstate -lcomm -lexpr -lparser -lutility $(VTK_LIBS) $(X_LIBS)
SERLIBS=-ldbatts -lpipeline_ser -lavtmath_ser -lavtexceptions -lvisit_vtk -llightweight_visit_vtk -lmisc -lstate -lcomm -lexpr -lparser -lutility $(VTK_LIBS) $(X_LIBS)
PARLIBS=-ldbatts -lpipeline_par -lavtmath_par -lavtexceptions -lvisit_vtk -llightweight_visit_vtk -lmisc -lstate -lcomm -lexpr -lparser -lutility $(VTK_LIBS) $(X_LIBS)
##
## Standard targets...
##
all: $(LIBSHARED)
all: $(LIBSHAREDSER) @LIBSHAREDPAR@
clean:
$(RM) $(OBJ) $(LIBSHARED)
$(RM) $(LIBSHAREDSER) @LIBSHAREDPAR@
$(RM) $(SEROBJ) $(PAROBJ)
##
## Automatic dependency stuff
##
@TARGETS@
@LIBTARGETS@
@PARLIBTARGETS@
# Copyright 2000 - 2004
# Copyright 2000 - 2005
# The Regents of the University of California.
# All rights reserved.
#
......@@ -43,6 +43,9 @@
# Brad Whitlock, Tue Jan 4 17:43:58 PST 2005
# I added -lexpr for MacOS X.
#
# Brad Whitlock, Fri Apr 29 11:35:19 PDT 2005
# I made it be ser/par for parallel build on MacOS X.
#
##############################################################################
@SET_MAKE@
......@@ -73,18 +76,20 @@ Zoo_src= \
CPPFLAGS=-I../../include @COMPONENT_CPPFLAGS@ @CPPFLAGS@
OBJ=$(SRC:.C=.o)
SEROBJ=$(SRC:.C=.o)
PAROBJ=$(SRC:.C=_par.o)
LIB=libmir
LIBS=-ldbatts -lpipeline_ser -lavtmath_ser -lavtexceptions -lstate -lutility -lmisc -lcomm -lexpr -lparser -llightweight_visit_vtk $(VTK_LIBS)
SERLIBS=-ldbatts -lpipeline_ser -lavtmath_ser -lavtexceptions -lstate -lutility -lmisc -lcomm -lexpr -lparser -llightweight_visit_vtk $(VTK_LIBS)
PARLIBS=-ldbatts -lpipeline_par -lavtmath_par -lavtexceptions -lstate -lutility -lmisc -lcomm -lexpr -lparser -llightweight_visit_vtk $(VTK_LIBS)
##
## Standard targets...
##
all: $(LIBSHARED)
all: $(LIBSHAREDSER) @LIBSHAREDPAR@
clean:
$(RM) $(LIBSHARED)
$(RM) $(OBJ)
$(RM) $(LIBSHAREDSER) @LIBSHAREDPAR@
$(RM) $(SEROBJ) $(PAROBJ)
##
## Nonstandard stuff for material tables
......@@ -103,4 +108,4 @@ mat3d_tet Tet/mat3d_tet.h Tet/mat3d_tet.C: Tet/mat3d_tables.C
## Automatic dependency stuff
##
@TARGETS@
@LIBTARGETS@
@PARLIBTARGETS@
# Copyright 2000 - 2004
# Copyright 2000 - 2005
# The Regents of the University of California.
# All rights reserved.
#
......@@ -297,6 +297,7 @@ PrivateFilters_src= \
PrivateFilters/avtMultipleInputToDataObjectFilter.C \
PrivateFilters/avtMultipleInputToDatasetFilter.C \
PrivateFilters/avtPluginStreamer.C \
PrivateFilters/avtPluginStructuredChunkStreamer.C \
PrivateFilters/avtSamplePointsToDataObjectFilter.C \
PrivateFilters/avtSamplePointsToDatasetFilter.C \
PrivateFilters/avtSamplePointsToImageFilter.C \
......
......@@ -1100,12 +1100,16 @@ avtDataSpecification::InitAdmissibleDataTypes()
// Programmer: Mark C. Miller
// Creation: March 23, 2005
//
// Modifications:
// Brad Whitlock, Tue May 10 15:03:30 PST 2005
// Fixed for win32.
//
// ****************************************************************************
void
avtDataSpecification::UpdateAdmissibleDataTypes(vector<int> admissibleTypes)
{
map<int,bool>::iterator it;
std::map<int,bool>::iterator it;
for (it = admissibleDataTypes.begin();
it != admissibleDataTypes.end(); it++)
{
......@@ -1131,12 +1135,16 @@ avtDataSpecification::UpdateAdmissibleDataTypes(vector<int> admissibleTypes)
// Programmer: Mark C. Miller
// Creation: March 23, 2005
//
// Modifications:
// Brad Whitlock, Tue May 10 15:03:30 PST 2005
// Fixed for win32.
//
// ****************************************************************************
bool
avtDataSpecification::IsAdmissibleDataType(int theType) const
{
map<int,bool>::const_iterator fit =
std::map<int,bool>::const_iterator fit =
admissibleDataTypes.find(theType);
if (fit != admissibleDataTypes.end())
return fit->second;
......@@ -1151,12 +1159,17 @@ avtDataSpecification::IsAdmissibleDataType(int theType) const
// Programmer: Mark C. Miller
// Creation: March 23, 2005
//
// Modifications:
// Brad Whitlock, Tue May 10 15:03:30 PST 2005
// Fixed for win32.
//
// ****************************************************************************
vector<int>
avtDataSpecification::GetAdmissibleDataTypes() const
{
vector<int> admissibleTypes;
map<int,bool>::const_iterator it;
std::map<int,bool>::const_iterator it;
for (it = admissibleDataTypes.begin();
it != admissibleDataTypes.end(); it++)
{
......
......@@ -445,7 +445,7 @@ avtMultiResolutionPartitionStrategy::AddBox(int *extents)
void
avtMultiResolutionPartitionStrategy::FindBoxes(int level, int cell)
{
int i, j;
int i;
RegionDescription &rd = reg_desc[level][cell];
if (rd.allOn)
......
......@@ -5,7 +5,7 @@
#ifndef AVT_MULTIRESOLUTION_PARTITION_STRATEGY_H
#define AVT_MULTIRESOLUTION_PARTITION_STRATEGY_H
#include <filters_exports.h>
#include <pipeline_exports.h>
#include <vector>
......@@ -24,7 +24,7 @@
//
// ****************************************************************************
class AVTFILTERS_API avtMultiResolutionPartitionStrategy
class PIPELINE_API avtMultiResolutionPartitionStrategy
: public avtStructuredMeshPartitionStrategy
{
public:
......
#include <avtPluginStructuredChunkStreamer.h>
avtPluginStructuredChunkStreamer::avtPluginStructuredChunkStreamer()
{
}
avtPluginStructuredChunkStreamer::~avtPluginStructuredChunkStreamer()
{
}
......@@ -26,6 +26,9 @@ class PIPELINE_API avtPluginStructuredChunkStreamer :
public virtual avtStructuredChunkStreamer,
public virtual avtPluginFilter
{
public:
avtPluginStructuredChunkStreamer();
virtual ~avtPluginStructuredChunkStreamer();
};
#endif
......
......@@ -765,7 +765,7 @@ avtStructuredMeshChunker::SplitIntoSubgrids(const int *dims, vtkDataSet *in_ds,
if ((boxes.size() % 6) != 0)
EXCEPTION0(ImproperUseException);
int nBoxes = boxes.size() / 6;
for (int i = 0 ; i < nBoxes ; i++)
for (i = 0 ; i < nBoxes ; i++)
{
// Now mark everything as being "in the grid".
MeshDescription descr;
......
......@@ -5,7 +5,7 @@
#ifndef AVT_STRUCTURED_MESH_CHUNKER_H
#define AVT_STRUCTURED_MESH_CHUNKER_H
#include <filters_exports.h>
#include <pipeline_exports.h>
class vtkCellData;
class vtkDataArray;
......@@ -45,7 +45,7 @@ class vtkUnstructuredGrid;
//
// ****************************************************************************
class AVTFILTERS_API avtStructuredMeshChunker
class PIPELINE_API avtStructuredMeshChunker
{
public:
typedef enum
......
......@@ -5,7 +5,7 @@
#ifndef AVT_STRUCTURED_MESH_PARTITION_STRATEGY_H
#define AVT_STRUCTURED_MESH_PARTITION_STRATEGY_H
#include <filters_exports.h>
#include <pipeline_exports.h>
#include <vector>
......@@ -24,7 +24,7 @@
//
// ****************************************************************************
class AVTFILTERS_API avtStructuredMeshPartitionStrategy
class PIPELINE_API avtStructuredMeshPartitionStrategy
{
public:
avtStructuredMeshPartitionStrategy();
......
......@@ -322,7 +322,8 @@ avtSweepPlanePartitionStrategy::ProposeGrid(int iStart, int iEnd, int jStart,
// remove all the previous candidates.
//
std::vector<bool> removeGrid(proposedGrid.size(), false);
for (int i = iStart ; i <= iEnd ; i++)
int i;
for (i = iStart ; i <= iEnd ; i++)
for (int j = jStart ; j <= jEnd ; j++)
for (int k = kStart ; k <= kEnd ; k++)
{
......@@ -347,7 +348,7 @@ avtSweepPlanePartitionStrategy::ProposeGrid(int iStart, int iEnd, int jStart,
{
GridCandidate &gc = proposedGrid[g];
gc.stillCandidate = false;
for (int i = gc.iStart ; i <= gc.iEnd ; i++)
for (i = gc.iStart ; i <= gc.iEnd ; i++)
for (int j = gc.jStart ; j <= gc.jEnd ; j++)
for (int k = gc.kStart ; k <= gc.kEnd ; k++)
{
......@@ -370,7 +371,7 @@ avtSweepPlanePartitionStrategy::ProposeGrid(int iStart, int iEnd, int jStart,
gc.stillCandidate = true;
proposedGrid.push_back(gc);
int gridIndex = proposedGrid.size() - 1;
for (int i = iStart ; i <= iEnd ; i++)
for (i = iStart ; i <= iEnd ; i++)
for (int j = jStart ; j <= jEnd ; j++)
for (int k = kStart ; k <= kEnd ; k++)
{
......
......@@ -5,7 +5,7 @@
#ifndef AVT_SWEEP_PLANE_PARTITION_STRATEGY_H
#define AVT_SWEEP_PLANE_PARTITION_STRATEGY_H
#include <filters_exports.h>
#include <pipeline_exports.h>
#include <vector>
......@@ -24,7 +24,7 @@
//
// ****************************************************************************
class AVTFILTERS_API avtSweepPlanePartitionStrategy
class PIPELINE_API avtSweepPlanePartitionStrategy
: public avtStructuredMeshPartitionStrategy
{
public:
......
......@@ -160,6 +160,9 @@
# Brad Whitlock, Wed Jan 5 09:25:20 PDT 2005
# Added -lexpr for MacOS X.
#
# Brad Whitlock, Fri Apr 29 11:35:19 PDT 2005
# I made it be ser/par for parallel build on MacOS X.
#
##############################################################################
##
......@@ -189,20 +192,24 @@ SRC=avtLegend.C avtVariableLegend.C avtGeometryDrawable.C avtActor.C \
CPPFLAGS=-I../../include/visit @COMPONENT_CPPFLAGS@ @CPPFLAGS@ @MESA_INCLUDE@
OBJ=$(SRC:.C=.o)
SEROBJ=$(SRC:.C=.o)
PAROBJ=$(SRC:.C=_par.o)
LIB=libplotter
LIBS=-ldbatts -lmisc -lcomm -lstate -lexpr -lparser -lutility -lpipeline_ser -lavtview -lavtmath_ser -lavtfilters_ser -lavtexceptions -lvisit_vtk -llightweight_visit_vtk -lparallel_visit_vtk_ser $(VTK_LIBS) $(X_LIBS)
SERLIBS=-ldbatts -lmisc -lcomm -lstate -lexpr -lparser -lutility -lpipeline_ser -lavtview -lavtmath_ser -lavtfilters_ser -lavtexceptions -lvisit_vtk -llightweight_visit_vtk -lparallel_visit_vtk_ser $(VTK_LIBS) $(X_LIBS)
PARLIBS=-ldbatts -lmisc -lcomm -lstate -lexpr -lparser -lutility -lpipeline_par -lavtview -lavtmath_par -lavtfilters_par -lavtexceptions -lvisit_vtk -llightweight_visit_vtk -lparallel_visit_vtk_par $(VTK_LIBS) $(X_LIBS)
##
## Standard targets...
##
all: $(LIBSHARED)
all: $(LIBSHAREDSER) @LIBSHAREDPAR@
clean:
$(RM) $(OBJ) $(LIBSHARED)
$(RM) $(LIBSHAREDSER) @LIBSHAREDPAR@
$(RM) $(SEROBJ) $(PAROBJ)
##
## Automatic dependency stuff
##
@TARGETS@
@LIBTARGETS@
@PARLIBTARGETS@
......@@ -43,6 +43,9 @@
# Brad Whitlock, Wed Jan 5 09:25:20 PDT 2005
# Added -lexpr for MacOS X.
#
# Brad Whitlock, Fri Apr 29 11:57:13 PDT 2005
# I changed -lplotter to -lplotter_ser and -lviswindow to -lviswindow_ser.
#
##############################################################################
##
......@@ -62,7 +65,7 @@ CPPFLAGS=@COMPONENT_CPPFLAGS@ @CPPFLAGS@ @VTKQT_CPPFLAGS@
OBJ=$(SRC:.C=.o)
LIB=libqtviswindow
LIBS=-ldbatts -lviswindow -lpipeline_ser -lavtfilters_ser -lavtmath_ser -lavtview -lavtexceptions -lplotter -lvisit_vtk -llightweight_visit_vtk -lparallel_visit_vtk_ser -lmisc -lstate -lcomm -lexpr -lparser -lutility @VTKQT_LIBS@ $(VTK_LIBS) $(X_LIBS)
LIBS=-ldbatts -lviswindow_ser -lpipeline_ser -lavtfilters_ser -lavtmath_ser -lavtview -lavtexceptions -lplotter_ser -lvisit_vtk -llightweight_visit_vtk -lparallel_visit_vtk_ser -lmisc -lstate -lcomm -lexpr -lparser -lutility @VTKQT_LIBS@ $(VTK_LIBS) $(X_LIBS)
##
## Standard targets...
......
......@@ -110,6 +110,9 @@
# Brad Whitlock, Wed Jan 5 09:25:20 PDT 2005
# Added -lexpr for MacOS X.
#
# Brad Whitlock, Fri Apr 29 11:35:19 PDT 2005
# I made it be ser/par for parallel build on MacOS X.
#
##############################################################################
@SET_MAKE@
......@@ -176,20 +179,23 @@ VisWindow_src= \
CPPFLAGS=@COMPONENT_CPPFLAGS@ @CPPFLAGS@ @ANNOTATION_FLAGS@ @VTK_INCLUDES@ $(MESA_INCLUDE)
OBJ=$(SRC:.C=.o)
SEROBJ=$(SRC:.C=.o)
PAROBJ=$(SRC:.C=_par.o)
LIB=libviswindow
LIBS=-ldbatts -lpipeline_ser -lavtfilters_ser -lavtmath_ser -lavtexceptions -lavtview -lmisc -lstate -lcomm -lexpr -lparser -lutility -lplotter -lvisit_vtk -llightweight_visit_vtk -lparallel_visit_vtk_ser @VTKQT_LIBS@ $(VTK_LIBS) $(X_LIBS)
SERLIBS=-ldbatts -lpipeline_ser -lavtfilters_ser -lavtmath_ser -lavtexceptions -lavtview -lmisc -lstate -lcomm -lexpr -lparser -lutility -lplotter_ser -lvisit_vtk -llightweight_visit_vtk -lparallel_visit_vtk_ser @VTKQT_LIBS@ $(VTK_LIBS) $(X_LIBS)
PARLIBS=-ldbatts -lpipeline_par -lavtfilters_par -lavtmath_par -lavtexceptions -lavtview -lmisc -lstate -lcomm -lexpr -lparser -lutility -lplotter_par -lvisit_vtk -llightweight_visit_vtk -lparallel_visit_vtk_par @VTKQT_LIBS@ $(VTK_LIBS) $(X_LIBS)
##
## Standard targets...
##
all: $(LIBSHARED)
all: $(LIBSHAREDSER) @LIBSHAREDPAR@
clean:
$(RM) $(OBJ) $(LIBSHARED)
$(RM) $(LIBSHAREDSER) @LIBSHAREDPAR@
$(RM) $(SEROBJ) $(PAROBJ)
##
## Automatic dependency stuff
##
@TARGETS@
@LIBTARGETS@
@PARLIBTARGETS@
This diff is collapsed.
This diff is collapsed.
......@@ -5,6 +5,8 @@
#include <strings.h>
#include <sys/types.h> // for getpid()
#include <unistd.h> // for alarm()
#else
#include <process.h> // for _getpid()
#endif
#include <new.h>
......@@ -1965,7 +1967,12 @@ Engine::ExecuteSimulationCommand(const std::string &command,
// Programmer: Mark C. Miller
// Creation: March 8, 2005
//
// Modifications:
// Brad Whitlock, Tue May 10 15:52:16 PST 2005
// Fixed for win32.
//
// ****************************************************************************
ProcessAttributes *
Engine::GetProcessAttributes()
{
......@@ -1980,8 +1987,13 @@ Engine::GetProcessAttributes()
doubleVector ppids;
stringVector hosts;
#if defined(_WIN32)
int myPid = _getpid();
int myPpid = -1;
#else
int myPid = getpid();
int myPpid = getppid();
#endif
#ifdef PARALLEL
......
......@@ -1323,7 +1323,7 @@ void
RPCExecutor<SimulationCommandRPC>::Execute(SimulationCommandRPC *rpc)
{
Engine *engine = Engine::Instance();
debug2 << "Executing SimulationCommandRPC: " << rpc->GetCommand() << endl;
debug2 << "Executing SimulationCommandRPC: " << rpc->GetCommand().c_str() << endl;
TRY
{
......
......@@ -218,6 +218,9 @@
# Brad Whitlock, Wed Jan 5 09:25:20 PDT 2005
# Added -lexpr for MacOS X.
#
# Brad Whitlock, Tue Apr 12 09:55:58 PDT 2005
# Made certain libraries be ser/par to link parallel VisIt on MacOS X.
#
# Jeremy Meredith, Thu Apr 28 17:47:51 PDT 2005
# Added explicit versioning for the VisIt Engine Library.
#
......@@ -236,37 +239,39 @@ LIB=libengine
CPPFLAGS= -I@tmpinc@ @ENGINE_CPPFLAGS@ @CPPFLAGS@ \
-I. -I../../include/visit
COMMONLIBS=-L../../lib -lplugin -lviswindow -lplotter -lmir -lavtview \
-lavtwriter -lvisit_vtk -llightweight_visit_vtk \
COMMONLIBS=-L../../lib -lplugin -lavtview \
-lvisit_vtk -llightweight_visit_vtk \
-lenginerpc -lutility -lmisc -lcomm -lstate \
-ldbatts -lavtexceptions -lexpr -lexpr -lparser
SERLIBS=$(COMMONLIBS) -lavtmath_ser -ldatabase_ser -lquery_ser \
SERLIBS=$(COMMONLIBS) -lviswindow_ser -lplotter_ser -lmir_ser -lavtwriter_ser \
-lavtmath_ser -ldatabase_ser -lquery_ser \
-lexpressions_ser -lavtfilters_ser -lpipeline_ser \
-lengineparstate_ser -lparallel_visit_vtk_ser \
@VTKQT_LIBS@ $(VTK_LIBS) $(X_LIBS) @LIBS@ @PTHREAD_LIB@
PARLIBS=$(COMMONLIBS) -lavtmath_par -ldatabase_par -lquery_par \
PARLIBS=$(COMMONLIBS) -lviswindow_par -lplotter_par -lmir_par -lavtwriter_par \
-lavtmath_par -ldatabase_par -lquery_par \
-lexpressions_par -lavtfilters_par -lpipeline_par \
-lengineparstate_par -lparallel_visit_vtk_par \
@VTKQT_LIBS@ $(VTK_LIBS) $(X_LIBS) \
@LIBS@ @MPI_LIBS@ @PTHREAD_LIB@
SERLIBDEP=../../lib/libplugin.@SHLIB_LIBEXT@ ../../lib/libplotter.@SHLIB_LIBEXT@ \
SERLIBDEP=../../lib/libplugin.@SHLIB_LIBEXT@ ../../lib/libplotter_ser.@SHLIB_LIBEXT@ \
../../lib/libdatabase_ser.@SHLIB_LIBEXT@ ../../lib/libpipeline_ser.@SHLIB_LIBEXT@ \
../../lib/libvisit_vtk.@SHLIB_LIBEXT@ ../../lib/libenginerpc.@SHLIB_LIBEXT@ \
../../lib/libutility.@SHLIB_LIBEXT@ ../../lib/libmisc.@SHLIB_LIBEXT@ \
../../lib/libcomm.@SHLIB_LIBEXT@ ../../lib/libstate.@SHLIB_LIBEXT@ \
../../lib/libengineparstate_ser.@SHLIB_LIBEXT@ ../../lib/libdbatts.@SHLIB_LIBEXT@ \
../../lib/libavtexceptions.@SHLIB_LIBEXT@ ../../lib/libmir.@SHLIB_LIBEXT@
../../lib/libavtexceptions.@SHLIB_LIBEXT@ ../../lib/libmir_ser.@SHLIB_LIBEXT@
PARLIBDEP=../../lib/libplugin.@SHLIB_LIBEXT@ ../../lib/libplotter.@SHLIB_LIBEXT@ \
PARLIBDEP=../../lib/libplugin.@SHLIB_LIBEXT@ ../../lib/libplotter_par.@SHLIB_LIBEXT@ \
../../lib/libdatabase_par.@SHLIB_LIBEXT@ ../../lib/libpipeline_par.@SHLIB_LIBEXT@ \
../../lib/libvisit_vtk.@SHLIB_LIBEXT@ ../../lib/libenginerpc.@SHLIB_LIBEXT@ \
../../lib/libutility.@SHLIB_LIBEXT@ ../../lib/libmisc.@SHLIB_LIBEXT@ \
../../lib/libcomm.@SHLIB_LIBEXT@ ../../lib/libstate.@SHLIB_LIBEXT@ \
../../lib/libengineparstate_par.@SHLIB_LIBEXT@ ../../lib/libdbatts.@SHLIB_LIBEXT@ \
../../lib/libavtexceptions.@SHLIB_LIBEXT@ ../../lib/libmir.@SHLIB_LIBEXT@
../../lib/libavtexceptions.@SHLIB_LIBEXT@ ../../lib/libmir_par.@SHLIB_LIBEXT@
##
## Files...
......@@ -317,8 +322,8 @@ $(ENGINEWRAPPAR) or_no_par_wrapper: $(PARLIBDEP) $(PAROBJ) $(LIBRARYPAROBJ) $(LI
@SHLIB_CREATEPROG@ $@ $(LDFLAGS) $(LIBRARYPAROBJ) -lengine_par $(PARLIBS)
purify: $(SERLIBDEP) $(SEROBJ)
purify -chain-length=64 $(CXX) -o @ENGINE_SER@ $(LDFLAGS) $(MAINSEROBJ) -lengine_ser $(SERLIBS)
purify -chain-length=64 -follow-child-processes=yes $(CXX) -o @ENGINE_PAR@ $(LDFLAGS) $(MAINPAROBJ) -lengine_par $(PARLIBS)
purify -cache-dir=$(TOPDIR)/lib -always-use-cache-dir -chain-length=64 $(CXX) -o @ENGINE_SER@ $(LDFLAGS) $(MAINSEROBJ) -lengine_ser $(SERLIBS)
purify -cache-dir=$(TOPDIR)/lib -always-use-cache-dir -chain-length=64 -follow-child-processes=yes $(CXX) -o @ENGINE_PAR@ $(LDFLAGS) $(MAINPAROBJ) -lengine_par $(PARLIBS)
quantify: $(SERLIBDEP) $(SEROBJ)
quantify $(CXX) -o @ENGINE_SER@ $(LDFLAGS) $(MAINSEROBJ) -lengine_ser $(SERLIBS)
......
......@@ -19,10 +19,10 @@ SimulationCommandRPC::operator()(const std::string &c,
int i,float f,const std::string &s)
{
debug3 << "Executing SimulationCommandRPC"
<< "\n\t command='"<<c<<"'"
<< "\n\t command='"<<c.c_str()<<"'"
<< "\n\t int_data="<<i
<< "\n\t float_data="<<f
<< "\n\t string_data='"<<s<<"'"
<< "\n\t string_data='"<<s.c_str()<<"'"
<< endl;
SetCommand(c);
......
......@@ -270,7 +270,7 @@ QvisEngineWindow::UpdateWindow(bool doAll)
if (!sim[i].empty())
{
int lastSlashPos = QString(sim[i].c_str()).findRev('/');
QString newsim = QString(sim[i].substr(lastSlashPos+1).c_str());
QString newsim(sim[i].substr(lastSlashPos+1).c_str());
int lastDotPos = newsim.findRev('.');
int firstDotPos = newsim.find('.');
......
This diff is collapsed.
......@@ -83,6 +83,9 @@
# Added NIFGUI.java as an example of creating a GUI program that uses
# the Java client.
#
# Brad Whitlock, Thu May 12 13:45:48 PST 2005
# Added ProcessAttributes.