Changeset 11679 for issm/trunk-jpl/src/c/objects/Elements/Tria.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/Elements/Tria.cpp (modified) (11 diffs)

issm/trunk-jpl/src/c/objects/Elements/Tria.cpp

@@ -319 +319 @@
 /*}}}*/
 /*FUNCTION Tria::CreateKMatrix {{{1*/
-void  Tria::CreateKMatrix(Mat Kff, Mat Kfs,Vec df){
+void  Tria::CreateKMatrix(Matrix* Kff, Matrix* Kfs,Vector* df){
 
         /*retreive parameters: */
@@ -672 +672 @@
 /*}}}*/
 /*FUNCTION Tria::CreatePVector {{{1*/
-void  Tria::CreatePVector(Vec pf){
+void  Tria::CreatePVector(Vector* pf){
 
         /*retrive parameters: */
@@ -892 +892 @@
 /*}}}*/
 /*FUNCTION Tria::CreateJacobianMatrix{{{1*/
-void  Tria::CreateJacobianMatrix(Mat Jff){
+void  Tria::CreateJacobianMatrix(Matrix* Jff){
 
         /*retrieve parameters: */
@@ -1274 +1274 @@
 /*}}}*/
 /*FUNCTION Tria::GetSolutionFromInputs{{{1*/
-void  Tria::GetSolutionFromInputs(Vec solution){
+void  Tria::GetSolutionFromInputs(Vector* solution){
 
         /*retrive parameters: */
@@ -3139 +3139 @@
 /*}}}*/
 /*FUNCTION Tria::GetSolutionFromInputsDiagnosticHoriz{{{1*/
-void  Tria::GetSolutionFromInputsDiagnosticHoriz(Vec solution){
+void  Tria::GetSolutionFromInputsDiagnosticHoriz(Vector* solution){
 
         const int    numdof=NDOF2*NUMVERTICES;
@@ -3170 +3170 @@
         }
 
-        VecSetValues(solution,numdof,doflist,(const double*)values,INSERT_VALUES);
+        solution->SetValues(numdof,doflist,values,INSERT_VALUES);
 
         /*Free ressources:*/
@@ -3178 +3178 @@
 /*}}}*/
 /*FUNCTION Tria::GetSolutionFromInputsDiagnosticHutter{{{1*/
-void  Tria::GetSolutionFromInputsDiagnosticHutter(Vec solution){
+void  Tria::GetSolutionFromInputsDiagnosticHutter(Vector* solution){
 
         const int    numdof=NDOF2*NUMVERTICES;
@@ -3209 +3209 @@
         }
 
-        VecSetValues(solution,numdof,doflist,(const double*)values,INSERT_VALUES);
+        solution->SetValues(numdof,doflist,values,INSERT_VALUES);
 
         /*Free ressources:*/
@@ -4881 +4881 @@
 }
 /*}}}*/
+
 /*FUNCTION Tria::InputUpdateFromSolutionAdjointBalancethickness {{{1*/
 void  Tria::InputUpdateFromSolutionAdjointBalancethickness(double* solution){
@@ -5185 +5186 @@
 /*}}}*/
 /*FUNCTION Tria::GetSolutionFromInputsHydrology{{{1*/
-void  Tria::GetSolutionFromInputsHydrology(Vec solution){
+void  Tria::GetSolutionFromInputsHydrology(Vector* solution){
 
         const int    numdof=NDOF1*NUMVERTICES;
@@ -5213 +5214 @@
         }
 
-        VecSetValues(solution,numdof,doflist,(const double*)values,INSERT_VALUES);
+        solution->SetValues(numdof,doflist,values,INSERT_VALUES);
 
         /*Free ressources:*/