Skip to content

Commit

Permalink
Added return value for OPS_getAllCrdTransfTags
Browse files Browse the repository at this point in the history
Implements the getCrdTransfTags TCL command
  • Loading branch information
jaabell committed Nov 4, 2021
1 parent 3700438 commit c95871b
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 2 deletions.
6 changes: 4 additions & 2 deletions SRC/coordTransformation/CrdTransf.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -95,16 +95,18 @@ void OPS_printCrdTransf(OPS_Stream &s, int flag) {

ID OPS_getAllCrdTransfTags() {

ID tags(0);
ID allCrdTransfTags(0);

MapOfTaggedObjectsIter theObjects = theCrdTransfObjects.getIter();
theObjects.reset();
TaggedObject *theObject;

while ((theObject = theObjects()) != 0) {
CrdTransf *theTransf = (CrdTransf *)theObject;
tags.insert(theTransf->getTag());
allCrdTransfTags.insert(theTransf->getTag());
}

return allCrdTransfTags;
}


Expand Down
21 changes: 21 additions & 0 deletions SRC/tcl/commands.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,9 @@ extern "C" int OPS_ResetInputNoBuilder(ClientData clientData, Tcl_Interp
// recorders
#include <Recorder.h> //SAJalali

// transformations
#include <CrdTransf.h>

extern void *OPS_NewtonRaphsonAlgorithm(void);
extern void *OPS_ExpressNewton(void);
extern void *OPS_ModifiedNewton(void);
Expand Down Expand Up @@ -1008,6 +1011,8 @@ int OpenSeesAppInit(Tcl_Interp *interp) {
(ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
Tcl_CreateCommand(interp, "getNodeTags", &getNodeTags,
(ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
Tcl_CreateCommand(interp, "getCrdTransfTags", &getCrdTransfTags,
(ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
Tcl_CreateCommand(interp, "getParamTags", &getParamTags,
(ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
Tcl_CreateCommand(interp, "getParamValue", &getParamValue,
Expand Down Expand Up @@ -9297,6 +9302,22 @@ getNodeTags(ClientData clientData, Tcl_Interp *interp, int argc, TCL_Char **argv
return TCL_OK;
}

int
getCrdTransfTags(ClientData clientData, Tcl_Interp *interp, int argc, TCL_Char **argv)
{
ID crdTransfTags = OPS_getAllCrdTransfTags(); // Function defined in CrdTransf.h

char buffer[20];

for (int i = 0; i < crdTransfTags.Size(); ++i)
{
sprintf(buffer, "%d ", crdTransfTags(i));
Tcl_AppendResult(interp, buffer, NULL);
}

return TCL_OK;
}

int
getParamTags(ClientData clientData, Tcl_Interp *interp, int argc, TCL_Char **argv)
{
Expand Down
3 changes: 3 additions & 0 deletions SRC/tcl/commands.h
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,9 @@ calculateNodalReactions(ClientData clientData, Tcl_Interp *interp, int argc, TCL
int
getNodeTags(ClientData clientData, Tcl_Interp *interp, int argc, TCL_Char **argv);

int
getCrdTransfTags(ClientData clientData, Tcl_Interp *interp, int argc, TCL_Char **argv);

int
getEleTags(ClientData clientData, Tcl_Interp *interp, int argc, TCL_Char **argv);

Expand Down

0 comments on commit c95871b

Please sign in to comment.