Changeset 21920

Timestamp:

08/09/17 11:55:56 (8 years ago)

Author:

schlegel

Message:

BUG: fixed compilation errors, fmod needs floating points

Location:

issm/trunk-jpl/src/c/classes

Files:

• Elements/Element.cpp (modified) (1 diff)
• Inputs/TransientInput.cpp (modified) (1 diff)

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

@@ -555 +555 @@
 
         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;
+        if (fmod(offset,12.)!=1){
+                time_clim=floor(dynamic_cast<TransientInput*>(input)->GetTimeByOffset(offset-fmod(offset,12.)+1)/yts)*yts;
         }
 

issm/trunk-jpl/src/c/classes/Inputs/TransientInput.cpp

@@ -264 +264 @@
 
         if (offset < 0) offset=0;
-        _assert_(this->timesteps[offset]);
+        _assert_(offset<this->numtimesteps);
 
         return this->timesteps[offset];