support MFDA (#239)

storm-fsv-cvut · Nov 16, 2023 · 814a15a · 814a15a
1 parent 791fa20
commit 814a15a
Show file tree

Hide file tree

Showing 54 changed files with 7,106 additions and 31 deletions.
diff --git a/.github/workflows/cmd_provider.yml b/.github/workflows/cmd_provider.yml
@@ -48,6 +48,20 @@ jobs:
       python-version: ${{ matrix.python-version }}
       pytest-suite: tests/test_cmd.py --config config_files/quicktest_sheet_stream.ini
 
+  smoderp2d-quicktest-rill-mfda:
+    strategy:
+      matrix:
+        python-version:
+          # - "2.7"
+          - "3.9"
+          - "3.11"
+
+    uses: ./.github/workflows/cmd_template.yml
+    with:
+      python-version: ${{ matrix.python-version }}
+      pytest-suite: tests/test_cmd.py --config config_files/quicktest_rill.ini --reference_dir=data/reference/quicktest_rill_mfda
+      mfda: true
+
   smoderp2d-quicktest-stream-rill:
     strategy:
       matrix:
@@ -100,6 +114,20 @@ jobs:
       python-version: ${{ matrix.python-version }}
       pytest-suite: tests/test_cmd.py --config config_files/test_sheet_stream.ini
 
+  smoderp2d-longtest-stream-rill-mfda:
+    strategy:
+      matrix:
+        python-version:
+          # - "2.7"
+          - "3.9"
+          - "3.11"
+
+    uses: ./.github/workflows/cmd_template.yml
+    with:
+      python-version: ${{ matrix.python-version }}
+      pytest-suite: tests/test_cmd.py --config config_files/test_stream_rill.ini --reference_dir=data/reference/test_stream_rill_mfda
+      mfda: true
+
   smoderp2d-longtest-stream-rill:
     strategy:
       matrix:

diff --git a/.github/workflows/cmd_template.yml b/.github/workflows/cmd_template.yml
@@ -9,6 +9,10 @@ on:
       pytest-suite:
         required: true
         type: string
+      mfda:
+        required: false
+        type: boolean
+        default: false
 
 jobs:
   consistency_test:
@@ -30,6 +34,11 @@ jobs:
           pip install -r .github/workflows/requirements.txt          
           pip install -r .github/workflows/requirements${{ inputs.python-version }}.txt
 
+      - name: Set up hidden config
+        if: ${{ inputs.mfda == true }}
+        run: |
+          mv tests/config_files/mfda_config.ini smoderp2d/.config.ini
+
       - name: Run command test suite
         run: |
           pytest ${{ inputs.pytest-suite }}
diff --git a/smoderp2d/core/flow.py b/smoderp2d/core/flow.py
@@ -14,9 +14,10 @@
 #  classes Kinematic or Diffuse in the
 #  package smoderp2d.core.kinematic_diffuse
 #
+import numpy as np
 import numpy.ma as ma
 
-from smoderp2d.core.general import Globals
+from smoderp2d.core.general import Globals, GridGlobals
 
 import smoderp2d.flow_algorithm.mfd as mfd
 import smoderp2d.flow_algorithm.D8 as D8_
@@ -101,44 +102,91 @@ def __init__(self):
 
         Logger.info("Multiflow direction algorithm")
         self.inflows, fd_rill = mfd.new_mfda(
-            mat_dem, mat_nan, mat_fd, dy, dx, rows, cols
+            Globals.mat_dem, Globals.mat_nan, Globals.mat_fd
         )
         self.inflowsRill = D8_.new_inflows(fd_rill)
 
     def update_inflows(self, fd):
-        self.inflows, fd_rill = mfd.new_mfda(
-            self.H, mat_nan, fd, dy, dx, rows, cols)
+        self.inflows, fd_rill = mfd.new_mfda(self.H, Globals.mat_nan, fd)
         self.inflowsRill = D8_.new_inflows(fd_rill)
 
     def cell_runoff(self, i, j, sur=True):
+        if i == 0:
+            inflows_up = np.array([[0,] * 8,] * GridGlobals.c)
+            inflows_down = self.inflows[i + 1]
+            vol_runoff_up = np.array([0,] * GridGlobals.c)
+            vol_runoff_down = self.arr.vol_runoff.data[i + 1]
+        elif i == GridGlobals.r - 1:
+            inflows_up = self.inflows[i - 1]
+            inflows_down = np.array([[0,] * 8,] * GridGlobals.c)
+            vol_runoff_up = self.arr.vol_runoff.data[i - 1]
+            vol_runoff_down = np.array([0,] * GridGlobals.c)
+        else:
+            inflows_up = self.inflows[i - 1]
+            inflows_down = self.inflows[i + 1]
+            vol_runoff_up = self.arr.vol_runoff.data[i - 1]
+            vol_runoff_down = self.arr.vol_runoff.data[i + 1]
+
+        if j == 0:
+            inflows_leftup = 0
+            inflows_left = 0
+            inflows_leftdown = 0
+            inflows_rightup = inflows_up[j + 1][3]
+            inflows_right = self.inflows[i][j + 1][4]
+            inflows_rightdown = inflows_down[j + 1][5]
+            vol_runoff_leftup = 0
+            vol_runoff_left = 0
+            vol_runoff_leftdown = 0
+            vol_runoff_rightup = vol_runoff_up[j + 1]
+            vol_runoff_right = self.arr.vol_runoff.data[i][j + 1]
+            vol_runoff_rightdown = vol_runoff_down[j + 1]
+        elif j == GridGlobals.c - 1:
+            inflows_leftup = inflows_up[j - 1][1]
+            inflows_left = self.inflows[i][j - 1][0]
+            inflows_leftdown = inflows_down[j - 1][7]
+            inflows_rightup = 0
+            inflows_right = 0
+            inflows_rightdown = 0
+            vol_runoff_leftup = vol_runoff_up[j - 1]
+            vol_runoff_left = self.arr.vol_runoff.data[i][j - 1]
+            vol_runoff_leftdown = vol_runoff_down[j - 1]
+            vol_runoff_rightup = 0
+            vol_runoff_right = 0
+            vol_runoff_rightdown = 0
+        else:
+            inflows_leftup = inflows_up[j - 1][1]
+            inflows_left = self.inflows[i][j - 1][0]
+            inflows_leftdown = inflows_down[j - 1][7]
+            inflows_rightup = inflows_up[j + 1][3]
+            inflows_right = self.inflows[i][j + 1][4]
+            inflows_rightdown = inflows_down[j + 1][5]
+            vol_runoff_leftup = vol_runoff_up[j - 1]
+            vol_runoff_left = self.arr.vol_runoff.data[i][j - 1]
+            vol_runoff_leftdown = vol_runoff_down[j - 1]
+            vol_runoff_rightup = vol_runoff_up[j + 1]
+            vol_runoff_right = self.arr.vol_runoff.data[i][j + 1]
+            vol_runoff_rightdown = vol_runoff_down[j + 1]
+
         inflow_from_cells = \
-            self.inflows[i - 1][j - 1][1] * \
-            self.arr.get_item([i - 1, j - 1]).vol_runoff_pre + \
-            self.inflows[i - 1][j][2] * \
-            self.arr.get_item([i - 1, j]).vol_runoff_pre + \
-            self.inflows[i - 1][j + 1][3] * \
-            self.arr.get_item([i - 1, j + 1]).vol_runoff_pre + \
-            self.inflows[i][j - 1][0] * \
-            self.arr.get_item([i, j - 1]).vol_runoff_pre + \
-            self.inflows[i][j + 1][4] * \
-            self.arr.get_item([i, j + 1]).vol_runoff_pre + \
-            self.inflows[i + 1][j - 1][7] * \
-            self.arr.get_item([i + 1, j - 1]).vol_runoff_pre + \
-            self.inflows[i + 1][j][6] * \
-            self.arr.get_item([i + 1, j]).vol_runoff_pre + \
-            self.inflows[i + 1][j + 1][5] * \
-            self.arr.get_item([i + 1, j + 1]).vol_runoff_pre
+            inflows_leftup * vol_runoff_leftup + \
+            inflows_up[j][2] * vol_runoff_up[j] + \
+            inflows_rightup * vol_runoff_rightup + \
+            inflows_left * vol_runoff_left + \
+            inflows_right * vol_runoff_right + \
+            inflows_leftdown * vol_runoff_leftdown + \
+            inflows_down[j][6] * vol_runoff_down[j] + \
+            inflows_rightdown * vol_runoff_rightdown
 
         if Globals.isRill and sur:
-            state_ij = self.state[i, j]
+            state_ij = self.arr.state[i, j]
             for z in range(len(self.inflowsRill[i][j])):
                 ax = self.inflowsRill[i][j][z][0]
                 bx = self.inflowsRill[i][j][z][1]
                 iax = i + ax
                 jbx = j + bx
 
-                if ma.equal(state_ij, 1) or ma.equal(state_ij, 1):
-                    inflow_from_cells += self.vol_runoff_rill_pre[iax, jbx]
+                if ma.equal(state_ij, 1) or ma.equal(state_ij, 2):
+                    inflow_from_cells += self.arr.vol_runoff_rill[iax, jbx]
                     # toto jeste predelat u ryh
 
         return inflow_from_cells
diff --git a/smoderp2d/flow_algorithm/mfd.py b/smoderp2d/flow_algorithm/mfd.py
@@ -15,12 +15,18 @@
 from smoderp2d.providers import Logger
 
 
-def new_mfda(mat_dem, mat_nan, mat_fd, dy, dx, rows, cols):
+def new_mfda(mat_dem, mat_nan, mat_fd):
     state = 0
     state2 = 0
 
+    rows = GridGlobals.r
+    cols = GridGlobals.c
+    dy = GridGlobals.dy
+    dx = GridGlobals.dx
+
     val_array = ma.masked_array(
-        np.zeros([rows, cols, 8], float), mask=GridGlobals.masks
+        np.zeros([rows, cols, 8], float),
+        mask=np.stack((GridGlobals.masks,) * 8, 2)
     )
     val_array2 = ma.masked_array(
         np.zeros([rows, cols], float), mask=GridGlobals.masks

diff --git a/tests/config_files/mfda_config.ini b/tests/config_files/mfda_config.ini
@@ -0,0 +1,27 @@
+[output]
+# if extraout is eq yes the model will provide more detailed results - will
+# show more variables in hydrographs point***.csv. It is usefull for debuging
+# model development or more stientific applications. For regular use the
+# extraout: no, which will provide the regural output.
+# yes or no
+# default: no
+extraout: yes
+# experimental times when rasters will be printed
+# default: empty value for off
+printtimes:
+
+[logging]
+# logging level
+#  - CRITICAL
+#  - ERROR
+#  - WARNING
+#  - INFO
+#  - DEBUG
+#  - NOTSET
+# default: INFO
+level: DEBUG
+
+[processes]
+# Mfda enabled
+# default: False
+mfda: True
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -1,2 +1,3 @@
 def pytest_addoption(parser):
     parser.addoption("--config", action="store", default="quicktest_rill.ini")
+    parser.addoption("--reference_dir", action="store", default=None)
diff --git a/tests/data/reference/quicktest_rill_mfda/control/cinfil_m3.asc b/tests/data/reference/quicktest_rill_mfda/control/cinfil_m3.asc
@@ -0,0 +1,17 @@
+-9.999000e+03 -9.999000e+03 -9.999000e+03 -9.999000e+03 -9.999000e+03 -9.999000e+03
+-9.999000e+03 1.654280e-04 1.654280e-04 1.654280e-04 1.654280e-04 -9.999000e+03
+-9.999000e+03 1.654280e-04 1.658748e-04 1.662372e-04 1.654280e-04 -9.999000e+03
+-9.999000e+03 1.654280e-04 1.662482e-04 1.668203e-04 1.654280e-04 -9.999000e+03
+-9.999000e+03 1.654280e-04 1.665831e-04 1.673266e-04 1.654280e-04 -9.999000e+03
+-9.999000e+03 1.654280e-04 1.668909e-04 1.677922e-04 1.654280e-04 -9.999000e+03
+-9.999000e+03 1.654280e-04 1.671804e-04 1.682281e-04 1.654280e-04 -9.999000e+03
+-9.999000e+03 1.654280e-04 1.674543e-04 1.686499e-04 1.654280e-04 -9.999000e+03
+-9.999000e+03 1.654280e-04 1.677160e-04 1.690542e-04 1.654280e-04 -9.999000e+03
+-9.999000e+03 1.654280e-04 1.679656e-04 1.694362e-04 1.654280e-04 -9.999000e+03
+-9.999000e+03 1.654280e-04 1.682073e-04 1.698089e-04 1.654280e-04 -9.999000e+03
+-9.999000e+03 1.654280e-04 1.684405e-04 1.701685e-04 1.654280e-04 -9.999000e+03
+-9.999000e+03 1.654280e-04 1.686659e-04 1.705181e-04 1.654280e-04 -9.999000e+03
+-9.999000e+03 1.654280e-04 1.688859e-04 1.708429e-04 1.654280e-04 -9.999000e+03
+-9.999000e+03 1.654280e-04 1.691002e-04 1.711592e-04 1.654280e-04 -9.999000e+03
+-9.999000e+03 1.654280e-04 1.693033e-04 1.714481e-04 1.654280e-04 -9.999000e+03
+-9.999000e+03 1.654903e-04 1.695529e-04 1.717250e-04 1.654903e-04 -9.999000e+03
diff --git a/tests/data/reference/quicktest_rill_mfda/control/crain_m3.asc b/tests/data/reference/quicktest_rill_mfda/control/crain_m3.asc
@@ -0,0 +1,17 @@
+-9.999000e+03 -9.999000e+03 -9.999000e+03 -9.999000e+03 -9.999000e+03 -9.999000e+03
+-9.999000e+03 1.250000e-03 1.250000e-03 1.250000e-03 1.250000e-03 -9.999000e+03
+-9.999000e+03 1.250000e-03 1.250000e-03 1.250000e-03 1.250000e-03 -9.999000e+03
+-9.999000e+03 1.250000e-03 1.250000e-03 1.250000e-03 1.250000e-03 -9.999000e+03
+-9.999000e+03 1.250000e-03 1.250000e-03 1.250000e-03 1.250000e-03 -9.999000e+03
+-9.999000e+03 1.250000e-03 1.250000e-03 1.250000e-03 1.250000e-03 -9.999000e+03
+-9.999000e+03 1.250000e-03 1.250000e-03 1.250000e-03 1.250000e-03 -9.999000e+03
+-9.999000e+03 1.250000e-03 1.250000e-03 1.250000e-03 1.250000e-03 -9.999000e+03
+-9.999000e+03 1.250000e-03 1.250000e-03 1.250000e-03 1.250000e-03 -9.999000e+03
+-9.999000e+03 1.250000e-03 1.250000e-03 1.250000e-03 1.250000e-03 -9.999000e+03
+-9.999000e+03 1.250000e-03 1.250000e-03 1.250000e-03 1.250000e-03 -9.999000e+03
+-9.999000e+03 1.250000e-03 1.250000e-03 1.250000e-03 1.250000e-03 -9.999000e+03
+-9.999000e+03 1.250000e-03 1.250000e-03 1.250000e-03 1.250000e-03 -9.999000e+03
+-9.999000e+03 1.250000e-03 1.250000e-03 1.250000e-03 1.250000e-03 -9.999000e+03
+-9.999000e+03 1.250000e-03 1.250000e-03 1.250000e-03 1.250000e-03 -9.999000e+03
+-9.999000e+03 1.250000e-03 1.250000e-03 1.250000e-03 1.250000e-03 -9.999000e+03
+-9.999000e+03 1.250000e-03 1.250000e-03 1.250000e-03 1.250000e-03 -9.999000e+03
diff --git a/tests/data/reference/quicktest_rill_mfda/control/crillvout_m3.asc b/tests/data/reference/quicktest_rill_mfda/control/crillvout_m3.asc
@@ -0,0 +1,17 @@
+-9.999000e+03 -9.999000e+03 -9.999000e+03 -9.999000e+03 -9.999000e+03 -9.999000e+03
+-9.999000e+03 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 -9.999000e+03
+-9.999000e+03 0.000000e+00 0.000000e+00 2.605687e-04 0.000000e+00 -9.999000e+03
+-9.999000e+03 0.000000e+00 0.000000e+00 8.440042e-04 0.000000e+00 -9.999000e+03
+-9.999000e+03 0.000000e+00 0.000000e+00 1.328124e-03 0.000000e+00 -9.999000e+03
+-9.999000e+03 0.000000e+00 0.000000e+00 1.738068e-03 0.000000e+00 -9.999000e+03
+-9.999000e+03 0.000000e+00 0.000000e+00 2.100144e-03 0.000000e+00 -9.999000e+03
+-9.999000e+03 0.000000e+00 0.000000e+00 2.558568e-03 0.000000e+00 -9.999000e+03
+-9.999000e+03 0.000000e+00 0.000000e+00 2.982169e-03 0.000000e+00 -9.999000e+03
+-9.999000e+03 0.000000e+00 0.000000e+00 3.302386e-03 0.000000e+00 -9.999000e+03
+-9.999000e+03 0.000000e+00 0.000000e+00 3.716753e-03 0.000000e+00 -9.999000e+03
+-9.999000e+03 0.000000e+00 0.000000e+00 4.098599e-03 0.000000e+00 -9.999000e+03
+-9.999000e+03 0.000000e+00 0.000000e+00 4.452702e-03 0.000000e+00 -9.999000e+03
+-9.999000e+03 0.000000e+00 0.000000e+00 4.890447e-03 0.000000e+00 -9.999000e+03
+-9.999000e+03 0.000000e+00 0.000000e+00 5.251086e-03 0.000000e+00 -9.999000e+03
+-9.999000e+03 0.000000e+00 0.000000e+00 5.709765e-03 0.000000e+00 -9.999000e+03
+-9.999000e+03 0.000000e+00 0.000000e+00 3.714492e-03 0.000000e+00 -9.999000e+03
diff --git a/tests/data/reference/quicktest_rill_mfda/control/csheetvout_m3.asc b/tests/data/reference/quicktest_rill_mfda/control/csheetvout_m3.asc
@@ -0,0 +1,17 @@
+-9.999000e+03 -9.999000e+03 -9.999000e+03 -9.999000e+03 -9.999000e+03 -9.999000e+03
+-9.999000e+03 4.595720e-04 4.595720e-04 4.595720e-04 4.595720e-04 -9.999000e+03
+-9.999000e+03 4.595720e-04 9.186972e-04 1.117338e-03 4.595720e-04 -9.999000e+03
+-9.999000e+03 4.595720e-04 1.377449e-03 1.451654e-03 4.595720e-04 -9.999000e+03
+-9.999000e+03 4.595720e-04 1.835866e-03 1.884780e-03 4.595720e-04 -9.999000e+03
+-9.999000e+03 4.595720e-04 2.293975e-03 2.391615e-03 4.595720e-04 -9.999000e+03
+-9.999000e+03 4.595720e-04 2.751795e-03 2.945884e-03 4.595720e-04 -9.999000e+03
+-9.999000e+03 4.595720e-04 3.209340e-03 3.403381e-03 4.595720e-04 -9.999000e+03
+-9.999000e+03 4.595720e-04 3.666624e-03 3.895298e-03 4.595720e-04 -9.999000e+03
+-9.999000e+03 4.595720e-04 4.123659e-03 4.490217e-03 4.595720e-04 -9.999000e+03
+-9.999000e+03 4.595720e-04 4.580451e-03 4.990613e-03 4.595720e-04 -9.999000e+03
+-9.999000e+03 4.595720e-04 5.037011e-03 5.523171e-03 4.595720e-04 -9.999000e+03
+-9.999000e+03 4.595720e-04 5.493345e-03 6.083122e-03 4.595720e-04 -9.999000e+03
+-9.999000e+03 4.595720e-04 5.949459e-03 6.559106e-03 4.595720e-04 -9.999000e+03
+-9.999000e+03 4.595720e-04 6.405359e-03 7.111879e-03 4.595720e-04 -9.999000e+03
+-9.999000e+03 4.595720e-04 6.861056e-03 7.566324e-03 4.595720e-04 -9.999000e+03
+-9.999000e+03 4.595097e-04 7.316503e-03 1.047416e-02 4.595097e-04 -9.999000e+03
diff --git a/tests/data/reference/quicktest_rill_mfda/control/cvin_m3.asc b/tests/data/reference/quicktest_rill_mfda/control/cvin_m3.asc
@@ -0,0 +1,17 @@
+-9.999000e+03 -9.999000e+03 -9.999000e+03 -9.999000e+03 -9.999000e+03 -9.999000e+03
+-9.999000e+03 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 -9.999000e+03
+-9.999000e+03 0.000000e+00 4.595720e-04 9.191439e-04 0.000000e+00 -9.999000e+03
+-9.999000e+03 0.000000e+00 9.186972e-04 1.837479e-03 0.000000e+00 -9.999000e+03
+-9.999000e+03 0.000000e+00 1.377449e-03 2.755230e-03 0.000000e+00 -9.999000e+03
+-9.999000e+03 0.000000e+00 1.835866e-03 3.672476e-03 0.000000e+00 -9.999000e+03
+-9.999000e+03 0.000000e+00 2.293975e-03 4.589256e-03 0.000000e+00 -9.999000e+03
+-9.999000e+03 0.000000e+00 2.751795e-03 5.505599e-03 0.000000e+00 -9.999000e+03
+-9.999000e+03 0.000000e+00 3.209340e-03 6.421522e-03 0.000000e+00 -9.999000e+03
+-9.999000e+03 0.000000e+00 3.666624e-03 7.337039e-03 0.000000e+00 -9.999000e+03
+-9.999000e+03 0.000000e+00 4.123659e-03 8.252175e-03 0.000000e+00 -9.999000e+03
+-9.999000e+03 0.000000e+00 4.580451e-03 9.166938e-03 0.000000e+00 -9.999000e+03
+-9.999000e+03 0.000000e+00 5.037011e-03 1.008134e-02 0.000000e+00 -9.999000e+03
+-9.999000e+03 0.000000e+00 5.493345e-03 1.099540e-02 0.000000e+00 -9.999000e+03
+-9.999000e+03 0.000000e+00 5.949459e-03 1.190912e-02 0.000000e+00 -9.999000e+03
+-9.999000e+03 0.000000e+00 6.405359e-03 1.282254e-02 0.000000e+00 -9.999000e+03
+-9.999000e+03 0.000000e+00 6.861056e-03 1.373538e-02 0.000000e+00 -9.999000e+03
diff --git a/tests/data/reference/quicktest_rill_mfda/control/massbalance.asc b/tests/data/reference/quicktest_rill_mfda/control/massbalance.asc
@@ -0,0 +1,17 @@
+-9.999000e+03 -9.999000e+03 -9.999000e+03 -9.999000e+03 -9.999000e+03 -9.999000e+03
+-9.999000e+03 -1.420305e-17 -1.420305e-17 -1.420305e-17 -1.420305e-17 -9.999000e+03
+-9.999000e+03 -1.409463e-17 -1.474515e-17 -1.322727e-17 -1.409463e-17 -9.999000e+03
+-9.999000e+03 -1.387779e-17 -1.301043e-17 -1.387779e-17 -1.387779e-17 -9.999000e+03
+-9.999000e+03 -1.409463e-17 -1.474515e-17 -1.778092e-17 -1.409463e-17 -9.999000e+03
+-9.999000e+03 -1.420305e-17 -1.214306e-17 -2.081668e-17 -1.420305e-17 -9.999000e+03
+-9.999000e+03 -1.420305e-17 -1.604619e-17 -9.540979e-18 -1.420305e-17 -9.999000e+03
+-9.999000e+03 -1.420305e-17 -1.908196e-17 -9.540979e-18 -1.420305e-17 -9.999000e+03
+-9.999000e+03 -1.409463e-17 -6.505213e-18 -2.688821e-17 -1.409463e-17 -9.999000e+03
+-9.999000e+03 -1.409463e-17 -1.647987e-17 -1.561251e-17 -1.409463e-17 -9.999000e+03
+-9.999000e+03 -1.409463e-17 -1.040834e-17 3.469447e-18 -1.409463e-17 -9.999000e+03
+-9.999000e+03 -1.409463e-17 -1.474515e-17 -1.387779e-17 -1.409463e-17 -9.999000e+03
+-9.999000e+03 -1.376937e-17 -1.127570e-17 -1.908196e-17 -1.376937e-17 -9.999000e+03
+-9.999000e+03 -1.452831e-17 -1.734723e-17 1.734723e-18 -1.452831e-17 -9.999000e+03
+-9.999000e+03 -1.398621e-17 -1.821460e-17 -2.428613e-17 -1.398621e-17 -9.999000e+03
+-9.999000e+03 -1.409463e-17 -1.127570e-17 -1.040834e-17 -1.409463e-17 -9.999000e+03
+-9.999000e+03 -1.409463e-17 -1.301043e-17 -3.469447e-17 -1.409463e-17 -9.999000e+03
diff --git a/tests/data/reference/quicktest_rill_mfda/control/mqrill_m3_s.asc b/tests/data/reference/quicktest_rill_mfda/control/mqrill_m3_s.asc
@@ -0,0 +1,17 @@
+-9.999000e+03 -9.999000e+03 -9.999000e+03 -9.999000e+03 -9.999000e+03 -9.999000e+03
+-9.999000e+03 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 -9.999000e+03
+-9.999000e+03 0.000000e+00 0.000000e+00 2.129156e-06 0.000000e+00 -9.999000e+03
+-9.999000e+03 0.000000e+00 0.000000e+00 6.904441e-06 0.000000e+00 -9.999000e+03
+-9.999000e+03 0.000000e+00 0.000000e+00 1.084051e-05 0.000000e+00 -9.999000e+03
+-9.999000e+03 0.000000e+00 0.000000e+00 1.414637e-05 0.000000e+00 -9.999000e+03
+-9.999000e+03 0.000000e+00 0.000000e+00 1.704205e-05 0.000000e+00 -9.999000e+03
+-9.999000e+03 0.000000e+00 0.000000e+00 2.071946e-05 0.000000e+00 -9.999000e+03
+-9.999000e+03 0.000000e+00 0.000000e+00 2.409704e-05 0.000000e+00 -9.999000e+03
+-9.999000e+03 0.000000e+00 0.000000e+00 2.661049e-05 0.000000e+00 -9.999000e+03
+-9.999000e+03 0.000000e+00 0.000000e+00 2.988965e-05 0.000000e+00 -9.999000e+03
+-9.999000e+03 0.000000e+00 0.000000e+00 3.289058e-05 0.000000e+00 -9.999000e+03
+-9.999000e+03 0.000000e+00 0.000000e+00 3.565342e-05 0.000000e+00 -9.999000e+03
+-9.999000e+03 0.000000e+00 0.000000e+00 3.909665e-05 0.000000e+00 -9.999000e+03
+-9.999000e+03 0.000000e+00 0.000000e+00 4.189518e-05 0.000000e+00 -9.999000e+03
+-9.999000e+03 0.000000e+00 0.000000e+00 4.549401e-05 0.000000e+00 -9.999000e+03
+-9.999000e+03 0.000000e+00 0.000000e+00 2.931837e-05 0.000000e+00 -9.999000e+03
diff --git a/tests/data/reference/quicktest_rill_mfda/control/mqsheet_m3_s.asc b/tests/data/reference/quicktest_rill_mfda/control/mqsheet_m3_s.asc
@@ -0,0 +1,17 @@
+-9.999000e+03 -9.999000e+03 -9.999000e+03 -9.999000e+03 -9.999000e+03 -9.999000e+03
+-9.999000e+03 7.886535e-05 7.886535e-05 7.886535e-05 7.886535e-05 -9.999000e+03
+-9.999000e+03 7.886533e-05 8.194693e-05 1.411795e-04 7.886533e-05 -9.999000e+03
+-9.999000e+03 7.886531e-05 8.446436e-05 1.411795e-04 7.886531e-05 -9.999000e+03
+-9.999000e+03 7.886533e-05 8.700981e-05 1.411795e-04 7.886533e-05 -9.999000e+03
+-9.999000e+03 7.886535e-05 8.958305e-05 1.411794e-04 7.886535e-05 -9.999000e+03
+-9.999000e+03 7.886535e-05 9.218387e-05 1.411794e-04 7.886535e-05 -9.999000e+03
+-9.999000e+03 7.886535e-05 9.481207e-05 1.411794e-04 7.886535e-05 -9.999000e+03
+-9.999000e+03 7.886533e-05 9.746745e-05 1.411795e-04 7.886533e-05 -9.999000e+03
+-9.999000e+03 7.886533e-05 1.001498e-04 1.411795e-04 7.886533e-05 -9.999000e+03
+-9.999000e+03 7.886533e-05 1.031094e-04 1.411795e-04 7.886533e-05 -9.999000e+03
+-9.999000e+03 7.886533e-05 1.064623e-04 1.411795e-04 7.886533e-05 -9.999000e+03
+-9.999000e+03 7.886534e-05 1.096863e-04 1.411794e-04 7.886534e-05 -9.999000e+03
+-9.999000e+03 7.886535e-05 1.128251e-04 1.411794e-04 7.886535e-05 -9.999000e+03
+-9.999000e+03 7.886534e-05 1.159093e-04 1.411794e-04 7.886534e-05 -9.999000e+03
+-9.999000e+03 7.886534e-05 1.192742e-04 1.411794e-04 7.886534e-05 -9.999000e+03
+-9.999000e+03 7.353664e-05 1.226564e-04 1.591233e-04 7.353664e-05 -9.999000e+03