- fixes to Makefiles to compile *.o when *.c* change

- made simulation_input.cpp read the <<tolerance>> from the Model_init.txt

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

Author: adrpo

c_runtime/Makefile

@@ -44,7 +44,10 @@ g++ -c -o sendData/libsendData.o sendData/humbug.cpp && \
 ar -ru sendData/release/libsendData.a sendData/libsendData.o
 endif
 
-all : libc_runtime.a libsim.a libf2c.a libsendData.a install
+all : $(SIMOBJS) $(OBJS) libc_runtime.a libsim.a libf2c.a libsendData.a install
+
+$(SIMOBJS) : $(HFILES) *.c*
+$(OBJS) : $(HFILES) *.c*
 
 libc_runtime.a : $(OBJS)
 	$(AR) $@ $(OBJS)

c_runtime/simulation_input.cpp

@@ -78,16 +78,21 @@ void read_commented_value(ifstream &f, char **str);
   }
   //  cerr << "opened file" << endl;
   read_commented_value(file,start);
+  if (sim_verbose) { cout << "read start = " << *start << " from init file." << endl; }
   read_commented_value(file,stop);
+  if (sim_verbose) { cout << "read stop = " << *stop << " from init file." << endl; }
   read_commented_value(file,stepSize);
-    
+  if (sim_verbose) { cout << "read stepSize = " << *stepSize << " from init file." << endl; }
   if (stepSize < 0) { // stepSize < 0 => Automatic number of outputs 
   	*outputSteps = -1;
   } else {
   	// Calculate outputSteps from stepSize, start and stop
-  *outputSteps = (long)(int(*stop-*start) /(*stepSize));
+    *outputSteps = (long)(int(*stop-*start) /(*stepSize));
   }
+  read_commented_value(file,tolerance);
+  if (sim_verbose) { cout << "read tolerance = " << *tolerance << " from init file." << endl; }
   read_commented_value(file,method);
+  if (sim_verbose) { cout << "read method = " << *method << " from init file." << endl; }
   int nxchk,nychk,npchk;
   int nystrchk,npstrchk;
   read_commented_value(file,&nxchk);