Changeset 12475 for issm/trunk-jpl/src/c/shared/Matrix/MatrixUtils.cpp

Timestamp:

06/20/12 12:10:48 (13 years ago)

Author:

utke

Message:

type renames

File:

• issm/trunk-jpl/src/c/shared/Matrix/MatrixUtils.cpp (modified) (12 diffs)

issm/trunk-jpl/src/c/shared/Matrix/MatrixUtils.cpp

@@ -17 +17 @@
 
 /*FUNCTION TripleMultiply {{{*/
-int TripleMultiply( double* a, int nrowa, int ncola, int itrna, double* b, int nrowb, int ncolb, int itrnb, double* c, int nrowc, int ncolc, int itrnc, double* d, int iaddd){
+int TripleMultiply( IssmDouble* a, int nrowa, int ncola, int itrna, IssmDouble* b, int nrowb, int ncolb, int itrnb, IssmDouble* c, int nrowc, int ncolc, int itrnc, IssmDouble* d, int iaddd){
         /*TripleMultiply    Perform triple matrix product a*b*c+d.*/
         
         int idima,idimb,idimc,idimd;
-        double* dtemp;
+        IssmDouble* dtemp;
 
 /*  set up dimensions for triple product  */
@@ -62 +62 @@
 /*  perform the matrix triple product in the order that minimizes the
         number of multiplies and the temporary space used, noting that
-        (a*b)*c requires ac(b+d) multiplies and ac doubles, and a*(b*c)
-        requires bd(a+c) multiplies and bd doubles (both are the same for
+        (a*b)*c requires ac(b+d) multiplies and ac IssmDoubles, and a*(b*c)
+        requires bd(a+c) multiplies and bd IssmDoubles (both are the same for
         a symmetric triple product)  */
 
@@ -69 +69 @@
 
         if (idima*idimc*(idimb+idimd) <= idimb*idimd*(idima+idimc)) {
-                dtemp=xNew<double>(idima*idimc);
+                dtemp=xNew<IssmDouble>(idima*idimc);
 
                 MatrixMultiply(a,nrowa,ncola,itrna,b,nrowb,ncolb,itrnb,dtemp,0);
                 MatrixMultiply(dtemp,idima,idimc,0,c,nrowc,ncolc,itrnc,d,iaddd);
-                xDelete<double>(dtemp);
+                xDelete<IssmDouble>(dtemp);
         }
 
@@ -79 +79 @@
 
         else {
-                dtemp=xNew<double>(idimb*idimd);
+                dtemp=xNew<IssmDouble>(idimb*idimd);
 
                 MatrixMultiply(b,nrowb,ncolb,itrnb,c,nrowc,ncolc,itrnc,dtemp,0);
                 MatrixMultiply(a,nrowa,ncola,itrna,dtemp,idimb,idimd,0,d,iaddd);
-                xDelete<double>(dtemp);
+                xDelete<IssmDouble>(dtemp);
         }
 
@@ -89 +89 @@
 }/*}}}*/
 /*FUNCTION MatrixMuliply {{{*/
-int MatrixMultiply( double* a, int nrowa, int ncola, int itrna, double* b, int nrowb, int ncolb, int itrnb, double* c, int iaddc ){
+int MatrixMultiply( IssmDouble* a, int nrowa, int ncola, int itrna, IssmDouble* b, int nrowb, int ncolb, int itrnb, IssmDouble* c, int iaddc ){
         /*MatrixMultiply    Perform matrix multiplication a*b+c.*/
         int noerr=1;
@@ -158 +158 @@
 }/*}}}*/
 /*FUNCTION MatrixInverse {{{*/
-int MatrixInverse( double* a, int ndim, int nrow, double* b, int nvec, double* pdet ){
+int MatrixInverse( IssmDouble* a, int ndim, int nrow, IssmDouble* b, int nvec, IssmDouble* pdet ){
 /* MatrixInverse    Perform matrix inversion and linear equation solution.
 
@@ -172 +172 @@
         int i,j,k,ipt,jpt,irow,icol,ipiv,ncol;
         int *pivrc1,*pivrc2,*pindx;
-        double pivot,det,dtemp;
+        IssmDouble pivot,det,dtemp;
 
         if (!b && nvec) {
@@ -333 +333 @@
         return noerr;
 }/*}}}*/
-/*FUNCTION Matrix2x2Determinant(double* Adet,double* A) {{{*/
-void Matrix2x2Determinant(double* Adet,double* A){
+/*FUNCTION Matrix2x2Determinant(IssmDouble* Adet,IssmDouble* A) {{{*/
+void Matrix2x2Determinant(IssmDouble* Adet,IssmDouble* A){
         /*Compute determinant of a 2x2 matrix*/
 
@@ -341 +341 @@
 }
 /*}}}*/
-/*FUNCTION Matrix2x2Invert(double* Ainv,double* A) {{{*/
-void Matrix2x2Invert(double* Ainv,double* A){
+/*FUNCTION Matrix2x2Invert(IssmDouble* Ainv,IssmDouble* A) {{{*/
+void Matrix2x2Invert(IssmDouble* Ainv,IssmDouble* A){
 
         /*Intermediaries*/
-        double det;
+        IssmDouble det;
 
         /*Compute determinant*/
@@ -358 +358 @@
 
 }/*}}}*/
-/*FUNCTION Matrix3x3Determinant(double* Adet,double* A) {{{*/
-void Matrix3x3Determinant(double* Adet,double* A){
+/*FUNCTION Matrix3x3Determinant(IssmDouble* Adet,IssmDouble* A) {{{*/
+void Matrix3x3Determinant(IssmDouble* Adet,IssmDouble* A){
         /*Compute determinant of a 3x3 matrix*/
 
@@ -366 +366 @@
 }
 /*}}}*/
-/*FUNCTION Matrix3x3Invert(double* Ainv,double* A) {{{*/
-void Matrix3x3Invert(double* Ainv,double* A){
+/*FUNCTION Matrix3x3Invert(IssmDouble* Ainv,IssmDouble* A) {{{*/
+void Matrix3x3Invert(IssmDouble* Ainv,IssmDouble* A){
 
         /*Intermediaries*/
-        double det;
+        IssmDouble det;
 
         /*Compute determinant*/
@@ -388 +388 @@
 
 }/*}}}*/
-/*FUNCTION MatrixTranspose(double* Adet,double* A) {{{*/
-void MatrixTranspose(double* tA,double* A, int nrows, int ncols){
+/*FUNCTION MatrixTranspose(IssmDouble* Adet,IssmDouble* A) {{{*/
+void MatrixTranspose(IssmDouble* tA,IssmDouble* A, int nrows, int ncols){
         /*Transpose a n*m matrix*/