Fixed so math functions works.

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@1564 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Mar 11, 2005 · 8a982c5 · 8a982c5
1 parent 6403b88
commit 8a982c5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/modeq/modpar/Codegen.cpp b/modeq/modpar/Codegen.cpp
@@ -288,6 +288,7 @@ void Codegen::generateSubTaskCode(VertexID task)
   InEdgeIterator e,e_end;
   int i;
   int parentSize = getParentSize(task,m_tg);
+
   vector<string> parentnames(parentSize);
   vector<EdgeID> parentEdges(in_degree(task,*m_tg));
 
@@ -462,6 +463,8 @@ void  Codegen::generateParallelMPIHeaders()
 		<< endl;
   m_cstreamFunc << "#define BARRIER MPI_Barrier(MPI_COMM_WORLD)" << endl;
 
+  m_cstreamFunc << "#define abs(x) fabs(x)" << endl;
+
 }
 
 void  Codegen::generateParallelMPIGlobals()
@@ -483,6 +486,7 @@ void Codegen::generateGlobals()
 {
   int numsteps = 100;
   m_cstream << "#include <stdlib.h>" << endl;
+  m_cstream << "#include <math.h>" << endl;
   m_cstream << "#include \"" << m_fileNameFunc << "\"" << endl << endl;
   m_cstream << "#include \"solvers.hpp\"" << endl;
   m_cstream << "#ifdef TIMING" << endl;

diff --git a/modeq/modpar/Schedule.cpp b/modeq/modpar/Schedule.cpp
@@ -391,7 +391,7 @@ void Schedule::tdsPass4()
 	temp = mergeTasks();
 
 	if (temp == -1) {
-	  cerr << "temp == -1, problem?" << endl;
+	  //cerr << "temp == -1, problem?" << endl;
 
 	} else {
 	  numProc-= temp;

diff --git a/modeq/modpar/TaskMerging.cpp b/modeq/modpar/TaskMerging.cpp
@@ -104,7 +104,7 @@ void TaskMerging::merge(TaskGraph *taskgraph, TaskGraph* orig_tg,
 
   while (m_change) {
     m_change=false;
-   mergeRules();
+     mergeRules();
   }
   new_size = num_vertices(*m_taskgraph);