Index: Qt/Components/Resources/UI/pqExodusIIPanel.ui
===================================================================
RCS file: /cvsroot/ParaView3/ParaView3/Qt/Components/Resources/UI/pqExodusIIPanel.ui,v
retrieving revision 1.13
diff -u -r1.13 pqExodusIIPanel.ui
--- Qt/Components/Resources/UI/pqExodusIIPanel.ui	28 Aug 2008 20:40:07 -0000	1.13
+++ Qt/Components/Resources/UI/pqExodusIIPanel.ui	20 Mar 2009 20:42:30 -0000
@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>299</width>
-    <height>568</height>
+    <width>341</width>
+    <height>672</height>
    </rect>
   </property>
   <property name="sizePolicy" >
@@ -404,6 +404,13 @@
            </item>
           </layout>
          </item>
+         <item>
+          <widget class="QCheckBox" name="AnimateModeShapes" >
+           <property name="text" >
+            <string>Animate Vibrations</string>
+           </property>
+          </widget>
+         </item>
         </layout>
        </widget>
       </item>
Index: Servers/ServerManager/Resources/readers.xml
===================================================================
RCS file: /cvsroot/ParaView3/ParaView3/Servers/ServerManager/Resources/readers.xml,v
retrieving revision 1.147
diff -u -r1.147 readers.xml
--- Servers/ServerManager/Resources/readers.xml	19 Mar 2009 14:43:40 -0000	1.147
+++ Servers/ServerManager/Resources/readers.xml	20 Mar 2009 20:42:30 -0000
@@ -3410,6 +3410,22 @@
        </Documentation>
      </IntVectorProperty>
 
+     <IntVectorProperty name="AnimateModeShapes"
+                        command="SetAnimateModeShapes"
+                        number_of_elements="1"
+                        default_values="1"
+                        animatable="0"
+                        label="Animate Vibrations">
+       <BooleanDomain name="bool"/>
+       <Documentation>
+         If this flag is on and HasModeShapes is also on, then this reader
+         will report a continuous time range [0,1] and animate the
+         displacements in a periodic sinusoid.  If this flag is off and
+         HasModeShapes is on, this reader ignores time.  This flag has no
+         effect if HasModeShapes is off.
+       </Documentation>
+     </IntVectorProperty>
+
      <!-- The following two properties magically send time information -->
      <!-- to the animation panel.  Usually you only need one (the former -->
      <!-- for discrete time, the latter for continuous time), but changing -->
@@ -4016,6 +4032,7 @@
          <Property name="XMLFileName" />
          <Property name="HasModeShapes" />
          <Property name="ModeShape" />
+         <Property name="AnimateModeShapes" />
          <Property name="Refresh" />
          <Property name="SILUpdateStamp" />
          <Property name="EdgeBlockArrayInfo" />
Index: VTK/Hybrid/vtkExodusIIReader.cxx
===================================================================
RCS file: /cvsroot/ParaView3/ParaView3/VTK/Hybrid/vtkExodusIIReader.cxx,v
retrieving revision 1.75
diff -u -r1.75 vtkExodusIIReader.cxx
--- VTK/Hybrid/vtkExodusIIReader.cxx	26 Feb 2009 16:45:00 -0000	1.75
+++ VTK/Hybrid/vtkExodusIIReader.cxx	20 Mar 2009 20:42:30 -0000
@@ -392,6 +392,7 @@
   this->TimeStep = 0;
   this->HasModeShapes = 0;
   this->ModeShapeTime = -1.;
+  this->AnimateModeShapes = 1;
 
   this->GenerateObjectIdArray = 1;
   this->GenerateGlobalElementIdArray = 0;
