Merge branch 'master' into examples

Author: markaren

export/src/fmu4cpp/fmi2/fmi2.cpp

@@ -1,6 +1,7 @@
 
 #include "fmi2Functions.h"
 
+#include <cstring>
 #include <fstream>
 #include <limits>
 #include <memory>
@@ -473,6 +474,7 @@ fmi2Status fmi2GetDirectionalDerivative(fmi2Component,
 
 
 fmi2Status fmi2GetFMUstate(fmi2Component c, fmi2FMUstate *state) {
+
     const auto component = static_cast<Fmi2Component *>(c);
 
     try {
@@ -491,6 +493,7 @@ fmi2Status fmi2GetFMUstate(fmi2Component c, fmi2FMUstate *state) {
 }
 
 fmi2Status fmi2SetFMUstate(fmi2Component c, fmi2FMUstate state) {
+
     const auto component = static_cast<Fmi2Component *>(c);
 
     try {
@@ -509,6 +512,11 @@ fmi2Status fmi2SetFMUstate(fmi2Component c, fmi2FMUstate state) {
 
 
 fmi2Status fmi2FreeFMUstate(fmi2Component c, fmi2FMUstate *state) {
+
+    if (state == nullptr || *state == nullptr) {
+        return fmi2OK;
+    }
+
     const auto component = static_cast<Fmi2Component *>(c);
 
     try {
@@ -525,23 +533,68 @@ fmi2Status fmi2FreeFMUstate(fmi2Component c, fmi2FMUstate *state) {
     }
 }
 
-fmi2Status fmi2SerializedFMUstateSize(fmi2Component, fmi2FMUstate, size_t *) {
+fmi2Status fmi2SerializedFMUstateSize(fmi2Component c, fmi2FMUstate state, size_t *size) {
 
-    return fmi2Error;
+    const auto component = static_cast<Fmi2Component *>(c);
+
+    try {
+
+        component->slave->serializedFMUStateSize(state, *size);
+        return fmi2OK;
+
+    } catch (const fmu4cpp::fatal_error &ex) {
+        component->logger->log(fmiFatal, ex.what());
+        return fmi2Fatal;
+    } catch (const std::exception &ex) {
+        component->logger->log(fmiError, ex.what());
+        return fmi2Error;
+    }
 }
 
-fmi2Status fmi2SerializeFMUstate(fmi2Component, fmi2FMUstate, fmi2Byte[], size_t) {
+fmi2Status fmi2SerializeFMUstate(fmi2Component c, fmi2FMUstate state, fmi2Byte data[], size_t size) {
 
-    return fmi2Error;
+    const auto component = static_cast<Fmi2Component *>(c);
+
+    try {
+
+        std::vector<uint8_t> serializedState(size);
+        component->slave->serializeFMUState(state, serializedState);
+        std::memcpy(data, serializedState.data(), size);
+        return fmi2OK;
+
+    } catch (const fmu4cpp::fatal_error &ex) {
+        component->logger->log(fmiFatal, ex.what());
+        return fmi2Fatal;
+    } catch (const std::exception &ex) {
+        component->logger->log(fmiError, ex.what());
+        return fmi2Error;
+    }
 }
 
-fmi2Status fmi2DeSerializeFMUstate(fmi2Component, const fmi2Byte[], size_t, fmi2FMUstate *) {
+fmi2Status fmi2DeSerializeFMUstate(fmi2Component c, const fmi2Byte data[], size_t size, fmi2FMUstate *state) {
 
-    return fmi2Error;
+    const auto component = static_cast<Fmi2Component *>(c);
+
+    try {
+
+        std::vector<uint8_t> serializedState(data, data + size);
+        component->slave->deserializeFMUState(serializedState, state);
+        return fmi2OK;
+
+    } catch (const fmu4cpp::fatal_error &ex) {
+        component->logger->log(fmiFatal, ex.what());
+        return fmi2Fatal;
+    } catch (const std::exception &ex) {
+        component->logger->log(fmiError, ex.what());
+        return fmi2Error;
+    }
 }
 
 void fmi2FreeInstance(fmi2Component c) {
-    const auto component = static_cast<Fmi2Component *>(c);
-    delete component;
+    if (c) {
+        const auto component = static_cast<Fmi2Component *>(c);
+        delete component;
+        c = nullptr;
+    }
 }
 }

export/src/fmu4cpp/fmi3/fmi3.cpp

@@ -641,6 +641,11 @@ fmi3Status fmi3SetFMUState(fmi3Instance c, fmi3FMUState state) {
 
 
 fmi3Status fmi3FreeFMUState(fmi3Instance c, fmi3FMUState *state) {
+
+    if (state == nullptr || *state == nullptr) {
+        return fmi3OK;
+    }
+
     const auto component = static_cast<Fmi3Component *>(c);
 
     try {
@@ -660,6 +665,7 @@ fmi3Status fmi3FreeFMUState(fmi3Instance c, fmi3FMUState *state) {
 }
 
 fmi3Status fmi3SerializedFMUStateSize(fmi3Instance c, fmi3FMUState state, size_t *size) {
+
     const auto component = static_cast<Fmi3Component *>(c);
 
     try {
@@ -939,6 +945,7 @@ void fmi3FreeInstance(fmi3Instance c) {
         const auto component = static_cast<Fmi3Component *>(c);
         component->state = Fmi3Component::State::Invalid;
         delete component;
+        c = nullptr;
     }
 }
 }

export/tests/fmi2/CMakeLists.txt

@@ -1,3 +1,4 @@
 
 make_test("fmi2" array_test array_test.cpp)
 make_test("fmi2" identity_test identity_test.cpp)
+make_test("fmi2" bouncing_ball_test bouncing_ball_test.cpp)

export/tests/fmi2/bouncing_ball_test.cpp

@@ -0,0 +1,75 @@
+
+#include <catch2/catch_approx.hpp>
+#include <catch2/catch_test_macros.hpp>
+
+#include "fmi2/fmi2Functions.h"
+
+#include "BouncingBall.hpp"
+
+
+std::string fmu4cpp::model_identifier() {
+    return "bouncing_ball";
+}
+
+
+TEST_CASE("BouncingBall_test") {
+
+    BouncingBall model({});
+    const auto guid = model.guid();
+
+    auto c = fmi2Instantiate("bouncing_ball", fmi2CoSimulation, guid.c_str(), "", nullptr, false, false);
+    REQUIRE(c);
+
+    REQUIRE(fmi2SetupExperiment(c, fmi2False, 0, 0, fmi2False, 0) == fmi2OK);
+    REQUIRE(fmi2EnterInitializationMode(c) == fmi2OK);
+    REQUIRE(fmi2ExitInitializationMode(c) == fmi2OK);
+
+    double t = 0;
+    double dt = 0.1;
+
+    REQUIRE(fmi2DoStep(c, t, dt, true) == fmi2OK);
+    t += dt;
+
+    const auto heightVr = model.get_real_variable("height")->value_reference();
+
+    double height;
+    REQUIRE(fmi2GetReal(c, &heightVr, 1, &height) == fmi2OK);
+    REQUIRE(height < 10.0);
+
+    double heightState = height;
+
+    fmi2FMUstate state;
+    REQUIRE(fmi2GetFMUstate(c, &state) == fmi2OK);
+
+    REQUIRE(fmi2DoStep(c, t, dt, true) == fmi2OK);
+    t += dt;
+
+    REQUIRE(fmi2GetReal(c, &heightVr, 1, &height) == fmi2OK);
+    CHECK(height != Catch::Approx(heightState));
+
+    REQUIRE(fmi2SetFMUstate(c, state) == fmi2OK);
+    REQUIRE(fmi2GetReal(c, &heightVr, 1, &height) == fmi2OK);
+    CHECK(height == Catch::Approx(heightState));
+
+
+    size_t serializedSize;
+    fmi2SerializedFMUstateSize(c, state, &serializedSize);
+    CHECK(serializedSize > 0);
+
+    std::vector<char> serializedData(serializedSize);
+    fmi2SerializeFMUstate(c, state, serializedData.data(), serializedSize);
+    fmi2DeSerializeFMUstate(c, serializedData.data(), serializedSize, &state);
+
+    REQUIRE(fmi2DoStep(c, t, dt, true) == fmi2OK);
+
+    REQUIRE(fmi2GetReal(c, &heightVr, 1, &height) == fmi2OK);
+    CHECK(height != Catch::Approx(heightState));
+
+    REQUIRE(fmi2SetFMUstate(c, state) == fmi2OK);
+    REQUIRE(fmi2GetReal(c, &heightVr, 1, &height) == fmi2OK);
+    CHECK(height == Catch::Approx(heightState));
+
+
+    REQUIRE(fmi2FreeFMUstate(c, &state) == fmi2OK);
+    REQUIRE(state == nullptr);
+}

export/tests/fmi3/bouncing_ball_test.cpp

@@ -17,7 +17,7 @@ TEST_CASE("BouncingBall_test") {
     BouncingBall model({});
     const auto guid = model.guid();
 
-    auto c = fmi3InstantiateCoSimulation("array", guid.c_str(), "", false, false, false, false, nullptr, 0, nullptr, nullptr, nullptr);
+    auto c = fmi3InstantiateCoSimulation("bouncing_ball", guid.c_str(), "", false, false, false, false, nullptr, 0, nullptr, nullptr, nullptr);
     REQUIRE(c);
 
     REQUIRE(fmi3EnterInitializationMode(c, false, 0, 0, false, 0) == fmi3OK);
@@ -74,4 +74,5 @@ TEST_CASE("BouncingBall_test") {
 
 
     REQUIRE(fmi3FreeFMUState(c, &state) == fmi3OK);
+    REQUIRE(state == nullptr);
 }