Update from July 30, 2003

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

bin/Makefile.in

@@ -33,12 +33,16 @@
 # Programmer: Jeremy Meredith
 # Date:       July 12, 2002
 #
+# Modifications:
+#   Brad Whitlock, Mon Jul 28 17:09:09 PST 2003
+#   I added makemovie.py to the list of files that get distributed.
+#
 ##############################################################################
 
 @SET_MAKE@
 @VARIABLES@
 
-DISTRIB= install-sh visit
+DISTRIB= install-sh visit makemovie.py
 NOT_DISTRIB= run_doxygen
 
 all: moc

bin/visit

@@ -241,6 +241,9 @@ $0 = shift @ARGV;
 #    I added the ability to translate a known remotehost into a different
 #    IP address.  This allows us to use the DISCOM pipes back to White from Q.
 #
+#    Brad Whitlock, Mon Jul 28 15:47:43 PST 2003
+#    I added movie-making options.
+#
 ###############################################################################
 
 
@@ -291,6 +294,8 @@ USAGE:  visit [arguments]
         -xml2python          Run the XML plugin Pthon generator
         -xml2window          Run the XML plugin GUI window generator
         -xml2java            Run the XML plugin Java generator
+        -movie               Run the CLI in a movie making mode.
+        -mpeg_encode         Run the MPEG encoder
 
     Version arguments:
         -beta                Run the current beta version
@@ -385,6 +390,7 @@ $launchengine = "";
 @breakpoints = ();
 $debug_gdb = 0;
 $debug_totalview = "";
+$add_movie_args = 0;
 
 # Parse the arguments 
 @visitargs = ();
@@ -426,6 +432,8 @@ while (scalar(@ARGV) > 0) {
     elsif ($arg eq "-surfcomp" )        { $exe_name = "surfcomp"; }
     elsif ($arg eq "-text2polys" )      { $exe_name = "text2polys"; }
     elsif ($arg eq "-time_annotation" ) { $exe_name = "time_annotation"; }
+    elsif ($arg eq "-mpeg_encode" )     { $exe_name = "mpeg_encode"; }
+    elsif ($arg eq "-movie" )           { $exe_name = "cli"; $add_movie_args = 1; }
     elsif ($arg eq "-publicpluginsonly"){ $publiconly = 1; push @visitargs, $arg; }
     elsif ($arg eq "-version")   { $want_version = 1; }
     elsif ($arg eq "-help")      { print STDERR "$usage\n"; exit(0); }
@@ -806,6 +814,11 @@ EOF
     exit 1;
 }
 
+# Add the movie script to the arguments.
+if($add_movie_args)
+{
+    push @visitargs, "-s", "$visitbindir/makemovie.py", "-nowin";
+}
 
 # -----------------------------------------------------------------------------
 #                   Set up the plugin/shared library environment

clearcase_bin/visit-bin-dist

@@ -121,6 +121,9 @@
 #    Eric Brugger, Tue Jul 29 08:23:32 PDT 2003
 #    Added makemili to the distribution.
 #
+#    Brad Whitlock, Wed Jul 30 13:12:14 PST 2003
+#    Added mpeg_encode and makemovie.py to the distribution.
+#
 #-----------------------------------------------------------------------
 
 set DataFiles = "TRUE"
@@ -489,6 +492,9 @@ cp $VisItDir/bin/time_annotation $bindir
 if(-e $VisItDir/bin/makemili_ser) then
    cp $VisItDir/bin/makemili_ser $bindir/makemili_ser
 endif
+# Copy the MPEG encoder and the makemovie script.
+cp $VisItDir/bin/mpeg_encode   $bindir
+cp $VisItDir/bin/makemovie.py  $bindir
 
 #
 # Copy the VisIt libraries to the distribution.

common/state/MaterialAttributes.C

@@ -10,17 +10,18 @@
 // Note:       Autogenerated by xml2atts.
 //
 // Programmer: xml2atts
