Skip to content

Commit

Permalink
Remove duplicate updateBoundParameter calls (#6824)
Browse files Browse the repository at this point in the history
- It will be called in initialization function anyway
  - Fixes memory leak
  - Hopefully this produces less errors
  • Loading branch information
AnHeuermann authored and adrpo committed Oct 21, 2020
1 parent 04ccf92 commit 9b268ea
Showing 1 changed file with 0 additions and 10 deletions.
Expand Up @@ -636,8 +636,6 @@ fmi2Status fmi2ExitInitializationMode(fmi2Component c)

if (comp->_need_update)
{
comp->fmuData->callback->updateBoundParameters(comp->fmuData, comp->threadData);
comp->fmuData->callback->updateBoundVariableAttributes(comp->fmuData, comp->threadData);
if (initialization(comp->fmuData, comp->threadData, "fmi", "", 0.0))
{
comp->state = modelError;
Expand Down Expand Up @@ -778,8 +776,6 @@ fmi2Status fmi2GetReal(fmi2Component c, const fmi2ValueReference vr[], size_t nv
{
if (modelInitializationMode == comp->state)
{
comp->fmuData->callback->updateBoundParameters(comp->fmuData, comp->threadData);
comp->fmuData->callback->updateBoundVariableAttributes(comp->fmuData, comp->threadData);
initialization(comp->fmuData, comp->threadData, "fmi", "", 0.0);
}
else
Expand Down Expand Up @@ -850,8 +846,6 @@ fmi2Status fmi2GetInteger(fmi2Component c, const fmi2ValueReference vr[], size_t
{
if (modelInitializationMode == comp->state)
{
comp->fmuData->callback->updateBoundParameters(comp->fmuData, comp->threadData);
comp->fmuData->callback->updateBoundVariableAttributes(comp->fmuData, comp->threadData);
initialization(comp->fmuData, comp->threadData, "fmi", "", 0.0);
}
else
Expand Down Expand Up @@ -922,8 +916,6 @@ fmi2Status fmi2GetBoolean(fmi2Component c, const fmi2ValueReference vr[], size_t
{
if (modelInitializationMode == comp->state)
{
comp->fmuData->callback->updateBoundParameters(comp->fmuData, comp->threadData);
comp->fmuData->callback->updateBoundVariableAttributes(comp->fmuData, comp->threadData);
initialization(comp->fmuData, comp->threadData, "fmi", "", 0.0);
}
else
Expand Down Expand Up @@ -994,8 +986,6 @@ fmi2Status fmi2GetString(fmi2Component c, const fmi2ValueReference vr[], size_t
{
if (modelInitializationMode == comp->state)
{
comp->fmuData->callback->updateBoundParameters(comp->fmuData, comp->threadData);
comp->fmuData->callback->updateBoundVariableAttributes(comp->fmuData, comp->threadData);
initialization(comp->fmuData, comp->threadData, "fmi", "", 0.0);
}
else
Expand Down

0 comments on commit 9b268ea

Please sign in to comment.