Changeset 17509

Timestamp:

03/20/14 16:48:44 (11 years ago)

Author:

Mathieu Morlighem

Message:

NEW: added Max function to PetscVec

Location:

issm/trunk-jpl/src/c/toolkits

Files:

• 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/objects/Vector.h ¶

@@ -305 +305 @@
                 }
                 /*}}}*/
+                /*FUNCTION Max{{{*/
+                doubletype Max(void){_assert_(this);
+
+                        doubletype max=0;
+
+                        if(type==PetscVecType){
+                                #ifdef _HAVE_PETSC_
+                                max=this->pvector->Max();
+                                #endif
+                        }
+                        else _error_("operation not supported yet");
+                        return max;
+                }
+                /*}}}*/
                 /*FUNCTION Norm{{{*/
                 doubletype Norm(NormMode norm_type){_assert_(this);

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

@@ -188 +188 @@
 }
 /*}}}*/
+/*FUNCTION PetscVec::Max{{{*/
+IssmDouble PetscVec::Max(void){
+
+        _assert_(this->vector);
+
+        IssmDouble max;
+        VecMax(this->vector,NULL,&max);
+        return max;
+
+}
+/*}}}*/
 /*FUNCTION PetscVec::Norm{{{*/
 IssmDouble PetscVec::Norm(NormMode mode){

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

@@ -38 +38 @@
 
                 /*PetscVec specific routines*/
-                void Echo(void);
-                void Assemble(void);
-                void SetValues(int ssize, int* list, IssmDouble* values, InsMode mode);
-                void SetValue(int dof, IssmDouble value, InsMode  mode);
-                void GetValue(IssmDouble* pvalue, int dof);
-                void GetSize(int* pM);
-                void GetLocalSize(int* pM);
-                PetscVec* Duplicate(void);
-                void Set(IssmDouble value);
-                void AXPY(PetscVec* X, IssmDouble a);
-                void AYPX(PetscVec* X, IssmDouble a);
+                void        Echo(void);
+                void        Assemble(void);
+                void        SetValues(int ssize, int* list, IssmDouble* values, InsMode mode);
+                void        SetValue(int dof, IssmDouble value, InsMode  mode);
+                void        GetValue(IssmDouble* pvalue, int dof);
+                void        GetSize(int* pM);
+                void        GetLocalSize(int* pM);
+                PetscVec*   Duplicate(void);
+                void        Set(IssmDouble value);
+                void        AXPY(PetscVec* X, IssmDouble a);
+                void        AYPX(PetscVec* X, IssmDouble a);
                 IssmDouble* ToMPISerial(void);
-                void Copy(PetscVec* to);
-                IssmDouble Norm(NormMode norm_type);
-                void Scale(IssmDouble scale_factor);
-                void PointwiseDivide(PetscVec* x,PetscVec* y);
-                IssmDouble Dot(PetscVec* vector);
+                void        Copy(PetscVec* to);
+                IssmDouble  Norm(NormMode norm_type);
+                IssmDouble  Max(void);
+                void        Scale(IssmDouble scale_factor);
+                void        PointwiseDivide(PetscVec* x,PetscVec* y);
+                IssmDouble  Dot(PetscVec* vector);
 };