Changeset 26208 for issm/trunk-jpl/src/c/classes/Inputs/TransientInput.cpp

Timestamp:

04/23/21 15:37:25 (4 years ago)

Author:

schlegel

Message:

CHG: clean up GEMB, change interp_forcings to interp_forcing, isclimatology is now cycle_forcing

File:

• issm/trunk-jpl/src/c/classes/Inputs/TransientInput.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/classes/Inputs/TransientInput.cpp

@@ -417 +417 @@
         /*First, recover current time from parameters: */
         bool linear_interp,cycle;
-        this->parameters->FindParam(&linear_interp,TimesteppingInterpForcingsEnum);
+        IssmDouble dt;
+        this->parameters->FindParam(&linear_interp,TimesteppingInterpForcingEnum);
         this->parameters->FindParam(&cycle,TimesteppingCycleForcingEnum);
+        this->parameters->FindParam(&dt,TimesteppingTimeStepEnum);          /*transient core time step*/
 
         /*Change input time if we cycle through the forcing*/
         IssmDouble time0 = this->timesteps[0];
         IssmDouble time1 = this->timesteps[this->numtimesteps - 1];
+
+        /*We need the end time to be the last timestep that would be taken*/
+        /* i.e., the case where GEMB has time stamps (finer timestep) after the last timestep */
+        IssmDouble nsteps = reCast<int,IssmDouble>(time1/dt);
+        if (reCast<IssmDouble>(nsteps)<time1/dt) nsteps=nsteps+1;
+        time1 = nsteps*dt;
+
         if(cycle && (time<time0 || time>time1)){
 
@@ -433 +442 @@
                 /*Uncomment following line if you would like to apply a cycle BEFORE the time series starts*/
                 //if(time<time0) num_intervals = -num_intervals-1;
-                
+
                 if(fabs(time-time0)/deltat == reCast<IssmDouble>(num_intervals)){
                         /*Hack to make sure we always cover the last value of the series (discussion with Nicole)*/