Changeset 27822

Timestamp:

07/11/23 14:05:03 (21 months ago)

Author:

Mathieu Morlighem

Message:

BUG: fixed problem with adaptive time stepping and cycling

File:

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

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

@@ -435 +435 @@
         /*First, recover current time from parameters: */
         bool linear_interp,average,cycle;
+        int  timestepping;
         IssmDouble dt;
         this->parameters->FindParam(&linear_interp,TimesteppingInterpForcingEnum);
@@ -440 +441 @@
         this->parameters->FindParam(&cycle,TimesteppingCycleForcingEnum);
         this->parameters->FindParam(&dt,TimesteppingTimeStepEnum);          /*transient core time step*/
+        this->parameters->FindParam(&timestepping,TimesteppingTypeEnum);
 
         if(cycle){
@@ -447 +449 @@
                 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(timestepping!=AdaptiveTimesteppingEnum){
+                        /*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 */
+                        /* warning: this assumes dt = constant!!*/
+                        IssmDouble nsteps = reCast<int,IssmDouble>(time1/dt);
+                        if (reCast<IssmDouble>(nsteps)<time1/dt) nsteps=nsteps+1;
+                        time1 = nsteps*dt;
+                }
 
                 /*See by how many intervals we have to offset time*/