-// Creation:   Wed Jul 23 11:30:44 PDT 2003
+// Creation:   Tue Jul 29 12:56:51 PDT 2003
 //
 // Modifications:
 //   
 // ****************************************************************************
 
-MaterialAttributes::MaterialAttributes() : AttributeSubject("bbb")
+MaterialAttributes::MaterialAttributes() : AttributeSubject("bbbb")
 {
     smoothing = false;
     forceMIR = false;
     cleanZonesOnly = false;
+    needValidConnectivity = false;
 }
 
 // ****************************************************************************
@@ -32,17 +33,18 @@ MaterialAttributes::MaterialAttributes() : AttributeSubject("bbb")
 // Note:       Autogenerated by xml2atts.
 //
 // Programmer: xml2atts
-// Creation:   Wed Jul 23 11:30:44 PDT 2003
+// Creation:   Tue Jul 29 12:56:51 PDT 2003
 //
 // Modifications:
 //   
 // ****************************************************************************
 
-MaterialAttributes::MaterialAttributes(const MaterialAttributes &obj) : AttributeSubject("bbb")
+MaterialAttributes::MaterialAttributes(const MaterialAttributes &obj) : AttributeSubject("bbbb")
 {
     smoothing = obj.smoothing;
     forceMIR = obj.forceMIR;
     cleanZonesOnly = obj.cleanZonesOnly;
+    needValidConnectivity = obj.needValidConnectivity;
 
     SelectAll();
 }
@@ -56,7 +58,7 @@ MaterialAttributes::MaterialAttributes(const MaterialAttributes &obj) : Attribut
 // Note:       Autogenerated by xml2atts.
 //
 // Programmer: xml2atts
-// Creation:   Wed Jul 23 11:30:44 PDT 2003
+// Creation:   Tue Jul 29 12:56:51 PDT 2003
 //
 // Modifications:
 //   
@@ -76,7 +78,7 @@ MaterialAttributes::~MaterialAttributes()
 // Note:       Autogenerated by xml2atts.
 //
 // Programmer: xml2atts
-// Creation:   Wed Jul 23 11:30:44 PDT 2003
+// Creation:   Tue Jul 29 12:56:51 PDT 2003
 //
 // Modifications:
 //   
@@ -88,6 +90,7 @@ MaterialAttributes::operator = (const MaterialAttributes &obj)
     smoothing = obj.smoothing;
     forceMIR = obj.forceMIR;
     cleanZonesOnly = obj.cleanZonesOnly;
+    needValidConnectivity = obj.needValidConnectivity;
 
     SelectAll();
 }
@@ -101,7 +104,7 @@ MaterialAttributes::operator = (const MaterialAttributes &obj)
 // Note:       Autogenerated by xml2atts.
 //
 // Programmer: xml2atts
-// Creation:   Wed Jul 23 11:30:44 PDT 2003
+// Creation:   Tue Jul 29 12:56:51 PDT 2003
 //
 // Modifications:
 //   
@@ -113,7 +116,8 @@ MaterialAttributes::operator == (const MaterialAttributes &obj) const
     // Create the return value
     return ((smoothing == obj.smoothing) &&
             (forceMIR == obj.forceMIR) &&
-            (cleanZonesOnly == obj.cleanZonesOnly));
+            (cleanZonesOnly == obj.cleanZonesOnly) &&
+            (needValidConnectivity == obj.needValidConnectivity));
 }
 
 // ****************************************************************************
@@ -125,7 +129,7 @@ MaterialAttributes::operator == (const MaterialAttributes &obj) const
 // Note:       Autogenerated by xml2atts.
 //
 // Programmer: xml2atts
-// Creation:   Wed Jul 23 11:30:44 PDT 2003
+// Creation:   Tue Jul 29 12:56:51 PDT 2003
 //
 // Modifications:
 //   
@@ -146,7 +150,7 @@ MaterialAttributes::operator != (const MaterialAttributes &obj) const
 // Note:       Autogenerated by xml2atts.
 //
 // Programmer: xml2atts
