Changeset 24705

Timestamp:

04/08/20 21:04:03 (5 years ago)

Author:

schlegel

Message:

CHG: fix GEMB linux drift when interpforcings is off

File:

• issm/trunk-jpl/src/c/modules/SurfaceMassBalancex/Gembx.cpp (modified) (3 diffs)

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

@@ -35 +35 @@
 
         int        count=0;
-        IssmDouble time,dt,finaltime,starttime;
+        IssmDouble time,dt,finaltime;
         IssmDouble timeclim=0.0;
         IssmDouble t,smb_dt;
    IssmDouble delta;
         bool       isclimatology=false;
-
+        bool       linear_interp=true;
+
+        femmodel->parameters->FindParam(&linear_interp,TimesteppingInterpForcingsEnum); /*is interpolation requested*/
         femmodel->parameters->FindParam(&time,TimeEnum);                        /*transient core time at which we run the smb core*/
    femmodel->parameters->FindParam(&dt,TimesteppingTimeStepEnum);          /*transient core time step*/
         femmodel->parameters->FindParam(&finaltime,TimesteppingFinalTimeEnum);
-        femmodel->parameters->FindParam(&starttime,TimesteppingStartTimeEnum);
    femmodel->parameters->FindParam(&smb_dt,SmbDtEnum);                     /*time period for the smb solution,  usually smaller than the glaciological dt*/
         femmodel->parameters->FindParam(&isclimatology,SmbIsclimatologyEnum);
@@ -56 +57 @@
         /*Start loop: */
         count=1;
-        for (t=time;t<time+dt;t=t+smb_dt){
+        for (t=time;t<=time+dt-smb_dt;t=t+smb_dt){
 
                 for(int i=0;i<femmodel->elements->Size();i++){
@@ -76 +77 @@
                                 }
                         }
-                        timeinputs = t-time+timeclim;
+                        if (linear_interp) timeinputs = t-time+timeclim;
+                        else timeinputs = t-time+timeclim+smb_dt/2;
                         element->SmbGemb(timeinputs,count);
                 }