peer-open-source · claudioperez · May 29, 2025 · May 15, 2025 · May 15, 2025 · May 15, 2025
diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml
@@ -89,7 +89,7 @@ jobs:
 #        ln -s /usr/local/bin/gfortran-11 /usr/local/bin/gfortran
 
       - name: Install Libraries
-        run: brew install tcl-tk libomp
+        run: brew install tcl-tk libomp gfortran
 
       - name: Build
         run: |
@@ -102,13 +102,11 @@ jobs:
             -DNoOpenSeesPyRT:BOOL=TRUE
           cmake --build . --target OpenSeesRT -j3
 
-#     - name: Verification
-#       run: |
-#         cd ./EXAMPLES/Verification/
 
 
 # Not building on Windows until we can figure out how to use Fortran
 # with Github Actions
+#
 # build-win32:
 #   name: Build on Windows
 #   runs-on: [windows-latest]

diff --git a/SRC/analysis/algorithm/CMakeLists.txt b/SRC/analysis/algorithm/CMakeLists.txt
@@ -14,4 +14,3 @@ target_sources(OPS_Analysis
 
 add_subdirectory(domainDecompAlgo)
 add_subdirectory(equiSolnAlgo)
-add_subdirectory(eigenAlgo)
diff --git a/SRC/analysis/algorithm/equiSolnAlgo/NewtonLineSearch.cpp b/SRC/analysis/algorithm/equiSolnAlgo/NewtonLineSearch.cpp
@@ -40,7 +40,8 @@
 NewtonLineSearch::NewtonLineSearch( )
 :EquiSolnAlgo(EquiALGORITHM_TAGS_NewtonLineSearch),
  theTest(0), theOtherTest(0), theLineSearch(0)
-{   
+{
+
 }
 
 
@@ -80,88 +81,88 @@ NewtonLineSearch::setConvergenceTest(ConvergenceTest *newTest)
 int 
 NewtonLineSearch::solveCurrentStep()
 {
-    // set up some pointers and check they are valid
-    // NOTE this could be taken away if we set Ptrs as protecetd in superclass
-    AnalysisModel   *theAnaModel = this->getAnalysisModelPtr();
-    IncrementalIntegrator *theIntegrator = this->getIncrementalIntegratorPtr();
-    LinearSOE  *theSOE = this->getLinearSOEptr();
-
-    if ((theAnaModel == 0) || (theIntegrator == 0) || (theSOE == 0)
-        || (theTest == 0)){
-        opserr << "WARNING NewtonLineSearch::solveCurrentStep() - setLinks() has";
-        opserr << " not been called - or no ConvergenceTest has been set\n";
-        return -5;
-    }        
-
-    theLineSearch->newStep(*theSOE);
-
-    // set itself as the ConvergenceTest objects EquiSolnAlgo
-    theTest->setEquiSolnAlgo(*this);
-    if (theTest->start() < 0) {
-      opserr << "NewtonLineSearch::solveCurrentStep() -";
-      opserr << "the ConvergenceTest object failed in start()\n";
-      return -3;
-    }
+  // set up some pointers and check they are valid
+  // NOTE this could be taken away if we set Ptrs as protecetd in superclass
+  AnalysisModel   *theAnaModel = this->getAnalysisModelPtr();
+  IncrementalIntegrator *theIntegrator = this->getIncrementalIntegratorPtr();
+  LinearSOE  *theSOE = this->getLinearSOEptr();
+
+  if ((theAnaModel == 0) || (theIntegrator == 0) || (theSOE == 0)
+      || (theTest == 0)){
+      opserr << "WARNING NewtonLineSearch::solveCurrentStep() - setLinks() has";
+      opserr << " not been called - or no ConvergenceTest has been set\n";
+      return -5;
+  }        
+
+  theLineSearch->newStep(*theSOE);
+
+  // set itself as the ConvergenceTest objects EquiSolnAlgo
+  theTest->setEquiSolnAlgo(*this);
+  if (theTest->start() < 0) {
+    opserr << "NewtonLineSearch::solveCurrentStep() -";
+    opserr << "the ConvergenceTest object failed in start()\n";
+    return -3;
+  }
 
-    if (theIntegrator->formUnbalance() < 0) 
-      return SolutionAlgorithm::BadFormResidual;
+  if (theIntegrator->formUnbalance() < 0) 
+    return SolutionAlgorithm::BadFormResidual;
 
-    int result = -1;
-    do {
+  int result = -1;
+  do {
 
-        // residual at this iteration before next solve 
-        const Vector &Resid0 = theSOE->getB() ;
-        
-        // form the tangent
-        if (theIntegrator->formTangent() < 0)
-          return SolutionAlgorithm::BadFormTangent;
-        
+      // residual at this iteration before next solve 
+      const Vector &Resid0 = theSOE->getB() ;
+
+      // form the tangent
+      if (theIntegrator->formTangent() < 0)
+        return SolutionAlgorithm::BadFormTangent;
+
 
-        if (theSOE->solve() < 0)
-          return SolutionAlgorithm::BadLinearSolve;      
+      if (theSOE->solve() < 0)
+        return SolutionAlgorithm::BadLinearSolve;      
 
 
-        // line search direction 
-        const Vector &dx0 = theSOE->getX() ;
+      // line search direction 
+      const Vector &dx0 = theSOE->getX() ;
 
-        // initial value of s
-        double s0 = - (dx0 ^ Resid0) ; 
+      // initial value of s
+      double s0 = - (dx0 ^ Resid0) ; 
 
-        if (theIntegrator->update(theSOE->getX()) < 0)     
-          return SolutionAlgorithm::BadStepUpdate;
+      if (theIntegrator->update(theSOE->getX()) < 0)     
+        return SolutionAlgorithm::BadStepUpdate;
 
 
-        if (theIntegrator->formUnbalance() < 0)
-          return SolutionAlgorithm::BadFormResidual;
+      if (theIntegrator->formUnbalance() < 0)
+        return SolutionAlgorithm::BadFormResidual;
 
-        // do a line search only if convergence criteria not met
-        theOtherTest->start();
-        result = theOtherTest->test();
+      // do a line search only if convergence criteria not met
+      theOtherTest->start();
+      result = theOtherTest->test();
 
-        if (result < 1) {
-          // new residual 
-          const Vector &Resid = theSOE->getB() ;
-          
-          // new value of s 
-          double s = - ( dx0 ^ Resid ) ;
-          
-          if (theLineSearch != 0)
-            theLineSearch->search(s0, s, *theSOE, *theIntegrator);
-        }
+      if (result < 1) {
+        // new residual 
+        const Vector &Resid = theSOE->getB() ;
+
+        // new value of s 
+        double s = - ( dx0 ^ Resid ) ;
+
+        if (theLineSearch != 0)
+          theLineSearch->search(s0, s, *theSOE, *theIntegrator);
+      }
 
-        this->record(0);
-          
-        result = theTest->test();
+      this->record(0);
+
+      result = theTest->test();
 
-    }  while (result == ConvergenceTest::Continue);
+  }  while (result == ConvergenceTest::Continue);
 
-    if (result == ConvergenceTest::Failure)
-      return SolutionAlgorithm::TestFailed;;
+  if (result == ConvergenceTest::Failure)
+    return SolutionAlgorithm::TestFailed;;
 
 
-    // note - if positive result we are returning what the convergence test returned
-    // which should be the number of iterations
-    return result;
+  // note - if positive result we are returning what the convergence test returned
+  // which should be the number of iterations
+  return result;
 }
 
 ConvergenceTest *
@@ -170,6 +171,7 @@ NewtonLineSearch::getConvergenceTest()
   return theTest;
 }
 
+
 int
 NewtonLineSearch::sendSelf(int cTag, Channel &theChannel)
 {

diff --git a/SRC/analysis/analysis/CMakeLists.txt b/SRC/analysis/analysis/CMakeLists.txt
@@ -6,21 +6,17 @@
 #==============================================================================
 target_sources(OPS_Analysis
     PRIVATE
-      Analysis.cpp 
-      EigenAnalysis.cpp
+      Analysis.cpp
       ResponseSpectrumAnalysis.cpp
 
       DomainDecompositionAnalysis.cpp
       StaticDomainDecompositionAnalysis.cpp 
       TransientDomainDecompositionAnalysis.cpp 
     PUBLIC
-      Analysis.h 
-      EigenAnalysis.h
+      Analysis.h
       ResponseSpectrumAnalysis.h
 
       DomainDecompositionAnalysis.h
       StaticDomainDecompositionAnalysis.h 
       TransientDomainDecompositionAnalysis.h 
 )
-
-#add_subdirectory(analysis)
diff --git a/SRC/coordTransformation/CorotCrdTransf2d.cpp b/SRC/coordTransformation/CorotCrdTransf2d.cpp
@@ -58,7 +58,7 @@ Matrix CorotCrdTransf2d::kg(6, 6);
 
 CorotCrdTransf2d::CorotCrdTransf2d(int tag, const Vector &rigJntOffsetI,
                                    const Vector &rigJntOffsetJ)
-    : FrameTransform2d(tag, CRDTR_TAG_CorotCrdTransf2d), nodeIOffset(2),
+    : CrdTransf(tag, CRDTR_TAG_CorotCrdTransf2d), nodeIOffset(2),
       nodeJOffset(2), cosTheta(0), sinTheta(0), cosAlpha(0), sinAlpha(0),
       nodeIPtr(0), nodeJPtr(0), L(0), Ln(0), ub(3), ubcommit(3), ubpr(3),
       nodeIInitialDisp(0), nodeJInitialDisp(0), initialDispChecked(false)
@@ -91,7 +91,7 @@ CorotCrdTransf2d::CorotCrdTransf2d(int tag, const Vector &rigJntOffsetI,
 // constructor:
 // invoked by a FEM_ObjectBroker, recvSelf() needs to be invoked on this object.
 CorotCrdTransf2d::CorotCrdTransf2d()
-    : FrameTransform2d(0, CRDTR_TAG_CorotCrdTransf2d), nodeIOffset(2), nodeJOffset(2),
+    : CrdTransf(0, CRDTR_TAG_CorotCrdTransf2d), nodeIOffset(2), nodeJOffset(2),
       cosTheta(0), sinTheta(0), cosAlpha(0), sinAlpha(0), nodeIPtr(0),
       nodeJPtr(0), L(0), Ln(0), ub(3), ubcommit(3), ubpr(3),
       nodeIInitialDisp(0), nodeJInitialDisp(0), initialDispChecked(false)

diff --git a/SRC/coordTransformation/CorotCrdTransf2d.h b/SRC/coordTransformation/CorotCrdTransf2d.h
@@ -32,7 +32,7 @@
 #include <Vector.h>
 #include <Matrix.h>
 
-class CorotCrdTransf2d: public FrameTransform2d
+class CorotCrdTransf2d: public CrdTransf
 {
 public:
     CorotCrdTransf2d(int tag, const Vector &rigJntOffsetI, const Vector &rigJntOffsetJ);

diff --git a/SRC/coordTransformation/CorotCrdTransfWarping2d.cpp b/SRC/coordTransformation/CorotCrdTransfWarping2d.cpp
@@ -59,7 +59,7 @@ Matrix CorotCrdTransfWarping2d::kg(8, 8);
 CorotCrdTransfWarping2d::CorotCrdTransfWarping2d(int tag,
                                                  const Vector &rigJntOffsetI,
                                                  const Vector &rigJntOffsetJ)
-    : FrameTransform2d(tag, CRDTR_TAG_CorotCrdTransfWarping2d), nodeIOffset(2),
+    : CrdTransf(tag, CRDTR_TAG_CorotCrdTransfWarping2d), nodeIOffset(2),
       nodeJOffset(2), cosTheta(0), sinTheta(0), cosAlpha(0), sinAlpha(0),
       nodeIPtr(0), nodeJPtr(0), L(0), Ln(0), ub(5), ubcommit(5), ubpr(5),
       nodeIInitialDisp(0), nodeJInitialDisp(0), initialDispChecked(false)
@@ -92,7 +92,7 @@ CorotCrdTransfWarping2d::CorotCrdTransfWarping2d(int tag,
 // constructor:
 // invoked by a FEM_ObjectBroker, recvSelf() needs to be invoked on this object.
 CorotCrdTransfWarping2d::CorotCrdTransfWarping2d()
-    : FrameTransform2d(0, CRDTR_TAG_CorotCrdTransfWarping2d), nodeIOffset(2),
+    : CrdTransf(0, CRDTR_TAG_CorotCrdTransfWarping2d), nodeIOffset(2),
       nodeJOffset(2), cosTheta(0), sinTheta(0), cosAlpha(0), sinAlpha(0),
       nodeIPtr(0), nodeJPtr(0), L(0), Ln(0), ub(5), ubcommit(5), ubpr(5),
       nodeIInitialDisp(0), nodeJInitialDisp(0), initialDispChecked(false)

diff --git a/SRC/coordTransformation/CorotCrdTransfWarping2d.h b/SRC/coordTransformation/CorotCrdTransfWarping2d.h
@@ -33,7 +33,7 @@
 #include <Vector.h>
 #include <Matrix.h>
 
-class CorotCrdTransfWarping2d: public FrameTransform2d
+class CorotCrdTransfWarping2d: public CrdTransf
 {
 public:
     CorotCrdTransfWarping2d(int tag, const Vector &rigJntOffsetI, const Vector &rigJntOffsetJ);

diff --git a/SRC/coordTransformation/Frame/BasicFrameTransf.h b/SRC/coordTransformation/Frame/BasicFrameTransf.h
@@ -19,10 +19,12 @@
 #include <Matrix.h>
 
 namespace OpenSees {
+
+template<int ndf=6>
 class BasicFrameTransf3d: public FrameTransform3d
 {
 public:
-    BasicFrameTransf3d(FrameTransform<2,6> *t);
+    BasicFrameTransf3d(FrameTransform<2,ndf> *t);
 
     ~BasicFrameTransf3d();
 
@@ -44,12 +46,6 @@ class BasicFrameTransf3d: public FrameTransform3d
     virtual const Vector &getBasicIncrDeltaDisp() override final;
     virtual const Vector &getBasicTrialVel() override final;
 
-    virtual VectorND<12>    pushResponse(VectorND<12>&pl) override final;
-    virtual VectorND<12>    pushConstant(const VectorND<12>&pl) const override final;
-
-    virtual MatrixND<12,12> pushResponse(MatrixND<12,12>& kl, const VectorND<12>& pl) override final;
-    virtual MatrixND<12,12> pushConstant(const MatrixND<12,12>& kl) override final;
-
     virtual const Vector &getGlobalResistingForce(const Vector &basicForce, const Vector &p0) final;
     virtual const Matrix &getGlobalStiffMatrix(const Matrix &basicStiff, const Vector &basicForce) final;
     virtual const Matrix &getInitialGlobalStiffMatrix(const Matrix &basicStiff) final;
@@ -81,12 +77,13 @@ class BasicFrameTransf3d: public FrameTransform3d
     // TaggedObject
     void Print(OPS_Stream &s, int flag = 0);
 
+
+    FrameTransform<2,ndf> &t;
 protected:
 private:
-    FrameTransform<2,6> &t;
 
     constexpr static int NBV = 6;
-    constexpr static int NDF = 6;
+    constexpr static int NDF = ndf;
     enum : int {
         inx = -12, //  0
         iny = -12, //  1
@@ -110,5 +107,6 @@ class BasicFrameTransf3d: public FrameTransform3d
 
 };
 } // namespace OpenSees
+#include "BasicFrameTransf.tpp"
 #endif
Original file line number	Diff line number	Diff line change
Expand Up		@@ -14,4 +14,3 @@ target_sources(OPS_Analysis

		add_subdirectory(domainDecompAlgo)
		add_subdirectory(equiSolnAlgo)
		add_subdirectory(eigenAlgo)