Changeset 12330 for issm/trunk/src/c/modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp

Timestamp:

06/01/12 17:26:03 (13 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 12326M

File:

• issm/trunk/src/c/modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp (modified) (3 diffs)

issm/trunk/src/c/modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp

@@ -14 +14 @@
 
 int InterpFromMeshToMesh2dx(double** pdata_interp,double* index_data,double* x_data,double* y_data,int nods_data,int nels_data,
-                        double* data,int data_rows,int data_cols,double* x_interp,double* y_interp,int nods_interp,double* default_values,int num_default_values, Contour** contours, int numcontours){
+                        double* data,int data_rows,int data_cols,double* x_interp,double* y_interp,int nods_interp,double* default_values,int num_default_values, DataSet* contours){
         
         /*Output*/
@@ -36 +36 @@
         bool   skip_bamg=false;
 
-
         /*Checks*/
         if (data_cols<=0){
@@ -50 +49 @@
         /*If default values supplied, figure out which nodes are inside the contour, including the border of the contour: */
         if(num_default_values){
-                ContourToNodesx( &vec_incontour,x_interp,y_interp,nods_interp,contours,numcontours,1);
+                ContourToNodesx( &vec_incontour,x_interp,y_interp,nods_interp,contours,1);
                 incontour=vec_incontour->ToMPISerial();
         }