-// Creation:   Wed Jul 23 11:30:44 PDT 2003
+// Creation:   Tue Jul 29 12:56:51 PDT 2003
 //
 // Modifications:
 //   
@@ -167,7 +171,7 @@ MaterialAttributes::TypeName() const
 // Note:       Autogenerated by xml2atts.
 //
 // Programmer: xml2atts
-// Creation:   Wed Jul 23 11:30:44 PDT 2003
+// Creation:   Tue Jul 29 12:56:51 PDT 2003
 //
 // Modifications:
 //   
@@ -195,7 +199,7 @@ MaterialAttributes::CopyAttributes(const AttributeGroup *atts)
 // Note:       Autogenerated by xml2atts.
 //
 // Programmer: xml2atts
-// Creation:   Wed Jul 23 11:30:44 PDT 2003
+// Creation:   Tue Jul 29 12:56:51 PDT 2003
 //
 // Modifications:
 //   
@@ -221,7 +225,7 @@ MaterialAttributes::CreateCompatible(const std::string &tname) const
 // Note:       Autogenerated by xml2atts.
 //
 // Programmer: xml2atts
-// Creation:   Wed Jul 23 11:30:44 PDT 2003
+// Creation:   Tue Jul 29 12:56:51 PDT 2003
 //
 // Modifications:
 //   
@@ -248,7 +252,7 @@ MaterialAttributes::NewInstance(bool copy) const
 // Note:       Autogenerated by xml2atts.
 //
 // Programmer: xml2atts
-// Creation:   Wed Jul 23 11:30:44 PDT 2003
+// Creation:   Tue Jul 29 12:56:51 PDT 2003
 //
 // Modifications:
 //   
@@ -260,6 +264,7 @@ MaterialAttributes::SelectAll()
     Select(0, (void *)&smoothing);
     Select(1, (void *)&forceMIR);
     Select(2, (void *)&cleanZonesOnly);
+    Select(3, (void *)&needValidConnectivity);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -275,7 +280,7 @@ MaterialAttributes::SelectAll()
 // Note:       Autogenerated by xml2atts.
 //
 // Programmer: xml2atts
-// Creation:   Wed Jul 23 11:30:44 PDT 2003
+// Creation:   Tue Jul 29 12:56:51 PDT 2003
 //
 // Modifications:
 //   
@@ -310,6 +315,12 @@ MaterialAttributes::CreateNode(DataNode *parentNode, bool forceAdd)
         node->AddNode(new DataNode("cleanZonesOnly", cleanZonesOnly));
     }
 
+    if(!FieldsEqual(3, &defaultObject))
+    {
+        addToParent = true;
+        node->AddNode(new DataNode("needValidConnectivity", needValidConnectivity));
+    }
+
 
     // Add the node to the parent node.
     if(addToParent || forceAdd)
@@ -329,7 +340,7 @@ MaterialAttributes::CreateNode(DataNode *parentNode, bool forceAdd)
 // Note:       Autogenerated by xml2atts.
 //
 // Programmer: xml2atts
-// Creation:   Wed Jul 23 11:30:44 PDT 2003
+// Creation:   Tue Jul 29 12:56:51 PDT 2003
 //
 // Modifications:
 //   
@@ -352,6 +363,8 @@ MaterialAttributes::SetFromNode(DataNode *parentNode)
         SetForceMIR(node->AsBool());
     if((node = searchNode->GetNode("cleanZonesOnly")) != 0)
         SetCleanZonesOnly(node->AsBool());
+    if((node = searchNode->GetNode("needValidConnectivity")) != 0)
+        SetNeedValidConnectivity(node->AsBool());
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -379,6 +392,13 @@ MaterialAttributes::SetCleanZonesOnly(bool cleanZonesOnly_)
     Select(2, (void *)&cleanZonesOnly);
 }
 
