Merge branch 'master' into dsmc

applications/utilities/postProcessing/graphics/PV3FoamReader/PV3FoamReader/vtkPV3FoamReader.cxx

@@ -319,6 +319,7 @@ int vtkPV3FoamReader::RequestData
             << output->GetNumberOfBlocks() << " blocks\n";
     }
 
+
 #ifdef EXPERIMENTAL_TIME_CACHING
     bool needsUpdate = false;
 
@@ -373,6 +374,9 @@ int vtkPV3FoamReader::RequestData
 
 #endif
 
+    // Do any cleanup on the Foam side
+    foamData_->CleanUp();
+
     return 1;
 }
 

applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C

@@ -492,11 +492,15 @@ void Foam::vtkPV3Foam::Update
     convertLagrangianFields(lagrangianOutput);
     reader_->UpdateProgress(0.95);
 
+    meshChanged_ = fieldsChanged_ = false;
+}
+
+
+void Foam::vtkPV3Foam::CleanUp()
+{
     // reclaim some memory
     reduceMemory();
     reader_->UpdateProgress(1.0);
-
-    meshChanged_ = fieldsChanged_ = false;
 }
 
 

applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H

@@ -700,6 +700,9 @@ public:
             vtkMultiBlockDataSet* lagrangianOutput
         );
 
+        //- Clean any storage
+        void CleanUp();
+
         //- Allocate and return a list of selected times
         //  returns the count via the parameter
         double* findTimes(int& nTimeSteps);

applications/utilities/postProcessing/miscellaneous/engineCompRatio/engineCompRatio.C

@@ -92,7 +92,7 @@ int main(int argc, char *argv[])
     Info << "Vmax/Vmin = " << Vmax/Vmin << endl;
     Info << "\n end\n";
 
-    return(0);
+    return 0;
 }
 
 

applications/utilities/postProcessing/miscellaneous/ptot/ptot.C

@@ -145,7 +145,7 @@ int main(int argc, char *argv[])
         Info<< endl;
     }
 
-    return(0);
+    return 0;
 }
 
 

applications/utilities/postProcessing/miscellaneous/wdot/wdot.C

@@ -124,7 +124,7 @@ int main(int argc, char *argv[])
         wdot.write();
     }
 
-    return(0);
+    return 0;
 }
 
 

applications/utilities/postProcessing/scalarField/pPrime2/pPrime2.C

@@ -112,7 +112,7 @@ int main(int argc, char *argv[])
         Info<< endl;
     }
 
-    return(0);
+    return 0;
 }
 
 

applications/utilities/postProcessing/stressField/stressComponents/stressComponents.C

@@ -222,7 +222,7 @@ int main(int argc, char *argv[])
 
     Info<< "End" << endl;
 
-    return(0);
+    return 0;
 }
 
 

applications/utilities/postProcessing/turbulence/R/R.C

@@ -65,7 +65,7 @@ int main(int argc, char *argv[])
 
     Info<< "End" << endl;
 
-    return(0);
+    return 0;
 }
 
 

applications/utilities/postProcessing/turbulence/createTurbulenceFields/createTurbulenceFields.C

@@ -133,7 +133,7 @@ int main(int argc, char *argv[])
 
     Info<< "\nEnd\n" << endl;
 
-    return(0);
+    return 0;
 }