Added: New tag <print_max/> in <postprocessing> scope.

Added: bool return value for Elasticity::initMaxVals().

Author: kmokstad

Elasticity/Elasticity.C

@@ -1008,16 +1008,19 @@ std::string Elasticity::getEFieldName (size_t i) const
 }
 
 
-void Elasticity::initMaxVals (size_t nP)
+bool Elasticity::initMaxVals (size_t nP)
 {
 #ifdef INT_DEBUG
   std::cout <<"Elasticity::initMaxVals: "<< maxVal.size()
             <<" --> "<< nP << std::endl;
 #endif
+  if (!maxVal.empty() && nP == 1)
+    return true; // already allocated
   if (maxVal.empty() && nP > 0)
     maxVal.resize(this->getNoFields(2),PointValues(nP,PointValue(Vec3(),0.0)));
   else for (PointValues& pval : maxVal)
     std::fill(pval.begin(),pval.end(),PointValue(Vec3(),0.0));
+  return false;
 }
 
 

Elasticity/Elasticity.h

@@ -249,7 +249,7 @@ class Elasticity : public ElasticBase
   //! determined. Otherwise, if it equals the number of patches in the model,
   //! the maximum values are computed for each patch separately. If \a nP is 0,
   //! the max-values buffer is initialized to zero without touching its size.
-  void initMaxVals(size_t nP = 0);
+  bool initMaxVals(size_t nP = 0);
 
   //! \brief Returns a pointer to the max values for external update.
   std::vector<PointValues>* getMaxVals() const { return &maxVal; }

Elasticity/NonlinearDriver.C

@@ -246,7 +246,7 @@ int NonlinearDriver::solveProblem (DataExporter* writer, HDF5Restart* restart,
   else if (doProject)
     getMaxVals = true;
   if (getMaxVals && !printMax)
-    const_cast<Elasticity*>(elp)->initMaxVals(1);
+    printMax = const_cast<Elasticity*>(elp)->initMaxVals(1);
 
   int iStep = aStep = 0; // Save initial state to VTF
   if (save0 && opt.format >= 0 && params.multiSteps() && params.time.dt > 0.0)

Elasticity/SIMElasticity.C

@@ -662,12 +662,21 @@ bool SIMElasticity<Dim>::parse (const tinyxml2::XMLElement* elem)
           plotRgd = true;
         else if (!strcasecmp(child->Value(),"strain"))
           Elasticity::wantStrain = true;
+        else if (!strcasecmp(child->Value(),"print_max"))
+          if (ElasticBase* elInt = this->getIntegrand(); elInt)
+          {
+            size_t nP = 1;
+            if (bool pch; utl::getAttribute(child,"patch",pch) && pch)
+              nP = Dim::myModel.size();
+            static_cast<Elasticity*>(elInt)->initMaxVals(nP);
+          }
     }
     else if (!strcasecmp(elem->Value(),"localsystem"))
     {
       if (ElasticBase* elInt = this->getIntegrand(); elInt)
         static_cast<Elasticity*>(elInt)->parseLocalSystem(elem);
     }
+
     return true;
   }
 

Test/Nonlinear/Necking-AxS-Fbar2.reg

@@ -1,4 +1,4 @@
-Necking-AxS-Fbar2.xinp -outPrec 6 -printMax
+Necking-AxS-Fbar2.xinp -outPrec 6
 
 Input file: Necking-AxS-Fbar2.xinp
 Equation solver: 2

Test/Nonlinear/Necking-AxS-Fbar2.xinp

@@ -58,6 +58,7 @@
       <point patch="1" u="0.0" v="1.0"/>
       <point patch="1" u="1.0" v="1.0"/>
     </resultpoints>
+    <print_max/>
   </postprocessing>
 
 </simulation>

Test/Nonlinear/PrintConcrete2D-p2.reg

@@ -1,4 +1,4 @@
-PrintConcrete2D-p2.xinp -printMax -ztol 0.001
+PrintConcrete2D-p2.xinp -ztol 0.001
 
 Input file: PrintConcrete2D-p2.xinp
 Equation solver: 2

Test/Nonlinear/PrintConcrete2D-p2.xinp

@@ -51,6 +51,7 @@
   <postprocessing>
     <vtfformat>BINARY</vtfformat>
     <direct2nd/>
+    <print_max/>
   </postprocessing>
 
 </simulation>