Changeset 0f89116 in flex_extract.git for Source/Python/Mods/disaggregation.py

Timestamp:

Dec 19, 2019, 8:07:12 PM (4 years ago)

Author:

Anne Philipp <anne.philipp@…>

Branches:

master, ctbto, dev

Children:

a73c0f6

Parents:

0d99607

Message:

diverse changes due to PEP8 style guide and eliminating grib2flexpart; removed unused parameter

File:

• Source/Python/Mods/disaggregation.py (modified) (8 diffs)

Source/Python/Mods/disaggregation.py

@@ -247 +247 @@
             # geometric mean, restricted such that non-negativity is guaranteed
             # according to Eq. (25)
-            fip1=min( 3.*g[i] , 3.*g[i+1] , np.sqrt(g[i+1]*g[i]) )
+            fip1 = min(3. * g[i], 3. * g[i + 1], np.sqrt(g[i + 1] * g[i]))
 
             # the function value at the first sub-grid point (fi1) is determined
@@ -281 +281 @@
                 # the monotonicity filter corrects the value at (fim1) by
                 # substituting (fim1) with (fmon), see Eq. (27), (28) and (29)
-                fmon = min(3.*g[i-2], \
-                           3.*g[i-1], \
-                           np.sqrt(max(0,(18./13.*g[i-2] - 5./13.*f[-7]) *
-                                         (18./13.*g[i-1] - 5./13.*f[-1]))))
+                fmon = min(3. * g[i - 2],
+                           3. * g[i - 1],
+                           np.sqrt(max(0, (18. / 13. * g[i - 2] - 5. / 13. * f[-7]) *
+                                       (18. / 13. * g[i - 1] - 5. / 13. * f[-1]))))
 
                 # recomputation of the sub-grid interval values while the
@@ -295 +295 @@
                 f[-2] = f[-3]+(f[-1]-fmon)/3.
 
-            f.extend([0.,0.,0.])
+            f.extend([0., 0., 0.])
 
         # otherwise the sub-grid values are calculated and added to the list
@@ -306 +306 @@
             # geometric mean, restricted such that non-negativity is guaranteed
             # according to Eq. (25)
-            fip1 = min( 3.*g[i] , 3.*g[i+1] , np.sqrt(g[i+1]*g[i]) )
+            fip1 = min(3. * g[i], 3. * g[i + 1], np.sqrt(g[i + 1] * g[i]))
 
             # the function value at the first sub-grid point (fi1) is determined
@@ -324 +324 @@
                 # the monotonicity filter corrects the value at (fim1) by
                 # substituting (fim1) with fmon, see Eq. (27), (28) and (29)
-                fmon = min(3.*g[i-2], \
-                           3.*g[i-1], \
-                           np.sqrt(max(0,(18./13.*g[i-2] - 5./13.*f[-7]) *
-                                         (18./13.*g[i-1] - 5./13.*f[-1]))))
+                fmon = min(3. * g[i - 2],
+                           3. * g[i - 1],
+                           np.sqrt(max(0, (18. / 13. * g[i - 2] - 5. / 13. * f[-7]) *
+                                       (18. / 13. * g[i - 1] - 5. / 13. * f[-1]))))
 
                 # recomputation of the sub-grid interval values while the
@@ -358 +358 @@
             # the monotonicity filter corrects the value at (fim1) by
             # substituting (fim1) with (fmon), see Eq. (27), (28) and (29)
-            fmon = min(3.*g[-3], \
-                       3.*g[-2], \
-                       np.sqrt(max(0,(18./13.*g[-3] - 5./13.*f[-7]) *
-                                     (18./13.*g[-2] - 5./13.*f[-1]))))
+            fmon = min(3. * g[-3],
+                       3. * g[-2],
+                       np.sqrt(max(0, (18. / 13. * g[-3] - 5. / 13. * f[-7]) *
+                                   (18. / 13. * g[-2] - 5. / 13. * f[-1]))))
 
             # recomputation of the sub-grid interval values while the
@@ -372 +372 @@
             f[-2] = f[-3]+(f[-1]-fmon)/3.
 
-        f.extend([0.,0.,0.])
+        f.extend([0., 0., 0.])
 
     # otherwise the sub-grid values are calculated and added to the list
@@ -397 +397 @@
             # the monotonicity filter corrects the value at (fim1) by
             # substituting (fim1) with (fmon), see Eq. (27), (28) and (29)
-            fmon = min(3.*g[-3], \
-                       3.*g[-2], \
-                       np.sqrt(max(0,(18./13.*g[-3] - 5./13.*f[-7]) *
-                                     (18./13.*g[-2] - 5./13.*f[-1]))))
+            fmon = min(3. * g[-3],
+                       3. * g[-2],
+                       np.sqrt(max(0, (18. / 13. * g[-3] - 5. / 13. * f[-7]) *
+                                   (18. / 13. * g[-2] - 5. / 13. * f[-1]))))
 
             # recomputation of the sub-grid interval values while the