changed the generate_init_data to use tolerance and output-steps

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@2151 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Feb 21, 2006 · 18ab58a · 18ab58a
1 parent 6795522
commit 18ab58a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/Compiler/Ceval.rml b/Compiler/Ceval.rml
@@ -2041,9 +2041,7 @@ relation calculate_simulation_settings: (Env.Env,Exp.Exp,
 	  => (Values.INTEGER(interval_i),SOME(st)) &
 	   ceval(env,method,true,SOME(st),NONE,msg) 
 	  => (Values.STRING(method_str),SOME(st)) &
-	   real_sub(stoptime_r,starttime_r) => delta_time &
 	 int_real(interval_i) => interval_r &
-	 real_div(delta_time,interval_r) => stepsize_r &
 	 Util.string_append_list([prefix_str,"_init.txt"]) => init_filename 
         ---------------------------------
         calculate_simulation_settings(env, 
@@ -2053,7 +2051,7 @@ relation calculate_simulation_settings: (Env.Env,Exp.Exp,
                                       st as Interactive.SYMBOLTABLE(p,sp,ic,iv,cf),
                                       msg,
                                       cname_str)
-          => (init_filename,starttime_r,stoptime_r,stepsize_r,method_str)
+          => (init_filename,starttime_r,stoptime_r,interval_r,method_str)
 
   rule  Print.print_error_buf("# calculate_simulation_settings failed\n")
         ----------------------------------
@@ -2091,11 +2089,12 @@ relation build_model:(Env.Env,
 
         Exp.unelab_cref(cr) => a_cref &
         change_to_file_dir(a_cref,p) &
-        calculate_simulation_settings(env,exp,st,msg,cname_str) => (init_filename,starttime_r,
-                                                                    stoptime_r,stepsize_r,method_str) &
+        calculate_simulation_settings(env,exp,st,msg,cname_str) 
+          => (init_filename,starttime_r,
+              stoptime_r,interval_r,method_str) &
 
 	SimCodegen.generate_init_data(indexed_dlow',classname,init_filename,
-				      starttime_r,stoptime_r,stepsize_r) &
+				      starttime_r,stoptime_r,interval_r) &
         extract_file_prefix(env,fileprefix,st,msg) => filenameprefix &
         generate_makefilename(filenameprefix) => makefilename &
         (*	Util.string_append_list(["make -f ",cname_str, ".makefile\n"]) => s_call &

diff --git a/Compiler/SimCodegen.rml b/Compiler/SimCodegen.rml
@@ -3137,10 +3137,12 @@ relation generate_init_data: (DAELow.DAELow, Absyn.Path(* classname *),
 			      string(* filename *),
 			      real, (* start time*)
 			      real, (* stop time *)
-			      real) (* step size *)
+			      real) (* �ntervals *)
 	  => () =
 
-   rule	real_string(start) => start_str &
+  rule  real_sub(stop,start) => delta_time &
+	real_div(delta_time,intervals) => step &
+	real_string(start) => start_str &
 	real_string(stop) => stop_str &
 	real_string(step) => step_str &
  	DAELow.calculate_sizes(dlow) => (nx,ny,np,_) &
@@ -3157,7 +3159,7 @@ relation generate_init_data: (DAELow.DAELow, Absyn.Path(* classname *),
  				 init_str]) => str &
  	System.write_file(filename,str) 
  	--------------------------
- 	generate_init_data(dlow,class,filename,start,stop,step)
+ 	generate_init_data(dlow,class,filename,start,stop,intervals)
 
   rule	print "-generate_init_data failed\n"
  	------------------------------------