check if OMC simulation succeeded

lenaRB · Mar 8, 2024 · 5e30f84 · 5e30f84
1 parent 9ea3bdd
commit 5e30f84
Showing 1 changed file with 21 additions and 4 deletions.
diff --git a/src/main/java/crml/compiler/OMCUtil.java b/src/main/java/crml/compiler/OMCUtil.java
@@ -136,11 +136,28 @@ public static String generateSimulationScript(String stripped_file_name, String
                   "  exit(1);\n" +
                   "end if;\n" + 
                   "getErrorString();\n";
-      mos_text +=  "simulate("+ stripped_file_name + "_verif" +"); getErrorString();\n";
-    } else // try simulating the model on its own (the non_external ones)
-      mos_text +=  "simulate("+ stripped_file_name +"); getErrorString();\n";
+      mos_text += "res := simulate("+ stripped_file_name + "_verif" +");\n" + 
+                  "error := getErrorString();\n" + 
+                  "resultFile := res.resultFile;\n" +
+                  "messages := res.messages;\n" +
+                  "if resultFile == \"\" then\n" + 
+                  "  print(\"Error: Simulation of: " + stripped_file_name + "_verif" + " did not produce a result-file\n\");\n" +
+                  "  print(\"Errors: \" + messages + error + \"\\n\");\n" +
+                  "  exit(1);\n" +
+                  "end if;\n";
+    } else { // try simulating the model on its own (the non_external ones)
+      mos_text += "res := simulate("+ stripped_file_name +");" + 
+                  "error := getErrorString();\n" + 
+                  "resultFile := res.resultFile;\n" +
+                  "messages := res.messages;\n" +
+                  "if resultFile == \"\" then\n" + 
+                  "  print(\"Error: Simulation of: " + stripped_file_name + " did not produce a result-file\n\");\n" +
+                  "  print(\"Errors: \" + messages + error + \"\\n\");\n" +
+                  "  exit(1);\n" +
+                  "end if;\n";
+    }
 
-      return mos_text;
+    return mos_text;
   }
 
     public static OMCmsg compile(String stripped_file_name, String out_dir, CompileSettings cs) throws ModelicaSimulationException, IOException, InterruptedException {