Code generation for the stand-alone solver of QSS methods

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

Author: fbergero

Compiler/BackEnd/BackendQSS.mo

@@ -3581,8 +3581,6 @@ algorithm
   end matchcontinue;
 end createIncreasingList;
 
-
-
 public function createListFromElement
   input Type_a elem;
   output list<Type_a> outList;
@@ -3598,6 +3596,80 @@ algorithm
   end matchcontinue;
 end createListFromElement;
 
+public function getAllInputs
+  input QSSinfo qssInfo;
+  output list<Integer> vars_tuple;
+algorithm
+  vars_tuple :=
+    match (qssInfo)
+      local
+        array<list<list<Integer>>> inVars "input connections for each DEVS block";
+      case QSSINFO(_,DEVS_STRUCT(_,_,_,inVars),_,_)
+      then convertArrayToFlatList(inVars,1,{});
+    end match;
+end getAllInputs;
+
+protected function listPair
+  input list<Integer> l;
+  input Integer i;
+  output list<Integer> o;
+algorithm
+  o :=
+    match (l,i)
+      local list<Integer> rest;
+            Integer h;
+      case ((h::rest),i)
+        equation
+          rest = listPair(rest,i);
+          rest = listAppend({i,h},rest);
+        then rest; 
+      case ({},_)
+        then {};
+    end match;
+end listPair;
+         
+          
+protected function convertArrayToFlatList
+  input array<list<list<Integer>>> vars;
+  input Integer index;
+  input list<Integer> res;
+  output list<Integer> vars_tuple;
+algorithm
+  vars_tuple := 
+    matchcontinue (vars,index,res)
+      local list<list<Integer>> v;
+            list<Integer> vf;
+    case (_,_,_)
+      equation
+        true = (index <= arrayLength(vars));
+        v = vars[index];
+        vf = Util.listMap(Util.listFlatten(v),intAbs);
+        vf = Util.listFilter(vf,isPositive);
+        vf = Util.listMap1(vf,intSub,1);
+        vf = listPair(vf,index-1);
+        vf = listAppend(res,convertArrayToFlatList(vars,index+1,vf));
+        then vf;
+    case (_,_,_)
+      equation
+        false = (index <= arrayLength(vars));
+        then res;
+    end matchcontinue;
+end convertArrayToFlatList;
+
+
+public function getAllOutputs
+  input QSSinfo qssInfo;
+  output list<Integer> vars_tuple;
+algorithm
+  vars_tuple :=
+    match (qssInfo)
+      local
+        array<list<list<Integer>>> outVars "output connections for each DEVS block";
+      case QSSINFO(_,DEVS_STRUCT(_,outVars,_,_),_,_)
+      then convertArrayToFlatList(outVars,1,{});
+    end match;
+end getAllOutputs;
+
 protected function replaceRowsArray
 "function: getListofZeroCrossings
   Takes as input the DAE and extracts the zero-crossings as well as the zero crosses that are 
@@ -3612,7 +3684,6 @@ protected function replaceRowsArray
 algorithm
   incidenceMatOut := matchcontinue (incidenceMat, rowsInd, newRows)
     local
-      
       Integer cur_ind;
       list<Integer> rest_ind, cur_row;
       list<list<Integer>> rest_rows;
@@ -3723,7 +3794,6 @@ algorithm
          (temp);
   end matchcontinue;
 end findElementInList;
-
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 /////  END OF PACKAGE
 ////////////////////////////////////////////////////////////////////////////////////////////////////

Compiler/susan_codegen/SimCode/SimCodeQSS.tpl

@@ -118,10 +118,10 @@ case SIMCODE(modelInfo=modelInfo as MODELINFO(varInfo=varInfo as  VARINFO(__)))
   startNonInteractiveSimulation(int, char**);
   int
   initRuntimeAndSimulation(int, char**);
+  <%generateIncidenceMatrix(BackendQSS.generateConnections(qssInfo))%>
   extern int interactiveSimulation;
-  char incidenceMatrix[0];
-  char inputMatrix[0];
-  char outputMatrix[0];
+  <%generateInputVars(BackendQSS.getAllInputs(qssInfo))%>
+  <%generateOutputVars(BackendQSS.getAllOutputs(qssInfo))%>
 
   #ifndef _OMC_OMPD
   int
@@ -132,7 +132,7 @@ case SIMCODE(modelInfo=modelInfo as MODELINFO(varInfo=varInfo as  VARINFO(__)))
     if (initRuntimeAndSimulation(argc, argv)) //initRuntimeAndSimulation returns 1 if an error occurs
       return 1;
 
