Commit d2179921 authored by hrchilds's avatar hrchilds

Update from December 17, 2004

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@381 18c085ea-50e0-402c-830e-de6fd14e8384
parent b467bad9
<?xml version="1.0"?>
<Plugin name="CMAT" type="database" label="CMAT" version="1.0" enabled="true" mdspecificcode="true" onlyengine="false" noengine="false" dbtype="STMD" haswriter="false">
<Extensions>
cmat
</Extensions>
<Attribute name="" purpose="" persistent="false" exportAPI="" exportInclude="">
</Attribute>
</Plugin>
#include <CMATPluginInfo.h>
#include <avtCMATFileFormat.h>
#include <avtSTMDFileFormatInterface.h>
#include <avtGenericDatabase.h>
// ****************************************************************************
// Method: CMATCommonPluginInfo::GetDatabaseType
//
// Purpose:
// Returns the type of a CMAT database.
//
// Programmer: whitlocb -- generated by xml2info
// Creation: Fri Dec 17 15:42:29 PST 2004
//
// ****************************************************************************
DatabaseType
CMATCommonPluginInfo::GetDatabaseType()
{
return DB_TYPE_STMD;
}
// ****************************************************************************
// Method: CMATCommonPluginInfo::GetDefaultExtensions
//
// Purpose:
// Returns the default extensions for a CMAT database.
//
// Programmer: whitlocb -- generated by xml2info
// Creation: Fri Dec 17 15:42:29 PST 2004
//
// ****************************************************************************
std::vector<std::string>
CMATCommonPluginInfo::GetDefaultExtensions()
{
std::vector<std::string> defaultExtensions;
defaultExtensions.push_back("cmat");
return defaultExtensions;
}
// ****************************************************************************
// Method: CMATCommonPluginInfo::GetWriter
//
// Purpose:
// Sets up a CMAT writer.
//
// Returns: A CMAT writer.
//
// Programmer: whitlocb -- generated by xml2info
// Creation: Fri Dec 17 15:42:29 PST 2004
//
// ****************************************************************************
avtDatabaseWriter *
CMATCommonPluginInfo::GetWriter(void)
{
return NULL;
}
// ****************************************************************************
// Method: CMATCommonPluginInfo::SetUpCMATDatabase
//
// Purpose:
// Sets up a CMAT 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 CMAT database from list.
//
// Programmer: whitlocb -- generated by xml2info
// Creation: Fri Dec 17 15:42:29 PST 2004
//
// ****************************************************************************
avtDatabase *
CMATCommonPluginInfo::SetupDatabase(const char *const *list,
int nList, int nBlock)
{
avtSTMDFileFormat **ffl = new avtSTMDFileFormat*[nList];
for (int i = 0 ; i < nList ; i++)
{
ffl[i] = new avtCMATFileFormat(list[i]);
}
avtSTMDFileFormatInterface *inter
= new avtSTMDFileFormatInterface(ffl, nList);
return new avtGenericDatabase(inter);
}
#include <CMATPluginInfo.h>
#if defined(__APPLE__)
#define GetEngineInfo CMAT_GetEngineInfo
#endif
// ****************************************************************************
// Function: GetEngineInfo
//
// Purpose:
// Return a new EnginePluginInfo for the CMAT database.
//
// Programmer: whitlocb -- generated by xml2info
// Creation: Fri Dec 17 15:42:29 PST 2004
//
// ****************************************************************************
extern "C" EngineDatabasePluginInfo* GetEngineInfo()
{
return new CMATEnginePluginInfo;
}
// this makes compilers happy... remove if we ever have functions here
void CMATEnginePluginInfo::dummy()
{
}
#include <CMATPluginInfo.h>
#if defined(__APPLE__)
#define GetMDServerInfo CMAT_GetMDServerInfo
#endif
// ****************************************************************************
// Function: GetMDServerInfo
//
// Purpose:
// Return a new MDServerPluginInfo for the CMAT database.
//
// Programmer: whitlocb -- generated by xml2info
// Creation: Fri Dec 17 15:42:29 PST 2004
//
// ****************************************************************************
extern "C" MDServerDatabasePluginInfo* GetMDServerInfo()
{
return new CMATMDServerPluginInfo;
}
// this makes compilers happy... remove if we ever have functions here
void CMATMDServerPluginInfo::dummy()
{
}
// ************************************************************************* //
// File: CMATPluginInfo.C
// ************************************************************************* //
#include <CMATPluginInfo.h>
#if defined(__APPLE__)
#define GetGeneralInfo CMAT_GetGeneralInfo
#endif
// ****************************************************************************
// Function: GetGeneralInfo
//
// Purpose:
// Return a new GeneralPluginInfo for the CMAT database.
//
// Programmer: whitlocb -- generated by xml2info
// Creation: Fri Dec 17 15:42:29 PST 2004
//
// ****************************************************************************
extern "C" GeneralDatabasePluginInfo* GetGeneralInfo()
{
return new CMATGeneralPluginInfo;
}
// ****************************************************************************
// Method: CMATGeneralPluginInfo::GetName
//
// Purpose:
// Return the name of the database plugin.
//
// Returns: A pointer to the name of the database plugin.
//
// Programmer: whitlocb -- generated by xml2info
// Creation: Fri Dec 17 15:42:29 PST 2004
//
// ****************************************************************************
char *
CMATGeneralPluginInfo::GetName() const
{
return "CMAT";
}
// ****************************************************************************
// Method: CMATGeneralPluginInfo::GetVersion
//
// Purpose:
// Return the version of the database plugin.
//
// Returns: A pointer to the version of the database plugin.
//
// Programmer: whitlocb -- generated by xml2info
// Creation: Fri Dec 17 15:42:29 PST 2004
//
// ****************************************************************************
char *
CMATGeneralPluginInfo::GetVersion() const
{
return "1.0";
}
// ****************************************************************************
// Method: CMATGeneralPluginInfo::GetID
//
// Purpose:
// Return the id of the database plugin.
//
// Returns: A pointer to the id of the database plugin.
//
// Programmer: whitlocb -- generated by xml2info
// Creation: Fri Dec 17 15:42:29 PST 2004
//
// ****************************************************************************
char *
CMATGeneralPluginInfo::GetID() const
{
return "CMAT_1.0";
}
// ****************************************************************************
// Method: CMATGeneralPluginInfo::EnabledByDefault
//
// Purpose:
// Return true if this plugin should be enabled by default; false otherwise.
//
// Returns: true/false
//
// Programmer: whitlocb -- generated by xml2info
// Creation: Fri Dec 17 15:42:29 PST 2004
//
// ****************************************************************************
bool
CMATGeneralPluginInfo::EnabledByDefault() const
{
return true;
}
// ****************************************************************************
// CMATPluginInfo.h
// ****************************************************************************
#ifndef CMAT_PLUGIN_INFO_H
#define CMAT_PLUGIN_INFO_H
#include <DatabasePluginInfo.h>
#include <database_plugin_exports.h>
class avtDatabase;
class avtDatabaseWriter;
// ****************************************************************************
// Class: CMATDatabasePluginInfo
//
// Purpose:
// Classes that provide all the information about the CMAT plugin.
// Portions are separated into pieces relevant to the appropriate
// components of VisIt.
//
// Programmer: whitlocb -- generated by xml2info
// Creation: Fri Dec 17 15:42:29 PST 2004
//
// Modifications:
//
// ****************************************************************************
class CMATGeneralPluginInfo : public virtual GeneralDatabasePluginInfo
{
public:
virtual char *GetName() const;
virtual char *GetVersion() const;
virtual char *GetID() const;
virtual bool EnabledByDefault() const;
};
class CMATCommonPluginInfo : public virtual CommonDatabasePluginInfo, public virtual CMATGeneralPluginInfo
{
public:
virtual DatabaseType GetDatabaseType();
virtual std::vector<std::string> GetDefaultExtensions();
virtual avtDatabase *SetupDatabase(const char * const *list,
int nList, int nBlock);
virtual avtDatabaseWriter *GetWriter(void);
};
class CMATMDServerPluginInfo : public virtual MDServerDatabasePluginInfo, public virtual CMATCommonPluginInfo
{
public:
// this makes compilers happy... remove if we ever have functions here
virtual void dummy();
};
class CMATEnginePluginInfo : public virtual EngineDatabasePluginInfo, public virtual CMATCommonPluginInfo
{
public:
// this makes compilers happy... remove if we ever have functions here
virtual void dummy();
};
#endif
This diff is collapsed.
// ************************************************************************* //
// avtCMATFileFormat.h //
// ************************************************************************* //
#ifndef AVT_CMAT_FILE_FORMAT_H
#define AVT_CMAT_FILE_FORMAT_H
#include <avtSTMDFileFormat.h>
#include <string>
class vtkFloatArray;
// ****************************************************************************
// Class: avtCMATFileFormat
//
// Purpose:
// Reads in CMAT files as a plugin to VisIt.
//
// Programmer: Brad Whitlock
// Creation: Fri Dec 17 13:33:58 PST 2004
//
// Modifications:
//
// ****************************************************************************
class avtCMATFileFormat : public avtSTMDFileFormat
{
public:
avtCMATFileFormat(const char *filename);
virtual ~avtCMATFileFormat();
virtual const char *GetType(void) { return "CMAT"; };
virtual void FreeUpResources(void);
virtual vtkDataSet *GetMesh(int, const char *);
virtual vtkDataArray *GetVar(int, const char *);
protected:
void Initialize(bool);
static const int n_zones_per_dom;
int xdims;
int ydims;
float xmin;
float xmax;
float ymin;
float ymax;
std::string title;
int nYPerDomain;
int numDomains;
float *data;
virtual void PopulateDatabaseMetaData(avtDatabaseMetaData *);
};
#endif
......@@ -126,6 +126,9 @@
# Jeremy Meredith, Wed Nov 17 11:24:23 PST 2004
# Added TecPlot.
#
# Brad Whitlock, Fri Dec 17 13:26:46 PST 2004
# Added CMAT reader.
#
##############################################################################
@SET_MAKE@
......@@ -142,7 +145,7 @@ MILI=Mili
PDB=KullLite PDB
SAF=SAF
SAMPLES=Rect Hex
REQUIRED=ANALYZE BOV Curve2D Dune EnSight Image Lines OVERFLOW \
REQUIRED=ANALYZE BOV CMAT Curve2D Dune EnSight Image Lines OVERFLOW \
PLOT2D PLOT3D Point3D STL Silo SimDB Spheral TecPlot Vista VTK WavefrontOBJ
VISUS=ViSUS
......
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="7.10"
Name="CMAT"
ProjectGUID="{01E1DC88-656B-4336-A0FF-BB8D89EFCC6C}"
SccProjectName=""
SccLocalPath=""
Keyword="MakeFileProj">
<Platforms>
<Platform
Name="Win32"/>
</Platforms>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory=".\Debug"
IntermediateDirectory=".\Debug"
ConfigurationType="10"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCMIDLTool"
TypeLibraryName=".\Debug\CMAT.tlb"
HeaderFileName=""/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory=".\Release"
IntermediateDirectory=".\Release"
ConfigurationType="10"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCMIDLTool"
TypeLibraryName=".\Release\CMAT.tlb"
HeaderFileName=""/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
</Files>
<Globals>
</Globals>
</VisualStudioProject>
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="7.10"
Name="CMATE"
ProjectGUID="{E22586B7-049E-44A4-8BC6-62B7042101BA}"
RootNamespace="CMATE"
SccProjectName=""
SccLocalPath="">
<Platforms>
<Platform
Name="Win32"/>
</Platforms>
<Configurations>
<Configuration
Name="Release|Win32"
OutputDirectory=".\Release\CMATE\"
IntermediateDirectory=".\Release\CMATE\"
ConfigurationType="2"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
OptimizeForProcessor="2"
AdditionalIncludeDirectories="..\..\visit\databases\CMAT;..\..\include\VisIt;..\..\include\vtk;..\..\include\vtk\MSVC7.Net;..\..\include\silo;..\..\include\zlib"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;USING_MSVC7;GENERAL_PLUGIN_EXPORTS;ENGINE_PLUGIN_EXPORTS"
StringPooling="TRUE"
RuntimeLibrary="2"
EnableFunctionLevelLinking="TRUE"
EnableEnhancedInstructionSet="1"
UsePrecompiledHeader="2"
PrecompiledHeaderFile=".\Release\CMATE\CMATE.pch"
AssemblerListingLocation=".\Release\CMATE\"
ObjectFile=".\Release\CMATE\"
ProgramDataBaseFileName=".\Release\CMATE\"
WarningLevel="3"
SuppressStartupBanner="TRUE"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="odbc32.lib odbccp32.lib state.lib misc.lib plugin.lib pipeline_ser.lib dbatts.lib database_ser.lib avtexceptions.lib vtkCommon.lib"
OutputFile="..\..\bin\MSVC7.Net\Release\databases\libECMATDatabase_ser.dll"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\MSVC7.Net\Release"
ProgramDatabaseFile=".\Release\CMATE\CMATE.pdb"
ImportLibrary=".\Release\CMATE\CMATE.lib"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"
PreprocessorDefinitions="NDEBUG"
MkTypLibCompatible="TRUE"
SuppressStartupBanner="TRUE"
TargetEnvironment="1"
TypeLibraryName=".\Release\CMATE\CMATE.tlb"
HeaderFileName=""/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="1033"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
Name="VCManagedWrapperGeneratorTool"/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="Debug|Win32"
OutputDirectory=".\Debug\CMATE\"
IntermediateDirectory=".\Debug\CMATE\"
ConfigurationType="2"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
OptimizeForProcessor="2"
AdditionalIncludeDirectories="..\..\visit\databases\CMAT;..\..\include\VisIt;..\..\include\vtk;..\..\include\vtk\MSVC7.Net;..\..\include\silo;..\..\include\zlib"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;USING_MSVC7;GENERAL_PLUGIN_EXPORTS;ENGINE_PLUGIN_EXPORTS"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
EnableFunctionLevelLinking="TRUE"
EnableEnhancedInstructionSet="1"
UsePrecompiledHeader="2"
PrecompiledHeaderFile=".\Debug\CMATE\CMATE.pch"
AssemblerListingLocation=".\Debug\CMATE\"
ObjectFile=".\Debug\CMATE\"
ProgramDataBaseFileName=".\Debug\CMATE\"
SuppressStartupBanner="TRUE"
DebugInformationFormat="4"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="odbc32.lib odbccp32.lib state.lib misc.lib plugin.lib pipeline_ser.lib dbatts.lib database_ser.lib avtexceptions.lib vtkCommon.lib"
OutputFile="..\..\bin\MSVC7.Net\Debug\databases\libECMATDatabase_ser.dll"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\lib\MSVC7.Net\Debug"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\Debug\CMATE\CMATE.pdb"
ImportLibrary=".\Debug\CMATE\CMATE.lib"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"
PreprocessorDefinitions="_DEBUG"
MkTypLibCompatible="TRUE"
SuppressStartupBanner="TRUE"
TargetEnvironment="1"
TypeLibraryName=".\Debug\CMATE\CMATE.tlb"
HeaderFileName=""/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG"
Culture="1033"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
Name="VCManagedWrapperGeneratorTool"/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="Source Files"
Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
<File
RelativePath="..\..\visit\databases\CMAT\avtCMATFileFormat.C">
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
PreprocessorDefinitions="$(Inherit)"
CompileAs="2"/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="$(Inherit)"
BasicRuntimeChecks="3"
CompileAs="2"/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\visit\databases\CMAT\CMATCommonPluginInfo.C">
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
PreprocessorDefinitions="$(Inherit)"
CompileAs="2"/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="$(Inherit)"
BasicRuntimeChecks="3"
CompileAs="2"/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\visit\databases\CMAT\CMATEnginePluginInfo.C">
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
PreprocessorDefinitions="$(Inherit)"
CompileAs="2"/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="$(Inherit)"
BasicRuntimeChecks="3"
CompileAs="2"/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\visit\databases\CMAT\CMATPluginInfo.C">
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
PreprocessorDefinitions="$(Inherit)"
CompileAs="2"/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="$(Inherit)"
BasicRuntimeChecks="3"
CompileAs="2"/>
</FileConfiguration>
</File>
</Filter>
</Files>
<Globals>
</Globals>
</VisualStudioProject>
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="7.10"
Name="CMATI"
ProjectGUID="{965ED00A-06DD-4B36-90E7-ED09FA3E32CC}"
RootNamespace="CMATI"
SccProjectName=""
SccLocalPath="">
<Platforms>
<Platform
Name="Win32"/>
</Platforms>
<Configurations>
<Configuration
Name="Release|Win32"
OutputDirectory=".\Release\CMATI\"
IntermediateDirectory=".\Release\CMATI\"
ConfigurationType="2"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
OptimizeForProcessor="2"
AdditionalIncludeDirectories="..\..\visit\databases\CMAT;..\..\include\VisIt;..\..\include\vtk;..\..\include\vtk\MSVC7.Net;..\..\include\silo;..\..\include\zlib"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;USING_MSVC7;GENERAL_PLUGIN_EXPORTS"
StringPooling="TRUE"
RuntimeLibrary="2"