[15393] | 1 | Index: ../trunk-jpl/src/c/toolkits/issm/IssmVec.h
|
---|
| 2 | ===================================================================
|
---|
| 3 | --- ../trunk-jpl/src/c/toolkits/issm/IssmVec.h (revision 14684)
|
---|
| 4 | +++ ../trunk-jpl/src/c/toolkits/issm/IssmVec.h (revision 14685)
|
---|
| 5 | @@ -20,7 +20,6 @@
|
---|
| 6 | #include "../../include/macros.h"
|
---|
| 7 | #include "./IssmToolkitUtils.h"
|
---|
| 8 | #include <math.h>
|
---|
| 9 | -
|
---|
| 10 | /*}}}*/
|
---|
| 11 |
|
---|
| 12 | /*We need to template this class, in case we want to create Vectors that hold
|
---|
| 13 | @@ -30,6 +29,8 @@
|
---|
| 14 | IssmPDouble types)
|
---|
| 15 | */
|
---|
| 16 | int IssmVecTypeFromToolkitOptions(void);
|
---|
| 17 | +template <class doubletype> class IssmSeqVec;
|
---|
| 18 | +template <class doubletype> class IssmMpiVec;
|
---|
| 19 |
|
---|
| 20 | template <class doubletype>
|
---|
| 21 | class IssmVec{
|
---|
| 22 | Index: ../trunk-jpl/src/c/toolkits/issm/issmtoolkit.h
|
---|
| 23 | ===================================================================
|
---|
| 24 | --- ../trunk-jpl/src/c/toolkits/issm/issmtoolkit.h (revision 14684)
|
---|
| 25 | +++ ../trunk-jpl/src/c/toolkits/issm/issmtoolkit.h (revision 14685)
|
---|
| 26 | @@ -23,5 +23,4 @@
|
---|
| 27 | #include "./IssmMpiVec.h"
|
---|
| 28 | #endif
|
---|
| 29 |
|
---|
| 30 | -
|
---|
| 31 | #endif
|
---|
| 32 | Index: ../trunk-jpl/src/c/classes/objects/Bucket.h
|
---|
| 33 | ===================================================================
|
---|
| 34 | --- ../trunk-jpl/src/c/classes/objects/Bucket.h (revision 14684)
|
---|
| 35 | +++ ../trunk-jpl/src/c/classes/objects/Bucket.h (revision 14685)
|
---|
| 36 | @@ -55,19 +55,17 @@
|
---|
| 37 | void DeepEcho(){ /*{{{*/
|
---|
| 38 | int i,j;
|
---|
| 39 |
|
---|
| 40 | - printf("Bucket echo (cpu #: %i): \n",IssmComm::GetRank());
|
---|
| 41 | - printf("# rows: %i, #cols: %i\n",this->m,this->n);
|
---|
| 42 | + _printLine_("Bucket echo (cpu #: "<<IssmComm::GetRank()<<")");
|
---|
| 43 | + _printLine_("num rows: "<<this->m<<" num cols: "<<this->n);
|
---|
| 44 | for (i=0;i<this->m;i++){
|
---|
| 45 | - printf("row %i, column indices: ",this->idxm[i]);
|
---|
| 46 | + _printLine_("row "<<this->idxm[i]<<", column indices: ");
|
---|
| 47 | for (j=0;j<this->n;j++){
|
---|
| 48 | - printf(" %i",this->idxn[j]);
|
---|
| 49 | + _printLine_(" "<<this->idxn[j]);
|
---|
| 50 | }
|
---|
| 51 | - printf("\n");
|
---|
| 52 | - printf("values: ");
|
---|
| 53 | + _printLine_("values: ");
|
---|
| 54 | for (j=0;j<this->n;j++){
|
---|
| 55 | - printf(" %i",this->values[m*i+j]);
|
---|
| 56 | + _printLine_(" "<<this->values[m*i+j]);
|
---|
| 57 | }
|
---|
| 58 | - printf("\n");
|
---|
| 59 | }
|
---|
| 60 | }
|
---|
| 61 | /*}}}*/
|
---|