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

Timestamp:

08/31/12 17:23:24 (13 years ago)

Author:

Eric.Larour

Message:

NEW: large change to the code, to adapt to ADOLC requirements.

This change relates to the introduction of template classes and functions for the
Option.h abstract class. This is needed, because we want to make the Matlab
API independent from the libCore objects, which are dependent on the IssmDouble*
ADOLC type (adouble), when the Matlab API is dependent on the IssmPDouble* type (double).

To make them independent, we need to be able to specify at run time Options, Matrix and
Vector objects that hold either IssmDouble or IssmPDouble objects. The only way to do
that is through the use of templated classes for Option.h, Matrix and Vector.

The change gets rid of a lot of useless code (especially in the classes/objects/Options
directory), by introducing template versions of the same code.

The bulk of the changes to src/modules and src/mex modules is to adapt to this
new runtime declaration of templated Matrix, Vector and Option objects.

File:

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

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

@@ -20 +20 @@
 /*}}}*/
 
-void TriMeshx(Matrix** pindex,Vector** px,Vector** py,Matrix** psegments,Vector** psegmentmarkerlist,DataSet* domain,DataSet* rifts,double area){
+void TriMeshx(Matrix<IssmDouble>** pindex,Vector<IssmDouble>** px,Vector<IssmDouble>** py,Matrix<IssmDouble>** psegments,Vector<IssmDouble>** psegmentmarkerlist,DataSet* domain,DataSet* rifts,double area){
 
         /*indexing: */
@@ -27 +27 @@
         /*output: */
         double* index=NULL;
-        Matrix* index_matrix=NULL;
+        Matrix<IssmDouble>* index_matrix=NULL;
         double* x=NULL;
         double* y=NULL;
         double* segments=NULL;
-        Matrix* segments_matrix=NULL;
+        Matrix<IssmDouble>* segments_matrix=NULL;
         double* segmentmarkerlist=NULL;
 
@@ -192 +192 @@
 
         /*Output : */
-        index_matrix=new Matrix(index,out.numberoftriangles,3,1,SeqMatType);
+        index_matrix=new Matrix<IssmDouble>(index,out.numberoftriangles,3,1,SeqMatType);
         *pindex=index_matrix;
         
-        segments_matrix=new Matrix(segments,out.numberofsegments,3,1,SeqMatType);
+        segments_matrix=new Matrix<IssmDouble>(segments,out.numberofsegments,3,1,SeqMatType);
         *psegments=segments_matrix;
 
-        *px=new Vector(x,out.numberofpoints,SeqMatType);
-        *py=new Vector(y,out.numberofpoints,SeqMatType);
-        *psegmentmarkerlist=new Vector(segmentmarkerlist,out.numberofsegments,SeqMatType);
+        *px=new Vector<IssmDouble>(x,out.numberofpoints,SeqMatType);
+        *py=new Vector<IssmDouble>(y,out.numberofpoints,SeqMatType);
+        *psegmentmarkerlist=new Vector<IssmDouble>(segmentmarkerlist,out.numberofsegments,SeqMatType);
 }