Changeset 26196 for issm/trunk-jpl/src/c/classes/Params/TransientArrayParam.cpp

Timestamp:

04/16/21 10:47:27 (4 years ago)

Author:

Mathieu Morlighem

Message:

CHG: preparing for cycling forcing

File:

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

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

@@ -20 +20 @@
 }
 /*}}}*/
-TransientArrayParam::TransientArrayParam(int in_enum_type,IssmDouble* in_values,IssmDouble* in_time,bool interpolation_on,int in_N,int in_M){/*{{{*/
+TransientArrayParam::TransientArrayParam(int in_enum_type,IssmDouble* in_values,IssmDouble* in_time,bool interpolation_on,bool cycle_in,int in_N,int in_M){/*{{{*/
 
         _assert_(in_values && in_time);
@@ -28 +28 @@
         this->N=in_N; //Number of timesteps
         this->interpolation=interpolation_on;
+        this->cycle=cycle_in;
 
         this->values=xNew<IssmDouble>(M*N);
-        xMemCpy<IssmDouble>(values,in_values,M*N);
+        xMemCpy<IssmDouble>(this->values,in_values,M*N);
 
         this->timesteps=xNew<IssmDouble>(N);
-        xMemCpy<IssmDouble>(timesteps,in_time,N);
+        xMemCpy<IssmDouble>(this->timesteps,in_time,N);
 }
 /*}}}*/
@@ -44 +45 @@
 Param* TransientArrayParam::copy() {/*{{{*/
 
-        return new TransientArrayParam(this->enum_type,this->values,this->timesteps,this->interpolation,this->M,this->N);
+        return new TransientArrayParam(this->enum_type,this->values,this->timesteps,this->interpolation,this->cycle,this->M,this->N);
 
 }
@@ -80 +81 @@
         marshallhandle->call(this->enum_type);
         marshallhandle->call(this->interpolation);
+        marshallhandle->call(this->cycle);
         marshallhandle->call(this->M);
         marshallhandle->call(this->N);
@@ -102 +104 @@
         bool       found;
         _assert_(row>=0 && row<this->M); 
+
+        if(this->cycle) _error_("not implemented yet");
 
         /*Ok, we have the time and row, go through the timesteps, and figure out which interval we 
@@ -129 +133 @@
                                         IssmDouble deltat = this->timesteps[i+1]-this->timesteps[i];
                                         IssmDouble alpha  = (time-this->timesteps[i])/deltat;
-                                        if(interpolation==true) output=(1.0-alpha)*this->values[row*this->N+i] + alpha*this->values[row*this->N+i+1];
+                                        if(this->interpolation==true) output=(1.0-alpha)*this->values[row*this->N+i] + alpha*this->values[row*this->N+i+1];
                                         else output=this->values[row*this->N+i];
                                         found=true;