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

Timestamp:

Jun 11, 2020, 11:14:56 PM (4 years ago)

Author:

Anne Philipp <anne.philipp@…>

Branches:

master, ctbto, dev

Children:

3a54479

Parents:

0c8c068

Message:

ECMWF server output directory renamed; reformulate dapoly formula; changed template filenames; make use of config jobscript names

File:

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

Source/Python/Mods/disaggregation.py

@@ -18 +18 @@
 #          to a new module named disaggregation
 #        - added the new disaggregation method for precipitation
+#
+#    June 2020 - Anne Philipp (University of Vienna):
+#        - reformulated formular for dapoly
 #
 # @License:
@@ -92 +95 @@
 
     """
-
-    pya = (alist[3] - alist[0] + 3. * (alist[1] - alist[2])) / 6.
-    pyb = (alist[2] + alist[0]) / 2. - alist[1] - 9. * pya / 2.
-    pyc = alist[1] - alist[0] - 7. * pya / 2. - 2. * pyb
-    pyd = alist[0] - pya / 4. - pyb / 3. - pyc / 2.
-    nfield = 8. * pya + 4. * pyb + 2. * pyc + pyd
+    
+    nfield = -1./12.*alist[0] + \
+              7./12.*alist[1] + \
+              7./12.*alist[2] - \
+              1./12.*alist[3]
 
     return nfield