Skip to content

Commit

Permalink
Merge branch 'OpenSees:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
jaabell authored May 30, 2022
2 parents 183033d + 0ab5742 commit b45fc18
Show file tree
Hide file tree
Showing 382 changed files with 1,633 additions and 963 deletions.
2 changes: 1 addition & 1 deletion SRC/actor/actor/Actor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ Actor::~Actor()


// void AddMethod(int tag, int (*fp)()):
// Method to add a function to the list of avaiable actor methods.
// Method to add a function to the list of available actor methods.
// The function will be identified as tag, it is a function with
// no args that returns an int.

Expand Down
6 changes: 3 additions & 3 deletions SRC/actor/channel/FileChannel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ int FileChannel::sendMatrix(int dbTag, int commitTag,
const Matrix &theMatrix,
ChannelAddress *theAddress)
{
// if o.k. get a ponter to the data in the Matrix and
// if o.k. get a pointer to the data in the Matrix and
// place the incoming data there
int nleft, rows, cols, i,j;
rows = theMatrix.noRows();
Expand All @@ -240,7 +240,7 @@ int FileChannel::recvMatrix(int dbTag, int commitTag,
Matrix &theMatrix,
ChannelAddress *theAddress)
{
// if o.k. get a ponter to the data in the Matrix and
// if o.k. get a pointer to the data in the Matrix and
// place the incoming data there
int nleft, rows, cols;
rows = theMatrix.noRows();
Expand All @@ -265,7 +265,7 @@ int FileChannel::recvMatrix(int dbTag, int commitTag,
int FileChannel::sendVector(int dbTag, int commitTag,
const Vector &theVector, ChannelAddress *theAddress )
{
// if o.k. get a ponter to the data in the Vector and
// if o.k. get a pointer to the data in the Vector and
// place the incoming data there
int nleft, size, i;
size = theVector.Size();
Expand Down
10 changes: 5 additions & 5 deletions SRC/actor/channel/HTTP.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ httpGet(char const *URL, char const *page, unsigned int port, char **dataPtr) {
nleft = strlen(outBuf);

//send the data
// if o.k. get a ponter to the data in the message and
// if o.k. get a pointer to the data in the message and
// place the incoming data there
nwrite = 0;
gMsg = outBuf;
Expand Down Expand Up @@ -304,7 +304,7 @@ httpGET_File(char const *URL, char const *page, unsigned int port, const char *f
nleft = strlen(outBuf);

//send the data
// if o.k. get a ponter to the data in the message and
// if o.k. get a pointer to the data in the message and
// place the incoming data there
nwrite = 0;
gMsg = outBuf;
Expand Down Expand Up @@ -424,7 +424,7 @@ httpGET_File(char const *URL, char const *page, unsigned int port, const char *f
nleft = strlen(outBuf);
//send the data
// if o.k. get a ponter to the data in the message and
// if o.k. get a pointer to the data in the message and
// place the incoming data there
nwrite = 0;
gMsg = outBuf;
Expand Down Expand Up @@ -711,7 +711,7 @@ httpsSEND(const char *URL,
nleft = strlen(outBuf);

//send the data
// if o.k. get a ponter to the data in the message and
// if o.k. get a pointer to the data in the message and
// place the incoming data there
nwrite = 0;
gMsg = outBuf;
Expand Down Expand Up @@ -1009,7 +1009,7 @@ httpsSEND_File(const char *URL,
nleft = strlen(outBuf);

//send the heading
// if o.k. get a ponter to the data in the message and
// if o.k. get a pointer to the data in the message and
// place the incoming data there
nwrite = 0;
gMsg = outBuf;
Expand Down
18 changes: 9 additions & 9 deletions SRC/actor/channel/MPI_Channel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ MPI_Channel::recvMsg(int dbTag, int commitTag, Message &msg, ChannelAddress *the
}
}

// if o.k. get a ponter to the data in the message and
// if o.k. get a pointer to the data in the message and
// place the incoming data there
int nleft,nread;
char *gMsg;
Expand Down Expand Up @@ -212,7 +212,7 @@ MPI_Channel::sendMsg(int dbTag, int commitTag, const Message &msg, ChannelAddres
}
}

// if o.k. get a ponter to the data in the message and
// if o.k. get a pointer to the data in the message and
// place the incoming data there
int nwrite, nleft;
char *gMsg;
Expand Down Expand Up @@ -242,7 +242,7 @@ MPI_Channel::recvMatrix(int dbTag, int commitTag, Matrix &theMatrix, ChannelAddr
}
}

// if o.k. get a ponter to the data in the Matrix and
// if o.k. get a pointer to the data in the Matrix and
// place the incoming data there
int nleft,nread;
double *data = theMatrix.data;
Expand Down Expand Up @@ -285,7 +285,7 @@ MPI_Channel::sendMatrix(int dbTag, int commitTag, const Matrix &theMatrix, Chann
}
}

// if o.k. get a ponter to the data in the Matrix and
// if o.k. get a pointer to the data in the Matrix and
// place the incoming data there
int nwrite, nleft;
double *data = theMatrix.data;
Expand Down Expand Up @@ -325,7 +325,7 @@ MPI_Channel::recvVector(int dbTag, int commitTag, Vector &theVector, ChannelAddr

// opserr << "MPI:recvVector " << otherTag << " " << theVector.Size() << endln;

// if o.k. get a ponter to the data in the Vector and
// if o.k. get a pointer to the data in the Vector and
// place the incoming data there
int nleft,nread;
double *data = theVector.theData;
Expand Down Expand Up @@ -369,7 +369,7 @@ MPI_Channel::sendVector(int dbTag, int commitTag, const Vector &theVector, Chann
}
}

// if o.k. get a ponter to the data in the Vector and
// if o.k. get a pointer to the data in the Vector and
// place the incoming data there
int nwrite, nleft;
double *data = theVector.theData;
Expand Down Expand Up @@ -404,7 +404,7 @@ MPI_Channel::recvID(int dbTag, int commitTag, ID &theID, ChannelAddress *theAddr
}
}

// if o.k. get a ponter to the data in the ID and
// if o.k. get a pointer to the data in the ID and
// place the incoming data there
int nleft,nread;
int *data = theID.data;
Expand All @@ -424,7 +424,7 @@ MPI_Channel::recvID(int dbTag, int commitTag, ID &theID, ChannelAddress *theAddr

if (count != nleft) {
opserr << "MPI_Channel::recvID() -";
opserr << " incorrect number of entries for ID received: " << count << " exptected: " << theID.sz << endln;
opserr << " incorrect number of entries for ID received: " << count << " expected: " << theID.sz << endln;
return -1;
}
else
Expand Down Expand Up @@ -453,7 +453,7 @@ MPI_Channel::sendID(int dbTag, int commitTag, const ID &theID, ChannelAddress *t
}
}

// if o.k. get a ponter to the data in the ID and
// if o.k. get a pointer to the data in the ID and
// place the incoming data there
int nwrite, nleft;
int *data = theID.data;
Expand Down
2 changes: 1 addition & 1 deletion SRC/actor/channel/socket.c
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ httpGet(const char *URL, const char *page, unsigned int port, char **dataPtr) {


//send the data
// if o.k. get a ponter to the data in the message and
// if o.k. get a pointer to the data in the message and
// place the incoming data there
nwrite = 0;
gMsg = outBuf;
Expand Down
4 changes: 2 additions & 2 deletions SRC/actor/machineBroker/MachineBroker.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -119,15 +119,15 @@ MachineBroker::runActors(void)

} else {

// create an actor of approriate type
// create an actor of appropriate type
Actor *theActor = theObjectBroker->getNewActor(actorType, theChannel);
if (theActor == 0) {
opserr << "MachineBroker::run(void) - invalid actor type\n";
idData(0) = 1;
} else
idData(0) = 0;

// send ID back indicating wheter actor was created
// send ID back indicating whether actor was created
if (theChannel->sendID(0, 0, idData) < 0) {
opserr << "MachineBroker::run(void) - failed to send ID\n";
}
Expand Down
2 changes: 1 addition & 1 deletion SRC/actor/machineBroker/MillMachineBroker.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
//
// Purpose: This file contains the class definition for MillMachineBroker.
// MillMachineBroker is a machine broker for use with the cluster of
// millenium machines in Soda Hall.
// millennium machines in Soda Hall.
//
// What: "@(#) MillMachineBroker.h, revA"

Expand Down
2 changes: 1 addition & 1 deletion SRC/actor/objectBroker/FEM_ObjectBroker.h
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ class FEM_ObjectBroker
virtual Vector *getPtrNewVector(int classTag, int size);
virtual ID *getPtrNewID(int classTag, int size);

// methods for ouput objects
// methods for output objects
// virtual DataOutputHandler *getPtrNewDataOutputHandler(int classTag);
virtual OPS_Stream *getPtrNewStream(int classTag);
virtual Recorder *getPtrNewRecorder(int classTag);
Expand Down
2 changes: 1 addition & 1 deletion SRC/actor/objectBroker/FEM_ObjectBrokerAllClasses.h
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ class FEM_ObjectBrokerAllClasses : public FEM_ObjectBroker
Vector *getPtrNewVector(int classTag, int size);
ID *getPtrNewID(int classTag, int size);

// methods for ouput objects
// methods for output objects
// DataOutputHandler *getPtrNewDataOutputHandler(int classTag);
OPS_Stream *getPtrNewStream(int classTag);
Recorder *getPtrNewRecorder(int classTag);
Expand Down
2 changes: 1 addition & 1 deletion SRC/analysis/algorithm/equiSolnAlgo/NewtonRaphson.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ NewtonRaphson::solveCurrentStep(void)
opserr << "the ConvergenceTest object failed in test()\n";
return -3;
}
// note - if postive result we are returning what the convergence test returned
// note - if positive result we are returning what the convergence test returned
// which should be the number of iterations

return result;
Expand Down
2 changes: 1 addition & 1 deletion SRC/analysis/dof_grp/DOF_Group.tex
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@
yet been created, one of size (numDOF,numDOF) is now created; if
construction of this matrix fails an error is printed and an error
Matrix is returned. Invokes {\em addMatrix(theNode-$>$getMass,fact)}
on the Matrix, printing a warining message if this method returns a
on the Matrix, printing a warning message if this method returns a
$negative$ value. If no Node is associated with the DOF\_Group an
error message is printed and nothing is done. \\

Expand Down
2 changes: 1 addition & 1 deletion SRC/analysis/fe_ele/transformation/TransformationFE.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ TransformationFE::TransformationFE(int tag, Element *ele)
int numNodes = nodes.Size();
theDOFs = new DOF_Group *[numNodes];
if (theDOFs == 0) {
opserr << "FATAL TransformationFE::TransformationFE() - out of memory craeting ";
opserr << "FATAL TransformationFE::TransformationFE() - out of memory creating ";
opserr << "array of size : " << numNodes << " for storage of DOF_Group\n";
exit(-1);
}
Expand Down
10 changes: 5 additions & 5 deletions SRC/analysis/integrator/ArcLength.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
// Revision: A
//
// Description: This file contains the class definition for ArcLength.
// ArcLength is an algorithmic class for perfroming a static analysis
// using the arc length scheme, that is within a load step the follwing
// ArcLength is an algorithmic class for performing a static analysis
// using the arc length scheme, that is within a load step the following
// constraint is enforced: dU^TdU + alpha^2*dLambda^2 = arcLength^2
// where dU is change in nodal displacements for step, dLambda is
// change in applied load and arcLength is a control parameter.
Expand Down Expand Up @@ -71,7 +71,7 @@ void* OPS_ArcLength()

int numdata = 1;
if (OPS_GetDoubleInput(&numdata, &arcLength) < 0) {
opserr << "WARNING integrator ArcLength failed to read arc lenght\n";
opserr << "WARNING integrator ArcLength failed to read arc length\n";
return 0;
}
if (OPS_GetDoubleInput(&numdata, &alpha) < 0) {
Expand Down Expand Up @@ -1013,7 +1013,7 @@ ArcLength::computeSensitivities(void)
// Zero out the old right-hand side of the SOE
theSOE->zeroB();

// Form the part of the RHS which are indepent of parameter
// Form the part of the RHS which are independent of parameter
this->formIndependentSensitivityRHS();

AnalysisModel *theModel = this->getAnalysisModel();
Expand Down Expand Up @@ -1090,7 +1090,7 @@ ArcLength::computeSensitivities(void)
// theSOE->zeroB();//reset the SOE to zero ;Abbas

}
// end of if statment to be run only one time during the iteration process.
// end of if statement to be run only one time during the iteration process.
//opserr<<"computeSensitivities : end"<<endln;
return 0;
}
Expand Down
4 changes: 2 additions & 2 deletions SRC/analysis/integrator/ArcLength.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
// Revision: A
//
// Description: This file contains the class definition for ArcLength.
// ArcLength is an algorithmic class for perfroming a static analysis
// using the arc length scheme, that is within a load step the follwing
// ArcLength is an algorithmic class for performing a static analysis
// using the arc length scheme, that is within a load step the following
// constraint is enforced:
// i=1 delta U^T delta U + alpha^2 delta lambda^2 = delta s^2
// i>1 dU^T delta U + alpha^2 dLambda delta lambda = 0
Expand Down
2 changes: 1 addition & 1 deletion SRC/analysis/integrator/DisplacementControl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1019,7 +1019,7 @@ DisplacementControl::computeSensitivities(void)
// Zero out the old right-hand side of the SOE
theSOE->zeroB();

// Form the part of the RHS which are indepent of parameter
// Form the part of the RHS which are independent of parameter
this->formIndependentSensitivityRHS();

AnalysisModel *theModel = this->getAnalysisModel();
Expand Down
2 changes: 1 addition & 1 deletion SRC/analysis/integrator/HarmonicSteadyState.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,7 @@ HarmonicSteadyState::computeSensitivities(void)
return -1;
}

// Form the part of the RHS which are indepent of parameter
// Form the part of the RHS which are independent of parameter
this->formIndependentSensitivityRHS();
AnalysisModel *theModel = this->getAnalysisModel();
Domain *theDomain=theModel->getDomainPtr();
Expand Down
2 changes: 1 addition & 1 deletion SRC/analysis/integrator/IncrementalIntegrator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -618,7 +618,7 @@ IncrementalIntegrator::addModalDampingMatrix(const Vector *modalDampingValues) {

const Vector &
IncrementalIntegrator::getVel(void) {
opserr << "IncrementalIntegrator::getVel() - not implemeneted for this integrator\n";
opserr << "IncrementalIntegrator::getVel() - not implemented for this integrator\n";
return theSOE->getX();
}

Expand Down
2 changes: 1 addition & 1 deletion SRC/analysis/integrator/LoadControl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@ LoadControl::computeSensitivities(void)
// Zero out the old right-hand side of the SOE
theSOE->zeroB();

// Form the part of the RHS which are indepent of parameter
// Form the part of the RHS which are independent of parameter
this->formIndependentSensitivityRHS();
AnalysisModel *theModel = this->getAnalysisModel();
Domain *theDomain=theModel->getDomainPtr();
Expand Down
2 changes: 1 addition & 1 deletion SRC/analysis/integrator/MinUnbalDispNorm.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -934,7 +934,7 @@ MinUnbalDispNorm::computeSensitivities(void)
// Zero out the old right-hand side of the SOE
theSOE->zeroB();

// Form the part of the RHS which are indepent of parameter
// Form the part of the RHS which are independent of parameter
this->formIndependentSensitivityRHS();

AnalysisModel *theModel = this->getAnalysisModel();
Expand Down
4 changes: 2 additions & 2 deletions SRC/analysis/integrator/MinUnbalDispNorm.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
// Revision: A
//
// Description: This file contains the class definition for MinUnbalDispNorm.
// MinUnbalDispNorm is an algorithmic class for perfroming a static analysis
// MinUnbalDispNorm is an algorithmic class for performing a static analysis
// using the minimum unbalanced displacement norm (Chan IJNME 26(2657:2669)1988
//
// What: "@(#) MinUnbalDispNorm.h, revA"
Expand Down Expand Up @@ -112,7 +112,7 @@ class MinUnbalDispNorm : public StaticIntegrator
// Pointers used for sensitivity analysis
Vector *dUhatdh,*dUIJdh, *Residual,*Residual2, *sensU,*d_deltaU_dh, *dphatdh, *dLAMBDAdh ;
// the created pointers shown above are
// *dUhatdh : The derivative of the tangent displacement w/r to prameter h
// *dUhatdh : The derivative of the tangent displacement w/r to parameter h
// *sensU : Displacement sensitivity using displacement control scheme
// *d_deltaU_dh : The derivative of the residual displacement
// *dUIJdh : The sensitivity of the residual displacement
Expand Down
2 changes: 1 addition & 1 deletion SRC/analysis/integrator/Newmark.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -987,7 +987,7 @@ Newmark::computeSensitivities(void)
// Zero out the old right-hand side of the SOE
theSOE->zeroB();

// Form the part of the RHS which are indepent of parameter
// Form the part of the RHS which are independent of parameter
this->formIndependentSensitivityRHS();
AnalysisModel *theModel = this->getAnalysisModel(); //Abbas
Domain *theDomain=theModel->getDomainPtr();//Abbas
Expand Down
4 changes: 2 additions & 2 deletions SRC/analysis/numberer/ParallelNumberer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ ParallelNumberer::setChannels(int nChannels, Channel **theC)


// int numberDOF(void)
// The ParalellNumberer sitting on P0, collects each partition graph from P1 through Pn-1,
// The ParallelNumberer sitting on P0, collects each partition graph from P1 through Pn-1,
// merges them into 1 large graph, & then numbers this graph. The ParallelNumberers sitting
// on P1 through Pn-1 then receive the mapping info for the dof tag and dof numbering from P0.

Expand Down Expand Up @@ -446,7 +446,7 @@ ParallelNumberer::sendSelf(int cTag, Channel &theChannel)
int nextNumChannels = numChannels + 1;
Channel **nextChannels = new Channel *[nextNumChannels];
if (nextNumChannels == 0) {
opserr << "ParalellNumberer::sendSelf() - failed to allocate channel array of size: " <<
opserr << "ParallelNumberer::sendSelf() - failed to allocate channel array of size: " <<
nextNumChannels << endln;
return -1;
}
Expand Down
2 changes: 1 addition & 1 deletion SRC/analysis/numberer/ParallelNumberer.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
// Description: This file contains the class definition for ParallelNumberer.
// ParallelNumberer is a subclass of DOF_Numberer. The ParallelNumberer numbers
// the dof of a partitioned domain, where the partitions are on different processors
// and each processor has a ParallelNumberer. The ParalellNumberer sitting on P0,
// and each processor has a ParallelNumberer. The ParallelNumberer sitting on P0,
// collects each partition graph from P1 through Pn-1, merges them into 1 large graph,
// & then numbers this graph. The ParallelNumberers sitting on P1 through Pn-1 then
// receive the mapping info for the dof tag and dof numbering from P0.
Expand Down
Loading

0 comments on commit b45fc18

Please sign in to comment.