Skip to content

Commit

Permalink
re-fix whitespace (see r25194)
Browse files Browse the repository at this point in the history 
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@25196 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
@rfranke
rfranke committed Mar 21, 2015
1 parent 9696bb7 commit 9b531d4
Show file tree
Hide file tree
Showing 3 changed files with 67 additions and 67 deletions.
100 changes: 50 additions & 50 deletions SimulationRuntime/cpp/Include/FMU2/FMU2Interface.cpp
View file
Expand Up @@ -58,12 +58,12 @@ extern "C"
//

fmi2Component fmi2Instantiate(fmi2String instanceName,
fmi2Type fmuType,
fmi2String GUID,
fmi2String fmuResourceLocation,
const fmi2CallbackFunctions *functions,
fmi2Boolean visible,
fmi2Boolean loggingOn)
fmi2Type fmuType,
fmi2String GUID,
fmi2String fmuResourceLocation,
const fmi2CallbackFunctions *functions,
fmi2Boolean visible,
fmi2Boolean loggingOn)
{
return reinterpret_cast<fmi2Component>(OBJECTCONSTRUCTOR);
}
Expand All @@ -74,9 +74,9 @@ extern "C"
}

fmi2Status fmi2SetDebugLogging(fmi2Component c,
fmi2Boolean loggingOn,
size_t nCategories,
const fmi2String categories[])
fmi2Boolean loggingOn,
size_t nCategories,
const fmi2String categories[])
{
return reinterpret_cast<FMU2Wrapper*>
(c)->setDebugLogging(loggingOn);
Expand All @@ -87,15 +87,15 @@ extern "C"
//

fmi2Status fmi2SetupExperiment(fmi2Component c,
fmi2Boolean toleranceDefined,
fmi2Real tolerance,
fmi2Real startTime,
fmi2Boolean stopTimeDefined,
fmi2Real stopTime)
fmi2Boolean toleranceDefined,
fmi2Real tolerance,
fmi2Real startTime,
fmi2Boolean stopTimeDefined,
fmi2Real stopTime)
{
return reinterpret_cast<FMU2Wrapper*>
(c)->setupExperiment(toleranceDefined, tolerance, startTime,
stopTimeDefined, stopTime);
stopTimeDefined, stopTime);
}

fmi2Status fmi2EnterInitializationMode(fmi2Component c)
Expand Down Expand Up @@ -126,64 +126,64 @@ extern "C"
//

fmi2Status fmi2GetReal(fmi2Component c,
const fmi2ValueReference vr[], size_t nvr,
fmi2Real value[])
const fmi2ValueReference vr[], size_t nvr,
fmi2Real value[])
{
return reinterpret_cast<FMU2Wrapper*>
(c)->getReal(vr, nvr, value);
}

fmi2Status fmi2GetInteger(fmi2Component c,
const fmi2ValueReference vr[], size_t nvr,
fmi2Integer value[])
const fmi2ValueReference vr[], size_t nvr,
fmi2Integer value[])
{
return reinterpret_cast<FMU2Wrapper*>
(c)->getInteger(vr, nvr, value);
}

fmi2Status fmi2GetBoolean(fmi2Component c,
const fmi2ValueReference vr[], size_t nvr,
fmi2Boolean value[])
const fmi2ValueReference vr[], size_t nvr,
fmi2Boolean value[])
{
return reinterpret_cast<FMU2Wrapper*>
(c)->getBoolean(vr, nvr, value);
}

fmi2Status fmi2GetString(fmi2Component c,
const fmi2ValueReference vr[], size_t nvr,
fmi2String value[])
const fmi2ValueReference vr[], size_t nvr,
fmi2String value[])
{
return reinterpret_cast<FMU2Wrapper*>
(c)->getString(vr, nvr, value);
}

fmi2Status fmi2SetReal(fmi2Component c,
const fmi2ValueReference vr[], size_t nvr,
const fmi2Real value[])
const fmi2ValueReference vr[], size_t nvr,
const fmi2Real value[])
{
return reinterpret_cast<FMU2Wrapper*>
(c)->setReal(vr, nvr, value);
}

