(39 warnings) Multithreaded fiber section

SRC/analysis/algorithm/equiSolnAlgo/AcceleratedNewton.cpp

@@ -249,13 +249,13 @@ AcceleratedNewton::recvSelf(int cTag, Channel &theChannel,
 void
 AcceleratedNewton::Print(OPS_Stream &s, int flag) const
 {
-  s << "AcceleratedNewton" << endln;
+  s << "QuasiNewton" << "\n";
   LinearSOE *theSOE = this->getLinearSOEptr();
-  s << "\tNumber of equations: " << theSOE->getNumEqn() << endln;
+  s << "\tNumber of equations: " << theSOE->getNumEqn() << "\n";
 
   if (theAccelerator != 0)
     theAccelerator->Print(s,flag);
   else
-    s << "\tNo accelerator --> Modified Newton" << endln;
+    s << "\tNo accelerator --> Modified Newton" << "\n";
 }
 

SRC/analysis/algorithm/equiSolnAlgo/Broyden.cpp

@@ -170,7 +170,7 @@ Broyden::solveCurrentStep()
       temp = new Vector(systemSize) ;
 
     // initial displacement increment
-    if ( s[1] == 0 ) 
+    if ( s[1] == nullptr ) 
       s[1] = new Vector(systemSize) ;
 
     *s[1] = theSOE->getX( ) ;
@@ -231,7 +231,7 @@ Broyden::solveCurrentStep()
 
       *s[nBroyden] = *du ;
 
-      //swap residuals
+      // swap residuals
       *residOld = *residNew ;
 
       //form the residual again
@@ -306,16 +306,16 @@ void  Broyden::BroydenUpdate( IncrementalIntegrator *theIntegrator,
     *temp *= ( (1.0/p) * sdotz ) ;
     *z[nBroyden] += (*temp) ;
 
-
-  } //end for i
+  }
 
 
-  //broyden modifications to du
+  // broyden modifications to du
   for (int i=1; i<=nBroyden; i++ ) {
 
     double p = - ( (*s[i]) ^ (*z[i]) ) ;
 
-    if ( fabs(p) < eps ) break ;
+    if ( std::fabs(p) < eps )
+      break ;
 
     double sdotdu = (*s[i]) ^ du ;
 

SRC/analysis/algorithm/equiSolnAlgo/Broyden.h

@@ -33,8 +33,6 @@
 // Description: This file contains the class definition for
 // Broyden.  Broyden is a class which performs the Broyden
 // solution algorithm in solving the equations.
-// No member functions are declared as virtual as 
-// it is not expected that this class will be subclassed.
 // 
 // What: "@(#)Broyden.h, revA"
 

SRC/analysis/algorithm/equiSolnAlgo/Linear.cpp

@@ -20,8 +20,7 @@
 //                                                                       
 // Description: This file contains the class definition for 
 // Linear. Linear is a class which performs a linear solution algorithm
-// to solve the equations. No member functions are declared as virtual as 
-// it is not expected that this class will be subclassed.
+// to solve the equations.
 // 
 // File: ~/OOP/analysis/algorithm/Linear.C 
 // 
@@ -62,28 +61,28 @@ Linear::solveCurrentStep()
   IncrementalIntegrator  *theIncIntegrator = this->getIncrementalIntegratorPtr(); 
 
   if ((theIncIntegrator ==0 ) || (theSOE == 0)) {
-      return SolutionAlgorithm::BadAlgorithm;
+    return SolutionAlgorithm::BadAlgorithm;
   }
 
   if (factorOnce != 2) {
-      if (theIncIntegrator->formTangent(incrTangent) < 0)
-        return SolutionAlgorithm::BadFormTangent;
+    if (theIncIntegrator->formTangent(incrTangent) < 0)
+      return SolutionAlgorithm::BadFormTangent;
 
-      if (factorOnce == 1)
-          factorOnce = 2;
+    if (factorOnce == 1)
+        factorOnce = 2;
   }
 
 
   if (theIncIntegrator->formUnbalance() < 0)
-      return SolutionAlgorithm::BadFormResidual;
+    return SolutionAlgorithm::BadFormResidual;
 
 
   if (theSOE->solve() < 0)
-      return SolutionAlgorithm::BadLinearSolve;
+    return SolutionAlgorithm::BadLinearSolve;
 
 
   if (theIncIntegrator->update(theSOE->getX()) < 0)
-      return SolutionAlgorithm::BadStepUpdate;
+    return SolutionAlgorithm::BadStepUpdate;
 
   return 0;
 }

SRC/analysis/algorithm/equiSolnAlgo/Linear.h

@@ -32,8 +32,7 @@
 
 // Description: This file contains the class definition for 
 // Linear. Linear is a class which performs a linear solution algorithm
-// to solve the equations. No member functions are declared as virtual as 
-// it is not expected that this class will be subclassed.
+// to solve the equations.
 // 
 // What: "@(#)Linear.h, revA"
 
