Removed tornado specific code from trunk. Now only exist on branches/mathcore_tornado

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

Author: Peter Aronsson

c_runtime/Makefile

@@ -10,7 +10,19 @@ FSRCS = daux.f \
           ddassl.f \
           dlamch.f \
           dlinpk.f \
-          lsame.f
+          lsame.f \
+          dogleg.f \
+          dpmpar.f \
+	  enorm.f \
+	  fdjac1.f \
+ 	  hybrd1.f \
+	  hybrd.f \
+	  hybrj.f \
+	  qform.f \
+	  qrfac.f \
+ 	  r1mpyq.f \
+	  r1updt.f 
+	  
 FOBJS = $(patsubst %.f,%.o,$(FSRCS))
 
 OBJS = $(FOBJS) boolean_array.o index_spec.o integer_array.o memory_pool.o \

modeq/.depend

@@ -1,4 +1,5 @@
 absyn.o: absyn.rml debug.sig dump.sig util.sig print.sig
+abb_come.o: abb_come.rml daelow.sig exp.sig
 algorithm.o: algorithm.rml exp.sig types.sig explode.sig util.sig print.sig dump.sig debug.sig
 builtin.o: builtin.rml absyn.sig explode.sig env.sig types.sig classinf.sig debug.sig print.sig
 ceval.o: ceval.rml env.sig exp.sig interactive.sig values.sig daelow.sig simcodegen.sig staticexp.sig print.sig types.sig modutil.sig system.sig absyn.sig explode.sig inst.sig lookup.sig dump.sig dae.sig debug.sig util.sig modsim.sig classinf.sig rtopts.sig parse.sig prefix.sig codegen.sig classloader.sig derive.sig
@@ -27,7 +28,7 @@ prefix.o: prefix.rml absyn.sig exp.sig env.sig lookup.sig util.sig print.sig
 staticexp.o: staticexp.rml absyn.sig exp.sig explode.sig types.sig env.sig values.sig interactive.sig classinf.sig dump.sig print.sig system.sig lookup.sig debug.sig inst.sig codegen.sig modutil.sig dae.sig util.sig rtopts.sig parse.sig classloader.sig mod.sig prefix.sig ceval.sig
 simcodegen.o: simcodegen.rml dae.sig daelow.sig absyn.sig exp.sig util.sig rtopts.sig debug.sig system.sig values.sig codegen.sig print.sig modutil.sig
 types.o: types.rml classinf.sig absyn.sig exp.sig values.sig explode.sig dump.sig debug.sig print.sig util.sig staticexp.sig
-taskgraph.o: taskgraph.rml exp.sig daelow.sig taskgraphext.sig util.sig absyn.sig dae.sig ceval.sig values.sig print.sig
+taskgraph.o: taskgraph.rml exp.sig daelow.sig taskgraphext.sig util.sig absyn.sig dae.sig ceval.sig values.sig print.sig vartransform.sig
 tornado.o: tornado.rml dae.sig absyn.sig interactive.sig util.sig system.sig daelow.sig exp.sig debug.sig rtopts.sig inst.sig values.sig tornadoext.sig explode.sig lookup.sig env.sig simcodegen.sig dump.sig tornadocodegen.sig
 tornadocodegen.o: tornadocodegen.rml dae.sig absyn.sig daelow.sig exp.sig interactive.sig util.sig system.sig debug.sig rtopts.sig inst.sig values.sig tornadoext.sig tornado.sig explode.sig lookup.sig env.sig simcodegen.sig dump.sig
 util.o: util.rml

modeq/Makefile.common

@@ -20,7 +20,7 @@ AST	= $(srcdir)/absyn_builder/absyn_builder.a
 RTOBJ   = $(srcdir)/runtime/systemimpl.o $(srcdir)/../c_runtime/libc_runtime.a \
 	$(srcdir)/runtime/rtopts.o $(srcdir)/runtime/socketimpl.o \
 	$(srcdir)/runtime/printimpl.o $(srcdir)/runtime/ptolemyio.o \
-	$(srcdir)/runtime/daeext.o $(srcdir)/runtime/tornadoext.o $(CORBAOBJ) \
+	$(srcdir)/runtime/daeext.o $(CORBAOBJ) \
 	$(srcdir)/modpar/libmodpar.a
 
 SRCRML= absyn.rml \
