Changeset 23604

Timestamp:

01/06/19 07:21:59 (6 years ago)

Author:

Mathieu Morlighem

Message:

BUG: fixed AD

Location:

issm/trunk-jpl/src/c/toolkits

Files:

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

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

@@ -37 +37 @@
                 virtual void GetSize(int* pM)=0;
                 virtual void GetLocalSize(int* pM)=0;
-                virtual void GetLocalVector(double** pvector,int** pindices)=0;
+                virtual void GetLocalVector(doubletype** pvector,int** pindices)=0;
                 virtual IssmAbsVec<doubletype>* Duplicate(void)=0;
                 virtual void Set(doubletype value)=0;

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

@@ -143 +143 @@
                         *pM=this->M;
                 }/*}}}*/
-                void GetLocalVector(double** pvector,int** pindices){/*{{{*/
+                void GetLocalVector(doubletype** pvector,int** pindices){/*{{{*/
                         _error_("not implemented");
                 } /*}}}*/

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

@@ -153 +153 @@
                 }
                 /*}}}*/
-                void GetLocalVector(double** pvector,int** pindices){/*{{{*/
+                void GetLocalVector(doubletype** pvector,int** pindices){/*{{{*/
                         vector->GetLocalVector(pvector,pindices);
                 } /*}}}*/

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

@@ -217 +217 @@
                 }
                 /*}}}*/
-                void GetLocalVector(double** pvector,int** pindices){_assert_(this);/*{{{*/
+                void GetLocalVector(doubletype** pvector,int** pindices){_assert_(this);/*{{{*/
 
                         if(type==PetscVecType){
@@ -242 +242 @@
 
                         return output;
-
-                }
-                /*}}}*/
+                } /*}}}*/
                 void Set(doubletype value){_assert_(this);/*{{{*/
 

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

@@ -115 +115 @@
 }
 /*}}}*/
-void PetscVec::GetLocalVector(double** pvector,int** pindices){/*{{{*/
+void PetscVec::GetLocalVector(IssmDouble** pvector,int** pindices){/*{{{*/
 
         _assert_(this->vector);
@@ -144 +144 @@
         for(int i=0;i<range;i++) indices[i]=lower_row+i;
         /*Get vector*/
-        IssmDouble* values =xNew<double>(range);
+        IssmDouble* values =xNew<IssmDouble>(range);
         VecGetValues(this->vector,range,indices,values); 
 

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

@@ -45 +45 @@
                 void        GetSize(int* pM);
                 void        GetLocalSize(int* pM);
-                void        GetLocalVector(double** pvector,int** pindices);
+                void        GetLocalVector(IssmDouble** pvector,int** pindices);
                 PetscVec*   Duplicate(void);
                 void        Set(IssmDouble value);