Implement nonlinear joint offsets

.github/workflows/build_cmake.yml

@@ -41,7 +41,7 @@ jobs:
         echo "XARA_SRC_WARN_COUNT=$XARA_SRC_WARN_COUNT" >> $GITHUB_ENV
         echo "warnings=$XARA_SRC_WARN_COUNT" >> $GITHUB_OUTPUT 
         echo "::warning::We found $XARA_SRC_WARN_COUNT warnings"
-        cmake --build . --target XaraRT -j3 2>&1
+        # cmake --build . --target XaraRT -j3 2>&1
 
 
     - name: Post warning count
@@ -89,16 +89,7 @@ jobs:
       working-directory: benchmarks/benchmarks
       run: |
         export OPENSEESRT_LIB=${GITHUB_WORKSPACE}/build/SRC/runtime/libOpenSeesRT.so
-        pytest -x -k test_x
-
-#   - name: Verification
-#     run: |
-#       cd build
-#       make trussExample
-#       make planeFrame
-
-        #ctest
-        #cd ./EXAMPLES/verification/ && ../../build/OpenSeesTcl runVerificationSuite.tcl
+        pytest -x -k 'not test_frame_0011 and not test_solve_0004 and not test_o_sdof and not test_sdof and not test_solve_1001 and not test_solve_0000 and not test_frame_1010 and not test_solve_0001 and not test_solve_0010'
 
   build-mac:
     name: Mac Build

SRC/actor/channel/FileChannel.cpp

@@ -26,7 +26,8 @@
 
 #include "FileChannel.h"
 
