Skip to content

Commit

Permalink
Update import framework to Reference-FMUs@39bc594
Browse files Browse the repository at this point in the history
  • Loading branch information
@t-sommer
t-sommer committed Mar 29, 2022
1 parent 6ad933e commit f72d16c
Show file tree
Hide file tree
Showing 8 changed files with 476 additions and 423 deletions.
3 changes: 1 addition & 2 deletions include/FMI.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,15 +155,14 @@ FMI_STATIC void FMIFreeInstance(FMIInstance *instance);

FMI_STATIC const char* FMIValueReferencesToString(FMIInstance *instance, const FMIValueReference vr[], size_t nvr);

FMI_STATIC const char* FMIValuesToString(FMIInstance *instance, size_t nvr, const void *value, FMIVariableType variableType);
FMI_STATIC const char* FMIValuesToString(FMIInstance *instance, size_t vValues, const size_t sizes[], const void* values, FMIVariableType variableType);

FMI_STATIC FMIStatus FMIURIToPath(const char *uri, char *path, const size_t pathLength);

FMI_STATIC FMIStatus FMIPathToURI(const char *path, char *uri, const size_t uriLength);

FMI_STATIC FMIStatus FMIPlatformBinaryPath(const char *unzipdir, const char *modelIdentifier, FMIVersion fmiVersion, char *platformBinaryPath, size_t size);