fmi2Status fmi2SetInteger(fmi2Component c,
const fmi2ValueReference vr[], size_t nvr,
const fmi2Integer value[])
const fmi2ValueReference vr[], size_t nvr,
const fmi2Integer value[])
{
return reinterpret_cast<FMU2Wrapper*>
(c)->setInteger(vr, nvr, value);
}

fmi2Status fmi2SetBoolean(fmi2Component c,
const fmi2ValueReference vr[], size_t nvr,
const fmi2Boolean value[])
const fmi2ValueReference vr[], size_t nvr,
const fmi2Boolean value[])
{
return reinterpret_cast<FMU2Wrapper*>
(c)->setBoolean(vr, nvr, value);
}

fmi2Status fmi2SetString(fmi2Component c,
const fmi2ValueReference vr[], size_t nvr,
const fmi2String value[])
const fmi2ValueReference vr[], size_t nvr,
const fmi2String value[])
{
return reinterpret_cast<FMU2Wrapper*>
(c)->setString(vr, nvr, value);
Expand All @@ -209,20 +209,20 @@ extern "C"
}

fmi2Status fmi2SerializedFMUstateSize(fmi2Component c, fmi2FMUstate FMUstate,
size_t *size)
size_t *size)
{
return fmi2Error; // not implemented
}

fmi2Status fmi2SerializeFMUstate(fmi2Component c, fmi2FMUstate FMUstate,
fmi2Byte serializedState[], size_t size)
fmi2Byte serializedState[], size_t size)
{
return fmi2Error; // not implemented
}

fmi2Status fmi2DeSerializeFMUstate(fmi2Component c,
const fmi2Byte serializedState[],
size_t size, fmi2FMUstate* FMUstate)
const fmi2Byte serializedState[],
size_t size, fmi2FMUstate* FMUstate)
{
return fmi2Error; // not implemented
}
Expand All @@ -232,12 +232,12 @@ extern "C"
//

fmi2Status fmi2GetDirectionalDerivative(fmi2Component c,
const fmi2ValueReference vUnknown_ref[],
size_t nUnknown,
const fmi2ValueReference vKnown_ref[],
size_t nKnown,
const fmi2Real dvKnown[],
fmi2Real dvUnknown[])
const fmi2ValueReference vUnknown_ref[],
size_t nUnknown,
const fmi2ValueReference vKnown_ref[],
size_t nKnown,
const fmi2Real dvKnown[],
fmi2Real dvUnknown[])
{
return fmi2Error; // not implemented
}
Expand Down Expand Up @@ -267,13 +267,13 @@ extern "C"
}

fmi2Status fmi2CompletedIntegratorStep(fmi2Component c,
fmi2Boolean noSetFMUStatePriorToCurrentPoint,
fmi2Boolean* enterEventMode,
fmi2Boolean* terminateSimulation)
fmi2Boolean noSetFMUStatePriorToCurrentPoint,
fmi2Boolean* enterEventMode,
fmi2Boolean* terminateSimulation)
{
return reinterpret_cast<FMU2Wrapper*>
(c)->completedIntegratorStep(noSetFMUStatePriorToCurrentPoint,
enterEventMode, terminateSimulation);
enterEventMode, terminateSimulation);
}

//
Expand All @@ -287,7 +287,7 @@ extern "C"
}

fmi2Status fmi2SetContinuousStates(fmi2Component c,
const fmi2Real x[], size_t nx)
const fmi2Real x[], size_t nx)
{
return reinterpret_cast<FMU2Wrapper*>
(c)->setContinuousStates(x, nx);
Expand All @@ -298,28 +298,28 @@ extern "C"
//

fmi2Status fmi2GetDerivatives(fmi2Component c,
fmi2Real derivatives[], size_t nx)
fmi2Real derivatives[], size_t nx)
{
return reinterpret_cast<FMU2Wrapper*>
(c)->getDerivatives(derivatives, nx);
}

fmi2Status fmi2GetEventIndicators(fmi2Component c,
fmi2Real eventIndicators[], size_t ni)
fmi2Real eventIndicators[], size_t ni)
{
return reinterpret_cast<FMU2Wrapper*>
(c)->getEventIndicators(eventIndicators, ni);
}

