Changeset 19236

Timestamp:

04/01/15 14:31:17 (10 years ago)

Author:

schlegel

Message:

CHG: allow removal of interpolation routine from TransientParam

Location:

issm/trunk-jpl/src/c

Files:

• classes/Params/TransientParam.cpp (modified) (5 diffs)
• classes/Params/TransientParam.h (modified) (2 diffs)
• modules/ModelProcessorx/CreateParameters.cpp (modified) (5 diffs)
• modules/SurfaceMassBalancex/SurfaceMassBalancex.cpp (modified) (1 diff)

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

@@ -20 +20 @@
 }
 /*}}}*/
-TransientParam::TransientParam(int in_enum_type,IssmDouble* in_values,IssmDouble* in_time,int in_N){/*{{{*/
+TransientParam::TransientParam(int in_enum_type,IssmDouble* in_values,IssmDouble* in_time,bool interpolation_on,int in_N){/*{{{*/
 
         _assert_(in_values && in_time);
@@ -26 +26 @@
         enum_type=in_enum_type;
         N=in_N;
+        interpolation=interpolation_on;
 
         values=xNew<IssmDouble>(N);
@@ -59 +60 @@
 }
 /*}}}*/
-int    TransientParam::Id(void){ return -1; }/*{{{*/
+int  TransientParam::Id(void){ return -1; }/*{{{*/
 /*}}}*/
-int TransientParam::ObjectEnum(void){/*{{{*/
+int  TransientParam::ObjectEnum(void){/*{{{*/
 
         return TransientParamEnum;
@@ -69 +70 @@
 Object* TransientParam::copy() {/*{{{*/
 
-        return new TransientParam(this->enum_type,this->values,this->timesteps,this->N);
+        return new TransientParam(this->enum_type,this->values,this->timesteps,this->interpolation,this->N);
 
 }
@@ -87 +88 @@
                 found=true;
         }
-        else if(time>this->timesteps[this->N-1]){
+        else if(time>this->timesteps[this->N-1] || !interpolation){
                 /*get values for the last time: */
                 output=this->values[this->N-1];

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

@@ -23 +23 @@
                 int         enum_type;
                 int         N;
+                bool        interpolation;
                 IssmDouble *values;
                 IssmDouble *timesteps;
@@ -29 +30 @@
                 /*TransientParam constructors, destructors: {{{*/
                 TransientParam();
-                TransientParam(int in_enum_type,IssmDouble* in_values,IssmDouble* in_time,int in_N);
+                TransientParam(int in_enum_type,IssmDouble* in_values,IssmDouble* in_time,bool interpolation_on,int in_N);
                 ~TransientParam();
                 /*}}}*/

issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp

@@ -22 +22 @@
         char**      requestedoutputs = NULL;
         IssmDouble  time;
-        bool        isdelta18o,ismungsm,isd18opd;
+        bool        isdelta18o,ismungsm,isd18opd,interp;
 
         /*parameters for mass flux:*/
@@ -101 +101 @@
         parameters->AddObject(iomodel->CopyConstantObject(SurfaceforcingsEnum));
         iomodel->Constant(&smb_model,SurfaceforcingsEnum);
+        iomodel->Constant(&interp,TimesteppingInterpForcingsEnum);
         switch(smb_model){
                 case SMBEnum:
@@ -119 +120 @@
                           iomodel->FetchData(&temp,&N,&M,SurfaceforcingsPfacEnum); _assert_(N==2);
                           for(i=0;i<M;i++) temp[M+i]=temp[M+i];
-                          parameters->AddObject(new TransientParam(SurfaceforcingsPfacEnum,&temp[0],&temp[M],M));
+                          parameters->AddObject(new TransientParam(SurfaceforcingsPfacEnum,&temp[0],&temp[M],interp,M));
                           iomodel->DeleteData(temp,SurfaceforcingsPfacEnum);
                         
                           iomodel->FetchData(&temp,&N,&M,SurfaceforcingsTdiffEnum); _assert_(N==2);
                           for(i=0;i<M;i++) temp[M+i]=temp[M+i];
-                          parameters->AddObject(new TransientParam(SurfaceforcingsTdiffEnum,&temp[0],&temp[M],M));
+                          parameters->AddObject(new TransientParam(SurfaceforcingsTdiffEnum,&temp[0],&temp[M],interp,M));
                           iomodel->DeleteData(temp,SurfaceforcingsTdiffEnum);
 
                           iomodel->FetchData(&temp,&N,&M,SurfaceforcingsSealevEnum); _assert_(N==2);
                           for(i=0;i<M;i++) temp[M+i]=temp[M+i];
-                          parameters->AddObject(new TransientParam(SurfaceforcingsSealevEnum,&temp[0],&temp[M],M));
+                          parameters->AddObject(new TransientParam(SurfaceforcingsSealevEnum,&temp[0],&temp[M],interp,M));
                           iomodel->DeleteData(temp,SurfaceforcingsSealevEnum);
                         }
@@ -137 +138 @@
                                 iomodel->FetchData(&temp,&N,&M,SurfaceforcingsDelta18oEnum); _assert_(N==2);
                                 for(i=0;i<M;i++) temp[M+i]=yts*temp[M+i];
-                                parameters->AddObject(new TransientParam(SurfaceforcingsDelta18oEnum,&temp[0],&temp[M],M));
+                                parameters->AddObject(new TransientParam(SurfaceforcingsDelta18oEnum,&temp[0],&temp[M],interp,M));
                                 iomodel->DeleteData(temp,SurfaceforcingsDelta18oEnum);
 
                                 iomodel->FetchData(&temp,&N,&M,SurfaceforcingsDelta18oSurfaceEnum); _assert_(N==2);
                                 for(i=0;i<M;i++) temp[M+i]=yts*temp[M+i];
-                                parameters->AddObject(new TransientParam(SurfaceforcingsDelta18oSurfaceEnum,&temp[0],&temp[M],M));
+                                parameters->AddObject(new TransientParam(SurfaceforcingsDelta18oSurfaceEnum,&temp[0],&temp[M],interp,M));
                                 iomodel->DeleteData(temp,SurfaceforcingsDelta18oSurfaceEnum);
                         }
@@ -161 +162 @@
                                 iomodel->FetchData(&temp,&N,&M,SurfaceforcingsDelta18oEnum); _assert_(N==2);
                                 for(i=0;i<M;i++) temp[M+i]=yts*temp[M+i];
-                                parameters->AddObject(new TransientParam(SurfaceforcingsDelta18oEnum,&temp[0],&temp[M],M));
+                                parameters->AddObject(new TransientParam(SurfaceforcingsDelta18oEnum,&temp[0],&temp[M],interp,M));
                                 iomodel->DeleteData(temp,SurfaceforcingsDelta18oEnum);
                                 

issm/trunk-jpl/src/c/modules/SurfaceMassBalancex/SurfaceMassBalancex.cpp

@@ -40 +40 @@
                                 if(VerboseSolution()) _printf0_("   call Delta18opdParameterization module\n");
                                 Delta18opdParameterizationx(femmodel);
-                        if(VerboseSolution()) _printf0_("   call positive degree day module\n");
-                        PositiveDegreeDayx(femmodel);
+                                if(VerboseSolution()) _printf0_("   call positive degree day module\n");
+                                PositiveDegreeDayx(femmodel);
                         } 
                         break;