Changeset 14685

Timestamp:

04/21/13 11:05:44 (12 years ago)

Author:

Mathieu Morlighem

Message:

BUG: IssmMpiVec needs forward declaration, + removed all printf in Bucket

Location:

issm/trunk-jpl/src/c

Files:

• classes/objects/Bucket.h (modified) (1 diff)
• toolkits/issm/IssmVec.h (modified) (2 diffs)
• toolkits/issm/issmtoolkit.h (modified) (1 diff)

issm/trunk-jpl/src/c/classes/objects/Bucket.h

@@ -56 +56 @@
                         int i,j;
 
-                        printf("Bucket echo (cpu #: %i): \n",IssmComm::GetRank());
-                        printf("# rows: %i, #cols: %i\n",this->m,this->n);
+                        _printLine_("Bucket echo (cpu #: "<<IssmComm::GetRank()<<")");
+                        _printLine_("num rows: "<<this->m<<" num cols: "<<this->n);
                         for (i=0;i<this->m;i++){
-                                printf("row %i, column indices: ",this->idxm[i]);
+                                _printLine_("row "<<this->idxm[i]<<", column indices: ");
                                 for (j=0;j<this->n;j++){
-                                        printf(" %i",this->idxn[j]);
+                                        _printLine_(" "<<this->idxn[j]);
                                 }
-                                printf("\n");
-                                printf("values: ");
+                                _printLine_("values: ");
                                 for (j=0;j<this->n;j++){
-                                        printf(" %i",this->values[m*i+j]);
+                                        _printLine_(" "<<this->values[m*i+j]);
                                 }
-                                printf("\n");
                         }
                 }

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

@@ -21 +21 @@
 #include "./IssmToolkitUtils.h"
 #include <math.h>
-
 /*}}}*/
 
@@ -31 +30 @@
 */
 int IssmVecTypeFromToolkitOptions(void);
+template <class doubletype> class IssmSeqVec;
+template <class doubletype> class IssmMpiVec;
 
 template <class doubletype> 

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

@@ -24 +24 @@
 #endif
 
-
 #endif