Changeset 14671

Timestamp:

04/19/13 15:02:04 (12 years ago)

Author:

Eric.Larour

Message:

CHG: fixed huge segfaults in the Duplicate and Copy methods.

Location:

issm/trunk-jpl/src/c/toolkits/issm

Files:

• IssmAbsMat.h (modified) (1 diff)
• IssmAbsVec.h (modified) (1 diff)
• IssmDenseMat.h (modified) (1 diff)
• IssmMat.h (modified) (1 diff)
• IssmMpiDenseMat.h (modified) (1 diff)
• IssmMpiVec.h (modified) (1 diff)
• IssmSeqVec.h (modified) (1 diff)

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

@@ -49 +49 @@
                 virtual void GetLocalSize(int* pM,int* pN)=0;
                 virtual void MatMult(IssmAbsVec<doubletype>* X,IssmAbsVec<doubletype>* AX)=0;
-                virtual IssmAbsMat* Duplicate(void)=0;
+                virtual IssmAbsMat<doubletype>* Duplicate(void)=0;
                 virtual doubletype* ToSerial(void)=0;
                 virtual void SetValues(int m,int* idxm,int n,int* idxn,doubletype* values,InsMode mode)=0;

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

@@ -51 +51 @@
                 virtual void GetSize(int* pM)=0;
                 virtual void GetLocalSize(int* pM)=0;
-                virtual IssmAbsVec* Duplicate(void)=0;
+                virtual IssmAbsVec<doubletype>* Duplicate(void)=0;
                 virtual void Set(doubletype value)=0;
                 virtual void AXPY(IssmAbsVec* X, doubletype a)=0;

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

@@ -204 +204 @@
                 /*}}}*/
                 /*FUNCTION Duplicate{{{*/
-                IssmDenseMat* Duplicate(void){
+                IssmDenseMat<doubletype>* Duplicate(void){
 
                         doubletype dummy=0;
 
-                        return new IssmDenseMat(this->matrix,this->M,this->N,dummy);
+                        return new IssmDenseMat<doubletype>(this->matrix,this->M,this->N,dummy);
 
                 }

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

@@ -158 +158 @@
                         matrix->MatMult(X->vector,AX->vector);
                 } /*}}}*/
-                IssmMat* Duplicate(void){ /*{{{*/
+                IssmMat<doubletype>* Duplicate(void){ /*{{{*/
 
-                        IssmMat* issmmatrix=NULL;
+                        IssmMat<doubletype>* issmmatrix=NULL;
 
                         issmmatrix=new IssmMat<doubletype>();

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

@@ -110 +110 @@
                 /*}}}*/
                 /*FUNCTION Duplicate{{{*/
-                IssmMpiDenseMat* Duplicate(void){
+                IssmMpiDenseMat<doubletype>* Duplicate(void){
                         _error_("not supported yet!");
                 }

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

@@ -163 +163 @@
                 /*}}}*/
                 /*FUNCTION Duplicate{{{*/
-                IssmMpiVec* Duplicate(void){
-
-                        return new IssmMpiVec(this->vector,this->M);
+                IssmMpiVec<doubletype>* Duplicate(void){
+
+                        return new IssmMpiVec<doubletype>(this->vector,this->M);
 
                 }

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

@@ -164 +164 @@
                 /*}}}*/
                 /*FUNCTION Duplicate{{{*/
-                IssmSeqVec* Duplicate(void){
-
-                        return new IssmSeqVec(this->vector,this->M);
+                IssmSeqVec<doubletype>* Duplicate(void){
+
+                        return new IssmSeqVec<doubletype>(this->vector,this->M);
 
                 }