Changeset 14888

Timestamp:

05/04/13 12:51:45 (12 years ago)

Author:

Eric.Larour

Message:

CHG: Solve method only needed in issm.exe, not the wrappers, don't want to bother with gsl undefined references

Location:

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

Files:

• IssmAbsMat.h (modified) (1 diff)
• IssmDenseMat.h (modified) (2 diffs)
• IssmMat.h (modified) (2 diffs)
• IssmMpiDenseMat.h (modified) (2 diffs)

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

@@ -56 +56 @@
                 virtual void SetValues(int m,int* idxm,int n,int* idxn,doubletype* values,InsMode mode)=0;
                 virtual void Convert(MatrixType type)=0;
+                #ifndef _HAVE_WRAPPERS_
                 virtual IssmAbsVec<IssmDouble>* Solve(IssmAbsVec<IssmDouble>* pf, Parameters* parameters)=0;
+                #endif
 };
 

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

@@ -265 +265 @@
                 }
                 /*}}}*/         
+                #ifndef _HAVE_WRAPPERS_
                 /*Solve{{{*/
                 IssmAbsVec<IssmDouble>* Solve(IssmAbsVec<IssmDouble>* pfin, Parameters* parameters){
@@ -286 +287 @@
 
                 }/*}}}*/
-
+                #endif
 };
 

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

@@ -200 +200 @@
                         matrix->convert(type);
                 }/*}}}*/
+                #ifndef _HAVE_WRAPPERS_
                 IssmVec<doubletype>* Solve(IssmVec<doubletype>* pf, Parameters* parameters){ /*{{{*/
                         
@@ -211 +212 @@
 
                 }/*}}}*/
-
+                #endif
 };
 

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

@@ -508 +508 @@
                 }
                 /*}}}*/         
+                #ifndef _HAVE_WRAPPERS_
                 /*Solve{{{*/
                 IssmAbsVec<IssmDouble>* Solve(IssmAbsVec<IssmDouble>* pfin, Parameters* parameters){
@@ -532 +533 @@
 
                 }/*}}}*/
+                #endif
 };