Changeset 23819

Timestamp:

04/01/19 14:27:40 (6 years ago)

Author:

schlegel

Message:

CHG: added initialization for climtime

Location:

issm/trunk-jpl/src/c

Files:

• classes/Elements/Element.cpp (modified) (2 diffs)
• modules/SurfaceMassBalancex/SurfaceMassBalancex.cpp (modified) (11 diffs)

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

@@ -3255 +3255 @@
         IssmDouble thermo_scaling=1.0;
         IssmDouble adThresh=1023.0;
-        int offsetend;
+        int offsetend=-1;
         IssmDouble time0, timeend, delta;
 
@@ -3478 +3478 @@
                 //If this is a climatology, we need to repeat the forcing after the final time
                 offsetend=dynamic_cast<TransientInput*>(Ta_input)->GetTimeInputOffset(finaltime);
-                time0=dynamic_cast<TransientInput*>(Ta_input)->GetTimeByOffset(0);
+                time0=dynamic_cast<TransientInput*>(Ta_input)->GetTimeByOffset(-1);
                 timeend=dynamic_cast<TransientInput*>(Ta_input)->GetTimeByOffset(offsetend);
                 if (time>time0 & timeend>time0){

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

@@ -19 +19 @@
                 int v;
                 IssmDouble time,dt,delta,starttime,finaltime;
-                int offsetend;
+                int offsetend=-1;
                 IssmDouble time0, timeend, timeclim;
 
@@ -44 +44 @@
                         //Get accumulation climatology value
                         offsetend=dynamic_cast<TransientInput*>(smb_input)->GetTimeInputOffset(finaltime);
-                        time0=dynamic_cast<TransientInput*>(smb_input)->GetTimeByOffset(0);
+                        time0=dynamic_cast<TransientInput*>(smb_input)->GetTimeByOffset(-1);
                         timeend=dynamic_cast<TransientInput*>(smb_input)->GetTimeByOffset(offsetend);
+                        timeclim=time;
                         if (time>time0 & timeend>time0){
                                 delta=(time-time0) - (timeend-time0)*(reCast<int,IssmDouble>((time-time0)/(timeend-time0)));
@@ -406 +407 @@
         bool isclimatology=false;
         IssmDouble time,delta,starttime,finaltime;
-        int offsetend;
+        int offsetend=-1;
         IssmDouble time0, timeend, timeclim;
 
@@ -435 +436 @@
                         //Get accumulation climatology value
                         offsetend=dynamic_cast<TransientInput*>(acc_input)->GetTimeInputOffset(finaltime);
-                        time0=dynamic_cast<TransientInput*>(acc_input)->GetTimeByOffset(0);
+                        time0=dynamic_cast<TransientInput*>(acc_input)->GetTimeByOffset(-1);
                         timeend=dynamic_cast<TransientInput*>(acc_input)->GetTimeByOffset(offsetend);
+                        timeclim=time;
                         if (time>time0 & timeend>time0){
                                 delta=(time-time0) - (timeend-time0)*(reCast<int,IssmDouble>((time-time0)/(timeend-time0)));
@@ -447 +449 @@
                         //Get evaporation climatology value
                         offsetend=dynamic_cast<TransientInput*>(evap_input)->GetTimeInputOffset(finaltime);
-                        time0=dynamic_cast<TransientInput*>(evap_input)->GetTimeByOffset(0);
+                        time0=dynamic_cast<TransientInput*>(evap_input)->GetTimeByOffset(-1);
                         timeend=dynamic_cast<TransientInput*>(evap_input)->GetTimeByOffset(offsetend);
+                        timeclim=time;
                         if (time>time0 & timeend>time0){
                                 delta=(time-time0) - (timeend-time0)*(reCast<int,IssmDouble>((time-time0)/(timeend-time0)));
@@ -459 +462 @@
                         //Get runoff climatology value
                         offsetend=dynamic_cast<TransientInput*>(runoff_input)->GetTimeInputOffset(finaltime);
-                        time0=dynamic_cast<TransientInput*>(runoff_input)->GetTimeByOffset(0);
+                        time0=dynamic_cast<TransientInput*>(runoff_input)->GetTimeByOffset(-1);
                         timeend=dynamic_cast<TransientInput*>(runoff_input)->GetTimeByOffset(offsetend);
+                        timeclim=time;
                         if (time>time0 & timeend>time0){
                                 delta=(time-time0) - (timeend-time0)*(reCast<int,IssmDouble>((time-time0)/(timeend-time0)));
@@ -501 +505 @@
         bool isclimatology=false;
         IssmDouble time,delta,starttime,finaltime;
-        int offsetend;
+        int offsetend=-1;
         IssmDouble time0, timeend, timeclim;
 
@@ -532 +536 @@
                         //Get accumulation climatology value
                         offsetend=dynamic_cast<TransientInput*>(acc_input)->GetTimeInputOffset(finaltime);
-                        time0=dynamic_cast<TransientInput*>(acc_input)->GetTimeByOffset(0);
+                        time0=dynamic_cast<TransientInput*>(acc_input)->GetTimeByOffset(-1);
                         timeend=dynamic_cast<TransientInput*>(acc_input)->GetTimeByOffset(offsetend);
+                        timeclim=time;
                         if (time>time0 & timeend>time0){
                                 delta=(time-time0) - (timeend-time0)*(reCast<int,IssmDouble>((time-time0)/(timeend-time0)));
@@ -544 +549 @@
                         //Get evaporation climatology value
                         offsetend=dynamic_cast<TransientInput*>(evap_input)->GetTimeInputOffset(finaltime);
-                        time0=dynamic_cast<TransientInput*>(evap_input)->GetTimeByOffset(0);
+                        time0=dynamic_cast<TransientInput*>(evap_input)->GetTimeByOffset(-1);
                         timeend=dynamic_cast<TransientInput*>(evap_input)->GetTimeByOffset(offsetend);
+                        timeclim=time;
                         if (time>time0){
                                 delta=(time-time0) - (timeend-time0)*(reCast<int,IssmDouble>((time-time0)/(timeend-time0)));
@@ -556 +562 @@
                         //Get melt climatology value
                         offsetend=dynamic_cast<TransientInput*>(melt_input)->GetTimeInputOffset(finaltime);
-                        time0=dynamic_cast<TransientInput*>(melt_input)->GetTimeByOffset(0);
+                        time0=dynamic_cast<TransientInput*>(melt_input)->GetTimeByOffset(-1);
                         timeend=dynamic_cast<TransientInput*>(melt_input)->GetTimeByOffset(offsetend);
+                        timeclim=time;
                         if (time>time0){
                                 delta=(time-time0) - (timeend-time0)*(reCast<int,IssmDouble>((time-time0)/(timeend-time0)));
@@ -568 +575 @@
                         //Get refreeze climatology value
                         offsetend=dynamic_cast<TransientInput*>(refreeze_input)->GetTimeInputOffset(finaltime);
-                        time0=dynamic_cast<TransientInput*>(refreeze_input)->GetTimeByOffset(0);
+                        time0=dynamic_cast<TransientInput*>(refreeze_input)->GetTimeByOffset(-1);
                         timeend=dynamic_cast<TransientInput*>(refreeze_input)->GetTimeByOffset(offsetend);
+                        timeclim=time;
                         if (time>time0){
                                 delta=(time-time0) - (timeend-time0)*(reCast<int,IssmDouble>((time-time0)/(timeend-time0)));