Changeset 11679 for issm/trunk-jpl/src/c/objects/Node.cpp

Timestamp:

03/12/12 09:35:33 (13 years ago)

Author:

Eric.Larour

Message:

Large commit, to strip out Petsc from the code. Created new Matrix and Vector
wrapper objects to the Petsc Mat and Vec objects. These wrappers make it possible
to hook up a different package to handle matrix and vector operations.

File:

• issm/trunk-jpl/src/c/objects/Node.cpp (modified) (8 diffs)

issm/trunk-jpl/src/c/objects/Node.cpp

@@ -594 +594 @@
 /*}}}*/
 /*FUNCTION Node::CreateNodalConstraints{{{1*/
-void  Node::CreateNodalConstraints(Vec ys){
+void  Node::CreateNodalConstraints(Vector* ys){
 
         int i;
@@ -613 +613 @@
                 
                 /*Add values into constraint vector: */
-                VecSetValues(ys,this->indexing.ssize,this->indexing.sdoflist,values,INSERT_VALUES);
+                ys->SetValues(this->indexing.ssize,this->indexing.sdoflist,values,INSERT_VALUES);
         }
 
@@ -875 +875 @@
 /*}}}*/
 /*FUNCTION Node::VecMerge {{{1*/
-void   Node::VecMerge(Vec ug, double* vector_serial,int setenum){
+void   Node::VecMerge(Vector* ug, double* vector_serial,int setenum){
 
         double* values=NULL;
@@ -897 +897 @@
 
                         /*Add values into ug: */
-                        VecSetValues(ug,this->indexing.fsize,indices,(const double*)values,INSERT_VALUES);
+                        ug->SetValues(this->indexing.fsize,indices,values,INSERT_VALUES);
                 }
         }
@@ -915 +915 @@
 
                         /*Add values into ug: */
-                        VecSetValues(ug,this->indexing.ssize,indices,(const double*)values,INSERT_VALUES);
+                        ug->SetValues(this->indexing.ssize,indices,values,INSERT_VALUES);
                 }
         }
@@ -926 +926 @@
 /*}}}*/
 /*FUNCTION Node::VecReduce {{{1*/
-void   Node::VecReduce(Vec vector, double* ug_serial,int setenum){
+void   Node::VecReduce(Vector* vector, double* ug_serial,int setenum){
 
         double* values=NULL;
@@ -945 +945 @@
 
                         /*Add values into ug: */
-                        VecSetValues(vector,this->indexing.fsize,this->indexing.fdoflist,(const double*)values,INSERT_VALUES);
+                        vector->SetValues(this->indexing.fsize,this->indexing.fdoflist,values,INSERT_VALUES);
                 }
         }
@@ -961 +961 @@
 
                         /*Add values into ug: */
-                        VecSetValues(vector,this->indexing.ssize,this->indexing.sdoflist,(const double*)values,INSERT_VALUES);
+                        vector->SetValues(this->indexing.ssize,this->indexing.sdoflist,values,INSERT_VALUES);
                 }
         }