Set sim_path based on provided resource_location.

Signed-off-by: Rule Timothy (VM/EMT3) <[email protected]>
boschglobal · Aug 19, 2024 · 2e2f1e0 · 2e2f1e0
1 parent 3b58a00
commit 2e2f1e0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/dse/fmimodelc/examples/network_fmu/fmi2importer.c b/dse/fmimodelc/examples/network_fmu/fmi2importer.c
@@ -93,7 +93,7 @@ int main(int argc, char** argv)
     fmi2Instantiate instantiate = dlsym(handle, "fmi2Instantiate");
     if (instantiate == NULL) return EINVAL;
     fmu = instantiate(
-        "network_fmu", fmi2CoSimulation, "guid", "resource", NULL, true, false);
+        "network_fmu", fmi2CoSimulation, "guid", "resources", NULL, true, false);
     if (fmu == NULL) return EINVAL;
 
     /* fmi2ExitInitializationMode */

diff --git a/dse/fmimodelc/fmi2fmu.c b/dse/fmimodelc/fmi2fmu.c
@@ -189,7 +189,7 @@ fmi2Status fmi2ExitInitializationMode(fmi2Component c)
          .runtime = {
              .runtime_model = fmu->instance.name,
              .model_name = fmu->instance.name,
-             .sim_path = "resources/sim",
+             .sim_path = dse_path_cat(fmu->instance.resource_location, "sim"),
              .simulation_yaml = "data/simulation.yaml",
              .end_time = END_TIME,
              .log_level = 5,
@@ -517,8 +517,9 @@ void fmi2FreeInstance(fmi2Component c)
     assert(m);
 
     _log("Call model_runtime_destroy() ...");
+    free(m->runtime.sim_path);
     model_runtime_destroy(m);
-    if (m->model.sim) free(m->model.sim);
+    free(m->model.sim);
 
     _log("Destroy the index");
     hashmap_destroy(&fmu->runtime.scalar.input);