Changeset 19977

Timestamp:

01/22/16 09:34:31 (9 years ago)

Author:

Eric.Larour

Message:

CHG: new capability to shift a toolkit vector by a certain offset. Akin to the VecShift routine
in Petsc.

Location:

issm/trunk-jpl/src/c/toolkits

Files:

• issm/IssmAbsVec.h (modified) (1 diff)
• issm/IssmMpiVec.h (modified) (1 diff)
• issm/IssmSeqVec.h (modified) (1 diff)
• issm/IssmVec.h (modified) (1 diff)
• objects/Vector.h (modified) (1 diff)
• petsc/objects/PetscVec.cpp (modified) (1 diff)
• petsc/objects/PetscVec.h (modified) (1 diff)

issm/trunk-jpl/src/c/toolkits/issm/IssmAbsVec.h ¶

@@ -42 +42 @@
                 virtual void AYPX(IssmAbsVec* X, doubletype a)=0;
                 virtual doubletype* ToMPISerial(void)=0;
+                virtual void Shift(doubletype shift)=0;
                 virtual void Copy(IssmAbsVec* to)=0;
                 virtual doubletype Norm(NormMode mode)=0;

issm/trunk-jpl/src/c/toolkits/issm/IssmMpiVec.h ¶

@@ -394 +394 @@
                         return buffer;
 
+                }
+                /*}}}*/
+                void Shift(doubletype shift){/*{{{*/
+                        for(int i=0;i<this->m;i++)this->vector[i]+=shift;
                 }
                 /*}}}*/

issm/trunk-jpl/src/c/toolkits/issm/IssmSeqVec.h ¶

@@ -199 +199 @@
                 }
                 /*}}}*/
+                void Shift(doubletype shift){/*{{{*/
+
+                        for(int i=0;i<this->M;i++)this->vector[i]+=shift;
+
+                }
+                /*}}}*/
                 void Copy(IssmAbsVec<doubletype>* toin){/*{{{*/
 

issm/trunk-jpl/src/c/toolkits/issm/IssmVec.h ¶

@@ -180 +180 @@
                 }
                 /*}}}*/
+                void Shift(doubletype shift){/*{{{*/
+                        vector->Shift(shift);
+                }
+                /*}}}*/
                 void Copy(IssmVec* to){/*{{{*/
                         vector->Copy(to->vector);

issm/trunk-jpl/src/c/toolkits/objects/Vector.h ¶

@@ -281 +281 @@
                 }
                 /*}}}*/
+                void Shift(doubletype shift){_assert_(this);/*{{{*/
+
+                        if(type==PetscVecType){
+                                #ifdef _HAVE_PETSC_
+                                this->pvector->Shift(shift);
+                                #endif
+                        }
+                        else this->ivector->Shift(shift);
+                }
+                /*}}}*/
                 void Copy(Vector* to){_assert_(this);/*{{{*/
 

issm/trunk-jpl/src/c/toolkits/petsc/objects/PetscVec.cpp ¶

@@ -163 +163 @@
 }
 /*}}}*/
+void PetscVec::Shift(IssmDouble shift){/*{{{*/
+
+        if(this->vector) VecShift(this->vector,shift);
+
+}
+/*}}}*/
 void PetscVec::Copy(PetscVec* to){/*{{{*/
 

issm/trunk-jpl/src/c/toolkits/petsc/objects/PetscVec.h ¶

@@ -50 +50 @@
                 void        AYPX(PetscVec* X, IssmDouble a);
                 IssmDouble* ToMPISerial(void);
+                void        Shift(IssmDouble shift);
                 void        Copy(PetscVec* to);
                 IssmDouble  Norm(NormMode norm_type);