[26740] | 1 | Index: ../trunk-jpl/test/Archives/Archive352.arch
|
---|
| 2 | ===================================================================
|
---|
| 3 | Cannot display: file marked as a binary type.
|
---|
| 4 | svn:mime-type = application/octet-stream
|
---|
| 5 | Index: ../trunk-jpl/test/Archives/Archive353.arch
|
---|
| 6 | ===================================================================
|
---|
| 7 | Cannot display: file marked as a binary type.
|
---|
| 8 | svn:mime-type = application/octet-stream
|
---|
| 9 | Index: ../trunk-jpl/test/Archives/Archive354.arch
|
---|
| 10 | ===================================================================
|
---|
| 11 | Cannot display: file marked as a binary type.
|
---|
| 12 | svn:mime-type = application/octet-stream
|
---|
| 13 | Index: ../trunk-jpl/src/c/classes/Inputs/TransientInput.cpp
|
---|
| 14 | ===================================================================
|
---|
| 15 | --- ../trunk-jpl/src/c/classes/Inputs/TransientInput.cpp (revision 26225)
|
---|
| 16 | +++ ../trunk-jpl/src/c/classes/Inputs/TransientInput.cpp (revision 26226)
|
---|
| 17 | @@ -431,7 +431,7 @@
|
---|
| 18 | if (reCast<IssmDouble>(nsteps)<time1/dt) nsteps=nsteps+1;
|
---|
| 19 | time1 = nsteps*dt;
|
---|
| 20 |
|
---|
| 21 | - if(cycle && (time<time0 || time>time1)){
|
---|
| 22 | + if(cycle){
|
---|
| 23 |
|
---|
| 24 | /*See by how many intervals we have to offset time*/
|
---|
| 25 | IssmDouble deltat = time1-time0;
|
---|
| 26 | @@ -440,7 +440,7 @@
|
---|
| 27 | int num_intervals = reCast<int,IssmDouble>(fabs(time-time0)/deltat);
|
---|
| 28 |
|
---|
| 29 | /*Uncomment following line if you would like to apply a cycle BEFORE the time series starts*/
|
---|
| 30 | - //if(time<time0) num_intervals = -num_intervals-1;
|
---|
| 31 | + if(time<time0) num_intervals = -num_intervals-1;
|
---|
| 32 |
|
---|
| 33 | if(fabs(time-time0)/deltat == reCast<IssmDouble>(num_intervals)){
|
---|
| 34 | /*Hack to make sure we always cover the last value of the series (discussion with Nicole)*/
|
---|