@@ -44,23 +43,22 @@
 
 class Linear: public EquiSolnAlgo
 {
-  public:
-    Linear(int theTangent = CURRENT_TANGENT, int factorOnce = 0);
-    ~Linear();
+public:
+  Linear(int theTangent = CURRENT_TANGENT, int factorOnce = 0);
+  ~Linear();
 
-    int solveCurrentStep(void);
-
-    virtual int sendSelf(int commitTag, Channel &theChannel);
-    virtual int recvSelf(int commitTag, Channel &theChannel, 
-			 FEM_ObjectBroker &theBroker);
-
-    void Print(OPS_Stream &, int flag) const final;    
-
-  protected:
-
-  private:
-    int incrTangent;
-    int factorOnce;
+  int solveCurrentStep(void);
+
+  virtual int sendSelf(int commitTag, Channel &);
+  virtual int recvSelf(int commitTag, Channel &,  FEM_ObjectBroker &);
+
+  void Print(OPS_Stream &, int flag) const final;    
+
+protected:
+
+private:
+  int incrTangent;
+  int factorOnce;
 };
 
 #endif

SRC/analysis/algorithm/equiSolnAlgo/ModifiedNewton.cpp

@@ -20,9 +20,7 @@
 //
 // Description: This file contains the class definition for 
 // ModifiedNewton. ModifiedNewton is a class which uses the
-// Newton-Raphson solution algorithm
-// to solve the equations. No member functions are declared as virtual as 
-// it is not expected that this class will be subclassed.
+// Newton-Raphson solution algorithm to solve the equations. 
 // 
 // Written: fmk 
 // Created: 11/96 

SRC/analysis/algorithm/equiSolnAlgo/ModifiedNewton.h

@@ -21,8 +21,6 @@
 // Description: This file contains the class definition for 
 // ModifiedNewton. ModifiedNewton is a class which performs a modified 
 // Newton-Raphson solution algorithm in solving the equations.
-// No member functions are declared as virtual as 
-// it is not expected that this class will be subclassed.
 // 
 // Written: fmk 
 // Created: 11/96 
@@ -38,17 +36,17 @@ class ConvergenceTest;
 
 class ModifiedNewton: public EquiSolnAlgo
 {
-  public:
+public:
   ModifiedNewton(int tangent, double iFactor = 0.0, double cFactor = 1.0);
   ~ModifiedNewton();
 
-    int solveCurrentStep();    
-    int getNumIterations() const override;
+  int solveCurrentStep();    
+  int getNumIterations() const override;
 
-    virtual int sendSelf(int commitTag, Channel &theChannel);
-    virtual int recvSelf(int commitTag, Channel &theChannel, FEM_ObjectBroker &theBroker);
+  virtual int sendSelf(int commitTag, Channel &);
+  virtual int recvSelf(int commitTag, Channel &, FEM_ObjectBroker &);
 
-    void Print(OPS_Stream &, int flag) const final;    
+  void Print(OPS_Stream &, int flag) const final;
 
   protected:
 

SRC/analysis/algorithm/equiSolnAlgo/NewtonRaphson.cpp

@@ -20,9 +20,7 @@
 //
 // Description: This file contains the class definition for 
 // NewtonRaphson. NewtonRaphson is a class which uses the
-// Newton-Raphson solution algorithm
-// to solve the equations. No member functions are declared as virtual as 
-// it is not expected that this class will be subclassed.
+// Newton-Raphson solution algorithm to solve the equations.
 // 
 // What: "@(#)NewtonRaphson.C, revA"
 // 

SRC/analysis/algorithm/equiSolnAlgo/NewtonRaphson.h

@@ -36,8 +36,6 @@
 // Description: This file contains the class definition for 
 // NewtonRaphson. NewtonRaphson is a class which performs a Newton-Raphson 
 // solution algorithm in solving the equations.
-// No member functions are declared as virtual as 
-// it is not expected that this class will be subclassed.
 // 
 // What: "@(#)NewtonRaphson.h, revA"
 

SRC/analysis/algorithm/equiSolnAlgo/accelerator/SecantAccelerator1.cpp

@@ -39,8 +39,7 @@ SecantAccelerator1::SecantAccelerator1(int maxIter, int tangent)
 
 }
 
-SecantAccelerator1::SecantAccelerator1(int maxIter, int tangent,
-				       double r1, double r2)
+SecantAccelerator1::SecantAccelerator1(int maxIter, int tangent, double r1, double r2)
   :Accelerator(ACCELERATOR_TAGS_Secant),
    iteration(0), numEqns(0), R1(r1), R2(r2),
    vOld(0), rOld(0), maxIterations(maxIter), theTangent(tangent),

SRC/analysis/algorithm/equiSolnAlgo/accelerator/SecantAccelerator2.cpp

@@ -39,8 +39,7 @@ SecantAccelerator2::SecantAccelerator2(int maxIter, int tangent)
 
 }
 
-SecantAccelerator2::SecantAccelerator2(int maxIter, int tangent,
-				       double r1, double r2)
+SecantAccelerator2::SecantAccelerator2(int maxIter, int tangent, double r1, double r2)
   :Accelerator(ACCELERATOR_TAGS_Secant),
    iteration(0), numEqns(0), R1(r1), R2(r2),
    vOld(0), rOld(0), maxIterations(maxIter), theTangent(tangent),
