source: issm/oecreview/Archive/25834-26739/ISSM-26225-26226.diff@ 26740

Last change on this file since 26740 was 26740, checked in by Mathieu Morlighem, 3 years ago

CHG: added 25834-26739

File size: 1.6 KB
RevLine 
[26740]1Index: ../trunk-jpl/test/Archives/Archive352.arch
2===================================================================
3Cannot display: file marked as a binary type.
4svn:mime-type = application/octet-stream
5Index: ../trunk-jpl/test/Archives/Archive353.arch
6===================================================================
7Cannot display: file marked as a binary type.
8svn:mime-type = application/octet-stream
9Index: ../trunk-jpl/test/Archives/Archive354.arch
10===================================================================
11Cannot display: file marked as a binary type.
12svn:mime-type = application/octet-stream
13Index: ../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)*/
Note: See TracBrowser for help on using the repository browser.