Gitlab updates will be applied at 1:30pm, (17:30 UTC), today. No downtime expected.

Commit 92f080cc authored by hrchilds's avatar hrchilds

Update from March 17, 2005

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@433 18c085ea-50e0-402c-830e-de6fd14e8384
parent 456084b1
......@@ -194,6 +194,9 @@
# Jeremy Meredith, Tue Feb 22 18:55:53 PST 2005
# Renamed convert to the more unique visitconver.
#
# Jeremy Meredith, Thu Mar 17 11:31:49 PST 2005
# Added xml2plugin back into the distribution.
#
#------------------------------------------------------------------------------
set DataFiles = "TRUE"
......@@ -584,6 +587,9 @@ set frameworkdir = distribution/visit/$Version/$visitbindir/Frameworks
cp $VisItDir/bin/legacylauncher distribution/visit/bin/
cp $VisItDir/bin/frontendlauncher distribution/visit/bin/
# copy xml2plugin
cp $VisItDir/bin/xml2plugin distribution/visit/bin/
# Copy the version-specific visit script
cp $VisItDir/bin/internallauncher $verdir/bin/
......
......@@ -932,10 +932,13 @@ avtScalarMetaData::avtScalarMetaData(std::string n, std::string mn,
// Hank Childs, Mon Feb 14 14:16:49 PST 2005
// Added original name. Also added missing "s".
//
// Jeremy Meredith, Wed Mar 16 17:44:36 PST 2005
// Added missing 'b'.
//
// ****************************************************************************
avtScalarMetaData::avtScalarMetaData(const avtScalarMetaData &rhs)
: AttributeSubject("ssibffbbss")
: AttributeSubject("ssibffbbbss")
{
name = rhs.name;
originalName = name;
......
......@@ -141,6 +141,9 @@
# Brad Whitlock, Tue Feb 22 19:22:24 PST 2005
# Added TFT reader.
#
# Jeremy Meredith, Thu Mar 10 12:37:54 PST 2005
# Renamed SimDB to SimV1 to make versioning explicit.
#
##############################################################################
@SET_MAKE@
......@@ -158,7 +161,8 @@ PDB=KullLite PDB
SAF=SAF
SAMPLES=Rect Hex
REQUIRED=ANALYZE BOV CMAT Curve2D Dune EnSight Image Lines OVERFLOW \
PLOT2D PLOT3D Point3D SAR STL Silo SimDB Spheral TFT Tecplot Vista VTK WavefrontOBJ
PLOT2D PLOT3D Point3D SAR STL Silo SimV1 Spheral TFT Tecplot Vista \
VTK WavefrontOBJ
VISUS=ViSUS
OPTIONAL=
......
#include <SimDBPluginInfo.h>
#if defined(__APPLE__)
#define GetMDServerInfo SimDB_GetMDServerInfo
#endif
// ****************************************************************************
// Function: GetMDServerInfo
//
// Purpose:
// Return a new MDServerPluginInfo for the SimDB database.
//
// Programmer: meredith -- generated by xml2info
// Creation: Mon Jan 12 14:24:06 PST 2004
//
// ****************************************************************************
extern "C" MDServerDatabasePluginInfo* GetMDServerInfo()
{
return new SimDBMDServerPluginInfo;
}
// this makes compilers happy... remove if we ever have functions here
void SimDBMDServerPluginInfo::dummy()
{
}
<?xml version="1.0"?>
<Plugin name="SimDB" type="database" noengine="yes" label="Simulation" version="1.0" enabled="true" dbtype="STMD" haswriter="false">
<Plugin name="SimV1" type="database" label="Simulation" version="1.0" enabled="true" mdspecificcode="true" onlyengine="false" noengine="false" dbtype="STMD" haswriter="false">
<Extensions>
sim
sim1
</Extensions>
<Attribute name="" purpose="" persistent="false" exportAPI="" exportInclude="">
</Attribute>
......
#include <SimDBPluginInfo.h>
#include <avtSimDBFileFormat.h>
#include <SimV1PluginInfo.h>
#include <avtSimV1FileFormat.h>
#include <avtSTMDFileFormatInterface.h>
#include <avtGenericDatabase.h>
// ****************************************************************************
// Method: SimDBCommonPluginInfo::GetDatabaseType
// Method: SimV1CommonPluginInfo::GetDatabaseType
//
// Purpose:
// Returns the type of a SimDB database.
// Returns the type of a SimV1 database.
//
// Programmer: meredith -- generated by xml2info
// Creation: Tue Feb 22 14:47:22 PST 2005
// Creation: Thu Mar 10 12:40:55 PDT 2005
//
// ****************************************************************************
DatabaseType
SimDBCommonPluginInfo::GetDatabaseType()
SimV1CommonPluginInfo::GetDatabaseType()
{
return DB_TYPE_STMD;
}
// ****************************************************************************
// Method: SimDBCommonPluginInfo::GetDefaultExtensions
// Method: SimV1CommonPluginInfo::GetDefaultExtensions
//
// Purpose:
// Returns the default extensions for a SimDB database.
// Returns the default extensions for a SimV1 database.
//
// Programmer: meredith -- generated by xml2info
// Creation: Tue Feb 22 14:47:22 PST 2005
// Creation: Thu Mar 10 12:40:55 PDT 2005
//
// ****************************************************************************
std::vector<std::string>
SimDBCommonPluginInfo::GetDefaultExtensions()
SimV1CommonPluginInfo::GetDefaultExtensions()
{
std::vector<std::string> defaultExtensions;
defaultExtensions.push_back("sim");
defaultExtensions.push_back("sim1");
return defaultExtensions;
}
// ****************************************************************************
// Method: SimDBCommonPluginInfo::SetUpSimDBDatabase
// Method: SimV1CommonPluginInfo::SetUpSimV1Database
//
// Purpose:
// Sets up a SimDB database.
// Sets up a SimV1 database.
//
// Arguments:
// list A list of file names.
// nList The number of timesteps in list.
// nBlocks The number of blocks in the list.
//
// Returns: A SimDB database from list.
// Returns: A SimV1 database from list.
//
// Programmer: meredith -- generated by xml2info
// Creation: Tue Feb 22 14:47:22 PST 2005
// Creation: Thu Mar 10 12:40:55 PDT 2005
//
// ****************************************************************************
avtDatabase *
SimDBCommonPluginInfo::SetupDatabase(const char *const *list,
SimV1CommonPluginInfo::SetupDatabase(const char *const *list,
int nList, int nBlock)
{
avtSTMDFileFormat **ffl = new avtSTMDFileFormat*[nList];
for (int i = 0 ; i < nList ; i++)
{
ffl[i] = new avtSimDBFileFormat(list[i]);
ffl[i] = new avtSimV1FileFormat(list[i]);
}
avtSTMDFileFormatInterface *inter
= new avtSTMDFileFormatInterface(ffl, nList);
......
#include <SimDBPluginInfo.h>
#include <SimV1PluginInfo.h>
#if defined(__APPLE__)
#define GetEngineInfo SimDB_GetEngineInfo
#define GetEngineInfo SimV1_GetEngineInfo
#endif
// ****************************************************************************
// Function: GetEngineInfo
//
// Purpose:
// Return a new EnginePluginInfo for the SimDB database.
// Return a new EnginePluginInfo for the SimV1 database.
//
// Programmer: meredith -- generated by xml2info
// Creation: Tue Feb 22 14:47:22 PST 2005
// Creation: Thu Mar 10 12:40:55 PDT 2005
//
// ****************************************************************************
extern "C" EngineDatabasePluginInfo* GetEngineInfo()
{
return new SimDBEnginePluginInfo;
return new SimV1EnginePluginInfo;
}
// ****************************************************************************
// Method: SimDBCommonPluginInfo::GetWriter
// Method: SimV1CommonPluginInfo::GetWriter
//
// Purpose:
// Sets up a SimDB writer.
// Sets up a SimV1 writer.
//
// Returns: A SimDB writer.
// Returns: A SimV1 writer.
//
// Programmer: meredith -- generated by xml2info
// Creation: Tue Feb 22 14:47:22 PST 2005
// Creation: Thu Mar 10 12:40:55 PDT 2005
//
// ****************************************************************************
avtDatabaseWriter *
SimDBEnginePluginInfo::GetWriter(void)
SimV1EnginePluginInfo::GetWriter(void)
{
return NULL;
}
......
#include <SimDBPluginInfo.h>
#include <SimV1PluginInfo.h>
#if defined(__APPLE__)
#define GetMDServerInfo SimDB_GetMDServerInfo
#define GetMDServerInfo SimV1_GetMDServerInfo
#endif
// ****************************************************************************
// Function: GetMDServerInfo
//
// Purpose:
// Return a new MDServerPluginInfo for the SimDB database.
// Return a new MDServerPluginInfo for the SimV1 database.
//
// Programmer: meredith -- generated by xml2info
// Creation: Mon Jan 12 14:24:06 PST 2004
// Creation: Thu Mar 10 12:40:55 PDT 2005
//
// ****************************************************************************
extern "C" MDServerDatabasePluginInfo* GetMDServerInfo()
{
return new SimDBMDServerPluginInfo;
return new SimV1MDServerPluginInfo;
}
// this makes compilers happy... remove if we ever have functions here
void SimDBMDServerPluginInfo::dummy()
void SimV1MDServerPluginInfo::dummy()
{
}
// ************************************************************************* //
// File: SimDBPluginInfo.C
// File: SimV1PluginInfo.C
// ************************************************************************* //
#include <SimDBPluginInfo.h>
#include <SimV1PluginInfo.h>
#include <visit-config.h>
#if defined(__APPLE__)
extern "C" const char *SimDBVisItPluginVersion = VERSION;
extern "C" const char *SimV1VisItPluginVersion = VERSION;
#else
extern "C" const char *VisItPluginVersion = VERSION;
#endif
#if defined(__APPLE__)
#define GetGeneralInfo SimDB_GetGeneralInfo
#define GetGeneralInfo SimV1_GetGeneralInfo
#endif
// ****************************************************************************
// Function: GetGeneralInfo
//
// Purpose:
// Return a new GeneralPluginInfo for the SimDB database.
// Return a new GeneralPluginInfo for the SimV1 database.
//
// Programmer: meredith -- generated by xml2info
// Creation: Tue Feb 22 14:47:22 PST 2005
// Creation: Thu Mar 10 12:40:55 PDT 2005
//
// ****************************************************************************
extern "C" GeneralDatabasePluginInfo* GetGeneralInfo()
{
return new SimDBGeneralPluginInfo;
return new SimV1GeneralPluginInfo;
}
// ****************************************************************************
// Method: SimDBGeneralPluginInfo::GetName
// Method: SimV1GeneralPluginInfo::GetName
//
// Purpose:
// Return the name of the database plugin.
......@@ -39,18 +39,18 @@ extern "C" GeneralDatabasePluginInfo* GetGeneralInfo()
// Returns: A pointer to the name of the database plugin.
//
// Programmer: meredith -- generated by xml2info
// Creation: Tue Feb 22 14:47:22 PST 2005
// Creation: Thu Mar 10 12:40:55 PDT 2005
//
// ****************************************************************************
char *
SimDBGeneralPluginInfo::GetName() const
SimV1GeneralPluginInfo::GetName() const
{
return "SimDB";
return "SimV1";
}
// ****************************************************************************
// Method: SimDBGeneralPluginInfo::GetVersion
// Method: SimV1GeneralPluginInfo::GetVersion
//
// Purpose:
// Return the version of the database plugin.
......@@ -58,18 +58,18 @@ SimDBGeneralPluginInfo::GetName() const
// Returns: A pointer to the version of the database plugin.
//
// Programmer: meredith -- generated by xml2info
// Creation: Tue Feb 22 14:47:22 PST 2005
// Creation: Thu Mar 10 12:40:55 PDT 2005
//
// ****************************************************************************
char *
SimDBGeneralPluginInfo::GetVersion() const
SimV1GeneralPluginInfo::GetVersion() const
{
return "1.0";
}
// ****************************************************************************
// Method: SimDBGeneralPluginInfo::GetID
// Method: SimV1GeneralPluginInfo::GetID
//
// Purpose:
// Return the id of the database plugin.
......@@ -77,17 +77,17 @@ SimDBGeneralPluginInfo::GetVersion() const
// Returns: A pointer to the id of the database plugin.
//
// Programmer: meredith -- generated by xml2info
// Creation: Tue Feb 22 14:47:22 PST 2005
// Creation: Thu Mar 10 12:40:55 PDT 2005
//
// ****************************************************************************
char *
SimDBGeneralPluginInfo::GetID() const
SimV1GeneralPluginInfo::GetID() const
{
return "SimDB_1.0";
return "SimV1_1.0";
}
// ****************************************************************************
// Method: SimDBGeneralPluginInfo::EnabledByDefault
// Method: SimV1GeneralPluginInfo::EnabledByDefault
//
// Purpose:
// Return true if this plugin should be enabled by default; false otherwise.
......@@ -95,17 +95,17 @@ SimDBGeneralPluginInfo::GetID() const
// Returns: true/false
//
// Programmer: meredith -- generated by xml2info
// Creation: Tue Feb 22 14:47:22 PST 2005
// Creation: Thu Mar 10 12:40:55 PDT 2005
//
// ****************************************************************************
bool
SimDBGeneralPluginInfo::EnabledByDefault() const
SimV1GeneralPluginInfo::EnabledByDefault() const
{
return true;
}
// ****************************************************************************
// Method: SimDBGeneralPluginInfo::HasWriter
// Method: SimV1GeneralPluginInfo::HasWriter
//
// Purpose:
// Return true if this plugin has a database writer.
......@@ -113,12 +113,12 @@ SimDBGeneralPluginInfo::EnabledByDefault() const
// Returns: true/false
//
// Programmer: meredith -- generated by xml2info
// Creation: Tue Feb 22 14:47:22 PST 2005
// Creation: Thu Mar 10 12:40:55 PDT 2005
//
// ****************************************************************************
bool
SimDBGeneralPluginInfo::HasWriter() const
SimV1GeneralPluginInfo::HasWriter() const
{
return false;
}
// ****************************************************************************
// SimDBPluginInfo.h
// SimV1PluginInfo.h
// ****************************************************************************
#ifndef SIMDB_PLUGIN_INFO_H
#define SIMDB_PLUGIN_INFO_H
#ifndef SIMV1_PLUGIN_INFO_H
#define SIMV1_PLUGIN_INFO_H
#include <DatabasePluginInfo.h>
#include <database_plugin_exports.h>
......@@ -11,21 +11,21 @@ class avtDatabase;
class avtDatabaseWriter;
// ****************************************************************************
// Class: SimDBDatabasePluginInfo
// Class: SimV1DatabasePluginInfo
//
// Purpose:
// Classes that provide all the information about the SimDB plugin.
// Classes that provide all the information about the SimV1 plugin.
// Portions are separated into pieces relevant to the appropriate
// components of VisIt.
//
// Programmer: meredith -- generated by xml2info
// Creation: Tue Feb 22 14:47:22 PST 2005
// Creation: Thu Mar 10 12:40:55 PDT 2005
//
// Modifications:
//
// ****************************************************************************
class SimDBGeneralPluginInfo : public virtual GeneralDatabasePluginInfo
class SimV1GeneralPluginInfo : public virtual GeneralDatabasePluginInfo
{
public:
virtual char *GetName() const;
......@@ -35,7 +35,7 @@ class SimDBGeneralPluginInfo : public virtual GeneralDatabasePluginInfo
virtual bool HasWriter() const;
};
class SimDBCommonPluginInfo : public virtual CommonDatabasePluginInfo, public virtual SimDBGeneralPluginInfo
class SimV1CommonPluginInfo : public virtual CommonDatabasePluginInfo, public virtual SimV1GeneralPluginInfo
{
public:
virtual DatabaseType GetDatabaseType();
......@@ -44,14 +44,14 @@ class SimDBCommonPluginInfo : public virtual CommonDatabasePluginInfo, public vi
int nList, int nBlock);
};
class SimDBMDServerPluginInfo : public virtual MDServerDatabasePluginInfo, public virtual SimDBCommonPluginInfo
class SimV1MDServerPluginInfo : public virtual MDServerDatabasePluginInfo, public virtual SimV1CommonPluginInfo
{
public:
// this makes compilers happy... remove if we ever have functions here
virtual void dummy();
};
class SimDBEnginePluginInfo : public virtual EngineDatabasePluginInfo, public virtual SimDBCommonPluginInfo
class SimV1EnginePluginInfo : public virtual EngineDatabasePluginInfo, public virtual SimV1CommonPluginInfo
{
public:
virtual avtDatabaseWriter *GetWriter(void);
......
// File : VisItDataInterface_V1.h
//
// Programmer: Jeremy Meredith
// Date : March 17, 2005
//
#ifndef VISIT_DATA_INTERFACE_V1_H
#define VISIT_DATA_INTERFACE_V1_H
#ifdef __cplusplus
extern "C"
{
#endif
/* Mesh Types */
#define VISIT_MESHTYPE_RECTILINEAR 0
#define VISIT_MESHTYPE_CURVILINEAR 1
#define VISIT_MESHTYPE_UNSTRUCTURED 2
#define VISIT_MESHTYPE_POINT 3
#define VISIT_MESHTYPE_SURFACE 4
#define VISIT_MESHTYPE_UNKNOWN 5
/* Centering */
#define VISIT_VARCENTERING_NODE 0
#define VISIT_VARCENTERING_ZONE 1
/* Variable Type */
#define VISIT_VARTYPE_MESH 0
#define VISIT_VARTYPE_SCALAR 1
#define VISIT_VARTYPE_VECTOR 2
#define VISIT_VARTYPE_TENSOR 3
#define VISIT_VARTYPE_SYMMETRIC_TENSOR 4
#define VISIT_VARTYPE_MATERIAL 5
#define VISIT_VARTYPE_MATSPECIES 6
#define VISIT_VARTYPE_CURVE 7
#define VISIT_VARTYPE_UNKNOWN 8
typedef struct VisIt_MeshMetaData
{
const char *name;
int meshType; /* MESHTYPE */
int topologicalDimension;
int spatialDimension;
int numBlocks;
const char *blockTitle;
const char *blockPieceName;
int numGroups;
const char *groupTitle;
const char *groupPieceName;
int *groupIds;
const char *units;
} VisIt_MeshMetaData;
typedef struct VisIt_ScalarMetaData
{
const char *name;
const char *meshName;
int centering; /* VARCENTERING */
int treatAsASCII; /* boolean */
} VisIt_ScalarMetaData;
typedef struct VisIt_MaterialMetaData
{
const char *name;
const char *meshName;
int numMaterials;
const char *materialNames[];
} VisIt_MaterialMetaData;
typedef struct VisIt_CurveMetaData
{
const char *name;
const char *xUnits;
const char *yUnits;
} VisIt_CurveMetaData;
typedef struct VisIt_ExpressionMetaData
{
const char *name;
const char *definition;
int vartype; /* VARTYPE */
} VisIt_ExpressionMetaData;
typedef struct VisIt_SimulationMetaData
{
int currentCycle;
double currentTime;
int numMeshes;
int numScalars;
int numMaterials;
int numCurves;
int numExpressions;
VisIt_MeshMetaData *meshes;
VisIt_ScalarMetaData *scalars;
VisIt_MaterialMetaData *materials;
VisIt_CurveMetaData *curves;
VisIt_ExpressionMetaData *expressions;
} VisIt_SimulationMetaData;
typedef struct VisIt_CurvilinearMesh
{
int dims[3];
int baseIndex[3];
int firstRealZone[3];
int lastRealZone[3];
float *xcoords;
float *ycoords;
float *zcoords;
} VisIt_CurvilinearMesh;
typedef struct VisIt_RectilinearMesh
{
int dims[3];
int baseIndex[3];
int firstRealZone[3];
int lastRealZone[3];
float *xcoords;
float *ycoords;
float *zcoords;
} VisIt_RectilinearMesh;
typedef struct VisIt_UnstructuredMesh
{
/* FILL IN */
} VisIt_UnstructuredMesh;
typedef struct VisIt_PointMesh
{
/* FILL IN */
} VisIt_PointMesh;
typedef struct VisIt_MeshData
{
int meshType; /* MESHTYPE */
VisIt_CurvilinearMesh *cmesh;
VisIt_RectilinearMesh *rmesh;
VisIt_UnstructuredMesh *umesh;
VisIt_PointMesh *pmesh;
} VisIt_MeshData;
typedef struct VisIt_ScalarData
{
int len;
float *data;
} VisIt_ScalarData;
typedef struct VisIt_MixedScalarData
{
int len;
float *data;
} VisIt_MixedScalarData;
typedef struct VisIt_MaterialData
{
/* FILL IN */
} VisIt_MaterialData;
typedef struct VisIt_CurveData
{
int len;
float *x;
float *y;
} VisIt_CurveData;
typedef struct VisIt_SimulationCallback
{
VisIt_SimulationMetaData *(*GetMetaData)();
VisIt_MeshData *(*GetMesh)(int,const char*);
VisIt_MaterialData *(*GetMaterial)(int,const char*);
VisIt_ScalarData *(*GetScalar)(int,const char*);
VisIt_CurveData *(*GetCurve)(const char*);
VisIt_MixedScalarData *(*GetMixedScalar)(int,const char*);
} VisIt_SimulationCallback;
#ifdef __cplusplus
}
#endif
#endif
// ************************************************************************* //
// avtSimDBFileFormat.h //
// avtSimV1FileFormat.h //
// ************************************************************************* //
#ifndef AVT_SimDB_FILE_FORMAT_H
#define AVT_SimDB_FILE_FORMAT_H
#ifndef AVT_SIMV1_FILE_FORMAT_H
#define AVT_SIMV1_FILE_FORMAT_H
#include <database_exports.h>
#include <avtSTMDFileFormat.h>
#include <VisItDataInterface_V1.h>
#include <vector>
// ****************************************************************************
// Class: avtSimDBFileFormat
// Class: avtSimV1FileFormat
//
// Purpose:
// Reads in a Simulation file as a plugin to VisIt.
// Note: This is the Metadata Server -only portion of the plugin.
// Each simulation creates its own specific Engine plugin.
// Reads in a .sim1 file for VisIt in the MDServer.
// Reads in simulation data as input to VisIt in the Engine.
//