Commit 1a420653 authored by ghweber's avatar ghweber

(1) Split apply operators and selections checkbox into two separate...

(1) Split apply operators and selections checkbox into two separate checkboxes.(2) Added suggestedDefaultSILRestriction to avtDataBaseMetaData. (3) Added options for displaying only root level and explicit materials in new plots to Chombo database plugin (uses change (2)). (4) Ignore +/-inf and nan in min/max extent calculations for variables. (5) Check for site visitrc file. (6) Added default configurations for ANAG. (7) Added a new '-configuration' option to visit-bin-dist. (8) Initialize windows from global guiconfig if no user guiconfig file exists. (9) Prevent an already posted window from being posted again. (10) Updated site-config file for ANAG build machines.

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@3180 18c085ea-50e0-402c-830e-de6fd14e8384
parent e8720d4c
......@@ -318,6 +318,12 @@
# Brad Whitlock, Mon Dec 10 14:19:45 PST 2007
# Added visitprotocol.
#
# Gunther H. Weber, Thu Feb 7 14:45:22 PST 2008
# Added a "-configuration" option that specifies which configuration
# referenced by the default configuration symbolic link. Check for a
# default guiconfig and visitrc as well and add symbolic links as
# necessary. If no "-configuration" option is specified then default to
# the "open" configuration as before.
#------------------------------------------------------------------------------
set DataFiles = "TRUE"
......@@ -336,6 +342,7 @@ set ArchGiven = "FALSE"
set Strip = "TRUE"
set Make = "make"
set Help = "FALSE"
set Configuration = "open"
#
# Parse the argument list.
......@@ -419,6 +426,11 @@ while ($#argv >= 1)
set ArchGiven = TRUE
breaksw
case -configuration:
shift
set Configuration = $1
breaksw
default:
echo " "
echo ">>>>>>>>>> Illegal option $1 <<<<<<<<<<"
......@@ -1292,7 +1304,26 @@ cp $VisItDir/clearcase_bin/visit-config-closed $verdir/.visit
cp $VisItDir/clearcase_bin/visit-config-nersc $verdir/.visit
cp $VisItDir/clearcase_bin/visit-config-open $verdir/.visit
cp $VisItDir/clearcase_bin/visit-config-ornl $verdir/.visit
ln -s visit-config-open $verdir/.visit/config
cp $VisItDir/clearcase_bin/visit-config-anag $verdir/.visit
if (-e $verdir/.visit/visit-config-$Configuration) then
ln -s visit-config-$Configuration $verdir/.visit/config
endif
#
# Copy the guiconfig files
#
cp $VisItDir/clearcase_bin/visit-guiconfig-anag $verdir/.visit
if (-e $verdir/.visit/visit-guiconfig-$Configuration) then
ln -s visit-guiconfig-$Configuration $verdir/.visit/guiconfig
endif
#
# Copy the visitrc files.
#
cp $VisItDir/clearcase_bin/visit-visitrc-anag $verdir/.visit
if (-e $verdir/.visit/visit-visitrc-$Configuration) then
ln -s visit-visitrc-$Configuration $verdir/.visit/visitrc
endif
#
# Strip the executables and shared libraries.
......
<?xml version="1.0"?>
<Object name="VisIt">
<Field name="Version" type="string">1.7</Field>
<Object name="VIEWER">
<Object name="DEFAULT_VALUES">
<Object name="GlobalAttributes">
<Field name="autoUpdateFlag" type="bool">true</Field>
<Field name="applyOperator" type="bool">false</Field>
<Field name="cloneWindowOnFirstRef" type="bool">true</Field>
</Object>
<Object name="SaveWindowAttributes">
<Field name="fileName" type="string">AMR</Field>
<Field name="format" type="string">PPM</Field>
</Object>
<Object name="WindowInformation">
<Field name="boundingBoxNavigate" type="bool">false</Field>
</Object>
<Object name="SliceAttributes">
<Field name="project2d" type="bool">false</Field>
<Field name="meshName" type="string">Mesh</Field>
</Object>
</Object>
</Object>
</Object>
<?xml version="1.0"?>
<Object name="VisIt">
<Field name="Version" type="string">1.8.0</Field>
<Object name="GUI">
<Object name="Macros">
<Field name="visible" type="bool">false</Field>
<Field name="posted" type="bool">true</Field>
</Object>
</Object>
</Object>
import time
time.sleep(0.01)
def SetupSlice():
# Get the name of the first variable in the file
filename = GetWindowInformation().activeSource
m = GetMetaData(filename)
varname = m.GetScalars(0).name
meshname = m.GetMeshes(0).name
if m.GetMeshes(0).spatialDimension == 2:
AddPlot("Mesh", meshname)
HideActivePlots()
AddPlot("Pseudocolor", varname)
else:
# Do a mesh plot. We do need a plot to perform a query
AddPlot("Mesh", meshname)
# Get the centroid
DrawPlots()
Query("Centroid", 0, 0, "default")
centroid = GetQueryOutputValue()
# Hide the mesh plot
HideActivePlots()
# Add a ThreeSlice
AddOperator("ThreeSlice")
ThreeSliceAtts = ThreeSliceAttributes()
ThreeSliceAtts.x = centroid[0]
ThreeSliceAtts.y = centroid[1]
ThreeSliceAtts.z = centroid[2]
SetOperatorOptions(ThreeSliceAtts)
# Add a Pseudocolor plot and the same ThreeSlice
AddPlot("Pseudocolor", varname)
AddOperator("ThreeSlice")
SetOperatorOptions(ThreeSliceAtts)
# Enable the point tool to control the ThreeSlice
EnableTool(4, 1)
RegisterMacro("Slice", SetupSlice)
def SetupIsosurf():
# Get the name of the first variable in the file
filename = GetWindowInformation().activeSource
m = GetMetaData(filename)
varname = m.GetScalars(0).name
AddPlot("Pseudocolor", varname)
AddOperator("Isosurface")
IsosurfaceAtts = IsosurfaceAttributes()
if m.GetMeshes(0).spatialDimension == 2:
IsosurfaceAtts.contourNLevels = 10
else:
IsosurfaceAtts.contourNLevels = 1
IsosurfaceAtts.contourMethod = IsosurfaceAtts.Level # Level, Value, Percent
IsosurfaceAtts.scaling = IsosurfaceAtts.Linear # Linear, Log
IsosurfaceAtts.variable = varname
SetOperatorOptions(IsosurfaceAtts)
RegisterMacro("Contours", SetupIsosurf)
def SetupBoundingBox():
AddPlot("Subset", "patches")
SubsetAtts = SubsetAttributes()
SubsetAtts.colorType = SubsetAtts.ColorByMultipleColors # ColorBySingleColor, ColorByMultipleColors, ColorByColorTable
SubsetAtts.legendFlag = 1
SubsetAtts.lineStyle = SubsetAtts.SOLID # SOLID, DASH, DOT, DOTDASH
SubsetAtts.wireframe = 1
SetPlotOptions(SubsetAtts)
RegisterMacro("Bounding Boxes", SetupBoundingBox)
def SetupBoundary():
# Get the name of the first variable in the file
filename = GetWindowInformation().activeSource
m = GetMetaData(filename)
materialsname = m.GetMaterials(0).name
AddPlot("Boundary", materialsname)
BoundaryAtts = BoundaryAttributes()
BoundaryAtts.colorType = BoundaryAtts.ColorBySingleColor # ColorBySingleColor, ColorByMultipleColors, ColorByColorTable
if m.GetMeshes(0).spatialDimension == 2:
BoundaryAtts.singleColor = (0, 0, 0, 255)
else:
BoundaryAtts.singleColor = (255, 255, 255, 255)
BoundaryAtts.boundaryType = BoundaryAtts.Material # Domain, Group, Material, Unknown
SetPlotOptions(BoundaryAtts)
RegisterMacro("Boundaries", SetupBoundary)
#def SetupMesh():
# # Get the name of the first variable in the file
# filename = GetWindowInformation().activeSource
# m = GetMetaData(filename)
# meshname = m.GetMeshes(0).name
#
# # Do a pseudocolor plot. We do need a plot to perform a query
# AddPlot("Mesh", meshname)
# DrawPlots()
#
# # Get the spatial extents and compute the centrois
# Query("SpatialExtents", 0, 0, "default")
# exts = GetQueryOutputValue()
# cx = (exts[1] + exts[0]) / 2
# cy = (exts[3] + exts[2]) / 2
# cz = (exts[5] + exts[4]) / 2
#
# AddOperator("Slice")
# SliceAtts = SliceAttributes()
# SliceAtts.originType = SliceAtts.Point # Point, Intercept, Percent, Zone, Node
# SliceAtts.originPoint = (cx, cy, cz)
# SliceAtts.axisType = SliceAtts.ZAxis # XAxis, YAxis, ZAxis, Arbitrary
# SliceAtts.project2d = 0 # Do not project to 2D
# SliceAtts.interactive = 1 # This operator will be affected by "plane tool" if it is active
# SetOperatorOptions(SliceAtts)
# DrawPlots()
#
#RegisterMacro("Setup mesh slice", SetupMesh)
This diff is collapsed.
......@@ -75,6 +75,9 @@ Definition:
// Brad Whitlock, Thu Jan 31 10:03:01 PST 2008
// Made it save userDirForSessionFiles, saveCrashRecovery.
//
// Gunther H. Weber, Mon Feb 4 15:13:11 PST 2008
// Made it save applySelection.
//
// ****************************************************************************
bool
......@@ -158,18 +161,21 @@ GlobalAttributes::CreateNode(DataNode *parentNode, bool completeSave, bool force
node->AddNode(new DataNode("treatAllDBsAsTimeVarying",
treatAllDBsAsTimeVarying));
}
if(completeSave || !FieldsEqual(ID_createMeshQualityExpressions, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("createMeshQualityExpressions",
createMeshQualityExpressions));
}
if(completeSave || !FieldsEqual(ID_createTimeDerivativeExpressions, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("createTimeDerivativeExpressions",
createTimeDerivativeExpressions));
}
if(completeSave || !FieldsEqual(ID_createVectorMagnitudeExpressions, &defaultObject))
{
addToParent = true;
......@@ -198,6 +204,13 @@ GlobalAttributes::CreateNode(DataNode *parentNode, bool completeSave, bool force
saveCrashRecoveryFile));
}
if(completeSave || !FieldsEqual(ID_applySelection, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("applySelection",
applySelection));
}
// Add the node to the parent node.
if(addToParent || forceAdd)
parentNode->AddNode(node);
......@@ -270,6 +283,9 @@ Definition:
// Brad Whitlock, Thu Jan 31 10:03:01 PST 2008
// Made it read userDirForSessionFiles, saveCrashRecovery.
//
// Gunther H. Weber, Mon Feb 4 15:14:51 PST 2008
// Made it read applySelection.
//
// ****************************************************************************
void
......@@ -317,5 +333,7 @@ GlobalAttributes::SetFromNode(DataNode *parentNode)
SetUserDirForSessionFiles(node->AsBool());
if((node = searchNode->GetNode("saveCrashRecoveryFile")) != 0)
SetSaveCrashRecoveryFile(node->AsBool());
if((node = searchNode->GetNode("applySelection")) != 0)
SetApplySelection(node->AsBool());
}
......@@ -51,7 +51,7 @@
// Notes: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Jan 31 10:05:58 PDT 2008
// Creation: Mon Feb 4 15:22:16 PST 2008
//
// Modifications:
//
......@@ -101,6 +101,7 @@ public:
void SetNewPlotsInheritSILRestriction(bool newPlotsInheritSILRestriction_);
void SetUserDirForSessionFiles(bool userDirForSessionFiles_);
void SetSaveCrashRecoveryFile(bool saveCrashRecoveryFile_);
void SetApplySelection(bool applySelection_);
// Property getting methods
const stringVector &GetSources() const;
......@@ -127,6 +128,7 @@ public:
bool GetNewPlotsInheritSILRestriction() const;
bool GetUserDirForSessionFiles() const;
bool GetSaveCrashRecoveryFile() const;
bool GetApplySelection() const;
// Persistence methods
virtual bool CreateNode(DataNode *node, bool completeSave, bool forceAdd);
......@@ -163,7 +165,8 @@ public:
ID_createVectorMagnitudeExpressions,
ID_newPlotsInheritSILRestriction,
ID_userDirForSessionFiles,
ID_saveCrashRecoveryFile
ID_saveCrashRecoveryFile,
ID_applySelection
};
private:
......@@ -189,6 +192,7 @@ private:
bool newPlotsInheritSILRestriction;
bool userDirForSessionFiles;
bool saveCrashRecoveryFile;
bool applySelection;
// Static class format string for type map.
static const char *TypeMapFormatString;
......
......@@ -64,6 +64,9 @@
<Field name="saveCrashRecoveryFile" label="Save a crash recovert file" type="bool">
true
</Field>
<Field name="applySelection" label="applySelection" type="bool">
true
</Field>
<Function name="CreateNode" user="false" member="true">
</Function>
<Function name="SetFromNode" user="false" member="true">
......
......@@ -925,6 +925,29 @@ GetUserVisItRCFile()
return GetUserVisItDirectory() + "visitrc";
}
// ****************************************************************************
// Method: GetSystemVisItRCFile
//
// Purpose:
// Returns the name of the VisIt RC file in the VisIt installation directory.
//
// Returns: The name of the RC file.
//
// Note:
//
// Programmer: Gunther H. Weber
// Creation: Thu Jan 17 15:10:30 PST 2008
//
// Modifications:
//
// ****************************************************************************
std::string
GetSystemVisItRCFile()
{
return std::string(GetDefaultConfigFile("visitrc", "VISITHOME"));
}
#if defined(_WIN32)
//
// Functions to get at VisIt data stored in the Windows registry.
......
......@@ -110,6 +110,7 @@ UTILITY_API char * GetDefaultConfigFile(const char *filename = 0, const cha
UTILITY_API char * GetSystemConfigFile(const char *filename = 0);
std::string UTILITY_API GetUserVisItRCFile();
std::string UTILITY_API GetSystemVisItRCFile();
int UTILITY_API ConfigStateGetRunCount(ConfigStateEnum &code);
void UTILITY_API ConfigStateIncrementRunCount(ConfigStateEnum &code);
......
......@@ -3588,3 +3588,25 @@ avtDatabaseMetaData::GetCycleFromFilenameRegex()
return cycleFromFilenameRegex;
}
Function: AddDefaultSILRestrictionDescription
Declaration: void AddDefaultSILRestrictionDescription(const std::string&);
Definition:
// ****************************************************************************
// Method: avtDatabaseMetaData::AddDefaultSILRestrictionDescription
//
// Purpose: Add a string to the description of a suggested default SIL
// restriction. This string should be "!TurnAllOn", "TurnAllOf",
// "+<SIL set name>" or "-<SIL set name>".
//
// Programmer: Gunther H. Weber
// Creation: February 04, 2008
//
// ****************************************************************************
void
avtDatabaseMetaData::AddDefaultSILRestrictionDescription(const std::string& setName)
{
suggestedDefaultSILRestriction.push_back(setName);
Select(ID_suggestedDefaultSILRestriction, (void *)&suggestedDefaultSILRestriction);
}
......@@ -81,7 +81,7 @@ class avtSILMetaData;
// Notes: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Wed Jun 13 13:59:40 PST 2007
// Creation: Thu Feb 7 14:15:32 PST 2008
//
// Modifications:
//
......@@ -128,6 +128,7 @@ public:
void SelectDefaultPlots();
void SelectSILs();
void SelectSimInfo();
void SelectSuggestedDefaultSILRestriction();
// Property setting methods
void SetHasTemporalExtents(bool hasTemporalExtents_);
......@@ -151,6 +152,7 @@ public:
void SetExprList(const ExpressionList &exprList_);
void SetIsSimulation(bool isSimulation_);
void SetSimInfo(const avtSimulationInformation &simInfo_);
void SetSuggestedDefaultSILRestriction(const stringVector &suggestedDefaultSILRestriction_);
// Property getting methods
bool GetHasTemporalExtents() const;
......@@ -209,6 +211,8 @@ public:
bool GetIsSimulation() const;
const avtSimulationInformation &GetSimInfo() const;
avtSimulationInformation &GetSimInfo();
const stringVector &GetSuggestedDefaultSILRestriction() const;
stringVector &GetSuggestedDefaultSILRestriction();
// Attributegroup convenience methods
......@@ -380,6 +384,46 @@ public:
static std::string cycleFromFilenameRegex;
static void SetCycleFromFilenameRegex(const char *re);
static std::string GetCycleFromFilenameRegex();
void AddDefaultSILRestrictionDescription(const std::string&);
// IDs that can be used to identify fields in case statements
enum {
ID_hasTemporalExtents = 0,
ID_minTemporalExtents,
ID_maxTemporalExtents,
ID_numStates,
ID_isVirtualDatabase,
ID_mustRepopulateOnStateChange,
ID_mustAlphabetizeVariables,
ID_formatCanDoDomainDecomposition,
ID_useCatchAllMesh,
ID_timeStepPath,
ID_timeStepNames,
ID_cycles,
ID_cyclesAreAccurate,
ID_times,
ID_timesAreAccurate,
ID_databaseName,
ID_fileFormat,
ID_databaseComment,
ID_exprList,
ID_meshes,
ID_scalars,
ID_vectors,
ID_tensors,
ID_symmTensors,
ID_arrays,
ID_materials,
ID_species,
ID_curves,
ID_labels,
ID_defaultPlots,
ID_SILs,
ID_isSimulation,
ID_simInfo,
ID_suggestedDefaultSILRestriction
};
protected:
AttributeGroup *CreateSubAttributeGroup(int index);
private:
......@@ -416,6 +460,7 @@ private:
AttributeGroupVector SILs;
bool isSimulation;
avtSimulationInformation simInfo;
stringVector suggestedDefaultSILRestriction;
// Static class format string for type map.
static const char *TypeMapFormatString;
......
......@@ -76,6 +76,8 @@
</Field>
<Field name="simInfo" label="Simulation information" type="att" subtype="avtSimulationInformation">
</Field>
<Field name="suggestedDefaultSILRestriction" label="Description of default SIL restriction for plots suggested by database plugin" type="stringVector">
</Field>
<Function name="SetNumStates" user="false" member="true">
</Function>
<Function name="SetTemporalExtents" user="true" member="true">
......@@ -246,6 +248,8 @@
</Function>
<Function name="GetCycleFromFilenameRegex" user="true" member="true">
</Function>
<Function name="AddDefaultSILRestrictionDescription" user="true" member="true">
</Function>
<Include file="header" quoted="false">
Expression.h
</Include>
......
......@@ -43,6 +43,7 @@
#include <avtExpressionFilter.h>
#include <math.h>
#include <cmath>
#include <float.h>
#include <vtkCellData.h>
......@@ -273,6 +274,9 @@ avtExpressionFilter::PostExecute(void)
// Thomas R. Treadway, Fri Dec 1 14:03:54 PST 2006
// Added check for GhostNodes in addition to the GhostZones
//
// Gunther H. Weber, Fri Feb 1 11:38:37 PST 2008
// Ignore nan, -inf and +inf
//
// Jeremy Meredith, Thu Feb 7 18:02:12 EST 2008
// Added support for updating the component extents of array variables.
//
......@@ -350,7 +354,13 @@ avtExpressionFilter::UpdateExtents(avtDataTree_p tree)
// This function is found in avtCommonDataFunctions.
value = MajorEigenvalue(val);
// else ... we handle array variables below
if(!std::isfinite(value))
{
// Ignore nan, -inf, and inf
continue;
}
if (value < exts[0])
exts[0] = value;
if (value > exts[1])
......
......@@ -43,6 +43,7 @@
#include <avtCommonDataFunctions.h>
#include <float.h>
#include <cmath>
#include <vector>
#include <visit-config.h>
......@@ -1218,6 +1219,9 @@ GetDataRange(vtkDataSet *ds, double *de, const char *vname,
// Hank Childs, Wed Oct 10 15:56:16 PDT 2007
// Added argument for ignoring values from ghost zones.
//
// Gunther H. Weber, Fri Feb 1 11:55:59 PST 2008
// Skip nan, -inf and +inf in min/max calculation
//
// ****************************************************************************
template <class T> static bool
......@@ -1231,6 +1235,9 @@ GetScalarRange(T *buf, int n, double *exts, unsigned char *ghosts)
if ((ghosts != NULL) && (ghosts[i] != '\0'))
continue;
if (!std::isfinite(*buf))
continue;
if (!setOne)
{
min = *buf;
......@@ -1507,6 +1514,9 @@ GetDataAllComponentsRange(vtkDataSet *ds, double *exts, const char *vname,
// Hank Childs, Wed Oct 10 15:56:16 PDT 2007
// Added argument for ignoring values from ghost zones.
//
// Gunther H. Weber, Fri Feb 1 11:55:59 PST 2008
// Skip nan, -inf and +inf in min/max calculation
//
// ****************************************************************************
template <class T> static void
......@@ -1522,6 +1532,9 @@ GetMagnitudeRange(T *buf, int n, int ncomps, double *exts,
for (int j = 0; j < ncomps; j++, buf++)
mag += *buf * *buf;
if (!std::isfinite(mag))
continue;
if (mag < exts[0])
{
exts[0] = mag;
......@@ -1637,6 +1650,9 @@ GetDataMagnitudeRange(vtkDataSet *ds, double *exts, const char *vname,
// Hank Childs, Wed Oct 10 15:56:16 PDT 2007
// Added argument for ignoring values from ghost zones.
//
// Gunther H. Weber, Fri Feb 1 11:55:59 PST 2008
// Skip nan, -inf and +inf in min/max calculation
//
// ****************************************************************************
void
......@@ -1688,6 +1704,10 @@ GetDataMajorEigenvalueRange(vtkDataSet *ds, double *exts, const char *vname,
continue;
double val = MajorEigenvalue(ptr);
if (!std::isfinite(val))
continue;
exts[0] = (exts[0] < val ? exts[0] : val);
exts[1] = (exts[1] > val ? exts[1] : val);
ptr+=ncomps;
......
##
## build_vist generated host.conf
## created: Mon Aug 20 18:03:24 PDT 2007
## system: Linux rogers 2.6.8-24.25-smp #1 SMP Thu Aug 24 09:57:32 UTC 2006 i686 i686 i386 GNU/Linux
## created: Tue Nov 6 16:05:01 PST 2007
## system: Linux rogers 2.6.18.8-0.5-default #1 SMP Fri Jun 22 12:17:53 UTC 2007 i686 i686 i386 GNU/Linux
## by: gweber
##
## Set the VISITHOME environment variable.
##
VISITHOME=/home/spencer/users/gweber/visit
VISITHOME=/scratch/users/gweber/visit
##
## Specify the location of the mesa include files and libraries.
##
MESA=$VISITHOME/mesa/6.4.2/linux_gcc-3.3.2
MESA=$VISITHOME/mesa/6.4.2/linux-i686_gcc-4.1.2
##
## Specify the location of the vtk include files and libraries.
##
VTK=$VISITHOME/vtk/5.0.0c/linux_gcc-3.3.2
VTK=$VISITHOME/vtk/5.0.0c/linux-i686_gcc-4.1.2
##
## Specify the location of the qt include files and libraries.
##
QT_BIN=$VISITHOME/qt/3.3.8/linux_gcc-3.3.2/bin
QT_INCLUDE=$VISITHOME/qt/3.3.8/linux_gcc-3.3.2/include
QT_LIB=$VISITHOME/qt/3.3.8/linux_gcc-3.3.2/lib
QT_BIN=$VISITHOME/qt/3.3.8/linux-i686_gcc-4.1.2/bin
QT_INCLUDE=$VISITHOME/qt/3.3.8/linux-i686_gcc-4.1.2/include
QT_LIB=$VISITHOME/qt/3.3.8/linux-i686_gcc-4.1.2/lib
##
## Specify the location of the python include and libraries.
##
PYDIR=$VISITHOME/python/2.5/linux_gcc-3.3.2
PYDIR=$VISITHOME/python/2.5/linux-i686_gcc-4.1.2
PYVERSION=python2.5
##
## Silo
##
DEFAULT_SILO_INCLUDES=$VISITHOME/silo/4.5.1/linux_gcc-3.3.2/include
DEFAULT_SILO_LIBRARY=$VISITHOME/silo/4.5.1/linux_gcc-3.3.2/lib
DEFAULT_SILO_INCLUDES=$VISITHOME/silo/4.5.1/linux-i686_gcc-4.1.2/include
DEFAULT_SILO_LIBRARY=$VISITHOME/silo/4.5.1/linux-i686_gcc-4.1.2/lib
## Compiler flags.
##
CC="gcc"
CXX="g++"
CFLAGS="-O2"
CXXFLAGS="-O2 -I/usr/local/anag/pkg/mpich-1.2.5.2/include -DUSE_STDARG -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_UNISTD_H=1 -DHAVE_STDARG_H=1 -DUSE_STDARG=1 -DMALLOC_RET_VOID=1 "
CXXFLAGS="-O2 -DUSE_STDARG -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_UNISTD_H=1 -DHAVE_STDARG_H=1 -DUSE_STDARG=1 -DMALLOC_RET_VOID=1 -I/usr/local/anag/pkg/mpich-1.2.5.2/include"
MPI_LIBS="-L/usr/local/anag/pkg/mpich-1.2.5.2/lib -lmpich "
IGNORE_HUPS="yes"
......@@ -55,34 +55,34 @@ IGNORE_HUPS="yes"
##
## Boxlib
##
DEFAULT_BOXLIB2D_INCLUDE=$VISITHOME/boxlib/linux_gcc-3.3.2/include/2D
DEFAULT_BOXLIB2D_LIBS=$VISITHOME/boxlib/linux_gcc-3.3.2/lib
DEFAULT_BOXLIB3D_INCLUDE=$VISITHOME/boxlib/linux_gcc-3.3.2/include/3D
DEFAULT_BOXLIB3D_LIBS=$VISITHOME/boxlib/linux_gcc-3.3.2/lib
DEFAULT_BOXLIB2D_INCLUDE=$VISITHOME/boxlib/linux-i686_gcc-4.1.2/include/2D
DEFAULT_BOXLIB2D_LIBS=$VISITHOME/boxlib/linux-i686_gcc-4.1.2/lib
DEFAULT_BOXLIB3D_INCLUDE=$VISITHOME/boxlib/linux-i686_gcc-4.1.2/include/3D
DEFAULT_BOXLIB3D_LIBS=$VISITHOME/boxlib/linux-i686_gcc-4.1.2/lib
##
## CFITSIO
##
DEFAULT_CFITSIO_INCLUDE=$VISITHOME/cfitsio/3006/linux_gcc-3.3.2/include
DEFAULT_CFITSIO_LIB=$VISITHOME/cfitsio/3006/linux_gcc-3.3.2/lib
DEFAULT_CFITSIO_INCLUDE=$VISITHOME/cfitsio/3006/linux-i686_gcc-4.1.2/include
DEFAULT_CFITSIO_LIB=$VISITHOME/cfitsio/3006/linux-i686_gcc-4.1.2/lib
##
## CGNS
##
DEFAULT_CGNS_INCLUDE=$VISITHOME/cgns/2.4/linux_gcc-3.3.2/include
DEFAULT_CGNS_LIB=$VISITHOME/cgns/2.4/linux_gcc-3.3.2/lib
DEFAULT_CGNS_INCLUDE=$VISITHOME/cgns/2.4/linux-i686_gcc-4.1.2/include
DEFAULT_CGNS_LIB=$VISITHOME/cgns/2.4/linux-i686_gcc-4.1.2/lib
##
## Exodus
##
DEFAULT_EXODUS_INCLUDES=$VISITHOME/exodus/4.46/linux_gcc-3.3.2/inc
DEFAULT_EXODUS_LIBRARY=$VISITHOME/exodus/4.46/linux_gcc-3.3.2/lib
DEFAULT_EXODUS_INCLUDES=$VISITHOME/exodus/4.46/linux-i686_gcc-4.1.2/inc
DEFAULT_EXODUS_LIBRARY=$VISITHOME/exodus/4.46/linux-i686_gcc-4.1.2/lib
##
## GDAL
##
DEFAULT_GDAL_INCLUDE=$VISITHOME/gdal/1.3.2/linux_gcc-3.3.2/include
DEFAULT_GDAL_LIB=$VISITHOME/gdal/1.3.2/linux_gcc-3.3.2/lib
DEFAULT_GDAL_INCLUDE=$VISITHOME/gdal/1.3.2/linux-i686_gcc-4.1.2/include
DEFAULT_GDAL_LIB=$VISITHOME/gdal/1.3.2/linux-i686_gcc-4.1.2/lib
##
## H5Part
......@@ -91,23 +91,29 @@ DEFAULT_GDAL_LIB=$VISITHOME/gdal/1.3.2/linux_gcc-3.3.2/lib
##
## HDF4
##
DEFAULT_HDF4_FLAGS=$VISITHOME/hdf4/4.2.1/linux_gcc-3.3.2/include
DEFAULT_HDF4_LIBS=$VISITHOME/hdf4/4.2.1/linux_gcc-3.3.2/lib
DEFAULT_HDF4_FLAGS=$VISITHOME/hdf4/4.2.1/linux-i686_gcc-4.1.2/include
DEFAULT_HDF4_LIBS=$VISITHOME/hdf4/4.2.1/linux-i686_gcc-4.1.2/lib
##
## HDF5
##
DEFAULT_HDF5_INCLUDE=$VISITHOME/hdf5/1.6.5/linux_gcc-3.3.2/include
DEFAULT_HDF5_LIB=$VISITHOME/hdf5/1.6.5/linux_gcc-3.3.2/lib
DEFAULT_HDF5_INCLUDE=$VISITHOME/hdf5/1.6.5/linux-i686_gcc-4.1.2/include
DEFAULT_HDF5_LIB=$VISITHOME/hdf5/1.6.5/linux-i686_gcc-4.1.2/lib
##
## Mili
##
MILI_DIR=$VISITHOME/mili/1.10.0/linux_gcc-3.3.2
MILI_DIR=$VISITHOME/mili/1.10.0/linux-i686_gcc-4.1.2