Changeset 22340

Timestamp:

01/05/18 20:32:15 (7 years ago)

Author:

seroussi

Message:

FIX: fixed problem with interpolation in transient input

File:

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

issm/trunk-jpl/src/c/classes/Params/TransientParam.cpp

@@ -104 +104 @@
                 found=true;
         }
-        else if(time>this->timesteps[this->N-1] || !interpolation){
+        else if(time>this->timesteps[this->N-1]){
                 /*get values for the last time: */
                 output=this->values[this->N-1];
@@ -123 +123 @@
                                         IssmDouble deltat=this->timesteps[i+1]-this->timesteps[i];
                                         IssmDouble alpha=(time-this->timesteps[i])/deltat;
-                                        output=(1.0-alpha)*this->values[i] + alpha*this->values[i+1];
+                                        if(interpolation==true) output=(1.0-alpha)*this->values[i] + alpha*this->values[i+1];
+                                        else output=this->values[i];
                                         found=true;
                                         break;