Changeset 12121

Timestamp:

04/24/12 21:45:58 (13 years ago)

Author:

Eric.Larour

Message:

Added new ContourToNodesx prototype to handle same functionality, but with DataSet* contours in input instead of just a simple Contour struct
Adapted InterpFromMeshToMesh2dx accordingly.

Location:

issm/trunk-jpl/src/c/modules

Files:

• ContourToNodesx/ContourToNodesx.cpp (modified) (1 diff)
• ContourToNodesx/ContourToNodesx.h (modified) (1 diff)
• InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp (modified) (3 diffs)
• InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.h (modified) (1 diff)

issm/trunk-jpl/src/c/modules/ContourToNodesx/ContourToNodesx.cpp ¶

@@ -38 +38 @@
         return 1;
 }
+
+int ContourToNodesx( Vector** pflags,double* x, double* y, int nods, DataSet* contours, int edgevalue){
+
+        int i;
+        int m,n;
+
+        /*Contour:*/
+        Contour* contouri=NULL;
+        int      numnodes;
+        double*  xc=NULL;
+        double*  yc=NULL;
+        double   value;
+
+        /*output: */
+        Vector* flags=NULL;
+
+        flags=new Vector(nods);
+
+        /*Loop through all contours: */
+        if(contours){
+                for (i=0;i<contours->Size();i++){
+                        Contour* contour=(Contour*)contours->GetObjectByOffset(i);
+                        IsInPoly(flags,contour->x,contour->y,contour->nods,x,y,0,nods,edgevalue);
+                }
+        }
+
+        /*Assemble vector: */
+        flags->Assemble();
+
+        /*Assign output pointers: */
+        *pflags=flags;
+        
+        return 1;
+}

issm/trunk-jpl/src/c/modules/ContourToNodesx/ContourToNodesx.h ¶

@@ -12 +12 @@
 /* local prototypes: */
 int ContourToNodesx( Vector** pflags,double* x, double* y, int nods, Contour** contours,int numcontours,int edgevalue);
+int ContourToNodesx( Vector** pflags,double* x, double* y, int nods, DataSet* contours, int edgevalue);
 
 #endif /* _CONTOURTONODESX_H */

issm/trunk-jpl/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();
         }

issm/trunk-jpl/src/c/modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.h ¶

@@ -10 +10 @@
 /* local prototypes: */
 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);
 
 #endif