Changeset 11322 for issm/trunk-jpl/src/c/objects/Numerics/ElementMatrix.cpp

Timestamp:

02/06/12 07:45:50 (13 years ago)

Author:

Mathieu Morlighem

Message:

Added Newton's method for Pattyn, parallel only for now, to be improved

File:

• issm/trunk-jpl/src/c/objects/Numerics/ElementMatrix.cpp (modified) (2 diffs)

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

@@ -245 +245 @@
 
 /*ElementMatrix specific routines: */
-/*FUNCTION ElementMatrix::AddToGlobal{{{1*/
+/*FUNCTION ElementMatrix::AddToGlobal(Mat Kff, Mat Kfs){{{1*/
 void ElementMatrix::AddToGlobal(Mat Kff, Mat Kfs){
 
@@ -294 +294 @@
 }
 /*}}}*/
+/*FUNCTION ElementMatrix::AddToGlobal(Mat Jff){{{1*/
+void ElementMatrix::AddToGlobal(Mat Jff){
+
+        int i,j;
+        double* localvalues=NULL;
+
+        /*In debugging mode, check consistency (no NaN, and values not too big)*/
+        this->CheckConsistency();
+
+        if(this->dofsymmetrical){
+                /*only use row dofs to add values into global matrices: */
+
+                if(this->row_fsize){
+                        /*first, retrieve values that are in the f-set from the g-set values matrix: */
+                        localvalues=(double*)xmalloc(this->row_fsize*this->row_fsize*sizeof(double));
+                        for(i=0;i<this->row_fsize;i++){
+                                for(j=0;j<this->row_fsize;j++){
+                                        *(localvalues+this->row_fsize*i+j)=*(this->values+this->ncols*this->row_flocaldoflist[i]+this->row_flocaldoflist[j]);
+                                }
+                        }
+                        /*add local values into global  matrix, using the fglobaldoflist: */
+                        MatSetValues(Jff,this->row_fsize,this->row_fglobaldoflist,this->row_fsize,this->row_fglobaldoflist,(const double*)localvalues,ADD_VALUES);
+
+                        /*Free ressources:*/
+                        xfree((void**)&localvalues);
+                }
+
+        }
+        else{
+                _error_(" non dofsymmetrical matrix AddToGlobal routine not support yet!");
+        }
+
+}
+/*}}}*/
 /*FUNCTION ElementMatrix::CheckConsistency{{{1*/
 void ElementMatrix::CheckConsistency(void){