fmi2Status fmi2GetContinuousStates(fmi2Component c,
fmi2Real states[], size_t nx)
fmi2Real states[], size_t nx)
{
return reinterpret_cast<FMU2Wrapper*>
(c)->getContinuousStates(states, nx);
}

fmi2Status fmi2GetNominalsOfContinuousStates(fmi2Component c,
fmi2Real x_nominal[], size_t nx)
fmi2Real x_nominal[], size_t nx)
{
return reinterpret_cast<FMU2Wrapper*>
(c)->getNominalsOfContinuousStates(x_nominal, nx);
Expand Down
4 changes: 2 additions & 2 deletions SimulationRuntime/cpp/Include/FMU2/FMU2Wrapper.cpp
View file
Expand Up @@ -120,8 +120,8 @@ void FMU2Wrapper::updateModel()
}

fmi2Status FMU2Wrapper::completedIntegratorStep(fmi2Boolean noSetFMUStatePriorToCurrentPoint,
fmi2Boolean *enterEventMode,
fmi2Boolean *terminateSimulation)
fmi2Boolean *enterEventMode,
fmi2Boolean *terminateSimulation)
{
_model->saveAll();
*enterEventMode = false;
Expand Down
30 changes: 15 additions & 15 deletions SimulationRuntime/cpp/Include/FMU2/FMU2Wrapper.h
View file
Expand Up @@ -45,45 +45,45 @@ class FMU2Wrapper
public:
// Creation and destruction of FMU instances and setting logging status
FMU2Wrapper(fmi2String instanceName, fmi2String GUID,
const fmi2CallbackFunctions *functions, fmi2Boolean loggingOn);
const fmi2CallbackFunctions *functions, fmi2Boolean loggingOn);
virtual ~FMU2Wrapper();

virtual fmi2Status setDebugLogging(fmi2Boolean loggingOn);

// Enter and exit initialization mode, terminate and reset
virtual fmi2Status setupExperiment(fmi2Boolean toleranceDefined,
fmi2Real tolerance,
fmi2Real startTime,
fmi2Boolean stopTimeDefined,
fmi2Real stopTime);
fmi2Real tolerance,
fmi2Real startTime,
fmi2Boolean stopTimeDefined,
fmi2Real stopTime);
virtual fmi2Status initialize ();
virtual fmi2Status terminate ();
virtual fmi2Status reset ();

// Getting and setting variable values
virtual fmi2Status getReal (const fmi2ValueReference vr[], size_t nvr,
fmi2Real value[]);
fmi2Real value[]);
virtual fmi2Status getInteger(const fmi2ValueReference vr[], size_t nvr,
fmi2Integer value[]);
fmi2Integer value[]);
virtual fmi2Status getBoolean(const fmi2ValueReference vr[], size_t nvr,
fmi2Boolean value[]);
fmi2Boolean value[]);
virtual fmi2Status getString (const fmi2ValueReference vr[], size_t nvr,
fmi2String value[]);
fmi2String value[]);

virtual fmi2Status setReal (const fmi2ValueReference vr[], size_t nvr,
const fmi2Real value[]);
const fmi2Real value[]);
virtual fmi2Status setInteger(const fmi2ValueReference vr[], size_t nvr,
const fmi2Integer value[]);
const fmi2Integer value[]);
virtual fmi2Status setBoolean(const fmi2ValueReference vr[], size_t nvr,
const fmi2Boolean value[]);
const fmi2Boolean value[]);
virtual fmi2Status setString (const fmi2ValueReference vr[], size_t nvr,
const fmi2String value[]);
const fmi2String value[]);

// Enter and exit the different modes for Model Exchange
virtual fmi2Status newDiscreteStates (fmi2EventInfo *eventInfo);
virtual fmi2Status completedIntegratorStep(fmi2Boolean noSetFMUStatePriorToCurrentPoint,
fmi2Boolean *enterEventMode,
fmi2Boolean *terminateSimulation);
fmi2Boolean *enterEventMode,
fmi2Boolean *terminateSimulation);

// Providing independent variables and re-initialization of caching
virtual fmi2Status setTime (fmi2Real time);
Expand Down

0 comments on commit 9b531d4

Please sign in to comment.