Changeset 13220 for issm/trunk-jpl/src/c/modules/TriMeshx/TriMeshx.cpp

Timestamp:

09/02/12 01:29:13 (13 years ago)

Author:

Eric.Larour

Message:

CHG: adjustments to compile the Matlab and Python modules when ADOLC is on.
Had to template MeshPartitionx, because it's used in both modules and the core code.
Had to template Contour too, same reason.
Had to default to ISSMPDouble type for modules such as InterpFromMesh2d* InterpFromGridToMeshx*, etc ..., which
only show up in the Matlab modules.

File:

• issm/trunk-jpl/src/c/modules/TriMeshx/TriMeshx.cpp (modified) (10 diffs)

issm/trunk-jpl/src/c/modules/TriMeshx/TriMeshx.cpp

@@ -20 +20 @@
 /*}}}*/
 
-void TriMeshx(Matrix<IssmDouble>** pindex,Vector<IssmDouble>** px,Vector<IssmDouble>** py,Matrix<IssmDouble>** psegments,Vector<IssmDouble>** psegmentmarkerlist,DataSet* domain,DataSet* rifts,double area){
+void TriMeshx(Matrix<IssmPDouble>** pindex,Vector<IssmPDouble>** px,Vector<IssmPDouble>** py,Matrix<IssmPDouble>** psegments,Vector<IssmPDouble>** psegmentmarkerlist,DataSet* domain,DataSet* rifts,double area){
 
         /*indexing: */
@@ -26 +26 @@
 
         /*output: */
-        double* index=NULL;
-        Matrix<IssmDouble>* index_matrix=NULL;
+        IssmPDouble* index=NULL;
+        Matrix<IssmPDouble>* index_matrix=NULL;
         double* x=NULL;
         double* y=NULL;
         double* segments=NULL;
-        Matrix<IssmDouble>* segments_matrix=NULL;
+        Matrix<IssmPDouble>* segments_matrix=NULL;
         double* segmentmarkerlist=NULL;
 
         /*intermediary: */
         int      counter,counter2,backcounter;
-        Contour* contour=NULL;
+        Contour<IssmPDouble>* contour=NULL;
 
         /* Triangle structures needed to call Triangle library routines: */
@@ -45 +45 @@
         in.numberofpoints=0;
         for (i=0;i<domain->Size();i++){
-                contour=(Contour*)domain->GetObjectByOffset(i);
+                contour=(Contour<IssmPDouble>*)domain->GetObjectByOffset(i);
                 in.numberofpoints+=contour->nods-1;
         }
         for (i=0;i<rifts->Size();i++){
-                contour=(Contour*)rifts->GetObjectByOffset(i);
+                contour=(Contour<IssmPDouble>*)rifts->GetObjectByOffset(i);
                 in.numberofpoints+=contour->nods;
         }
@@ -61 +61 @@
         counter=0;
         for (i=0;i<domain->Size();i++){
-                contour=(Contour*)domain->GetObjectByOffset(i);
+                contour=(Contour<IssmPDouble>*)domain->GetObjectByOffset(i);
                 for (j=0;j<contour->nods-1;j++){
                         in.pointlist[2*counter+0]=contour->x[j];
@@ -69 +69 @@
         }
         for (i=0;i<rifts->Size();i++){
-                contour=(Contour*)rifts->GetObjectByOffset(i);
+                contour=(Contour<IssmPDouble>*)rifts->GetObjectByOffset(i);
                 for (j=0;j<contour->nods;j++){
                         in.pointlist[2*counter+0]=contour->x[j];
@@ -88 +88 @@
         in.numberofsegments=0;
         for (i=0;i<domain->Size();i++){
-                contour=(Contour*)domain->GetObjectByOffset(i);
+                contour=(Contour<IssmPDouble>*)domain->GetObjectByOffset(i);
                 in.numberofsegments+=contour->nods-1;
         }
         for(i=0;i<rifts->Size();i++){
-                contour=(Contour*)rifts->GetObjectByOffset(i);
+                contour=(Contour<IssmPDouble>*)rifts->GetObjectByOffset(i);
                 /*for rifts, we have one less segment as we have vertices*/
                 in.numberofsegments+=contour->nods-1;
@@ -102 +102 @@
         backcounter=0;
         for (i=0;i<domain->Size();i++){
-                contour=(Contour*)domain->GetObjectByOffset(i);
+                contour=(Contour<IssmPDouble>*)domain->GetObjectByOffset(i);
                 for (j=0;j<contour->nods-2;j++){
                         in.segmentlist[2*counter+0]=counter;
@@ -118 +118 @@
         counter2=counter;
         for (i=0;i<rifts->Size();i++){
-                contour=(Contour*)rifts->GetObjectByOffset(i);
+                contour=(Contour<IssmPDouble>*)rifts->GetObjectByOffset(i);
                 for (j=0;j<(contour->nods-1);j++){
                         in.segmentlist[2*counter2+0]=counter;
@@ -137 +137 @@
                 in.holelist = xNew<REAL>(in.numberofholes*2);
                 for (i=0;i<domain->Size()-1;i++){
-                        contour=(Contour*)domain->GetObjectByOffset(i+1);
+                        contour=(Contour<IssmPDouble>*)domain->GetObjectByOffset(i+1);
                         GridInsideHole(&in.holelist[2*i+0],&in.holelist[2*i+1],contour->nods-1,contour->x,contour->y);
                 }
@@ -192 +192 @@
 
         /*Output : */
-        index_matrix=new Matrix<IssmDouble>(index,out.numberoftriangles,3,1,SeqMatType);
+        index_matrix=new Matrix<IssmPDouble>(index,out.numberoftriangles,3,1.0,SeqMatType);
         *pindex=index_matrix;
         
-        segments_matrix=new Matrix<IssmDouble>(segments,out.numberofsegments,3,1,SeqMatType);
+        segments_matrix=new Matrix<IssmPDouble>(segments,out.numberofsegments,3,1.0,SeqMatType);
         *psegments=segments_matrix;
 
-        *px=new Vector<IssmDouble>(x,out.numberofpoints,SeqMatType);
-        *py=new Vector<IssmDouble>(y,out.numberofpoints,SeqMatType);
-        *psegmentmarkerlist=new Vector<IssmDouble>(segmentmarkerlist,out.numberofsegments,SeqMatType);
+        *px=new Vector<IssmPDouble>(x,out.numberofpoints,SeqMatType);
+        *py=new Vector<IssmPDouble>(y,out.numberofpoints,SeqMatType);
+        *psegmentmarkerlist=new Vector<IssmPDouble>(segmentmarkerlist,out.numberofsegments,SeqMatType);
 }