-FileChannel::FileChannel( int readWrite ) {
+FileChannel::FileChannel( int readWrite ) 
+{
   strcpy(fileNameBase,"domain");
   commitStep = 0;
   fileType = readWrite;
@@ -111,7 +112,9 @@ int FileChannel::setCommitStep(int commitTag) {
  * Close the file if hasn't already been closed and set the pointer
  * to NULL to be really sure
  */
-void FileChannel::closeFile() {
+void
+FileChannel::closeFile()
+{
   if (theFile != NULL) {
 	fclose(theFile);
 	theFile = NULL;
@@ -123,13 +126,13 @@ FileChannel::~FileChannel(){
 }
 
 char * 
-FileChannel::addToProgram(void) 
+FileChannel::addToProgram() 
 {
   return 0;
 }
 
 int 
-FileChannel::setUpConnection(void)
+FileChannel::setUpConnection()
 {
   return 0;
 }
@@ -338,33 +341,32 @@ int FileChannel::sendID(int dbTag, int commitTag, const ID &theID,ChannelAddress
  * pre! old and new ID have the same data size (uncorrupted)
  * and same endianness
  */
-int FileChannel::recvID(int dbTag, int commitTag, 
+int
+FileChannel::recvID(int dbTag, int commitTag, 
 	       ID &theID,  ChannelAddress *theAddress) 
 {
 
-  int nleft,size,i;
-  size = theID.Size();
+  int nleft;
+  int size = theID.Size();
   int *data = new int[size];
   void * gMsg = (void *)data;;
   nleft =  theID.Size() * sizeof(int);
 
-  if( theFile ) {
+  if ( theFile ) {
+
+    int i =  fread( gMsg, nleft, 1, theFile);
 
-	i =  fread( gMsg, nleft, 1, theFile);
-
-	if ( i == 1 ) {
-	  theID.setData( data, size );
-	  return 0;
-	}
-	opserr << "FileChannel::recvID, error reading from open file\n";
+    if ( i == 1 ) {
+      theID.setData( data, size );
+      return 0;
+    }
+    opserr << "FileChannel::recvID, error reading from open file\n";
   }
   else
-	opserr << "FileChannel::recvID, error reading, NULL file handle\n";
+    opserr << "FileChannel::recvID, error reading, NULL file handle\n";
 
   return -1;
-
-
-}    
+}
 
 
 //OK< here, we can't afford not to be a friend of NDarray; it'd be really complicated to read.
@@ -379,37 +381,36 @@ FileChannel::sendnDarray(int dbTag, int commitTag, const nDarray &theNDarray,Cha
   int elem =   (theNDarray.pc_nDarray_rep)->total_numb;
 
   // send rank  
-  if( fwrite( (void *)&rank, sizeof(int), 1, theFile ) != 1) {
-	opserr << "FileChannel::sendnDarray, error writing rank to file\n";
-	return -1;
+  if ( fwrite( (void *)&rank, sizeof(int), 1, theFile ) != 1) {
+    opserr << "FileChannel::sendnDarray, error writing rank to file\n";
+    return -1;
   } 
 
   //send the length of the data array
   if ( fwrite( (void *)&elem, sizeof(int), 1, theFile ) != 1 ) {
   	opserr << 
 	  "FileChannel::sendnDarray, error writing num elements to file\n";
-	return -1;
+    return -1;
   } 
 
   // send each dimension 
   for ( i = 0; i < rank; i++ ) {
     j = dim[i];
 
-    if (  fwrite( (void *)&j, sizeof(int), 1, theFile ) != 1) {
-	opserr << 
-	  "FileChannel::sendnDarray, error writing array dimension to file\n";
-	return -1;
+    if (fwrite( (void *)&j, sizeof(int), 1, theFile ) != 1) {
+      opserr << 
+        "FileChannel::sendnDarray, error writing array dimension to file\n";
+      return -1;
     }
   }
 
 
    //send the data in the array
-  if( fwrite( (void *)data, sizeof(double), elem, theFile) != elem ){
-  	opserr << 
-	  "FileChannel::sendnDarray, error writing array elements to file\n";
-	return -1;
-	} 
-
+  if ( fwrite( (void *)data, sizeof(double), elem, theFile) != elem ) {
+      opserr << 
+      "FileChannel::sendnDarray, error writing array elements to file\n";
+    return -1;
+	}
   return 0;
 }
 
@@ -430,14 +431,14 @@ FileChannel::recvnDarray(int dbTag, int commitTag, nDarray &theNDarray, ChannelA
 
 
   // receive rank  
-  if( fread( (void *)&rank, sizeof(int), 1, theFile ) != 1) {
-	opserr << "FileChannel::receivenDarray, error reading rank to file\n";
-	return -1;
-  } 
+  if ( fread( (void *)&rank, sizeof(int), 1, theFile ) != 1) {
+    opserr << "FileChannel::receivenDarray, error reading rank to file\n";
+    return -1;
+  }
 
   if ( rank != n_rank ) {
-	opserr << "FileChannel::recvnDarray, mismatch in rank of nDArray\n";
-	return -1;
+    opserr << "FileChannel::recvnDarray, mismatch in rank of nDArray\n";
+    return -1;
   }
 
   //receive the length of the data array
@@ -447,23 +448,23 @@ FileChannel::recvnDarray(int dbTag, int commitTag, nDarray &theNDarray, ChannelA
 	return -1;
   } 
 
-  if( elem != n_elem )	{
-	opserr << "FileChannel::recvnDarray, mismatch in length of nDArray\n";
-	return -1;
+  if ( elem != n_elem )	{
+    opserr << "FileChannel::recvnDarray, mismatch in length of nDArray\n";
+    return -1;
   }
 
   // receive each dimension 
   for ( i = 0; i < rank; i++ ) {
-	if (  fread( (void *)&j, sizeof(int), 1, theFile ) != 1) {
-	opserr << 
-	  "FileChannel::receivenDarray, error reading array dimension from file\n";
-	return -1;
-	}
-	n_dim[i] = j;
+    if (  fread( (void *)&j, sizeof(int), 1, theFile ) != 1) {
+      opserr << 
+        "FileChannel::receivenDarray, error reading array dimension from file\n";
+      return -1;
+    }
+    n_dim[i] = j;
   }
 
   //receive the data in the array
-   if( fread( gmsg, sizeof(double), elem, theFile) != elem ){
+   if ( fread( gmsg, sizeof(double), elem, theFile) != elem ){
     opserr << 
       "FileChannel::receivenDarray, error writing array elements to file\n";
     return -1;

SRC/analysis/integrator/Dynamic/GS4.cpp

@@ -864,20 +864,6 @@ GS4::computeSensitivities()
 
 
 
-int
-GS4::sendSelf(int cTag, Channel &)
-{
-  return -1;
-}
-
-
-int
-GS4::recvSelf(int cTag, Channel &, FEM_ObjectBroker &)
-{
-  return -1;
-}
-
-
 void
 GS4::Print(OPS_Stream &s, int flag)
 {

SRC/analysis/integrator/Dynamic/GS4.h

@@ -74,9 +74,6 @@ class GS4 : public TransientIntegrator
     double getCFactor();
     const Vector &getVel();
 
-    // MovableObject
-    int sendSelf(int commitTag, Channel &) override;
-    int recvSelf(int commitTag, Channel &, FEM_ObjectBroker &) override;
 
     void Print(OPS_Stream &, int flag) final;
 

SRC/analysis/integrator/Dynamic/GimmeMCK.cpp

@@ -32,8 +32,6 @@
 #include <Vector.h>
 #include <DOF_Group.h>
 #include <AnalysisModel.h>
-#include <Channel.h>
-#include <FEM_ObjectBroker.h>
 
 #if 1
 #include <elementAPI.h>
@@ -308,39 +306,6 @@ GimmeMCK::getVel()
   return *Udot;
 }
 
-int GimmeMCK::sendSelf(int cTag, Channel &theChannel)
-{
-    Vector data(4);
-    data(0) = m;
-    data(1) = c;
-    data(2) = k;
-    data(3) = ki;
-
-    if (theChannel.sendVector(this->getDbTag(), cTag, data) < 0)  {
-        opserr << "WARNING GimmeMCK::sendSelf() - could not send data\n";
-        return -1;
-    }
-
-    return 0;
-}
-
-
-int GimmeMCK::recvSelf(int cTag, Channel &theChannel, FEM_ObjectBroker &theBroker)
-{
-    Vector data(4);
-    if (theChannel.recvVector(this->getDbTag(), cTag, data) < 0)  {
-        opserr << "WARNING GimmeMCK::recvSelf() - could not receive data\n";
-        return -1;
-    }
-
-    m = data(0);
-    c = data(1);
-    k = data(2);
-    ki = data(3);
-
-    return 0;
-}
-
 
 void GimmeMCK::Print(OPS_Stream &s, int flag)
 {
@@ -350,8 +315,8 @@ void GimmeMCK::Print(OPS_Stream &s, int flag)
         s << "GimmeMCK - currentTime: " << currentTime << endln;
         s << "  m: " << m << endln;
         s << "  c: " << c << endln;
-	s << "  k: " << k << endln;
-	s << "  ki: " << ki << endln;
+        s << "  k: " << k << endln;
+        s << "  ki: " << ki << endln;
     } else
         s << "GimmeMCK - no associated AnalysisModel\n";
 }

SRC/analysis/integrator/Dynamic/GimmeMCK.h

@@ -57,10 +57,7 @@ class GimmeMCK : public TransientIntegrator
     int update(const Vector &aiPlusOne);
 
     const Vector &getVel();
-
-    virtual int sendSelf(int commitTag, Channel &theChannel);
-    virtual int recvSelf(int commitTag, Channel &theChannel, FEM_ObjectBroker &theBroker);
-
+
     void Print(OPS_Stream &s, int flag);
 
 private:

SRC/analysis/integrator/Dynamic/ParkLMS3.cpp

@@ -37,8 +37,6 @@
 #include <Vector.h>
 #include <DOF_Group.h>
 #include <AnalysisModel.h>
-#include <Channel.h>
-#include <FEM_ObjectBroker.h>
 
 
 ParkLMS3::ParkLMS3()
@@ -302,19 +300,6 @@ ParkLMS3::getVel()
   return *Udot;
 }
 
-int ParkLMS3::sendSelf(int cTag, Channel &theChannel)
-{
-    // nothing to send
-    return 0;
-}
-
-
-int ParkLMS3::recvSelf(int cTag, Channel &theChannel, FEM_ObjectBroker &theBroker)
-{
-    // nothing to receive
-    return 0;
-}
-
 
 void ParkLMS3::Print(OPS_Stream &s, int flag)
 {

SRC/analysis/integrator/Dynamic/ParkLMS3.h

@@ -65,10 +65,7 @@ class ParkLMS3 : public TransientIntegrator
     int update(const Vector &deltaU);
 
     const Vector &getVel(void);
-
-    int sendSelf(int commitTag, Channel &theChannel);
-    int recvSelf(int commitTag, Channel &theChannel, FEM_ObjectBroker &theBroker);
-
+
     void Print(OPS_Stream &s, int flag = 0);        
 
  private: