- bugfix CombiTable2D

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@5087 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Mar 5, 2010 · a16418c · a16418c
1 parent 6440d84
commit a16418c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/c_runtime/tables.cpp b/c_runtime/tables.cpp
@@ -151,10 +151,10 @@ int omcTable2DIni(int ipoType,
 }
 
 extern "C"
-double omcTable2DIpo(int tableID,int icol, double irow)
+double omcTable2DIpo(int tableID,double u1_, double u2_)
 {
     if ((int)interpolationTables2D.size() != 0 && tableID >= 0 && tableID < (int)interpolationTables2D.size()) {
-    	return interpolationTables2D[tableID]->Interpolate(icol,irow-1);
+    	return interpolationTables2D[tableID]->Interpolate(u1_,u2_);
     } else { // error, unvalid tableID
     	if (acceptedStep) {
     		cerr << "in omcTable2DIpo, tableID " << tableID << " is not a valid table ID." << endl;
@@ -481,12 +481,12 @@ double InterpolationTable2D::Interpolate(double u1_, double u2_)
 /* test if u1 and u2 are strict growing */
 bool InterpolationTable2D::check_data(double u1_, double u2_)
 {
-	for(unsigned int i=1;i<nRows_-2;i++)
+	for(unsigned int i=1;i<nRows_-1;i++)
 	{
 		if(!(getElt(i,0)<getElt(i+1,0))) throw "u1 nicht streng monoton";
 	}
 
-	for(unsigned int i=1;i<nCols_-2;i++)
+	for(unsigned int i=1;i<nCols_-1;i++)
 	{
 		if(!(getElt(0,i)<getElt(0,i+1))) throw "u2 nicht streng monoton";
 	}

diff --git a/c_runtime/tables.h b/c_runtime/tables.h
@@ -59,7 +59,7 @@ double omcTableTimeTmin(int tableID);
 
 int omcTable2DIni(int ipoType,char *tableName,char* fileName, double *table,int tableDim1,int tableDim2,int colWise);
 
-double omcTable2DIpo(int tableID,int icol, double irow);
+double omcTable2DIpo(int tableID,double u1_, double u2_);
 
 
 #ifdef __cplusplus