Skip to content
This repository has been archived by the owner on May 18, 2019. It is now read-only.

Commit

Permalink
Fix some error messages
Browse files Browse the repository at this point in the history
  • Loading branch information
lochel authored and OpenModelica-Hudson committed Sep 27, 2017
1 parent 08c6143 commit c7cddda
Showing 1 changed file with 11 additions and 8 deletions.
19 changes: 11 additions & 8 deletions SimulationRuntime/fmi/export/fmi2/fmu2_model_interface.c
Original file line number Diff line number Diff line change
Expand Up @@ -697,7 +697,8 @@ fmi2Status fmi2SetReal(fmi2Component c, const fmi2ValueReference vr[], size_t nv
return fmi2Error;
FILTERED_LOG(comp, fmi2OK, LOG_FMI2_CALL, "fmi2SetReal: nvr = %d", nvr)
// no check whether setting the value is allowed in the current state
for (i = 0; i < nvr; i++) {
for (i = 0; i < nvr; i++)
{
if (vrOutOfRange(comp, "fmi2SetReal", vr[i], NUMBER_OF_REALS+NUMBER_OF_STATES))
return fmi2Error;
FILTERED_LOG(comp, fmi2OK, LOG_FMI2_CALL, "fmi2SetReal: #r%d# = %.16g", vr[i], value[i])
Expand All @@ -715,15 +716,16 @@ fmi2Status fmi2SetInteger(fmi2Component c, const fmi2ValueReference vr[], size_t
int meStates = modelInstantiated|modelInitializationMode|modelEventMode;
int csStates = modelInstantiated|modelInitializationMode|modelEventMode|modelContinuousTimeMode;

if (invalidState(comp, "fmi2SetReal", meStates, csStates))
if (invalidState(comp, "fmi2SetInteger", meStates, csStates))
return fmi2Error;
if (nvr > 0 && nullPointer(comp, "fmi2SetInteger", "vr[]", vr))
return fmi2Error;
if (nvr > 0 && nullPointer(comp, "fmi2SetInteger", "value[]", value))
return fmi2Error;
FILTERED_LOG(comp, fmi2OK, LOG_FMI2_CALL, "fmi2SetInteger: nvr = %d", nvr)

for (i = 0; i < nvr; i++) {
for (i = 0; i < nvr; i++)
{
if (vrOutOfRange(comp, "fmi2SetInteger", vr[i], NUMBER_OF_INTEGERS))
return fmi2Error;
FILTERED_LOG(comp, fmi2OK, LOG_FMI2_CALL, "fmi2SetInteger: #i%d# = %d", vr[i], value[i])
Expand All @@ -740,15 +742,16 @@ fmi2Status fmi2SetBoolean(fmi2Component c, const fmi2ValueReference vr[], size_t
int meStates = modelInstantiated|modelInitializationMode|modelEventMode;
int csStates = modelInstantiated|modelInitializationMode|modelEventMode|modelContinuousTimeMode;

if (invalidState(comp, "fmi2SetReal", meStates, csStates))
if (invalidState(comp, "fmi2SetBoolean", meStates, csStates))
return fmi2Error;
if (nvr>0 && nullPointer(comp, "fmi2SetBoolean", "vr[]", vr))
return fmi2Error;
if (nvr>0 && nullPointer(comp, "fmi2SetBoolean", "value[]", value))
return fmi2Error;
FILTERED_LOG(comp, fmi2OK, LOG_FMI2_CALL, "fmi2SetBoolean: nvr = %d", nvr)

for (i = 0; i < nvr; i++) {
for (i = 0; i < nvr; i++)
{
if (vrOutOfRange(comp, "fmi2SetBoolean", vr[i], NUMBER_OF_BOOLEANS))
return fmi2Error;
FILTERED_LOG(comp, fmi2OK, LOG_FMI2_CALL, "fmi2SetBoolean: #b%d# = %s", vr[i], value[i] ? "true" : "false")
Expand All @@ -766,19 +769,19 @@ fmi2Status fmi2SetString(fmi2Component c, const fmi2ValueReference vr[], size_t
int meStates = modelInstantiated|modelInitializationMode|modelEventMode;
int csStates = modelInstantiated|modelInitializationMode|modelEventMode|modelContinuousTimeMode;

if (invalidState(comp, "fmi2SetReal", meStates, csStates))
if (invalidState(comp, "fmi2SetString", meStates, csStates))
return fmi2Error;
if (nvr>0 && nullPointer(comp, "fmi2SetString", "vr[]", vr))
return fmi2Error;
if (nvr>0 && nullPointer(comp, "fmi2SetString", "value[]", value))
return fmi2Error;
FILTERED_LOG(comp, fmi2OK, LOG_FMI2_CALL, "fmi2SetString: nvr = %d", nvr)

for (i = 0; i < nvr; i++) {
for (i = 0; i < nvr; i++)
{
if (vrOutOfRange(comp, "fmi2SetString", vr[i], NUMBER_OF_STRINGS))
return fmi2Error;
FILTERED_LOG(comp, fmi2OK, LOG_FMI2_CALL, "fmi2SetString: #s%d# = '%s'", vr[i], value[i])

if (setString(comp, vr[i], value[i]) != fmi2OK) // to be implemented by the includer of this file
return fmi2Error;
}
Expand Down

0 comments on commit c7cddda

Please sign in to comment.