Changeset 23811

Timestamp:

03/29/19 14:16:19 (6 years ago)

Author:

schlegel

Message:

CHG: update climatology to not use fmod

File:

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

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

@@ -3255 +3255 @@
         IssmDouble thermo_scaling=1.0;
         IssmDouble adThresh=1023.0;
-        int offset0, offsetend;
-        IssmDouble time0, timeend;
+        int offsetend;
+        IssmDouble time0, timeend, delta;
 
         /*}}}*/
@@ -3473 +3473 @@
         //go back to time - deltaT:
         time-=dt;
+
+        timeclim=time;
         if (isclimatology){
                 //If this is a climatology, we need to repeat the forcing after the final time
-                offset0=dynamic_cast<TransientInput*>(Ta_input)->GetTimeInputOffset(starttime);
                 offsetend=dynamic_cast<TransientInput*>(Ta_input)->GetTimeInputOffset(finaltime);
-                time0=dynamic_cast<TransientInput*>(Ta_input)->GetTimeByOffset(offset0);
+                time0=dynamic_cast<TransientInput*>(Ta_input)->GetTimeByOffset(0);
                 timeend=dynamic_cast<TransientInput*>(Ta_input)->GetTimeByOffset(offsetend);
-
-                #if defined(_HAVE_ADOLC_)
-                _error_("fmod is not differentiable...");
-                #else
-                timeclim=time0+fmod(time-time0,timeend-time0);
-                #endif                                                                                                                                                                                                  
-        }
-        else{
-                timeclim=time;
+                if (time>time0){
+                        delta=(time-time0) - (timeend-time0)*floor((time-time0)/(timeend-time0));
+                        timeclim=time0+delta;
+                }
         }
 
@@ -3504 +3500 @@
                 eAir_input->GetInputValue(&eAir,gauss,t-time+timeclim);  //screen level vapor pressure [Pa]
                 pAir_input->GetInputValue(&pAir,gauss,t-time+timeclim);  // screen level air pressure [Pa]
-                teValue_input->GetInputValue(&teValue,gauss);  // screen level air pressure [Pa]
+                teValue_input->GetInputValue(&teValue,gauss);  // Emissivity [0-1]
                 aValue_input->GetInputValue(&aValue,gauss);  // screen level air pressure [Pa]
                 //_printf_("Time: " << t << " Ta: " << Ta << " V: " << V << " dlw: " << dlw << " dsw: " << dsw << " P: " << P << " eAir: " << eAir << " pAir: " << pAir << "\n");