Changeset 22873

Timestamp:

06/22/18 13:53:33 (7 years ago)

Author:

schlegel

Message:

CHG: minor update to make sure monthly pdd forcing for delo18 can take various timestep configurations

File:

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

issm/trunk-jpl/src/c/classes/Elements/Element.cpp

@@ -540 +540 @@
         IssmDouble Delta18oTime;
         IssmDouble dpermil,f;
-        IssmDouble time,yts,time_yr,month,time_clim,time_climt,time_climp;
+        IssmDouble time,yts,time_yr,month,time_clim,time_climt,time_climp,del_clim;
         bool isTemperatureScaled=true;
         bool isPrecipScaled=true;
@@ -547 +547 @@
         this->parameters->FindParam(&f,SmbFEnum);
         time_yr=floor(time/yts)*yts;
-        time_clim=time_yr;
-        time_climt=time_yr;
-        time_climp=time_yr;
+        time_clim=ceil(time/yts + 1e-10)*yts;
+        time_climt=ceil(time/yts + 1e-10)*yts;
+        time_climp=ceil(time/yts + 1e-10)*yts;
 
         /*Get some pdd parameters*/
@@ -564 +564 @@
         int offset;
 
-        offset=dynamic_cast<TransientInput*>(input)->GetTimeInputOffset(time_yr);
-        if (fmod(offset,12.)!=1){
-                time_clim=floor(dynamic_cast<TransientInput*>(input)->GetTimeByOffset(offset-fmod(offset,12.)+1)/yts)*yts;
-        }
+        offset=dynamic_cast<TransientInput*>(input)->GetTimeInputOffset(time_clim);
+        time_clim=dynamic_cast<TransientInput*>(input)->GetTimeByOffset(offset-11-fmod(offset-11,12.));
 
         if(!isTemperatureScaled){
                 input3=this->inputs->GetInput(SmbTemperaturesReconstructedEnum);           _assert_(input3);
-                offset=dynamic_cast<TransientInput*>(input3)->GetTimeInputOffset(time_yr);
-                if (fmod(offset,12.)!=1){
-                        time_climt=floor(dynamic_cast<TransientInput*>(input3)->GetTimeByOffset(offset-fmod(offset,12.)+1)/yts)*yts;
-                }
+                offset=dynamic_cast<TransientInput*>(input3)->GetTimeInputOffset(time_climt);
+                time_climt=dynamic_cast<TransientInput*>(input3)->GetTimeByOffset(offset-11-fmod(offset-11,12.));
         }
         if(!isPrecipScaled){
                 input4=this->inputs->GetInput(SmbPrecipitationsReconstructedEnum);         _assert_(input4);
-                offset=dynamic_cast<TransientInput*>(input4)->GetTimeInputOffset(time_yr);
-                if (fmod(offset,12.)!=1){
-                        time_climp=floor(dynamic_cast<TransientInput*>(input4)->GetTimeByOffset(offset-fmod(offset,12.)+1)/yts)*yts;
-                }
+                offset=dynamic_cast<TransientInput*>(input4)->GetTimeInputOffset(time_climp);
+                time_climp=dynamic_cast<TransientInput*>(input4)->GetTimeByOffset(offset-11-fmod(offset-11,12.));
         }