@@ -2493,7 +2494,7 @@
     if ( displ )
       {
       double* coords = darr->GetPointer( 0 );
-      if ( this->HasModeShapes )
+      if ( this->HasModeShapes && this->AnimateModeShapes )
         {
         for ( vtkIdType idx = 0; idx < displ->GetNumberOfTuples(); ++idx )
           {
@@ -3400,6 +3401,7 @@
   os << indent << "TimeStep: " << this->TimeStep << "\n";
   os << indent << "HasModeShapes: " << this->HasModeShapes << "\n";
   os << indent << "ModeShapeTime: " << this->ModeShapeTime << "\n";
+  os << indent << "AnimateModeShapes: " << this->AnimateModeShapes << "\n";
 
   // Print nodal variables
   if ( this->ArrayInfo[ vtkExodusIIReader::NODAL ].size() > 0 )
@@ -4820,6 +4822,7 @@
 
   this->HasModeShapes = 0;
   this->ModeShapeTime = -1.;
+  this->AnimateModeShapes = 1;
 
   this->SqueezePoints = 1;
 
@@ -5604,7 +5607,7 @@
       //cout << "Requested value: " << requestedTimeSteps[0] << " Step: " << this->TimeStep << endl;
       output->GetInformation()->Set( vtkDataObject::DATA_TIME_STEPS(), steps + this->TimeStep, 1 );
       }
-    else
+    else if (this->GetAnimateModeShapes())
       {
       // Let the metadata know the time value so that the Metadata->RequestData call below will generate
       // the animated mode shape properly.
@@ -5736,6 +5739,16 @@
   return this->Metadata->GetModeShapeTime();
 }
 
+void vtkExodusIIReader::SetAnimateModeShapes(int flag)
+{
+  this->Metadata->SetAnimateModeShapes(flag);
+}
+
+int vtkExodusIIReader::GetAnimateModeShapes()
+{
+  return this->Metadata->GetAnimateModeShapes();
+}
+
 void vtkExodusIIReader::SetEdgeFieldDecorations( int d )
 {
   this->Metadata->SetEdgeFieldDecorations( d );
@@ -6539,12 +6552,17 @@
       this->TimeStepRange[0] = 0; this->TimeStepRange[1] = nTimes - 1;
       }
     }
-  else
+  else if (this->GetAnimateModeShapes())
     {
     outInfo->Remove( vtkStreamingDemandDrivenPipeline::TIME_STEPS() );
     static double timeRange[] = { 0, 1 };
     outInfo->Set( vtkStreamingDemandDrivenPipeline::TIME_RANGE(), timeRange, 2 );
     }
+  else
+    {
+    outInfo->Remove(vtkStreamingDemandDrivenPipeline::TIME_STEPS());
+    outInfo->Remove(vtkStreamingDemandDrivenPipeline::TIME_RANGE());
+    }
 
   // Advertise to downstream filters that this reader supports a fast-path
   // for reading data over time.
Index: VTK/Hybrid/vtkExodusIIReader.h
===================================================================
RCS file: /cvsroot/ParaView3/ParaView3/VTK/Hybrid/vtkExodusIIReader.h,v
retrieving revision 1.26
diff -u -r1.26 vtkExodusIIReader.h
--- VTK/Hybrid/vtkExodusIIReader.h	26 Feb 2009 16:45:00 -0000	1.26
+++ VTK/Hybrid/vtkExodusIIReader.h	20 Mar 2009 20:42:30 -0000
@@ -251,6 +251,16 @@
   double GetModeShapeTime();
 
   // Description:
+  // If this flag is on (the default) and HasModeShapes is also on, then this
+  // reader will report a continuous time range [0,1] and animate the
+  // displacements in a periodic sinusoid.  If this flag is off and
+  // HasModeShapes is on, this reader ignores time.  This flag has no effect if
+  // HasModeShapes is off.
+  virtual void SetAnimateModeShapes(int flag);
+  int GetAnimateModeShapes();
+  vtkBooleanMacro(AnimateModeShapes, int);
+
+  // Description:
   // FIXME
   virtual void SetEdgeFieldDecorations( int d );
   int GetEdgeFieldDecorations();
Index: VTK/Hybrid/vtkExodusIIReaderPrivate.h
===================================================================
RCS file: /cvsroot/ParaView3/ParaView3/VTK/Hybrid/vtkExodusIIReaderPrivate.h,v
retrieving revision 1.5
diff -u -r1.5 vtkExodusIIReaderPrivate.h
--- VTK/Hybrid/vtkExodusIIReaderPrivate.h	6 Aug 2008 14:52:24 -0000	1.5
+++ VTK/Hybrid/vtkExodusIIReaderPrivate.h	20 Mar 2009 20:42:30 -0000
@@ -258,6 +258,9 @@
   vtkSetMacro(ModeShapeTime,double);
   vtkGetMacro(ModeShapeTime,double);
 
+  vtkSetMacro(AnimateModeShapes, int);
+  vtkGetMacro(AnimateModeShapes, int);
+
   vtkDataArray* FindDisplacementVectors( int timeStep );
 
   vtkSetMacro(EdgeFieldDecorations,int);
@@ -787,6 +790,7 @@
   int ApplyDisplacements;
   float DisplacementMagnitude;
   int HasModeShapes;
+  int AnimateModeShapes;
 
   // Specify how to decorate edge and face variables.
   int EdgeFieldDecorations;
Index: VTK/Hybrid/vtkPExodusIIReader.cxx
===================================================================
RCS file: /cvsroot/ParaView3/ParaView3/VTK/Hybrid/vtkPExodusIIReader.cxx,v
retrieving revision 1.25
diff -u -r1.25 vtkPExodusIIReader.cxx
--- VTK/Hybrid/vtkPExodusIIReader.cxx	27 Aug 2008 13:48:02 -0000	1.25
+++ VTK/Hybrid/vtkPExodusIIReader.cxx	20 Mar 2009 20:42:30 -0000
@@ -578,6 +578,7 @@
     this->ReaderList[reader_idx]->SetApplyDisplacements( this->GetApplyDisplacements() );
     this->ReaderList[reader_idx]->SetDisplacementMagnitude( this->GetDisplacementMagnitude() );
     this->ReaderList[reader_idx]->SetHasModeShapes( this->GetHasModeShapes() );
+    this->ReaderList[reader_idx]->SetAnimateModeShapes( this->GetAnimateModeShapes() );
     this->ReaderList[reader_idx]->SetEdgeFieldDecorations( this->GetEdgeFieldDecorations() );
     this->ReaderList[reader_idx]->SetFaceFieldDecorations( this->GetFaceFieldDecorations() );