Consider -inputPath when looking for dependency json file. (#10013)

- When looking for the json file which contains the ODEs dependency info, consider the `-inputPath` specified for the simulation executable commandline.
OpenModelica · Jan 6, 2023 · feafa9e · feafa9e
1 parent b874646
commit feafa9e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/OMCompiler/Compiler/Template/CodegenC.tpl b/OMCompiler/Compiler/Template/CodegenC.tpl
@@ -4422,7 +4422,7 @@ match eqlstlst
   let &nrfuncs += "0"
   <<
   /* no <%name%> systems */
-  static void (**function<%name%>_systems)(DATA *) = NULL;
+  static void (**function<%name%>_systems)(DATA *,  threadData_t *) = NULL;
   >>
 
   case eqlstlst as ({eqlst}) then

diff --git a/OMCompiler/SimulationRuntime/ParModelica/auto/om_pm_model.cpp b/OMCompiler/SimulationRuntime/ParModelica/auto/om_pm_model.cpp
@@ -33,6 +33,9 @@
  Mahder.Gebremedhin@liu.se  2020-10-12
 */
 
+// We need this to get the flag/option values passed to a simulation executable.
+#include "simulation/options.h"
+
 #include "om_pm_model.hpp"
 
 #include <cstring>
@@ -259,9 +262,19 @@ void load_equation(Equation& current_node, const nlohmann::json& json_eq) {
 
 void OMModel::load_from_json(TaskSystemT& task_system, const std::string& eq_to_read, FunctionType* function_system) {
     std::string json_file = this->name + "_ode.json";
+
+    if (omc_flag[FLAG_INPUT_PATH]) {
+      json_file = std::string(omc_flagValue[FLAG_INPUT_PATH]) + "/" + json_file;
+    }
+
     // utility::log("") << "Loading " << json_file << std::endl;
 
     std::ifstream  f_s(json_file);
+    if (!f_s.is_open()) {
+        utility::error("Fatal") << "Could not open dependency json file '" << json_file << "'. Please make sure the file is generated in the correct place and is readable." << std::endl;
+    }
+
+
     nlohmann::json jmodel_info;
 
     jmodel_info << f_s;