Fixed bug in DAELow.lower_varkind, etc.

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

Compiler/DAELow.rml

@@ -1962,9 +1962,13 @@ relation lower_varkind: (DAE.VarKind, DAE.Type, Exp.ComponentRef, BinTree (* sta
 	-----------------------------
 	lower_varkind(DAE.VARIABLE,_,v,states) => STATE
 
-  axiom	lower_varkind(_,DAE.BOOL,_,_) => DISCRETE
 
-  axiom	lower_varkind(_,DAE.INT,_,_) => DISCRETE
+  axiom	lower_varkind(DAE.VARIABLE,DAE.BOOL,_,_) => DISCRETE
+
+  axiom	lower_varkind(DAE.DISCRETE,DAE.BOOL,_,_) => DISCRETE
+
+  axiom	lower_varkind(DAE.VARIABLE,DAE.INT,_,_) => DISCRETE
+  axiom	lower_varkind(DAE.DISCRETE,DAE.INT,_,_) => DISCRETE
 
   axiom	lower_varkind(DAE.VARIABLE,_,_,_) => VARIABLE
 

Compiler/TaskGraph.rml

@@ -137,6 +137,7 @@ with "Ceval.rml"
 with "Values.rml"
 with "Print.rml"
 with "VarTransform.rml"
+with "SimCodegen.rml"
 
 relation build_taskgraph: (DAELow.DAELow,  int vector, int vector, int list list) => () =
 
@@ -149,6 +150,7 @@ relation build_taskgraph: (DAELow.DAELow,  int vector, int vector, int list list
 	DAELow.vararray_list(vararr) =>  vars &
 	DAELow.vararray_list(knvararr) => knvars &
 	add_variables(vars,starttask) &
+	add_variables(knvars,starttask) &
 	add_variables([DAELow.VAR(Exp.CREF_IDENT("sim_time",[]),DAELow.VARIABLE,
                               DAE.INPUT,DAE.REAL,NONE,NONE,[],NONE,0,"time",[],NONE,NONE)],starttask) &
 	build_blocks(dae,ass1,ass2,blocks) &
@@ -346,7 +348,7 @@ relation build_equation:(DAELow.DAELow, int vector, int vector, int) => () =
 	--------------------------------
 	build_equation(DAELow.DAELOW(vars,_,eqns,_,_,_,_),ass1,ass2,e)	
 
-  rule	int_sub(e,1) => e' &
+(*  rule	int_sub(e,1) => e' &
 	DAELow.equation_nth(eqns,e') => DAELow.EQUATION(e1,e2) &
 	vector_nth(ass2,e') => v & (* v==variable no solved in this equation *)
 	int_sub(v,1) => v' &
@@ -356,7 +358,7 @@ relation build_equation:(DAELow.DAELow, int vector, int vector, int) => () =
 	print "nonlinear equation not implemented yet\n" 
 	--------------------------------
 	build_equation(DAELow.DAELOW(DAELow.VARIABLES(_,vararr,_,_),_,eqns,_,_,_,_),ass1,ass2,e) => fail
-
+*)
   rule	(* state nonlinear *)
 	int_sub(e,1) => e' &
 	DAELow.equation_nth(eqns,e') => DAELow.EQUATION(e1,e2) &
@@ -374,6 +376,22 @@ relation build_equation:(DAELow.DAELow, int vector, int vector, int) => () =
 	--------------------------------
 	build_equation(DAELow.DAELOW(vars,_,eqns,_,_,_,_),ass1,ass2,e)	
 
+  rule	(* Solving nonlinear for non-states *)
+	int_sub(e,1) => e' &
+	DAELow.equation_nth(eqns,e') => DAELow.EQUATION(e1,e2) &
+	vector_nth(ass2,e') => v &
+	(* v == variable no solved in this equation *)
+	int_sub(v,1) => v' &
+	DAELow.var_list(vars) => varlst &
+	list_nth(varlst,v') => (v as DAELow.VAR(cr,kind,_,_,_,_,_,_,_,origname,_,dae_var_attr,comment)) &  
+	is_non_state kind &
+	(*print "Solving for non-states\n" &*)
+	let varexp = Exp.CREF(cr,Exp.REAL) &
+	not Exp.solve(e1,e2,varexp) => expr &
+	build_nonlinear_equations([varexp],[Exp.BINARY(e1,Exp.SUB(Exp.REAL),e2)]) 
+	--------------------------------
+	build_equation(DAELow.DAELOW(vars,_,eqns,_,_,_,_),ass1,ass2,e)	
+
   rule	print "-build_equation failed\n" 
 	--------------------------------
 	build_equation(_,_,_,_) => fail
@@ -459,7 +477,7 @@ relation build_residual_code2:(Exp.Exp list,
   axiom	build_residual_code2([],_,_) => "" 
 
   rule	VarTransform.replace_exp(e,repl) => e' &
-	Exp.print_exp_str(e') => s1 &
+	SimCodegen.print_exp_cpp_str(e') => s1 &
 	pos + 1 => pos'  &
 	build_residual_code2(es,pos',repl) => s2 &
 	int_string(pos) => pstr &
@@ -665,6 +683,16 @@ relation build_expression:(Exp.Exp) => (int, string) =
  	---------------------------------
 	build_expression(Exp.CREF(cr,_)) => (tid,crs)
 
+  rule	(* special case for pow *)
+	build_expression(e1) => (t1,s1) &
+	real_int(rval) => ival &
+	int_string(ival) => istr &
+	Util.string_append_list(["pow(%s,",istr,")"]) => ts &
+	TaskGraphExt.new_task(ts) => t &
+	TaskGraphExt.add_edge(t1,t,s1,0) 
+	---------------------------
+	build_expression(Exp.BINARY(e1,Exp.POW(_),Exp.RCONST(rval))) => (t,"")
+
   rule	build_expression(e1) => (t1,s1) &
 	build_expression(e2) => (t2,s2) &
 	Exp.binop_symbol_1(op) => ops &
@@ -786,11 +814,11 @@ relation build_call_str:(string , int) => string =
 	build_call_str(str,n) => res
 end
 
-relation add_predecessors: (int, int list,string list,int (* prio*)) => () =
+relation add_predecessors: (int (* task*), int list (* list of precessors *),string list,int (* prio*)) => () =
 
 axiom add_predecessors(_,[],[],_) 
 
-  rule	TaskGraphExt.add_edge(t,t1,s,prio) &
+  rule	TaskGraphExt.add_edge(t1,t,s,prio) &
 	int_add(prio,1) => prio' &
 	add_predecessors(t,ts,strs,prio')
 	---------------------

Compiler/modpar/Codegen.cpp

@@ -552,21 +552,16 @@ void  Codegen::generateParallelMPIGlobals()
   m_cstreamFunc  << "extern int rank;" << endl;
   m_cstreamFunc  << "extern double x[];" << endl;
   m_cstreamFunc  << "extern double xd[];" << endl;
-<<<<<<< .mine
+  m_cstreamFunc  << "extern double y[];" << endl;
+  m_cstreamFunc  << "extern double p[];" << endl;
+  m_cstreamFunc  << "extern \"C\" {" << endl;
   m_cstreamFunc  <<  "void hybrd_(void (int*, double *, double*, int*)," << endl
 		 << "int* n, double* x,double* fvec,double* xtol,int* maxfev, " << endl
 		 << "int* ml,int* mu,double* epsfcn,double* diag,int* mode, double* factor, " << endl 
 		 << "int* nprint,int* info,int* nfev,double* fjac,int* ldfjac,double* r, " << endl 
 		 << "int* lr, double* qtf,double* wa1,double* wa2,double* wa3,double* wa4);" << endl;
+
   m_cstreamFunc << "}" << endl;
-=======
-  m_cstreamFunc  <<  "void hybrd_(void (int, double *, double*, int)," << endl
-		 << "int n, double* x,double* fvec,double xtol,int maxfev, " << endl
-		 << "int ml,int mu,double epsfcn,double* diag,int mode, double factor, " << endl 
-		 << "int nprint,int* info,int* nfev,double* fjac,int ldfjac,double* r, " << endl 
-		 << "int lr, double* qtf,double* wa1,double* wa2,double* wa3,double* wa4);" << endl;
-  m_cstreamFunc << "}" << endl;
->>>>>>> .r1786
   m_cstream << "/* MPI Global variables */" << endl;
   m_cstream << "MPI_Status status;" << endl;
   m_cstream << "MPI_Request request;" << endl;