Changeset 6027

Timestamp:

09/24/10 11:56:20 (15 years ago)

Author:

Mathieu Morlighem

Message:

Added Transpose method

Location:

issm/trunk/src/c/objects/Numerics

Files:

• ElementMatrix.cpp (modified) (2 diffs)
• ElementMatrix.h (modified) (1 diff)
• ElementVector.cpp (modified) (1 diff)
• ElementVector.h (modified) (1 diff)

issm/trunk/src/c/objects/Numerics/ElementMatrix.cpp

@@ -250 +250 @@
 
 /*ElementMatrix specific routines: */
-/*FUNCTION ElementMatrix::AddValues{{{1*/
-void ElementMatrix::AddValues(double* Ke_gg){
-
-        if(Ke_gg){
-                for (int i=0;i<this->nrows;i++){
-                        for(int j=0;j<this->ncols;j++){
-                                *(this->values+this->ncols*i+j)+=*(Ke_gg+this->ncols*i+j);
-                        }
-                }
-        }
-}
-/*}}}*/
 /*FUNCTION ElementMatrix::AddToGlobal{{{1*/
 void ElementMatrix::AddToGlobal(Mat Kgg, Mat Kff, Mat Kfs){
@@ -327 +315 @@
 }
 /*}}}*/
+/*FUNCTION ElementMatrix::Transpose{{{1*/
+void ElementMatrix::Transpose(void){
+
+        /*Intermediaries*/
+        double *values_copy=NULL;
+        int     temp;
+
+        /*Transpose indices*/
+        if(!dofsymmetrical){
+                ISSMERROR("not supported yet");
+        }
+
+        /*Transpose values*/
+        values_copy=(double*)xmalloc(this->nrows*this->ncols*sizeof(double));
+        memcpy(values_copy,this->values,this->nrows*this->ncols*sizeof(double));
+        for (int i=0;i<this->nrows;i++) for(int j=0;j<this->ncols;j++) this->values[j*this->nrows+i]=values_copy[i*this->ncols+j];
+
+        /*Update sizes*/
+        temp=this->nrows;
+        this->nrows=this->ncols;
+        this->ncols=temp;
+
+        /*Clean up and return*/
+        xfree((void**)&values_copy);
+}
+/*}}}*/
 /*FUNCTION ElementMatrix::Echo{{{1*/
 void ElementMatrix::Echo(void){

issm/trunk/src/c/objects/Numerics/ElementMatrix.h

@@ -58 +58 @@
                 /*}}}*/
                 /*ElementMatrix specific routines {{{1*/
-                void AddValues(double* Ke_gg);
                 void AddToGlobal(Mat Kgg, Mat Kff, Mat Kfs);
                 void Echo(void);
                 void CheckConsistency(void);
+                void Transpose(void);
                 void Init(ElementMatrix* Ke);
                 /*}}}*/

issm/trunk/src/c/objects/Numerics/ElementVector.cpp

@@ -170 +170 @@
 
 /*ElementVector specific routines: */
-/*FUNCTION ElementVector::AddValues(double* Ke_gg){{{1*/
-void ElementVector::AddValues(double* pe_gg){
-
-        int i,j;
-
-        if(pe_gg){
-                for (i=0;i<this->nrows;i++){
-                        this->values[i]+=pe_gg[i];
-                }
-        }
-}
-/*}}}*/
 /*FUNCTION ElementVector::AddToGlobal(Vec pg, Vec pf){{{1*/
 void ElementVector::AddToGlobal(Vec pg, Vec pf){

issm/trunk/src/c/objects/Numerics/ElementVector.h

@@ -41 +41 @@
                 /*}}}*/
                 /*ElementVector specific routines {{{1*/
-                void AddValues(double* pe_gg);
                 void AddToGlobal(Vec pg, Vec pf);
                 void Echo(void);