Update from October 30, 2003

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@109 18c085ea-50e0-402c-830e-de6fd14e8384

BUILD_NOTES

@@ -353,7 +353,11 @@ Silo
 Silo is a self-describing, machine-independent scientific file format.
 Silo is one of the file formats supported by VisIt.  Follow the directions
 listed below to build Silo.  If you have any problems building or installing
-Silo, read the INSTALL_NOTES file in the SILO distribution for more information.
+Silo, read the INSTALL_NOTES file in the SILO distribution for more
+information.
+
+Note: for Itanium (ia64) systems, the -fpic flag is needed.  You can replace
+CFLAGS=-O2 with CFLAGS="-fpic -O2" in the configure command below.
 
 #
 # Build Silo
@@ -388,6 +392,15 @@ directions listed below to build Python.  If you have any problems building
 or installing Python, read the README file in the Python distribution for more
 information.
 
+Note: for Itanium (ia64) systems, the -fpic flag is needed.  To add this flag
+to python's build, do the following:  (1) Follow the commands below until the
+configure step.  Execute configure as given.  (2) Look at the Makefile and find
+the value of the variable OPT.  (3) Re-execute configure with OPT specified
+through the env command, with -fpic added to OPT.  For example:
+    env OPT="-fpic -O2" ./configure --prefix=`cat ../visitpath`/python
+where the "-O2" was the value of OPT in the makefile.  (4) Continue with
+the commands below as given.
+
 #
 # Build and install it in the visit directory under the python directory.
 #
@@ -426,6 +439,9 @@ configure that tests your system for various libraries and programs required
 to build VisIt.  Follow the directions listed below to build VisIt.
 More information about building VisIt follows after that.
 
+Note: for Itanium (ia64) systems, add the -fpic flag to the CXXFLAGS in the
+env command for configure.
+
 #
 # Build and install it in the visit directory.
 #

common/plugin/PluginManager.C

@@ -602,6 +602,11 @@ PluginManager::LoadPluginsNow()
 //    Brad Whitlock, Fri Mar 29 12:24:28 PDT 2002
 //    Moved most of the code to other methods so it is easier to port.
 //
+//    Jeremy Meredith, Wed Oct 29 13:16:48 PST 2003
+//    Added code to catch the PluginOpen call and simply print an error
+//    and fail to load the plugin, as long as we're not the viewer or
+//    the gui.
+//
 // ****************************************************************************
 
 void
@@ -624,7 +629,29 @@ PluginManager::LoadSinglePlugin(int index)
     }
 
     // Open the plugin
-    PluginOpen(libfiles[index]);
+    TRY
+    {
+        PluginOpen(libfiles[index]);
+    }
+    CATCHALL(...)
+    {
+        if (category==GUI || category==Viewer)
+        {
+            // These guys can't handle failing to load a plugin
+            // once they decided to load it
+            RETHROW;
+        }
+        else
+        {
+            // Everyone else can!
+            debug1 << "Skipping " << managerName.c_str() << " plugin "
+                   << names[index].c_str()
+                   << " version " << versions[index].c_str()
+                   << " because it failed to open." << endl;
+            return;
+        }
+    }
+    ENDTRY
 
     // Success so far -- add the handle and the info to the list
     int loadedindex = loadedhandles.size();
@@ -650,7 +677,7 @@ PluginManager::LoadSinglePlugin(int index)
         break;
     }
 
-    debug1 << "Loaded "<<managerName.c_str()<<" plugin info for "
+    debug1 << "Loaded full "<<managerName.c_str()<<" plugin "
            << names[index].c_str() << " version " << versions[index].c_str()
            << endl;
 }

config-site/tdevi.conf