@@ -53,14 +53,12 @@ SRCRML= absyn.rml \
 	simcodegen.rml \
 	types.rml \
 	taskgraph.rml \
-	tornado.rml \
-	tornadocodegen.rml \
 	util.rml \
 	values.rml \
 	vartransform.rml
 
 ALLRML = $(SRCRML) daeext.rml print.rml rtopts.rml system.rml parse.rml \
-		taskgraphext.rml corba.rml socket.rml tornadoext.rml
+		taskgraphext.rml corba.rml socket.rml 
 
 SRCC=	$(SRCRML:.rml=.c)
 SRCH=	$(SRCRML:.rml=.h)

modeq/builtin.rml

@@ -717,16 +717,6 @@ val array2real= (Types.T_FUNCTION([("x",(Types.T_ARRAY(Types.DIM(SOME(1)),(Types
  val array8dimbool2array1dimint = (Types.T_FUNCTION([("x",(Types.T_ARRAY(Types.DIM(SOME(8)),(Types.T_BOOL([]),NONE)),NONE))], (Types.T_ARRAY(Types.DIM(SOME(1)),(Types.T_INTEGER([]),NONE)),NONE)),NONE)
  val array9dimbool2array1dimint = (Types.T_FUNCTION([("x",(Types.T_ARRAY(Types.DIM(SOME(9)),(Types.T_BOOL([]),NONE)),NONE))], (Types.T_ARRAY(Types.DIM(SOME(1)),(Types.T_INTEGER([]),NONE)),NONE)),NONE)
 
-val dymTableTimeIni_type = (Types.T_FUNCTION([("time",(Types.T_REAL([]),NONE)),
-					     ("ipoType",(Types.T_INTEGER([]),NONE)),
-					     ("tableName",(Types.T_STRING([]),NONE)),
-					     ("fileName",(Types.T_STRING([]),NONE)),
-					     ("tableIn",(Types.T_ARRAY(Types.DIM(SOME(2)),(Types.T_REAL([]),NONE)),NONE)),
-					     ("colWiseIn",(Types.T_INTEGER([]),NONE)) 
-], 
-(Types.T_REAL([]),NONE) (* return type *)
-),NONE)
-					     
 
 
 (*
@@ -1322,13 +1312,9 @@ relation initial_env =
 	Env.extend_frame_t(env, "skew", array1dimreal2array3dimreal)		      => env &
 
 	Env.extend_frame_t(env, "sqrt", int2real)			              => env & 
-	Env.extend_frame_t(env, "sqrt", real2real)			              => env &
-
+	Env.extend_frame_t(env, "sqrt", real2real)			              => env 
 
-	(* Dymola specific external functions. Needed to generaete tornado code *)			    
-	Env.extend_frame_t(env, "dymTableTimeIni",dymTableTimeIni_type) => env			    
 
-				    
 (*Debug.	Print.print_buf "\n Just AFTER the built in array functions part." *)
 	----------------------------------------------
 	initial_env () => env

modeq/ceval.rml

@@ -149,7 +149,6 @@ See http://www.ida.liu.se/~pelab/modelica/OpenModelica.html
 
   end
 
-with "abb_come.rml"
 with "daelow.rml"
 with "simcodegen.rml"
 with "staticexp.rml"

modeq/main.rml

@@ -139,7 +139,6 @@ with "system.rml"
 with "util.rml"
 with "taskgraph.rml"
 with "taskgraphext.rml" 
-with "tornado.rml"
 with "simcodegen.rml"
 
 (** relation: server_loop
@@ -356,8 +355,6 @@ end
 (** relation: transform_if_flat
  ** Checks is a modelica file is a flat modelica file
  ** and if so, translates all variables on the form a.b.c to a_b_c
- ** This is needed to prevent tornado code generation from beliving
- ** that those variables belong to subcomponents.
  **)
 relation transform_if_flat: (string, DAE.DAElist) => DAE.DAElist =
 
@@ -411,18 +408,6 @@ end
 
 relation translate_file : string list => () =
 
-  rule	(* for tornado code generation, MathCode project*)
-	is_modelica_file(f) &
-	run_tornado_cg_q() => true 
-	& Parser.parse f => p
-	& SCode.elaborate(p) => p'
-	& Inst.instantiate(p') => d
-	(*& transform_if_flat(f,d) => d *)
-	& Absyn.last_classname(p) => cname
-	& Tornado.generate_code(p,d,cname) 
-	----------------------------
-	translate_file [f] 
-
   rule	(*Print.print_buf "Parsing\n" &	 *)
 	is_modelica_file(f) 
 	& Parser.parse f => p
@@ -522,16 +507,6 @@ relation translate_file : string list => () =
 
 end
 
-
-(* Determine if tornado code generation should be used*)
-relation run_tornado_cg_q:() => bool =
-
-  rule	RTOpts.tornado_cg => res
-	------------------------
-	run_tornado_cg_q() => res
-end
-
-
 (* Determine if backend, i.e. BLT etc. should be run.
 It should be run if either "blt" flag is set or if 
 parallelization is enabled by giving flag -n=<no proc.>

modeq/rtopts.rml

@@ -129,7 +129,6 @@ module RTOpts:
   relation no_proc: () => int 	  
   relation latency:() => real
   relation bandwidth: () => real	  
-  relation tornado_cg: () => bool
   relation simulation_cg: () => bool
   relation silent: () => bool  	  
 end

modeq/runtime/rtopts.c

@@ -19,7 +19,6 @@ static int debug_none;
 int nproc;
 double latency=0.0;
 double bandwidth=0.0;
-int tornado_cg;
 int simulation_cg;
 int silent;
 
@@ -33,7 +32,6 @@ void RTOpts_5finit(void)
   debug_all = 0;
   debug_none = 1;
   nproc = 0;
-  tornado_cg = 0;
   simulation_cg = 0;
   silent = 0;
 }
@@ -150,10 +148,6 @@ RML_BEGIN_LABEL(RTOpts__args)
 	split_arrays = 0;
 	type_info = 0;
 	break;
-      case 'c':
-	tornado_cg = 1;
-	/*modelica_output = 1;*/
-	break;
       case 's':
 	simulation_cg = 1;
 	break;
@@ -242,15 +236,7 @@ RML_END_LABEL
 
 RML_BEGIN_LABEL(RTOpts__modelica_5foutput)
 {
-/*  this check is needed for not generating variable of the  */
-/*  form a_b_c. The tornado implementation needs the variable */
-/*  of the form a.b.c */
-  if(tornado_cg)
-    {
-      rmlA0 = RML_PRIM_MKBOOL(0);
-    }else{
-      rmlA0 = RML_PRIM_MKBOOL(modelica_output);
-    }
+  rmlA0 = RML_PRIM_MKBOOL(modelica_output);
   RML_TAILCALLK(rmlSC);
 }
 RML_END_LABEL
@@ -325,13 +311,6 @@ RML_BEGIN_LABEL(RTOpts__bandwidth)
 }
 RML_END_LABEL
 
-RML_BEGIN_LABEL(RTOpts__tornado_5fcg)
-{
-  rmlA0 = RML_PRIM_MKBOOL(tornado_cg);
-  RML_TAILCALLK(rmlSC);
-}
-RML_END_LABEL
-
 RML_BEGIN_LABEL(RTOpts__simulation_5fcg)
 {
   rmlA0 = RML_PRIM_MKBOOL(simulation_cg);

modeq/simcodegen.rml

@@ -1021,15 +1021,9 @@ end
   axiom	print_exp2_str(Exp.BCONST(true),_) => "true"
 
 
-  rule  RTOpts.tornado_cg => true &
-         cref_modelica_str(c) => res 
-         --------------------------------
-         print_exp2_str(Exp.CREF(c,_),_) => res
- 
-  rule  
-	     Exp.print_component_ref_str c => res
-         --------------------------------
-         print_exp2_str(Exp.CREF(c,_),_) => res
+  rule	Exp.print_component_ref_str c => res
+        --------------------------------
+        print_exp2_str(Exp.CREF(c,_),_) => res
 
   rule  Exp.binop_symbol(op) => sym &
  	 Exp.binop_priority(op) => pri2' &