#ifdef __cplusplus
} /* end of extern "C" { */
#endif
Expand Down
68 changes: 34 additions & 34 deletions include/FMI1.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,53 +80,53 @@ struct FMI1Functions_ {
/***************************************************
Common Functions for FMI 1.0
****************************************************/
FMI_STATIC fmi1Status FMI1SetReal (FMIInstance *instance, const fmi1ValueReference vr[], size_t nvr, const fmi1Real value[]);
FMI_STATIC fmi1Status FMI1SetInteger (FMIInstance *instance, const fmi1ValueReference vr[], size_t nvr, const fmi1Integer value[]);
FMI_STATIC fmi1Status FMI1SetBoolean (FMIInstance *instance, const fmi1ValueReference vr[], size_t nvr, const fmi1Boolean value[]);
FMI_STATIC fmi1Status FMI1SetString (FMIInstance *instance, const fmi1ValueReference vr[], size_t nvr, const fmi1String value[]);
FMI_STATIC fmi1Status FMI1GetReal (FMIInstance *instance, const fmi1ValueReference vr[], size_t nvr, fmi1Real value[]);
FMI_STATIC fmi1Status FMI1GetInteger (FMIInstance *instance, const fmi1ValueReference vr[], size_t nvr, fmi1Integer value[]);
FMI_STATIC fmi1Status FMI1GetBoolean (FMIInstance *instance, const fmi1ValueReference vr[], size_t nvr, fmi1Boolean value[]);
FMI_STATIC fmi1Status FMI1GetString (FMIInstance *instance, const fmi1ValueReference vr[], size_t nvr, fmi1String value[]);
FMI_STATIC fmi1Status FMI1SetDebugLogging (FMIInstance *instance, fmi1Boolean loggingOn);
FMI_STATIC FMIStatus FMI1SetReal (FMIInstance *instance, const fmi1ValueReference vr[], size_t nvr, const fmi1Real value[]);
FMI_STATIC FMIStatus FMI1SetInteger (FMIInstance *instance, const fmi1ValueReference vr[], size_t nvr, const fmi1Integer value[]);
FMI_STATIC FMIStatus FMI1SetBoolean (FMIInstance *instance, const fmi1ValueReference vr[], size_t nvr, const fmi1Boolean value[]);
FMI_STATIC FMIStatus FMI1SetString (FMIInstance *instance, const fmi1ValueReference vr[], size_t nvr, const fmi1String value[]);
FMI_STATIC FMIStatus FMI1GetReal (FMIInstance *instance, const fmi1ValueReference vr[], size_t nvr, fmi1Real value[]);
FMI_STATIC FMIStatus FMI1GetInteger (FMIInstance *instance, const fmi1ValueReference vr[], size_t nvr, fmi1Integer value[]);
FMI_STATIC FMIStatus FMI1GetBoolean (FMIInstance *instance, const fmi1ValueReference vr[], size_t nvr, fmi1Boolean value[]);
FMI_STATIC FMIStatus FMI1GetString (FMIInstance *instance, const fmi1ValueReference vr[], size_t nvr, fmi1String value[]);
FMI_STATIC FMIStatus FMI1SetDebugLogging (FMIInstance *instance, fmi1Boolean loggingOn);

/***************************************************
FMI 1.0 for Model Exchange Functions
****************************************************/
FMI_STATIC const char* FMI1GetModelTypesPlatform (FMIInstance *instance);
FMI_STATIC const char* FMI1GetVersion (FMIInstance *instance);
FMI_STATIC fmi1Status FMI1InstantiateModel (FMIInstance *instance, fmi1String modelIdentifier, fmi1String GUID, fmi1Boolean loggingOn);
FMI_STATIC FMIStatus FMI1InstantiateModel (FMIInstance *instance, fmi1String modelIdentifier, fmi1String GUID, fmi1Boolean loggingOn);
FMI_STATIC void FMI1FreeModelInstance (FMIInstance *instance);
FMI_STATIC fmi1Status FMI1SetTime (FMIInstance *instance, fmi1Real time);
FMI_STATIC fmi1Status FMI1SetContinuousStates (FMIInstance *instance, const fmi1Real x[], size_t nx);
FMI_STATIC fmi1Status FMI1CompletedIntegratorStep (FMIInstance *instance, fmi1Boolean* callEventUpdate);
FMI_STATIC fmi1Status FMI1Initialize (FMIInstance *instance, fmi1Boolean toleranceControlled, fmi1Real relativeTolerance);
FMI_STATIC fmi1Status FMI1GetDerivatives (FMIInstance *instance, fmi1Real derivatives[], size_t nx);
FMI_STATIC fmi1Status FMI1GetEventIndicators (FMIInstance *instance, fmi1Real eventIndicators[], size_t ni);
FMI_STATIC fmi1Status FMI1EventUpdate (FMIInstance *instance, fmi1Boolean intermediateResults, fmi1EventInfo* eventInfo);
FMI_STATIC fmi1Status FMI1GetContinuousStates (FMIInstance *instance, fmi1Real states[], size_t nx);
FMI_STATIC fmi1Status FMI1GetNominalContinuousStates (FMIInstance *instance, fmi1Real x_nominal[], size_t nx);
FMI_STATIC fmi1Status FMI1GetStateValueReferences (FMIInstance *instance, fmi1ValueReference vrx[], size_t nx);
FMI_STATIC fmi1Status FMI1Terminate (FMIInstance *instance);
FMI_STATIC FMIStatus FMI1SetTime (FMIInstance *instance, fmi1Real time);
FMI_STATIC FMIStatus FMI1SetContinuousStates (FMIInstance *instance, const fmi1Real x[], size_t nx);
FMI_STATIC FMIStatus FMI1CompletedIntegratorStep (FMIInstance *instance, fmi1Boolean* callEventUpdate);
FMI_STATIC FMIStatus FMI1Initialize (FMIInstance *instance, fmi1Boolean toleranceControlled, fmi1Real relativeTolerance);
FMI_STATIC FMIStatus FMI1GetDerivatives (FMIInstance *instance, fmi1Real derivatives[], size_t nx);
FMI_STATIC FMIStatus FMI1GetEventIndicators (FMIInstance *instance, fmi1Real eventIndicators[], size_t ni);
FMI_STATIC FMIStatus FMI1EventUpdate (FMIInstance *instance, fmi1Boolean intermediateResults, fmi1EventInfo* eventInfo);
FMI_STATIC FMIStatus FMI1GetContinuousStates (FMIInstance *instance, fmi1Real states[], size_t nx);
FMI_STATIC FMIStatus FMI1GetNominalContinuousStates (FMIInstance *instance, fmi1Real x_nominal[], size_t nx);
FMI_STATIC FMIStatus FMI1GetStateValueReferences (FMIInstance *instance, fmi1ValueReference vrx[], size_t nx);
FMI_STATIC FMIStatus FMI1Terminate (FMIInstance *instance);

/***************************************************
FMI 1.0 for Co-Simulation Functions
****************************************************/
FMI_STATIC const char* FMI1GetTypesPlatform (FMIInstance *instance);
FMI_STATIC fmi1Status FMI1InstantiateSlave (FMIInstance *instance, fmi1String modelIdentifier, fmi1String fmuGUID, fmi1String fmuLocation, fmi1String mimeType, fmi1Real timeout, fmi1Boolean visible, fmi1Boolean interactive, fmi1Boolean loggingOn);
FMI_STATIC fmi1Status FMI1InitializeSlave (FMIInstance *instance, fmi1Real tStart, fmi1Boolean StopTimeDefined, fmi1Real tStop);
FMI_STATIC fmi1Status FMI1TerminateSlave (FMIInstance *instance);
FMI_STATIC fmi1Status FMI1ResetSlave (FMIInstance *instance);
FMI_STATIC FMIStatus FMI1InstantiateSlave (FMIInstance *instance, fmi1String modelIdentifier, fmi1String fmuGUID, fmi1String fmuLocation, fmi1String mimeType, fmi1Real timeout, fmi1Boolean visible, fmi1Boolean interactive, fmi1Boolean loggingOn);
FMI_STATIC FMIStatus FMI1InitializeSlave (FMIInstance *instance, fmi1Real tStart, fmi1Boolean StopTimeDefined, fmi1Real tStop);
FMI_STATIC FMIStatus FMI1TerminateSlave (FMIInstance *instance);
FMI_STATIC FMIStatus FMI1ResetSlave (FMIInstance *instance);
FMI_STATIC void FMI1FreeSlaveInstance (FMIInstance *instance);
FMI_STATIC fmi1Status FMI1SetRealInputDerivatives (FMIInstance *instance, const fmi1ValueReference vr[], size_t nvr, const fmi1Integer order[], const fmi1Real value[]);
FMI_STATIC fmi1Status FMI1GetRealOutputDerivatives (FMIInstance *instance, const fmi1ValueReference vr[], size_t nvr, const fmi1Integer order[], fmi1Real value[]);
FMI_STATIC fmi1Status FMI1CancelStep (FMIInstance *instance);
FMI_STATIC fmi1Status FMI1DoStep (FMIInstance *instance, fmi1Real currentCommunicationPoint, fmi1Real communicationStepSize, fmi1Boolean newStep);
FMI_STATIC fmi1Status FMI1GetStatus (FMIInstance *instance, const fmi1StatusKind s, fmi1Status* value);
FMI_STATIC fmi1Status FMI1GetRealStatus (FMIInstance *instance, const fmi1StatusKind s, fmi1Real* value);
FMI_STATIC fmi1Status FMI1GetIntegerStatus (FMIInstance *instance, const fmi1StatusKind s, fmi1Integer* value);
FMI_STATIC fmi1Status FMI1GetBooleanStatus (FMIInstance *instance, const fmi1StatusKind s, fmi1Boolean* value);
FMI_STATIC fmi1Status FMI1GetStringStatus (FMIInstance *instance, const fmi1StatusKind s, fmi1String* value);
FMI_STATIC FMIStatus FMI1SetRealInputDerivatives (FMIInstance *instance, const fmi1ValueReference vr[], size_t nvr, const fmi1Integer order[], const fmi1Real value[]);
FMI_STATIC FMIStatus FMI1GetRealOutputDerivatives (FMIInstance *instance, const fmi1ValueReference vr[], size_t nvr, const fmi1Integer order[], fmi1Real value[]);
FMI_STATIC FMIStatus FMI1CancelStep (FMIInstance *instance);
FMI_STATIC FMIStatus FMI1DoStep (FMIInstance *instance, fmi1Real currentCommunicationPoint, fmi1Real communicationStepSize, fmi1Boolean newStep);
FMI_STATIC FMIStatus FMI1GetStatus (FMIInstance *instance, const fmi1StatusKind s, fmi1Status* value);
FMI_STATIC FMIStatus FMI1GetRealStatus (FMIInstance *instance, const fmi1StatusKind s, fmi1Real* value);
FMI_STATIC FMIStatus FMI1GetIntegerStatus (FMIInstance *instance, const fmi1StatusKind s, fmi1Integer* value);
FMI_STATIC FMIStatus FMI1GetBooleanStatus (FMIInstance *instance, const fmi1StatusKind s, fmi1Boolean* value);
FMI_STATIC FMIStatus FMI1GetStringStatus (FMIInstance *instance, const fmi1StatusKind s, fmi1String* value);

#ifdef __cplusplus
} /* end of extern "C" { */
Expand Down
Loading

0 comments on commit f72d16c

Please sign in to comment.