-    if (interactiveSimuation) {
+    if (interactiveSimulation) {
       //cout << "startInteractiveSimulation: " << version << endl;
       retVal = startInteractiveSimulation(argc, argv);
     } else {
@@ -542,6 +542,9 @@ template generateZCExp(DAE.Exp exp, Context context, Text &preExp /*BUFP*/, Text
   <<
   <% sub %>
   >>
+  case e as CALL(path=IDENT(name="sample")) then
+  <<
+  >>
   else SimCodeC.error(sourceInfo(), 'Unhandled expression in SimCodeQSS.generateZCExp: <%ExpressionDump.printExpStr(exp)%>')
 end generateZCExp;
 
@@ -756,7 +759,7 @@ case SIMCODE(modelInfo=MODELINFO(__), makefileParams=MAKEFILE_PARAMS(__), simula
   let extraCflags = match sopt case SOME(s as SIMULATION_SETTINGS(__)) then
     '<%if s.measureTime then "-D_OMC_MEASURE_TIME "%> <%match s.method
        case "inline-euler" then "-D_OMC_INLINE_EULER"
-       case "inline-rungekutta" then "-D_OMC_INLINE_RK"%>'
+       case "inline-rungekutta" then "-D_OMC_INLINE_RK"%> -D_OMC_OMPD_LIB'
   <<
   # Makefile generated by OpenModelica
 
@@ -768,15 +771,15 @@ case SIMCODE(modelInfo=MODELINFO(__), makefileParams=MAKEFILE_PARAMS(__), simula
   EXEEXT=<%makefileParams.exeext%>
   DLLEXT=<%makefileParams.dllext%>
   CFLAGS_BASED_ON_INIT_FILE=<%extraCflags%>
-  CFLAGS=$(CFLAGS_BASED_ON_INIT_FILE) -I"<%makefileParams.omhome%>/include/omc" <%makefileParams.cflags%> -D_OMC_QSS -g
+  CFLAGS=$(CFLAGS_BASED_ON_INIT_FILE) -I"<%makefileParams.omhome%>/include/omc" <%makefileParams.cflags%> -D_OMC_QSS -g -D_OMC_OMPD
   LDFLAGS=-L"<%makefileParams.omhome%>/lib/omc" <%makefileParams.ldflags%>
   SENDDATALIBS=<%makefileParams.senddatalibs%>
   PERL=perl
 
   .PHONY: <%fileNamePrefix%>
   <%fileNamePrefix%>: <%fileNamePrefix%>.conv.cpp <%fileNamePrefix%>_functions.cpp <%fileNamePrefix%>_functions.h <%fileNamePrefix%>_records.c
   <%\t%> $(CXX) -I. -o <%fileNamePrefix%>$(EXEEXT) <%fileNamePrefix%>.conv.cpp <%fileNamePrefix%>_functions.cpp <%dirExtra%> <%libsPos1%> <%libsPos2%> -lsim_ompd -linteractive $(CFLAGS) $(SENDDATALIBS) $(LDFLAGS) <%match System.os() case "OSX" then "-lf2c" else "-Wl,-Bstatic -lf2c -Wl,-Bdynamic"%> <%fileNamePrefix%>_records.c 
-  <%fileNamePrefix%>.conv.cpp: <%fileNamePrefix%>.cpp
+  <%fileNamePrefix%>.conv.cpp: modelica_funcs.cpp
   <%\t%> $(PERL) <%makefileParams.omhome%>/share/omc/scripts/convert_lines.pl $< $@.tmp
   <%\t%> @mv $@.tmp $@
   >>
@@ -816,6 +819,46 @@ template simulationFunctionsFile(String filePrefix, list<Function> functions, li
   /* adpro: leave a newline at the end of file to get rid of warnings! */
 end simulationFunctionsFile;
 
+template generateIncidenceMatrix(list<list<Integer>> conns)
+"Generate the incidence matrix for the stand alone solver"
+::=
+  <<
+  int incidenceRows = <% listLength(conns) %>;
+  int incidenceMatrix[] = { <% conns |> c =>
+  <<
+  <% listNth(c,0) %>,<% listNth(c,2) %>
+  >>
+  ;separator="," %> }; 
+  >>
+end generateIncidenceMatrix;
+
+template generateInputVars(list<Integer> vars_tuple)
+"Generate the input vars for the stand alone solver"
+::=
+  <<
+  int inputMatrix[] = { <% vars_tuple |> i => 
+  << 
+  <% i %>
+  >>
+  ; separator="," %> };
+  int inputRows = <% intDiv(listLength(vars_tuple),2) %>;
+  >>
+end generateInputVars;
+
+template generateOutputVars(list<Integer> vars_tuple)
+"Generate the output vars for the stand alone solver"
+::=
+  <<
+  int outputMatrix[] = { <% vars_tuple |> i => 
+  << 
+  <% i %>
+  >>
+  ; separator="," %> };
+  int outputRows = <% intDiv(listLength(vars_tuple),2) %>;
+  >>
+end generateOutputVars;
+
+
 
 end SimCodeQSS;
 

Compiler/susan_codegen/SimCode/SimCodeTV.mo

@@ -27,6 +27,13 @@ package builtin
     output Integer c;
   end intAdd;
 
+
+  function intDiv
+    input Integer a;
+    input Integer b;
+    output Integer c;
+  end intDiv;
+
   function arrayList 
     replaceable type TypeVar subtypeof Any;    
     input TypeVar[:] arr;
@@ -1997,6 +2004,15 @@ package BackendQSS
     output list<BackendDAE.Var> states;
   end getStates;
 
+  function getAllInputs
+    input QSSinfo qssInfo;
+    output list<Integer> vars_tuple;
+  end getAllInputs;
+
+  function getAllOutputs
+    input QSSinfo qssInfo;
+    output list<Integer> vars_tuple;
+  end getAllOutputs;
 
 end BackendQSS;