Partial fixes for #1365

- link properly to get tables working.
- display the name of the model in the SimulationResult record when failing.


git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@7212 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Compiler/CevalScript.mo

@@ -677,7 +677,8 @@ algorithm
       equation
         omhome = Settings.getInstallationDirectoryPath() "simulation fail for some other reason than OPENMODELICAHOME not being set." ;
         errorStr = Error.printMessagesStr();
-        res = stringAppendList({"Simulation failed.\n",errorStr});
+        str = Absyn.pathString(className);
+        res = stringAppendList({"Simulation failed for model: ", str, "\n", errorStr});
         simValue = createSimulationResultFailure(res);
       then
         (cache,simValue,st);
@@ -686,7 +687,8 @@ algorithm
       expLst = DAE.CODE(Absyn.C_TYPENAME(className),_)::_),
       (st as Interactive.SYMBOLTABLE(ast = p,explodedAst = sp,instClsLst = ic,lstVarVal = iv,compiledFunctions = cf)),msg)
       equation
-        simValue = createSimulationResultFailure("Simulation Failed. Environment variable OPENMODELICAHOME not set.");
+        str = Absyn.pathString(className);
+        simValue = createSimulationResultFailure("Simulation failed for model: " +& str +& "\nEnvironment variable OPENMODELICAHOME not set.");
       then
         (cache,simValue,st);
 

Compiler/susan_codegen/SimCode/SimCodeC.tpl

@@ -2332,7 +2332,9 @@ template simulationFunctionsFile(String filePrefix, list<Function> functions)
   extern "C" {
   <%functionBodies(functions)%>
   }
+
   >>
+  /* adpro: leave a newline at the end of file to get rid of warnings! */
 end simulationFunctionsFile;
 
 template recordsFile(String filePrefix, list<RecordDeclaration> recordDecls)
@@ -2342,7 +2344,9 @@ template recordsFile(String filePrefix, list<RecordDeclaration> recordDecls)
   /* Additional record code for <%filePrefix%> generated by the OpenModelica Compiler <%getVersionNr()%>. */
   #include "meta_modelica.h"
   <%recordDecls |> rd => recordDeclaration(rd) ;separator="\n"%>
+
   >>
+  /* adpro: leave a newline at the end of file to get rid of warnings! */
 end recordsFile;
 
 template simulationFunctionsHeaderFile(String filePrefix, list<Function> functions, list<String> includes, list<RecordDeclaration> recordDecls)
@@ -2389,7 +2393,7 @@ case SIMCODE(modelInfo=MODELINFO(__), makefileParams=MAKEFILE_PARAMS(__)) then
 
   .PHONY: <%fileNamePrefix%>
   <%fileNamePrefix%>: <%fileNamePrefix%>.cpp <%fileNamePrefix%>_functions.cpp <%fileNamePrefix%>_functions.h <%fileNamePrefix%>_records.c
-  <%\t%> $(CXX) $(CFLAGS) -I. -o <%fileNamePrefix%>$(EXEEXT) <%fileNamePrefix%>.cpp <%fileNamePrefix%>_functions.cpp <%dirExtra%> <%libsPos1%> -lsim $(LDFLAGS) -lf2c -linteractive $(SENDDATALIBS) <%libsPos2%> <%fileNamePrefix%>_records.c
+  <%\t%> $(CXX) $(CFLAGS) -I. -o <%fileNamePrefix%>$(EXEEXT) <%fileNamePrefix%>.cpp <%fileNamePrefix%>_functions.cpp <%dirExtra%> <%libsPos1%> <%libsPos2%> -lsim -linteractive $(SENDDATALIBS) $(LDFLAGS) -lf2c <%fileNamePrefix%>_records.c
   >>
 end simulationMakefile;