+## This config site file is for tdevi, an LLNL
+## Itanium development cluster
+
+VISITHOME=/home/meredith/visit
+
+##
+## Set the VISITHOME environment variable.
+##
+
+##
+## Specify the location of the silo include files and library.
+##
+DEFAULT_SILO_INCLUDES=$VISITHOME/silo/include
+DEFAULT_SILO_LIBRARY=$VISITHOME/silo/lib
+
+##
+## Specify the location of the mesa include files and libraries.
+##
+MESA=$VISITHOME/mesa
+
+##
+## Specify the location of the vtk include files and libraries.
+##
+VTK=$VISITHOME/vtk
+
+##
+## Specify the location of the qt include files and libraries.
+##
+QTDIR=$VISITHOME/qt
+
+##
+## Specify the location of the python include files and libraries.
+##
+PYDIR=$VISITHOME/python
+PYVERSION=python2.1
+
+CXXFLAGS="-fpic $CXXFLAGS"
+LDFLAGS="-fpic $LDFLAGS"

engine/main/NetworkManager.C

@@ -6,6 +6,7 @@
 #include <MaterialAttributes.h>
 #include <avtExpressionEvaluatorFilter.h>
 #include <ImproperUseException.h>
+#include <InvalidVariableException.h>
 #include <DatabaseException.h>
 #include <NoInputException.h>
 #include <avtPluginFilter.h>
@@ -47,6 +48,9 @@
 #include <parallel.h>
 #endif
 
+#include <set>
+using std::set;
+
 static double RenderBalance(int numTrianglesIHave);
 
 // ****************************************************************************
@@ -309,6 +313,9 @@ NetworkManager::GetDBFromCache(const string &filename, int time)
 //    Jeremy Meredith, Fri Sep  5 15:23:13 PDT 2003
 //    Added a flag for the new MIR algorithm.
 //
+//    Jeremy Meredith, Thu Oct 30 16:09:32 PST 2003
+//    Added code to make sure varLeaves was non-empty before accessing it.
+//
 // ****************************************************************************
 void
 NetworkManager::StartNetwork(const string &filename, const string &var,
@@ -335,7 +342,12 @@ NetworkManager::StartNetwork(const string &filename, const string &var,
     ExprNode *tree = ParsingExprList::GetExpressionTree(leaf);
     while (tree != NULL)
     {
-        leaf = *tree->GetVarLeaves().begin();
+        const set<string> &varLeaves = tree->GetVarLeaves();
+        if (varLeaves.empty())
+        {
+            EXCEPTION1(InvalidVariableException, "");
+        }
+        leaf = *varLeaves.begin();
         tree = ParsingExprList::GetExpressionTree(leaf);
     }
 

plots/Makefile.in

@@ -96,6 +96,9 @@
 #    Hank Childs, Tue Sep 23 07:28:20 PDT 2003
 #    Added Tensor plot.
 #
+#    Jeremy Meredith, Thu Oct 30 12:03:04 PST 2003
+#    Removed Kerbel plot entirely from this makefile.
+#
 ##############################################################################
 
 @SET_MAKE@
@@ -104,7 +107,7 @@
 all: message
 	for dir in $(SUBDIRS); do (cd $$dir && $(MAKE) $@) || exit 1; done
 
-OPTIONAL=Kerbel Topology
+OPTIONAL=Topology
 
 REQUIRED=Boundary Contour Curve FilledBoundary Histogram Mesh Pseudocolor \
          Streamline Subset Surface Tensor Vector Volume

viewer/main/ViewerPlotList.C

@@ -2061,6 +2061,9 @@ ViewerPlotList::OverlayDatabase(const std::string &host, const std::string &data
 //   Made it properly catch errors from parsing expressions.
 //   Made it handle (and abort from) infinitely recursive expressions.
 //
+//   Jeremy Meredith, Wed Oct 29 12:31:52 PST 2003
+//   Added code to make sure varLeaves was non-empty before accessing it.
+//
 // ****************************************************************************
 avtSILRestriction_p
 ViewerPlotList::GetDefaultSILRestriction(const std::string &host,
@@ -2096,7 +2099,12 @@ ViewerPlotList::GetDefaultSILRestriction(const std::string &host,
             // There was a parse error
             return silr;
         }
-        realvar = *tree->GetVarLeaves().begin();
+        const set<string> &varLeaves = tree->GetVarLeaves();
+        if (varLeaves.empty())
+        {
+            EXCEPTION1(InvalidVariableException, "");
+        }
+        realvar = *varLeaves.begin();
         if (expandedVars.count(realvar))
         {
             EXCEPTION1(RecursiveExpressionException, realvar);