Rev | Line | |
---|
[17802] | 1 | Index: ../trunk-jpl/src/c/classes/IoModel.cpp
|
---|
| 2 | ===================================================================
|
---|
| 3 | --- ../trunk-jpl/src/c/classes/IoModel.cpp (revision 16770)
|
---|
| 4 | +++ ../trunk-jpl/src/c/classes/IoModel.cpp (revision 16771)
|
---|
| 5 | @@ -1202,12 +1202,9 @@
|
---|
| 6 |
|
---|
| 7 | /*output: */
|
---|
| 8 | int* vector=NULL;
|
---|
| 9 | - int num
|
---|
| 10 |
|
---|
| 11 | /*intermediary: */
|
---|
| 12 | - int M, N;
|
---|
| 13 | - IssmPDouble *pmatrix = NULL;
|
---|
| 14 | - IssmDouble *matrix = NULL;
|
---|
| 15 | + int integer;
|
---|
| 16 | int *codes = NULL;
|
---|
| 17 | int code;
|
---|
| 18 |
|
---|
| 19 | @@ -1424,7 +1421,7 @@
|
---|
| 20 | /*this data has already been checked out! So cancel all that we've done here, and return
|
---|
| 21 | * the data[data_enum] directly: */
|
---|
| 22 | matrix=this->data[data_enum];
|
---|
| 23 | - for (int i=0;i<M*N;++i) integer_matrixmatrix[i]=reCast<int>(matrix[i]);
|
---|
| 24 | + for (int i=0;i<M*N;++i) integer_matrix[i]=reCast<int>(matrix[i]);
|
---|
| 25 | }
|
---|
| 26 | else{
|
---|
| 27 | for (int i=0;i<M*N;++i) integer_matrix[i]=pmatrix[i];
|
---|
Note:
See
TracBrowser
for help on using the repository browser.