+void
+MaterialAttributes::SetNeedValidConnectivity(bool needValidConnectivity_)
+{
+    needValidConnectivity = needValidConnectivity_;
+    Select(3, (void *)&needValidConnectivity);
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // Get property methods
 ///////////////////////////////////////////////////////////////////////////////
@@ -401,6 +421,12 @@ MaterialAttributes::GetCleanZonesOnly() const
     return cleanZonesOnly;
 }
 
+bool
+MaterialAttributes::GetNeedValidConnectivity() const
+{
+    return needValidConnectivity;
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // Keyframing methods
 ///////////////////////////////////////////////////////////////////////////////
@@ -414,7 +440,7 @@ MaterialAttributes::GetCleanZonesOnly() const
 // Note:       Autogenerated by xml2atts.
 //
 // Programmer: xml2atts
-// Creation:   Wed Jul 23 11:30:44 PDT 2003
+// Creation:   Tue Jul 29 12:56:51 PDT 2003
 //
 // Modifications:
 //   
@@ -428,6 +454,7 @@ MaterialAttributes::GetFieldName(int index) const
         case 0:  return "Enable interface smoothing";
         case 1:  return "Force interface reconstruction";
         case 2:  return "Clean zones only";
+        case 3:  return "Force perfect connectivity";
         default:  return "invalid index";
     }
 }
@@ -441,7 +468,7 @@ MaterialAttributes::GetFieldName(int index) const
 // Note:       Autogenerated by xml2atts.
 //
 // Programmer: xml2atts
-// Creation:   Wed Jul 23 11:30:44 PDT 2003
+// Creation:   Tue Jul 29 12:56:51 PDT 2003
 //
 // Modifications:
 //   
@@ -455,6 +482,7 @@ MaterialAttributes::GetFieldType(int index) const
         case 0:  return FieldType_bool;
         case 1:  return FieldType_bool;
         case 2:  return FieldType_bool;
+        case 3:  return FieldType_bool;
         default:  return FieldType_unknown;
     }
 }
@@ -468,7 +496,7 @@ MaterialAttributes::GetFieldType(int index) const
 // Note:       Autogenerated by xml2atts.
 //
 // Programmer: xml2atts
-// Creation:   Wed Jul 23 11:30:44 PDT 2003
+// Creation:   Tue Jul 29 12:56:51 PDT 2003
 //
 // Modifications:
 //   
@@ -482,6 +510,7 @@ MaterialAttributes::GetFieldTypeName(int index) const
         case 0:  return "bool";
         case 1:  return "bool";
         case 2:  return "bool";
+        case 3:  return "bool";
         default:  return "invalid index";
     }
 }
@@ -495,7 +524,7 @@ MaterialAttributes::GetFieldTypeName(int index) const
 // Note:       Autogenerated by xml2atts.
 //
 // Programmer: xml2atts
-// Creation:   Wed Jul 23 11:30:44 PDT 2003
+// Creation:   Tue Jul 29 12:56:51 PDT 2003
 //
 // Modifications:
 //   
@@ -523,6 +552,11 @@ MaterialAttributes::FieldsEqual(int index_, const AttributeGroup *rhs) const
         retval = (cleanZonesOnly == obj.cleanZonesOnly);
         }
         break;
+    case 3:
+        {  // new scope
+        retval = (needValidConnectivity == obj.needValidConnectivity);
+        }
+        break;
     default: retval = false;
     }
 

common/state/MaterialAttributes.h

@@ -12,7 +12,7 @@
 // Notes:      Autogenerated by xml2atts.
 //
 // Programmer: xml2atts
-// Creation:   Wed Jul 23 11:30:44 PDT 2003
+// Creation:   Tue Jul 29 12:56:51 PDT 2003
 //
 // Modifications:
 //   
@@ -41,11 +41,13 @@ public:
     void SetSmoothing(bool smoothing_);
     void SetForceMIR(bool forceMIR_);
     void SetCleanZonesOnly(bool cleanZonesOnly_);
