Changeset 12004 for issm/branches/trunk-jpl-damage/src/c/objects/Numerics/ElementMatrix.cpp

Timestamp:

04/16/12 16:06:52 (13 years ago)

Author:

cborstad

Message:

merged trunk-jpl into trunk-jpl-damage through revision 11990

Location:

issm/branches/trunk-jpl-damage

Files:

• . (modified) (1 prop)
• src/c/objects/Numerics/ElementMatrix.cpp (modified) (2 diffs)

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

@@ -260 +260 @@
         this->CheckConsistency();
 
-        #ifdef _HAVE_PETSC_
-                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]);
-                                        }
+        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(Kff->matrix,this->row_fsize,this->row_fglobaldoflist,this->row_fsize,this->row_fglobaldoflist,(const double*)localvalues,ADD_VALUES);
-
-                                /*Free ressources:*/
-                                xfree((void**)&localvalues);
-                        }
-
-
-                        if((this->row_ssize!=0) && (this->row_fsize!=0)){
-                                /*first, retrieve values that are in the f and s-set from the g-set values matrix: */
-                                localvalues=(double*)xmalloc(this->row_fsize*this->row_ssize*sizeof(double));
-                                for(i=0;i<this->row_fsize;i++){
-                                        for(j=0;j<this->row_ssize;j++){
-                                                *(localvalues+this->row_ssize*i+j)=*(this->values+this->ncols*this->row_flocaldoflist[i]+this->row_slocaldoflist[j]);
-                                        }
+                        }
+                        /*add local values into global  matrix, using the fglobaldoflist: */
+                        Kff->SetValues(this->row_fsize,this->row_fglobaldoflist,this->row_fsize,this->row_fglobaldoflist,localvalues,ADD_VAL);
+
+                        /*Free ressources:*/
+                        xfree((void**)&localvalues);
+                }
+
+
+                if((this->row_ssize!=0) && (this->row_fsize!=0)){
+                        /*first, retrieve values that are in the f and s-set from the g-set values matrix: */
+                        localvalues=(double*)xmalloc(this->row_fsize*this->row_ssize*sizeof(double));
+                        for(i=0;i<this->row_fsize;i++){
+                                for(j=0;j<this->row_ssize;j++){
+                                        *(localvalues+this->row_ssize*i+j)=*(this->values+this->ncols*this->row_flocaldoflist[i]+this->row_slocaldoflist[j]);
                                 }
-                                /*add local values into global  matrix, using the fglobaldoflist: */
-                                MatSetValues(Kfs->matrix,this->row_fsize,this->row_fglobaldoflist,this->row_ssize,this->row_sglobaldoflist,(const double*)localvalues,ADD_VALUES);
-
-                                /*Free ressources:*/
-                                xfree((void**)&localvalues);
-                        }
-                }
-                else{
-                        _error_(" non dofsymmetrical matrix AddToGlobal routine not support yet!");
-                }
-        #else
-                _error_("not supported yet!");
-        #endif
+                        }
+                        /*add local values into global  matrix, using the fglobaldoflist: */
+                        Kfs->SetValues(this->row_fsize,this->row_fglobaldoflist,this->row_ssize,this->row_sglobaldoflist,localvalues,ADD_VAL);
+
+                        /*Free ressources:*/
+                        xfree((void**)&localvalues);
+                }
+        }
+        else{
+                _error_(" non dofsymmetrical matrix AddToGlobal routine not support yet!");
+        }
 
 }
@@ -316 +312 @@
         this->CheckConsistency();
 
-        #ifdef _HAVE_PETSC_
-                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]);
-                                        }
+        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->matrix,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!");
-                }
-        #else
-                _error_("not supported yet!");
-        #endif
+                        }
+                        /*add local values into global  matrix, using the fglobaldoflist: */
+                        Jff->SetValues(this->row_fsize,this->row_fglobaldoflist,this->row_fsize,this->row_fglobaldoflist,localvalues,ADD_VAL);
+
+                        /*Free ressources:*/
+                        xfree((void**)&localvalues);
+                }
+
+        }
+        else{
+                _error_(" non dofsymmetrical matrix AddToGlobal routine not support yet!");
+        }
 
 }