Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/galvisf/OpenSees
Browse files Browse the repository at this point in the history
  • Loading branch information
galvisf committed Jul 25, 2021
2 parents e32cc34 + d09a79c commit b75acf6
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 7 deletions.
1 change: 1 addition & 0 deletions SRC/element/mixedBeamColumn/MixedBeamColumn2d.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,7 @@ void * OPS_MixedBeamColumn2d() {
return 0;
}

delete [] sections;
return theElement;
}

Expand Down
1 change: 1 addition & 0 deletions SRC/element/mixedBeamColumn/MixedBeamColumn3d.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,7 @@ void * OPS_MixedBeamColumn3d() {
return 0;
}

delete [] sections;
return theElement;
}

Expand Down
4 changes: 4 additions & 0 deletions SRC/interpreter/OpenSeesOutputCommands.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,10 @@ int OPS_nodeEigenvector()

// get eigen vectors
Node* theNode = theDomain->getNode(data[0]);
if (theNode == 0) {
opserr << "nodeEigenvector - node with tag " << data[0] << " not found\n";
return -1;
}
const Matrix &theEigenvectors = theNode->getEigenvectors();

int size = theEigenvectors.noRows();
Expand Down
2 changes: 1 addition & 1 deletion SRC/material/section/FiberSection3d.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1331,7 +1331,7 @@ FiberSection3d::setResponse(const char **argv, int argc, OPS_Stream &output)
}

output.endTag();
return theResponse;
return SectionForceDeformation::setResponse(argv, argc, output);
}


Expand Down
13 changes: 7 additions & 6 deletions SRC/recorder/ElementRecorder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -249,13 +249,14 @@ OPS_ElementRecorder()
nargrem = 1 + OPS_GetNumRemainingInputArgs();
data = new const char *[nargrem];
data[0] = option;
argv = new char*[nargrem];
//argv = new char*[nargrem];
char buffer[128];
for (int i = 1; i < nargrem; i++) {
argv[i] = new char[128];
data[i] = new char[128];

// Turn everything in to a string for setResponse
data[i] = OPS_GetStringFromAll(buffer, 128);
//data[i] = OPS_GetStringFromAll(buffer, 128);
OPS_GetStringFromAll((char*)data[i], 128);
}
}
}
Expand Down Expand Up @@ -287,11 +288,11 @@ OPS_ElementRecorder()
data, nargrem, echoTimeFlag, *domain, *theOutputStream,
dT, &dofs);

if (argv != 0) {
if (data != 0) {
for (int i=1; i<nargrem; ++i) {
delete [] argv[i];
delete [] data[i];
}
delete [] argv;
delete [] data;
}

return recorder;
Expand Down

0 comments on commit b75acf6

Please sign in to comment.