+    void SetNeedValidConnectivity(bool needValidConnectivity_);
 
     // Property getting methods
     bool GetSmoothing() const;
     bool GetForceMIR() const;
     bool GetCleanZonesOnly() const;
+    bool GetNeedValidConnectivity() const;
 
     // Persistence methods
     virtual bool CreateNode(DataNode *node, bool forceAdd);
@@ -62,6 +64,7 @@ private:
     bool smoothing;
     bool forceMIR;
     bool cleanZonesOnly;
+    bool needValidConnectivity;
 };
 
 #endif

common/state/MaterialAttributes.xml

@@ -9,4 +9,7 @@
     <Field name="cleanZonesOnly" label="Clean zones only" type="bool">
       false
     </Field>
+    <Field name="needValidConnectivity" label="Force perfect connectivity" type="bool">
+      false
+    </Field>
   </Attribute>

components/Pipeline/PublicFilters/avtContourFilter.C

@@ -159,6 +159,9 @@ avtContourFilter::~avtContourFilter()
 //    Brad Whitlock, Tue May 20 13:43:11 PST 2003
 //    Made it use the updated ContourOpAttributes.
 //
+//    Hank Childs, Wed Jul 30 09:04:28 PDT 2003
+//    Do not claim we need face connectivity if we are in 2D.
+//
 // ****************************************************************************
 
 avtPipelineSpecification_p
