Commit 8a0e67d4 authored by bonnell's avatar bonnell

Remove avt dependence from visit_vtk/parallel, rename VERSION to VISIT_VERSION...

Remove avt dependence from visit_vtk/parallel, rename VERSION to VISIT_VERSION for better namespace behavior, added code files for some DB plugins with specialized info code

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@7308 18c085ea-50e0-402c-830e-de6fd14e8384
parent 2fc82d23
......@@ -106,6 +106,9 @@ using std::vector;
// Kathleen Bonnell, Tue Jan 11 16:06:33 PST 2005
// Initialize is2Dimensional.
//
// Brad Whitlock, Fri Jan 23 15:27:34 PST 2009
// Pass the communicator to vtkParallelImageSpaceRedistributor.
//
// ****************************************************************************
avtTransparencyActor::avtTransparencyActor()
......@@ -118,6 +121,9 @@ avtTransparencyActor::avtTransparencyActor()
parallelFilter = vtkParallelImageSpaceRedistributor::New();
parallelFilter->SetRankAndSize(PAR_Rank(), PAR_Size());
#ifdef PARALLEL
parallelFilter->SetCommunicator(VISIT_MPI_COMM);
#endif
//
// Tell the mapper that we are going to set up an RGBA field ourselves.
......
......@@ -42,7 +42,7 @@
#ifndef BAD_COLLEAGUE_EXCEPTION_H
#define BAD_COLLEAGUE_EXCEPTION_H
#include <avtexception_exports.h>
#include <viswindow_exports.h>
#include <VisWindowException.h>
......@@ -59,7 +59,7 @@
//
// ****************************************************************************
class AVTEXCEPTION_API BadColleagueException : public VisWindowException
class VISWINDOW_API BadColleagueException : public VisWindowException
{
public:
BadColleagueException();
......
......@@ -42,7 +42,7 @@
#ifndef BAD_INTERACTOR_EXCEPTION_H
#define BAD_INTERACTOR_EXCEPTION_H
#include <avtexception_exports.h>
#include <viswindow_exports.h>
#include <VisWindowException.h>
#include <VisWindowTypes.h>
......@@ -60,7 +60,7 @@
//
// ****************************************************************************
class AVTEXCEPTION_API BadInteractorException : public VisWindowException
class VISWINDOW_API BadInteractorException : public VisWindowException
{
public:
BadInteractorException(INTERACTION_MODE);
......
......@@ -42,7 +42,7 @@
#ifndef BAD_PLOT_EXCEPTION_H
#define BAD_PLOT_EXCEPTION_H
#include <avtexception_exports.h>
#include <viswindow_exports.h>
#include <VisWindowException.h>
......@@ -58,7 +58,7 @@
//
// ****************************************************************************
class AVTEXCEPTION_API BadPlotException : public VisWindowException
class VISWINDOW_API BadPlotException : public VisWindowException
{
public:
BadPlotException();
......
......@@ -42,7 +42,7 @@
#ifndef BAD_WINDOW_MODE_EXCEPTION_H
#define BAD_WINDOW_MODE_EXCEPTION_H
#include <avtexception_exports.h>
#include <viswindow_exports.h>
#include <VisWindowException.h>
#include <VisWindowTypes.h>
......@@ -60,7 +60,7 @@
//
// ****************************************************************************
class AVTEXCEPTION_API BadWindowModeException : public VisWindowException
class VISWINDOW_API BadWindowModeException : public VisWindowException
{
public:
BadWindowModeException(WINDOW_MODE);
......
......@@ -42,7 +42,7 @@
#ifndef PLOT_DIMENSIONALITY_EXCEPTION_H
#define PLOT_DIMENSIONALITY_EXCEPTION_H
#include <avtexception_exports.h>
#include <viswindow_exports.h>
#include <VisWindowException.h>
#include <VisWindowTypes.h>
......@@ -61,7 +61,7 @@
//
// ****************************************************************************
class AVTEXCEPTION_API PlotDimensionalityException : public VisWindowException
class VISWINDOW_API PlotDimensionalityException : public VisWindowException
{
public:
PlotDimensionalityException(WINDOW_MODE, WINDOW_MODE, int);
......
......@@ -42,7 +42,7 @@
#ifndef VIS_WINDOW_EXCEPTION_H
#define VIS_WINDOW_EXCEPTION_H
#include <avtexception_exports.h>
#include <viswindow_exports.h>
#include <VisItException.h>
......@@ -61,7 +61,7 @@
//
// ****************************************************************************
class AVTEXCEPTION_API VisWindowException : public VisItException
class VISWINDOW_API VisWindowException : public VisItException
{
public:
~VisWindowException() VISIT_THROW_NOTHING {;};
......
......@@ -98,7 +98,7 @@
//
// ****************************************************************************
ParentProcess::ParentProcess() : version(VERSION), localUserName()
ParentProcess::ParentProcess() : version(VISIT_VERSION), localUserName()
{
// Set some default values.
hostName = std::string("localhost");
......
......@@ -1572,7 +1572,7 @@ RemoteProcess::ExchangeTypeRepresentations()
std::string socketKey(header.CreateRandomKey());
// Send the local component and platform information.
header.WriteHeader(writeConnections[0], VERSION,
header.WriteHeader(writeConnections[0], VISIT_VERSION,
"", socketKey);
bool throwVersionException = false;
......@@ -1585,7 +1585,7 @@ RemoteProcess::ExchangeTypeRepresentations()
header.SetSecurityKey(securityKey);
// Read the remote component and platform information.
header.ReadHeader(readConnections[0], VERSION);
header.ReadHeader(readConnections[0], VISIT_VERSION);
}
CATCH(IncompatibleVersionException)
{
......@@ -1874,7 +1874,7 @@ RemoteProcess::CreateCommandLine(stringVector &args, const std::string &rHost,
//
args.push_back("-v");
int major=0, minor=0, patch=0;
if (GetVisItVersionFromString(VERSION, major, minor, patch) >= 2)
if (GetVisItVersionFromString(VISIT_VERSION, major, minor, patch) >= 2)
{
// Note: we didn't wrap GetVisItVersionFromString with abs() because
// a negative value implies a beta version, and we only want to
......@@ -1886,7 +1886,7 @@ RemoteProcess::CreateCommandLine(stringVector &args, const std::string &rHost,
}
else
{
args.push_back(VERSION);
args.push_back(VISIT_VERSION);
}
//
......
......@@ -512,7 +512,7 @@ GetIsDevelopmentVersion()
std::string
GetVisItInstallationDirectory()
{
return GetVisItInstallationDirectory(VERSION);
return GetVisItInstallationDirectory(VISIT_VERSION);
}
#if _MSC_VER <= 1310
......@@ -610,7 +610,7 @@ GetVisItInstallationDirectory(const char *version)
std::string
GetVisItArchitectureDirectory()
{
return GetVisItArchitectureDirectory(VERSION);
return GetVisItArchitectureDirectory(VISIT_VERSION);
}
std::string
......@@ -641,7 +641,7 @@ GetVisItArchitectureDirectory(const char *version)
#else
// Get the installation dir for the version that's running. They all use
// the same "visit" script so it's okay to do this.
std::string archDir(std::string("/usr/local/visit/") + std::string(VERSION));
std::string archDir(std::string("/usr/local/visit/") + std::string(VISIT_VERSION));
const std::string adir = Environment::get("VISITARCHHOME");
if(!adir.empty())
archDir = adir;
......@@ -872,7 +872,7 @@ ConfigStateGetRunCount(ConfigStateEnum &code)
int nStartups = 1;
std::string rcFile(GetUserVisItDirectory());
rcFile += "state";
rcFile += VERSION;
rcFile += VISIT_VERSION;
rcFile += ".txt";
FILE *f = 0;
......@@ -929,7 +929,7 @@ ConfigStateIncrementRunCount(ConfigStateEnum &code)
{
std::string rcFile(GetUserVisItDirectory());
rcFile += "state";
rcFile += VERSION;
rcFile += VISIT_VERSION;
rcFile += ".txt";
// Does the file exist?
......
......@@ -686,7 +686,7 @@ PluginManager::ReadPluginInfo()
pluginsWithNoVersion.push_back(pluginFile);
success = false;
}
else if (!VisItVersionsCompatible(*VisItPluginVersion, VERSION))
else if (!VisItVersionsCompatible(*VisItPluginVersion, VISIT_VERSION))
{
pluginsWithWrongVersion.push_back(pluginFile);
success = false;
......
......@@ -190,7 +190,7 @@ ColorTableManager::WriteConfigFile(const char *filename)
// Create the color table node.
DataNode *ctNode = new DataNode("ColorTable");
topLevel.AddNode(ctNode);
ctNode->AddNode(new DataNode("Version", std::string(VERSION)));
ctNode->AddNode(new DataNode("Version", std::string(VISIT_VERSION)));
// Let the color table create add its information to tbe node.
ccpl.CreateNode(ctNode, false, true);
......
......@@ -1448,14 +1448,14 @@ fi
# Grab the version number
echo "$as_me:$LINENO: checking what version the package is" >&5
echo $ECHO_N "checking what version the package is... $ECHO_C" >&6
VERSION=`cat VERSION`
VISIT_VERSION=`cat VERSION`
cat >>confdefs.h <<_ACEOF
#define VERSION "$VERSION"
#define VISIT_VERSION "$VISIT_VERSION"
_ACEOF
echo "$as_me:$LINENO: result: $VERSION" >&5
echo "${ECHO_T}$VERSION" >&6
echo "$as_me:$LINENO: result: $VISIT_VERSION" >&5
echo "${ECHO_T}$VISIT_VERSION" >&6
# Get the SVN version number.
echo "$as_me:$LINENO: checking what subversion revision is" >&5
......@@ -3952,9 +3952,9 @@ fi
VISITWRAPPER_RPATH=
VISIT_LIB_DIR="$""(libdir)"
COMPATIBILITY_VERSION=`sed -e "s/b//" VERSION`
COMPATIBILITY_VERSION=`sed -e "s/b//" VISIT_VERSION`
if test "x$prefix" != xNONE; then
COMPATIBILITY_VERSION=`sed -e "s/b//" VERSION`
COMPATIBILITY_VERSION=`sed -e "s/b//" VISIT_VERSION`
PLATFORM=
case "$UNAME" in
Linux)
......@@ -11893,7 +11893,7 @@ case $UNAME in
SHLIB_POSTPROCESS=""
SHLIB_POSTPROCESS_SER=""
SHLIB_POSTPROCESS_PAR=""
COMPATIBILITY_VERSION=`sed -e "s/b//" VERSION`
COMPATIBILITY_VERSION=`sed -e "s/b//" VISIT_VERSION`
# Set SHLIB_LIBS so the right libraries are added to the link line but also ensure
# that the shared library is created with a unique starting address so we can
......
......@@ -1002,9 +1002,9 @@ fi
# Grab the version number
AC_MSG_CHECKING(what version the package is)
VERSION=`cat VERSION`
AC_DEFINE_UNQUOTED(VERSION,"$VERSION",[VisIt version])
AC_MSG_RESULT($VERSION)
VISIT_VERSION=`cat VERSION`
AC_DEFINE_UNQUOTED(VISIT_VERSION,"$VISIT_VERSION",[VisIt version])
AC_MSG_RESULT($VISIT_VERSION)
# Get the SVN version number.
AC_MSG_CHECKING(what subversion revision is)
......@@ -1842,9 +1842,9 @@ dnl into account if it has been specified.
dnl
VISITWRAPPER_RPATH=
VISIT_LIB_DIR="$""(libdir)"
COMPATIBILITY_VERSION=`sed -e "s/b//" VERSION`
COMPATIBILITY_VERSION=`sed -e "s/b//" VISIT_VERSION`
if test "x$prefix" != xNONE; then
COMPATIBILITY_VERSION=`sed -e "s/b//" VERSION`
COMPATIBILITY_VERSION=`sed -e "s/b//" VISIT_VERSION`
PLATFORM=
case "$UNAME" in
Linux)
......@@ -3704,7 +3704,7 @@ case $UNAME in
SHLIB_POSTPROCESS=""
SHLIB_POSTPROCESS_SER=""
SHLIB_POSTPROCESS_PAR=""
COMPATIBILITY_VERSION=`sed -e "s/b//" VERSION`
COMPATIBILITY_VERSION=`sed -e "s/b//" VISIT_VERSION`
# Set SHLIB_LIBS so the right libraries are added to the link line but also ensure
# that the shared library is created with a unique starting address so we can
......
......@@ -47,8 +47,8 @@
// Purpose:
// Returns the type of a ANALYZE database.
//
// Programmer: meredith -- generated by xml2info
// Creation: Tue Feb 22 14:33:46 PST 2005
// Programmer: generated by xml2info
// Creation: omitted
//
// ****************************************************************************
DatabaseType
......@@ -58,7 +58,7 @@ ANALYZECommonPluginInfo::GetDatabaseType()
}
// ****************************************************************************
// Method: ANALYZECommonPluginInfo::SetUpANALYZEDatabase
// Method: ANALYZECommonPluginInfo::SetupDatabase
//
// Purpose:
// Sets up a ANALYZE database.
......@@ -70,8 +70,8 @@ ANALYZECommonPluginInfo::GetDatabaseType()
//
// Returns: A ANALYZE database from list.
//
// Programmer: meredith -- generated by xml2info
// Creation: Tue Feb 22 14:33:46 PST 2005
// Programmer: generated by xml2info
// Creation: omitted
//
// ****************************************************************************
avtDatabase *
......
......@@ -48,8 +48,8 @@
// Purpose:
// Return a new EnginePluginInfo for the ANALYZE database.
//
// Programmer: meredith -- generated by xml2info
// Creation: Tue Feb 22 14:33:46 PST 2005
// Programmer: generated by xml2info
// Creation: omitted
//
// ****************************************************************************
extern "C" EngineDatabasePluginInfo* GetEngineInfo()
......@@ -58,15 +58,15 @@ extern "C" EngineDatabasePluginInfo* GetEngineInfo()
}
// ****************************************************************************
// Method: ANALYZECommonPluginInfo::GetWriter
// Method: ANALYZEEnginePluginInfo::GetWriter
//
// Purpose:
// Sets up a ANALYZE writer.
//
// Returns: A ANALYZE writer.
//
// Programmer: meredith -- generated by xml2info
// Creation: Tue Feb 22 14:33:46 PST 2005
// Programmer: generated by xml2info
// Creation: omitted
//
// ****************************************************************************
avtDatabaseWriter *
......
......@@ -48,8 +48,8 @@
// Purpose:
// Return a new MDServerPluginInfo for the ANALYZE database.
//
// Programmer: whitlocb -- generated by xml2info
// Creation: Mon Nov 24 16:51:12 PST 2003
// Programmer: generated by xml2info
// Creation: omitted
//
// ****************************************************************************
extern "C" MDServerDatabasePluginInfo* GetMDServerInfo()
......@@ -61,3 +61,4 @@ extern "C" MDServerDatabasePluginInfo* GetMDServerInfo()
void ANALYZEMDServerPluginInfo::dummy()
{
}
......@@ -44,9 +44,9 @@
#include <visit-config.h>
#if defined(__APPLE__)
extern "C" const char *ANALYZEVisItPluginVersion = VERSION;
extern "C" const char *ANALYZEVisItPluginVersion = VISIT_VERSION;
#else
extern "C" const char *VisItPluginVersion = VERSION;
extern "C" const char *VisItPluginVersion = VISIT_VERSION;
#endif
#if defined(__APPLE__)
......@@ -59,8 +59,8 @@ extern "C" const char *VisItPluginVersion = VERSION;
// Purpose:
// Return a new GeneralPluginInfo for the ANALYZE database.
//
// Programmer: miller -- generated by xml2info
// Creation: Mon Aug 6 23:49:04 PST 2007
// Programmer: generated by xml2info
// Creation: omitted
//
// ****************************************************************************
extern "C" GeneralDatabasePluginInfo* GetGeneralInfo()
......@@ -76,8 +76,8 @@ extern "C" GeneralDatabasePluginInfo* GetGeneralInfo()
//
// Returns: A pointer to the name of the database plugin.