Changeset 11684 for issm/branches/trunk-jpl-damage/src/c/modules/Reduceloadx/Reduceloadx.cpp

Timestamp:

03/12/12 14:40:42 (13 years ago)

Author:

cborstad

Message:

merged revisions 11428:11680 from trunk-jpl into branches/trunk-jpl-damage

Location:

issm/branches/trunk-jpl-damage

Files:

• . (modified) (1 prop)
• src/c/modules/Reduceloadx/Reduceloadx.cpp (modified) (3 diffs)

issm/branches/trunk-jpl-damage/src/c/modules/Reduceloadx/Reduceloadx.cpp ¶

@@ -12 +12 @@
 #include "../../io/io.h"
 
-void    Reduceloadx( Vec pf, Mat Kfs, Vec y_s,bool flag_ys0){
+void    Reduceloadx( Vector* pf, Matrix* Kfs, Vector* y_s,bool flag_ys0){
 
         /*intermediary*/
-        Vec         y_s0   = NULL;
-        Vec         Kfsy_s = NULL;
+        Vector*     y_s0   = NULL;
+        Vector*     Kfsy_s = NULL;
         int         Kfsm,Kfsn;
         int         global_m,global_n;
-        PetscScalar a;
         bool        fromlocalsize = true;
         int         verbose;
@@ -25 +24 @@
         _printf_(VerboseModule(),"   Dirichlet lifting applied to load vector\n");
 
-        MatGetSize(Kfs,&global_m,&global_n);
+        Kfs->GetSize(&global_m,&global_n);
         if(pf && global_m*global_n){
 
@@ -32 +31 @@
 
                 /*pf = pf - Kfs * y_s;*/
-                MatGetLocalSize(Kfs,&Kfsm,&Kfsn);
-                Kfsy_s=NewVec(Kfsm,fromlocalsize);
+                Kfs->GetLocalSize(&Kfsm,&Kfsn);
+                Kfsy_s=new Vector(Kfsm,fromlocalsize);
                 if (flag_ys0){
 
                         /*Create y_s0, full of 0: */
-                        VecDuplicate(y_s,&y_s0);
-                        VecSet(y_s0,0.0);
-                        VecAssemblyBegin(y_s0);
-                        VecAssemblyEnd(y_s0);
+                        y_s0=y_s->Duplicate();
+                        y_s0->Set(0.0);
+                        y_s0->Assemble();
 
-                        MatMultPatch(Kfs,y_s0,Kfsy_s);
+                        Kfs->MatMult(y_s0,Kfsy_s);
                 }
                 else{
-                        MatMultPatch(Kfs,y_s,Kfsy_s);
+                        Kfs->MatMult(y_s,Kfsy_s);
                 }
 
-                a=-1;
-                VecAXPY(pf,a,Kfsy_s);  
+                pf->AXPY(Kfsy_s,-1);
         }
 
 
         /*Free ressources and return*/
-        VecFree(&y_s0);
-        VecFree(&Kfsy_s);
+        delete y_s0;
+        delete Kfsy_s;
 
 }