@@ -166,7 +169,8 @@ avtContourFilter::PerformRestriction(avtPipelineSpecification_p in_spec)
 {
     avtPipelineSpecification_p spec = new avtPipelineSpecification(in_spec);
 
-    spec->GetDataSpecification()->SetNeedValidFaceConnectivity(true);
+    if (GetInput()->GetInfo().GetAttributes().GetTopologicalDimension() == 3)
+        spec->GetDataSpecification()->SetNeedValidFaceConnectivity(true);
 
     int  i, j;
 

config-site/gps01.conf

@@ -11,7 +11,7 @@ CXX=/usr/local/tools/gnu/gcc/3.0.4/bin/g++
 ##
 ## Use fake exceptions instead of C++ exceptions.
 ##
-CXXFLAGS="-DFAKE_EXCEPTIONS $CXXFLAGS"
+FAKE_EXCEPTIONS_BY_DEFAULT="yes"
 CFLAGS="-pthread"
 PTHREAD_CXXFLAGS="-pthread"
 

config-site/gps02.conf

@@ -11,7 +11,7 @@ CXX=/usr/local/tools/gnu/gcc/3.0.4/bin/g++
 ##
 ## Use fake exceptions instead of C++ exceptions.
 ##
-CXXFLAGS="-DFAKE_EXCEPTIONS $CXXFLAGS"
+FAKE_EXCEPTIONS_BY_DEFAULT="yes"
 CFLAGS="-pthread"
 PTHREAD_CXXFLAGS="-pthread"
 

config-site/gps15.conf

@@ -11,7 +11,7 @@ CXX=/usr/local/tools/gnu/gcc/3.0.4/bin/g++
 ##
 ## Use fake exceptions instead of C++ exceptions.
 ##
-CXXFLAGS="-DFAKE_EXCEPTIONS $CXXFLAGS"
+FAKE_EXCEPTIONS_BY_DEFAULT="yes"
 CFLAGS="-pthread"
 PTHREAD_CXXFLAGS="-pthread"
 

config-site/gps16.conf

@@ -11,7 +11,7 @@ CXX=/usr/local/tools/gnu/gcc/3.0.4/bin/g++
 ##
 ## Use fake exceptions instead of C++ exceptions.
 ##
-CXXFLAGS="-DFAKE_EXCEPTIONS $CXXFLAGS"
+FAKE_EXCEPTIONS_BY_DEFAULT="yes"
 CFLAGS="-pthread"
 PTHREAD_CXXFLAGS="-pthread"
 

config-site/ice01.asci.llnl.gov.conf

@@ -16,7 +16,8 @@ fi
 ## Use fake exceptions instead of C++ exceptions, turn off warnings for
 ## deprecated features, and enable threads.
 ##
-CXXFLAGS="-DFAKE_EXCEPTIONS -Wno-deprecated $CXXFLAGS"
+FAKE_EXCEPTIONS_BY_DEFAULT="yes"
+CXXFLAGS="-Wno-deprecated $CXXFLAGS"
 CFLAGS="-pthread"
 PTHREAD_CXXFLAGS="-pthread"
 

config-site/pacific.llnl.gov.conf

@@ -20,7 +20,8 @@ CXX=g++
 ##
 ## Use fake exceptions instead of C++ exceptions.
 ##
-CXXFLAGS="-DFAKE_EXCEPTIONS -Wno-deprecated $CXXFLAGS"
+FAKE_EXCEPTIONS_BY_DEFAULT="yes"
+CXXFLAGS="-Wno-deprecated $CXXFLAGS"
 CFLAGS="-pthread"
 PTHREAD_CXXFLAGS="-pthread"
 

config-site/q.conf

@@ -32,7 +32,7 @@ CXX=g++
 ## Use fake exceptions instead of C++ exceptions.
 ##
 CPPFLAGS="-I/usr/local/opt/Compaq_MPI_64_2.5_r1/MPI_64/include"
-CXXFLAGS="-DFAKE_EXCEPTIONS $CXXFLAGS"
+FAKE_EXCEPTIONS_BY_DEFAULT="yes"
 CFLAGS="-pthread"
 PTHREAD_CXXFLAGS="-pthread"
 if test -z "$MPI_LIBS"; then

config-site/sc1.conf

@@ -11,7 +11,7 @@ CXX=g++
 ##
 ## Use fake exceptions instead of C++ exceptions.
 ##
-CXXFLAGS="-DFAKE_EXCEPTIONS $CXXFLAGS"
+FAKE_EXCEPTIONS_BY_DEFAULT="yes"
 CFLAGS="-pthread"
 PTHREAD_CXXFLAGS="-pthread"
 

config-site/sc2.conf

@@ -11,7 +11,7 @@ CXX=g++
 ##
 ## Use fake exceptions instead of C++ exceptions.
 ##
-CXXFLAGS="-DFAKE_EXCEPTIONS $CXXFLAGS"
+FAKE_EXCEPTIONS_BY_DEFAULT="yes"
 CFLAGS="-pthread"
 PTHREAD_CXXFLAGS="-pthread"
 

config-site/sc39.conf

@@ -11,7 +11,7 @@ CXX=g++
 ##
 ## Use fake exceptions instead of C++ exceptions.
 ##
-CXXFLAGS="-DFAKE_EXCEPTIONS $CXXFLAGS"
+FAKE_EXCEPTIONS_BY_DEFAULT="yes"
 CFLAGS="-pthread"
 PTHREAD_CXXFLAGS="-pthread"
 

config-site/sc40.conf

@@ -11,7 +11,7 @@ CXX=g++
 ##
 ## Use fake exceptions instead of C++ exceptions.
 ##
-CXXFLAGS="-DFAKE_EXCEPTIONS $CXXFLAGS"
+FAKE_EXCEPTIONS_BY_DEFAULT="yes"
 CFLAGS="-pthread"
 PTHREAD_CXXFLAGS="-pthread"
 

config-site/white128.asci.llnl.gov.conf

@@ -16,7 +16,8 @@ fi
 ## Use fake exceptions instead of C++ exceptions, turn off warnings for
 ## deprecated features, and enable threads.
 ##
-CXXFLAGS="-DFAKE_EXCEPTIONS -Wno-deprecated $CXXFLAGS"
+FAKE_EXCEPTIONS_BY_DEFAULT="yes"
+CXXFLAGS="-Wno-deprecated $CXXFLAGS"
 CFLAGS="-pthread"
 PTHREAD_CXXFLAGS="-pthread"