Changeset 2811 in lmdz_wrf for trunk/tools

Timestamp:

Apr 8, 2020, 10:30:47 PM (5 years ago)

Author:

lfita

Message:

Rounding truncation to the latest decimal

File:

• trunk/tools/generic_tools.py (modified) (2 diffs)

trunk/tools/generic_tools.py

@@ -14112 +14112 @@
     fname = 'truncate'
 
-    multiplier = 10. ** decimals
+    dec = decimals + 1
+    multiplier = 10. ** dec
     tfv = int(fv * multiplier) / multiplier
 
-    return int(fv * multiplier) / multiplier
+    # decimals section
+    decsec = int(fv*multiplier-int(fv)*multiplier)
+    
+    # last decimal
+    if decsec != 0.:
+        lastdecsec = int((decsec/10. - int(decsec/10.))*10)
+        if lastdecsec > 5.:
+            decsec = decsec + 1
+            fv = int(fv) + decsec/multiplier
+
+    dec = decimals
+    multiplier = 10. ** dec
+    tfv = int(fv * multiplier) / multiplier
+
+    return tfv
 
 def angle_DegMinSec(angle):
@@ -14129 +14144 @@
    degv = int(abs(angle))
    minv = int((abs(angle) - degv*1.)*60.)
-   secv = (abs(angle) - degv*1. - minv/60.)*3600.
-
+   secv = truncate((abs(angle) - degv*1. - minv/60.)*3600., 7) 
    if secv < 1.e-8: secv = 0.