@@ -112,8 +111,6 @@ SecantAccelerator2::accelerate(Vector &vStar, LinearSOE &theSOE,
     // Check "cut-out" criteria
     if (cutOut && (A > R1 || A < 1.0/R1 || DA > R2 || DA < -0.5*R2)) {
       // do nothing
-      //opserr << "SecantAccelerator2::accelerate() -- cut out, A = " << A
-      // 	   << ", D/A = " << DA << "\n";
     }
     else {
       //vStar.addVector(A, *vOld, D);

SRC/analysis/criteria/CTestEnergyIncr.cpp

@@ -44,8 +44,9 @@ CTestEnergyIncr::CTestEnergyIncr()
 
 
 CTestEnergyIncr::CTestEnergyIncr(double theTol, int maxIter, int printIt, int normType, double max)
-    : ConvergenceTest(CONVERGENCE_TEST_CTestEnergyIncr),
-      tol(theTol), maxTol(max), maxNumIter(maxIter), currentIter(0),printFlag(printIt),
+    : ConvergenceTest(CONVERGENCE_TEST_CTestEnergyIncr)
+    , tol(theTol), maxTol(max), maxNumIter(maxIter)
+    , currentIter(0), printFlag(printIt),
       nType(normType), norms(maxNumIter)
 {
 
@@ -61,11 +62,15 @@ CTestEnergyIncr::~CTestEnergyIncr()
 ConvergenceTest*
 CTestEnergyIncr::getCopy(int iterations)
 {
-  return new CTestEnergyIncr(this->tol, iterations, this->printFlag, this->nType, this->maxTol);
+  return new CTestEnergyIncr(this->tol, iterations, 
+                             ConvergenceTest::Silent, //this->printFlag, 
+                             this->nType, 
+                             this->maxTol);
 }
 
 
-void CTestEnergyIncr::setTolerance(double newTol)
+void
+CTestEnergyIncr::setTolerance(double newTol)
 {
   tol = newTol;
 }
@@ -85,6 +90,12 @@ CTestEnergyIncr::test(LinearSOE& theSOE)
 
     // determine the energy & save value in norms vector
     const Vector &b = theSOE.getB();
+#if 0
+    if (currentIter > 1) {
+        theSOE.setB(b);
+        theSOE.solve();
+    }
+#endif
     const Vector &x = theSOE.getX();
     double product = x ^ b;
     if (product < 0.0)
@@ -100,15 +111,17 @@ CTestEnergyIncr::test(LinearSOE& theSOE)
         pstream << LOG_ITERATE
                << "Iter: "         << pad(currentIter)
                << ", EnergyIncr: " << pad(product) 
+               << ", Residual: "   << pad(b.pNorm(nType))
+               << ", Increment: "  << pad(x.pNorm(nType))
                << "\n";
     }
     if (printFlag & ConvergenceTest::PrintTest02) {
         pstream << LOG_ITERATE
                << "Iter: "          << pad(currentIter)
                << ", EnergyIncr: "  << pad(product)
                << LOG_CONTINUE
-               << "Norm deltaX: "   << pad(x.pNorm(nType))
-               << ", Norm deltaR: " << pad(b.pNorm(nType))
+               << "Norm dX: "   << pad(x.pNorm(nType))
+               << ", Norm dR: " << pad(b.pNorm(nType))
                << LOG_CONTINUE
                << "deltaX: " << x
                << "\tdeltaR: " << b;
@@ -187,32 +200,35 @@ CTestEnergyIncr::start(LinearSOE& theSOE)
 
 
 int
-CTestEnergyIncr::getNumTests(void)
+CTestEnergyIncr::getNumTests()
 {
-    return currentIter;
+  return currentIter;
 }
 
 
-int CTestEnergyIncr::getMaxNumTests(void)
+int
+CTestEnergyIncr::getMaxNumTests()
 {
-    return maxNumIter;
+  return maxNumIter;
 }
 
 
-double CTestEnergyIncr::getRatioNumToMax(void)
+double CTestEnergyIncr::getRatioNumToMax()
 {
-    double div = maxNumIter;
-    return currentIter/div;
+  double div = maxNumIter;
+  return currentIter/div;
 }
 
 
-const Vector& CTestEnergyIncr::getNorms(void)
+const Vector& 
+CTestEnergyIncr::getNorms()
 {
-    return norms;
+  return norms;
 }
 
 
-int CTestEnergyIncr::sendSelf(int cTag, Channel &theChannel)
+int
+CTestEnergyIncr::sendSelf(int cTag, Channel &theChannel)
 {
     int res = 0;
     static Vector x(5);
@@ -229,8 +245,8 @@ int CTestEnergyIncr::sendSelf(int cTag, Channel &theChannel)
 }
 
 
-int CTestEnergyIncr::recvSelf(int cTag, Channel &theChannel,
-    FEM_ObjectBroker &theBroker)
+int
+CTestEnergyIncr::recvSelf(int cTag, Channel &theChannel, FEM_ObjectBroker &theBroker)
 {
     int res = 0;
     static Vector x(5);