Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixing a bug: setParameter backward compatibility issue after recent commit #1078

Merged
merged 1 commit into from Dec 5, 2022
Merged

Fixing a bug: setParameter backward compatibility issue after recent commit #1078

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 6 additions & 5 deletions SRC/domain/component/ElementStateParameter.cpp
View file
Open in desktop
Expand Up @@ -27,12 +27,12 @@
#include <Channel.h>
#include <Message.h>

ElementStateParameter::ElementStateParameter(double value,
ElementStateParameter::ElementStateParameter(int tag, double value,
const char **Argv,
int Argc,
int Flag,
ID *theEle)
:Parameter(0,PARAMETER_TAG_ElementStateParameter),
:Parameter(tag,PARAMETER_TAG_ElementStateParameter),
currentValue(value),
flag(Flag),
argc(Argc), fromFree(1)
Expand Down Expand Up @@ -149,13 +149,14 @@ ElementStateParameter::setDomain(Domain *theDomain)
int
ElementStateParameter::sendSelf(int commitTag, Channel &theChannel)
{
static ID iData(3);
static ID iData(4);
iData(0) = flag;
iData(1) = argc;
if (theEleIDs != 0)
iData(2) = theEleIDs->Size();
else
iData(2) = 0;
iData(3) = getTag();

theChannel.sendID(commitTag, 0, iData);

Expand Down Expand Up @@ -183,12 +184,12 @@ ElementStateParameter::sendSelf(int commitTag, Channel &theChannel)
int
ElementStateParameter::recvSelf(int commitTag, Channel &theChannel, FEM_ObjectBroker &theBroker)
{
static ID iData(3);
static ID iData(4);
theChannel.recvID(commitTag, 0, iData);
flag = iData(0);
argc = iData(1);
int numEle = iData(2);

setTag(iData(3));

static Vector dData(1);
theChannel.recvVector(commitTag, 0, dData);
Expand Down
2 changes: 1 addition & 1 deletion SRC/domain/component/ElementStateParameter.h
View file
Open in desktop
Expand Up @@ -33,7 +33,7 @@ class Domain;
class ElementStateParameter : public Parameter
{
public:
ElementStateParameter(double value,
ElementStateParameter(int tag, double value,
const char **argv,
int argc,
int flag,
Expand Down
17 changes: 14 additions & 3 deletions SRC/interpreter/OpenSeesParameterCommands.cpp
View file
Open in desktop
Expand Up @@ -636,12 +636,23 @@ int OPS_setParameter() {

if (argv.empty()) return 0;

ElementStateParameter theParameter(newValue, &argv[0], (int)argv.size(),
Domain* theDomain = OPS_GetDomain();
if (theDomain == 0) return 0;

int tempParamId = 0;
Parameter* tempParam;
ParameterIter& tempParamIter = theDomain->getParameters();
while ((tempParam = tempParamIter()) != 0) {
if (tempParam->getTag() > tempParamId)
tempParamId = tempParam->getTag();
}
++tempParamId;
ElementStateParameter theParameter(tempParamId, newValue, &argv[0], (int)argv.size(),
flag, &eleIDs);

Domain *theDomain = OPS_GetDomain();
if (theDomain == 0) return 0;

theDomain->addParameter(&theParameter);
theDomain->removeParameter(tempParamId);

return 0;
}
12 changes: 10 additions & 2 deletions SRC/tcl/commands.cpp
View file
Open in desktop
Expand Up @@ -10551,9 +10551,17 @@ setParameter(ClientData clientData, Tcl_Interp *interp, int argc, TCL_Char **arg
argLoc += 3;
}

ElementStateParameter theParameter(newValue, &argv[argLoc], argc-argLoc, flag, &eleIDs);

int tempParamId = 0;
Parameter* tempParam;
ParameterIter& tempParamIter = theDomain.getParameters();
while ((tempParam = tempParamIter()) != 0) {
if (tempParam->getTag() > tempParamId)
tempParamId = tempParam->getTag();
}
++tempParamId;
ElementStateParameter theParameter(tempParamId, newValue, &argv[argLoc], argc-argLoc, flag, &eleIDs);
theDomain.addParameter(&theParameter);
theDomain.removeParameter(tempParamId);
}

return TCL_OK;
Expand Down