Merge branch 'master' into fmi3

Author: markaren

README.md

@@ -94,9 +94,7 @@ model_info fmu4cpp::get_model_info() {
     return info;
 }
 
-std::unique_ptr<fmu_base> fmu4cpp::createInstance(const std::string &instanceName, const std::string &fmuResourceLocation) {
-    return std::make_unique<BouncingBall>(instanceName, fmuResourceLocation);
-}
+FMU4CPP_INSTANTIATE(BouncingBall);
 
 ```
 

export/examples/BouncingBall/bouncing_ball.cpp

@@ -98,6 +98,4 @@ model_info fmu4cpp::get_model_info() {
     return info;
 }
 
-std::unique_ptr<fmu_base> fmu4cpp::createInstance(const std::string &instanceName, const std::filesystem::path &fmuResourceLocation) {
-    return std::make_unique<BouncingBall>(instanceName, fmuResourceLocation);
-}
+FMU4CPP_INSTANTIATE(BouncingBall);

export/examples/Resource/resource.cpp

@@ -49,6 +49,4 @@ model_info fmu4cpp::get_model_info() {
     return info;
 }
 
-std::unique_ptr<fmu_base> fmu4cpp::createInstance(const std::string &instanceName, const std::filesystem::path &fmuResourceLocation) {
-    return std::make_unique<Resource>(instanceName, fmuResourceLocation);
-}
+FMU4CPP_INSTANTIATE(Resource);

export/examples/SimplePendulum/simple_pendulum.cpp

@@ -68,6 +68,4 @@ model_info fmu4cpp::get_model_info() {
     return info;
 }
 
-std::unique_ptr<fmu_base> fmu4cpp::createInstance(const std::string &instanceName, const std::filesystem::path &fmuResourceLocation) {
-    return std::make_unique<SimplePendulum>(instanceName, fmuResourceLocation);
-}
+FMU4CPP_INSTANTIATE(SimplePendulum);

export/include/fmu4cpp/fmu_base.hpp

@@ -16,6 +16,12 @@
 
 #include <filesystem>
 
+#define FMU4CPP_INSTANTIATE(MODELCLASS)                                                                   \
+    std::unique_ptr<fmu_base> fmu4cpp::createInstance(const std::string &instanceName,                    \
+                                                      const std::filesystem::path &fmuResourceLocation) { \
+        return std::make_unique<MODELCLASS>(instanceName, fmuResourceLocation);                           \
+    }
+
 namespace fmu4cpp {
 
     class fmu_base {

src/model.cpp

@@ -87,7 +87,4 @@ model_info fmu4cpp::get_model_info() {
     return info;
 }
 
-std::unique_ptr<fmu_base> fmu4cpp::createInstance(const std::string &instanceName,
-                                                  const std::filesystem::path &fmuResourceLocation) {
-    return std::make_unique<Model>(instanceName, fmuResourceLocation);
-}
+FMU4CPP_INSTANTIATE(Model); // Entry point for FMI instantiate function.