diff --git a/.github/workflows/openfoam.yml b/.github/workflows/openfoam.yml
new file mode 100644
index 00000000..9fb5e1f0
--- /dev/null
+++ b/.github/workflows/openfoam.yml
@@ -0,0 +1,40 @@
+name: openfoam
+
+on:
+  push:
+    branches: [ of2206 ]
+  pull_request:
+    branches: [ of2206 ]
+
+jobs:
+  build-and-test:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: setup  openfoam
+      run: |
+        curl -s https://dl.openfoam.com/add-debian-repo.sh | sudo bash
+        sudo apt-get install libglu1-mesa
+        wget -q -O - https://dl.openfoam.com/add-debian-repo.sh | sudo bash
+        sudo apt-get update
+        sudo apt-get install openfoam2206-default
+    - name: compile library
+      run: |
+        export WM_NCOMPPROCS=2
+        openfoam2206 -c ./Allwmake
+        openfoam2206 -c ./get-gmsh.sh
+    - name: test
+      run: |
+        python -m pip install --upgrade pip
+        pip install oftest scipy casefoam
+        openfoam2206 -c "py.test  --writeNSteps=1 run/"
+        openfoam2206 -c "py.test -m 'not slow'"
+        
+    - name: upload logs
+      if: ${{ failure() }}
+      uses: actions/upload-artifact@v2
+      with:
+        name: logs
+        path: logs
diff --git a/.gitignore b/.gitignore
index d63c044e..2d878df0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,12 +35,16 @@ lnInclude
 #OpenFOAM
 Cases
 CasesTri
-polyMesh/*
-0.[0-9]* [1-9]* *e-*
+*/polyMesh/*
+0.[0-9]*
+[1-9]*
+*e-*
 processor*
 logs
 AlphaInit
 controlDict.orig
+*.msh
+gmsh-*-Linux64
 
 # Build directories - anywhere
 linux*Clang*/
diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
index 53efe53e..bb366d82 100644
--- a/.vscode/c_cpp_properties.json
+++ b/.vscode/c_cpp_properties.json
@@ -4,18 +4,12 @@
             "name": "Linux",
             "includePath": [
                 "${workspaceFolder}/**",
-                "${FOAM_SRC}/OpenFOAM/lnInclude",
-                "${FOAM_SRC}/finiteVolume/lnInclude"
-            ],
-            "browse.path":[
-                "${workspaceFolder}/**",
-                "${FOAM_SRC}/OpenFOAM/lnInclude",
-                "${FOAM_SRC}/finiteVolume/lnInclude"
+                "${FOAM_SRC}/**"
             ],
             "defines": [],
             "compilerPath": "/usr/bin/gcc",
             "cStandard": "c11",
-            "cppStandard": "c++17",
+            "cppStandard": "c++11",
             "intelliSenseMode": "clang-x64"
         }
     ],
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 447de6d2..1362c25b 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -1,17 +1,31 @@
 {
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
         {
-            "name": "(gdb) Launch",
+            "name": "OF-Debug",
+            "type": "cppdbg",
+            "request": "attach",
+            "processId": "${command:pickProcess}",
+            "program": "${env:FOAM_USER_APPBIN}/${fileBasenameNoExtension}",
+            "MIMode": "gdb",
+            "setupCommands": [
+                {
+                    "description": "Enable pretty-printing for gdb",
+                    "text": "-enable-pretty-printing",
+                    "ignoreFailures": true
+                }
+            ],
+            "preLaunchTask": "wmake-build",
+            "miDebuggerPath": "/usr/bin/gdb"
+        },
+        {
+            "name": "multiRegionPhaseChangeFlow",
             "type": "cppdbg",
             "request": "launch",
-            "program": "enter program name, for example ${workspaceFolder}/a.out",
+            "program": "${env:FOAM_USER_APPBIN}/multiRegionPhaseChangeFlow",
             "args": [],
             "stopAtEntry": false,
-            "cwd": "${workspaceFolder}",
+            "cwd": "/media/henning/ssd1linux/libsAndApps/release/TwoPhaseFlow/testsuite/cht/fixedFlux", //"${input:casepath}",
             "environment": [],
             "externalConsole": false,
             "MIMode": "gdb",
@@ -23,5 +37,5 @@
                 }
             ]
         }
-    ]
+    ],
 }
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
index f329c0c5..0793ed4b 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -2,13 +2,13 @@
     "files.associations": {
         "*.H": "cpp",
         "*.C": "cpp",
-        "vector": "cpp",
-        "limits": "cpp"
+        "random": "cpp",
+        "vector": "cpp"
     },
-    "C_Cpp.intelliSenseEngine": "Tag Parser",
     "python.testing.pytestArgs": [
         "."
     ],
     "python.testing.unittestEnabled": false,
-    "python.testing.pytestEnabled": true
+    "python.testing.pytestEnabled": true,
+    "python.formatting.provider": "black"
 }
\ No newline at end of file
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 6c283859..7e488ffb 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -1,12 +1,42 @@
 {
-    // See https://go.microsoft.com/fwlink/?LinkId=733558
-    // for the documentation about the tasks.json format
     "version": "2.0.0",
     "tasks": [
         {
-            "label": "echo",
             "type": "shell",
-            "command": "echo Hello"
+            "label": "wmake-build",
+            "command": "wmake",
+            "problemMatcher": [
+                "$gcc"
+            ],
+            "group": "build"
+        },
+        {
+            "type": "shell",
+            "label": "Allwmake",
+            "command": "./Allwmake",
+            "problemMatcher": [
+                "$gcc"
+            ],
+            "group": "build"
+        },
+        {
+            "type": "cppbuild",
+            "label": "C/C++: cpp build active file",
+            "command": "/usr/bin/cpp",
+            "args": [
+                "-g",
+                "${file}",
+                "-o",
+                "${fileDirname}/${fileBasenameNoExtension}"
+            ],
+            "options": {
+                "cwd": "/usr/bin"
+            },
+            "problemMatcher": [
+                "$gcc"
+            ],
+            "group": "build",
+            "detail": "compiler: /usr/bin/cpp"
         }
     ]
 }
\ No newline at end of file
diff --git a/apps/benchmark/reconstructInterface/Make/options b/apps/benchmark/reconstructInterface/Make/options
index 026c8c5c..013e9ab0 100755
--- a/apps/benchmark/reconstructInterface/Make/options
+++ b/apps/benchmark/reconstructInterface/Make/options
@@ -1,5 +1,6 @@
 EXE_INC = \
     -I../../../src/VoF/lnInclude \
+    -I$(FOAM_UTILITIES)/preProcessing/setAlphaField/alphaFieldFunctions/lnInclude \
     -I../../../src/postProcessing/lnInclude \
     -I../../../src/surfaceForces/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
@@ -9,6 +10,7 @@ EXE_INC = \
 
 EXE_LIBS = \
     -L$(FOAM_USER_LIBBIN) \
+    -lalphaFieldFunctions \
     -lfiniteVolume \
     -lmeshTools \
     -lsurfMesh \
diff --git a/apps/benchmark/reconstructInterface/reconstructInterface.C b/apps/benchmark/reconstructInterface/reconstructInterface.C
index 106a7a5e..fa2342f0 100755
--- a/apps/benchmark/reconstructInterface/reconstructInterface.C
+++ b/apps/benchmark/reconstructInterface/reconstructInterface.C
@@ -41,7 +41,6 @@ Author
 #include "cutCellImpFunc.H"
 #include "cutCellIso.H"
 #include "reconstructionError.H"
-#include "isoCutCell.H"
 
 #include "surfaceForces.H"
 
@@ -171,7 +170,7 @@ int main(int argc, char *argv[])
         )
     );
 
-    vector centre = initAlphaFieldDict.lookup("origin");
+    vector centre = initAlphaFieldDict.get<vector>("origin");
     //    scalar radius = readScalar(initAlphaFieldDict.lookup("radius"));
 
     Random rndCentre(1234567);
@@ -221,7 +220,7 @@ int main(int argc, char *argv[])
                 initAlphaFieldDict.set<vector>("origin",centrePos);
             }
 
-            centre = initAlphaFieldDict.lookup("origin");
+            centre = initAlphaFieldDict.get<vector>("origin");
 
             Info << "centre " <<  centre << endl;
 
@@ -229,7 +228,7 @@ int main(int argc, char *argv[])
             (
                 implicitFunction::New
                 (
-                    word(initAlphaFieldDict.lookup("type")),
+                    word(initAlphaFieldDict.get<word>("type")),
                     initAlphaFieldDict
                 )
             );
diff --git a/apps/initAlphaField/Make/options b/apps/initAlphaField/Make/options
index 741f55f4..8b6a4486 100755
--- a/apps/initAlphaField/Make/options
+++ b/apps/initAlphaField/Make/options
@@ -1,5 +1,6 @@
 EXE_INC = \
     -I../../src/VoF/lnInclude \
+    -I$(FOAM_UTILITIES)/preProcessing/setAlphaField/alphaFieldFunctions/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/surfMesh/lnInclude \
@@ -9,6 +10,7 @@ EXE_INC = \
 
 EXE_LIBS = \
     -L$(FOAM_USER_LIBBIN) \
+    -lalphaFieldFunctions \
     -lfiniteVolume \
     -lsurfMesh \
     -lVoF \
diff --git a/apps/initAlphaField/initAlphaField.C b/apps/initAlphaField/initAlphaField.C
index 018ad878..bb737299 100755
--- a/apps/initAlphaField/initAlphaField.C
+++ b/apps/initAlphaField/initAlphaField.C
@@ -33,8 +33,6 @@ Author
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
-#include "isoCutFace.H"
-#include "isoCutCell.H"
 #include "searchableCylinder.H"
 #include "searchableSurface.H"
 #include "mathematicalConstants.H"
diff --git a/apps/setFieldfromTable/Make/options b/apps/setFieldfromTable/Make/options
index 0bbfb85b..37a2cbc3 100644
--- a/apps/setFieldfromTable/Make/options
+++ b/apps/setFieldfromTable/Make/options
@@ -1,4 +1,5 @@
 EXE_INC = \
+    -I$(FOAM_UTILITIES)/preProcessing/setAlphaField/alphaFieldFunctions/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/dynamicMesh/lnInclude \
@@ -7,6 +8,7 @@ EXE_INC = \
     -I../../src/VoF/lnInclude
 
 EXE_LIBS = \
+    -lalphaFieldFunctions \
     -lfiniteVolume \
     -ldynamicMesh \
     -lmeshTools \
diff --git a/apps/setFieldfromTable/setFieldfromTable.C b/apps/setFieldfromTable/setFieldfromTable.C
index f757c746..eb59441b 100644
--- a/apps/setFieldfromTable/setFieldfromTable.C
+++ b/apps/setFieldfromTable/setFieldfromTable.C
@@ -102,7 +102,7 @@ int main(int argc, char *argv[])
 
     Foam::autoPtr<Foam::implicitFunction> func =  implicitFunction::New
     (
-           setFieldTableDict.get<word>("function"),
+           setFieldTableDict.get<word>("type"),
            setFieldTableDict
     );
 
diff --git a/apps/setFieldfromTable/setFieldfromTableDict b/apps/setFieldfromTable/setFieldfromTableDict
index f8ba74da..e532ca89 100644
--- a/apps/setFieldfromTable/setFieldfromTableDict
+++ b/apps/setFieldfromTable/setFieldfromTableDict
@@ -23,13 +23,13 @@ hasHeaderLine false;
 timeColumn 0;
 valueColumns (1);
 
-function composedFunction;
+type composedFunction;
 mode add;
 composedFunctions
 {
     plane
     {
-        function plane;
+        type plane;
         centre (0 1. 0);
         normal (0 1 0);
 
@@ -37,7 +37,7 @@ composedFunctions
 
     sphere
     {
-        function impSphere;
+        type impSphere;
         radius 0.4;
         centre (0.5 0.8 0.5);
         scale 1;
@@ -45,7 +45,7 @@ composedFunctions
 
     sphere2
     {
-        function impSphere;
+        type impSphere;
         radius 0.4;
         centre (0.5 0.5 0.5);
     }
diff --git a/get-gmsh.sh b/get-gmsh.sh
index f2fffadd..838072b3 100755
--- a/get-gmsh.sh
+++ b/get-gmsh.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 cd "${0%/*}" || exit                                # Run from this directory
 
-wget https://gmsh.info/bin/Linux/gmsh-3.0.6-Linux64.tgz
-tar zxvf gmsh-3.0.6-Linux64.tgz
-cp gmsh-3.0.6-Linux64/bin/gmsh $FOAM_USER_APPBIN/gmshv306
-rm gmsh-3.0.6-Linux64.tgz
+wget https://gmsh.info/bin/Linux/gmsh-4.9.3-Linux64.tgz
+tar zxvf gmsh-4.9.3-Linux64.tgz
+cp gmsh-4.9.3-Linux64/bin/gmsh $FOAM_USER_APPBIN/gmshv493
+rm gmsh-4.9.3-Linux64.tgz
diff --git a/modules/multiDimAMR b/modules/multiDimAMR
index cbd97304..ce0f044a 160000
--- a/modules/multiDimAMR
+++ b/modules/multiDimAMR
@@ -1 +1 @@
-Subproject commit cbd97304f8e291d08457afce24ca13286a98b6e9
+Subproject commit ce0f044acdbecb1b976299365121e54dcefc2f1f
diff --git a/pytest.ini b/pytest.ini
index e2958c9b..9371bbb0 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,5 +1,7 @@
 [pytest]
 #minversion = 6.0
+markers =
+    slow: marks tests as slow (deselect with '-m "not slow"')
 addopts = -ra -v --import-mode=importlib --tb=short --cache-clear
 testpaths =
         testsuite
diff --git a/run/Reorientation/system/blockMeshDict b/run/Reorientation/system/blockMeshDict
index 5478dd44..3f35dc13 100644
--- a/run/Reorientation/system/blockMeshDict
+++ b/run/Reorientation/system/blockMeshDict
@@ -15,7 +15,7 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 
-convertToMeters 0.001;
+scale 0.001;
 
 vertices // testZelle is 80 mm hoch galube ich
 (
diff --git a/run/Reorientation/system/setAlphaFieldDict b/run/Reorientation/system/setAlphaFieldDict
index 8de6d47d..6eee2519 100644
--- a/run/Reorientation/system/setAlphaFieldDict
+++ b/run/Reorientation/system/setAlphaFieldDict
@@ -17,7 +17,7 @@ FoamFile
 
 field       alpha.phase1;
 type        plane;
-direction   (0 1 0);
+normal   (0 1 0);
 
 origin      (0 1e-6 0);
 
diff --git a/run/benchmark/acceleration/tiltedBox/tiltedBox/system/blockMeshDict b/run/benchmark/acceleration/tiltedBox/tiltedBox/system/blockMeshDict
index ce5ac05c..e1ab3429 100755
--- a/run/benchmark/acceleration/tiltedBox/tiltedBox/system/blockMeshDict
+++ b/run/benchmark/acceleration/tiltedBox/tiltedBox/system/blockMeshDict
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-convertToMeters 1;
+scale 1;
 
 vertices
 (
diff --git a/run/benchmark/phaseChange/scriven3D/scriven3D/system/controlDict b/run/benchmark/phaseChange/scriven3D/scriven3D/system/controlDict
index d9f04fe9..0a542191 100755
--- a/run/benchmark/phaseChange/scriven3D/scriven3D/system/controlDict
+++ b/run/benchmark/phaseChange/scriven3D/scriven3D/system/controlDict
@@ -1,4 +1,4 @@
-k/*--------------------------------*- C++ -*----------------------------------*\
+/*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  plus                                  |
@@ -96,14 +96,22 @@ functions
 
     intPsi
     {
-        type            fieldIntegrate;
-        libs ("libpostProcess.so");
+        type            volFieldValue;
+        libs            ("libfieldFunctionObjects.so");
 
-        // Write at same frequency as fields
         writeControl    timeStep;
-        writeInterval   10;
-        region fluid;
-        field psi0_;
+        writeInterval   1;
+        writeFields     false;
+        log             true;
+        region          fluid;
+
+        operation       volIntegrate;
+
+        fields
+        (
+            psi0_
+        );
+
     }
 
 }
diff --git a/run/benchmark/phaseChange/scriven3D/scriven3D/system/fluid/blockMeshDict b/run/benchmark/phaseChange/scriven3D/scriven3D/system/fluid/blockMeshDict
index 9298c5e2..6d2d57bf 100755
--- a/run/benchmark/phaseChange/scriven3D/scriven3D/system/fluid/blockMeshDict
+++ b/run/benchmark/phaseChange/scriven3D/scriven3D/system/fluid/blockMeshDict
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-convertToMeters 0.001;
+scale 0.001;
 
 vertices
 (
diff --git a/run/benchmark/phaseChange/scriven3D/scriven3D/system/fluid/setFieldfromTableDict b/run/benchmark/phaseChange/scriven3D/scriven3D/system/fluid/setFieldfromTableDict
index 18e38afa..e80067fa 100644
--- a/run/benchmark/phaseChange/scriven3D/scriven3D/system/fluid/setFieldfromTableDict
+++ b/run/benchmark/phaseChange/scriven3D/scriven3D/system/fluid/setFieldfromTableDict
@@ -23,19 +23,10 @@ hasHeaderLine false;
 timeColumn 0;
 valueColumns (1);
 
-function sphere;
+type sphere;
 scale  -1;
 origin (0 0 0);
 radius 50e-6;
 
 
-
-
-
-
-
-
-
-
-
 // ************************************************************************* //
diff --git a/run/benchmark/phaseChange/scrivenWedge/scrivenWedge/system/controlDict b/run/benchmark/phaseChange/scrivenWedge/scrivenWedge/system/controlDict
index 4b61e117..cd57b612 100755
--- a/run/benchmark/phaseChange/scrivenWedge/scrivenWedge/system/controlDict
+++ b/run/benchmark/phaseChange/scrivenWedge/scrivenWedge/system/controlDict
@@ -101,14 +101,22 @@ functions
 
     intPsi
     {
-        type            fieldIntegrate;
-        libs ("libpostProcess.so");
+        type            volFieldValue;
+        libs            ("libfieldFunctionObjects.so");
 
-        // Write at same frequency as fields
         writeControl    timeStep;
         writeInterval   1;
-        region fluid;
-        field psi0_;
+        writeFields     false;
+        log             true;
+        region          fluid;
+
+        operation       volIntegrate;
+
+        fields
+        (
+            psi0_
+        );
+
     }
 
 }
diff --git a/run/benchmark/phaseChange/scrivenWedge/scrivenWedge/system/fluid/blockMeshDict b/run/benchmark/phaseChange/scrivenWedge/scrivenWedge/system/fluid/blockMeshDict
index f20697bc..5ab3fbdd 100755
--- a/run/benchmark/phaseChange/scrivenWedge/scrivenWedge/system/fluid/blockMeshDict
+++ b/run/benchmark/phaseChange/scrivenWedge/scrivenWedge/system/fluid/blockMeshDict
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-convertToMeters 0.001;
+scale 0.001;
 
 vertices
 (
diff --git a/run/benchmark/phaseChange/scrivenWedge/scrivenWedge/system/fluid/setFieldfromTableDict b/run/benchmark/phaseChange/scrivenWedge/scrivenWedge/system/fluid/setFieldfromTableDict
index 8de568fd..b8c48efa 100755
--- a/run/benchmark/phaseChange/scrivenWedge/scrivenWedge/system/fluid/setFieldfromTableDict
+++ b/run/benchmark/phaseChange/scrivenWedge/scrivenWedge/system/fluid/setFieldfromTableDict
@@ -22,7 +22,7 @@ hasHeaderLine false;
 timeColumn 0;
 valueColumns (1);
 
-function sphere;
+type sphere;
 origin (0 0 0);
 radius 50e-6;
 scale -1;
diff --git a/run/benchmark/phaseChange/stefanProblem/stefanProblem/constant/fluid/polyMesh/boundary b/run/benchmark/phaseChange/stefanProblem/stefanProblem/constant/fluid/polyMesh/boundary
index 84d0ffb4..d4298044 100644
--- a/run/benchmark/phaseChange/stefanProblem/stefanProblem/constant/fluid/polyMesh/boundary
+++ b/run/benchmark/phaseChange/stefanProblem/stefanProblem/constant/fluid/polyMesh/boundary
@@ -1,14 +1,15 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v1812                                 |
-|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|  \\    /   O peration     | Version:  2206                                  |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
 {
     version     2.0;
     format      ascii;
+    arch        "LSB;label=32;scalar=64";
     class       polyBoundaryMesh;
     location    "constant/fluid/polyMesh";
     object      boundary;
diff --git a/run/benchmark/phaseChange/stefanProblem/stefanProblem/constant/fluid/polyMesh/faces b/run/benchmark/phaseChange/stefanProblem/stefanProblem/constant/fluid/polyMesh/faces
index daf290c0..a9a9b685 100644
--- a/run/benchmark/phaseChange/stefanProblem/stefanProblem/constant/fluid/polyMesh/faces
+++ b/run/benchmark/phaseChange/stefanProblem/stefanProblem/constant/fluid/polyMesh/faces
@@ -1,14 +1,15 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v1812                                 |
-|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|  \\    /   O peration     | Version:  2206                                  |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
 {
     version     2.0;
     format      ascii;
+    arch        "LSB;label=32;scalar=64";
     class       faceList;
     location    "constant/fluid/polyMesh";
     object      faces;
diff --git a/run/benchmark/phaseChange/stefanProblem/stefanProblem/constant/fluid/polyMesh/neighbour b/run/benchmark/phaseChange/stefanProblem/stefanProblem/constant/fluid/polyMesh/neighbour
index c836e5e1..32a934b0 100644
--- a/run/benchmark/phaseChange/stefanProblem/stefanProblem/constant/fluid/polyMesh/neighbour
+++ b/run/benchmark/phaseChange/stefanProblem/stefanProblem/constant/fluid/polyMesh/neighbour
@@ -1,16 +1,17 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v1812                                 |
-|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|  \\    /   O peration     | Version:  2206                                  |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
 {
     version     2.0;
     format      ascii;
+    arch        "LSB;label=32;scalar=64";
+    note        "nPoints:404  nCells:100  nFaces:501  nInternalFaces:99";
     class       labelList;
-    note        "nPoints: 404 nCells: 100 nFaces: 501 nInternalFaces: 99";
     location    "constant/fluid/polyMesh";
     object      neighbour;
 }
diff --git a/run/benchmark/phaseChange/stefanProblem/stefanProblem/constant/fluid/polyMesh/owner b/run/benchmark/phaseChange/stefanProblem/stefanProblem/constant/fluid/polyMesh/owner
index 88299292..eade427e 100644
--- a/run/benchmark/phaseChange/stefanProblem/stefanProblem/constant/fluid/polyMesh/owner
+++ b/run/benchmark/phaseChange/stefanProblem/stefanProblem/constant/fluid/polyMesh/owner
@@ -1,16 +1,17 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v1812                                 |
-|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|  \\    /   O peration     | Version:  2206                                  |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
 {
     version     2.0;
     format      ascii;
+    arch        "LSB;label=32;scalar=64";
+    note        "nPoints:404  nCells:100  nFaces:501  nInternalFaces:99";
     class       labelList;
-    note        "nPoints: 404 nCells: 100 nFaces: 501 nInternalFaces: 99";
     location    "constant/fluid/polyMesh";
     object      owner;
 }
diff --git a/run/benchmark/phaseChange/stefanProblem/stefanProblem/constant/fluid/polyMesh/points b/run/benchmark/phaseChange/stefanProblem/stefanProblem/constant/fluid/polyMesh/points
index 51e64542..32c07205 100644
--- a/run/benchmark/phaseChange/stefanProblem/stefanProblem/constant/fluid/polyMesh/points
+++ b/run/benchmark/phaseChange/stefanProblem/stefanProblem/constant/fluid/polyMesh/points
@@ -1,14 +1,15 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v1812                                 |
-|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|  \\    /   O peration     | Version:  2206                                  |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
 {
     version     2.0;
     format      ascii;
+    arch        "LSB;label=32;scalar=64";
     class       vectorField;
     location    "constant/fluid/polyMesh";
     object      points;
diff --git a/run/benchmark/phaseChange/stefanProblem/stefanProblem/system/controlDict b/run/benchmark/phaseChange/stefanProblem/stefanProblem/system/controlDict
index 4fac321b..40270be9 100755
--- a/run/benchmark/phaseChange/stefanProblem/stefanProblem/system/controlDict
+++ b/run/benchmark/phaseChange/stefanProblem/stefanProblem/system/controlDict
@@ -91,26 +91,41 @@ functions
 
     intPsi
     {
-        type            fieldIntegrate;
-        libs ("libpostProcess.so");
+        type            volFieldValue;
+        libs            ("libfieldFunctionObjects.so");
 
-        // Write at same frequency as fields
         writeControl    timeStep;
         writeInterval   1;
-        region fluid;
-        field psi0_;
-    }
+        writeFields     false;
+        log             true;
+        region          fluid;
 
-    intPsiSource
+        operation       volIntegrate;
+
+        fields
+        (
+            psi0_
+        );
+
+    }
+    intPsi
     {
-        type            fieldIntegrate;
-        libs ("libpostProcess.so");
+        type            volFieldValue;
+        libs            ("libfieldFunctionObjects.so");
 
-        // Write at same frequency as fields
         writeControl    timeStep;
         writeInterval   1;
-        region fluid;
-        field massSource_;
+        writeFields     false;
+        log             true;
+        region          fluid;
+
+        operation       volIntegrate;
+
+        fields
+        (
+            psi0_
+        );
+
     }
 }
 
diff --git a/run/benchmark/phaseChange/stefanProblem/stefanProblem/system/fluid/blockMeshDict b/run/benchmark/phaseChange/stefanProblem/stefanProblem/system/fluid/blockMeshDict
index 4fcdf825..76868bec 100755
--- a/run/benchmark/phaseChange/stefanProblem/stefanProblem/system/fluid/blockMeshDict
+++ b/run/benchmark/phaseChange/stefanProblem/stefanProblem/system/fluid/blockMeshDict
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-convertToMeters 0.001;
+scale 0.001;
 
 vertices
 (
diff --git a/run/benchmark/phaseChange/suckingInterface/suckingInterface/system/controlDict b/run/benchmark/phaseChange/suckingInterface/suckingInterface/system/controlDict
index 6e72c57a..59eae3ac 100755
--- a/run/benchmark/phaseChange/suckingInterface/suckingInterface/system/controlDict
+++ b/run/benchmark/phaseChange/suckingInterface/suckingInterface/system/controlDict
@@ -86,26 +86,42 @@ functions
 
     intPsi
     {
-        type            fieldIntegrate;
-        libs ("libpostProcess.so");
+        type            volFieldValue;
+        libs            ("libfieldFunctionObjects.so");
 
-        // Write at same frequency as fields
         writeControl    timeStep;
         writeInterval   1;
-        region fluid;
-        field psi0_;
+        writeFields     false;
+        log             true;
+        region          fluid;
+
+        operation       volIntegrate;
+
+        fields
+        (
+            psi0_
+        );
+
     }
 
     intPsiSource
     {
-        type            fieldIntegrate;
-        libs ("libpostProcess.so");
+        type            volFieldValue;
+        libs            ("libfieldFunctionObjects.so");
 
-        // Write at same frequency as fields
         writeControl    timeStep;
         writeInterval   1;
-        region fluid;
-        field massSource_;
+        writeFields     false;
+        log             true;
+        region          fluid;
+
+        operation       volIntegrate;
+
+        fields
+        (
+            psi0_
+        );
+
     }
 }
 
diff --git a/run/benchmark/phaseChange/suckingInterface/suckingInterface/system/fluid/blockMeshDict b/run/benchmark/phaseChange/suckingInterface/suckingInterface/system/fluid/blockMeshDict
index 9ba8eab9..caff05d3 100755
--- a/run/benchmark/phaseChange/suckingInterface/suckingInterface/system/fluid/blockMeshDict
+++ b/run/benchmark/phaseChange/suckingInterface/suckingInterface/system/fluid/blockMeshDict
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-convertToMeters 0.001;
+scale 0.001;
 
 vertices
 (
diff --git a/run/benchmark/phaseChange/suckingInterface/suckingInterface/system/fluid/fvSolution b/run/benchmark/phaseChange/suckingInterface/suckingInterface/system/fluid/fvSolution
index 38d72319..da654a93 100755
--- a/run/benchmark/phaseChange/suckingInterface/suckingInterface/system/fluid/fvSolution
+++ b/run/benchmark/phaseChange/suckingInterface/suckingInterface/system/fluid/fvSolution
@@ -114,10 +114,8 @@ solvers
 
     "(U|h|T.*|k|epsilon|R)"
     {
-        solver          PBiCGStab;
-        preconditioner  DILU;
-        //olver           smoothSolver;;
-        //smoother        symGaussSeidel;
+        solver           smoothSolver;;
+        smoother        symGaussSeidel;
         tolerance        1e-7;
         relTol           0.;
         minIter          15;
diff --git a/run/benchmark/phaseChange/suckingInterface/suckingInterface/system/fluid/setFieldfromTableDict b/run/benchmark/phaseChange/suckingInterface/suckingInterface/system/fluid/setFieldfromTableDict
index 00139af1..ac1dcb9e 100644
--- a/run/benchmark/phaseChange/suckingInterface/suckingInterface/system/fluid/setFieldfromTableDict
+++ b/run/benchmark/phaseChange/suckingInterface/suckingInterface/system/fluid/setFieldfromTableDict
@@ -23,18 +23,9 @@ hasHeaderLine false;
 timeColumn 0;
 valueColumns (1);
 
-function plane;
+type plane;
 origin (0 0 0);
 normal (1 0 0);
 
 
-
-
-
-
-
-
-
-
-
 // ************************************************************************* //
diff --git a/run/benchmark/surfaceTension/advectedCircle/advectedCircle/system/blockMeshDict b/run/benchmark/surfaceTension/advectedCircle/advectedCircle/system/blockMeshDict
index 0d88e456..9c6c2c8e 100755
--- a/run/benchmark/surfaceTension/advectedCircle/advectedCircle/system/blockMeshDict
+++ b/run/benchmark/surfaceTension/advectedCircle/advectedCircle/system/blockMeshDict
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-convertToMeters 1;
+scale 1;
 
 vertices        
 (
diff --git a/run/benchmark/surfaceTension/advectedCircle/advectedCircle/system/fvSolution b/run/benchmark/surfaceTension/advectedCircle/advectedCircle/system/fvSolution
index c5a7543e..dd8e608e 100755
--- a/run/benchmark/surfaceTension/advectedCircle/advectedCircle/system/fvSolution
+++ b/run/benchmark/surfaceTension/advectedCircle/advectedCircle/system/fvSolution
@@ -71,8 +71,8 @@ solvers
 
     U
     {
-        solver          PBiCGStab;
-        preconditioner  DILU;
+        solver          smoothSolver;
+        smoother        symGaussSeidel;
         tolerance       1e-20;
         relTol          0;
         minIter 10;
@@ -80,8 +80,8 @@ solvers
 
     UFinal
     {
-        solver          PBiCGStab;
-        preconditioner  DILU;
+        solver          smoothSolver;
+        smoother        symGaussSeidel;
         tolerance       1e-20;
         relTol          0;
         minIter 10;
diff --git a/run/benchmark/surfaceTension/advectedCircle/advectedCircle/system/setAlphaFieldDict b/run/benchmark/surfaceTension/advectedCircle/advectedCircle/system/setAlphaFieldDict
index 4f217690..682dbe04 100755
--- a/run/benchmark/surfaceTension/advectedCircle/advectedCircle/system/setAlphaFieldDict
+++ b/run/benchmark/surfaceTension/advectedCircle/advectedCircle/system/setAlphaFieldDict
@@ -19,7 +19,7 @@ type sin;
 period 0.003; 
 direction (1 0 0);
 up (0 1 0);
-centre (-7.5e-4 0 0);
+origin (-7.5e-4 0 0);
 amplitude 3e-5;;
 
 // ************************************************************************* //
diff --git a/run/benchmark/surfaceTension/advectedCircle/advectedCircleTri/Allrun b/run/benchmark/surfaceTension/advectedCircle/advectedCircleTri/Allrun
index 62c9c528..bab6bb00 100755
--- a/run/benchmark/surfaceTension/advectedCircle/advectedCircleTri/Allrun
+++ b/run/benchmark/surfaceTension/advectedCircle/advectedCircleTri/Allrun
@@ -5,7 +5,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 restore0Dir
 touch sinwavetri.foam
-gmshv306 -3 triSquare.geo
+gmshv493 -3 triSquare.geo
 echo '$End' >> triSquare.msh 
 runApplication gmshToFoam triSquare.msh
 runApplication changeDictionary
diff --git a/run/benchmark/surfaceTension/advectedCircle/advectedCircleTri/system/blockMeshDict b/run/benchmark/surfaceTension/advectedCircle/advectedCircleTri/system/blockMeshDict
index 530ed388..b018e973 100755
--- a/run/benchmark/surfaceTension/advectedCircle/advectedCircleTri/system/blockMeshDict
+++ b/run/benchmark/surfaceTension/advectedCircle/advectedCircleTri/system/blockMeshDict
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-convertToMeters 0.0015;
+scale 0.0015;
 
 vertices        
 (
diff --git a/run/benchmark/surfaceTension/advectedCircle/advectedCircleTri/system/fvSolution b/run/benchmark/surfaceTension/advectedCircle/advectedCircleTri/system/fvSolution
index c5a7543e..dd8e608e 100755
--- a/run/benchmark/surfaceTension/advectedCircle/advectedCircleTri/system/fvSolution
+++ b/run/benchmark/surfaceTension/advectedCircle/advectedCircleTri/system/fvSolution
@@ -71,8 +71,8 @@ solvers
 
     U
     {
-        solver          PBiCGStab;
-        preconditioner  DILU;
+        solver          smoothSolver;
+        smoother        symGaussSeidel;
         tolerance       1e-20;
         relTol          0;
         minIter 10;
@@ -80,8 +80,8 @@ solvers
 
     UFinal
     {
-        solver          PBiCGStab;
-        preconditioner  DILU;
+        solver          smoothSolver;
+        smoother        symGaussSeidel;
         tolerance       1e-20;
         relTol          0;
         minIter 10;
diff --git a/run/benchmark/surfaceTension/advectedCircle/advectedCircleTri/system/setAlphaFieldDict b/run/benchmark/surfaceTension/advectedCircle/advectedCircleTri/system/setAlphaFieldDict
index 4f217690..682dbe04 100755
--- a/run/benchmark/surfaceTension/advectedCircle/advectedCircleTri/system/setAlphaFieldDict
+++ b/run/benchmark/surfaceTension/advectedCircle/advectedCircleTri/system/setAlphaFieldDict
@@ -19,7 +19,7 @@ type sin;
 period 0.003; 
 direction (1 0 0);
 up (0 1 0);
-centre (-7.5e-4 0 0);
+origin (-7.5e-4 0 0);
 amplitude 3e-5;;
 
 // ************************************************************************* //
diff --git a/run/benchmark/surfaceTension/advectedCircle/advectedCircleTri/triSquare.msh b/run/benchmark/surfaceTension/advectedCircle/advectedCircleTri/triSquare.msh
deleted file mode 100644
index 710a8257..00000000
--- a/run/benchmark/surfaceTension/advectedCircle/advectedCircleTri/triSquare.msh
+++ /dev/null
@@ -1,44 +0,0 @@
-$MeshFormat
-2.2 0 8
-$EndMeshFormat
-$PhysicalNames
-5
-2 2 "left"
-2 3 "right"
-2 4 "frontAndBack"
-2 5 "walls"
-3 1 "internal"
-$EndPhysicalNames
-$Nodes
-10
-1 -2 -0.05 -0.5
-2 2 -0.05 -0.5
-3 2 -0.05 0.5
-4 -2 -0.05 0.5
-5 -2 0.05 0.5
-6 -2 0.05 -0.5
-7 2 0.05 -0.5
-8 2 0.05 0.5
-9 0 -0.05 0
-10 0 0.05 0
-$EndNodes
-$Elements
-16
-1 2 2 4 6 1 2 9
-2 2 2 4 6 3 4 9
-3 2 2 4 6 1 9 4
-4 2 2 4 6 2 3 9
-5 2 2 4 28 6 7 10
-6 2 2 4 28 8 5 10
-7 2 2 4 28 6 10 5
-8 2 2 4 28 7 8 10
-9 3 2 2 15 4 1 6 5
-10 3 2 5 19 1 2 7 6
-11 3 2 3 23 2 3 8 7
-12 3 2 5 27 3 4 5 8
-13 6 2 1 1 2 1 9 7 6 10
-14 6 2 1 1 4 3 9 5 8 10
-15 6 2 1 1 9 1 4 10 6 5
-16 6 2 1 1 3 2 9 8 7 10
-$EndElements
-$End
diff --git a/run/benchmark/surfaceTension/curvatureCircle/curvature2D/system/blockMeshDict b/run/benchmark/surfaceTension/curvatureCircle/curvature2D/system/blockMeshDict
index e95a6eb5..6932d6e4 100755
--- a/run/benchmark/surfaceTension/curvatureCircle/curvature2D/system/blockMeshDict
+++ b/run/benchmark/surfaceTension/curvatureCircle/curvature2D/system/blockMeshDict
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-convertToMeters 1;
+scale 1;
 
 vertices
 (
diff --git a/run/benchmark/surfaceTension/curvatureCircle/curvature2D/system/setAlphaFieldDict b/run/benchmark/surfaceTension/curvatureCircle/curvature2D/system/setAlphaFieldDict
index 7ce51d2d..d8f0e6e5 100755
--- a/run/benchmark/surfaceTension/curvatureCircle/curvature2D/system/setAlphaFieldDict
+++ b/run/benchmark/surfaceTension/curvatureCircle/curvature2D/system/setAlphaFieldDict
@@ -19,7 +19,7 @@ field "alpha1";
 type cylinder;
 radius 0.49999999;
 direction (0 1 0);
-centre (1.01 0 1.01);
+origin (1.01 0 1.01);
 
 
 // ************************************************************************* //
diff --git a/run/benchmark/surfaceTension/curvatureCircle/curvature2DTri/Allclean b/run/benchmark/surfaceTension/curvatureCircle/curvature2DTri/Allclean
index 68dcf800..fdffeed9 100755
--- a/run/benchmark/surfaceTension/curvatureCircle/curvature2DTri/Allclean
+++ b/run/benchmark/surfaceTension/curvatureCircle/curvature2DTri/Allclean
@@ -5,6 +5,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
-rm -rf 0 isoFaces
+rm -rf 0 isoFaces  triSquare.msh
 
 #------------------------------------------------------------------------------
diff --git a/run/benchmark/surfaceTension/curvatureCircle/curvature2DTri/Allrun b/run/benchmark/surfaceTension/curvatureCircle/curvature2DTri/Allrun
index 8296b466..0e4e56e2 100755
--- a/run/benchmark/surfaceTension/curvatureCircle/curvature2DTri/Allrun
+++ b/run/benchmark/surfaceTension/curvatureCircle/curvature2DTri/Allrun
@@ -4,8 +4,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 touch curvature.foam
-gmshv306 -3 triSquare.geo 
-echo '$End' >> triSquare.msh 
+gmshv493 -3 triSquare.geo
 runApplication gmshToFoam triSquare.msh 
 runApplication changeDictionary
 restore0Dir 
diff --git a/run/benchmark/surfaceTension/curvatureCircle/curvature2DTri/system/blockMeshDict b/run/benchmark/surfaceTension/curvatureCircle/curvature2DTri/system/blockMeshDict
index e95a6eb5..6932d6e4 100755
--- a/run/benchmark/surfaceTension/curvatureCircle/curvature2DTri/system/blockMeshDict
+++ b/run/benchmark/surfaceTension/curvatureCircle/curvature2DTri/system/blockMeshDict
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-convertToMeters 1;
+scale 1;
 
 vertices
 (
diff --git a/run/benchmark/surfaceTension/curvatureCircle/curvature2DTri/system/setAlphaFieldDict b/run/benchmark/surfaceTension/curvatureCircle/curvature2DTri/system/setAlphaFieldDict
index 7ce51d2d..d8f0e6e5 100755
--- a/run/benchmark/surfaceTension/curvatureCircle/curvature2DTri/system/setAlphaFieldDict
+++ b/run/benchmark/surfaceTension/curvatureCircle/curvature2DTri/system/setAlphaFieldDict
@@ -19,7 +19,7 @@ field "alpha1";
 type cylinder;
 radius 0.49999999;
 direction (0 1 0);
-centre (1.01 0 1.01);
+origin (1.01 0 1.01);
 
 
 // ************************************************************************* //
diff --git a/run/benchmark/surfaceTension/curvatureCircle/curvature2DTri/triSquare.msh b/run/benchmark/surfaceTension/curvatureCircle/curvature2DTri/triSquare.msh
deleted file mode 100644
index 72e3ac8b..00000000
--- a/run/benchmark/surfaceTension/curvatureCircle/curvature2DTri/triSquare.msh
+++ /dev/null
@@ -1,1003 +0,0 @@
-$MeshFormat
-2.2 0 8
-$EndMeshFormat
-$PhysicalNames
-4
-2 2 "back"
-2 3 "rim"
-2 4 "front"
-3 1 "internal"
-$EndPhysicalNames
-$Nodes
-266
-1 -0 -0.05 0
-2 2 -0.05 0
-3 2 -0.05 2
-4 0 -0.05 2
-5 0 0.05 2
-6 0 0.05 0
-7 2 0.05 0
-8 2 0.05 2
-9 0.2222222222218165 -0.05 0
-10 0.4444444444434286 -0.05 0
-11 0.6666666666650021 -0.05 0
-12 0.8888888888865757 -0.05 0
-13 1.111111111108767 -0.05 0
-14 1.333333333331575 -0.05 0
-15 1.555555555554383 -0.05 0
-16 1.777777777777192 -0.05 0
-17 2 -0.05 0.2222222222218165
-18 2 -0.05 0.4444444444434286
-19 2 -0.05 0.6666666666650021
-20 2 -0.05 0.8888888888865757
-21 2 -0.05 1.111111111108767
-22 2 -0.05 1.333333333331575
-23 2 -0.05 1.555555555554383
-24 2 -0.05 1.777777777777192
-25 1.777777777776852 -0.05 2
-26 1.555555555555864 -0.05 2
-27 1.333333333335184 -0.05 2
-28 1.111111111114503 -0.05 2
-29 0.8888888888925885 -0.05 2
-30 0.6666666666694414 -0.05 2
-31 0.4444444444462943 -0.05 2
-32 0.2222222222231471 -0.05 2
-33 0 -0.05 1.777777777776852
-34 0 -0.05 1.555555555555864
-35 0 -0.05 1.333333333335184
-36 0 -0.05 1.111111111114503
-37 0 -0.05 0.8888888888925885
-38 0 -0.05 0.6666666666694414
-39 0 -0.05 0.4444444444462943
-40 0 -0.05 0.2222222222231471
-41 0 0.05 1.777777777776852
-42 0 0.05 1.555555555555864
-43 0 0.05 1.333333333335184
-44 0 0.05 1.111111111114503
-45 0 0.05 0.8888888888925885
-46 0 0.05 0.6666666666694414
-47 0 0.05 0.4444444444462943
-48 0 0.05 0.2222222222231471
-49 0.2222222222218165 0.05 0
-50 0.4444444444434286 0.05 0
-51 0.6666666666650021 0.05 0
-52 0.8888888888865757 0.05 0
-53 1.111111111108767 0.05 0
-54 1.333333333331575 0.05 0
-55 1.555555555554383 0.05 0
-56 1.777777777777192 0.05 0
-57 2 0.05 0.2222222222218165
-58 2 0.05 0.4444444444434286
-59 2 0.05 0.6666666666650021
-60 2 0.05 0.8888888888865757
-61 2 0.05 1.111111111108767
-62 2 0.05 1.333333333331575
-63 2 0.05 1.555555555554383
-64 2 0.05 1.777777777777192
-65 1.777777777776852 0.05 2
-66 1.555555555555864 0.05 2
-67 1.333333333335184 0.05 2
-68 1.111111111114503 0.05 2
-69 0.8888888888925885 0.05 2
-70 0.6666666666694414 0.05 2
-71 0.4444444444462943 0.05 2
-72 0.2222222222231471 0.05 2
-73 1.008882266433366 -0.05 1.003270929861117
-74 1.416666666666894 -0.05 1.416666666666443
-75 0.5870986626406687 -0.05 1.420578125716495
-76 1.416666666666502 -0.05 0.58333333333307
-77 0.5807382936228226 -0.05 0.5866138859950274
-78 0.9996632857399345 -0.05 1.582643375854696
-79 1.562307823955064 -0.05 1.030318326056299
-80 0.4173566241453439 -0.05 0.9996632857399461
-81 1.030318326056293 -0.05 0.4376921760449784
-82 1.665598290598542 -0.05 1.665598290598175
-83 0.3344017094018713 -0.05 1.665598290598663
-84 1.665598290598065 -0.05 0.3344017094013922
-85 0.3344017094012708 -0.05 0.3344017094019804
-86 1.13161375661422 -0.05 1.285052910052513
-87 0.7264522412322941 -0.05 1.146533029032955
-88 1.288666524529382 -0.05 0.8699226662690922
-89 0.8516259285403525 -0.05 0.7305864992421995
-90 1.297649533118867 -0.05 1.687703706420593
-91 0.3122962935794548 -0.05 1.297649533118919
-92 1.688049975453314 -0.05 0.7032907664093321
-93 0.703290766409281 -0.05 0.3119500245467329
-94 1.690954779520614 -0.05 1.306840704128668
-95 1.306840704128645 -0.05 0.3090452204793769
-96 0.6979603544504887 -0.05 1.68864386387067
-97 0.3113561361293212 -0.05 0.6979603544505086
-98 1.377912874588844 -0.05 1.144022802498461
-99 0.8568440069012876 -0.05 1.323672160554052
-100 1.144022802498482 -0.05 0.622087125411206
-101 0.6761399779738868 -0.05 0.857265869963486
-102 0.99998247010613 -0.05 1.803573795519565
-103 0.1964262044804551 -0.05 0.9999824701061333
-104 1.799411884411671 -0.05 0.999999999997671
-105 0.9999999999976706 -0.05 0.2005881155883505
-106 1.457210711773072 -0.05 1.809338336364794
-107 0.1906616636352317 -0.05 1.45721071177312
-108 1.809387803369438 -0.05 0.5429236167309509
-109 0.5429236167309028 -0.05 0.1906121966305876
-110 1.810701487701287 -0.05 1.453427322518931
-111 1.453427322518897 -0.05 0.1892985122986967
-112 0.5472585429928489 -0.05 1.81037135689416
-113 0.189628643105823 -0.05 0.5472585429928827
-114 1.210412440067874 -0.05 1.488883253423635
-115 0.5111167465764207 -0.05 1.21041244006791
-116 1.492334695453989 -0.05 0.7907408975659884
-117 0.788889049583438 -0.05 0.5102274656217533
-118 1.190619524068427 -0.05 1.074217581852836
-119 1.075320075976742 -0.05 0.8228249988961952
-120 0.7883498305516383 -0.05 1.501741997935555
-121 0.4983990717978669 -0.05 0.7883419663537012
-122 1.811456165380825 -0.05 1.81145616538082
-123 0.1951115405061553 -0.05 1.804888459493844
-124 1.804888459493696 -0.05 0.1951115405061828
-125 0.1951115405061281 -0.05 0.1951115405062905
-126 1.441885411967884 -0.05 1.58621607860563
-127 0.4144114762789607 -0.05 1.442537321809523
-128 1.586857274950241 -0.05 0.5584859156431052
-129 0.5577447676942731 -0.05 0.4141165106727005
-130 1.603774829582057 -0.05 1.449106218160141
-131 1.449106218160137 -0.05 0.3962251704178981
-132 0.5615800960527461 -0.05 1.588245159470844
-133 0.4120447702918962 -0.05 0.5614488283111334
-134 0.9731688732764706 -0.05 1.181320828040965
-135 0.8231574228780214 -0.05 0.9735906029623728
-136 1.518570324431383 -0.05 1.253411708507248
-137 1.253411708507264 -0.05 0.4814296755686236
-138 0.1494421005277161 -0.05 1.221262763553946
-139 1.221262763553938 -0.05 1.850557899472312
-140 0.7791247684344389 -0.05 1.846216026689749
-141 0.1537839733102517 -0.05 0.7791247684344456
-142 1.839788562235696 -0.05 1.220987553661376
-143 1.220987553661366 -0.05 0.1602114377643059
-144 0.7792109092121347 -0.05 0.1542720135355118
-145 1.845727986464514 -0.05 0.7792109092121458
-146 1.653519700217031 -0.05 1.857278558468758
-147 0.1440349827086516 -0.05 1.652206159039669
-148 1.857551188736131 -0.05 1.6527630223659
-149 0.3486876919140633 -0.05 1.856171621397333
-150 1.651449481188447 -0.05 0.1437623524412543
-151 0.1438283786026444 -0.05 0.3486876919141189
-152 1.85597491069224 -0.05 0.3478207066607542
-153 0.3478207066607094 -0.05 0.1440250893077717
-154 0.7035002424143305 -0.05 1.308622396758385
-155 1.395379204476062 -0.05 0.9908479602542757
-156 0.6912850430977036 -0.05 0.703731598046483
-157 0.9826012899755654 -0.05 0.6176431997891976
-158 0.8612259166571928 -0.05 1.684619537770038
-159 0.315400615049041 -0.05 0.8612247932003567
-160 1.682206674910885 -0.05 1.162311658470252
-161 1.162311658470248 -0.05 0.3177933250891271
-162 1.132302938268942 -0.05 1.683694338930928
-163 1.679621438607653 -0.05 0.8667230866507073
-164 0.3163056610691033 -0.05 1.132302938268967
-165 0.8708276274297054 -0.05 0.319172173928713
-166 1.300767543065493 -0.05 1.292537234203102
-167 1.012588733221726 -0.05 1.402921872082391
-168 0.598046095025601 -0.05 1.013545669626528
-169 1.29323175381464 -0.05 0.7006044198156187
-170 1.008882266433366 0.05 1.003270929861117
-171 1.416666666666894 0.05 1.416666666666443
-172 0.5870986626406687 0.05 1.420578125716495
-173 1.416666666666502 0.05 0.58333333333307
-174 0.5807382936228226 0.05 0.5866138859950274
-175 0.9996632857399345 0.05 1.582643375854696
-176 1.562307823955064 0.05 1.030318326056299
-177 0.4173566241453439 0.05 0.9996632857399461
-178 1.030318326056293 0.05 0.4376921760449784
-179 1.665598290598542 0.05 1.665598290598175
-180 0.3344017094018713 0.05 1.665598290598663
-181 1.665598290598065 0.05 0.3344017094013922
-182 0.3344017094012708 0.05 0.3344017094019804
-183 1.13161375661422 0.05 1.285052910052513
-184 0.7264522412322941 0.05 1.146533029032955
-185 1.288666524529382 0.05 0.8699226662690922
-186 0.8516259285403525 0.05 0.7305864992421995
-187 1.297649533118867 0.05 1.687703706420593
-188 0.3122962935794548 0.05 1.297649533118919
-189 1.688049975453314 0.05 0.7032907664093321
-190 0.703290766409281 0.05 0.3119500245467329
-191 1.690954779520614 0.05 1.306840704128668
-192 1.306840704128645 0.05 0.3090452204793769
-193 0.6979603544504887 0.05 1.68864386387067
-194 0.3113561361293212 0.05 0.6979603544505086
-195 1.377912874588844 0.05 1.144022802498461
-196 0.8568440069012876 0.05 1.323672160554052
-197 1.144022802498482 0.05 0.622087125411206
-198 0.6761399779738868 0.05 0.857265869963486
-199 0.99998247010613 0.05 1.803573795519565
-200 0.1964262044804551 0.05 0.9999824701061333
-201 1.799411884411671 0.05 0.999999999997671
-202 0.9999999999976706 0.05 0.2005881155883505
-203 1.457210711773072 0.05 1.809338336364794
-204 0.1906616636352317 0.05 1.45721071177312
-205 1.809387803369438 0.05 0.5429236167309509
-206 0.5429236167309028 0.05 0.1906121966305876
-207 1.810701487701287 0.05 1.453427322518931
-208 1.453427322518897 0.05 0.1892985122986967
-209 0.5472585429928489 0.05 1.81037135689416
-210 0.189628643105823 0.05 0.5472585429928827
-211 1.210412440067874 0.05 1.488883253423635
-212 0.5111167465764207 0.05 1.21041244006791
-213 1.492334695453989 0.05 0.7907408975659884
-214 0.788889049583438 0.05 0.5102274656217533
-215 1.190619524068427 0.05 1.074217581852836
-216 1.075320075976742 0.05 0.8228249988961952
-217 0.7883498305516383 0.05 1.501741997935555
-218 0.4983990717978669 0.05 0.7883419663537012
-219 1.811456165380825 0.05 1.81145616538082
-220 0.1951115405061553 0.05 1.804888459493844
-221 1.804888459493696 0.05 0.1951115405061828
-222 0.1951115405061281 0.05 0.1951115405062905
-223 1.441885411967884 0.05 1.58621607860563
-224 0.4144114762789607 0.05 1.442537321809523
-225 1.586857274950241 0.05 0.5584859156431052
-226 0.5577447676942731 0.05 0.4141165106727005
-227 1.603774829582057 0.05 1.449106218160141
-228 1.449106218160137 0.05 0.3962251704178981
-229 0.5615800960527461 0.05 1.588245159470844
-230 0.4120447702918962 0.05 0.5614488283111334
-231 0.9731688732764706 0.05 1.181320828040965
-232 0.8231574228780214 0.05 0.9735906029623728
-233 1.518570324431383 0.05 1.253411708507248
-234 1.253411708507264 0.05 0.4814296755686236
-235 0.1494421005277161 0.05 1.221262763553946
-236 1.221262763553938 0.05 1.850557899472312
-237 0.7791247684344389 0.05 1.846216026689749
-238 0.1537839733102517 0.05 0.7791247684344456
-239 1.839788562235696 0.05 1.220987553661376
-240 1.220987553661366 0.05 0.1602114377643059
-241 0.7792109092121347 0.05 0.1542720135355118
-242 1.845727986464514 0.05 0.7792109092121458
-243 1.653519700217031 0.05 1.857278558468758
-244 0.1440349827086516 0.05 1.652206159039669
-245 1.857551188736131 0.05 1.6527630223659
-246 0.3486876919140633 0.05 1.856171621397333
-247 1.651449481188447 0.05 0.1437623524412543
-248 0.1438283786026444 0.05 0.3486876919141189
-249 1.85597491069224 0.05 0.3478207066607542
-250 0.3478207066607094 0.05 0.1440250893077717
-251 0.7035002424143305 0.05 1.308622396758385
-252 1.395379204476062 0.05 0.9908479602542757
-253 0.6912850430977036 0.05 0.703731598046483
-254 0.9826012899755654 0.05 0.6176431997891976
-255 0.8612259166571928 0.05 1.684619537770038
-256 0.315400615049041 0.05 0.8612247932003567
-257 1.682206674910885 0.05 1.162311658470252
-258 1.162311658470248 0.05 0.3177933250891271
-259 1.132302938268942 0.05 1.683694338930928
-260 1.679621438607653 0.05 0.8667230866507073
-261 0.3163056610691033 0.05 1.132302938268967
-262 0.8708276274297054 0.05 0.319172173928713
-263 1.300767543065493 0.05 1.292537234203102
-264 1.012588733221726 0.05 1.402921872082391
-265 0.598046095025601 0.05 1.013545669626528
-266 1.29323175381464 0.05 0.7006044198156187
-$EndNodes
-$Elements
-720
-1 2 2 2 6 92 116 128
-2 2 2 2 6 93 117 129
-3 2 2 2 6 76 128 116
-4 2 2 2 6 77 129 117
-5 2 2 2 6 89 119 135
-6 2 2 2 6 90 114 126
-7 2 2 2 6 91 115 127
-8 2 2 2 6 74 126 114
-9 2 2 2 6 75 127 115
-10 2 2 2 6 73 135 119
-11 2 2 2 6 88 118 119
-12 2 2 2 6 73 119 118
-13 2 2 2 6 79 136 98
-14 2 2 2 6 81 137 100
-15 2 2 2 6 87 134 99
-16 2 2 2 6 89 135 101
-17 2 2 2 6 87 135 134
-18 2 2 2 6 99 167 120
-19 2 2 2 6 101 168 121
-20 2 2 2 6 98 166 118
-21 2 2 2 6 100 169 119
-22 2 2 2 6 167 78 120
-23 2 2 2 6 168 80 121
-24 2 2 2 6 30 112 140
-25 2 2 2 6 38 113 141
-26 2 2 2 6 22 110 142
-27 2 2 2 6 14 111 143
-28 2 2 2 6 35 138 107
-29 2 2 2 6 27 139 106
-30 2 2 2 6 11 144 109
-31 2 2 2 6 19 145 108
-32 2 2 2 6 166 86 118
-33 2 2 2 6 169 88 119
-34 2 2 2 6 3 25 122
-35 2 2 2 6 2 17 124
-36 2 2 2 6 4 33 123
-37 2 2 2 6 1 9 125
-38 2 2 2 6 2 124 16
-39 2 2 2 6 1 125 40
-40 2 2 2 6 3 122 24
-41 2 2 2 6 4 123 32
-42 2 2 2 6 34 35 107
-43 2 2 2 6 26 27 106
-44 2 2 2 6 30 31 112
-45 2 2 2 6 22 23 110
-46 2 2 2 6 10 11 109
-47 2 2 2 6 38 39 113
-48 2 2 2 6 18 19 108
-49 2 2 2 6 14 15 111
-50 2 2 2 6 96 140 112
-51 2 2 2 6 97 141 113
-52 2 2 2 6 94 142 110
-53 2 2 2 6 95 143 111
-54 2 2 2 6 91 107 138
-55 2 2 2 6 90 106 139
-56 2 2 2 6 93 109 144
-57 2 2 2 6 92 108 145
-58 2 2 2 6 86 134 118
-59 2 2 2 6 79 160 136
-60 2 2 2 6 81 161 137
-61 2 2 2 6 79 98 155
-62 2 2 2 6 87 99 154
-63 2 2 2 6 81 100 157
-64 2 2 2 6 89 101 156
-65 2 2 2 6 73 134 135
-66 2 2 2 6 28 29 102
-67 2 2 2 6 36 37 103
-68 2 2 2 6 20 21 104
-69 2 2 2 6 12 13 105
-70 2 2 2 6 73 118 134
-71 2 2 2 6 78 158 120
-72 2 2 2 6 80 159 121
-73 2 2 2 6 28 102 139
-74 2 2 2 6 36 103 138
-75 2 2 2 6 29 140 102
-76 2 2 2 6 37 141 103
-77 2 2 2 6 20 104 145
-78 2 2 2 6 12 105 144
-79 2 2 2 6 21 142 104
-80 2 2 2 6 13 143 105
-81 2 2 2 6 90 126 106
-82 2 2 2 6 91 127 107
-83 2 2 2 6 92 128 108
-84 2 2 2 6 93 129 109
-85 2 2 2 6 82 130 110
-86 2 2 2 6 83 132 112
-87 2 2 2 6 84 131 111
-88 2 2 2 6 85 133 113
-89 2 2 2 6 75 120 132
-90 2 2 2 6 96 132 120
-91 2 2 2 6 77 121 133
-92 2 2 2 6 97 133 121
-93 2 2 2 6 77 117 156
-94 2 2 2 6 89 156 117
-95 2 2 2 6 78 114 162
-96 2 2 2 6 80 115 164
-97 2 2 2 6 102 162 139
-98 2 2 2 6 103 164 138
-99 2 2 2 6 104 163 145
-100 2 2 2 6 105 165 144
-101 2 2 2 6 104 142 160
-102 2 2 2 6 102 140 158
-103 2 2 2 6 105 143 161
-104 2 2 2 6 103 141 159
-105 2 2 2 6 75 115 154
-106 2 2 2 6 87 154 115
-107 2 2 2 6 79 155 116
-108 2 2 2 6 88 116 155
-109 2 2 2 6 89 117 157
-110 2 2 2 6 81 157 117
-111 2 2 2 6 83 127 132
-112 2 2 2 6 82 126 130
-113 2 2 2 6 85 129 133
-114 2 2 2 6 84 128 131
-115 2 2 2 6 82 106 126
-116 2 2 2 6 83 107 127
-117 2 2 2 6 84 108 128
-118 2 2 2 6 85 109 129
-119 2 2 2 6 90 162 114
-120 2 2 2 6 91 164 115
-121 2 2 2 6 94 110 130
-122 2 2 2 6 95 111 131
-123 2 2 2 6 96 112 132
-124 2 2 2 6 97 113 133
-125 2 2 2 6 78 167 114
-126 2 2 2 6 76 116 169
-127 2 2 2 6 80 168 115
-128 2 2 2 6 92 163 116
-129 2 2 2 6 93 165 117
-130 2 2 2 6 79 116 163
-131 2 2 2 6 81 117 165
-132 2 2 2 6 25 26 146
-133 2 2 2 6 33 34 147
-134 2 2 2 6 17 18 152
-135 2 2 2 6 9 10 153
-136 2 2 2 6 23 24 148
-137 2 2 2 6 15 16 150
-138 2 2 2 6 31 32 149
-139 2 2 2 6 39 40 151
-140 2 2 2 6 86 167 134
-141 2 2 2 6 99 134 167
-142 2 2 2 6 87 168 135
-143 2 2 2 6 101 135 168
-144 2 2 2 6 86 114 167
-145 2 2 2 6 87 115 168
-146 2 2 2 6 88 169 116
-147 2 2 2 6 78 162 102
-148 2 2 2 6 78 102 158
-149 2 2 2 6 80 164 103
-150 2 2 2 6 80 103 159
-151 2 2 2 6 79 163 104
-152 2 2 2 6 79 104 160
-153 2 2 2 6 81 165 105
-154 2 2 2 6 81 105 161
-155 2 2 2 6 82 146 106
-156 2 2 2 6 83 147 107
-157 2 2 2 6 84 152 108
-158 2 2 2 6 85 153 109
-159 2 2 2 6 82 110 148
-160 2 2 2 6 83 112 149
-161 2 2 2 6 84 111 150
-162 2 2 2 6 85 113 151
-163 2 2 2 6 74 114 166
-164 2 2 2 6 86 166 114
-165 2 2 2 6 74 166 136
-166 2 2 2 6 98 136 166
-167 2 2 2 6 76 169 137
-168 2 2 2 6 100 137 169
-169 2 2 2 6 96 120 158
-170 2 2 2 6 97 121 159
-171 2 2 2 6 29 30 140
-172 2 2 2 6 37 38 141
-173 2 2 2 6 21 22 142
-174 2 2 2 6 13 14 143
-175 2 2 2 6 35 36 138
-176 2 2 2 6 27 28 139
-177 2 2 2 6 11 12 144
-178 2 2 2 6 19 20 145
-179 2 2 2 6 94 136 160
-180 2 2 2 6 95 137 161
-181 2 2 2 6 98 118 155
-182 2 2 2 6 88 155 118
-183 2 2 2 6 100 119 157
-184 2 2 2 6 89 157 119
-185 2 2 2 6 74 136 130
-186 2 2 2 6 94 130 136
-187 2 2 2 6 76 137 131
-188 2 2 2 6 95 131 137
-189 2 2 2 6 26 106 146
-190 2 2 2 6 34 107 147
-191 2 2 2 6 18 108 152
-192 2 2 2 6 10 109 153
-193 2 2 2 6 23 148 110
-194 2 2 2 6 15 150 111
-195 2 2 2 6 31 149 112
-196 2 2 2 6 39 151 113
-197 2 2 2 6 75 154 120
-198 2 2 2 6 99 120 154
-199 2 2 2 6 101 121 156
-200 2 2 2 6 77 156 121
-201 2 2 2 6 74 130 126
-202 2 2 2 6 75 132 127
-203 2 2 2 6 76 131 128
-204 2 2 2 6 77 133 129
-205 2 2 2 6 25 146 122
-206 2 2 2 6 17 152 124
-207 2 2 2 6 33 147 123
-208 2 2 2 6 9 153 125
-209 2 2 2 6 24 122 148
-210 2 2 2 6 16 124 150
-211 2 2 2 6 32 123 149
-212 2 2 2 6 40 125 151
-213 2 2 2 6 82 122 146
-214 2 2 2 6 83 123 147
-215 2 2 2 6 82 148 122
-216 2 2 2 6 83 149 123
-217 2 2 2 6 84 124 152
-218 2 2 2 6 84 150 124
-219 2 2 2 6 85 125 153
-220 2 2 2 6 85 151 125
-221 2 2 2 6 90 139 162
-222 2 2 2 6 91 138 164
-223 2 2 2 6 92 145 163
-224 2 2 2 6 93 144 165
-225 2 2 2 6 94 160 142
-226 2 2 2 6 95 161 143
-227 2 2 2 6 96 158 140
-228 2 2 2 6 97 159 141
-229 2 2 4 28 189 213 225
-230 2 2 4 28 190 214 226
-231 2 2 4 28 173 225 213
-232 2 2 4 28 174 226 214
-233 2 2 4 28 186 216 232
-234 2 2 4 28 187 211 223
-235 2 2 4 28 188 212 224
-236 2 2 4 28 171 223 211
-237 2 2 4 28 172 224 212
-238 2 2 4 28 170 232 216
-239 2 2 4 28 185 215 216
-240 2 2 4 28 170 216 215
-241 2 2 4 28 176 233 195
-242 2 2 4 28 178 234 197
-243 2 2 4 28 184 231 196
-244 2 2 4 28 186 232 198
-245 2 2 4 28 184 232 231
-246 2 2 4 28 196 264 217
-247 2 2 4 28 198 265 218
-248 2 2 4 28 195 263 215
-249 2 2 4 28 197 266 216
-250 2 2 4 28 264 175 217
-251 2 2 4 28 265 177 218
-252 2 2 4 28 70 209 237
-253 2 2 4 28 46 210 238
-254 2 2 4 28 62 207 239
-255 2 2 4 28 54 208 240
-256 2 2 4 28 43 235 204
-257 2 2 4 28 67 236 203
-258 2 2 4 28 51 241 206
-259 2 2 4 28 59 242 205
-260 2 2 4 28 263 183 215
-261 2 2 4 28 266 185 216
-262 2 2 4 28 8 65 219
-263 2 2 4 28 7 57 221
-264 2 2 4 28 5 41 220
-265 2 2 4 28 6 49 222
-266 2 2 4 28 7 221 56
-267 2 2 4 28 6 222 48
-268 2 2 4 28 8 219 64
-269 2 2 4 28 5 220 72
-270 2 2 4 28 42 43 204
-271 2 2 4 28 66 67 203
-272 2 2 4 28 70 71 209
-273 2 2 4 28 62 63 207
-274 2 2 4 28 50 51 206
-275 2 2 4 28 46 47 210
-276 2 2 4 28 58 59 205
-277 2 2 4 28 54 55 208
-278 2 2 4 28 193 237 209
-279 2 2 4 28 194 238 210
-280 2 2 4 28 191 239 207
-281 2 2 4 28 192 240 208
-282 2 2 4 28 188 204 235
-283 2 2 4 28 187 203 236
-284 2 2 4 28 190 206 241
-285 2 2 4 28 189 205 242
-286 2 2 4 28 183 231 215
-287 2 2 4 28 176 257 233
-288 2 2 4 28 178 258 234
-289 2 2 4 28 176 195 252
-290 2 2 4 28 184 196 251
-291 2 2 4 28 178 197 254
-292 2 2 4 28 186 198 253
-293 2 2 4 28 170 231 232
-294 2 2 4 28 68 69 199
-295 2 2 4 28 44 45 200
-296 2 2 4 28 60 61 201
-297 2 2 4 28 52 53 202
-298 2 2 4 28 170 215 231
-299 2 2 4 28 175 255 217
-300 2 2 4 28 177 256 218
-301 2 2 4 28 68 199 236
-302 2 2 4 28 44 200 235
-303 2 2 4 28 69 237 199
-304 2 2 4 28 45 238 200
-305 2 2 4 28 60 201 242
-306 2 2 4 28 52 202 241
-307 2 2 4 28 61 239 201
-308 2 2 4 28 53 240 202
-309 2 2 4 28 187 223 203
-310 2 2 4 28 188 224 204
-311 2 2 4 28 189 225 205
-312 2 2 4 28 190 226 206
-313 2 2 4 28 179 227 207
-314 2 2 4 28 180 229 209
-315 2 2 4 28 181 228 208
-316 2 2 4 28 182 230 210
-317 2 2 4 28 172 217 229
-318 2 2 4 28 193 229 217
-319 2 2 4 28 174 218 230
-320 2 2 4 28 194 230 218
-321 2 2 4 28 174 214 253
-322 2 2 4 28 186 253 214
-323 2 2 4 28 175 211 259
-324 2 2 4 28 177 212 261
-325 2 2 4 28 199 259 236
-326 2 2 4 28 200 261 235
-327 2 2 4 28 201 260 242
-328 2 2 4 28 202 262 241
-329 2 2 4 28 201 239 257
-330 2 2 4 28 199 237 255
-331 2 2 4 28 202 240 258
-332 2 2 4 28 200 238 256
-333 2 2 4 28 172 212 251
-334 2 2 4 28 184 251 212
-335 2 2 4 28 176 252 213
-336 2 2 4 28 185 213 252
-337 2 2 4 28 186 214 254
-338 2 2 4 28 178 254 214
-339 2 2 4 28 180 224 229
-340 2 2 4 28 179 223 227
-341 2 2 4 28 182 226 230
-342 2 2 4 28 181 225 228
-343 2 2 4 28 179 203 223
-344 2 2 4 28 180 204 224
-345 2 2 4 28 181 205 225
-346 2 2 4 28 182 206 226
-347 2 2 4 28 187 259 211
-348 2 2 4 28 188 261 212
-349 2 2 4 28 191 207 227
-350 2 2 4 28 192 208 228
-351 2 2 4 28 193 209 229
-352 2 2 4 28 194 210 230
-353 2 2 4 28 175 264 211
-354 2 2 4 28 173 213 266
-355 2 2 4 28 177 265 212
-356 2 2 4 28 189 260 213
-357 2 2 4 28 190 262 214
-358 2 2 4 28 176 213 260
-359 2 2 4 28 178 214 262
-360 2 2 4 28 65 66 243
-361 2 2 4 28 41 42 244
-362 2 2 4 28 57 58 249
-363 2 2 4 28 49 50 250
-364 2 2 4 28 63 64 245
-365 2 2 4 28 55 56 247
-366 2 2 4 28 71 72 246
-367 2 2 4 28 47 48 248
-368 2 2 4 28 183 264 231
-369 2 2 4 28 196 231 264
-370 2 2 4 28 184 265 232
-371 2 2 4 28 198 232 265
-372 2 2 4 28 183 211 264
-373 2 2 4 28 184 212 265
-374 2 2 4 28 185 266 213
-375 2 2 4 28 175 259 199
-376 2 2 4 28 175 199 255
-377 2 2 4 28 177 261 200
-378 2 2 4 28 177 200 256
-379 2 2 4 28 176 260 201
-380 2 2 4 28 176 201 257
-381 2 2 4 28 178 262 202
-382 2 2 4 28 178 202 258
-383 2 2 4 28 179 243 203
-384 2 2 4 28 180 244 204
-385 2 2 4 28 181 249 205
-386 2 2 4 28 182 250 206
-387 2 2 4 28 179 207 245
-388 2 2 4 28 180 209 246
-389 2 2 4 28 181 208 247
-390 2 2 4 28 182 210 248
-391 2 2 4 28 171 211 263
-392 2 2 4 28 183 263 211
-393 2 2 4 28 171 263 233
-394 2 2 4 28 195 233 263
-395 2 2 4 28 173 266 234
-396 2 2 4 28 197 234 266
-397 2 2 4 28 193 217 255
-398 2 2 4 28 194 218 256
-399 2 2 4 28 69 70 237
-400 2 2 4 28 45 46 238
-401 2 2 4 28 61 62 239
-402 2 2 4 28 53 54 240
-403 2 2 4 28 43 44 235
-404 2 2 4 28 67 68 236
-405 2 2 4 28 51 52 241
-406 2 2 4 28 59 60 242
-407 2 2 4 28 191 233 257
-408 2 2 4 28 192 234 258
-409 2 2 4 28 195 215 252
-410 2 2 4 28 185 252 215
-411 2 2 4 28 197 216 254
-412 2 2 4 28 186 254 216
-413 2 2 4 28 171 233 227
-414 2 2 4 28 191 227 233
-415 2 2 4 28 173 234 228
-416 2 2 4 28 192 228 234
-417 2 2 4 28 66 203 243
-418 2 2 4 28 42 204 244
-419 2 2 4 28 58 205 249
-420 2 2 4 28 50 206 250
-421 2 2 4 28 63 245 207
-422 2 2 4 28 55 247 208
-423 2 2 4 28 71 246 209
-424 2 2 4 28 47 248 210
-425 2 2 4 28 172 251 217
-426 2 2 4 28 196 217 251
-427 2 2 4 28 198 218 253
-428 2 2 4 28 174 253 218
-429 2 2 4 28 171 227 223
-430 2 2 4 28 172 229 224
-431 2 2 4 28 173 228 225
-432 2 2 4 28 174 230 226
-433 2 2 4 28 65 243 219
-434 2 2 4 28 57 249 221
-435 2 2 4 28 41 244 220
-436 2 2 4 28 49 250 222
-437 2 2 4 28 64 219 245
-438 2 2 4 28 56 221 247
-439 2 2 4 28 72 220 246
-440 2 2 4 28 48 222 248
-441 2 2 4 28 179 219 243
-442 2 2 4 28 180 220 244
-443 2 2 4 28 179 245 219
-444 2 2 4 28 180 246 220
-445 2 2 4 28 181 221 249
-446 2 2 4 28 181 247 221
-447 2 2 4 28 182 222 250
-448 2 2 4 28 182 248 222
-449 2 2 4 28 187 236 259
-450 2 2 4 28 188 235 261
-451 2 2 4 28 189 242 260
-452 2 2 4 28 190 241 262
-453 2 2 4 28 191 257 239
-454 2 2 4 28 192 258 240
-455 2 2 4 28 193 255 237
-456 2 2 4 28 194 256 238
-457 3 2 3 15 4 33 41 5
-458 3 2 3 15 33 34 42 41
-459 3 2 3 15 34 35 43 42
-460 3 2 3 15 35 36 44 43
-461 3 2 3 15 36 37 45 44
-462 3 2 3 15 37 38 46 45
-463 3 2 3 15 38 39 47 46
-464 3 2 3 15 39 40 48 47
-465 3 2 3 15 40 1 6 48
-466 3 2 3 19 1 9 49 6
-467 3 2 3 19 9 10 50 49
-468 3 2 3 19 10 11 51 50
-469 3 2 3 19 11 12 52 51
-470 3 2 3 19 12 13 53 52
-471 3 2 3 19 13 14 54 53
-472 3 2 3 19 14 15 55 54
-473 3 2 3 19 15 16 56 55
-474 3 2 3 19 16 2 7 56
-475 3 2 3 23 2 17 57 7
-476 3 2 3 23 17 18 58 57
-477 3 2 3 23 18 19 59 58
-478 3 2 3 23 19 20 60 59
-479 3 2 3 23 20 21 61 60
-480 3 2 3 23 21 22 62 61
-481 3 2 3 23 22 23 63 62
-482 3 2 3 23 23 24 64 63
-483 3 2 3 23 24 3 8 64
-484 3 2 3 27 3 25 65 8
-485 3 2 3 27 25 26 66 65
-486 3 2 3 27 26 27 67 66
-487 3 2 3 27 27 28 68 67
-488 3 2 3 27 28 29 69 68
-489 3 2 3 27 29 30 70 69
-490 3 2 3 27 30 31 71 70
-491 3 2 3 27 31 32 72 71
-492 3 2 3 27 32 4 5 72
-493 6 2 1 1 116 92 128 213 189 225
-494 6 2 1 1 117 93 129 214 190 226
-495 6 2 1 1 128 76 116 225 173 213
-496 6 2 1 1 129 77 117 226 174 214
-497 6 2 1 1 119 89 135 216 186 232
-498 6 2 1 1 114 90 126 211 187 223
-499 6 2 1 1 115 91 127 212 188 224
-500 6 2 1 1 126 74 114 223 171 211
-501 6 2 1 1 127 75 115 224 172 212
-502 6 2 1 1 135 73 119 232 170 216
-503 6 2 1 1 118 88 119 215 185 216
-504 6 2 1 1 119 73 118 216 170 215
-505 6 2 1 1 136 79 98 233 176 195
-506 6 2 1 1 137 81 100 234 178 197
-507 6 2 1 1 134 87 99 231 184 196
-508 6 2 1 1 135 89 101 232 186 198
-509 6 2 1 1 135 87 134 232 184 231
-510 6 2 1 1 167 99 120 264 196 217
-511 6 2 1 1 168 101 121 265 198 218
-512 6 2 1 1 166 98 118 263 195 215
-513 6 2 1 1 169 100 119 266 197 216
-514 6 2 1 1 78 167 120 175 264 217
-515 6 2 1 1 80 168 121 177 265 218
-516 6 2 1 1 112 30 140 209 70 237
-517 6 2 1 1 113 38 141 210 46 238
-518 6 2 1 1 110 22 142 207 62 239
-519 6 2 1 1 111 14 143 208 54 240
-520 6 2 1 1 138 35 107 235 43 204
-521 6 2 1 1 139 27 106 236 67 203
-522 6 2 1 1 144 11 109 241 51 206
-523 6 2 1 1 145 19 108 242 59 205
-524 6 2 1 1 86 166 118 183 263 215
-525 6 2 1 1 88 169 119 185 266 216
-526 6 2 1 1 25 3 122 65 8 219
-527 6 2 1 1 17 2 124 57 7 221
-528 6 2 1 1 33 4 123 41 5 220
-529 6 2 1 1 9 1 125 49 6 222
-530 6 2 1 1 124 2 16 221 7 56
-531 6 2 1 1 125 1 40 222 6 48
-532 6 2 1 1 122 3 24 219 8 64
-533 6 2 1 1 123 4 32 220 5 72
-534 6 2 1 1 35 34 107 43 42 204
-535 6 2 1 1 27 26 106 67 66 203
-536 6 2 1 1 31 30 112 71 70 209
-537 6 2 1 1 23 22 110 63 62 207
-538 6 2 1 1 11 10 109 51 50 206
-539 6 2 1 1 39 38 113 47 46 210
-540 6 2 1 1 19 18 108 59 58 205
-541 6 2 1 1 15 14 111 55 54 208
-542 6 2 1 1 140 96 112 237 193 209
-543 6 2 1 1 141 97 113 238 194 210
-544 6 2 1 1 142 94 110 239 191 207
-545 6 2 1 1 143 95 111 240 192 208
-546 6 2 1 1 107 91 138 204 188 235
-547 6 2 1 1 106 90 139 203 187 236
-548 6 2 1 1 109 93 144 206 190 241
-549 6 2 1 1 108 92 145 205 189 242
-550 6 2 1 1 134 86 118 231 183 215
-551 6 2 1 1 160 79 136 257 176 233
-552 6 2 1 1 161 81 137 258 178 234
-553 6 2 1 1 98 79 155 195 176 252
-554 6 2 1 1 99 87 154 196 184 251
-555 6 2 1 1 100 81 157 197 178 254
-556 6 2 1 1 101 89 156 198 186 253
-557 6 2 1 1 134 73 135 231 170 232
-558 6 2 1 1 29 28 102 69 68 199
-559 6 2 1 1 37 36 103 45 44 200
-560 6 2 1 1 21 20 104 61 60 201
-561 6 2 1 1 13 12 105 53 52 202
-562 6 2 1 1 118 73 134 215 170 231
-563 6 2 1 1 158 78 120 255 175 217
-564 6 2 1 1 159 80 121 256 177 218
-565 6 2 1 1 102 28 139 199 68 236
-566 6 2 1 1 103 36 138 200 44 235
-567 6 2 1 1 140 29 102 237 69 199
-568 6 2 1 1 141 37 103 238 45 200
-569 6 2 1 1 104 20 145 201 60 242
-570 6 2 1 1 105 12 144 202 52 241
-571 6 2 1 1 142 21 104 239 61 201
-572 6 2 1 1 143 13 105 240 53 202
-573 6 2 1 1 126 90 106 223 187 203
-574 6 2 1 1 127 91 107 224 188 204
-575 6 2 1 1 128 92 108 225 189 205
-576 6 2 1 1 129 93 109 226 190 206
-577 6 2 1 1 130 82 110 227 179 207
-578 6 2 1 1 132 83 112 229 180 209
-579 6 2 1 1 131 84 111 228 181 208
-580 6 2 1 1 133 85 113 230 182 210
-581 6 2 1 1 120 75 132 217 172 229
-582 6 2 1 1 132 96 120 229 193 217
-583 6 2 1 1 121 77 133 218 174 230
-584 6 2 1 1 133 97 121 230 194 218
-585 6 2 1 1 117 77 156 214 174 253
-586 6 2 1 1 156 89 117 253 186 214
-587 6 2 1 1 114 78 162 211 175 259
-588 6 2 1 1 115 80 164 212 177 261
-589 6 2 1 1 162 102 139 259 199 236
-590 6 2 1 1 164 103 138 261 200 235
-591 6 2 1 1 163 104 145 260 201 242
-592 6 2 1 1 165 105 144 262 202 241
-593 6 2 1 1 142 104 160 239 201 257
-594 6 2 1 1 140 102 158 237 199 255
-595 6 2 1 1 143 105 161 240 202 258
-596 6 2 1 1 141 103 159 238 200 256
-597 6 2 1 1 115 75 154 212 172 251
-598 6 2 1 1 154 87 115 251 184 212
-599 6 2 1 1 155 79 116 252 176 213
-600 6 2 1 1 116 88 155 213 185 252
-601 6 2 1 1 117 89 157 214 186 254
-602 6 2 1 1 157 81 117 254 178 214
-603 6 2 1 1 127 83 132 224 180 229
-604 6 2 1 1 126 82 130 223 179 227
-605 6 2 1 1 129 85 133 226 182 230
-606 6 2 1 1 128 84 131 225 181 228
-607 6 2 1 1 106 82 126 203 179 223
-608 6 2 1 1 107 83 127 204 180 224
-609 6 2 1 1 108 84 128 205 181 225
-610 6 2 1 1 109 85 129 206 182 226
-611 6 2 1 1 162 90 114 259 187 211
-612 6 2 1 1 164 91 115 261 188 212
-613 6 2 1 1 110 94 130 207 191 227
-614 6 2 1 1 111 95 131 208 192 228
-615 6 2 1 1 112 96 132 209 193 229
-616 6 2 1 1 113 97 133 210 194 230
-617 6 2 1 1 167 78 114 264 175 211
-618 6 2 1 1 116 76 169 213 173 266
-619 6 2 1 1 168 80 115 265 177 212
-620 6 2 1 1 163 92 116 260 189 213
-621 6 2 1 1 165 93 117 262 190 214
-622 6 2 1 1 116 79 163 213 176 260
-623 6 2 1 1 117 81 165 214 178 262
-624 6 2 1 1 26 25 146 66 65 243
-625 6 2 1 1 34 33 147 42 41 244
-626 6 2 1 1 18 17 152 58 57 249
-627 6 2 1 1 10 9 153 50 49 250
-628 6 2 1 1 24 23 148 64 63 245
-629 6 2 1 1 16 15 150 56 55 247
-630 6 2 1 1 32 31 149 72 71 246
-631 6 2 1 1 40 39 151 48 47 248
-632 6 2 1 1 167 86 134 264 183 231
-633 6 2 1 1 134 99 167 231 196 264
-634 6 2 1 1 168 87 135 265 184 232
-635 6 2 1 1 135 101 168 232 198 265
-636 6 2 1 1 114 86 167 211 183 264
-637 6 2 1 1 115 87 168 212 184 265
-638 6 2 1 1 169 88 116 266 185 213
-639 6 2 1 1 162 78 102 259 175 199
-640 6 2 1 1 102 78 158 199 175 255
-641 6 2 1 1 164 80 103 261 177 200
-642 6 2 1 1 103 80 159 200 177 256
-643 6 2 1 1 163 79 104 260 176 201
-644 6 2 1 1 104 79 160 201 176 257
-645 6 2 1 1 165 81 105 262 178 202
-646 6 2 1 1 105 81 161 202 178 258
-647 6 2 1 1 146 82 106 243 179 203
-648 6 2 1 1 147 83 107 244 180 204
-649 6 2 1 1 152 84 108 249 181 205
-650 6 2 1 1 153 85 109 250 182 206
-651 6 2 1 1 110 82 148 207 179 245
-652 6 2 1 1 112 83 149 209 180 246
-653 6 2 1 1 111 84 150 208 181 247
-654 6 2 1 1 113 85 151 210 182 248
-655 6 2 1 1 114 74 166 211 171 263
-656 6 2 1 1 166 86 114 263 183 211
-657 6 2 1 1 166 74 136 263 171 233
-658 6 2 1 1 136 98 166 233 195 263
-659 6 2 1 1 169 76 137 266 173 234
-660 6 2 1 1 137 100 169 234 197 266
-661 6 2 1 1 120 96 158 217 193 255
-662 6 2 1 1 121 97 159 218 194 256
-663 6 2 1 1 30 29 140 70 69 237
-664 6 2 1 1 38 37 141 46 45 238
-665 6 2 1 1 22 21 142 62 61 239
-666 6 2 1 1 14 13 143 54 53 240
-667 6 2 1 1 36 35 138 44 43 235
-668 6 2 1 1 28 27 139 68 67 236
-669 6 2 1 1 12 11 144 52 51 241
-670 6 2 1 1 20 19 145 60 59 242
-671 6 2 1 1 136 94 160 233 191 257
-672 6 2 1 1 137 95 161 234 192 258
-673 6 2 1 1 118 98 155 215 195 252
-674 6 2 1 1 155 88 118 252 185 215
-675 6 2 1 1 119 100 157 216 197 254
-676 6 2 1 1 157 89 119 254 186 216
-677 6 2 1 1 136 74 130 233 171 227
-678 6 2 1 1 130 94 136 227 191 233
-679 6 2 1 1 137 76 131 234 173 228
-680 6 2 1 1 131 95 137 228 192 234
-681 6 2 1 1 106 26 146 203 66 243
-682 6 2 1 1 107 34 147 204 42 244
-683 6 2 1 1 108 18 152 205 58 249
-684 6 2 1 1 109 10 153 206 50 250
-685 6 2 1 1 148 23 110 245 63 207
-686 6 2 1 1 150 15 111 247 55 208
-687 6 2 1 1 149 31 112 246 71 209
-688 6 2 1 1 151 39 113 248 47 210
-689 6 2 1 1 154 75 120 251 172 217
-690 6 2 1 1 120 99 154 217 196 251
-691 6 2 1 1 121 101 156 218 198 253
-692 6 2 1 1 156 77 121 253 174 218
-693 6 2 1 1 130 74 126 227 171 223
-694 6 2 1 1 132 75 127 229 172 224
-695 6 2 1 1 131 76 128 228 173 225
-696 6 2 1 1 133 77 129 230 174 226
-697 6 2 1 1 146 25 122 243 65 219
-698 6 2 1 1 152 17 124 249 57 221
-699 6 2 1 1 147 33 123 244 41 220
-700 6 2 1 1 153 9 125 250 49 222
-701 6 2 1 1 122 24 148 219 64 245
-702 6 2 1 1 124 16 150 221 56 247
-703 6 2 1 1 123 32 149 220 72 246
-704 6 2 1 1 125 40 151 222 48 248
-705 6 2 1 1 122 82 146 219 179 243
-706 6 2 1 1 123 83 147 220 180 244
-707 6 2 1 1 148 82 122 245 179 219
-708 6 2 1 1 149 83 123 246 180 220
-709 6 2 1 1 124 84 152 221 181 249
-710 6 2 1 1 150 84 124 247 181 221
-711 6 2 1 1 125 85 153 222 182 250
-712 6 2 1 1 151 85 125 248 182 222
-713 6 2 1 1 139 90 162 236 187 259
-714 6 2 1 1 138 91 164 235 188 261
-715 6 2 1 1 145 92 163 242 189 260
-716 6 2 1 1 144 93 165 241 190 262
-717 6 2 1 1 160 94 142 257 191 239
-718 6 2 1 1 161 95 143 258 192 240
-719 6 2 1 1 158 96 140 255 193 237
-720 6 2 1 1 159 97 141 256 194 238
-$EndElements
-$End
diff --git a/run/benchmark/surfaceTension/curvatureSphere/curvature3D/system/blockMeshDict b/run/benchmark/surfaceTension/curvatureSphere/curvature3D/system/blockMeshDict
index f230a845..f1559d76 100755
--- a/run/benchmark/surfaceTension/curvatureSphere/curvature3D/system/blockMeshDict
+++ b/run/benchmark/surfaceTension/curvatureSphere/curvature3D/system/blockMeshDict
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-convertToMeters 1;
+scale 1;
 
 vertices
 (
diff --git a/run/benchmark/surfaceTension/curvatureSphere/curvature3D/system/setAlphaFieldDict b/run/benchmark/surfaceTension/curvatureSphere/curvature3D/system/setAlphaFieldDict
index 7ce51d2d..d8f0e6e5 100755
--- a/run/benchmark/surfaceTension/curvatureSphere/curvature3D/system/setAlphaFieldDict
+++ b/run/benchmark/surfaceTension/curvatureSphere/curvature3D/system/setAlphaFieldDict
@@ -19,7 +19,7 @@ field "alpha1";
 type cylinder;
 radius 0.49999999;
 direction (0 1 0);
-centre (1.01 0 1.01);
+origin (1.01 0 1.01);
 
 
 // ************************************************************************* //
diff --git a/run/benchmark/surfaceTension/curvatureSphere/curvature3DTri/Allrun b/run/benchmark/surfaceTension/curvatureSphere/curvature3DTri/Allrun
index 41b763bf..05cc07e5 100755
--- a/run/benchmark/surfaceTension/curvatureSphere/curvature3DTri/Allrun
+++ b/run/benchmark/surfaceTension/curvatureSphere/curvature3DTri/Allrun
@@ -6,7 +6,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 touch curv3d.foam
 restore0Dir
 
-gmshv306 -3 -optimize_netgen triBlock.geo
+gmshv493 -3 -optimize_netgen triBlock.geo
 echo '$End' >> triBlock.msh 
 #sbatch Allrun_Slurm
 runApplication gmshToFoam triBlock.msh
diff --git a/run/benchmark/surfaceTension/curvatureSphere/curvature3DTri/system/blockMeshDict b/run/benchmark/surfaceTension/curvatureSphere/curvature3DTri/system/blockMeshDict
index f230a845..f1559d76 100755
--- a/run/benchmark/surfaceTension/curvatureSphere/curvature3DTri/system/blockMeshDict
+++ b/run/benchmark/surfaceTension/curvatureSphere/curvature3DTri/system/blockMeshDict
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-convertToMeters 1;
+scale 1;
 
 vertices
 (
diff --git a/run/benchmark/surfaceTension/curvatureSphere/curvature3DTri/system/setAlphaFieldDict b/run/benchmark/surfaceTension/curvatureSphere/curvature3DTri/system/setAlphaFieldDict
index 7ce51d2d..d8f0e6e5 100755
--- a/run/benchmark/surfaceTension/curvatureSphere/curvature3DTri/system/setAlphaFieldDict
+++ b/run/benchmark/surfaceTension/curvatureSphere/curvature3DTri/system/setAlphaFieldDict
@@ -19,7 +19,7 @@ field "alpha1";
 type cylinder;
 radius 0.49999999;
 direction (0 1 0);
-centre (1.01 0 1.01);
+origin (1.01 0 1.01);
 
 
 // ************************************************************************* //
diff --git a/run/benchmark/surfaceTension/curvatureSphere/curvature3DTri/triBlock.msh b/run/benchmark/surfaceTension/curvatureSphere/curvature3DTri/triBlock.msh
deleted file mode 100644
index 47f111e1..00000000
--- a/run/benchmark/surfaceTension/curvatureSphere/curvature3DTri/triBlock.msh
+++ /dev/null
@@ -1,77 +0,0 @@
-$MeshFormat
-2.2 0 8
-$EndMeshFormat
-$PhysicalNames
-2
-2 1 "rim"
-3 2 "internal"
-$EndPhysicalNames
-$Nodes
-14
-1 0 0 1
-2 0 0 0
-3 0 1 1
-4 0 1 0
-5 1 0 1
-6 1 0 0
-7 1 1 1
-8 1 1 0
-9 0 0.5 0.5
-10 1 0.5 0.5
-11 0.5 0 0.5
-12 0.5 1 0.5
-13 0.5 0.5 0
-14 0.5 0.5 1
-$EndNodes
-$Elements
-48
-1 2 2 1 1 1 9 2
-2 2 2 1 1 1 3 9
-3 2 2 1 1 2 9 4
-4 2 2 1 1 3 4 9
-5 2 2 1 2 6 10 5
-6 2 2 1 2 10 7 5
-7 2 2 1 2 8 10 6
-8 2 2 1 2 10 8 7
-9 2 2 1 3 2 11 1
-10 2 2 1 3 11 5 1
-11 2 2 1 3 6 11 2
-12 2 2 1 3 11 6 5
-13 2 2 1 4 3 12 4
-14 2 2 1 4 3 7 12
-15 2 2 1 4 4 12 8
-16 2 2 1 4 7 8 12
-17 2 2 1 5 4 13 2
-18 2 2 1 5 13 6 2
-19 2 2 1 5 8 13 4
-20 2 2 1 5 13 8 6
-21 2 2 1 6 1 14 3
-22 2 2 1 6 1 5 14
-23 2 2 1 6 3 14 7
-24 2 2 1 6 5 7 14
-25 4 2 2 1 14 9 12 10
-26 4 2 2 1 12 9 13 10
-27 4 2 2 1 9 14 11 10
-28 4 2 2 1 13 9 11 10
-29 4 2 2 1 12 4 8 13
-30 4 2 2 1 3 7 14 12
-31 4 2 2 1 9 3 1 14
-32 4 2 2 1 5 1 14 11
-33 4 2 2 1 4 3 9 12
-34 4 2 2 1 2 13 11 6
-35 4 2 2 1 8 13 6 10
-36 4 2 2 1 2 4 9 13
-37 4 2 2 1 2 9 1 11
-38 4 2 2 1 7 12 8 10
-39 4 2 2 1 11 5 6 10
-40 4 2 2 1 7 5 14 10
-41 4 2 2 1 9 2 13 11
-42 4 2 2 1 9 3 14 12
-43 4 2 2 1 9 4 12 13
-44 4 2 2 1 1 9 14 11
-45 4 2 2 1 8 12 13 10
-46 4 2 2 1 13 11 6 10
-47 4 2 2 1 7 14 12 10
-48 4 2 2 1 14 5 11 10
-$EndElements
-$End
diff --git a/run/benchmark/surfaceTension/curvatureWall/curvatureWall/system/blockMeshDict b/run/benchmark/surfaceTension/curvatureWall/curvatureWall/system/blockMeshDict
index 98d3ab52..3304626a 100755
--- a/run/benchmark/surfaceTension/curvatureWall/curvatureWall/system/blockMeshDict
+++ b/run/benchmark/surfaceTension/curvatureWall/curvatureWall/system/blockMeshDict
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-convertToMeters 0.5;
+scale 0.5;
 
 vertices        
 (
diff --git a/run/benchmark/surfaceTension/curvatureWall/curvatureWallTri/Allrun b/run/benchmark/surfaceTension/curvatureWall/curvatureWallTri/Allrun
index 15db6724..c95bcbe7 100755
--- a/run/benchmark/surfaceTension/curvatureWall/curvatureWallTri/Allrun
+++ b/run/benchmark/surfaceTension/curvatureWall/curvatureWallTri/Allrun
@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 touch curvature.foam
-gmshv306 -3 triSquare.geo 
+gmshv493 -3 triSquare.geo 
 echo '$End' >> triSquare.msh 
 runApplication gmshToFoam triSquare.msh 
 runApplication changeDictionary
diff --git a/run/benchmark/surfaceTension/curvatureWall/curvatureWallTri/system/blockMeshDict b/run/benchmark/surfaceTension/curvatureWall/curvatureWallTri/system/blockMeshDict
index e95a6eb5..6932d6e4 100755
--- a/run/benchmark/surfaceTension/curvatureWall/curvatureWallTri/system/blockMeshDict
+++ b/run/benchmark/surfaceTension/curvatureWall/curvatureWallTri/system/blockMeshDict
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-convertToMeters 1;
+scale 1;
 
 vertices
 (
diff --git a/run/benchmark/surfaceTension/curvatureWall/curvatureWallTri/system/setAlphaFieldDict b/run/benchmark/surfaceTension/curvatureWall/curvatureWallTri/system/setAlphaFieldDict
index 7ce51d2d..d8f0e6e5 100755
--- a/run/benchmark/surfaceTension/curvatureWall/curvatureWallTri/system/setAlphaFieldDict
+++ b/run/benchmark/surfaceTension/curvatureWall/curvatureWallTri/system/setAlphaFieldDict
@@ -19,7 +19,7 @@ field "alpha1";
 type cylinder;
 radius 0.49999999;
 direction (0 1 0);
-centre (1.01 0 1.01);
+origin (1.01 0 1.01);
 
 
 // ************************************************************************* //
diff --git a/run/benchmark/surfaceTension/curvatureWall/curvatureWallTri/triSquare.msh b/run/benchmark/surfaceTension/curvatureWall/curvatureWallTri/triSquare.msh
deleted file mode 100644
index d64bf333..00000000
--- a/run/benchmark/surfaceTension/curvatureWall/curvatureWallTri/triSquare.msh
+++ /dev/null
@@ -1,42 +0,0 @@
-$MeshFormat
-2.2 0 8
-$EndMeshFormat
-$PhysicalNames
-3
-2 2 "walls"
-2 3 "frontAndBack"
-3 1 "internal"
-$EndPhysicalNames
-$Nodes
-10
-1 -0.5 -0.05 -1
-2 0.5 -0.05 -1
-3 0.5 -0.05 1
-4 -0.5 -0.05 1
-5 -0.5 0.05 1
-6 -0.5 0.05 -1
-7 0.5 0.05 -1
-8 0.5 0.05 1
-9 0 -0.05 0
-10 0 0.05 0
-$EndNodes
-$Elements
-16
-1 2 2 3 6 1 2 9
-2 2 2 3 6 3 4 9
-3 2 2 3 6 1 9 4
-4 2 2 3 6 2 3 9
-5 2 2 3 28 6 7 10
-6 2 2 3 28 8 5 10
-7 2 2 3 28 6 10 5
-8 2 2 3 28 7 8 10
-9 3 2 2 15 4 1 6 5
-10 3 2 2 19 1 2 7 6
-11 3 2 2 23 2 3 8 7
-12 3 2 2 27 3 4 5 8
-13 6 2 1 1 2 1 9 7 6 10
-14 6 2 1 1 4 3 9 5 8 10
-15 6 2 1 1 9 1 4 10 6 5
-16 6 2 1 1 3 2 9 8 7 10
-$EndElements
-$End
diff --git a/run/benchmark/surfaceTension/sinWave/sinWave/system/blockMeshDict b/run/benchmark/surfaceTension/sinWave/sinWave/system/blockMeshDict
index d3ab71f8..a0cb6802 100755
--- a/run/benchmark/surfaceTension/sinWave/sinWave/system/blockMeshDict
+++ b/run/benchmark/surfaceTension/sinWave/sinWave/system/blockMeshDict
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-convertToMeters 0.0015;
+scale 0.0015;
 
 vertices        
 (
diff --git a/run/benchmark/surfaceTension/sinWave/sinWave/system/setAlphaFieldDict b/run/benchmark/surfaceTension/sinWave/sinWave/system/setAlphaFieldDict
index 4f217690..682dbe04 100755
--- a/run/benchmark/surfaceTension/sinWave/sinWave/system/setAlphaFieldDict
+++ b/run/benchmark/surfaceTension/sinWave/sinWave/system/setAlphaFieldDict
@@ -19,7 +19,7 @@ type sin;
 period 0.003; 
 direction (1 0 0);
 up (0 1 0);
-centre (-7.5e-4 0 0);
+origin (-7.5e-4 0 0);
 amplitude 3e-5;;
 
 // ************************************************************************* //
diff --git a/run/benchmark/surfaceTension/sinWaveTri/sinWaveTri/Allrun b/run/benchmark/surfaceTension/sinWaveTri/sinWaveTri/Allrun
index ad7cea6d..47b13b66 100755
--- a/run/benchmark/surfaceTension/sinWaveTri/sinWaveTri/Allrun
+++ b/run/benchmark/surfaceTension/sinWaveTri/sinWaveTri/Allrun
@@ -5,7 +5,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 restore0Dir
 touch sinwavetri.foam
-gmshv306 -3 triSquare.geo
+gmshv493 -3 triSquare.geo
 echo '$End' >> triSquare.msh 
 runApplication gmshToFoam triSquare.msh
 runApplication changeDictionary
diff --git a/run/benchmark/surfaceTension/sinWaveTri/sinWaveTri/system/blockMeshDict b/run/benchmark/surfaceTension/sinWaveTri/sinWaveTri/system/blockMeshDict
index d3ab71f8..a0cb6802 100755
--- a/run/benchmark/surfaceTension/sinWaveTri/sinWaveTri/system/blockMeshDict
+++ b/run/benchmark/surfaceTension/sinWaveTri/sinWaveTri/system/blockMeshDict
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-convertToMeters 0.0015;
+scale 0.0015;
 
 vertices        
 (
diff --git a/run/benchmark/surfaceTension/sinWaveTri/sinWaveTri/system/setAlphaFieldDict b/run/benchmark/surfaceTension/sinWaveTri/sinWaveTri/system/setAlphaFieldDict
index 4f217690..682dbe04 100755
--- a/run/benchmark/surfaceTension/sinWaveTri/sinWaveTri/system/setAlphaFieldDict
+++ b/run/benchmark/surfaceTension/sinWaveTri/sinWaveTri/system/setAlphaFieldDict
@@ -19,7 +19,7 @@ type sin;
 period 0.003; 
 direction (1 0 0);
 up (0 1 0);
-centre (-7.5e-4 0 0);
+origin (-7.5e-4 0 0);
 amplitude 3e-5;;
 
 // ************************************************************************* //
diff --git a/run/benchmark/surfaceTension/sinWaveTri/sinWaveTri/triSquare.msh b/run/benchmark/surfaceTension/sinWaveTri/sinWaveTri/triSquare.msh
deleted file mode 100644
index 0da8343c..00000000
--- a/run/benchmark/surfaceTension/sinWaveTri/sinWaveTri/triSquare.msh
+++ /dev/null
@@ -1,42 +0,0 @@
-$MeshFormat
-2.2 0 8
-$EndMeshFormat
-$PhysicalNames
-3
-2 2 "frontAndBack"
-2 3 "walls"
-3 1 "internal"
-$EndPhysicalNames
-$Nodes
-10
-1 -0.0015 -0.0005 -0.0045
-2 0.0015 -0.0005 -0.0045
-3 0.0015 -0.0005 0.0045
-4 -0.0015 -0.0005 0.0045
-5 -0.0015 0.0005 0.0045
-6 -0.0015 0.0005 -0.0045
-7 0.0015 0.0005 -0.0045
-8 0.0015 0.0005 0.0045
-9 0 -0.0005 0
-10 0 0.0005 0
-$EndNodes
-$Elements
-16
-1 2 2 2 6 1 9 4
-2 2 2 2 6 2 3 9
-3 2 2 2 6 1 2 9
-4 2 2 2 6 3 4 9
-5 2 2 2 28 6 10 5
-6 2 2 2 28 7 8 10
-7 2 2 2 28 6 7 10
-8 2 2 2 28 8 5 10
-9 3 2 3 15 4 1 6 5
-10 3 2 3 19 1 2 7 6
-11 3 2 3 23 2 3 8 7
-12 3 2 3 27 3 4 5 8
-13 6 2 1 1 1 4 9 6 5 10
-14 6 2 1 1 2 9 3 7 10 8
-15 6 2 1 1 1 9 2 6 10 7
-16 6 2 1 1 3 9 4 8 10 5
-$EndElements
-$End
diff --git a/run/coffeePot/constant/fluid/thermophysicalProperties.air b/run/coffeePot/constant/fluid/thermophysicalProperties.air
index 220bc2d1..f1d7342f 100755
--- a/run/coffeePot/constant/fluid/thermophysicalProperties.air
+++ b/run/coffeePot/constant/fluid/thermophysicalProperties.air
@@ -19,8 +19,8 @@ thermoType
 {
     type            heRhoThermo;
     mixture         pureMixture;
-    transport       tabulated;
-    thermo          hTabulated;
+    transport       const;  // tabulated
+    thermo          hConst; // hTabulated
     equationOfState perfectGas;
     specie          specie;
     energy          sensibleInternalEnergy;
@@ -37,19 +37,21 @@ mixture
         Cp          2030;
         Hf          0;
         Sf          0;
-        CpFile      "thermo/cp.dat";
-        sampleRate  1;
-        nPoints     100;
-        TMin  1;
-        TMax  1000;
+        // CpFile      "thermo/cp.dat";
+        // sampleRate  1;
+        // nPoints     100;
+        // TMin  1;
+        // TMax  1000;
     }
     transport
     {
-        MuFile         "thermo/mu.dat";
-        KappaFile      "thermo/kappa.dat";
-        nPoints     100;
-        TMin  1;
-        TMax  1000;
+        mu          1e-5;
+        Pr          1;
+        // MuFile         "thermo/mu.dat";
+        // KappaFile      "thermo/kappa.dat";
+        // nPoints     100;
+        // TMin  1;
+        // TMax  1000;
     }
 }
 
diff --git a/run/coffeePot/constant/fluid/thermophysicalProperties.water b/run/coffeePot/constant/fluid/thermophysicalProperties.water
index c5c81c38..ae9a57ba 100755
--- a/run/coffeePot/constant/fluid/thermophysicalProperties.water
+++ b/run/coffeePot/constant/fluid/thermophysicalProperties.water
@@ -34,7 +34,6 @@ mixture
     }
     equationOfState
     {
-        //R           1024;
         rho0        958.4;
         T0          373;
         beta        6.9e-4;
@@ -48,7 +47,6 @@ mixture
     {
         mu          0.00028176;
         Pr          1.7703430104321904;
-        //Pr          0.17703430104321904; 
     }
 }
 
diff --git a/run/coffeePot/system/controlDict b/run/coffeePot/system/controlDict
index 81acd7dd..c2d0ae7a 100755
--- a/run/coffeePot/system/controlDict
+++ b/run/coffeePot/system/controlDict
@@ -64,14 +64,22 @@ functions
 
     intPsi
     {
-        type            fieldIntegrate;
-        functionObjectLibs ("libpostProcess.so");
+        type            volFieldValue;
+        libs            ("libfieldFunctionObjects.so");
 
-        // Write at same frequency as fields
         writeControl    timeStep;
         writeInterval   1;
-        region fluid;
-        field psi0_;
+        writeFields     false;
+        log             true;
+        region          fluid;
+
+        operation       volIntegrate;
+
+        fields
+        (
+            psi0_
+        );
+
     }
 
 }
diff --git a/run/coffeePot/system/fluid/blockMeshDict b/run/coffeePot/system/fluid/blockMeshDict
index 46fc0409..24e9e210 100755
--- a/run/coffeePot/system/fluid/blockMeshDict
+++ b/run/coffeePot/system/fluid/blockMeshDict
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-convertToMeters 0.001;
+scale 0.001;
 
 vertices
 (
diff --git a/run/coffeePot/system/fluid/fvSolution b/run/coffeePot/system/fluid/fvSolution
index feda7a72..ba9a2f65 100755
--- a/run/coffeePot/system/fluid/fvSolution
+++ b/run/coffeePot/system/fluid/fvSolution
@@ -32,7 +32,7 @@ solvers
         advectionScheme isoAdvection;
         reconstructionScheme isoAlpha;
         vof2IsoTol 1e-8;
-        surfCellTol 1e-5;
+        surfCellTol 1e-6;
         snapTol     1e-10;
         writeVTK true;
     }
diff --git a/run/coffeePot/system/fluid/setFieldsDict b/run/coffeePot/system/fluid/setFieldsDict
index 40dd8f4c..e565823c 100755
--- a/run/coffeePot/system/fluid/setFieldsDict
+++ b/run/coffeePot/system/fluid/setFieldsDict
@@ -17,9 +17,9 @@ FoamFile
 
 defaultFieldValues
 (
-    volScalarFieldValue T 300
-    volScalarFieldValue T.air 300
-    volScalarFieldValue T.water 300
+    volScalarFieldValue T 350
+    volScalarFieldValue T.air 350
+    volScalarFieldValue T.water 350
 );
 
 regions
@@ -29,9 +29,9 @@ regions
         box (-100 -100 -100) (100 0.04 100);
         fieldValues
         (
-            volScalarFieldValue T 373.15
-            volScalarFieldValue T.air 373.15
-            volScalarFieldValue T.water 373.15
+            volScalarFieldValue T 370
+            volScalarFieldValue T.air 370
+            volScalarFieldValue T.water 370
         );
     }
 );
diff --git a/run/coffeePot/system/fvSolution b/run/coffeePot/system/fvSolution
index 0e4e5224..5238220f 100755
--- a/run/coffeePot/system/fvSolution
+++ b/run/coffeePot/system/fvSolution
@@ -15,90 +15,6 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-solvers
-{
-    "alpha.*"
-    {
-        nAlphaCorr      1;
-        nAlphaSubCycles 2;
-        cAlpha          1;
-
-        MULESCorr       no;
-        nLimiterIter    5;
-
-        solver          smoothSolver;
-        smoother        symGaussSeidel;
-        tolerance       1e-8;
-        relTol          0;
-        advectionScheme asasd;
-        reconstructionScheme plicRDFN;
-        vof2IsoTol 1e-8;
-        surfCellTol 1e-8;
-        writeVTK true;
-    }
-
-    ".*(rho|rhoFinal)"
-    {
-        solver          diagonal;
-    }
-
-    "pcorr.*"
-    {
-        solver          PCG;
-        preconditioner
-        {
-            preconditioner  GAMG;
-            tolerance       1e-05;
-            relTol          0;
-            smoother        DICGaussSeidel;
-        }
-        tolerance       1e-05;
-        relTol          0;
-        maxIter         100;
-    }
-
-    p_rgh
-    {
-        solver          GAMG;
-        tolerance       1e-07;
-        relTol          0.01;
-        smoother        DIC;
-    }
-
-    p_rghFinal
-    {
-        solver          PCG;
-        preconditioner
-        {
-            preconditioner  GAMG;
-            tolerance       1e-07;
-            relTol          0;
-            nVcycles        2;
-            smoother        DICGaussSeidel;
-            nPreSweeps      2;
-        }
-        tolerance       1e-07;
-        relTol          0;
-        maxIter         20;
-    }
-
-    U
-    {
-        solver          smoothSolver;
-        smoother        GaussSeidel;
-        tolerance       1e-06;
-        relTol          0;
-        nSweeps         1;
-    }
-
-    "(T|k|B|nuTilda).*"
-    {
-        solver          smoothSolver;
-        smoother        symGaussSeidel;
-        tolerance       1e-08;
-        relTol          0;
-    }
-}
 
 PIMPLE
 {
diff --git a/run/coffeePot/system/solid/setFieldsDict b/run/coffeePot/system/solid/setFieldsDict
index 0f1c9e3e..0e393ea2 100755
--- a/run/coffeePot/system/solid/setFieldsDict
+++ b/run/coffeePot/system/solid/setFieldsDict
@@ -17,7 +17,7 @@ FoamFile
 
 defaultFieldValues
 (
-    volScalarFieldValue T 300
+    volScalarFieldValue T 350
 );
 
 regions
@@ -27,7 +27,7 @@ regions
         box (-100 -100 -100) (100 0.04 100);
         fieldValues
         (
-            volScalarFieldValue T 378
+            volScalarFieldValue T 370
         );
     }
 
diff --git a/run/depthCharge2D/constant/thermophysicalProperties.air b/run/depthCharge2D/constant/thermophysicalProperties.air
index 7b5b7b15..0dc91557 100755
--- a/run/depthCharge2D/constant/thermophysicalProperties.air
+++ b/run/depthCharge2D/constant/thermophysicalProperties.air
@@ -20,7 +20,7 @@ thermoType
     type            heRhoThermo;
     mixture         multiComponentMixture;
     transport       const;
-    thermo          hConst;
+    thermo          eConst;
     equationOfState perfectGas;
     specie          specie;
     energy          sensibleInternalEnergy;
@@ -41,7 +41,7 @@ steam
     }
     thermodynamics
     {
-        Cp          1007;
+        Cv          1554.8;
         Hf          0;
     }
     transport
@@ -59,7 +59,7 @@ air
     }
     thermodynamics
     {
-        Cp          1007;
+        Cv          716;
         Hf          0;
     }
     transport
diff --git a/run/depthCharge2D/system/blockMeshDict b/run/depthCharge2D/system/blockMeshDict
index eb62f4d3..e5c51966 100755
--- a/run/depthCharge2D/system/blockMeshDict
+++ b/run/depthCharge2D/system/blockMeshDict
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-convertToMeters 1;
+scale 1;
 
 vertices
 (
diff --git a/run/velocityStaticCircle/system/blockMeshDict b/run/velocityStaticCircle/system/blockMeshDict
index 62d4b571..d0827f46 100755
--- a/run/velocityStaticCircle/system/blockMeshDict
+++ b/run/velocityStaticCircle/system/blockMeshDict
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-convertToMeters 1;
+scale 1;
 
 vertices
 (
diff --git a/run/velocityStaticCircle/system/setAlphaFieldDict b/run/velocityStaticCircle/system/setAlphaFieldDict
index 7ce51d2d..d8f0e6e5 100755
--- a/run/velocityStaticCircle/system/setAlphaFieldDict
+++ b/run/velocityStaticCircle/system/setAlphaFieldDict
@@ -19,7 +19,7 @@ field "alpha1";
 type cylinder;
 radius 0.49999999;
 direction (0 1 0);
-centre (1.01 0 1.01);
+origin (1.01 0 1.01);
 
 
 // ************************************************************************* //
diff --git a/solver/compressibleInterFlow/YEqns.H b/solver/compressibleInterFlow/YEqns.H
index 7b78c839..8c4b7339 100644
--- a/solver/compressibleInterFlow/YEqns.H
+++ b/solver/compressibleInterFlow/YEqns.H
@@ -1,15 +1,9 @@
 {
-    // autoPtr<phaseSystem::massTransferTable>
-    //     massTransferPtr(fluid.massTransfer());
-
-    // phaseSystem::massTransferTable&
-    //     massTransfer(massTransferPtr());
 
     PtrList<volScalarField>& Y1 = mixture.phase1().Y();
     PtrList<volScalarField>& Y2 = mixture.phase2().Y();
-    // why alphaEff ?
-    volScalarField muEff = turbulence.muEff(); //mixture.phase1().rho();
-    // volScalarField muEff2 = turbulence.alphaEff(); //mixture.phase2().rho();
+ 
+    volScalarField muEff(turbulence.muEff());
     if (!Y1.empty())
     {
         label inertIndex1 = mixture.phase1().inertIndex();
@@ -21,13 +15,13 @@
 
             if (Y1iEqn.valid())
             {
-                Y1iEqn =
-                (
-                    Y1iEqn
+                // Y1iEqn =
+                // (
+                //     Y1iEqn
                 //  ==
                 //    *massTransfer[Y1[i].name()]
                 //   + fvOptions(alpha1, rho1, Y1[i])
-                );
+                // );
 
                 Y1iEqn->relax();
                 Y1iEqn->solve(mesh.solver("Yi"));
diff --git a/solver/multiRegionPhaseChangeFlow/Make/options b/solver/multiRegionPhaseChangeFlow/Make/options
index 3be98730..ebdc276d 100644
--- a/solver/multiRegionPhaseChangeFlow/Make/options
+++ b/solver/multiRegionPhaseChangeFlow/Make/options
@@ -46,6 +46,7 @@ EXE_LIBS = \
     -ldynamicFvMesh \
     -lregionModels \
     -lsampling \
+    -lthermoTools \
     -L$(FOAM_USER_LIBBIN) \
     -lVoFphaseModelCompressibleTurbulenceModels \
     -lVoF \
diff --git a/solver/multiRegionPhaseChangeFlow/fluid/YEqns.H b/solver/multiRegionPhaseChangeFlow/fluid/YEqns.H
index 95c95aec..219a99ec 100644
--- a/solver/multiRegionPhaseChangeFlow/fluid/YEqns.H
+++ b/solver/multiRegionPhaseChangeFlow/fluid/YEqns.H
@@ -2,7 +2,7 @@
 
     PtrList<volScalarField>& Y1 = mixture.phase1().Y();
     PtrList<volScalarField>& Y2 = mixture.phase2().Y();
-    volScalarField muEff = turbulence.muEff();
+    volScalarField muEff(turbulence.muEff());
     if (!Y1.empty())
     {
         label inertIndex1 = mixture.phase1().inertIndex();
diff --git a/solver/multiRegionPhaseChangeFlow/fluid/compressibleAlphaEqnSubCycle.H b/solver/multiRegionPhaseChangeFlow/fluid/compressibleAlphaEqnSubCycle.H
index 66f9d2dd..31d91533 100644
--- a/solver/multiRegionPhaseChangeFlow/fluid/compressibleAlphaEqnSubCycle.H
+++ b/solver/multiRegionPhaseChangeFlow/fluid/compressibleAlphaEqnSubCycle.H
@@ -2,20 +2,14 @@
 // new U and phi for propagating alpha1 in all but the first outer iteration
 if (oCorr != 0)
 {
-//     // We are recalculating alpha1 from the its old time value
+
        alpha1 = alpha1.oldTime();
-//     // Temporarily storing new U and phi values in prevIter storage
-//     U.storePrevIter();
-//     phi.storePrevIter();
 
-//     // Overwriting new U and phi values with mixture of old and new values
-//     phi = 0.5*(phi + phi.oldTime());
-//     U = 0.5*(U + U.oldTime());
 }
 
 tmp<surfaceScalarField> talphaPhi1(alphaPhi10);
-volScalarField tCpl = mixture.thermo1().Cp();
-volScalarField tCpv = mixture.thermo2().Cp();
+volScalarField tCpl(mixture.thermo1().Cp());
+volScalarField tCpv(mixture.thermo2().Cp());
 
 if (nAlphaSubCycles > 1)
 {
@@ -92,12 +86,6 @@ else
     #include "alphaEqn.H"
 }
 
-// if (oCorr != 0)
-// {
-//     // Restoring new U and phi values temporarily saved in prevIter() above
-//     U = U.prevIter();
-//     phi = phi.prevIter();
-// }
 
 rho = alpha1*rho1 + alpha2*rho2;
 
diff --git a/solver/multiRegionPhaseChangeFlow/multiRegionPhaseChangeFlow.C b/solver/multiRegionPhaseChangeFlow/multiRegionPhaseChangeFlow.C
index 37f2b9f3..c57489ee 100644
--- a/solver/multiRegionPhaseChangeFlow/multiRegionPhaseChangeFlow.C
+++ b/solver/multiRegionPhaseChangeFlow/multiRegionPhaseChangeFlow.C
@@ -57,7 +57,7 @@ Description
 #include "advectionSchemes.H"
 #include "surfaceForces.H"
 
-#include "alphaContactAngleFvPatchScalarField.H"
+#include "alphaContactAngleTwoPhaseFvPatchScalarField.H"
 
 #include "singleComponentPhaseChange.H"
 
diff --git a/solver/multiRegionPhaseChangeFlow/updateThermo.H b/solver/multiRegionPhaseChangeFlow/updateThermo.H
new file mode 100644
index 00000000..031bdea6
--- /dev/null
+++ b/solver/multiRegionPhaseChangeFlow/updateThermo.H
@@ -0,0 +1,6 @@
+mixture.correct();
+
+turbulence.correctPhasePhi();
+surfForces.correct();
+phaseChange.correctSatProperties(p,T);
+phaseChange.correct();
diff --git a/src/VoF/Make/files b/src/VoF/Make/files
index 8a86a57b..41a14c80 100644
--- a/src/VoF/Make/files
+++ b/src/VoF/Make/files
@@ -10,28 +10,7 @@ cellCuts/cutFace/cutFaceImpFunc.C
 surfaceIterators/surfaceIteratorPLIC.C
 surfaceIterators/surfaceIteratorIso.C
 
-/* Run-time selectable implicitFunctions */
-implicitFunctions/implicitFunction.C
-implicitFunctions/sphere/sphereImplicitFunction.C
-implicitFunctions/sin/sinImplicitFunction.C
-implicitFunctions/ellipsoid/ellipsoidImplicitFunction.C
-implicitFunctions/paraboloid/paraboloidImplicitFunction.C
-implicitFunctions/plane/planeImplicitFunction.C
-implicitFunctions/cylinder/cylinderImplicitFunction.C
-implicitFunctions/composedFunction/composedFunctionImplicitFunction.C
-
-zoneDistribute/zoneStencils/zoneCellStencils.C
-zoneDistribute/zoneStencils/zoneCPCStencil.C
-zoneDistribute/zoneDistribute.C
-zoneDistribute/zoneDistributePoints.C
-
-multiDimPolyFitter/multiDimPolyFunctions/multiDimPolyFunctions.C
-multiDimPolyFitter/multiDimPolyFunctions/polyDegree1.C
-multiDimPolyFitter/multiDimPolyFunctions/polyDegree2.C
 multiDimPolyFitter/multiDimPolyFunctions/paraboloid.C
-multiDimPolyFitter/multiDimPolyFitter.C
-multiDimPolyFitter/leastSquareGrad.C
-multiDimPolyFitter/leastSquareInterpolate.C
 multiDimPolyFitter/leastSquareFitParabolid.C
 
 reconstructedDistanceFunction/reconstructedDistanceFunction.C
diff --git a/src/VoF/Make/options b/src/VoF/Make/options
index 7c6b2322..fa95491e 100644
--- a/src/VoF/Make/options
+++ b/src/VoF/Make/options
@@ -1,12 +1,17 @@
 EXE_INC = \
+    -I$(FOAM_UTILITIES)/preProcessing/setAlphaField/alphaFieldFunctions/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/fileFormat/lnInclude \
     -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
     -I$(LIB_SRC)/transportModels/twoPhaseProperties/lnInclude
 
 LIB_LIBS = \
+    -lalphaFieldFunctions \
     -lfiniteVolume \
+    -lfileFormats \
     -lsurfMesh \
     -lmeshTools \
     -ltwoPhaseMixture \
diff --git a/src/VoF/advectionSchemes/MULES/MULESScheme.C b/src/VoF/advectionSchemes/MULES/MULESScheme.C
index dceca836..5c56dd3e 100644
--- a/src/VoF/advectionSchemes/MULES/MULESScheme.C
+++ b/src/VoF/advectionSchemes/MULES/MULESScheme.C
@@ -115,11 +115,6 @@ Foam::advection::MULESScheme::MULESScheme
          alpha1_.mesh(),
          dimensionedScalar("nHatf", dimArea, 0.0)
      )
-
-
-
-
-
 {
 
     //- Reference to mesh
@@ -132,21 +127,45 @@ Foam::advection::MULESScheme::MULESScheme
 
     MULESCorr_ = (alphaControls.lookupOrDefault<Switch>("MULESCorr", false));
 
-// Apply the compression correction from the previous iteration
-// Improves efficiency for steady-simulations but can only be applied
-// once the alpha field is reasonably steady, i.e. fully developed
+    // Apply the compression correction from the previous iteration
+    // Improves efficiency for steady-simulations but can only be applied
+    // once the alpha field is reasonably steady, i.e. fully developed
     alphaApplyPrevCorr_ =
-     (
-         alphaControls.lookupOrDefault<Switch>("alphaApplyPrevCorr", false)
-     );
- //Isotropic compression coefficient
+    (
+        alphaControls.lookupOrDefault<Switch>("alphaApplyPrevCorr", false)
+    );
+    
+    //Isotropic compression coefficient
     icAlpha_ =
-     (
-         alphaControls.lookupOrDefault<scalar>("icAlpha", 0)
-     );
+    (
+        alphaControls.lookupOrDefault<scalar>("icAlpha", 0)
+    );
 
     cAlpha_ = readScalar(alphaControls.lookup("cAlpha"));
 
+    // Shear compression coefficient
+    scAlpha_ =
+    (
+        alphaControls.getOrDefault<scalar>("scAlpha", 0)
+    );
+
+    IOobject alphaPhi10Header
+    (
+        IOobject::groupName("alphaPhi0", alpha1.group()),
+        mesh_.time().timeName(),
+        mesh_,
+        IOobject::READ_IF_PRESENT,
+        IOobject::AUTO_WRITE
+    );
+
+    alphaRestart_ =
+        alphaPhi10Header.typeHeaderOk<surfaceScalarField>(true);
+
+    if (alphaRestart_)
+    {
+        Info << "Restarting alpha" << endl;
+    }
+
 
 }
 
@@ -159,19 +178,18 @@ Foam::advection::MULESScheme::~MULESScheme()
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
-
-// ************************************************************************* //
-void Foam::advection::MULESScheme::advect()
+template<class SpType, class SuType>
+void Foam::advection::MULESScheme::advect(const SpType& Sp, const SuType& Su)
 {
     updateNHatf();
 
     word alphaScheme("div(phi,alpha)");
     word alpharScheme("div(phirb,alpha)");
 
+    // Set the off-centering coefficient according to ddt scheme
     scalar ocCoeff = 0;
     {
-
-        tmp<fv::ddtScheme<scalar>> ddtAlpha
+        tmp<fv::ddtScheme<scalar>> tddtAlpha
         (
             fv::ddtScheme<scalar>::New
             (
@@ -179,18 +197,17 @@ void Foam::advection::MULESScheme::advect()
                 mesh_.ddtScheme("ddt(alpha)")
             )
         );
-
-        // Set the off-centering coefficient according to ddt scheme
+        const fv::ddtScheme<scalar>& ddtAlpha = tddtAlpha();
 
         if
         (
-            isType<fv::EulerDdtScheme<scalar>>(ddtAlpha())
-         || isType<fv::localEulerDdtScheme<scalar>>(ddtAlpha())
+            isType<fv::EulerDdtScheme<scalar>>(ddtAlpha)
+         || isType<fv::localEulerDdtScheme<scalar>>(ddtAlpha)
         )
         {
             ocCoeff = 0;
         }
-        else if (isType<fv::CrankNicolsonDdtScheme<scalar>>(ddtAlpha()))
+        else if (isType<fv::CrankNicolsonDdtScheme<scalar>>(ddtAlpha))
         {
             if (nAlphaSubCycles_ > 1)
             {
@@ -200,9 +217,16 @@ void Foam::advection::MULESScheme::advect()
                     << exit(FatalError);
             }
 
-            ocCoeff =
-                refCast<const fv::CrankNicolsonDdtScheme<scalar>>(ddtAlpha())
-               .ocCoeff();
+            if
+            (
+                alphaRestart_
+             || mesh_.time().timeIndex() > mesh_.time().startTimeIndex() + 1
+            )
+            {
+                ocCoeff =
+                    refCast<const fv::CrankNicolsonDdtScheme<scalar>>(ddtAlpha)
+                   .ocCoeff();
+            }
         }
         else
         {
@@ -212,6 +236,7 @@ void Foam::advection::MULESScheme::advect()
         }
     }
 
+    // Set the time blending factor, 1 for Euler
     scalar cnCoeff = 1.0/(1.0 + ocCoeff);
 
     // Standard face-flux compression coefficient
@@ -224,6 +249,13 @@ void Foam::advection::MULESScheme::advect()
         phic += (cAlpha_*icAlpha_)*fvc::interpolate(mag(U_));
     }
 
+    // Add the optional shear compression contribution
+    if (scAlpha_ > 0)
+    {
+        phic +=
+            scAlpha_*mag(mesh_.delta() & fvc::interpolate(symm(fvc::grad(U_))));
+    }
+
     surfaceScalarField::Boundary& phicBf =
         phic.boundaryFieldRef();
 
@@ -262,6 +294,10 @@ void Foam::advection::MULESScheme::advect()
                 phiCN,
                 upwind<scalar>(mesh_, phiCN)
             ).fvmDiv(phiCN, alpha1_)
+       // - fvm::Sp(fvc::ddt(dimensionedScalar("1", dimless, 1), mesh)
+       //           + fvc::div(phiCN), alpha1)
+         ==
+            Su + fvm::Sp(Sp , alpha1_)
         );
 
         alpha1Eqn.solve();
@@ -278,7 +314,15 @@ void Foam::advection::MULESScheme::advect()
         if (alphaApplyPrevCorr_)
         {
             Info<< "Applying the previous iteration compression flux" << endl;
-            MULES::correct(alpha1_, alphaPhi_, talphaPhiCorr0_, 1, 0);
+            MULES::correct
+            (
+                geometricOneField(),
+                alpha1_,
+                alphaPhi_,
+                talphaPhiCorr0_,
+                oneField(),
+                zeroField()
+            );
 
             alphaPhi_ += talphaPhiCorr0_;
         }
@@ -288,7 +332,6 @@ void Foam::advection::MULESScheme::advect()
 
         alpha2_ = 1.0 - alpha1_;
 
-       // mixture.correct();
         updateNHatf();
     }
 
@@ -297,256 +340,25 @@ void Foam::advection::MULESScheme::advect()
     {
         surfaceScalarField phir(phic*nHatf_);
 
-        tmp<surfaceScalarField> talphaPhiUn
-            (
-                fvc::flux
-                (
-                    phi_,
-                    alpha1_,
-                    alphaScheme
-                )
-            + fvc::flux
-                (
-                    -fvc::flux(-phir, alpha2_, alpharScheme),
-                    alpha1_,
-                    alpharScheme
-                )
-            );
-
-        // Calculate the Crank-Nicolson off-centred alpha flux
-//            if (ocCoeff > 0)
-//            {
-//                talphaPhiUn =
-//                    cnCoeff*talphaPhiUn + (1.0 - cnCoeff)*alphaPhi_.oldTime();
-//            }
-
-        if (MULESCorr_)
-        {
-            tmp<surfaceScalarField> talphaPhiCorr(talphaPhiUn - alphaPhi_);
-            volScalarField alpha10("alpha10", alpha1_);
-
-            MULES::correct(alpha1_, talphaPhiUn, talphaPhiCorr.ref(), 1, 0);
-
-            // Under-relax the correction for all but the 1st corrector
-            if (aCorr == 0)
-            {
-                alphaPhi_ += talphaPhiCorr();
-            }
-            else
-            {
-                alpha1_ = 0.5*alpha1_ + 0.5*alpha10;
-                alphaPhi_ += 0.5*talphaPhiCorr();
-            }
-        }
-        else
-        {
-            alphaPhi_ = talphaPhiUn;
-
-            MULES::explicitSolve(alpha1_, phiCN, alphaPhi_, 1, 0);
-        }
-
-        alpha2_ = 1.0 - alpha1_;
-
-        // mixture.correct();
-         updateNHatf();
-    }
-
-    if (alphaApplyPrevCorr_ && MULESCorr_)
-    {
-        talphaPhiCorr0_ = alphaPhi_ - talphaPhiCorr0_;
-    }
-
-    if
-    (
-        word(mesh_.ddtScheme("ddt(rho,U)"))
-     == fv::EulerDdtScheme<vector>::typeName
-    )
-    {
-//            rhoPhi = alphaPhi_*(rho1 - rho2) + phiCN*rho2;
-    }
-    else
-    {
-        if (ocCoeff > 0)
-        {
-            // Calculate the end-of-time-step alpha flux
-            alphaPhi_ = (alphaPhi_ - (1.0 - cnCoeff)*alphaPhi_.oldTime())/cnCoeff;
-        }
-
-        // Calculate the end-of-time-step mass flux
-        //rhoPhi = alphaPhi_*(rho1 - rho2) + phi_*rho2;
-    }
-
-    Info<< "Phase-1 volume fraction = "
-        << alpha1_.weightedAverage(mesh_.Vsc()).value()
-        << "  Min(" << alpha1_.name() << ") = " << min(alpha1_).value()
-        << "  Max(" << alpha1_.name() << ") = " << max(alpha1_).value()
-        << endl;
-}
-
-void Foam::advection::MULESScheme::advect(const volScalarField::Internal& Sp,const volScalarField::Internal& Su)
-{
-    updateNHatf();
-
-    word alphaScheme("div(phi,alpha)");
-    word alpharScheme("div(phirb,alpha)");
-
-    scalar ocCoeff = 0;
-    {
-
-        tmp<fv::ddtScheme<scalar>> ddtAlpha
+        tmp<surfaceScalarField> talphaPhi1Un
         (
-            fv::ddtScheme<scalar>::New
+            fvc::flux
             (
-                mesh_,
-                mesh_.ddtScheme("ddt(alpha)")
+                phi_,
+                cnCoeff*alpha1_ + (1.0 - cnCoeff)*alpha1_.oldTime(),
+                alphaScheme
             )
-        );
-
-        // Set the off-centering coefficient according to ddt scheme
-
-        if
-        (
-            isType<fv::EulerDdtScheme<scalar>>(ddtAlpha())
-         || isType<fv::localEulerDdtScheme<scalar>>(ddtAlpha())
-        )
-        {
-            ocCoeff = 0;
-        }
-        else if (isType<fv::CrankNicolsonDdtScheme<scalar>>(ddtAlpha()))
-        {
-            if (nAlphaSubCycles_ > 1)
-            {
-                FatalErrorInFunction
-                    << "Sub-cycling is not supported "
-                       "with the CrankNicolson ddt scheme"
-                    << exit(FatalError);
-            }
-
-            ocCoeff =
-                refCast<const fv::CrankNicolsonDdtScheme<scalar>>(ddtAlpha())
-               .ocCoeff();
-        }
-        else
-        {
-            FatalErrorInFunction
-                << "Only Euler and CrankNicolson ddt schemes are supported"
-                << exit(FatalError);
-        }
-    }
-
-    scalar cnCoeff = 1.0/(1.0 + ocCoeff);
-
-    // Standard face-flux compression coefficient
-    surfaceScalarField phic(cAlpha_*mag(phi_/mesh_.magSf()));
-
-    // Add the optional isotropic compression contribution
-    if (icAlpha_ > 0)
-    {
-        phic *= (1.0 - icAlpha_);
-        phic += (cAlpha_*icAlpha_)*fvc::interpolate(mag(U_));
-    }
-
-    surfaceScalarField::Boundary& phicBf =
-        phic.boundaryFieldRef();
-
-    // Do not compress interface at non-coupled boundary faces
-    // (inlets, outlets etc.)
-    forAll(phic.boundaryField(), patchi)
-    {
-        fvsPatchScalarField& phicp = phicBf[patchi];
-
-        if (!phicp.coupled())
-        {
-            phicp == 0;
-        }
-    }
-
-    tmp<surfaceScalarField> phiCN(phi_);
-
-    // Calculate the Crank-Nicolson off-centred volumetric flux
-    if (ocCoeff > 0)
-    {
-        phiCN = cnCoeff*phi_ + (1.0 - cnCoeff)*phi_.oldTime();
-    }
-
-    if (MULESCorr_)
-    {
-        fvScalarMatrix alpha1Eqn
-        (
+          + fvc::flux
             (
-                LTS_
-              ? fv::localEulerDdtScheme<scalar>(mesh_).fvmDdt(alpha1_)
-              : fv::EulerDdtScheme<scalar>(mesh_).fvmDdt(alpha1_)
+               -fvc::flux(-phir, alpha2_, alpharScheme),
+                alpha1_,
+                alpharScheme
             )
-          + fv::gaussConvectionScheme<scalar>
-            (
-                mesh_,
-                phiCN,
-                upwind<scalar>(mesh_, phiCN)
-            ).fvmDiv(phiCN, alpha1_)
-             ==
-                 Su + fvm::Sp(Sp , alpha1_)
         );
 
-        alpha1Eqn.solve();
-
-        Info<< "Phase-1 volume fraction = "
-            << alpha1_.weightedAverage(mesh_.Vsc()).value()
-            << "  Min(" << alpha1_.name() << ") = " << min(alpha1_).value()
-            << "  Max(" << alpha1_.name() << ") = " << max(alpha1_).value()
-            << endl;
-
-        tmp<surfaceScalarField> talphaPhiUD(alpha1Eqn.flux());
-        alphaPhi_ = talphaPhiUD();
-
-        if (alphaApplyPrevCorr_)
-        {
-            Info<< "Applying the previous iteration compression flux" << endl;
-            MULES::correct(alpha1_, alphaPhi_, talphaPhiCorr0_, 1, 0);
-
-            alphaPhi_ += talphaPhiCorr0_;
-        }
-
-        // Cache the upwind-flux
-        talphaPhiCorr0_ = talphaPhiUD;
-
-        alpha2_ = 1.0 - alpha1_;
-
-       // mixture.correct();
-        updateNHatf();
-    }
-
-
-    for (int aCorr=0; aCorr<nAlphaCorr_; aCorr++)
-    {
-        surfaceScalarField phir(phic*nHatf_);
-
-        tmp<surfaceScalarField> talphaPhiUn
-            (
-                fvc::flux
-                (
-                    phi_,
-                    alpha1_,
-                    alphaScheme
-                )
-            + fvc::flux
-                (
-                    -fvc::flux(-phir, alpha2_, alpharScheme),
-                    alpha1_,
-                    alpharScheme
-                )
-            );
-
-        // Calculate the Crank-Nicolson off-centred alpha flux
-//            if (ocCoeff > 0)
-//            {
-//                talphaPhiUn =
-//                    cnCoeff*talphaPhiUn + (1.0 - cnCoeff)*alphaPhi_.oldTime();
-//            }
-
         if (MULESCorr_)
         {
-            tmp<surfaceScalarField> talphaPhiCorr(talphaPhiUn - alphaPhi_);
+            tmp<surfaceScalarField> talphaPhi1Corr(talphaPhi1Un - alphaPhi_);
             volScalarField alpha10("alpha10", alpha1_);
 
             MULES::correct
@@ -557,44 +369,41 @@ void Foam::advection::MULESScheme::advect(const volScalarField::Internal& Sp,con
                 alphaPhi_,
                 Sp,
                 Su,
-                1,
-                0
+                oneField(),
+                zeroField()
             );
 
             // Under-relax the correction for all but the 1st corrector
             if (aCorr == 0)
             {
-                alphaPhi_ += talphaPhiCorr();
+                alphaPhi_ += talphaPhi1Corr();
             }
             else
             {
                 alpha1_ = 0.5*alpha1_ + 0.5*alpha10;
-                alphaPhi_ += 0.5*talphaPhiCorr();
+                alphaPhi_ += 0.5*talphaPhi1Corr();
             }
         }
         else
         {
-
-            alphaPhi_ = talphaPhiUn;
-
+            alphaPhi_ = talphaPhi1Un;
 
             MULES::explicitSolve
             (
-               geometricOneField(),
-               alpha1_,
-               phiCN,
-               alphaPhi_,
-               Sp,
-               Su,
-               1,
-               0
+                geometricOneField(),
+                alpha1_,
+                phiCN,
+                alphaPhi_,
+                Sp,
+                Su,
+                oneField(),
+                zeroField()
             );
         }
 
         alpha2_ = 1.0 - alpha1_;
 
-        // mixture.correct();
-         updateNHatf();
+        updateNHatf();
     }
 
     if (alphaApplyPrevCorr_ && MULESCorr_)
@@ -606,20 +415,23 @@ void Foam::advection::MULESScheme::advect(const volScalarField::Internal& Sp,con
     (
         word(mesh_.ddtScheme("ddt(rho,U)"))
      == fv::EulerDdtScheme<vector>::typeName
+     || word(mesh_.ddtScheme("ddt(rho,U)"))
+     == fv::localEulerDdtScheme<vector>::typeName
     )
     {
-//            rhoPhi = alphaPhi_*(rho1 - rho2) + phiCN*rho2;
+        // rhoPhi = alphaPhi_*(rho1 - rho2) + phiCN*rho2;
     }
     else
     {
         if (ocCoeff > 0)
         {
             // Calculate the end-of-time-step alpha flux
-            alphaPhi_ = (alphaPhi_ - (1.0 - cnCoeff)*alphaPhi_.oldTime())/cnCoeff;
+            alphaPhi_ =
+                (alphaPhi_ - (1.0 - cnCoeff)*alphaPhi_.oldTime())/cnCoeff;
         }
 
         // Calculate the end-of-time-step mass flux
-        //rhoPhi = alphaPhi_*(rho1 - rho2) + phi_*rho2;
+        // rhoPhi = alphaPhi10*(rho1f - rho2f) + phi*rho2f;
     }
 
     Info<< "Phase-1 volume fraction = "
@@ -629,4 +441,3 @@ void Foam::advection::MULESScheme::advect(const volScalarField::Internal& Sp,con
         << endl;
 
 }
-
diff --git a/src/VoF/advectionSchemes/MULES/MULESScheme.H b/src/VoF/advectionSchemes/MULES/MULESScheme.H
index 07c77e69..880c5425 100644
--- a/src/VoF/advectionSchemes/MULES/MULESScheme.H
+++ b/src/VoF/advectionSchemes/MULES/MULESScheme.H
@@ -38,8 +38,10 @@ SourceFiles
 #include "typeInfo.H"
 #include "advectionSchemes.H"
 #include "volFields.H"
+#include "volFieldsFwd.H"
 #include "dimensionedScalar.H"
 #include "autoPtr.H"
+#include "zeroField.H"
 
 #include "volPointInterpolation.H"
 #include "reconstructionSchemes.H"
@@ -92,9 +94,14 @@ private:
         // Isotropic compression coefficient
         scalar icAlpha_;
 
+        // Shear compression coefficient
+        scalar scAlpha_;
+
         //- Compression coefficient
         scalar cAlpha_;
 
+        bool alphaRestart_;
+
         void alphaEqn();
 
         void updateNHatf();
@@ -133,10 +140,28 @@ public:
     virtual ~MULESScheme();
 
 
-
-    virtual void advect();
-
-    virtual void advect(const volScalarField::Internal& Sp,const volScalarField::Internal& Su);
+    //- Advect the free surface. Updates alpha field, taking into account
+    //  multiple calls within a single time step.
+    template < class SpType, class SuType >
+    void advect(const SpType& Sp, const SuType& Su);
+
+    //- advection of the interface
+    virtual void advect()
+    {
+        zeroField Sp;
+        zeroField Su;
+        advect<zeroField,zeroField>(Sp,Su);
+    }
+
+    //- advection of the interface with source terms
+    virtual void advect
+    (
+        const volScalarField::Internal& Sp,
+        const volScalarField::Internal& Su
+    )
+    {
+        advect<volScalarField::Internal,volScalarField::Internal>(Sp,Su);
+    }
 
 
 };
diff --git a/src/VoF/advectionSchemes/geoAdvection/geoAdvection.C b/src/VoF/advectionSchemes/geoAdvection/geoAdvection.C
index 69da0b59..a951a5a2 100644
--- a/src/VoF/advectionSchemes/geoAdvection/geoAdvection.C
+++ b/src/VoF/advectionSchemes/geoAdvection/geoAdvection.C
@@ -37,6 +37,7 @@ License
 #include "cellSet.H"
 #include "meshTools.H"
 #include "OBJstream.H"
+#include "processorPolyPatch.H"
 
 #include "addToRunTimeSelectionTable.H"
 
diff --git a/src/VoF/advectionSchemes/isoAdvection/isoAdvection.C b/src/VoF/advectionSchemes/isoAdvection/isoAdvection.C
index a45de67d..15a447ee 100644
--- a/src/VoF/advectionSchemes/isoAdvection/isoAdvection.C
+++ b/src/VoF/advectionSchemes/isoAdvection/isoAdvection.C
@@ -39,6 +39,7 @@ License
 #include "meshTools.H"
 #include "OBJstream.H"
 #include "syncTools.H"
+#include "profiling.H"
 
 #include "addToRunTimeSelectionTable.H"
 
@@ -188,6 +189,7 @@ void Foam::advection::isoAdvection::extendMarkedCells
 void Foam::advection::isoAdvection::timeIntegratedFlux()
 {
     // Get time step
+    addProfilingInFunction(geometricVoF);
     const scalar dt = mesh_.time().deltaTValue();
 
     // Create object for interpolating velocity to isoface centres
@@ -553,6 +555,7 @@ void Foam::advection::isoAdvection::checkIfOnProcPatch(const label facei)
 
 void Foam::advection::isoAdvection::applyBruteForceBounding()
 {
+    addProfilingInFunction(geometricVoF);
     bool alpha1Changed = false;
 
     scalar snapAlphaTol = modelDict().lookupOrDefault<scalar>("snapTol", 0);
diff --git a/src/VoF/advectionSchemes/isoAdvection/isoAdvectionTemplates.C b/src/VoF/advectionSchemes/isoAdvection/isoAdvectionTemplates.C
index 6aa6e4fa..ec1343e0 100644
--- a/src/VoF/advectionSchemes/isoAdvection/isoAdvectionTemplates.C
+++ b/src/VoF/advectionSchemes/isoAdvection/isoAdvectionTemplates.C
@@ -118,6 +118,7 @@ void Foam::advection::isoAdvection::limitFluxes
     const SuType& Su
 )
 {
+    addProfilingInFunction(geometricVoF);
     DebugInFunction << endl;
 
     const scalar aTol = 1.0e-12;          // Note: tolerances
@@ -223,6 +224,7 @@ void Foam::advection::isoAdvection::boundFlux
     const SuType& Su
 )
 {
+    addProfilingInFunction(geometricVoF);
     DebugInFunction << endl;
     scalar rDeltaT = 1/mesh_.time().deltaTValue();
 
@@ -374,6 +376,7 @@ void Foam::advection::isoAdvection::boundFlux
 template<class SpType, class SuType>
 void Foam::advection::isoAdvection::advect(const SpType& Sp, const SuType& Su)
 {
+    addProfilingInFunction(geometricVoF);
     DebugInFunction << endl;
 
     if (mesh_.topoChanging())
diff --git a/src/VoF/advectionSchemes/newAdvectionSchemes.C b/src/VoF/advectionSchemes/newAdvectionSchemes.C
index 68e7bdbd..f5546e33 100644
--- a/src/VoF/advectionSchemes/newAdvectionSchemes.C
+++ b/src/VoF/advectionSchemes/newAdvectionSchemes.C
@@ -50,29 +50,22 @@ Foam::advectionSchemes::New
         ).subDict("solvers").subDict(alpha1.name()).lookup("advectionScheme")
      );
 
-    //word advectionSchemesTypeName = word(advectionSchemesCoeffs_.lookup("advectionScheme"));
-
-
     Info<< "Selecting advectionSchemes: "
         << advectionSchemesTypeName << endl;
 
-    componentsConstructorTable::iterator cstrIter =
-        componentsConstructorTablePtr_
-            ->find(advectionSchemesTypeName);
+    auto ctorPtr = componentsConstructorTable(advectionSchemesTypeName);
 
-    if (cstrIter == componentsConstructorTablePtr_->end())
+    if (!ctorPtr)
     {
-        FatalErrorIn
+        FatalErrorInLookup
         (
-            "advectionSchemes::New"
-        )   << "Unknown advectionSchemes type "
-            << advectionSchemesTypeName << endl << endl
-            << "Valid  advectionSchemess are : " << endl
-            << componentsConstructorTablePtr_->sortedToc()
-            << exit(FatalError);
+            "advectionSchemes",
+            advectionSchemesTypeName,
+            *componentsConstructorTablePtr_
+        ) << exit(FatalError);
     }
 
-    return autoPtr<advectionSchemes>(cstrIter()( alpha1, phi,U));
+    return autoPtr<advectionSchemes>(ctorPtr(alpha1, phi,U));
 }
 
 
diff --git a/src/VoF/cellCuts/cutCell/cutCellImpFunc.C b/src/VoF/cellCuts/cutCell/cutCellImpFunc.C
index f1731cce..126d058c 100644
--- a/src/VoF/cellCuts/cutCell/cutCellImpFunc.C
+++ b/src/VoF/cellCuts/cutCell/cutCellImpFunc.C
@@ -31,8 +31,8 @@ License
 Foam::point Foam::cutCellImpFunc::bisection(point p0, point p1)
 {
     // return
-    vector start = p0;
-    vector end = p1;
+    //vector start = p0;
+    //vector end = p1;
     scalar a = func_.value(p0);
     scalar b = func_.value(p1);
     if (a * b > 0)
@@ -413,7 +413,9 @@ Foam::label Foam::cutCellImpFunc::calcSubCell
 
         VOF_ = subCellVolume_ / mesh_.V()[cellI_];
 
-        scalar error = GREAT;
+        // DEBUGGING
+        //scalar error = GREAT;
+        
         DynamicList<point> interfacePoints(1000);
         DynamicList<point> interfaceLocalFacePoints(1000);
 
@@ -539,9 +541,10 @@ Foam::label Foam::cutCellImpFunc::calcSubCell
             subCellVolume_
         );
         scalar newVoF = subCellVolume_ / mesh_.V()[cellI_];
-        error = (newVoF-VOF_)/newVoF;
         VOF_ = newVoF;
 
+        // DEBUGGING
+        // error = (newVoF-VOF_)/newVoF;
         // Info << "error " << error << endl;
         // Info << "celli " << cellI <<  " VOF_ " << VOF_ << endl;
 
diff --git a/src/VoF/implicitFunctions/composedFunction/composedFunctionImplicitFunction.C b/src/VoF/implicitFunctions/composedFunction/composedFunctionImplicitFunction.C
deleted file mode 100644
index 7711f550..00000000
--- a/src/VoF/implicitFunctions/composedFunction/composedFunctionImplicitFunction.C
+++ /dev/null
@@ -1,207 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2019 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-                            | Copyright (C) 2019 DLR
--------------------------------------------------------------------------------
-
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "composedFunctionImplicitFunction.H"
-#include "scalarField.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-namespace Foam
-{
-    namespace implicitFunctions
-    {
-        defineTypeNameAndDebug(composedFunctionImplicitFunction, 0);
-        addToRunTimeSelectionTable
-        (
-            implicitFunction,
-            composedFunctionImplicitFunction,
-            dict
-        );
-    }
-}
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-const Foam::Enum
-<
-    Foam::implicitFunctions::composedFunctionImplicitFunction::modeType
->
-Foam::implicitFunctions::composedFunctionImplicitFunction::modeTypeNames
-({
-    { modeType::ADD, "add" },
-    { modeType::SUBTRACT, "subtract" },
-    { modeType::MINDIST, "minDist" },
-    { modeType::INTERSECT, "intersect" },
-});
-
-Foam::label
-Foam::implicitFunctions::composedFunctionImplicitFunction::selectFunction
-(
-    const scalarField& values
-) const
-{
-    switch (mode_)
-    {
-        case modeType::MINDIST:
-        {
-            scalarField absVal(mag(values));
-            return findMin(absVal);
-        }
-        case modeType::ADD:
-        {
-            return findMax(values);
-        }
-        case modeType::SUBTRACT:
-        {
-            // Note: start at the second entry
-            const label idx = findMin(values, 1);
-
-            if (values[idx] < values[0] && pos(values[0]))
-            {
-                return idx;
-            }
-            else
-            {
-                return 0;
-            }
-        }
-        case modeType::INTERSECT:
-        {
-            return findMin(values);
-        }
-        default:
-        {
-            FatalErrorInFunction
-                << "This mode is not supported  only " << nl
-                << "Supported modes are: " << nl
-                << modeTypeNames
-                << abort(FatalError);
-        }
-    }
-
-    return -1;
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::implicitFunctions::composedFunctionImplicitFunction::
-composedFunctionImplicitFunction
-(
-    const dictionary& dict
-)
-:
-    functions_(dict.subDict("composedFunction").size()),
-    mode_(modeTypeNames.get("mode", dict)),
-    values_(dict.subDict("composedFunction").size())
-{
-    const dictionary& funcDict = dict.subDict("composedFunction");
-    label funcI = 0;
-
-    forAllConstIters(funcDict, iter)
-    {
-        const word& key = iter().keyword();
-
-        if (!funcDict.isDict(key))
-        {
-            FatalErrorInFunction
-                << "Found non-dictionary entry " << iter()
-                << " in top-level dictionary " << funcDict
-                << exit(FatalError);
-        }
-
-        const dictionary& compFuncDict = funcDict.subDict(key);
-
-        functions_.set
-        (
-            funcI,
-            implicitFunction::New
-            (
-                word(compFuncDict.lookup("type")),
-                compFuncDict
-            )
-        );
-
-        ++funcI;
-    }
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-Foam::scalar Foam::implicitFunctions::composedFunctionImplicitFunction::value
-(
-    const vector& p
-) const
-{
-    forAll(values_,i)
-    {
-        values_[i] = functions_[i].value(p);
-    }
-
-    const label idx = selectFunction(values_);
-
-    return values_[idx];
-}
-
-
-Foam::vector Foam::implicitFunctions::composedFunctionImplicitFunction::grad
-(
-    const vector& p
-) const
-{
-    forAll(values_,i)
-    {
-        values_[i] = mag(functions_[i].value(p));
-    }
-
-    const label minIdx = findMin(values_);
-
-    return functions_[minIdx].grad(p);
-}
-
-
-Foam::scalar
-Foam::implicitFunctions::composedFunctionImplicitFunction::distanceToSurfaces
-(
-    const vector& p
-) const
-{
-    forAll(values_,i)
-    {
-        values_[i] = mag(functions_[i].value(p));
-    }
-
-    const label minIdx = findMin(values_);
-
-    return functions_[minIdx].distanceToSurfaces(p);
-}
-
-
-// ************************************************************************* //
diff --git a/src/VoF/implicitFunctions/composedFunction/composedFunctionImplicitFunction.H b/src/VoF/implicitFunctions/composedFunction/composedFunctionImplicitFunction.H
deleted file mode 100644
index 782d0da1..00000000
--- a/src/VoF/implicitFunctions/composedFunction/composedFunctionImplicitFunction.H
+++ /dev/null
@@ -1,171 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2019 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-                            | Copyright (C) 2019 DLR
--------------------------------------------------------------------------------
-
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Class
-    Foam::implicitFunctions::composedFunctionImplicitFunction
-
-Description
-    Handles multiple implicit functions and offers multiple ways to combine
-    them
-
-Usage
-    Example of function object partial specification:
-    \verbatim
-    function composedFunctionImplicitFunction;
-    mode minDist;
-    // following mode are available:
-    // "add" "subtract" "minDist" "intersect"
-    composedFunctionImplicitFunctions
-    {
-        plane
-        {
-            function plane;
-            origin (0 1. 0);
-            normal (0 1 0);
-
-        }
-
-        sphere
-        {
-            function sphere;
-            radius 0.4;
-            origin (0.5 1.5 0.5);
-            scale 1;
-        }
-
-        sphere2
-        {
-            function sphere;
-            radius 0.4;
-            origin (0.5 0.5 0.5);
-            scale -1;
-        }
-    }
-    \endverbatim
-
-    Original code supplied by Henning Scheufler, DLR (2019)
-
-SourceFiles
-    composedFunctionImplicitFunction.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef implicitFunctions_composedFunctionImplicitFunction_H
-#define implicitFunctions_composedFunctionImplicitFunction_H
-
-#include "implicitFunction.H"
-#include "scalarField.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace implicitFunctions
-{
-
-/*---------------------------------------------------------------------------*\
-              Class composedFunctionImplicitFunction Declaration
-\*---------------------------------------------------------------------------*/
-
-class composedFunctionImplicitFunction
-:
-    public implicitFunction
-{
-private:
-
-    // Private Member Data
-         //- Enumeration defining the valid actions
-        enum class modeType
-        {
-            ADD,
-            SUBTRACT,
-            MINDIST,
-            INTERSECT
-        };
-
-        //- The setActions text representations
-        static const Enum<modeType> modeTypeNames;
-
-        //- Stores the functions
-        PtrList<implicitFunction> functions_;
-
-        //- Mode
-        modeType mode_;
-
-        //- Needed for finding the closest function.
-        //  Note: avoid creation every call
-        mutable scalarField values_;
-
-        label selectFunction(const scalarField& values) const;
-
-
-    // Private Member Functions
-
-        //- No copy construct
-        composedFunctionImplicitFunction
-        (
-            const composedFunctionImplicitFunction&
-        ) = delete;
-
-        //- No bitwise assignment
-        void operator=(const composedFunctionImplicitFunction&) = delete;
-
-
-public:
-
-    //- Runtime type information
-    TypeName("composedFunction");
-
-
-    // Constructors
-
-        //- Construct from dictionary
-        composedFunctionImplicitFunction(const dictionary& dict);
-
-
-    //- Destructor
-    virtual ~composedFunctionImplicitFunction() = default;
-
-
-    // Member Functions
-
-        virtual scalar value(const vector& p) const;
-
-        virtual vector grad(const vector& p) const;
-
-        virtual scalar distanceToSurfaces(const vector& p) const;
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-} // End namespace implicitFunctions
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/VoF/implicitFunctions/cylinder/cylinderImplicitFunction.C b/src/VoF/implicitFunctions/cylinder/cylinderImplicitFunction.C
deleted file mode 100644
index e4672c2d..00000000
--- a/src/VoF/implicitFunctions/cylinder/cylinderImplicitFunction.C
+++ /dev/null
@@ -1,86 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2019 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-                            | Copyright (C) 2019 DLR
--------------------------------------------------------------------------------
-
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "cylinderImplicitFunction.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-namespace Foam
-{
-    namespace implicitFunctions
-    {
-        defineTypeNameAndDebug(cylinderImplicitFunction, 0);
-        addToRunTimeSelectionTable
-        (
-            implicitFunction,
-            cylinderImplicitFunction,
-            dict
-        );
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::implicitFunctions::cylinderImplicitFunction::cylinderImplicitFunction
-(
-    const point& origin,
-    const scalar radius,
-    const scalar scale,
-    const vector& direction
-)
-:
-    origin_(origin),
-    radius_(radius),
-    scale_(scale),
-    direction_(direction),
-    project_(tensor::I)
-{
-   direction_.normalise();
-   project_ = tensor::I - direction_*direction_; // outer product
-}
-
-
-Foam::implicitFunctions::cylinderImplicitFunction::cylinderImplicitFunction
-(
-    const dictionary& dict
-)
-:
-    origin_(dict.get<point>("origin")),
-    radius_(dict.get<scalar>("radius")),
-    scale_(dict.lookupOrDefault<scalar>("scale", 1)),
-    direction_(dict.get<vector>("direction")),
-    project_(tensor::I)
-{
-    direction_.normalise();
-    project_ = tensor::I - (direction_ * direction_); // outer product
-}
-
-
-// ************************************************************************* //
diff --git a/src/VoF/implicitFunctions/cylinder/cylinderImplicitFunction.H b/src/VoF/implicitFunctions/cylinder/cylinderImplicitFunction.H
deleted file mode 100644
index cfe98bbb..00000000
--- a/src/VoF/implicitFunctions/cylinder/cylinderImplicitFunction.H
+++ /dev/null
@@ -1,138 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2019 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-                            | Copyright (C) 2019 DLR
--------------------------------------------------------------------------------
-
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Class
-    Foam::implicitFunctions::cylinderImplicitFunction
-
-Description
-    creates a infintite long cylinderImplicitFunction
-
-    Original code supplied by Henning Scheufler, DLR (2019)
-
-SourceFiles
-    cylinderImplicitFunction.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef implicitFunction_cylinderImplicitFunction_H
-#define implicitFunction_cylinderImplicitFunction_H
-
-#include "implicitFunction.H"
-#include "point.H"
-#include "tensor.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace implicitFunctions
-{
-
-/*---------------------------------------------------------------------------*\
-                   Class cylinderImplicitFunction Declaration
-\*---------------------------------------------------------------------------*/
-
-class cylinderImplicitFunction
-:
-    public implicitFunction
-{
-private:
-
-    // Private Member Data
-
-        //- Origin point
-        const point origin_;
-
-        //- Radius
-        const scalar radius_;
-
-        const scalar scale_;
-
-        vector direction_;
-
-        tensor project_;
-
-
-    // Private Member Functions
-
-        //- No copy construct
-        cylinderImplicitFunction(const cylinderImplicitFunction&) = delete;
-
-        //- No bitwise assignment
-        void operator=(const cylinderImplicitFunction&) = delete;
-
-
-public:
-
-    //- Runtime type information
-    TypeName("cylinder");
-
-
-    // Constructors
-
-        //- Construct from components
-        cylinderImplicitFunction
-        (
-            const point& origin,
-            const scalar radius,
-            const scalar scale,
-            const vector& direction
-        );
-
-        //- Construct from dictionary
-        cylinderImplicitFunction(const dictionary& dict);
-
-
-    //- Destructor
-    virtual ~cylinderImplicitFunction() = default;
-
-    virtual scalar value(const vector& p) const
-    {
-        return (-mag(project_ & (p - origin_)) + radius_)*scale_;
-    }
-
-    virtual vector grad(const vector& p) const
-    {
-        return -(project_ & (p - origin_))*scale_;
-    }
-
-    virtual scalar distanceToSurfaces(const vector& p) const
-    {
-        return mag(mag(project_ & (p - origin_)) - radius_)*scale_;
-    }
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace implicitFunctions
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/VoF/implicitFunctions/ellipsoid/ellipsoidImplicitFunction.C b/src/VoF/implicitFunctions/ellipsoid/ellipsoidImplicitFunction.C
deleted file mode 100644
index 6b9567ed..00000000
--- a/src/VoF/implicitFunctions/ellipsoid/ellipsoidImplicitFunction.C
+++ /dev/null
@@ -1,68 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2019 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-                            | Copyright (C) 2019 DLR
--------------------------------------------------------------------------------
-
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-\*---------------------------------------------------------------------------*/
-
-#include "ellipsoidImplicitFunction.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-namespace Foam
-{
-    namespace implicitFunctions
-    {
-        defineTypeNameAndDebug(ellipsoidImplicitFunction, 0);
-        addToRunTimeSelectionTable
-        (
-            implicitFunction,
-            ellipsoidImplicitFunction,
-            dict
-        );
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::implicitFunctions::ellipsoidImplicitFunction::ellipsoidImplicitFunction
-(
-    const vector& semiAxis
-)
-:
-    semiAxis_(semiAxis)
-{}
-
-
-Foam::implicitFunctions::ellipsoidImplicitFunction::ellipsoidImplicitFunction
-(
-    const dictionary& dict
-)
-:
-    semiAxis_(dict.get<vector>("semiAxis"))
-{}
-
-
-// ************************************************************************* //
diff --git a/src/VoF/implicitFunctions/ellipsoid/ellipsoidImplicitFunction.H b/src/VoF/implicitFunctions/ellipsoid/ellipsoidImplicitFunction.H
deleted file mode 100644
index a395a297..00000000
--- a/src/VoF/implicitFunctions/ellipsoid/ellipsoidImplicitFunction.H
+++ /dev/null
@@ -1,138 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2019-2019 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-                            | Copyright (C) 2019-2019 DLR
--------------------------------------------------------------------------------
-
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Class
-    Foam::implicitFunctions::ellipsoidImplicitFunction
-
-Description
-    creates an ellipsoidImplicitFunction
-
-    Original code supplied by Henning Scheufler, DLR (2019)
-
-SourceFiles
-    ellipsoidImplicitFunction.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef implicitFunction_ellipsoidImplicitFunction_H
-#define implicitFunction_ellipsoidImplicitFunction_H
-
-#include "implicitFunction.H"
-#include "mathematicalConstants.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace implicitFunctions
-{
-
-/*---------------------------------------------------------------------------*\
-                  Class ellipsoidImplicitFunction Declaration
-\*---------------------------------------------------------------------------*/
-
-class ellipsoidImplicitFunction
-:
-    public implicitFunction
-{
-private:
-
-    // Private Member Data
-
-        //- Axis
-        vector semiAxis_;
-
-        //- Origin point
-        vector origin_;
-
-
-    // Private Member Functions
-
-        //- No copy construct
-        ellipsoidImplicitFunction(const ellipsoidImplicitFunction&) = delete;
-
-        //- No bitwise assignment
-        void operator=(const ellipsoidImplicitFunction&) = delete;
-
-
-public:
-
-    //- Runtime type information
-    TypeName("ellipsoidImplicitFunction");
-
-
-    // Constructors
-
-        //- Construct from components
-        ellipsoidImplicitFunction(const vector& semiAxis);
-
-        //- Construct from dictionary
-        ellipsoidImplicitFunction(const dictionary& dict);
-
-
-    //- Destructor
-    virtual ~ellipsoidImplicitFunction() = default;
-
-    virtual scalar value(const vector& p) const
-    {
-          return
-           -sqrt
-            (
-                sqr((p.x() - origin_.x())/semiAxis_.x())
-              + sqr((p.y() - origin_.y())/semiAxis_.y())
-              + sqr((p.z() - origin_.z())/semiAxis_.z())
-            ) + 1;
-    }
-
-    virtual vector grad(const vector& p) const
-    {
-        // normal_ has the length of one
-        return vector
-        (
-            2*(p.x() - origin_.x())/sqr(semiAxis_.x()),
-            2*(p.y() - origin_.y())/sqr(semiAxis_.y()),
-            2*(p.z() - origin_.z())/sqr(semiAxis_.z())
-        );
-    }
-
-    virtual scalar distanceToSurfaces(const vector& p) const
-    {
-        NotImplemented;
-        return GREAT;
-    }
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace implicitFunctions
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/VoF/implicitFunctions/implicitFunction.C b/src/VoF/implicitFunctions/implicitFunction.C
deleted file mode 100644
index 27ea09fd..00000000
--- a/src/VoF/implicitFunctions/implicitFunction.C
+++ /dev/null
@@ -1,70 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2019 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-                            | Copyright (C) 2019 DLR
--------------------------------------------------------------------------------
-
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "implicitFunction.H"
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-namespace Foam
-{
-    defineTypeNameAndDebug(implicitFunction, 0);
-    defineRunTimeSelectionTable(implicitFunction, dict);
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-Foam::autoPtr<Foam::implicitFunction> Foam::implicitFunction::New
-(
-    const word& functionType,
-    const dictionary& dict
-)
-{
-    const auto& cstrIter = dictConstructorTablePtr_->find(functionType);
-
-    if (!cstrIter.found())
-    {
-        FatalErrorInFunction
-            << "Unknown implicitFunction type " << functionType
-            << nl << nl
-            << "Valid implicitFunction types : " << nl
-            << dictConstructorTablePtr_->sortedToc()
-            << exit(FatalError);
-    }
-
-    return autoPtr<implicitFunction>(cstrIter()(dict));
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::implicitFunction::implicitFunction()
-{}
-
-
-// ************************************************************************* //
diff --git a/src/VoF/implicitFunctions/implicitFunction.H b/src/VoF/implicitFunctions/implicitFunction.H
deleted file mode 100644
index 1d66a280..00000000
--- a/src/VoF/implicitFunctions/implicitFunction.H
+++ /dev/null
@@ -1,126 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2019 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-                            | Copyright (C) 2019 DLR
--------------------------------------------------------------------------------
-
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Class
-    Foam::implicitFunction
-
-Description
-    Base class for implicit functions
-
-    Original code supplied by Henning Scheufler, DLR (2019)
-
-SourceFiles
-    implicitFunction.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef implicitFunction_H
-#define implicitFunction_H
-
-#include "autoPtr.H"
-#include "dictionary.H"
-#include "vector.H"
-#include "runTimeSelectionTables.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-/*---------------------------------------------------------------------------*\
-                      Class implicitFunction Declaration
-\*---------------------------------------------------------------------------*/
-
-class implicitFunction
-{
-    // Private Member Functions
-
-        //- No copy construct
-        implicitFunction(const implicitFunction&) = delete;
-
-        //- No copy assignment
-        void operator=(const implicitFunction&) = delete;
-
-
-public:
-
-    //- Runtime type information
-    TypeName("implicitFunction");
-
-    //- Declare run-time constructor selection table
-    declareRunTimeSelectionTable
-    (
-        autoPtr,
-        implicitFunction,
-        dict,
-        (
-            const dictionary& dict
-        ),
-        (dict)
-    );
-
-    //- Constructor
-    implicitFunction();
-
-    //- Return a reference to the selected implicitFunction
-    static autoPtr<implicitFunction> New
-    (
-        const word& implicitFunctionType,
-        const dictionary& dict
-    );
-
-    //- Destructor
-    virtual ~implicitFunction() = default;
-
-
-    // Member Functions
-
-        virtual scalar value(const vector& p) const
-        {
-            return GREAT;
-        }
-
-        virtual vector grad(const vector& p) const
-        {
-            return vector::max;
-        }
-
-        virtual scalar distanceToSurfaces(const vector& p) const
-        {
-            return GREAT;
-        }
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/VoF/implicitFunctions/paraboloid/paraboloidImplicitFunction.C b/src/VoF/implicitFunctions/paraboloid/paraboloidImplicitFunction.C
deleted file mode 100644
index 48d31a0f..00000000
--- a/src/VoF/implicitFunctions/paraboloid/paraboloidImplicitFunction.C
+++ /dev/null
@@ -1,70 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2019 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-                            | Copyright (C) 2019 DLR
--------------------------------------------------------------------------------
-
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "paraboloidImplicitFunction.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-namespace Foam
-{
-    namespace implicitFunctions
-    {
-        defineTypeNameAndDebug(paraboloidImplicitFunction, 0);
-        addToRunTimeSelectionTable
-        (
-            implicitFunction,
-            paraboloidImplicitFunction,
-            dict
-        );
-    }
-
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::implicitFunctions::paraboloidImplicitFunction::paraboloidImplicitFunction
-(
-    const vector& coeffs
-)
-:
-    coeffs_(coeffs)
-{}
-
-
-Foam::implicitFunctions::paraboloidImplicitFunction::paraboloidImplicitFunction
-(
-    const dictionary& dict
-)
-:
-    coeffs_(dict.get<vector>("coeffs"))
-{}
-
-
-// ************************************************************************* //
diff --git a/src/VoF/implicitFunctions/paraboloid/paraboloidImplicitFunction.H b/src/VoF/implicitFunctions/paraboloid/paraboloidImplicitFunction.H
deleted file mode 100644
index ba1a4e99..00000000
--- a/src/VoF/implicitFunctions/paraboloid/paraboloidImplicitFunction.H
+++ /dev/null
@@ -1,129 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2019 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-                            | Copyright (C) 2019 DLR
--------------------------------------------------------------------------------
-
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Class
-    Foam::implicitFunctions::paraboloidImplicitFunction
-
-Description
-    creates a paraboloid
-
-    Original code supplied by Henning Scheufler, DLR (2019)
-
-SourceFiles
-    paraboloidImplicitFunction.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef implicitFunction_paraboloidImplicitFunction_H
-#define implicitFunction_paraboloidImplicitFunction_H
-
-#include "implicitFunction.H"
-#include "mathematicalConstants.H"
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace implicitFunctions
-{
-
-/*---------------------------------------------------------------------------*\
-                 class paraboloidImplicitFunction Declaration
-\*---------------------------------------------------------------------------*/
-
-class paraboloidImplicitFunction
-:
-    public implicitFunction
-{
-private:
-
-    // Private Member Data
-
-        //- Coefficients of ax^2 + bx*y + cy^2
-        vector coeffs_;
-
-
-    // Private Member Functions
-
-        //- No copy construct
-        paraboloidImplicitFunction(const paraboloidImplicitFunction&);
-
-        //- No bitwise assignment
-        void operator=(const paraboloidImplicitFunction&);
-
-
-public:
-
-    //- Runtime type information
-    TypeName("paraboloid");
-
-
-    // Constructors
-
-        //- Construct from components
-        paraboloidImplicitFunction(const vector& coeffs);
-
-        //- Construct from dictionary
-        paraboloidImplicitFunction(const dictionary& dict);
-
-
-    //- Destructor
-    virtual ~paraboloidImplicitFunction() = default;
-
-    virtual scalar value(const vector& p) const
-    {
-        return
-            coeffs_.x()*sqr(p.x())
-          + coeffs_.y()*p.x()*p.y()
-          + coeffs_.z()*sqr(p.y())
-          - p.z();
-    }
-
-    virtual vector grad(const vector& p) const
-    {
-        NotImplemented;
-        return vector::zero;
-    }
-
-    virtual scalar distanceToSurfaces(const vector& p) const
-    {
-        NotImplemented;
-        return 0;
-    }
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace implicitFunctions
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/VoF/implicitFunctions/plane/planeImplicitFunction.C b/src/VoF/implicitFunctions/plane/planeImplicitFunction.C
deleted file mode 100644
index 1b05a8d5..00000000
--- a/src/VoF/implicitFunctions/plane/planeImplicitFunction.C
+++ /dev/null
@@ -1,74 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2019 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-                            | Copyright (C) 2019 DLR
--------------------------------------------------------------------------------
-
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "planeImplicitFunction.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-namespace Foam
-{
-    namespace implicitFunctions
-    {
-        defineTypeNameAndDebug(planeImplicitFunction, 0);
-        addToRunTimeSelectionTable
-        (
-            implicitFunction,
-            planeImplicitFunction,
-            dict
-        );
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::implicitFunctions::planeImplicitFunction::planeImplicitFunction
-(
-    const vector& origin,
-    const vector& normal
-)
-:
-    origin_(origin),
-    normal_(normal)
-{}
-
-
-Foam::implicitFunctions::planeImplicitFunction::planeImplicitFunction
-(
-    const dictionary& dict
-)
-:
-    origin_(dict.get<vector>("origin")),
-    normal_(dict.get<vector>("normal"))
-{
-    normal_.normalise();
-}
-
-
-// ************************************************************************* //
diff --git a/src/VoF/implicitFunctions/plane/planeImplicitFunction.H b/src/VoF/implicitFunctions/plane/planeImplicitFunction.H
deleted file mode 100644
index 361ee18d..00000000
--- a/src/VoF/implicitFunctions/plane/planeImplicitFunction.H
+++ /dev/null
@@ -1,130 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2019 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-                            | Copyright (C) 2019 DLR
--------------------------------------------------------------------------------
-
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Class
-    Foam::implicitFunctions::planeImplicitFunction
-
-Description
-    creates a plane
-
-    Original code supplied by Henning Scheufler, DLR (2019)
-
-SourceFiles
-    planeImplicitFunction.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef implicitFunction_planeImplicitFunction_H
-#define implicitFunction_planeImplicitFunction_H
-
-#include "implicitFunction.H"
-#include "mathematicalConstants.H"
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace implicitFunctions
-{
-
-/*---------------------------------------------------------------------------*\
-                    Class planeImplicitFunction Declaration
-\*---------------------------------------------------------------------------*/
-
-class planeImplicitFunction
-:
-    public implicitFunction
-{
-private:
-
-    // Private Member Data
-
-        //- ax^2 + bx*y + cy^2
-        //- Reference point
-        vector origin_;
-
-        //- Normal vector
-        vector normal_;
-
-
-    // Private Member Functions
-
-        //- No copy construct
-        planeImplicitFunction(const planeImplicitFunction&);
-
-        //- No assignment
-        void operator=(const planeImplicitFunction&);
-
-
-public:
-
-    //- Runtime type information
-    TypeName("plane");
-
-
-    // Constructors
-
-        //- Construct from components
-        planeImplicitFunction(const vector& origin, const vector& normal);
-
-        //- Construct from dictionary (used by implicitFunctions)
-        planeImplicitFunction(const dictionary& dict);
-
-
-    //- Destructor
-    virtual ~planeImplicitFunction() = default;
-
-
-    virtual scalar value(const vector& p) const
-    {
-        return -normal_ & (origin_ - p);
-    }
-
-    virtual vector grad(const vector& p) const
-    {
-        // normal_ has the length of one
-        return normal_;
-    }
-
-    virtual scalar distanceToSurfaces(const vector& p) const
-    {
-        // normal_ has the length of one
-        return mag((p - origin_) & -normal_);
-    }
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace implicitFunctions
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/VoF/implicitFunctions/sin/sinImplicitFunction.C b/src/VoF/implicitFunctions/sin/sinImplicitFunction.C
deleted file mode 100644
index 425ded51..00000000
--- a/src/VoF/implicitFunctions/sin/sinImplicitFunction.C
+++ /dev/null
@@ -1,86 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2019 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-                            | Copyright (C) 2019 DLR
--------------------------------------------------------------------------------
-
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "sinImplicitFunction.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-namespace Foam
-{
-    namespace implicitFunctions
-    {
-        defineTypeNameAndDebug(sinImplicitFunction, 0);
-        addToRunTimeSelectionTable
-        (
-            implicitFunction,
-            sinImplicitFunction,
-            dict
-        );
-    }
-}
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::implicitFunctions::sinImplicitFunction::sinImplicitFunction
-(
-    const scalar period,
-    const scalar phase,
-    const scalar amplitude,
-    const vector& direction,
-    const vector& up,
-    const vector& origin
-)
-:
-    period_(period),
-    phase_(phase),
-    amplitude_(amplitude),
-    up_(up),
-    direction_(direction),
-    origin_(origin)
-{}
-
-
-Foam::implicitFunctions::sinImplicitFunction::sinImplicitFunction
-(
-    const dictionary& dict
-)
-:
-    period_(dict.get<scalar>("period")),
-    phase_(dict.lookupOrDefault<scalar>("phase",0.0)),
-    amplitude_(dict.get<scalar>("amplitude")),
-    up_(dict.get<vector>("up")),
-    direction_(dict.get<vector>("direction")),
-    origin_(dict.get<vector>("origin"))
-{
-    direction_.normalise();
-    up_.normalise();
-}
-
-
-// ************************************************************************* //
diff --git a/src/VoF/implicitFunctions/sin/sinImplicitFunction.H b/src/VoF/implicitFunctions/sin/sinImplicitFunction.H
deleted file mode 100644
index 977aa1e7..00000000
--- a/src/VoF/implicitFunctions/sin/sinImplicitFunction.H
+++ /dev/null
@@ -1,148 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2019 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-                            | Copyright (C) 2019 DLR
--------------------------------------------------------------------------------
-
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Class
-    Foam::implicitFunctions::sinImplicitFunction
-
-Description
-
-    Original code supplied by Henning Scheufler, DLR (2019)
-
-SourceFiles
-    sinImplicitFunction.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef implicitFunction_sinImplicitFunction_H
-#define implicitFunction_sinImplicitFunction_H
-
-#include "implicitFunction.H"
-#include "mathematicalConstants.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace implicitFunctions
-{
-
-/*---------------------------------------------------------------------------*\
-                     Class sinImplicitFunction Declaration
-\*---------------------------------------------------------------------------*/
-
-class sinImplicitFunction
-:
-    public implicitFunction
-{
-private:
-
-    // Private Member Data
-
-        //- origin point
-        const scalar period_;
-
-        //- Radius
-        const scalar phase_;
-
-        const scalar amplitude_;
-
-        vector up_;
-
-        vector direction_;
-
-        vector origin_;
-
-
-    // Private Member Functions
-
-        //- No copy construct
-        sinImplicitFunction(const sinImplicitFunction&) = delete;
-
-        //- No bitwise assignment
-        void operator=(const sinImplicitFunction&) = delete;
-
-
-public:
-
-    //- Runtime type information
-    TypeName("sin");
-
-
-    // Constructors
-
-        //- Construct from components
-        sinImplicitFunction
-        (
-            const scalar period,
-            const scalar phase,
-            const scalar amplitude,
-            const vector& direction,
-            const vector& up,
-            const vector& origin
-        );
-
-        //- Construct from dictionary (used by implicitFunctions)
-        sinImplicitFunction(const dictionary& dict);
-
-
-    //- Destructor
-    virtual ~sinImplicitFunction() = default;
-
-    virtual scalar value(const vector& p) const
-    {
-        const scalar x = (p - origin_) & direction_;
-        const scalar z = (p - origin_) & -up_;
-
-        return
-            z
-          - amplitude_
-           *Foam::sin(2*constant::mathematical::pi*x/period_ + phase_);
-    }
-
-    virtual vector grad(const vector& p) const
-    {
-        NotImplemented;
-        return vector::zero;
-    }
-
-    virtual scalar distanceToSurfaces(const vector& p) const
-    {
-        NotImplemented;
-        return 0;
-    }
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace implicitFunctions
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/VoF/implicitFunctions/sphere/sphereImplicitFunction.C b/src/VoF/implicitFunctions/sphere/sphereImplicitFunction.C
deleted file mode 100644
index 05d63e46..00000000
--- a/src/VoF/implicitFunctions/sphere/sphereImplicitFunction.C
+++ /dev/null
@@ -1,74 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2019 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-                            | Copyright (C) 2019 DLR
--------------------------------------------------------------------------------
-
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "sphereImplicitFunction.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-namespace Foam
-{
-    namespace implicitFunctions
-    {
-        defineTypeNameAndDebug(sphereImplicitFunction, 0);
-        addToRunTimeSelectionTable
-        (
-            implicitFunction,
-            sphereImplicitFunction,
-            dict
-        );
-    }
-}
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::implicitFunctions::sphereImplicitFunction::sphereImplicitFunction
-(
-    const point& origin,
-    const scalar radius,
-    const scalar scale
-)
-:
-    origin_(origin),
-    radius_(radius),
-    scale_(scale)
-{}
-
-
-Foam::implicitFunctions::sphereImplicitFunction::sphereImplicitFunction
-(
-    const dictionary& dict
-)
-:
-    origin_(dict.get<point>("origin")),
-    radius_(dict.get<scalar>("radius")),
-    scale_(dict.lookupOrDefault<scalar>("scale" ,1))
-{}
-
-
-// ************************************************************************* //
diff --git a/src/VoF/implicitFunctions/sphere/sphereImplicitFunction.H b/src/VoF/implicitFunctions/sphere/sphereImplicitFunction.H
deleted file mode 100644
index 964d2fba..00000000
--- a/src/VoF/implicitFunctions/sphere/sphereImplicitFunction.H
+++ /dev/null
@@ -1,132 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2019 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-                            | Copyright (C) 2019 DLR
--------------------------------------------------------------------------------
-
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Class
-    Foam::implicitFunctions::sphereImplicitFunction
-
-Description
-    Creates a sphere
-
-    Original code supplied by Henning Scheufler, DLR (2019)
-
-SourceFiles
-    sphereImplicitFunction.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef implicitFunction_sphereImplicitFunction_H
-#define implicitFunction_sphereImplicitFunction_H
-
-#include "implicitFunction.H"
-#include "point.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace implicitFunctions
-{
-
-/*---------------------------------------------------------------------------*\
-                   Class sphereImplicitFunction Declaration
-\*---------------------------------------------------------------------------*/
-
-class sphereImplicitFunction
-:
-    public implicitFunction
-{
-    // Private Member Data
-
-        //- Origin point
-        const point origin_;
-
-        //- Radius
-        const scalar radius_;
-
-        const scalar scale_;
-
-
-    // Private Member Functions
-
-        //- No copy construct
-        sphereImplicitFunction(const sphereImplicitFunction&);
-
-        //- No copy assignment
-        void operator=(const sphereImplicitFunction&) = delete;
-
-
-public:
-
-    //- Runtime type information
-    TypeName("sphere");
-
-
-    // Constructors
-
-        //- Construct from components
-        sphereImplicitFunction
-        (
-            const point&,
-            const scalar radius,
-            const scalar scale
-        );
-
-        //- Construct from dictionary
-        sphereImplicitFunction(const dictionary& dict);
-
-    //- Destructor
-    virtual ~sphereImplicitFunction() = default;
-
-
-    // Member Functions
-
-        virtual scalar value(const vector& p) const
-        {
-            return (-mag(p - origin_) + radius_)*scale_;
-        }
-
-        virtual vector grad(const vector& p) const
-        {
-            return (origin_ - p)*scale_;
-        }
-
-        virtual scalar distanceToSurfaces(const vector& p) const
-        {
-            return mag(mag(p-origin_) - radius_)*scale_;
-        }
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace implicitFunctions
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/VoF/markInterfaceRegion/markInterfaceRegion.C b/src/VoF/markInterfaceRegion/markInterfaceRegion.C
index ea90f6e7..b488232b 100644
--- a/src/VoF/markInterfaceRegion/markInterfaceRegion.C
+++ b/src/VoF/markInterfaceRegion/markInterfaceRegion.C
@@ -28,7 +28,7 @@ License
 #include "wedgePolyPatch.H"
 #include "indexedOctree.H"
 #include "treeDataPoint.H"
-#include "alphaContactAngleFvPatchScalarField.H"
+#include "alphaContactAngleTwoPhaseFvPatchScalarField.H"
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
diff --git a/src/VoF/multiDimPolyFitter/leastSquareGrad.C b/src/VoF/multiDimPolyFitter/leastSquareGrad.C
deleted file mode 100644
index cb4a1116..00000000
--- a/src/VoF/multiDimPolyFitter/leastSquareGrad.C
+++ /dev/null
@@ -1,178 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2019-2019 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-                            | Copyright (C) 2019-2019 DLR
--------------------------------------------------------------------------------
-
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "leastSquareGrad.H"
-
-#include "emptyPolyPatch.H"
-#include "processorPolyPatch.H"
-#include "wedgePolyPatch.H"
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-template<class T>
-Foam::leastSquareGrad<T>::leastSquareGrad
-(
-    word functionName,
-    Vector<label> geomDir
-)
-:
-    polyFitter_(functionName,geomDir),
-    geomDir_(geomDir),
-    nDims_(0)
-{
-    // compute number of dimensions
-    forAll(geomDir_,i)
-    {
-        if(geomDir_[i] == 1)
-        {
-            nDims_++;
-        }
-    }
-
-}
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-template<class T>
-typename Foam::outerProduct<Foam::vector, T>::type Foam::leastSquareGrad<T>::grad
-(
-    const List<vector>& positions,
-    const List<T>& listValue
-)
-{
-    typedef typename outerProduct<vector, T>::type GradType;
-
-    List<T> fitData = polyFitter_.fitData
-    (
-        positions,
-        listValue
-    );
-
-    label dimCounter = 0;
-    GradType grad = Zero;
-
-    if(nDims_ == 3)
-    {
-        grad = GradType(fitData[1],fitData[2],fitData[3]);
-    }
-    else
-    {
-        forAll(geomDir_,i)
-        {
-            if(geomDir_[i] == 1)
-            {
-                grad[i] = fitData[dimCounter+1];
-                dimCounter++;
-            }
-        }
-    }
-  
-
-    return grad;
-}
-
-namespace Foam // needed g++ bug
-{
-    template<>
-    tensor leastSquareGrad<vector>::grad
-    (
-        const List<vector>& positions,
-        const List<vector>& listValue
-    )
-    {
-
-        List<vector> fitData = polyFitter_.fitData
-        (
-            positions,
-            listValue
-        );
-
-        label dimCounter = 0;
-        tensor t = Zero;
-
-        if(nDims_ == 3)
-        {
-            t = tensor(fitData[1],fitData[2],fitData[3]);
-        }
-        else
-        {
-            forAll(geomDir_,i)
-            {
-                if(geomDir_[i] == 1)
-                {
-                    const vector& fitVec = fitData[dimCounter+1];
-                    forAll(fitVec,j)
-                    {
-                        t[i*3 + j] = fitVec[j];
-                    }
-                    dimCounter++;
-                }
-            }
-        }
-
-
-        return t;
-    }
-}
-
-template<class T>
-Foam::Map < typename Foam::outerProduct<Foam::vector, T>::type >  Foam::leastSquareGrad<T>::grad
-(
-    const Map <List<vector> >& positions,
-    const Map <List<T> >& listValue
-)
-{
-    typedef typename outerProduct<vector, T>::type GradType;
-
-    Map< GradType > gradMap(positions.size());
-    Map <List<vector> >::const_iterator iterPos = positions.cbegin();
-    typename Map <List<T> >::const_iterator iterValue = listValue.cbegin();
-
-    while(iterPos != positions.cend())
-    {
-        const List<vector>& positions = iterPos();
-        const List<T>& listValue = iterValue();
-
-        GradType grad = this->grad(positions,listValue);
-
-        gradMap.insert(iterPos.key(),grad);
-
-        ++iterPos;
-        ++iterValue;
-
-    }
-
-    return gradMap;
-}
-
-template class Foam::leastSquareGrad<Foam::scalar>;
-template class Foam::leastSquareGrad<Foam::vector>;
-
-
-// ************************************************************************* //
diff --git a/src/VoF/multiDimPolyFitter/leastSquareGrad.H b/src/VoF/multiDimPolyFitter/leastSquareGrad.H
deleted file mode 100644
index 986e05eb..00000000
--- a/src/VoF/multiDimPolyFitter/leastSquareGrad.H
+++ /dev/null
@@ -1,112 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2019-2019 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-                            | Copyright (C) 2019-2019 DLR
--------------------------------------------------------------------------------
-
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-    
-Class
-    Foam::leastSquareGrad
-
-Description
-    Estimates the gradient with a least square scheme in a cell
-
-    Original code supplied by Henning Scheufler, DLR (2019)
-
-SourceFiles
-    leastSquareGrad.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef leastSquareGrad_H
-#define leastSquareGrad_H
-
-#include "fvMesh.H"
-#include "volFields.H"
-#include "surfaceFields.H"
-#include "OFstream.H"
-
-
-
-#include "multiDimPolyFitter.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-/*---------------------------------------------------------------------------*\
-                        Class leastSquareGrad Declaration
-\*---------------------------------------------------------------------------*/
-template<class T>
-class leastSquareGrad
-{
-
-
-
-private:
-    // Private data
-    multiDimPolyFitter<T> polyFitter_;
-
-    Vector<label> geomDir_;
-
-    label nDims_;
-
-
-public:
-
-    // Constructors
-
-        //- Construct from fvMesh and globalIndex
-        leastSquareGrad(word functionName,const Vector<label> geomDir);
-
-
-    // Member functions
-
-        //- returns the gradient of the cell
-        typename outerProduct<vector, T>::type grad
-        (
-            const List<vector>& positions,
-            const List<T>& listValue
-        );
-
-        Map<typename outerProduct<vector, T>::type > grad
-        (
-            const Map <List<vector> >& positions,
-            const Map <List<T> >& listValue
-        );
-
-
-
-
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/VoF/multiDimPolyFitter/leastSquareInterpolate.C b/src/VoF/multiDimPolyFitter/leastSquareInterpolate.C
deleted file mode 100644
index 04c94ee1..00000000
--- a/src/VoF/multiDimPolyFitter/leastSquareInterpolate.C
+++ /dev/null
@@ -1,95 +0,0 @@
-/*---------------------------------------------------------------------------*\
-            Copyright (c) 2017-2019, German Aerospace Center (DLR)
--------------------------------------------------------------------------------
-License
-    This file is part of the VoFLibrary source code library, which is an
-    unofficial extension to OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "leastSquareInterpolate.H"
-
-#include "emptyPolyPatch.H"
-#include "processorPolyPatch.H"
-#include "wedgePolyPatch.H"
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-template<class T>
-Foam::leastSquareInterpolate<T>::leastSquareInterpolate
-(
-    word functionName,
-    Vector<label> geomDir
-)
-:
-    polyFitter_(functionName,geomDir)
-{
-
-}
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-template<class T>
-T Foam::leastSquareInterpolate<T>::interpolate
-(
-    const List<vector>& positions,
-    const List<T>& listValue
-)
-{
-    List<T> fitData = polyFitter_.fitData
-    (
-        positions,
-        listValue
-    );
-
-    return fitData[0];
-}
-
-
-template<class T>
-Foam::Map < T >  Foam::leastSquareInterpolate<T>::interpolate
-(
-    const Map <List<vector> >& positions,
-    const Map <List<T> >& listValue
-)
-{
-    Map< T > interpolMap(positions.size());
-    Map <List<vector> >::const_iterator iterPos = positions.cbegin();
-    typename Map <List<T> >::const_iterator iterValue = listValue.cbegin();
-
-    while(iterPos != positions.cend())
-    {
-        const List<vector>& positions = iterPos();
-        const List<T>& listValue = iterValue();
-
-        const T value = interpolate(positions,listValue);
-
-        interpolMap.insert(iterPos.key(),value);
-
-        ++iterPos;
-        ++iterValue;
-
-    }
-
-    return interpolMap;
-}
-
-template class Foam::leastSquareInterpolate<Foam::scalar>;
-template class Foam::leastSquareInterpolate<Foam::vector>;
-
-
-// ************************************************************************* //
diff --git a/src/VoF/multiDimPolyFitter/leastSquareInterpolate.H b/src/VoF/multiDimPolyFitter/leastSquareInterpolate.H
deleted file mode 100644
index 5db6c247..00000000
--- a/src/VoF/multiDimPolyFitter/leastSquareInterpolate.H
+++ /dev/null
@@ -1,107 +0,0 @@
-/*---------------------------------------------------------------------------*\
-            Copyright (c) 2017-2019, German Aerospace Center (DLR)
--------------------------------------------------------------------------------
-License
-    This file is part of the VoFLibrary source code library, which is an
-    unofficial extension to OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Class
-    Foam::leastSquareInterpolate
-
-Description
-    Least square interpolation scheme
-
-Author
-    Henning Scheufler, DLR, all rights reserved.
-
-SourceFiles
-    leastSquareInterpolate.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef leastSquareInterpolate_H
-#define leastSquareInterpolate_H
-
-#include "fvMesh.H"
-#include "volFields.H"
-#include "surfaceFields.H"
-#include "OFstream.H"
-
-
-
-#include "multiDimPolyFitter.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-/*---------------------------------------------------------------------------*\
-                        Class leastSquareInterpolate Declaration
-\*---------------------------------------------------------------------------*/
-template<class T>
-class leastSquareInterpolate
-{
-
-
-
-private:
-    // Private data
-    multiDimPolyFitter<T> polyFitter_;
-
-    Vector<label> geomDir_;
-
-    label nDims_;
-
-
-public:
-
-    // Constructors
-
-        //- Construct from fvMesh and globalIndex
-        leastSquareInterpolate(word functionName,const Vector<label> geomDir);
-
-
-    // Member functions
-
-        //- returns the gradient of the cell
-        T interpolate
-        (
-            const List<vector>& positions,
-            const List<T>& listValue
-        );
-
-        Map< T > interpolate
-        (
-            const Map <List<vector> >& positions,
-            const Map <List<T> >& listValue
-        );
-
-
-
-
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/VoF/multiDimPolyFitter/multiDimPolyFitter.C b/src/VoF/multiDimPolyFitter/multiDimPolyFitter.C
index fa3455bf..54092cc3 100644
--- a/src/VoF/multiDimPolyFitter/multiDimPolyFitter.C
+++ b/src/VoF/multiDimPolyFitter/multiDimPolyFitter.C
@@ -49,7 +49,7 @@ void Foam::multiDimPolyFitter<T>::resetMatrix()
 {
     for (label i=0;i<A_.size();i++)
     {
-        A_.v()[i] = Zero;
+        A_.data()[i] = Zero;
     }
     A_.source() = Zero;
 }
diff --git a/src/VoF/multiDimPolyFitter/multiDimPolyFitter.H b/src/VoF/multiDimPolyFitter/multiDimPolyFitter.H
deleted file mode 100644
index d5bb845b..00000000
--- a/src/VoF/multiDimPolyFitter/multiDimPolyFitter.H
+++ /dev/null
@@ -1,169 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2019 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-                            | Copyright (C) 2019 DLR
--------------------------------------------------------------------------------
-
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Class
-    Foam::multiDimPolyFitter
-
-Description
-    Fit a polynominal function with the help of multiDimPolyFunction
-
-    Original code supplied by Henning Scheufler, DLR (2019)
-
-SourceFiles
-    multiDimPolyFitter.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef multiDimPolyFitter_H
-#define multiDimPolyFitter_H
-
-#include "simpleMatrix.H"
-#include "multiDimPolyFunctions.H"
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-/*---------------------------------------------------------------------------*\
-                        Class multiDimPolyFitter Declaration
-\*---------------------------------------------------------------------------*/
-
-template<class T>
-class multiDimPolyFitter
-{
-    // Private data
-
-        //- Mesh whose cells and faces to cut at their intersection with an
-        //-  isosurface.
-        autoPtr<multiDimPolyFunctions> polyFunc_;
-
-        simpleMatrix<T> A_;
-
-
-public:
-
-    //- Construct from number of terms
-    multiDimPolyFitter
-    (
-        const word polyFunctionName,
-        const Vector<label> geomDirs
-    );
-
-    void resetMatrix();
-
-    label nCoeffs() const
-    {
-        return A_.n();
-    }
-
-    void fillMatrix
-    (
-        const scalarField& polyTerms,
-        const T& value
-    );
-
-    void fillMatrix
-    (
-        const scalarField& polyTerms,
-        const T& value,
-        const scalar weight
-    );
-
-    void fillMatrix
-    (
-        const scalarField& polyTerms,
-        scalarSymmetricSquareMatrix& A
-    );
-
-    //- Fit data
-    Field<T> fitData
-    (
-        const List<scalarField>& listPolyTerms,
-        const List<T>& listValue
-    );
-
-    //- Fit data
-    Field<T> fitData
-    (
-        const List<scalarField>& listPolyTerms,
-        const List<T>& listValue,
-        const List<scalar>& listWeight
-    );
-
-    //- Compute inverse
-    scalarSymmetricSquareMatrix computeInverse
-    (
-        const List<scalarField>& listPolyTerms
-    );
-
-    //- Compute source
-    Field<T> computeMatrixSource
-    (
-        const List<scalarField>& listPolyTerms,
-        const List<T>& listValue
-    );
-
-    //- Fit data
-    Field<T> fitData
-    (
-        const List<vector>& positions,
-        const List<T>& listValue
-    );
-
-    //- Fit data
-    Field<T> fitData
-    (
-        const List<vector>& positions,
-        const List<T>& listValue,
-        const List<scalar>& listWeight
-    );
-
-    //- Compute inverse
-    scalarSymmetricSquareMatrix computeInverse
-    (
-        const List<vector>& positions
-    );
-
-    //- Compute source
-    Field<T> computeMatrixSource
-    (
-        const List<vector>& positions,
-        const List<T>& listValue
-    );
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/VoF/multiDimPolyFitter/multiDimPolyFunctions/multiDimPolyFunctions.C b/src/VoF/multiDimPolyFitter/multiDimPolyFunctions/multiDimPolyFunctions.C
index a3e92fad..fffcf2ad 100644
--- a/src/VoF/multiDimPolyFitter/multiDimPolyFunctions/multiDimPolyFunctions.C
+++ b/src/VoF/multiDimPolyFitter/multiDimPolyFunctions/multiDimPolyFunctions.C
@@ -43,10 +43,9 @@ Foam::autoPtr<Foam::multiDimPolyFunctions> Foam::multiDimPolyFunctions::New
     const Vector<label> dirs
 )
 {
-    wordConstructorTable::iterator cstrIter =
-        wordConstructorTablePtr_->find(multiDimPolyFunctionsType);
+    auto* ctorPtr = wordConstructorTable(multiDimPolyFunctionsType);
 
-    if (!cstrIter.found())
+    if (!ctorPtr)
     {
         FatalErrorInFunction
             << "Unknown multiDimPolyFunctions type " << multiDimPolyFunctionsType
@@ -56,7 +55,7 @@ Foam::autoPtr<Foam::multiDimPolyFunctions> Foam::multiDimPolyFunctions::New
             << exit(FatalError);
     }
 
-    return autoPtr<multiDimPolyFunctions>(cstrIter()( dirs));
+    return autoPtr<multiDimPolyFunctions>(ctorPtr(dirs));
 }
 
 
diff --git a/src/VoF/multiDimPolyFitter/multiDimPolyFunctions/multiDimPolyFunctions.H b/src/VoF/multiDimPolyFitter/multiDimPolyFunctions/multiDimPolyFunctions.H
deleted file mode 100644
index 9b845b00..00000000
--- a/src/VoF/multiDimPolyFitter/multiDimPolyFunctions/multiDimPolyFunctions.H
+++ /dev/null
@@ -1,141 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2019-2019 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-                            | Copyright (C) 2019-2019 DLR
--------------------------------------------------------------------------------
-
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Class
-    Foam::multiDimPolyFunctions
-
-Description
-    base class for polynomial functions
-
-    Original code supplied by Henning Scheufler, DLR (2019)
-
-SourceFiles
-    multiDimPolyFunctions.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef multiDimPolyFunctions_H
-#define multiDimPolyFunctions_H
-
-
-#include "FixedList.H"
-#include "vector.H"
-#include "vector2D.H"
-#include "scalarField.H"
-#include "runTimeSelectionTables.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-/*---------------------------------------------------------------------------*\
-                        Class multiDimPolyFunctions Declaration
-\*---------------------------------------------------------------------------*/
-
-class multiDimPolyFunctions
-{
-
-protected:
-    // Private data
-
-    // number of polynominal term
-    label nTerms_;
-
-    scalarField coeffs_;
-
-    const Vector<label> geomDir_;
-
-    vector geomCorrection_;
-
-    scalarField termValues_;
-
-
-
-public:
-
-    //- Runtime type information
-    TypeName("multiDimPolyFunctions");
-
-    // Declare run-time constructor selection table
-
-    // For the dictionary constructor
-    declareRunTimeSelectionTable
-    (
-        autoPtr,
-        multiDimPolyFunctions,
-        word,
-        (
-            const Vector<label> dirs
-        ),
-        (dirs)
-    );
-
-
- 
-
-
-    // Constructors
-
-    multiDimPolyFunctions(const Vector<label> dirs);
-
-     // Selectors
-    //- Return a reference to the selected multiDimPolyFunctions
-    static autoPtr<multiDimPolyFunctions> New
-    (
-        const word& multiDimPolyFunctionsType,
-        const Vector<label> dirs
-    );
-
-
-    //- Destructor
-    virtual ~multiDimPolyFunctions();
-
-    virtual scalar value(const vector& vec) = 0;
-
-    virtual const scalarField& termValues(const vector& vec) = 0;
-
-    label& nTerms()
-    {
-        return nTerms_;
-    }
-
-    scalarField& coeffs()
-    {
-        return coeffs_;
-    }
-
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/VoF/multiDimPolyFitter/multiDimPolyFunctions/polyDegree1.C b/src/VoF/multiDimPolyFitter/multiDimPolyFunctions/polyDegree1.C
deleted file mode 100644
index 458f3a10..00000000
--- a/src/VoF/multiDimPolyFitter/multiDimPolyFunctions/polyDegree1.C
+++ /dev/null
@@ -1,97 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2019-2019 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-                            | Copyright (C) 2019-2019 DLR
--------------------------------------------------------------------------------
-
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "polyDegree1.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-defineTypeNameAndDebug(polyDegree1, 0);
-addToRunTimeSelectionTable(multiDimPolyFunctions, polyDegree1, word);
-
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::polyDegree1::polyDegree1
-(
-    const Vector<label> dirs
-)
-: multiDimPolyFunctions(dirs)
-{
-    nTerms_ = 1;
-    forAll(geomDir_,i)
-    {
-        if(geomDir_[i] == 1)
-        {
-            nTerms_ += 1;
-        }
-    }
-    coeffs_.resize(nTerms_,0);
-    termValues_.resize(nTerms_,0);
-}
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-
-Foam::scalar Foam::polyDegree1::value(const vector& vec)
-{
-    // size has to be 4
-    scalar value = coeffs_[0];
-    forAll(geomDir_,i)
-    {
-        if(geomDir_[i] == 1)
-        {
-            value += coeffs_[i+1]*vec[i];
-        }
-    }
-
-    return value;
-}
-
-const Foam::scalarField& Foam::polyDegree1::termValues(const vector& vec)
-{
-    termValues_[0]=1;
-    label dimCounter = 0;
-    forAll(geomDir_,i)
-    {
-        if(geomDir_[i] == 1)
-        {
-            dimCounter++;
-            termValues_[dimCounter] = vec[i];
-        }
-    }
-
-    return termValues_;
-}
-
-// ************************************************************************* //
diff --git a/src/VoF/multiDimPolyFitter/multiDimPolyFunctions/polyDegree1.H b/src/VoF/multiDimPolyFitter/multiDimPolyFunctions/polyDegree1.H
deleted file mode 100644
index 4bb0f029..00000000
--- a/src/VoF/multiDimPolyFitter/multiDimPolyFunctions/polyDegree1.H
+++ /dev/null
@@ -1,99 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2019-2019 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-                            | Copyright (C) 2019-2019 DLR
--------------------------------------------------------------------------------
-
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-    
-Class
-    Foam::polyDegree1
-
-Description
-    first degree polynominal function
-
-    c0 + c1*x + c2*y + c3*z 
-
-    Original code supplied by Henning Scheufler, DLR (2019)
-
-SourceFiles
-    polyDegree1.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef polyDegree1_H
-#define polyDegree1_H
-
-
-#include "FixedList.H"
-#include "vector.H"
-#include "vector2D.H"
-#include "scalarField.H"
-
-#include "multiDimPolyFunctions.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-/*---------------------------------------------------------------------------*\
-                        Class polyDegree1 Declaration
-\*---------------------------------------------------------------------------*/
-
-class polyDegree1
-:
-    public multiDimPolyFunctions
-{
-
-
-
-private:
-    // Private data
-
-
-public:
-
-
-    //- Runtime type information
-    TypeName("polyDegree1");
-    // Constructors
-
-    //- Construct from nTerms
-    polyDegree1(const Vector<label> dirs);
-
-    //virtual ~polyDegree1();
-
-    virtual scalar value(const vector& vec);
-
-    virtual const scalarField& termValues(const vector& vec);
-
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/VoF/multiDimPolyFitter/multiDimPolyFunctions/polyDegree2.C b/src/VoF/multiDimPolyFitter/multiDimPolyFunctions/polyDegree2.C
deleted file mode 100644
index 6ed8150e..00000000
--- a/src/VoF/multiDimPolyFitter/multiDimPolyFunctions/polyDegree2.C
+++ /dev/null
@@ -1,144 +0,0 @@
-/*---------------------------------------------------------------------------*\
-            Copyright (c) 2017-2019, German Aerospace Center (DLR)
--------------------------------------------------------------------------------
-License
-    This file is part of the VoFLibrary source code library, which is an
-    unofficial extension to OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "polyDegree2.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-defineTypeNameAndDebug(polyDegree2, 0);
-addToRunTimeSelectionTable(multiDimPolyFunctions, polyDegree2, word);
-
-}
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::polyDegree2::polyDegree2
-(
-    const Vector<label> dirs
-)
-: multiDimPolyFunctions(dirs),
-nDims_(0)
-{
-
-    nTerms_ = 1;
-    forAll(geomDir_,i)
-    {
-        if(geomDir_[i] == 1)
-        {
-            nTerms_ += 2; // without mixed terms
-            nDims_++;
-        }
-    }
-    // compute the mixed terms
-    if(nDims_ == 1)
-    {
-        nTerms_ += 0; // 1 dim no mixed terms
-    }
-    else if(nDims_ == 2)
-    {
-        nTerms_ += 1; // 2 dim 1 mixed term
-    }
-    else if(nDims_ == 3)
-    {
-        nTerms_ += 3; // 3 dim 3 mixed terms
-    }
-    coeffs_.resize(nTerms_,0);
-    termValues_.resize(nTerms_,0);
-
-}
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-// Foam::scalar Foam::polyDegree2::value(const vector2D& vec)
-// {
-//     // size has to be 3
-//     return coeffs_[0] + coeffs_[1]*vec.x() + coeffs_[2]*vec.y();
-// }
-
-Foam::scalar Foam::polyDegree2::value(const vector& vec)
-{
-    // size has to be 4
-    notImplemented("polyDegree2::value is not implemented");
-    return coeffs_[0] + coeffs_[1]*vec.x() + coeffs_[2]*vec.y() + coeffs_[3]*vec.y();
-}
-
-// Foam::scalarField Foam::polyDegree2::termValues(const vector2D& vec)
-// {
-//     // size has to be 3
-//     scalarField termVal(3,0);
-//     termVal[0]=1;
-//     termVal[1]=vec.x();
-//     termVal[2]=vec.y();
-//     return termVal;
-// }
-
-const Foam::scalarField& Foam::polyDegree2::termValues(const vector& vec)
-{
-    // c0 + c1*x + c2*y + c3*z + c4*x^2 + c5*y^2 + c6*z^2 + c7*x*y  + c8*x*z + c9*y*z
-    termValues_[0]=1;
-    label dimCounter = 0;
-    forAll(geomDir_,i)
-    {
-        if(geomDir_[i] == 1)
-        {
-            dimCounter++;
-            termValues_[dimCounter] = vec[i];
-            termValues_[dimCounter + nDims_] = vec[i]*vec[i];
-        }
-    }
-
-    // account for mixed terms
-    // 1 dim do nothing
-    if(nDims_ == 3)
-    {
-        termValues_[7] = vec.x()*vec.y();
-        termValues_[8] = vec.x()*vec.z();
-        termValues_[9] = vec.y()*vec.z();
-    }
-    else if(nDims_ == 2)
-    {
-
-        bool firstDir = true;
-        forAll(geomDir_,i)
-        {
-            if(geomDir_[i] == 1)
-            {
-                if(firstDir)
-                {
-                    termValues_[5] = vec[i];
-                    firstDir = false;
-                }
-                else
-                {
-                    termValues_[5] *= vec[i];
-                }
-            }
-        }
-    }
-
-    return termValues_;
-}
-
-// ************************************************************************* //
diff --git a/src/VoF/multiDimPolyFitter/multiDimPolyFunctions/polyDegree2.H b/src/VoF/multiDimPolyFitter/multiDimPolyFunctions/polyDegree2.H
deleted file mode 100644
index b5f31f16..00000000
--- a/src/VoF/multiDimPolyFitter/multiDimPolyFunctions/polyDegree2.H
+++ /dev/null
@@ -1,96 +0,0 @@
-/*---------------------------------------------------------------------------*\
-            Copyright (c) 2017-2019, German Aerospace Center (DLR)
--------------------------------------------------------------------------------
-License
-    This file is part of the VoFLibrary source code library, which is an
-    unofficial extension to OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Class
-    Foam::polyDegree2
-
-Description
-    second degree polynominal function
-
-    c0 + c1*x + c2*y + c3*z + c4*x^2 + c5*y^2 + c6*z^2 + c7*x*y  + c8*x*z + c9*y*z
-
-Author
-    Henning Scheufler, DLR, all rights reserved.
-
-SourceFiles
-    polyDegree2.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef polyDegree2_H
-#define polyDegree2_H
-
-
-#include "FixedList.H"
-#include "vector.H"
-#include "vector2D.H"
-#include "scalarField.H"
-
-#include "multiDimPolyFunctions.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-/*---------------------------------------------------------------------------*\
-                        Class polyDegree2 Declaration
-\*---------------------------------------------------------------------------*/
-
-class polyDegree2
-:
-    public multiDimPolyFunctions
-{
-
-
-
-private:
-    // Private data
-
-    // number of polynominal term
-    label nDims_;
-
-
-public:
-
-    // Constructors
-    //- Runtime type information
-    TypeName("polyDegree2");
-
-    //- Construct from nTerms
-    polyDegree2(const Vector<label> dirs);
-
-    //virtual ~polyDegree2();
-
-    virtual scalar value(const vector& vec);
-
-    virtual const scalarField& termValues(const vector& vec);
-
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/VoF/reconstructedDistanceFunction/reconstructedDistanceFunction.C b/src/VoF/reconstructedDistanceFunction/reconstructedDistanceFunction.C
index a407acf6..32124d24 100644
--- a/src/VoF/reconstructedDistanceFunction/reconstructedDistanceFunction.C
+++ b/src/VoF/reconstructedDistanceFunction/reconstructedDistanceFunction.C
@@ -28,7 +28,7 @@ License
 #include "wedgePolyPatch.H"
 #include "indexedOctree.H"
 #include "treeDataPoint.H"
-#include "alphaContactAngleFvPatchScalarField.H"
+#include "alphaContactAngleTwoPhaseFvPatchScalarField.H"
 
 namespace Foam
 {
@@ -693,12 +693,12 @@ void Foam::reconstructedDistanceFunction::updateContactAngle
 
     forAll(boundary, patchi)
     {
-        if (isA<alphaContactAngleFvPatchScalarField>(abf[patchi]))
+        if (isA<alphaContactAngleTwoPhaseFvPatchScalarField>(abf[patchi]))
         {
-            alphaContactAngleFvPatchScalarField& acap =
-                const_cast<alphaContactAngleFvPatchScalarField&>
+            alphaContactAngleTwoPhaseFvPatchScalarField& acap =
+                const_cast<alphaContactAngleTwoPhaseFvPatchScalarField&>
                 (
-                    refCast<const alphaContactAngleFvPatchScalarField>
+                    refCast<const alphaContactAngleTwoPhaseFvPatchScalarField>
                     (
                         abf[patchi]
                     )
@@ -709,8 +709,8 @@ void Foam::reconstructedDistanceFunction::updateContactAngle
             (
                 convertToRad*acap.theta(U.boundaryField()[patchi],nHatp)
             );
-            scalarField projDist = acap.patch().nf() & acap.patch().delta();
-            scalarField diff = projDist-(1/acap.patch().deltaCoeffs());
+            scalarField projDist(acap.patch().nf() & acap.patch().delta());
+            scalarField diff(projDist-(1/acap.patch().deltaCoeffs()));
 
             RDFbf[patchi] = projDist*cos(theta)
                          +  RDFbf[patchi].patchInternalField();
diff --git a/src/VoF/reconstructionSchemes/isoSchemes/isoAlpha/isoAlpha.C b/src/VoF/reconstructionSchemes/isoSchemes/isoAlpha/isoAlpha.C
index 877b0145..8222ef6f 100644
--- a/src/VoF/reconstructionSchemes/isoSchemes/isoAlpha/isoAlpha.C
+++ b/src/VoF/reconstructionSchemes/isoSchemes/isoAlpha/isoAlpha.C
@@ -28,6 +28,7 @@ License
 #include "isoAlpha.H"
 #include "addToRunTimeSelectionTable.H"
 #include "cutCellPLIC.H"
+#include "profiling.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -76,6 +77,7 @@ Foam::reconstruction::isoAlpha::isoAlpha
 
 void Foam::reconstruction::isoAlpha::reconstruct(bool forceUpdate)
 {
+    addProfilingInFunction(geometricVoF);
     const bool uptodate = alreadyReconstructed(forceUpdate);
 
     if (uptodate && !forceUpdate)
diff --git a/src/VoF/reconstructionSchemes/isoSchemes/isoSurface/isoSurface.C b/src/VoF/reconstructionSchemes/isoSchemes/isoSurface/isoSurface.C
index 5ea1da50..6c5452c6 100644
--- a/src/VoF/reconstructionSchemes/isoSchemes/isoSurface/isoSurface.C
+++ b/src/VoF/reconstructionSchemes/isoSchemes/isoSurface/isoSurface.C
@@ -22,7 +22,6 @@ License
 
 #include "isoSurface.H"
 #include "addToRunTimeSelectionTable.H"
-#include "implicitFunction.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -60,7 +59,7 @@ Foam::reconstruction::isoSurface::isoSurface
     cutCell_(mesh_,ap_),
 
     // Tolerances and solution controls
-    iso_(modelDict().lookupOrAddDefault<scalar>("iso", 0.5,false,false))
+    iso_(modelDict().lookupOrDefault<scalar>("iso", 0.5))
 {
 }
 
diff --git a/src/VoF/reconstructionSchemes/plicSchemes/gradAlpha/gradAlpha.C b/src/VoF/reconstructionSchemes/plicSchemes/gradAlpha/gradAlpha.C
index 87d038c6..774913d8 100755
--- a/src/VoF/reconstructionSchemes/plicSchemes/gradAlpha/gradAlpha.C
+++ b/src/VoF/reconstructionSchemes/plicSchemes/gradAlpha/gradAlpha.C
@@ -46,6 +46,7 @@ namespace reconstruction
 
 void Foam::reconstruction::gradAlpha::gradSurf(const volScalarField& phi)
 {
+    addProfilingInFunction(geometricVoF);
     leastSquareGrad<scalar> lsGrad("polyDegree1",mesh_.geometricD());
 
     zoneDistribute& exchangeFields = zoneDistribute::New(mesh_);
@@ -123,6 +124,7 @@ Foam::reconstruction::gradAlpha::gradAlpha
 
 void Foam::reconstruction::gradAlpha::reconstruct(bool forceUpdate)
 {
+    addProfilingInFunction(geometricVoF);
     const bool uptodate = alreadyReconstructed(forceUpdate);
 
     if (uptodate && !forceUpdate)
@@ -194,6 +196,7 @@ void Foam::reconstruction::gradAlpha::reconstruct(bool forceUpdate)
 
 void Foam::reconstruction::gradAlpha::mapAlphaField() const
 {
+    addProfilingInFunction(geometricVoF);
     // Without this line, we seem to get a race condition
     mesh_.C();
 
diff --git a/src/VoF/reconstructionSchemes/plicSchemes/plicRDF/plicRDF.C b/src/VoF/reconstructionSchemes/plicSchemes/plicRDF/plicRDF.C
index 397e2132..64ed60f6 100755
--- a/src/VoF/reconstructionSchemes/plicSchemes/plicRDF/plicRDF.C
+++ b/src/VoF/reconstructionSchemes/plicSchemes/plicRDF/plicRDF.C
@@ -30,7 +30,8 @@ License
 #include "fvc.H"
 #include "leastSquareGrad.H"
 #include "addToRunTimeSelectionTable.H"
-#include "alphaContactAngleFvPatchScalarField.H"
+#include "alphaContactAngleTwoPhaseFvPatchScalarField.H"
+#include "profiling.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -48,6 +49,7 @@ namespace reconstruction
 
 void Foam::reconstruction::plicRDF::interpolateNormal()
 {
+    addProfilingInFunction(geometricVoF);
     scalar dt = mesh_.time().deltaTValue();
     zoneDistribute& exchangeFields = zoneDistribute::New(mesh_);
 
@@ -161,6 +163,7 @@ void Foam::reconstruction::plicRDF::interpolateNormal()
 
 void Foam::reconstruction::plicRDF::gradSurf(const volScalarField& phi)
 {
+    addProfilingInFunction(geometricVoF);
     leastSquareGrad<scalar> lsGrad("polyDegree1", mesh_.geometricD());
     zoneDistribute& exchangeFields = zoneDistribute::New(mesh_);
 
@@ -207,6 +210,7 @@ void Foam::reconstruction::plicRDF::gradSurf(const volScalarField& phi)
 
 void Foam::reconstruction::plicRDF::setInitNormals(bool interpolate)
 {
+    addProfilingInFunction(geometricVoF);
     zoneDistribute& exchangeFields = zoneDistribute::New(mesh_);
 
     interfaceLabels_.clear();
@@ -241,6 +245,7 @@ void Foam::reconstruction::plicRDF::calcResidual
     List<normalRes>& normalResidual
 )
 {
+    addProfilingInFunction(geometricVoF);
     zoneDistribute& exchangeFields = zoneDistribute::New(mesh_);
     exchangeFields.setUpCommforZone(interfaceCell_,false);
 
@@ -305,6 +310,7 @@ void Foam::reconstruction::plicRDF::calcResidual
 
 void Foam::reconstruction::plicRDF::centreAndNormalBC()
 {
+    addProfilingInFunction(geometricVoF);
     scalar convertToRad = Foam::constant::mathematical::pi/180.0;
 
     // check if face is cut
@@ -317,11 +323,11 @@ void Foam::reconstruction::plicRDF::centreAndNormalBC()
     const fvBoundaryMesh& boundary = mesh_.boundary();
 
     // we need a surfaceVectorField to compute theta
-    surfaceVectorField normalf = fvc::interpolate(normal_);
+    surfaceVectorField normalf(fvc::interpolate(normal_));
 
     forAll(boundary, patchi)
     {
-        if (isA<alphaContactAngleFvPatchScalarField>(abf[patchi]))
+        if (isA<alphaContactAngleTwoPhaseFvPatchScalarField>(abf[patchi]))
         {
             forAll(normalf.boundaryFieldRef()[patchi],i)
             {
@@ -338,12 +344,12 @@ void Foam::reconstruction::plicRDF::centreAndNormalBC()
 
     forAll(boundary, patchi)
     {
-        if (isA<alphaContactAngleFvPatchScalarField>(abf[patchi]))
+        if (isA<alphaContactAngleTwoPhaseFvPatchScalarField>(abf[patchi]))
         {
-            alphaContactAngleFvPatchScalarField& acap =
-                const_cast<alphaContactAngleFvPatchScalarField&>
+            alphaContactAngleTwoPhaseFvPatchScalarField& acap =
+                const_cast<alphaContactAngleTwoPhaseFvPatchScalarField&>
                 (
-                    refCast<const alphaContactAngleFvPatchScalarField>
+                    refCast<const alphaContactAngleTwoPhaseFvPatchScalarField>
                     (
                         abf[patchi]
                     )
@@ -483,6 +489,7 @@ Foam::reconstruction::plicRDF::plicRDF
 
 void Foam::reconstruction::plicRDF::reconstruct(bool forceUpdate)
 {
+    addProfilingInFunction(geometricVoF);
     zoneDistribute& exchangeFields = zoneDistribute::New(mesh_);
     const bool uptodate = alreadyReconstructed(forceUpdate);
 
@@ -649,6 +656,7 @@ void Foam::reconstruction::plicRDF::reconstruct(bool forceUpdate)
 
 void Foam::reconstruction::plicRDF::mapAlphaField() const
 {
+    addProfilingInFunction(geometricVoF);
     // without it we seem to get a race condition
     mesh_.C();
 
diff --git a/src/VoF/reconstructionSchemes/plicSchemes/plicRDF/plicRDF.H b/src/VoF/reconstructionSchemes/plicSchemes/plicRDF/plicRDF.H
index b108c990..e8672c3d 100755
--- a/src/VoF/reconstructionSchemes/plicSchemes/plicRDF/plicRDF.H
+++ b/src/VoF/reconstructionSchemes/plicSchemes/plicRDF/plicRDF.H
@@ -59,7 +59,7 @@ SourceFiles
 #include "autoPtr.H"
 #include "surfaceIteratorPLIC.H"
 #include "reconstructedDistanceFunction.H"
-#include "zoneDistribute.H"
+//#include "zoneDistribute.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/VoF/zoneDistribute/zoneDistribute.C b/src/VoF/zoneDistribute/zoneDistribute.C
deleted file mode 100644
index 3a49a68c..00000000
--- a/src/VoF/zoneDistribute/zoneDistribute.C
+++ /dev/null
@@ -1,204 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2020 DLR
-    Copyright (C) 2020 OpenCFD Ltd.
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "zoneDistribute.H"
-#include "dummyTransform.H"
-#include "emptyPolyPatch.H"
-#include "processorPolyPatch.H"
-#include "syncTools.H"
-#include "wedgePolyPatch.H"
-
-#include "globalPoints.H"
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-namespace Foam
-{
-    defineTypeNameAndDebug(zoneDistribute, 0);
-}
-
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-Foam::autoPtr<Foam::indirectPrimitivePatch>
-Foam::zoneDistribute::coupledFacesPatch() const
-{
-    const polyBoundaryMesh& patches = mesh_.boundaryMesh();
-
-    label nCoupled = 0;
-
-    for (const polyPatch& pp : patches)
-    {
-        if (isA<processorPolyPatch>(pp))
-        {
-            nCoupled += pp.size();
-        }
-    }
-    labelList coupledFaces(nCoupled);
-    nCoupled = 0;
-
-    for (const polyPatch& pp : patches)
-    {
-        if (isA<processorPolyPatch>(pp))
-        {
-            label facei = pp.start();
-
-            forAll(pp, i)
-            {
-                coupledFaces[nCoupled++] = facei++;
-            }
-        }
-    }
-
-    return autoPtr<indirectPrimitivePatch>::New
-    (
-        IndirectList<face>
-        (
-            mesh_.faces(),
-            coupledFaces
-        ),
-        mesh_.points()
-    );
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::zoneDistribute::zoneDistribute(const fvMesh& mesh)
-:
-    MeshObject<fvMesh, Foam::TopologicalMeshObject, zoneDistribute>(mesh),
-    coupledBoundaryPoints_(coupledFacesPatch()().meshPoints()),
-    send_(Pstream::nProcs()),
-    stencil_(zoneCPCStencil::New(mesh)),
-    gblIdx_(stencil_.globalNumbering())
-{
-}
-
-
-// * * * * * * * * * * * * * * * * Selectors  * * * * * * * * * * * * * * //
-
-Foam::zoneDistribute& Foam::zoneDistribute::New(const fvMesh& mesh)
-{
-    bool found = mesh.thisDb().foundObject<zoneDistribute>
-    (
-        zoneDistribute::typeName
-    );
-    zoneDistribute* ptr = nullptr;
-
-    if(found)
-    {
-        ptr = mesh.thisDb().getObjectPtr<zoneDistribute>
-        (
-            zoneDistribute::typeName
-        );
-
-        return *ptr;
-    }
-
-    zoneDistribute* objectPtr = new zoneDistribute(mesh);
-
-    regIOobject::store(static_cast<zoneDistribute*>(objectPtr));
-
-    return *objectPtr;
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-void Foam::zoneDistribute::updateStencil(const boolList& zone)
-{
-    zoneCPCStencil::New(mesh_).updateStencil(zone);
-}
-
-
-void Foam::zoneDistribute::setUpCommforZone(const boolList& zone,bool updateStencil)
-{
-    zoneCPCStencil& stencil = zoneCPCStencil::New(mesh_);
-
-    if(updateStencil)
-    {
-        stencil.updateStencil(zone);
-    }
-
-    const labelHashSet comms = stencil.needsComm();
-
-    List<labelHashSet> needed(Pstream::nProcs());
-
-    if (Pstream::parRun())
-    {
-        for (const label celli : comms)
-        {
-            if (zone[celli])
-            {
-                for (const label gblIdx : stencil_[celli])
-                {
-                    if(!gblIdx_.isLocal(gblIdx))
-                    {
-                        const label procID = gblIdx_.whichProcID (gblIdx);
-                        needed[procID].insert(gblIdx);
-                    }
-                }
-            }
-        }
-
-        PstreamBuffers pBufs(Pstream::commsTypes::nonBlocking);
-
-        // Stream data into buffer
-        for (label domain = 0; domain < Pstream::nProcs(); domain++)
-        {
-            if (domain != Pstream::myProcNo())
-            {
-                // Put data into send buffer
-                UOPstream toDomain(domain, pBufs);
-
-                toDomain << needed[domain];
-            }
-        }
-
-        // wait until everything is written.
-        pBufs.finishedSends();
-
-        for (label domain = 0; domain < Pstream::nProcs(); domain++)
-        {
-            send_[domain].clear();
-
-            if (domain != Pstream::myProcNo())
-            {
-                // get data from send buffer
-                UIPstream fromDomain(domain, pBufs);
-
-                fromDomain >> send_[domain];
-            }
-        }
-    }
-}
-
-
-
-
-// ************************************************************************* //
diff --git a/src/VoF/zoneDistribute/zoneDistribute.H b/src/VoF/zoneDistribute/zoneDistribute.H
deleted file mode 100644
index f2bda69f..00000000
--- a/src/VoF/zoneDistribute/zoneDistribute.H
+++ /dev/null
@@ -1,191 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2020 DLR
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Class
-    Foam::zoneDistribute
-
-Description
-    Class for parallel communication in a narrow band. It either provides a Map
-    with the neighbouring values of the selected region or returns a Map of the
-    required values in global addressing. Also holds a reference to the stencil
-    Before the data transfer the communation has to be set up:
-    exchangeFields_.setUpCommforZone(interfaceCell_);
-    Is used in the plicRDF
-
-    Original code supplied by Henning Scheufler, DLR (2019)
-
-SourceFiles
-    zoneDistribute.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef zoneDistribute_H
-#define zoneDistribute_H
-
-#include "fvMesh.H"
-#include "globalIndex.H"
-#include "volFields.H"
-
-#include "zoneCPCStencil.H"
-#include "IOobject.H"
-#include "MeshObject.H"
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-/*---------------------------------------------------------------------------*\
-                        Class zoneDistribute Declaration
-\*---------------------------------------------------------------------------*/
-
-class zoneDistribute
-:
-    public MeshObject<fvMesh, TopologicalMeshObject, zoneDistribute>
-{
-    // Private Data
-
-
-        //- labels of the points on coupled patches
-        labelList coupledBoundaryPoints_;
-
-        //- storage of the addressing for processor-to-processor comms
-        List<labelHashSet> send_;
-
-        //- Return patch of all coupled faces.
-        autoPtr<indirectPrimitivePatch> coupledFacesPatch() const;
-
-        zoneCPCStencil& stencil_;
-
-        const globalIndex& gblIdx_;
-
-
-        //- Gives patchNumber and patchFaceNumber for a given
-        //- Geometric volume field
-        template<typename Type>
-        Type getLocalValue
-        (
-            const GeometricField<Type, fvPatchField, volMesh>& phi,
-            const label localIdx
-        ) const;
-
-
-        //- Gives patchNumber and patchFaceNumber for a given
-        //- Geometric volume field
-        template<typename Type>
-        Type faceValue
-        (
-            const GeometricField<Type, fvPatchField, volMesh>& phi,
-            const label localIdx
-        ) const;
-
-
-public:
-
-    //- Runtime information
-    TypeName("zoneDistribute");
-
-
-    // Constructors
-
-        //- Construct from fvMesh
-        explicit zoneDistribute(const fvMesh&);
-
-
-    // Selectors
-
-        static zoneDistribute& New(const fvMesh&);
-
-    //- Destructor
-        virtual ~zoneDistribute() = default;
-
-    // Member Functions
-
-        //- Update stencil with boolList the size has to match mesh nCells
-        void setUpCommforZone(const boolList& zone, bool updateStencil=true);
-
-        //- Updates stencil with boolList the size has to match mesh nCells
-        void updateStencil(const boolList& zone);
-
-        //- Stencil reference
-        const labelListList& getStencil()
-        {
-            return stencil_;
-        }
-
-        //- Addressing reference
-        const globalIndex& globalNumbering() const
-        {
-            return gblIdx_;
-        }
-
-        //- Gives patchNumber and patchFaceNumber for a given
-        //- Geometric volume field
-        template<typename Type>
-        Type getValue
-        (
-            const GeometricField<Type, fvPatchField, volMesh>& phi,
-            const Map<Type>& valuesFromOtherProc,
-            const label gblIdx
-        ) const;
-
-        //- Returns stencil and provides a Map with globalNumbering
-        template<typename Type>
-        Map<Field<Type>> getFields
-        (
-            const boolList& zone,
-            const GeometricField<Type, fvPatchField, volMesh>& phi
-        );
-
-        //- Returns stencil and provides a Map with globalNumbering
-        template<typename Type>
-        Map<Type> getDatafromOtherProc
-        (
-            const boolList& zone,
-            const GeometricField<Type, fvPatchField, volMesh>& phi
-        );
-
-
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#ifdef NoRepository
-#include "zoneDistributeI.H"
-#endif
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/VoF/zoneDistribute/zoneDistributeI.H b/src/VoF/zoneDistribute/zoneDistributeI.H
deleted file mode 100644
index 118e973f..00000000
--- a/src/VoF/zoneDistribute/zoneDistributeI.H
+++ /dev/null
@@ -1,223 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2019-2020 DLR
-    Copyright (C) 2020 OpenCFD Ltd.
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "zoneDistribute.H"
-#include "DynamicField.H"
-#include "syncTools.H"
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-template<typename Type>
-Type Foam::zoneDistribute::getLocalValue
-(
-    const GeometricField<Type, fvPatchField, volMesh>& phi,
-    const label localIdx
-) const
-{
-    if (localIdx < mesh_.nCells()) // internal: cellI
-    {
-        return phi[localIdx];
-    }
-    else
-    {
-        return faceValue(phi,localIdx);
-    }
-
-}
-
-
-template<typename Type>
-Type Foam::zoneDistribute::faceValue
-(
-    const GeometricField<Type, fvPatchField, volMesh>& phi,
-    const label localIdx
-) const
-{
-    const label faceI = localIdx + mesh_.nInternalFaces() - mesh_.nCells();
-
-    const polyBoundaryMesh& pbm = mesh_.boundaryMesh();
-
-    // Boundary face. Find out which face of which patch
-    const label patchI = pbm.whichPatch(faceI);
-
-    if (patchI < 0 || patchI >= pbm.size())
-    {
-       FatalErrorInFunction
-            << "Cannot find patch for face " << faceI
-            << abort(FatalError);
-    }
-
-    const polyPatch& pp = pbm[patchI];
-
-    const label patchFaceI = pp.whichFace(faceI);
-
-    return phi.boundaryField()[patchI][patchFaceI];
-}
-
-
-template<typename Type>
-Type Foam::zoneDistribute::getValue
-(
-    const GeometricField<Type, fvPatchField, volMesh>& phi,
-    const Map<Type>& valuesFromOtherProc,
-    const label gblIdx
-) const
-{
-    if(gblIdx_.isLocal(gblIdx))
-    {
-        const label idx = gblIdx_.toLocal(gblIdx);
-        return getLocalValue(phi,idx);
-    }
-    else // from other proc
-    {
-        return valuesFromOtherProc[gblIdx];
-    }
-}
-
-
-template<typename Type>
-Foam::Map<Foam::Field<Type>> Foam::zoneDistribute::getFields
-(
-    const boolList& zone,
-    const GeometricField<Type, fvPatchField, volMesh>& phi
-)
-{
-    zoneCPCStencil& stencil = zoneCPCStencil::New(mesh_);
-    if (zone.size() != phi.size())
-    {
-        FatalErrorInFunction
-            << "size of zone: " << zone.size()
-            << "size of phi:" <<  phi.size()
-            << "do not match. Did the mesh change?"
-            << exit(FatalError);
-
-        return Map<Field<Type>>();
-    }
-
-
-    // Get values from other proc
-    Map<Type> neiValues = getDatafromOtherProc(zone, phi);
-
-    Map<Field<Type>> stencilWithValues;
-
-    DynamicField<Type> tmpField(100);
-
-    forAll(zone,celli)
-    {
-        if (zone[celli])
-        {
-            tmpField.clearStorage();
-
-            for (const label gblIdx : stencil_[celli])
-            {
-                tmpField.append(getValue(phi,neiValues,gblIdx));
-            }
-
-            stencilWithValues.insert(celli,tmpField);
-        }
-    }
-
-    return stencilWithValues;
-}
-
-
-template<typename Type>
-Foam::Map<Type> Foam::zoneDistribute::getDatafromOtherProc
-(
-    const boolList& zone,
-    const GeometricField<Type, fvPatchField, volMesh>& phi
-)
-{
-    if (zone.size() != phi.size())
-    {
-        FatalErrorInFunction
-            << "size of zone: " << zone.size()
-            << "size of phi:" <<  phi.size()
-            << "do not match. Did the mesh change?"
-            << exit(FatalError);
-
-        return Map<Type>();
-    }
-
-
-    // Get values from other proc
-    Map<Type> neiValues;
-    List<Map<Type>> sendValues(Pstream::nProcs());
-
-    if (Pstream::parRun())
-    {
-        forAll(send_, domaini)
-        {
-            for (const label sendIdx : send_[domaini])
-            {
-                sendValues[domaini].insert
-                (
-                    sendIdx,
-                    getLocalValue(phi,gblIdx_.toLocal(sendIdx))
-                );
-            }
-        }
-
-        PstreamBuffers pBufs(Pstream::commsTypes::nonBlocking);
-
-        // Stream data into buffer
-        for (label domain = 0; domain < Pstream::nProcs(); domain++)
-        {
-            if (domain != Pstream::myProcNo())
-            {
-                // Put data into send buffer
-                UOPstream toDomain(domain, pBufs);
-
-                toDomain << sendValues[domain];
-            }
-        }
-
-        // Wait until everything is written.
-        pBufs.finishedSends();
-
-        Map<Type> tmpValue;
-
-        for (label domain = 0; domain < Pstream::nProcs(); domain++)
-        {
-            if (domain != Pstream::myProcNo())
-            {
-                // Get data from send buffer
-                UIPstream fromDomain(domain, pBufs);
-
-                fromDomain >> tmpValue;
-
-                neiValues += tmpValue;
-            }
-        }
-    }
-
-    return neiValues;
-}
-
-
-// ************************************************************************* //
diff --git a/src/VoF/zoneDistribute/zoneDistributePoints.C b/src/VoF/zoneDistribute/zoneDistributePoints.C
deleted file mode 100644
index 3ce839cc..00000000
--- a/src/VoF/zoneDistribute/zoneDistributePoints.C
+++ /dev/null
@@ -1,157 +0,0 @@
-/*---------------------------------------------------------------------------*\
-            Copyright (c) 2017-2019, German Aerospace Center (DLR)
--------------------------------------------------------------------------------
-License
-    This file is part of the VoFLibrary source code library, which is an
-    unofficial extension to OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "zoneDistributePoints.H"
-#include "dummyTransform.H"
-#include "emptyPolyPatch.H"
-#include "processorPolyPatch.H"
-#include "syncTools.H"
-#include "wedgePolyPatch.H"
-
-#include "globalPoints.H"
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-namespace Foam
-{
-    defineTypeNameAndDebug(zoneDistributePoints, 0);
-}
-
-
-Foam::autoPtr<Foam::indirectPrimitivePatch>
-Foam::zoneDistributePoints::nonEmptyWedgePatch() const
-{
-    const polyBoundaryMesh& patches = mesh_.boundaryMesh();
-
-    label nonWedgeEmpty = 0;
-
-    for (const polyPatch& pp : patches)
-    {
-        if
-        (
-            !isA<emptyPolyPatch>(pp) &&
-            !isA<wedgePolyPatch>(pp)
-        )
-        {
-            nonWedgeEmpty += pp.size();
-        }
-    }
-    labelList nonWedgeEmptyFaces(nonWedgeEmpty);
-    nonWedgeEmpty = 0;
-
-    for (const polyPatch& pp : patches)
-    {
-        if
-        (
-            !isA<emptyPolyPatch>(pp) &&
-            !isA<wedgePolyPatch>(pp)
-        )
-        {
-            label facei = pp.start();
-
-            forAll(pp, i)
-            {
-                nonWedgeEmptyFaces[nonWedgeEmpty++] = facei++;
-            }
-        }
-    }
-
-    return autoPtr<indirectPrimitivePatch>::New
-    (
-        IndirectList<face>
-        (
-            mesh_.faces(),
-            nonWedgeEmptyFaces
-        ),
-        mesh_.points()
-    );
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-
-Foam::zoneDistributePoints::zoneDistributePoints(const fvMesh& mesh)
-:
-    MeshObject<fvMesh, Foam::TopologicalMeshObject, zoneDistributePoints>(mesh),
-    mesh_(mesh),
-    //stencil_(getStencilRef()),
-    boundaryPoints_(nonEmptyWedgePatch()().meshPoints()),
-    isBoundaryPoint_(mesh.nFaces(),false),
-    validBoundaryFace_(mesh.nFaces()-mesh.nInternalFaces(),false)
-{
-
-    const polyBoundaryMesh& patches = mesh_.boundaryMesh();
-
-    for (const polyPatch& pp : patches)
-    {
-        if
-        (
-            !isA<processorPolyPatch>(pp) &&
-            !isA<emptyPolyPatch>(pp) &&
-            !isA<wedgePolyPatch>(pp)
-        )
-        {
-            validBoundaryFace_[pp.start() - mesh.nInternalFaces()] = true;
-        }
-    }
-    forAll(boundaryPoints_,i)
-    {
-        isBoundaryPoint_[boundaryPoints_[i]] = true;
-    }
-}
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-// void Foam::zoneDistributePoints::updateMesh(const mapPolyMesh& mpm)
-// {
-//     if(mesh_.topoChanging())
-//     {
-//         boundaryPoints_ = nonEmptyWedgePatch()().meshPoints();
-//         validBoundaryFace_.setSize(mesh_.nFaces()-mesh_.nInternalFaces());
-//         validBoundaryFace_ = false;
-
-//         const polyBoundaryMesh& patches = mesh_.boundaryMesh();
-
-//         for (const polyPatch& pp : patches)
-//         {
-//             if
-//             (
-//                 !isA<processorPolyPatch>(pp) &&
-//                 !isA<emptyPolyPatch>(pp) &&
-//                 !isA<wedgePolyPatch>(pp)
-//             )
-//             {
-//                 validBoundaryFace_[pp.start() - mesh_.nInternalFaces()] = true;
-//             }
-//         }
-//         isBoundaryPoint_.setSize(mesh_.nPoints());
-//         isBoundaryPoint_ = false;
-//         forAll(boundaryPoints_,i)
-//         {
-//             isBoundaryPoint_[boundaryPoints_[i]] = true;
-//         }
-//     }
-
-// }
-
-// ************************************************************************* //
diff --git a/src/VoF/zoneDistribute/zoneDistributePoints.H b/src/VoF/zoneDistribute/zoneDistributePoints.H
deleted file mode 100644
index ea9ca926..00000000
--- a/src/VoF/zoneDistribute/zoneDistributePoints.H
+++ /dev/null
@@ -1,169 +0,0 @@
-/*---------------------------------------------------------------------------*\
-            Copyright (c) 2017-2019, German Aerospace Center (DLR)
--------------------------------------------------------------------------------
-License
-    This file is part of the VoFLibrary source code library, which is an
-    unofficial extension to OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Class
-    Foam::zoneDistributePoints
-
-Description
-    Class for parallel communication in a narrow band for pointValues
-
-Author
-    Henning Scheufler, DLR, all rights reserved.
-
-SourceFiles
-    zoneDistributePoints.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef zoneDistributePoints_H
-#define zoneDistributePoints_H
-
-#include "fvMesh.H"
-#include "volFields.H"
-
-#include "IOobject.H"
-#include "MeshObject.H"
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-/*---------------------------------------------------------------------------*\
-                        Class zoneDistributePoints Declaration
-\*---------------------------------------------------------------------------*/
-
-class zoneDistributePoints
-:   public MeshObject
-    <
-        fvMesh,
-        TopologicalMeshObject,
-        zoneDistributePoints
-    >
-{
-
-  private:
-
-    // Private data
-
-    //- Combine operator for Lists
-    template <class type> class appendOp
-    {
-      public:
-        void operator()(List<type>& x, const List<type>& y) const
-        {
-            if (y.size())
-            {
-                if (x.empty())
-                {
-                    x = y;
-                }
-                else
-                {
-                    x.append(y);
-                }
-            }
-        }
-    };
-
-        //- Reference to mesh
-        const fvMesh& mesh_;
-
-        //- boundaryPoints without empty and wedge points
-        labelList boundaryPoints_;
-
-        //- is point and patch empty and wege are excluded
-        boolList isBoundaryPoint_;
-
-        //- valid boundary face excludes processor wedge and empty
-        //  size is nFaces - internalFaces
-        boolList validBoundaryFace_;
-
-        //- Return patch with non-empty and non-wedge faces.
-        autoPtr<indirectPrimitivePatch> nonEmptyWedgePatch() const;
-
-        //- return faceValue
-        template <typename Type>
-        Type faceValue
-        (
-            const GeometricField<Type, fvPatchField, volMesh>& phi,
-            const label faceI
-        ) const;
-
-
-
-  public:
-    // Constructors
-        //- Declare name of the class and its debug switch
-        TypeName("zoneDistributePoints");
-
-        //- Construct from fvMesh
-        zoneDistributePoints(const fvMesh&);
-
-        //- return boundaryPoints without wedge and empty patchPoints
-        const boolList& isBoundaryPoint()
-        {
-            return isBoundaryPoint_;
-        }
-
-
-        //- Returns Map with cellPointValues
-        template <typename Type>
-        Map<Field <Type> > getPointDatafromOtherProc
-        (
-            const boolList& zone,
-            const GeometricField<Type, fvPatchField, volMesh>& phi
-        );
-
-        // //- update mesh in case of topochange
-        // virtual void updateMesh(const mapPolyMesh& mpm);
-
-        // //- movePoints
-        // virtual bool movePoints()
-        // {
-        //     // do nothing;
-        //     return false;
-        // }
-
-
-
-
-
-
-};
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#ifdef NoRepository
-#include "zoneDistributePointsI.H"
-#endif
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/VoF/zoneDistribute/zoneDistributePointsI.H b/src/VoF/zoneDistribute/zoneDistributePointsI.H
deleted file mode 100644
index 0a8fa64d..00000000
--- a/src/VoF/zoneDistribute/zoneDistributePointsI.H
+++ /dev/null
@@ -1,101 +0,0 @@
-/*---------------------------------------------------------------------------*\
-            Copyright (c) 2017-2019, German Aerospace Center (DLR)
--------------------------------------------------------------------------------
-License
-    This file is part of the VoFLibrary source code library, which is an
-    unofficial extension to OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "zoneDistributePoints.H"
-#include "DynamicField.H"
-#include "syncTools.H"
-
-// ************************************************************************* //
-
-template <typename Type>
-Type Foam::zoneDistributePoints::faceValue
-(
-    const GeometricField<Type, fvPatchField, volMesh>& phi,
-    const label faceI
-) const
-{
-    const polyBoundaryMesh& pbm = mesh_.boundaryMesh();
-
-    // Boundary face. Find out which face of which patch
-    const label patchI = pbm.whichPatch(faceI);
-
-    if (patchI < 0 || patchI >= pbm.size())
-    {
-       FatalErrorInFunction << "Cannot find patch for face " << faceI
-                            << abort(FatalError);
-    }
-    const polyPatch& pp = pbm[patchI];
-
-    const label patchFaceI = pp.whichFace(faceI);
-
-    return phi.boundaryField()[patchI][patchFaceI];
-}
-
-template <typename Type>
-Foam::Map<Foam::Field <Type> >
-Foam::zoneDistributePoints::getPointDatafromOtherProc
-(
-    const boolList& zone,
-    const GeometricField<Type, fvPatchField, volMesh>& phi
-)
-{
-    const labelListList& cPoints = mesh_.pointCells();
-    const labelListList& fPoints = mesh_.pointFaces();
-
-    // cannot be on empty or wedge since they are ignored in syncGlobalIdxMap
-    DynamicList<Type> valList(16);
-    Map<Field <Type> > values;
-
-    // Insert all cells adjacent to the point in stencil
-    forAll(boundaryPoints_, i)
-    {
-        valList.clear();
-        const label pI = boundaryPoints_[i];
-        forAll(cPoints[pI], j)
-        {
-            const label& celli = cPoints[pI][j];
-            valList.append(phi[celli]);
-        }
-        // insert non wedge empty proc patches in stencil
-        forAll(fPoints[pI], fi)
-        {
-            const label& faceI = fPoints[pI][fi];
-            if (!mesh_.isInternalFace(faceI))
-            {
-                if(validBoundaryFace_[faceI - mesh_.nInternalFaces()])
-                {
-                    valList.append(faceValue(phi,faceI));
-                }
-            }
-        }
-        const Field<Type> fieldVal(valList);
-
-        values.insert(pI, fieldVal);
-    }
-
-    // syncNeiCellMap processor values are appended to the list
-    syncTools::syncPointMap(mesh_, values, appendOp<Type>());
-    return values;
-}
-
-
-// ************************************************************************* //
diff --git a/src/VoF/zoneDistribute/zoneStencils/zoneCPCStencil.C b/src/VoF/zoneDistribute/zoneStencils/zoneCPCStencil.C
deleted file mode 100644
index 82d0f942..00000000
--- a/src/VoF/zoneDistribute/zoneStencils/zoneCPCStencil.C
+++ /dev/null
@@ -1,253 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2020 DLR
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "zoneCPCStencil.H"
-#include "syncTools.H"
-#include "ListOps.H"
-#include "dummyTransform.H"
-#include "emptyPolyPatch.H"
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-namespace Foam
-{
-    defineTypeNameAndDebug(zoneCPCStencil, 0);
-}
-
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-Foam::Map<bool> Foam::zoneCPCStencil::syncCoupledBoundaryPoints
-(
-    const boolList& zone,
-    const labelList& boundaryPoints
-) const
-{
-    const labelListList& pCells = mesh_.pointCells();
-
-    Map<bool> syncPoints;
-
-    for (const label pointi : boundaryPoints)
-    {
-        bool updatePoint = false;
-
-        // Check if point needs to be updated
-        for (const label celli : pCells[pointi])
-        {
-            if (zone[celli])
-            {
-                updatePoint = true;
-                break;
-            }
-        }
-
-        if (updatePoint)
-        {
-            syncPoints.insert(pointi, true);
-        }
-    }
-
-    syncTools::syncPointMap
-    (
-        mesh_,
-        syncPoints,
-        orEqOp<bool>(),
-        Foam::dummyTransform()
-    );
-
-    return syncPoints;
-}
-
-
-void Foam::zoneCPCStencil::calcPointBoundaryData
-(
-    const boolList& zone,
-    const boolList& isValidBFace,
-    const labelList& boundaryPoints,
-    Map<labelList>& neiGlobal
-) const
-{
-    neiGlobal.resize(2*boundaryPoints.size());
-
-    labelHashSet pointGlobals;
-
-    for (const label pointi : boundaryPoints)
-    {
-        neiGlobal.insert
-        (
-            pointi,
-            calcFaceCells
-            (
-                isValidBFace,
-                mesh_.pointFaces()[pointi],
-                pointGlobals
-            )
-        );
-    }
-
-    syncTools::syncPointMap
-    (
-        mesh_,
-        neiGlobal,
-        unionEqOp(),
-        Foam::dummyTransform()
-    );
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::zoneCPCStencil::zoneCPCStencil(const fvMesh& mesh)
-:
-    MeshObject<fvMesh, Foam::TopologicalMeshObject, zoneCPCStencil>(mesh),
-    zoneCellStencils(mesh),
-    nonEmptyBoundaryPoints_(nonEmptyFacesPatch()().meshPoints()),
-    uptodate_(mesh.nCells(), false)
-{
-    // Mark boundary faces to be included in stencil (i.e. not coupled or empty)
-    validBoundaryFaces(isValidBFace_);
-}
-
-Foam::zoneCPCStencil& Foam::zoneCPCStencil::New(const fvMesh& mesh)
-{
-    bool found = mesh.thisDb().foundObject<zoneCPCStencil>
-    (
-        zoneCPCStencil::typeName
-    );
-    zoneCPCStencil* ptr = nullptr;
-
-    if(found)
-    {
-        ptr = mesh.thisDb().getObjectPtr<zoneCPCStencil>
-        (
-            zoneCPCStencil::typeName
-        );
-
-        return *ptr;
-    }
-
-    zoneCPCStencil* objectPtr = new zoneCPCStencil(mesh);
-
-    regIOobject::store(static_cast<zoneCPCStencil*>(objectPtr));
-
-    return *objectPtr;
-}
-
-
-void Foam::zoneCPCStencil::calculateStencil
-(
-    const boolList& zone,
-    labelListList& globalCellCells
-)
-{
-    // Swap pointCells for coupled points
-    Map<bool> syncPoints = syncCoupledBoundaryPoints
-    (
-        zone,
-        nonEmptyBoundaryPoints_
-    );
-
-    labelList boundaryPoints(syncPoints.toc());
-
-    Map<labelList> neiGlobal;
-    calcPointBoundaryData
-    (
-        zone,
-        isValidBFace_,
-        boundaryPoints,
-        neiGlobal
-    );
-
-    // add boundary Points first
-
-    for (const label pointi : boundaryPoints)
-    {
-        const labelList& pGlobals = neiGlobal[pointi];
-
-        // Distribute to all pointCells
-        const labelList& pCells = mesh_.pointCells(pointi);
-
-        for (const label celli : pCells)
-        {
-            // Insert pGlobals into globalCellCells
-            if (zone[celli] && !uptodate_[celli])
-            {
-                merge
-                (
-                    globalNumbering().toGlobal(celli),
-                    pGlobals,
-                    globalCellCells[celli]
-                );
-
-                for (const label gblIdx : globalCellCells[celli])
-                {
-                    if (!globalNumbering().isLocal(gblIdx))
-                    {
-                        needComm_.insert(celli);
-                    }
-                }
-            }
-        }
-    }
-
-
-    neiGlobal.clear();
-
-    // Do remaining points cells
-    const labelListList& cPoints = mesh_.cellPoints();
-
-    forAll(zone,celli)
-    {
-        if (zone[celli] && !uptodate_[celli])
-        {
-            for (const label pointi : cPoints[celli])
-            {
-                labelList pCells = mesh_.pointCells(pointi);
-
-                for (label& neiCelli : pCells)
-                {
-                    neiCelli = globalNumbering().toGlobal(neiCelli);
-                }
-
-                if (!uptodate_[celli])
-                {
-                    merge
-                    (
-                        globalNumbering().toGlobal(celli),
-                        pCells,
-                        globalCellCells[celli]
-                    );
-                }
-            }
-
-            uptodate_[celli] = true;
-        }
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/src/VoF/zoneDistribute/zoneStencils/zoneCPCStencil.H b/src/VoF/zoneDistribute/zoneStencils/zoneCPCStencil.H
deleted file mode 100644
index e3a5d1b3..00000000
--- a/src/VoF/zoneDistribute/zoneStencils/zoneCPCStencil.H
+++ /dev/null
@@ -1,137 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2020 DLR
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Class
-    Foam::zoneCPCStencil
-
-Description
-    computes a cell point cell stencil in a narrow band. resizes in case
-    of topological change
-
-    Original code supplied by Henning Scheufler, DLR (2019)
-
-SourceFiles
-    zoneCPCStencil.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef zoneCPCStencil_H
-#define zoneCPCStencil_H
-
-#include "zoneCellStencils.H"
-#include "boolList.H"
-#include "HashSet.H"
-#include "Map.H"
-#include "indirectPrimitivePatch.H"
-#include "fvMesh.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-/*---------------------------------------------------------------------------*\
-                    Class zoneCPCStencil Declaration
-\*---------------------------------------------------------------------------*/
-
-class zoneCPCStencil
-:
-    public MeshObject
-    <
-        fvMesh,
-        TopologicalMeshObject,
-        zoneCPCStencil
-    >,
-    public zoneCellStencils
-{
-    // Private Data
-
-        labelList nonEmptyBoundaryPoints_;
-
-        //- is valid boundaryface ?
-        //- non valid face are on empty, wedge and processor patches
-        boolList isValidBFace_;
-
-        //- cell is already uptodate
-        boolList uptodate_;
-
-
-    // Private Member Functions
-
-        //- Sync boundary points
-        Map<bool> syncCoupledBoundaryPoints
-        (
-            const boolList& zone,
-            const labelList& boundaryPoints
-        ) const;
-
-        //- Calculates per point the neighbour data (= pointCells)
-        void calcPointBoundaryData
-        (
-            const boolList& zone,
-            const boolList& isValidBFace,
-            const labelList& boundaryPoints,
-            Map<labelList>& neiGlobal
-        ) const;
-
-        //- Calculate stencil
-        void calculateStencil
-        (
-            const boolList& zone,
-            labelListList& globalCellCells
-        );
-
-        //- No copy construct
-        zoneCPCStencil(const zoneCPCStencil&) = delete;
-
-        //- No copy assignment
-        void operator=(const zoneCPCStencil&) = delete;
-
-public:
-
-    //- Runtime information
-    TypeName("zoneCPCStencil");
-
-
-    // Constructors
-
-        //- Construct from all cells and boundary faces
-        explicit zoneCPCStencil(const fvMesh&);
-
-    // Selectors
-        static zoneCPCStencil& New(const fvMesh&);
-
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/VoF/zoneDistribute/zoneStencils/zoneCellStencils.C b/src/VoF/zoneDistribute/zoneStencils/zoneCellStencils.C
deleted file mode 100644
index 907ae676..00000000
--- a/src/VoF/zoneDistribute/zoneStencils/zoneCellStencils.C
+++ /dev/null
@@ -1,293 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2020 DLR
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "zoneCellStencils.H"
-#include "syncTools.H"
-#include "dummyTransform.H"
-#include "emptyPolyPatch.H"
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-namespace Foam
-{
-    defineTypeNameAndDebug(zoneCellStencils, 0);
-}
-
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-Foam::autoPtr<Foam::indirectPrimitivePatch>
-Foam::zoneCellStencils::nonEmptyFacesPatch() const
-{
-    const polyBoundaryMesh& patches = meshRef_.boundaryMesh();
-
-    label nNonEmpty = 0;
-
-    for (const polyPatch& pp : patches)
-    {
-        if (!isA<emptyPolyPatch>(pp))
-        {
-            nNonEmpty += pp.size();
-        }
-    }
-    labelList nonEmptyFaces(nNonEmpty);
-    nNonEmpty = 0;
-
-    for (const polyPatch& pp : patches)
-    {
-        if (!isA<emptyPolyPatch>(pp))
-        {
-            label facei = pp.start();
-
-            forAll(pp, i)
-            {
-                nonEmptyFaces[nNonEmpty++] = facei++;
-            }
-        }
-    }
-
-    return autoPtr<indirectPrimitivePatch>::New
-    (
-        IndirectList<face>
-        (
-            meshRef_.faces(),
-            nonEmptyFaces
-        ),
-        meshRef_.points()
-    );
-}
-
-
-Foam::autoPtr<Foam::indirectPrimitivePatch>
-Foam::zoneCellStencils::allCoupledFacesPatch() const
-{
-    const polyBoundaryMesh& patches = meshRef_.boundaryMesh();
-
-    label nCoupled = 0;
-
-    for (const polyPatch& pp : patches)
-    {
-        if (pp.coupled())
-        {
-            nCoupled += pp.size();
-        }
-    }
-    labelList coupledFaces(nCoupled);
-    nCoupled = 0;
-
-    for (const polyPatch& pp : patches)
-    {
-        if (pp.coupled())
-        {
-            label facei = pp.start();
-
-            forAll(pp, i)
-            {
-                coupledFaces[nCoupled++] = facei++;
-            }
-        }
-    }
-
-    return autoPtr<indirectPrimitivePatch>::New
-    (
-        IndirectList<face>
-        (
-            meshRef_.faces(),
-            coupledFaces
-        ),
-        meshRef_.points()
-    );
-}
-
-
-void Foam::zoneCellStencils::validBoundaryFaces(boolList& isValidBFace) const
-{
-    const polyBoundaryMesh& patches = meshRef_.boundaryMesh();
-
-    isValidBFace.setSize(meshRef_.nBoundaryFaces());
-
-    isValidBFace = true;
-
-    for (const polyPatch& pp : patches)
-    {
-        if (pp.coupled() || isA<emptyPolyPatch>(pp))
-        {
-            label bFacei = pp.start()-meshRef_.nInternalFaces();
-            forAll(pp, i)
-            {
-                isValidBFace[bFacei++] = false;
-            }
-        }
-    }
-}
-
-void Foam::zoneCellStencils::unionEqOp::operator()
-(
-    labelList& x,
-    const labelList& y
-) const
-{
-    if (y.size())
-    {
-        if (x.empty())
-        {
-            x = y;
-        }
-        else
-        {
-            labelHashSet set(x);
-            set.insert(y);
-            x = set.toc();
-        }
-    }
-}
-
-void Foam::zoneCellStencils::merge
-(
-    const label globalI,
-    const labelList& pGlobals,
-    labelList& cCells
-)
-{
-    labelHashSet set;
-    for (const label celli : cCells)
-    {
-        if (celli != globalI)
-        {
-            set.insert(celli);
-        }
-    }
-
-    for (const label celli : pGlobals)
-    {
-        if (celli != globalI)
-        {
-            set.insert(celli);
-        }
-    }
-
-    cCells.setSize(set.size()+1);
-    label n = 0;
-    cCells[n++] = globalI;
-
-    for (const label seti : set)
-    {
-        cCells[n++] = seti;
-    }
-}
-
-
-void Foam::zoneCellStencils::insertFaceCells
-(
-    const label exclude0,
-    const label exclude1,
-    const boolList& isValidBFace,
-    const labelList& faceLabels,
-    labelHashSet& globals
-) const
-{
-    const labelList& own = meshRef_.faceOwner();
-    const labelList& nei = meshRef_.faceNeighbour();
-
-    forAll(faceLabels, i)
-    {
-        label facei = faceLabels[i];
-
-        label globalOwn = globalNumbering().toGlobal(own[facei]);
-        if (globalOwn != exclude0 && globalOwn != exclude1)
-        {
-            globals.insert(globalOwn);
-        }
-
-        if (meshRef_.isInternalFace(facei))
-        {
-            label globalNei = globalNumbering().toGlobal(nei[facei]);
-            if (globalNei != exclude0 && globalNei != exclude1)
-            {
-                globals.insert(globalNei);
-            }
-        }
-        else
-        {
-            label bFacei = facei-meshRef_.nInternalFaces();
-
-            if (isValidBFace[bFacei])
-            {
-                label globalI = globalNumbering().toGlobal
-                (
-                    meshRef_.nCells()
-                + bFacei
-                );
-
-                if (globalI != exclude0 && globalI != exclude1)
-                {
-                    globals.insert(globalI);
-                }
-            }
-        }
-    }
-}
-
-
-Foam::labelList Foam::zoneCellStencils::calcFaceCells
-(
-    const boolList& isValidBFace,
-    const labelList& faceLabels,
-    labelHashSet& globals
-) const
-{
-    globals.clear();
-
-    insertFaceCells
-    (
-        -1,
-        -1,
-        isValidBFace,
-        faceLabels,
-        globals
-    );
-
-    return globals.toc();
-}
-
-
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::zoneCellStencils::zoneCellStencils(const fvMesh& mesh)
-:
-    labelListList(mesh.nCells()),
-    meshRef_(mesh),
-    needComm_(),
-    globalNumbering_(meshRef_.nCells()+meshRef_.nFaces()-meshRef_.nInternalFaces())
-{
-
-}
-
-
-// ************************************************************************* //
diff --git a/src/VoF/zoneDistribute/zoneStencils/zoneCellStencils.H b/src/VoF/zoneDistribute/zoneStencils/zoneCellStencils.H
deleted file mode 100644
index 7129b9db..00000000
--- a/src/VoF/zoneDistribute/zoneStencils/zoneCellStencils.H
+++ /dev/null
@@ -1,185 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2020 DLR
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Class
-    Foam::zoneCellStencils
-
-Description
-    base class for cell stencil in a narrow band
-
-    Original code supplied by Henning Scheufler, DLR (2019)
-
-SourceFiles
-    zoneCellStencils.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef zoneCellStencils_H
-#define zoneCellStencils_H
-
-#include "boolList.H"
-#include "HashSet.H"
-#include "Map.H"
-#include "indirectPrimitivePatch.H"
-#include "MeshObject.H"
-#include "fvMesh.H"
-#include "globalIndex.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-/*---------------------------------------------------------------------------*\
-                    Class zoneCellStencils Declaration
-\*---------------------------------------------------------------------------*/
-
-class zoneCellStencils
-:
-    public labelListList
-{
-protected:
-
-    // Protected Members
-
-        const fvMesh& meshRef_;
-
-        labelHashSet needComm_;
-
-        globalIndex globalNumbering_;
-
-
-    // Protected Member Functions
-
-        //- Return patch of all coupled faces.
-        autoPtr<indirectPrimitivePatch> nonEmptyFacesPatch() const;
-
-        //- Return patch of all coupled faces.
-        autoPtr<indirectPrimitivePatch> allCoupledFacesPatch() const;
-
-        //- Valid boundary faces (not empty and not coupled)
-        void validBoundaryFaces(boolList& isValidBFace) const;
-
-        //- Merge two lists and guarantee globalI is first.
-        static void merge
-        (
-            const label globalI,
-            const labelList& pGlobals,
-            labelList& cCells
-        );
-
-        //- Combine operator for labelLists
-        class unionEqOp
-        {
-            public:
-            void operator()(labelList& x, const labelList& y) const;
-        };
-
-        //- Collect cell neighbours of faces in global numbering
-        void insertFaceCells
-        (
-            const label exclude0,
-            const label exclude1,
-            const boolList& nonEmptyFace,
-            const labelList& faceLabels,
-            labelHashSet& globals
-        ) const;
-
-        //- Collect cell neighbours of faces in global numbering
-        labelList calcFaceCells
-        (
-            const boolList& nonEmptyFace,
-            const labelList& faceLabels,
-            labelHashSet& globals
-        ) const;
-
-        virtual void calculateStencil
-        (
-            const boolList& zone,
-            labelListList& globalCellCells
-        ) = 0;
-
-
-        //- No copy construct
-        zoneCellStencils(const zoneCellStencils&) = delete;
-
-        //- No copy assignment
-        void operator=(const zoneCellStencils&) = delete;
-
-public:
-
-        // Declare name of the class and its debug switch
-        TypeName("zoneCellStencils");
-
-
-    // Constructors
-
-        //- Construct from all cells and boundary faces
-        explicit zoneCellStencils(const fvMesh&);
-
-        //- Calculates per cell the neighbour data
-        //  (= cell or boundary in global numbering).
-        //  First element is always cell itself!
-        //- Destructor
-        virtual ~zoneCellStencils() = default;
-
-
-    // Member Functions
-
-        void updateStencil
-        (
-            const boolList& zone
-        )
-        {
-            calculateStencil(zone,*this);
-        }
-
-        const labelHashSet& needsComm()
-        {
-            return needComm_;
-        }
-
-        const polyMesh& mesh() const
-        {
-            return meshRef_;
-        }
-
-         //- Global numbering for cells and boundary faces
-        const globalIndex& globalNumbering() const
-        {
-             return globalNumbering_;
-        }
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/boundaryConditions/dynContactAngleModel/dynamicAlphaContactAngleJiang/dynamicAlphaContactAngleJiangFvPatchScalarField.C b/src/boundaryConditions/dynContactAngleModel/dynamicAlphaContactAngleJiang/dynamicAlphaContactAngleJiangFvPatchScalarField.C
index 7787f258..de373293 100644
--- a/src/boundaryConditions/dynContactAngleModel/dynamicAlphaContactAngleJiang/dynamicAlphaContactAngleJiangFvPatchScalarField.C
+++ b/src/boundaryConditions/dynContactAngleModel/dynamicAlphaContactAngleJiang/dynamicAlphaContactAngleJiangFvPatchScalarField.C
@@ -42,7 +42,7 @@ dynamicAlphaContactAngleJiangFvPatchScalarField
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    alphaContactAngleFvPatchScalarField(p, iF),
+    alphaContactAngleTwoPhaseFvPatchScalarField(p, iF),
     theta0_(0.0)
 {}
 
@@ -56,7 +56,7 @@ dynamicAlphaContactAngleJiangFvPatchScalarField
     const fvPatchFieldMapper& mapper
 )
 :
-    alphaContactAngleFvPatchScalarField(gcpsf, p, iF, mapper),
+    alphaContactAngleTwoPhaseFvPatchScalarField(gcpsf, p, iF, mapper),
     theta0_(gcpsf.theta0_)
 {}
 
@@ -69,7 +69,7 @@ dynamicAlphaContactAngleJiangFvPatchScalarField
     const dictionary& dict
 )
 :
-    alphaContactAngleFvPatchScalarField(p, iF, dict),
+    alphaContactAngleTwoPhaseFvPatchScalarField(p, iF, dict),
     theta0_(readScalar(dict.lookup("theta0")))
 {
     evaluate();
@@ -82,7 +82,7 @@ dynamicAlphaContactAngleJiangFvPatchScalarField
     const dynamicAlphaContactAngleJiangFvPatchScalarField& gcpsf
 )
 :
-    alphaContactAngleFvPatchScalarField(gcpsf),
+    alphaContactAngleTwoPhaseFvPatchScalarField(gcpsf),
     theta0_(gcpsf.theta0_)
 {}
 
@@ -94,7 +94,7 @@ dynamicAlphaContactAngleJiangFvPatchScalarField
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    alphaContactAngleFvPatchScalarField(gcpsf, iF),
+    alphaContactAngleTwoPhaseFvPatchScalarField(gcpsf, iF),
     theta0_(gcpsf.theta0_)
 {}
 
@@ -186,7 +186,7 @@ Foam::dynamicAlphaContactAngleJiangFvPatchScalarField::theta
 
 void Foam::dynamicAlphaContactAngleJiangFvPatchScalarField::write(Ostream& os) const
 {
-    alphaContactAngleFvPatchScalarField::write(os);
+    alphaContactAngleTwoPhaseFvPatchScalarField::write(os);
     os.writeKeyword("theta0") << theta0_ << token::END_STATEMENT << nl;
     writeEntry("value", os);
 }
diff --git a/src/boundaryConditions/dynContactAngleModel/dynamicAlphaContactAngleJiang/dynamicAlphaContactAngleJiangFvPatchScalarField.H b/src/boundaryConditions/dynContactAngleModel/dynamicAlphaContactAngleJiang/dynamicAlphaContactAngleJiangFvPatchScalarField.H
index 8fd802b9..554132aa 100644
--- a/src/boundaryConditions/dynContactAngleModel/dynamicAlphaContactAngleJiang/dynamicAlphaContactAngleJiangFvPatchScalarField.H
+++ b/src/boundaryConditions/dynContactAngleModel/dynamicAlphaContactAngleJiang/dynamicAlphaContactAngleJiangFvPatchScalarField.H
@@ -26,7 +26,7 @@ Class
 
 Description
     A dynamic alphaContactAngle scalar boundary condition
-    (alphaContactAngleFvPatchScalarField)
+    (alphaContactAngleTwoPhaseFvPatchScalarField)
 
 SourceFiles
     dynamicAlphaContactAngleJiangFvPatchScalarField.C
@@ -37,7 +37,7 @@ SourceFiles
 #ifndef dynamicAlphaContactAngleJiangFvPatchScalarField_H
 #define dynamicAlphaContactAngleJiangFvPatchScalarField_H
 
-#include "alphaContactAngleFvPatchScalarField.H"
+#include "alphaContactAngleTwoPhaseFvPatchScalarField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -50,7 +50,7 @@ namespace Foam
 
 class dynamicAlphaContactAngleJiangFvPatchScalarField
 :
-    public alphaContactAngleFvPatchScalarField
+    public alphaContactAngleTwoPhaseFvPatchScalarField
 {
     // Private data
 
diff --git a/src/boundaryConditions/dynContactAngleModel/dynamicAlphaContactAngleVoxVoinov/dynamicAlphaContactAngleVoxVoinovFvPatchScalarField.C b/src/boundaryConditions/dynContactAngleModel/dynamicAlphaContactAngleVoxVoinov/dynamicAlphaContactAngleVoxVoinovFvPatchScalarField.C
index 7a2a1ed5..157ba6c0 100644
--- a/src/boundaryConditions/dynContactAngleModel/dynamicAlphaContactAngleVoxVoinov/dynamicAlphaContactAngleVoxVoinovFvPatchScalarField.C
+++ b/src/boundaryConditions/dynContactAngleModel/dynamicAlphaContactAngleVoxVoinov/dynamicAlphaContactAngleVoxVoinovFvPatchScalarField.C
@@ -23,6 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
+#include "dimensionedScalarFwd.H"
 #include "dynamicAlphaContactAngleVoxVoinovFvPatchScalarField.H"
 #include "addToRunTimeSelectionTable.H"
 #include "fvPatchFieldMapper.H"
@@ -40,7 +41,7 @@ dynamicAlphaContactAngleVoxVoinovFvPatchScalarField
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    alphaContactAngleFvPatchScalarField(p, iF),
+    alphaContactAngleTwoPhaseFvPatchScalarField(p, iF),
     theta0_(0.0),
     ct_(0.0)
 {}
@@ -55,7 +56,7 @@ dynamicAlphaContactAngleVoxVoinovFvPatchScalarField
     const fvPatchFieldMapper& mapper
 )
 :
-    alphaContactAngleFvPatchScalarField(gcpsf, p, iF, mapper),
+    alphaContactAngleTwoPhaseFvPatchScalarField(gcpsf, p, iF, mapper),
     theta0_(gcpsf.theta0_),
     ct_(gcpsf.ct_)
 {}
@@ -69,7 +70,7 @@ dynamicAlphaContactAngleVoxVoinovFvPatchScalarField
     const dictionary& dict
 )
 :
-    alphaContactAngleFvPatchScalarField(p, iF, dict),
+    alphaContactAngleTwoPhaseFvPatchScalarField(p, iF, dict),
     theta0_(readScalar(dict.lookup("theta0"))),
     ct_(readScalar(dict.lookup("ct")))
 {
@@ -83,7 +84,7 @@ dynamicAlphaContactAngleVoxVoinovFvPatchScalarField
     const dynamicAlphaContactAngleVoxVoinovFvPatchScalarField& gcpsf
 )
 :
-    alphaContactAngleFvPatchScalarField(gcpsf),
+    alphaContactAngleTwoPhaseFvPatchScalarField(gcpsf),
     theta0_(gcpsf.theta0_),
     ct_(gcpsf.ct_)
 {}
@@ -96,7 +97,7 @@ dynamicAlphaContactAngleVoxVoinovFvPatchScalarField
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    alphaContactAngleFvPatchScalarField(gcpsf, iF),
+    alphaContactAngleTwoPhaseFvPatchScalarField(gcpsf, iF),
     theta0_(gcpsf.theta0_),
     ct_(gcpsf.ct_)
 {}
@@ -142,15 +143,9 @@ Foam::dynamicAlphaContactAngleVoxVoinovFvPatchScalarField::theta
     word phase1Name (wordList(transportProperties.lookup("phases"))[0]);
     word phase2Name (wordList(transportProperties.lookup("phases"))[1]);
 
-    const volScalarField& alpha =
-        this->db().objectRegistry::lookupObject<volScalarField>
-        (
-            IOobject::groupName("alpha", phase1Name)
-        );
-
-    dimensionedScalar rho1(transportProperties.subDict(phase1Name).lookup("rho"));
+    dimensionedScalar rho1(transportProperties.subDict(phase1Name).get<dimensionedScalar>("rho"));
 
-    dimensionedScalar sigmap(transportProperties.lookup("sigma"));
+    dimensionedScalar sigmap(transportProperties.get<dimensionedScalar>("sigma"));
 
     const fvPatchScalarField&  nu1p = nu1.boundaryField()[patchi];
 
@@ -194,7 +189,7 @@ Foam::dynamicAlphaContactAngleVoxVoinovFvPatchScalarField::theta
 
 void Foam::dynamicAlphaContactAngleVoxVoinovFvPatchScalarField::write(Ostream& os) const
 {
-    alphaContactAngleFvPatchScalarField::write(os);
+    alphaContactAngleTwoPhaseFvPatchScalarField::write(os);
     os.writeKeyword("theta0") << theta0_ << token::END_STATEMENT << nl;
     os.writeKeyword("ct") << ct_ << token::END_STATEMENT << nl;
     writeEntry("value", os);
diff --git a/src/boundaryConditions/dynContactAngleModel/dynamicAlphaContactAngleVoxVoinov/dynamicAlphaContactAngleVoxVoinovFvPatchScalarField.H b/src/boundaryConditions/dynContactAngleModel/dynamicAlphaContactAngleVoxVoinov/dynamicAlphaContactAngleVoxVoinovFvPatchScalarField.H
index c22964f1..aeacebf1 100644
--- a/src/boundaryConditions/dynContactAngleModel/dynamicAlphaContactAngleVoxVoinov/dynamicAlphaContactAngleVoxVoinovFvPatchScalarField.H
+++ b/src/boundaryConditions/dynContactAngleModel/dynamicAlphaContactAngleVoxVoinov/dynamicAlphaContactAngleVoxVoinovFvPatchScalarField.H
@@ -26,7 +26,7 @@ Class
 
 Description
     A dynamic alphaContactAngle scalar boundary condition
-    (alphaContactAngleFvPatchScalarField)
+    (alphaContactAngleTwoPhaseFvPatchScalarField)
 
 SourceFiles
     dynamicAlphaContactAngleVoxVoinovFvPatchScalarField.C
@@ -38,7 +38,7 @@ SourceFiles
 #ifndef dynamicAlphaContactAngleVoxVoinovFvPatchScalarField_H
 #define dynamicAlphaContactAngleVoxVoinovFvPatchScalarField_H
 
-#include "alphaContactAngleFvPatchScalarField.H"
+#include "alphaContactAngleTwoPhaseFvPatchScalarField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -51,7 +51,7 @@ namespace Foam
 
 class dynamicAlphaContactAngleVoxVoinovFvPatchScalarField
 :
-    public alphaContactAngleFvPatchScalarField
+    public alphaContactAngleTwoPhaseFvPatchScalarField
 {
     // Private data
 
diff --git a/src/boundaryConditions/dynContactAngleModelComp/dynamicAlphaContactAngleJiang/dynamicAlphaContactAngleJiangFvPatchScalarField.C b/src/boundaryConditions/dynContactAngleModelComp/dynamicAlphaContactAngleJiang/dynamicAlphaContactAngleJiangFvPatchScalarField.C
index 23644e30..c6baeeb8 100644
--- a/src/boundaryConditions/dynContactAngleModelComp/dynamicAlphaContactAngleJiang/dynamicAlphaContactAngleJiangFvPatchScalarField.C
+++ b/src/boundaryConditions/dynContactAngleModelComp/dynamicAlphaContactAngleJiang/dynamicAlphaContactAngleJiangFvPatchScalarField.C
@@ -44,7 +44,7 @@ dynamicAlphaContactAngleJiangFvPatchScalarField
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    alphaContactAngleFvPatchScalarField(p, iF),
+    alphaContactAngleTwoPhaseFvPatchScalarField(p, iF),
     theta0_(0.0)
 {}
 
@@ -58,7 +58,7 @@ dynamicAlphaContactAngleJiangFvPatchScalarField
     const fvPatchFieldMapper& mapper
 )
 :
-    alphaContactAngleFvPatchScalarField(gcpsf, p, iF, mapper),
+    alphaContactAngleTwoPhaseFvPatchScalarField(gcpsf, p, iF, mapper),
     theta0_(gcpsf.theta0_)
 {}
 
@@ -71,7 +71,7 @@ dynamicAlphaContactAngleJiangFvPatchScalarField
     const dictionary& dict
 )
 :
-    alphaContactAngleFvPatchScalarField(p, iF, dict),
+    alphaContactAngleTwoPhaseFvPatchScalarField(p, iF, dict),
     theta0_(readScalar(dict.lookup("theta0")))
 {
     evaluate();
@@ -84,7 +84,7 @@ dynamicAlphaContactAngleJiangFvPatchScalarField
     const dynamicAlphaContactAngleJiangFvPatchScalarField& gcpsf
 )
 :
-    alphaContactAngleFvPatchScalarField(gcpsf),
+    alphaContactAngleTwoPhaseFvPatchScalarField(gcpsf),
     theta0_(gcpsf.theta0_)
 {}
 
@@ -96,7 +96,7 @@ dynamicAlphaContactAngleJiangFvPatchScalarField
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    alphaContactAngleFvPatchScalarField(gcpsf, iF),
+    alphaContactAngleTwoPhaseFvPatchScalarField(gcpsf, iF),
     theta0_(gcpsf.theta0_)
 {}
 
@@ -174,7 +174,7 @@ Foam::dynamicAlphaContactAngleJiangFvPatchScalarField::theta
 
 void Foam::dynamicAlphaContactAngleJiangFvPatchScalarField::write(Ostream& os) const
 {
-    alphaContactAngleFvPatchScalarField::write(os);
+    alphaContactAngleTwoPhaseFvPatchScalarField::write(os);
     os.writeKeyword("theta0") << theta0_ << token::END_STATEMENT << nl;
     writeEntry("value", os);
 }
diff --git a/src/boundaryConditions/dynContactAngleModelComp/dynamicAlphaContactAngleJiang/dynamicAlphaContactAngleJiangFvPatchScalarField.H b/src/boundaryConditions/dynContactAngleModelComp/dynamicAlphaContactAngleJiang/dynamicAlphaContactAngleJiangFvPatchScalarField.H
index 59c3c05f..18e7b048 100644
--- a/src/boundaryConditions/dynContactAngleModelComp/dynamicAlphaContactAngleJiang/dynamicAlphaContactAngleJiangFvPatchScalarField.H
+++ b/src/boundaryConditions/dynContactAngleModelComp/dynamicAlphaContactAngleJiang/dynamicAlphaContactAngleJiangFvPatchScalarField.H
@@ -26,7 +26,7 @@ Class
 
 Description
     A dynamic alphaContactAngle scalar boundary condition
-    (alphaContactAngleFvPatchScalarField)
+    (alphaContactAngleTwoPhaseFvPatchScalarField)
 
 SourceFiles
     dynamicAlphaContactAngleJiangFvPatchScalarField.C
@@ -34,14 +34,14 @@ SourceFiles
 
 Dynamics of Spreading of Liquid on Solid Surface* nach dem paper Eq15
 
-thetaD^3 −θ0^3 = cT Ca ct numerical 
+thetaD^3 −θ0^3 = cT Ca ct numerical
 
 \*---------------------------------------------------------------------------*/
 
 #ifndef dynamicAlphaContactAngleJiangFvPatchScalarField_H
 #define dynamicAlphaContactAngleJiangFvPatchScalarField_H
 
-#include "alphaContactAngleFvPatchScalarField.H"
+#include "alphaContactAngleTwoPhaseFvPatchScalarField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -54,7 +54,7 @@ namespace Foam
 
 class dynamicAlphaContactAngleJiangFvPatchScalarField
 :
-    public alphaContactAngleFvPatchScalarField
+    public alphaContactAngleTwoPhaseFvPatchScalarField
 {
     // Private data
 
diff --git a/src/boundaryConditions/dynContactAngleModelComp/dynamicAlphaContactAngleVoxVoinov/compdynamicAlphaContactAngleVoxVoinovFvPatchScalarField.C b/src/boundaryConditions/dynContactAngleModelComp/dynamicAlphaContactAngleVoxVoinov/compdynamicAlphaContactAngleVoxVoinovFvPatchScalarField.C
index f61f6632..e5b09e45 100644
--- a/src/boundaryConditions/dynContactAngleModelComp/dynamicAlphaContactAngleVoxVoinov/compdynamicAlphaContactAngleVoxVoinovFvPatchScalarField.C
+++ b/src/boundaryConditions/dynContactAngleModelComp/dynamicAlphaContactAngleVoxVoinov/compdynamicAlphaContactAngleVoxVoinovFvPatchScalarField.C
@@ -41,7 +41,7 @@ compdynamicAlphaContactAngleVoxVoinovFvPatchScalarField
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    alphaContactAngleFvPatchScalarField(p, iF),
+    alphaContactAngleTwoPhaseFvPatchScalarField(p, iF),
     init_(true),
     theta0_(0.0),
     ct_(0.0),
@@ -58,7 +58,7 @@ compdynamicAlphaContactAngleVoxVoinovFvPatchScalarField
     const fvPatchFieldMapper& mapper
 )
 :
-    alphaContactAngleFvPatchScalarField(gcpsf, p, iF, mapper),
+    alphaContactAngleTwoPhaseFvPatchScalarField(gcpsf, p, iF, mapper),
     init_(true),
     theta0_(gcpsf.theta0_),
     ct_(gcpsf.ct_),
@@ -74,7 +74,7 @@ compdynamicAlphaContactAngleVoxVoinovFvPatchScalarField
     const dictionary& dict
 )
 :
-    alphaContactAngleFvPatchScalarField(p, iF, dict),
+    alphaContactAngleTwoPhaseFvPatchScalarField(p, iF, dict),
     init_(true),
     theta0_(readScalar(dict.lookup("theta0"))),
     ct_(readScalar(dict.lookup("ct"))),
@@ -90,7 +90,7 @@ compdynamicAlphaContactAngleVoxVoinovFvPatchScalarField
     const compdynamicAlphaContactAngleVoxVoinovFvPatchScalarField& gcpsf
 )
 :
-    alphaContactAngleFvPatchScalarField(gcpsf),
+    alphaContactAngleTwoPhaseFvPatchScalarField(gcpsf),
     init_(true),
     theta0_(gcpsf.theta0_),
     ct_(gcpsf.ct_),
@@ -105,7 +105,7 @@ compdynamicAlphaContactAngleVoxVoinovFvPatchScalarField
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    alphaContactAngleFvPatchScalarField(gcpsf, iF),
+    alphaContactAngleTwoPhaseFvPatchScalarField(gcpsf, iF),
     init_(true),
     theta0_(gcpsf.theta0_),
     ct_(gcpsf.ct_),
@@ -147,7 +147,7 @@ Foam::compdynamicAlphaContactAngleVoxVoinovFvPatchScalarField::theta
         "thermophysicalProperties"
     );
 
-    dimensionedScalar sigmap(thermophysicalProperties.lookup("sigma"));
+    dimensionedScalar sigmap(thermophysicalProperties.get<dimensionedScalar>("sigma"));
 
     const fvPatchScalarField&  mu1p = mu1.boundaryField()[patchi];
 
@@ -195,7 +195,7 @@ Foam::compdynamicAlphaContactAngleVoxVoinovFvPatchScalarField::theta
 
 void Foam::compdynamicAlphaContactAngleVoxVoinovFvPatchScalarField::write(Ostream& os) const
 {
-    alphaContactAngleFvPatchScalarField::write(os);
+    alphaContactAngleTwoPhaseFvPatchScalarField::write(os);
     os.writeKeyword("theta0") << theta0_ << token::END_STATEMENT << nl;
     os.writeKeyword("ct") << ct_ << token::END_STATEMENT << nl;
     os.writeKeyword("muFieldName") << muName_ << token::END_STATEMENT << nl;
diff --git a/src/boundaryConditions/dynContactAngleModelComp/dynamicAlphaContactAngleVoxVoinov/compdynamicAlphaContactAngleVoxVoinovFvPatchScalarField.H b/src/boundaryConditions/dynContactAngleModelComp/dynamicAlphaContactAngleVoxVoinov/compdynamicAlphaContactAngleVoxVoinovFvPatchScalarField.H
index c3669702..3ca7e7d6 100644
--- a/src/boundaryConditions/dynContactAngleModelComp/dynamicAlphaContactAngleVoxVoinov/compdynamicAlphaContactAngleVoxVoinovFvPatchScalarField.H
+++ b/src/boundaryConditions/dynContactAngleModelComp/dynamicAlphaContactAngleVoxVoinov/compdynamicAlphaContactAngleVoxVoinovFvPatchScalarField.H
@@ -26,7 +26,7 @@ Class
 
 Description
     A dynamic alphaContactAngle scalar boundary condition
-    (alphaContactAngleFvPatchScalarField)
+    (alphaContactAngleTwoPhaseFvPatchScalarField)
 
 SourceFiles
     compdynamicAlphaContactAngleVoxVoinovFvPatchScalarField.C
@@ -37,7 +37,7 @@ SourceFiles
 #ifndef compdynamicAlphaContactAngleVoxVoinovFvPatchScalarField_H
 #define compdynamicAlphaContactAngleVoxVoinovFvPatchScalarField_H
 
-#include "alphaContactAngleFvPatchScalarField.H"
+#include "alphaContactAngleTwoPhaseFvPatchScalarField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -50,7 +50,7 @@ namespace Foam
 
 class compdynamicAlphaContactAngleVoxVoinovFvPatchScalarField
 :
-    public alphaContactAngleFvPatchScalarField
+    public alphaContactAngleTwoPhaseFvPatchScalarField
 {
     // Private data
 
diff --git a/src/phaseChange/interfaceDiffFlux/explicitInterfaceDiffFlux/explicitInterfaceDiffFlux.C b/src/phaseChange/interfaceDiffFlux/explicitInterfaceDiffFlux/explicitInterfaceDiffFlux.C
index 95319060..0fc33f4d 100644
--- a/src/phaseChange/interfaceDiffFlux/explicitInterfaceDiffFlux/explicitInterfaceDiffFlux.C
+++ b/src/phaseChange/interfaceDiffFlux/explicitInterfaceDiffFlux/explicitInterfaceDiffFlux.C
@@ -21,7 +21,6 @@ License
 #include "explicitInterfaceDiffFlux.H"
 #include "zeroGradientFvPatchFields.H"
 
-#include "alphaContactAngleFvPatchScalarField.H"
 #include "mathematicalConstants.H"
 #include "surfaceInterpolate.H"
 #include "fvcDiv.H"
diff --git a/src/phaseChange/phaseChangeModels/energySourceTermModel/Schrage/Schrage.C b/src/phaseChange/phaseChangeModels/energySourceTermModel/Schrage/Schrage.C
index 11e90ec0..11db6334 100644
--- a/src/phaseChange/phaseChangeModels/energySourceTermModel/Schrage/Schrage.C
+++ b/src/phaseChange/phaseChangeModels/energySourceTermModel/Schrage/Schrage.C
@@ -22,7 +22,6 @@ License
 #include "addToRunTimeSelectionTable.H"
 #include "zeroGradientFvPatchFields.H"
 
-#include "alphaContactAngleFvPatchScalarField.H"
 #include "mathematicalConstants.H"
 #include "surfaceInterpolate.H"
 #include "fvcDiv.H"
@@ -189,7 +188,7 @@ Foam::tmp<Foam::volScalarField> Foam::Schrage::energyFlux1()
         *rho2/pow(TSat,1.5)
     );
 
-    volScalarField interface = phase2_*0;
+    volScalarField interface(phase2_*0);
     interface.boundaryFieldRef() = Zero;
 
     for (const label celli: surf_.interfaceLabels())
@@ -222,7 +221,7 @@ Foam::tmp<Foam::volScalarField> Foam::Schrage::energyFlux2()
         *rho2/pow(TSat,1.5)
     );
 
-    volScalarField interface = phase2_*0;
+    volScalarField interface(phase2_*0);
     interface.boundaryFieldRef() = Zero;
 
     for (const label celli: surf_.interfaceLabels())
diff --git a/src/phaseChange/phaseChangeModels/energySourceTermModel/newEnergySourceTermModel.C b/src/phaseChange/phaseChangeModels/energySourceTermModel/newEnergySourceTermModel.C
index 8786577a..236d74dd 100644
--- a/src/phaseChange/phaseChangeModels/energySourceTermModel/newEnergySourceTermModel.C
+++ b/src/phaseChange/phaseChangeModels/energySourceTermModel/newEnergySourceTermModel.C
@@ -41,33 +41,32 @@ Foam::energySourceTermModel::New
     Info<< "Selecting energySourceTermModel model "
         << energySourceTermModelTypeName << endl;
 
-    componentsConstructorTable::iterator cstrIter =
-        componentsConstructorTablePtr_
-            ->find(energySourceTermModelTypeName);
 
-    if (cstrIter == componentsConstructorTablePtr_->end())
+    auto ctorPtr = componentsConstructorTable(energySourceTermModelTypeName);
+
+    if (!ctorPtr)
     {
-        FatalErrorIn
+        FatalErrorInLookup
         (
-            "energySourceTermModel::New"
-        )   << "Unknown energySourceTermModel type "
-            << energySourceTermModelTypeName << endl << endl
-            << "Valid  energySourceTermModels are : " << endl
-            << componentsConstructorTablePtr_->sortedToc()
-            << exit(FatalError);
+            "energySourceTermModel",
+            energySourceTermModelTypeName,
+            *componentsConstructorTablePtr_
+        ) << exit(FatalError);
     }
 
-    return
-    autoPtr<energySourceTermModel>(cstrIter()
+    return autoPtr<energySourceTermModel>
     (
-        phase1,
-        phase2,
-        turbModel,
-        p,
-        satModel,
-        surf,
-        dict
-    ));
+        ctorPtr
+        (
+            phase1,
+            phase2,
+            turbModel,
+            p,
+            satModel,
+            surf,
+            dict
+        )
+    );
 }
 
 
diff --git a/src/phaseChange/phaseChangeModels/macroModels/directEvaporation/directEvaporation.C b/src/phaseChange/phaseChangeModels/macroModels/directEvaporation/directEvaporation.C
index 73a68759..25b1b10b 100644
--- a/src/phaseChange/phaseChangeModels/macroModels/directEvaporation/directEvaporation.C
+++ b/src/phaseChange/phaseChangeModels/macroModels/directEvaporation/directEvaporation.C
@@ -136,8 +136,10 @@ void Foam::directEvaporation::energySource(volScalarField& Q)
         mag(normal)
     );
 
-    volScalarField scaledEvapSource=
-        interface*dimensionedScalar("0",dimless,1);
+    volScalarField scaledEvapSource
+    (
+        interface*dimensionedScalar("0",dimless,1)
+    );
 
     dimensionedScalar area("area",dimArea,gSum(mag(normal)().internalField()));
     if (area.value() != 0)
diff --git a/src/phaseChange/phaseChangeModels/macroModels/macroModels.C b/src/phaseChange/phaseChangeModels/macroModels/macroModels.C
index 30058d40..9ff939bc 100644
--- a/src/phaseChange/phaseChangeModels/macroModels/macroModels.C
+++ b/src/phaseChange/phaseChangeModels/macroModels/macroModels.C
@@ -37,32 +37,30 @@ Foam::macroModel::New
     Info<< "Selecting macroModel model "
         << macroModelTypeName << endl;
 
-    componentsConstructorTable::iterator cstrIter =
-        componentsConstructorTablePtr_
-            ->find(macroModelTypeName);
+    auto ctorPtr = componentsConstructorTable(macroModelTypeName);
 
-    if (cstrIter == componentsConstructorTablePtr_->end())
+    if (!ctorPtr)
     {
-        FatalErrorIn
+        FatalErrorInLookup
         (
-            "macroModel::New"
-        )   << "Unknown macroModel type "
-            << macroModelTypeName << endl << endl
-            << "Valid  macroModels are : " << endl
-            << componentsConstructorTablePtr_->sortedToc()
-            << exit(FatalError);
+            "macroModel",
+            macroModelTypeName,
+            *componentsConstructorTablePtr_
+        ) << exit(FatalError);
     }
 
-    return
-    autoPtr<macroModel>(cstrIter()
+    return autoPtr<macroModel>
     (
-        phase1,
-        phase2,
-        p,
-        satModel,
-        turbModel,
-        dict
-    ));
+        ctorPtr
+        (
+            phase1,
+            phase2,
+            p,
+            satModel,
+            turbModel,
+            dict
+        )
+    );
 }
 
 
diff --git a/src/phaseChange/phaseChangeModels/massSourceTermModel/hardtWondra/hardtWondra.C b/src/phaseChange/phaseChangeModels/massSourceTermModel/hardtWondra/hardtWondra.C
index c06ad646..82bbda9d 100644
--- a/src/phaseChange/phaseChangeModels/massSourceTermModel/hardtWondra/hardtWondra.C
+++ b/src/phaseChange/phaseChangeModels/massSourceTermModel/hardtWondra/hardtWondra.C
@@ -22,7 +22,6 @@ License
 #include "addToRunTimeSelectionTable.H"
 #include "zeroGradientFvPatchFields.H"
 
-#include "alphaContactAngleFvPatchScalarField.H"
 #include "mathematicalConstants.H"
 #include "surfaceInterpolate.H"
 #include "fvcDiv.H"
diff --git a/src/phaseChange/phaseChangeModels/massSourceTermModel/hardtWondraGasPhase/hardtWondraGasPhase.C b/src/phaseChange/phaseChangeModels/massSourceTermModel/hardtWondraGasPhase/hardtWondraGasPhase.C
index 6ffe61a3..fdf37f69 100644
--- a/src/phaseChange/phaseChangeModels/massSourceTermModel/hardtWondraGasPhase/hardtWondraGasPhase.C
+++ b/src/phaseChange/phaseChangeModels/massSourceTermModel/hardtWondraGasPhase/hardtWondraGasPhase.C
@@ -22,7 +22,6 @@ License
 #include "addToRunTimeSelectionTable.H"
 #include "zeroGradientFvPatchFields.H"
 
-#include "alphaContactAngleFvPatchScalarField.H"
 #include "mathematicalConstants.H"
 #include "surfaceInterpolate.H"
 #include "fvcDiv.H"
diff --git a/src/phaseChange/phaseChangeModels/massSourceTermModel/newMassSourceTermModel.C b/src/phaseChange/phaseChangeModels/massSourceTermModel/newMassSourceTermModel.C
index 7f2d2a22..cacc49da 100644
--- a/src/phaseChange/phaseChangeModels/massSourceTermModel/newMassSourceTermModel.C
+++ b/src/phaseChange/phaseChangeModels/massSourceTermModel/newMassSourceTermModel.C
@@ -41,31 +41,30 @@ Foam::massSourceTermModel::New
     Info<< "Selecting massSourceTermModel model "
         << massSourceTermModelTypeName << endl;
 
-    componentsConstructorTable::iterator cstrIter =
-        componentsConstructorTablePtr_
-            ->find(massSourceTermModelTypeName);
+    auto ctorPtr = componentsConstructorTable(massSourceTermModelTypeName);
 
-    if (cstrIter == componentsConstructorTablePtr_->end())
+    if (!ctorPtr)
     {
-        FatalErrorIn
+        FatalErrorInLookup
         (
-            "massSourceTermModel::New"
-        )   << "Unknown massSourceTermModel type "
-            << massSourceTermModelTypeName << endl << endl
-            << "Valid  massSourceTermModels are : " << endl
-            << componentsConstructorTablePtr_->sortedToc()
-            << exit(FatalError);
+            "massSourceTermModel",
+            massSourceTermModelTypeName,
+            *componentsConstructorTablePtr_
+        ) << exit(FatalError);
     }
 
-    return autoPtr<massSourceTermModel>(cstrIter()
+    return autoPtr<massSourceTermModel>
     (
+        ctorPtr
+        (
         phase1,
         phase2,
         p,
         satModel,
         surf,
         dict
-    ));
+        )
+    );
 }
 
 
diff --git a/src/phaseChange/phaseChangeModels/massSourceTermModel/noPhaseChange/noPhaseChange.C b/src/phaseChange/phaseChangeModels/massSourceTermModel/noPhaseChange/noPhaseChange.C
index 30cde702..d1431009 100644
--- a/src/phaseChange/phaseChangeModels/massSourceTermModel/noPhaseChange/noPhaseChange.C
+++ b/src/phaseChange/phaseChangeModels/massSourceTermModel/noPhaseChange/noPhaseChange.C
@@ -22,7 +22,6 @@ License
 #include "addToRunTimeSelectionTable.H"
 #include "zeroGradientFvPatchFields.H"
 
-#include "alphaContactAngleFvPatchScalarField.H"
 #include "mathematicalConstants.H"
 #include "surfaceInterpolate.H"
 #include "fvcDiv.H"
diff --git a/src/phaseChange/saturationProperties/singleComponentSatProp/newSingleComponentSatProp.C b/src/phaseChange/saturationProperties/singleComponentSatProp/newSingleComponentSatProp.C
index 502d65fe..c03fd15b 100644
--- a/src/phaseChange/saturationProperties/singleComponentSatProp/newSingleComponentSatProp.C
+++ b/src/phaseChange/saturationProperties/singleComponentSatProp/newSingleComponentSatProp.C
@@ -39,23 +39,26 @@ Foam::singleComponentSatProp::New
     Info<< "Selecting saturation model "
         << singleComponentSatPropTypeName << endl;
 
-    componentsConstructorTable::iterator cstrIter =
-        componentsConstructorTablePtr_
-            ->find(singleComponentSatPropTypeName);
+    auto ctorPtr = componentsConstructorTable(singleComponentSatPropTypeName);
 
-    if (cstrIter == componentsConstructorTablePtr_->end())
+    if (!ctorPtr)
     {
-        FatalErrorIn
+        FatalErrorInLookup
         (
-            "saturationModel singleComponentSatProp::New"
-        )   << "Unknown singleComponentSatProp type "
-            << singleComponentSatPropTypeName << endl << endl
-            << "Valid  singleComponentSatProps are : " << endl
-            << componentsConstructorTablePtr_->sortedToc()
-            << exit(FatalError);
+            "singleComponentSatProp",
+            singleComponentSatPropTypeName,
+            *componentsConstructorTablePtr_
+        ) << exit(FatalError);
     }
 
-    return autoPtr<singleComponentSatProp>(cstrIter()(mesh,dict));
+    return autoPtr<singleComponentSatProp>
+    (
+        ctorPtr
+        (
+            mesh,
+            dict
+        )
+    );
 }
 
 
diff --git a/src/phaseChange/saturationProperties/singleComponentSatProp/singleComponentSatProp.C b/src/phaseChange/saturationProperties/singleComponentSatProp/singleComponentSatProp.C
index df1a29d3..623f2695 100644
--- a/src/phaseChange/saturationProperties/singleComponentSatProp/singleComponentSatProp.C
+++ b/src/phaseChange/saturationProperties/singleComponentSatProp/singleComponentSatProp.C
@@ -46,8 +46,6 @@ Foam::singleComponentSatProp::singleComponentSatProp
     ),
     singleComponentSatPropCoeffs_(dict),
     mesh_(mesh),
-    Tmin_(modelDict().get<scalar>("Tmin")),
-    Tmax_(modelDict().get<scalar>("Tmax")),
     TSat_
     (
         IOobject
@@ -89,7 +87,9 @@ Foam::singleComponentSatProp::singleComponentSatProp
         mesh,
         dimEnergy/dimMass,
         calculatedFvPatchScalarField::typeName
-    )
+    ),
+    Tmin_(modelDict().get<scalar>("Tmin")),
+    Tmax_(modelDict().get<scalar>("Tmax"))
 {
 }
 
diff --git a/src/postProcessing/Make/files b/src/postProcessing/Make/files
index 9f156df2..cef3e127 100644
--- a/src/postProcessing/Make/files
+++ b/src/postProcessing/Make/files
@@ -1,7 +1,6 @@
 superHeated/superHeated.C
 interfaceEnergyFluxes/interfaceEnergyFluxes.C
 wallHeatFluxSolid/wallHeatFluxSolid.C
-thermalResiduals/thermalResiduals.C
 
 interface/interface.C
 interface/sampledInterface.C
diff --git a/src/postProcessing/Make/options b/src/postProcessing/Make/options
index 681d1f6a..fa209591 100644
--- a/src/postProcessing/Make/options
+++ b/src/postProcessing/Make/options
@@ -1,4 +1,5 @@
 EXE_INC = \
+    -I$(FOAM_UTILITIES)/preProcessing/setAlphaField/alphaFieldFunctions/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
@@ -34,6 +35,7 @@ EXE_INC = \
     -I../turbulence/VoFphaseCompressibleTurbulenceModels/lnInclude
 
 LIB_LIBS = \
+    -lalphaFieldFunctions \
     -lfiniteVolume \
     -ldynamicMesh \
     -lmeshTools \
diff --git a/src/postProcessing/interface/sampledInterface.C b/src/postProcessing/interface/sampledInterface.C
index 749cb58e..a40a0dec 100644
--- a/src/postProcessing/interface/sampledInterface.C
+++ b/src/postProcessing/interface/sampledInterface.C
@@ -77,7 +77,7 @@ bool Foam::sampledInterface::updateGeometry() const
         (
             new fvMeshSubset(fvm)
         );
-        subMeshPtr_().setLargeCellSubset
+        subMeshPtr_().setCellSubset
         (
             labelHashSet(mesh().cellZones()[zoneID_.index()]),
             exposedPatchi
diff --git a/src/postProcessing/interfaceEnergyFluxes/interfaceEnergyFluxes.C b/src/postProcessing/interfaceEnergyFluxes/interfaceEnergyFluxes.C
index aabdd618..84f820f1 100644
--- a/src/postProcessing/interfaceEnergyFluxes/interfaceEnergyFluxes.C
+++ b/src/postProcessing/interfaceEnergyFluxes/interfaceEnergyFluxes.C
@@ -162,7 +162,7 @@ bool Foam::functionObjects::interfaceEnergyFluxes::write()
 
     if (Pstream::master())
     {
-        writeTime(file());
+        writeCurrentTime(file());
 
         file()
             << token::TAB << intEnergyLiquid
diff --git a/src/postProcessing/reconstructionError/reconstructionError.C b/src/postProcessing/reconstructionError/reconstructionError.C
index eca3dc3f..79d88c67 100644
--- a/src/postProcessing/reconstructionError/reconstructionError.C
+++ b/src/postProcessing/reconstructionError/reconstructionError.C
@@ -200,7 +200,7 @@ void Foam::reconstructionError::write(const scalar k1, const scalar k2)
 
     if (Pstream::master())
     {
-        writeTime(file());
+        writeCurrentTime(file());
 
         file()
             << token::TAB << LNormalInf_
@@ -229,7 +229,7 @@ void Foam::reconstructionError::write()
 
     if (Pstream::master())
     {
-        writeTime(file());
+        writeCurrentTime(file());
 
         file()
             << token::TAB << LNormalInf_
diff --git a/src/postProcessing/superHeated/superHeated.C b/src/postProcessing/superHeated/superHeated.C
index eda0fa27..12dfd470 100644
--- a/src/postProcessing/superHeated/superHeated.C
+++ b/src/postProcessing/superHeated/superHeated.C
@@ -160,7 +160,7 @@ bool Foam::functionObjects::superHeated::write()
 
     if (Pstream::master())
     {
-        writeTime(file());
+        writeCurrentTime(file());
 
         file()
             << token::TAB << maximumValue
diff --git a/src/postProcessing/thermalResiduals/thermalResiduals.C b/src/postProcessing/thermalResiduals/thermalResiduals.C
deleted file mode 100644
index 8e3e2af3..00000000
--- a/src/postProcessing/thermalResiduals/thermalResiduals.C
+++ /dev/null
@@ -1,150 +0,0 @@
-/*---------------------------------------------------------------------------*\
-            Copyright (c) 2017-2019, German Aerospace Center (DLR)
--------------------------------------------------------------------------------
-License
-    This file is part of the VoFLibrary source code library, which is an
-    unofficial extension to OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "thermalResiduals.H"
-#include "surfaceInterpolate.H"
-#include "fvcSnGrad.H"
-#include "wallPolyPatch.H"
-#include "turbulentFluidThermoModel.H"
-#include "addToRunTimeSelectionTable.H"
-#include "singleComponentPhaseChange.H"
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace functionObjects
-{
-    defineTypeNameAndDebug(thermalResiduals, 0);
-    addToRunTimeSelectionTable(functionObject, thermalResiduals, dictionary);
-}
-}
-
-
-// * * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * //
-
-void Foam::functionObjects::thermalResiduals::writeFileHeader(Ostream& os) const
-{
-    // Add headers to output data
-    writeHeader(os, "thermalResiduals ");
-    writeCommented(os, "Time");
-    writeTabbed(os, "thermalResiduals_Vol");
-    writeTabbed(os, "thermalResiduals_Mass");
-    os  << endl;
-}
-
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::functionObjects::thermalResiduals::thermalResiduals
-(
-    const word& name,
-    const Time& runTime,
-    const dictionary& dict
-)
-:
-    fvMeshFunctionObject(name, runTime, dict),
-    writeFile(obr_, name, typeName, dict),
-    TField_(),
-    alphaField_(),
-    rhoField_(),
-    subCooled_("subCooled",dimTemperature,dict.get<scalar>("subCooled"))
-{
-
-
-
-    read(dict);
-
-    writeFileHeader(file());
-}
-
-
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::functionObjects::thermalResiduals::~thermalResiduals()
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-bool Foam::functionObjects::thermalResiduals::read(const dictionary& dict)
-{
-    fvMeshFunctionObject::read(dict);
-    writeFile::read(dict);
-
-    TField_ = word(dict.lookup("T"));
-    alphaField_ = word(dict.lookup("alpha"));
-    rhoField_ = word(dict.lookup("rho"));
-
-
-    return true;
-}
-
-
-bool Foam::functionObjects::thermalResiduals::execute()
-{
-    // do nothing
-
-    return true;
-}
-
-
-bool Foam::functionObjects::thermalResiduals::write()
-{
-
-    const volScalarField& T = lookupObject<volScalarField>(TField_);
-    singleComponentPhaseChange& pcModel = lookupObjectRef<singleComponentPhaseChange>("singleComponentPhaseChange");
-    const volScalarField& alpha1 = lookupObject<volScalarField>(alphaField_);
-    const volScalarField& rho1 = lookupObject<volScalarField>(rhoField_);
-    const volScalarField& p = lookupObject<volScalarField>("p");
-    const volScalarField& TSat = pcModel.satProp().TSat();
-
-
-    volScalarField thermalResVol = neg0(TSat-(T+subCooled_))*alpha1;
-    volScalarField thermalResMass = neg0(TSat-(T+subCooled_))*alpha1*rho1;
-
-
-    scalar intVolValue = fvc::domainIntegrate(thermalResVol.internalField()).value();
-    scalar intMassValue = fvc::domainIntegrate(thermalResMass.internalField()).value();
-
-
-    //Log << type() << " " << thermalResiduals.name() << " are " << intValue << endl;
-
-
-    if (Pstream::master())
-    {
-        writeTime(file());
-
-        file()
-            << token::TAB << intVolValue
-            << token::TAB << intMassValue
-            << endl;
-    }
-
-
-
-    return true;
-}
-
-
-// ************************************************************************* //
diff --git a/src/postProcessing/thermalResiduals/thermalResiduals.H b/src/postProcessing/thermalResiduals/thermalResiduals.H
deleted file mode 100644
index 27ce17aa..00000000
--- a/src/postProcessing/thermalResiduals/thermalResiduals.H
+++ /dev/null
@@ -1,162 +0,0 @@
-/*---------------------------------------------------------------------------*\
-            Copyright (c) 2017-2019, German Aerospace Center (DLR)
--------------------------------------------------------------------------------
-License
-    This file is part of the VoFLibrary source code library, which is an
-    unofficial extension to OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Class
-    Foam::functionObjects::thermalResiduals
-
-Group
-    grpForcesFunctionObjects
-
-Description
-    Calculates and write the heat-flux at wall patches as the
-    volScalarField field 'thermalResiduals'.
-
-    All wall patches are included by default; to restrict the calculation to
-    certain patches, use the optional 'patches' entry.
-
-Usage
-    Example of function object specification:
-    \verbatim
-    thermalResiduals1
-    {
-        type        thermalResiduals;
-        libs        ("libfieldFunctionObjects.so");
-        ...
-        patches     (".*Wall");
-    }
-    \endverbatim
-
-    Where the entries comprise:
-    \table
-        Property | Description                | Required   | Default value
-        type     | type name: thermalResiduals    | yes        |
-        patches  | list of patches to process | no         | all wall patches
-    \endtable
-
-See also
-    Foam::functionObject
-    Foam::functionObjects::fvMeshFunctionObject
-    Foam::functionObjects::writeFile
-    Foam::functionObjects::timeControl
-
-SourceFiles
-    thermalResiduals.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef functionObjects_thermalResiduals_H
-#define functionObjects_thermalResiduals_H
-
-#include "fvMeshFunctionObject.H"
-#include "writeFile.H"
-#include "volFieldsFwd.H"
-#include "HashSet.H"
-#include "dimensionedScalar.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace functionObjects
-{
-
-/*---------------------------------------------------------------------------*\
-                       Class thermalResiduals Declaration
-\*---------------------------------------------------------------------------*/
-
-class thermalResiduals
-:
-    public fvMeshFunctionObject,
-    public writeFile
-{
-
-protected:
-
-    // Protected data
-
-    word TField_;
-    word alphaField_;
-    word rhoField_;
-
-    dimensionedScalar subCooled_;
-
-
-    // Protected Member Functions
-
-        //- File header information
-        virtual void writeFileHeader(Ostream& os) const;
-
-
-
-private:
-
-    // Private member functions
-
-        //- Disallow default bitwise copy construct
-        thermalResiduals(const thermalResiduals&);
-
-        //- Disallow default bitwise assignment
-        void operator=(const thermalResiduals&);
-
-
-public:
-
-    //- Runtime type information
-    TypeName("thermalResiduals");
-
-
-    // Constructors
-
-        //- Construct from Time and dictionary
-        thermalResiduals
-        (
-            const word& name,
-            const Time& runTime,
-            const dictionary&
-        );
-
-
-    //- Destructor
-    virtual ~thermalResiduals();
-
-
-    // Member Functions
-
-        //- Read the thermalResiduals data
-        virtual bool read(const dictionary&);
-
-        //- Calculate the wall heat-flux
-        virtual bool execute();
-
-        //- Write the wall heat-flux
-        virtual bool write();
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace functionObjects
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/postProcessing/volumeFractionError/volumeFractionError.C b/src/postProcessing/volumeFractionError/volumeFractionError.C
index b61609b9..2b691887 100644
--- a/src/postProcessing/volumeFractionError/volumeFractionError.C
+++ b/src/postProcessing/volumeFractionError/volumeFractionError.C
@@ -74,7 +74,7 @@ Foam::functionObjects::volumeFractionError::volumeFractionError
     Field_(),
     dict_(dict),
     initMass_(0),
-    initCentre_(dict.lookup("origin"))
+    initCentre_(dict.get<vector>("origin"))
 {
 
 
@@ -98,7 +98,7 @@ bool Foam::functionObjects::volumeFractionError::read(const dictionary& dict)
     fvMeshFunctionObject::read(dict);
     writeFile::read(dict);
 
-    Field_ = word(dict.lookup("field"));
+    Field_ = dict.get<word>("field");
 
 
     // set initial mass
@@ -106,7 +106,7 @@ bool Foam::functionObjects::volumeFractionError::read(const dictionary& dict)
     (
         implicitFunction::New
         (
-            word(dict.lookup("function")),
+            dict.get<word>("functionType"),
             dict
         )
     );
@@ -177,7 +177,7 @@ bool Foam::functionObjects::volumeFractionError::write()
 
     const volScalarField& alpha = lookupObject<volScalarField>(Field_);
 
-    vector centre = dict_.lookup("origin");
+    vector centre = dict_.get<vector>("origin");
 
     const volVectorField& U = mesh_.lookupObject<volVectorField>("U");
 
@@ -208,7 +208,7 @@ bool Foam::functionObjects::volumeFractionError::write()
 
     Foam::autoPtr<Foam::implicitFunction> func =  implicitFunction::New
     (
-           word(dict_.lookup("function")),
+           word(dict_.lookup("functionType")),
            dict_
     );
 
@@ -289,7 +289,7 @@ bool Foam::functionObjects::volumeFractionError::write()
 
     if (Pstream::master())
     {
-        writeTime(file());
+        writeCurrentTime(file());
 
         file()
             << token::TAB << E1
diff --git a/src/postProcessing/wallHeatFluxSolid/wallHeatFluxSolid.C b/src/postProcessing/wallHeatFluxSolid/wallHeatFluxSolid.C
index c078d3a6..410f5402 100644
--- a/src/postProcessing/wallHeatFluxSolid/wallHeatFluxSolid.C
+++ b/src/postProcessing/wallHeatFluxSolid/wallHeatFluxSolid.C
@@ -274,7 +274,7 @@ bool Foam::functionObjects::wallHeatFluxSolid::write()
 
         if (Pstream::master())
         {
-            writeTime(file());
+            writeCurrentTime(file());
 
             file()
                 << token::TAB << pp.name()
diff --git a/src/surfaceForces/Make/options b/src/surfaceForces/Make/options
index 4ce8d08d..ec80634d 100644
--- a/src/surfaceForces/Make/options
+++ b/src/surfaceForces/Make/options
@@ -8,6 +8,7 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
     -I$(LIB_SRC)/transportModels/compressible/compressibleTransportModel \
+    -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
     -I$(LIB_SRC)/transportModels/twoPhaseProperties/alphaContactAngle/alphaContactAngle
 
 LIB_LIBS = \
diff --git a/src/surfaceForces/accelerationForceModel/accelerationForceModels.C b/src/surfaceForces/accelerationForceModel/accelerationForceModels.C
index cb14b89a..09355542 100644
--- a/src/surfaceForces/accelerationForceModel/accelerationForceModels.C
+++ b/src/surfaceForces/accelerationForceModel/accelerationForceModels.C
@@ -42,23 +42,26 @@ Foam::accelerationForceModel::New
     Info<< "Selecting surfaceTension model "
         << accelerationForceModelTypeName << endl;
 
-    componentsConstructorTable::iterator cstrIter =
-        componentsConstructorTablePtr_
-            ->find(accelerationForceModelTypeName);
+    auto ctorPtr = componentsConstructorTable(accelerationForceModelTypeName);
 
-    if (cstrIter == componentsConstructorTablePtr_->end())
+    if (!ctorPtr)
     {
-        FatalErrorIn
+        FatalErrorInLookup
         (
-            "accelerationForceModel::New"
-        )   << "Unknown accelerationForceModel type "
-            << accelerationForceModelTypeName << endl << endl
-            << "Valid  accelerationForceModels are : " << endl
-            << componentsConstructorTablePtr_->sortedToc()
-            << exit(FatalError);
+            "accelerationForceModel",
+            accelerationForceModelTypeName,
+            *componentsConstructorTablePtr_
+        ) << exit(FatalError);
     }
 
-    return autoPtr<accelerationForceModel>(cstrIter()( dict,mesh));
+    return autoPtr<accelerationForceModel>
+    (
+        ctorPtr
+        (
+            dict,
+            mesh
+        )
+    );
 }
 
 
diff --git a/src/surfaceForces/deltaFunctions/newDeltaFunctionModel.C b/src/surfaceForces/deltaFunctions/newDeltaFunctionModel.C
index 19e1b197..b50aaae6 100644
--- a/src/surfaceForces/deltaFunctions/newDeltaFunctionModel.C
+++ b/src/surfaceForces/deltaFunctions/newDeltaFunctionModel.C
@@ -33,23 +33,26 @@ Foam::deltaFunctionModel::New
     Info<< "Selecting surfaceTension model "
         << deltaFunctionModelTypeName << endl;
 
-    componentsConstructorTable::iterator cstrIter =
-        componentsConstructorTablePtr_
-            ->find(deltaFunctionModelTypeName);
+    auto ctorPtr = componentsConstructorTable(deltaFunctionModelTypeName);
 
-    if (cstrIter == componentsConstructorTablePtr_->end())
+    if (!ctorPtr)
     {
-        FatalErrorIn
+        FatalErrorInLookup
         (
-            "deltaFunctionModel::New"
-        )   << "Unknown deltaFunctionModel type "
-            << deltaFunctionModelTypeName << endl << endl
-            << "Valid  deltaFunctionModels are : " << endl
-            << componentsConstructorTablePtr_->sortedToc()
-            << exit(FatalError);
+            "deltaFunctionModel",
+            deltaFunctionModelTypeName,
+            *componentsConstructorTablePtr_
+        ) << exit(FatalError);
     }
 
-    return autoPtr<deltaFunctionModel>(cstrIter()( dict,alpha1));
+    return autoPtr<deltaFunctionModel>
+    (
+        ctorPtr
+        (
+            dict,
+            alpha1
+        )
+    );
 }
 
 
diff --git a/src/surfaceForces/surfaceForces.C b/src/surfaceForces/surfaceForces.C
index fb36bc34..5ee8e699 100644
--- a/src/surfaceForces/surfaceForces.C
+++ b/src/surfaceForces/surfaceForces.C
@@ -63,10 +63,12 @@ Foam::scalar Foam::surfaceForces::capillaryDt
     const volScalarField& rho2
 )
 {
-    volScalarField  interface = pos0(alpha1_ - 0.001)*pos0(0.999 - alpha1_);
-    volScalarField deltaX =
+    volScalarField interface(pos0(alpha1_ - 0.001)*pos0(0.999 - alpha1_));
+    volScalarField deltaX
+    (
         interface*fvc::average(mag(mesh_.delta()))
-        + neg0(interface-0.5)*dimensionedScalar("0",dimLength,GREAT);
+      + neg0(interface-0.5)*dimensionedScalar("0",dimLength,GREAT)
+    );
 
     dimensionedScalar smallSigma("smallSigma",dimensionSet(1,0,-2, 0, 0),SMALL);
 
@@ -83,10 +85,12 @@ Foam::scalar Foam::surfaceForces::capillaryDt
     const dimensionedScalar rho2
 )
 {
-    volScalarField  interface = pos0(alpha1_ - 0.001)*pos0(0.999 - alpha1_);
-    volScalarField deltaX =
+    volScalarField  interface(pos0(alpha1_ - 0.001)*pos0(0.999 - alpha1_));
+    volScalarField deltaX
+    (
         interface*fvc::average(mag(mesh_.delta()))
-        + neg0(interface-0.5)*dimensionedScalar("0",dimLength,GREAT);
+      + neg0(interface-0.5)*dimensionedScalar("0",dimLength,GREAT)
+    );
     dimensionedScalar smallSigma("smallSigma",dimensionSet(1,0,-2,0,0),SMALL);
 
     dimensionedScalar dt =
diff --git a/src/surfaceForces/surfaceTensionForceModels/surfaceTensionForceModel/RDF/RDF.C b/src/surfaceForces/surfaceTensionForceModels/surfaceTensionForceModel/RDF/RDF.C
index 21fecb1f..7de0d98f 100644
--- a/src/surfaceForces/surfaceTensionForceModels/surfaceTensionForceModel/RDF/RDF.C
+++ b/src/surfaceForces/surfaceTensionForceModels/surfaceTensionForceModel/RDF/RDF.C
@@ -20,7 +20,7 @@ License
 #include "RDF.H"
 #include "addToRunTimeSelectionTable.H"
 
-#include "alphaContactAngleFvPatchScalarField.H"
+#include "alphaContactAngleTwoPhaseFvPatchScalarField.H"
 #include "mathematicalConstants.H"
 #include "surfaceInterpolate.H"
 #include "fvcDiv.H"
@@ -35,6 +35,8 @@ License
 #include "wedgePolyPatch.H"
 #include "indexedOctree.H"
 #include "treeDataPoint.H"
+#include "processorPolyPatch.H"
+#include "syncTools.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -207,12 +209,12 @@ void Foam::RDF::correctContactAngle
 
     forAll(boundary, patchi)
     {
-        if (isA<alphaContactAngleFvPatchScalarField>(abf[patchi]))
+        if (isA<alphaContactAngleTwoPhaseFvPatchScalarField>(abf[patchi]))
         {
-            alphaContactAngleFvPatchScalarField& acap =
-                const_cast<alphaContactAngleFvPatchScalarField&>
+            alphaContactAngleTwoPhaseFvPatchScalarField& acap =
+                const_cast<alphaContactAngleTwoPhaseFvPatchScalarField&>
                 (
-                    refCast<const alphaContactAngleFvPatchScalarField>
+                    refCast<const alphaContactAngleTwoPhaseFvPatchScalarField>
                     (
                         abf[patchi]
                     )
@@ -311,7 +313,7 @@ void Foam::RDF::correct()
         1e-14/pow(average(mesh.V()), 1.0/3.0)
     );
 
-    volVectorField gradRDF = fvc::grad(RDF_);
+    volVectorField gradRDF(fvc::grad(RDF_));
 
     gradRDF /= (mag(gradRDF)+deltaN*dimensionedScalar("0", dimLength, 1));
 
diff --git a/src/surfaceForces/surfaceTensionForceModels/surfaceTensionForceModel/constantCurvature/constantCurvature.C b/src/surfaceForces/surfaceTensionForceModels/surfaceTensionForceModel/constantCurvature/constantCurvature.C
index 2fcd1b4f..5d60f511 100644
--- a/src/surfaceForces/surfaceTensionForceModels/surfaceTensionForceModel/constantCurvature/constantCurvature.C
+++ b/src/surfaceForces/surfaceTensionForceModels/surfaceTensionForceModel/constantCurvature/constantCurvature.C
@@ -20,7 +20,7 @@ License
 #include "constantCurvature.H"
 #include "addToRunTimeSelectionTable.H"
 
-#include "alphaContactAngleFvPatchScalarField.H"
+#include "alphaContactAngleTwoPhaseFvPatchScalarField.H"
 #include "mathematicalConstants.H"
 #include "surfaceInterpolate.H"
 #include "fvcDiv.H"
diff --git a/src/surfaceForces/surfaceTensionForceModels/surfaceTensionForceModel/fitParaboloid/fitParaboloid.C b/src/surfaceForces/surfaceTensionForceModels/surfaceTensionForceModel/fitParaboloid/fitParaboloid.C
index 55d9a8c3..e645a405 100644
--- a/src/surfaceForces/surfaceTensionForceModels/surfaceTensionForceModel/fitParaboloid/fitParaboloid.C
+++ b/src/surfaceForces/surfaceTensionForceModels/surfaceTensionForceModel/fitParaboloid/fitParaboloid.C
@@ -20,7 +20,7 @@ License
 #include "fitParaboloid.H"
 #include "addToRunTimeSelectionTable.H"
 
-#include "alphaContactAngleFvPatchScalarField.H"
+#include "alphaContactAngleTwoPhaseFvPatchScalarField.H"
 #include "mathematicalConstants.H"
 #include "surfaceInterpolate.H"
 #include "fvcDiv.H"
@@ -37,6 +37,7 @@ License
 #include "cutFacePLIC.H"
 #include "cutCellIso.H"
 #include "reconstructedDistanceFunction.H"
+#include "processorPolyPatch.H"
 
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -176,11 +177,11 @@ void Foam::fitParaboloid::correctContactAngle
     const fvBoundaryMesh& boundary = mesh.boundary();
 
     // we need a surfaceVectorField to compute theta
-    surfaceVectorField normalf = fvc::interpolate(normal);
+    surfaceVectorField normalf(fvc::interpolate(normal));
 
     forAll(boundary, patchi)
     {
-        if (isA<alphaContactAngleFvPatchScalarField>(abf[patchi]))
+        if (isA<alphaContactAngleTwoPhaseFvPatchScalarField>(abf[patchi]))
         {
             forAll(normalf.boundaryFieldRef()[patchi],i)
             {
@@ -197,12 +198,12 @@ void Foam::fitParaboloid::correctContactAngle
 
     forAll(boundary, patchi)
     {
-        if (isA<alphaContactAngleFvPatchScalarField>(abf[patchi]))
+        if (isA<alphaContactAngleTwoPhaseFvPatchScalarField>(abf[patchi]))
         {
-            alphaContactAngleFvPatchScalarField& acap =
-                const_cast<alphaContactAngleFvPatchScalarField&>
+            alphaContactAngleTwoPhaseFvPatchScalarField& acap =
+                const_cast<alphaContactAngleTwoPhaseFvPatchScalarField&>
                 (
-                    refCast<const alphaContactAngleFvPatchScalarField>
+                    refCast<const alphaContactAngleTwoPhaseFvPatchScalarField>
                     (
                         abf[patchi]
                     )
@@ -262,7 +263,7 @@ void Foam::fitParaboloid::correctContactAngle
                 }
                 else
                 {
-                    cbf[patchi][i] == vector::zero;
+                    cbf[patchi][i] = vector::zero;
                 }
             }
             acap.evaluate();
diff --git a/src/surfaceForces/surfaceTensionForceModels/surfaceTensionForceModel/gradAlpha/gradAlpha.C b/src/surfaceForces/surfaceTensionForceModels/surfaceTensionForceModel/gradAlpha/gradAlpha.C
index c843d28d..6b76638a 100644
--- a/src/surfaceForces/surfaceTensionForceModels/surfaceTensionForceModel/gradAlpha/gradAlpha.C
+++ b/src/surfaceForces/surfaceTensionForceModels/surfaceTensionForceModel/gradAlpha/gradAlpha.C
@@ -20,7 +20,7 @@ License
 #include "gradAlpha.H"
 #include "addToRunTimeSelectionTable.H"
 
-#include "alphaContactAngleFvPatchScalarField.H"
+#include "alphaContactAngleTwoPhaseFvPatchScalarField.H"
 #include "mathematicalConstants.H"
 #include "surfaceInterpolate.H"
 #include "fvcDiv.H"
@@ -80,12 +80,12 @@ void Foam::gradAlpha::correctContactAngle
 
     forAll(boundary, patchi)
     {
-        if (isA<alphaContactAngleFvPatchScalarField>(abf[patchi]))
+        if (isA<alphaContactAngleTwoPhaseFvPatchScalarField>(abf[patchi]))
         {
-            alphaContactAngleFvPatchScalarField& acap =
-                const_cast<alphaContactAngleFvPatchScalarField&>
+            alphaContactAngleTwoPhaseFvPatchScalarField& acap =
+                const_cast<alphaContactAngleTwoPhaseFvPatchScalarField&>
                 (
-                    refCast<const alphaContactAngleFvPatchScalarField>
+                    refCast<const alphaContactAngleTwoPhaseFvPatchScalarField>
                     (
                         abf[patchi]
                     )
diff --git a/src/surfaceForces/surfaceTensionForceModels/surfaceTensionForceModel/heightFunction/heightFunction.C b/src/surfaceForces/surfaceTensionForceModels/surfaceTensionForceModel/heightFunction/heightFunction.C
index 8769c21f..74dd9de4 100644
--- a/src/surfaceForces/surfaceTensionForceModels/surfaceTensionForceModel/heightFunction/heightFunction.C
+++ b/src/surfaceForces/surfaceTensionForceModels/surfaceTensionForceModel/heightFunction/heightFunction.C
@@ -20,7 +20,7 @@ License
 #include "heightFunction.H"
 #include "addToRunTimeSelectionTable.H"
 
-#include "alphaContactAngleFvPatchScalarField.H"
+#include "alphaContactAngleTwoPhaseFvPatchScalarField.H"
 #include "mathematicalConstants.H"
 #include "surfaceInterpolate.H"
 #include "fvcDiv.H"
@@ -266,12 +266,12 @@ void Foam::heightFunction::correctContactAngle
 
     forAll(boundary, patchi)
     {
-        if (isA<alphaContactAngleFvPatchScalarField>(abf[patchi]))
+        if (isA<alphaContactAngleTwoPhaseFvPatchScalarField>(abf[patchi]))
         {
-            alphaContactAngleFvPatchScalarField& acap =
-                const_cast<alphaContactAngleFvPatchScalarField&>
+            alphaContactAngleTwoPhaseFvPatchScalarField& acap =
+                const_cast<alphaContactAngleTwoPhaseFvPatchScalarField&>
                 (
-                    refCast<const alphaContactAngleFvPatchScalarField>
+                    refCast<const alphaContactAngleTwoPhaseFvPatchScalarField>
                     (
                         abf[patchi]
                     )
diff --git a/src/surfaceForces/surfaceTensionForceModels/surfaceTensionForceModel/surfaceTensionForceModels.C b/src/surfaceForces/surfaceTensionForceModels/surfaceTensionForceModel/surfaceTensionForceModels.C
index b242ebf1..cdeb748f 100644
--- a/src/surfaceForces/surfaceTensionForceModels/surfaceTensionForceModel/surfaceTensionForceModels.C
+++ b/src/surfaceForces/surfaceTensionForceModels/surfaceTensionForceModel/surfaceTensionForceModels.C
@@ -44,23 +44,29 @@ Foam::surfaceTensionForceModel::New
     Info<< "Selecting surfaceTension model "
         << surfaceTensionForceModelTypeName << endl;
 
-    componentsConstructorTable::iterator cstrIter =
-        componentsConstructorTablePtr_
-            ->find(surfaceTensionForceModelTypeName);
+    auto ctorPtr = componentsConstructorTable(surfaceTensionForceModelTypeName);
 
-    if (cstrIter == componentsConstructorTablePtr_->end())
+    if (!ctorPtr)
     {
-        FatalErrorIn
+        FatalErrorInLookup
         (
-            "surfaceTensionForceModel::New"
-        )   << "Unknown surfaceTensionForceModel type "
-            << surfaceTensionForceModelTypeName << endl << endl
-            << "Valid  surfaceTensionForceModels are : " << endl
-            << componentsConstructorTablePtr_->sortedToc()
-            << exit(FatalError);
+            "surfaceTensionForceModel",
+            surfaceTensionForceModelTypeName,
+            *componentsConstructorTablePtr_
+        ) << exit(FatalError);
     }
 
-    return autoPtr<surfaceTensionForceModel>(cstrIter()( dict,alpha1, phi, U));
+    return autoPtr<surfaceTensionForceModel>
+    (
+        ctorPtr
+        (
+            dict,
+            alpha1,
+            phi,
+            U
+        )
+    );
+
 }
 
 
diff --git a/src/thermoDynamics/Allwmake b/src/thermoDynamics/Allwmake
index 6eaf8f27..d6ec423a 100755
--- a/src/thermoDynamics/Allwmake
+++ b/src/thermoDynamics/Allwmake
@@ -1,5 +1,4 @@
 #! /bin/bash
 
-wmake libso solidTabulatedThermo
 wmake libso fluidThermo
 wmake libso twoPhaseModelThermo
diff --git a/src/thermoDynamics/fluidThermo/Make/options b/src/thermoDynamics/fluidThermo/Make/options
index e4ed1b17..fa816be2 100644
--- a/src/thermoDynamics/fluidThermo/Make/options
+++ b/src/thermoDynamics/fluidThermo/Make/options
@@ -2,6 +2,7 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude
 
diff --git a/src/thermoDynamics/fluidThermo/fluidThermos.C b/src/thermoDynamics/fluidThermo/fluidThermos.C
index 01df4dfc..e1fe2814 100644
--- a/src/thermoDynamics/fluidThermo/fluidThermos.C
+++ b/src/thermoDynamics/fluidThermo/fluidThermos.C
@@ -42,10 +42,10 @@ License
 
 #include "constTransport.H"
 #include "hPolynomialThermo.H"
-#include "hTabulatedThermo.H"
-
 #include "polynomialTransport.H"
-#include "tabulatedTransport.H"
+
+// #include "hTabulatedThermo.H"
+// #include "tabulatedTransport.H"
 
 #include "heRhoThermo.H"
 #include "pureMixture.H"
@@ -87,57 +87,57 @@ makeThermos
 );
 
 // added tabThermo
-makeThermo
-(
-    rhoThermo,
-    heRhoThermo,
-    pureMixture,
-    tabulatedTransport,
-    sensibleInternalEnergy,
-    hTabulatedThermo,
-    perfectGas,
-    specie
-);
-
-makeThermo
-(
-    rhoThermo,
-    heRhoThermo,
-    pureMixture,
-    tabulatedTransport,
-    sensibleInternalEnergy,
-    hTabulatedThermo,
-    PengRobinsonGas,
-    specie
-);
+// makeThermo
+// (
+//     rhoThermo,
+//     heRhoThermo,
+//     pureMixture,
+//     tabulatedTransport,
+//     sensibleInternalEnergy,
+//     hTabulatedThermo,
+//     perfectGas,
+//     specie
+// );
+
+// makeThermo
+// (
+//     rhoThermo,
+//     heRhoThermo,
+//     pureMixture,
+//     tabulatedTransport,
+//     sensibleInternalEnergy,
+//     hTabulatedThermo,
+//     PengRobinsonGas,
+//     specie
+// );
 
 
 // thermo physics types based on sensibleInternalEnergy
-typedef
-tabulatedTransport
-<
-    species::thermo
-    <
-        hTabulatedThermo
-        <
-            perfectGas<specie>
-        >,
-        sensibleInternalEnergy
-    >
-> tabTabEThermoPhysics;
-
-typedef
-tabulatedTransport
-<
-    species::thermo
-    <
-        hTabulatedThermo
-        <
-            PengRobinsonGas<specie>
-        >,
-        sensibleInternalEnergy
-    >
-> tabTabPengRobPhysics;
+// typedef
+// tabulatedTransport
+// <
+//     species::thermo
+//     <
+//         hTabulatedThermo
+//         <
+//             perfectGas<specie>
+//         >,
+//         sensibleInternalEnergy
+//     >
+// > tabTabEThermoPhysics;
+
+// typedef
+// tabulatedTransport
+// <
+//     species::thermo
+//     <
+//         hTabulatedThermo
+//         <
+//             PengRobinsonGas<specie>
+//         >,
+//         sensibleInternalEnergy
+//     >
+// > tabTabPengRobPhysics;
 
 typedef
 polynomialTransport
@@ -163,24 +163,24 @@ makeThermoPhysicsReactionThermos
     polyPolyEThermoPhysics
 );
 
-makeThermoPhysicsReactionThermos
-(
-    rhoThermo,
-    rhoReactionThermo,
-    heRhoThermo,
-    multiComponentMixture,
-    tabTabEThermoPhysics
-);
-
-
-makeThermoPhysicsReactionThermos
-(
-    rhoThermo,
-    rhoReactionThermo,
-    heRhoThermo,
-    multiComponentMixture,
-    tabTabPengRobPhysics
-);
+// makeThermoPhysicsReactionThermos
+// (
+//     rhoThermo,
+//     rhoReactionThermo,
+//     heRhoThermo,
+//     multiComponentMixture,
+//     tabTabEThermoPhysics
+// );
+
+
+// makeThermoPhysicsReactionThermos
+// (
+//     rhoThermo,
+//     rhoReactionThermo,
+//     heRhoThermo,
+//     multiComponentMixture,
+//     tabTabPengRobPhysics
+// );
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/thermoDynamics/solidTabulatedThermo/Make/files b/src/thermoDynamics/solidTabulatedThermo/Make/files
deleted file mode 100755
index c56a73b6..00000000
--- a/src/thermoDynamics/solidTabulatedThermo/Make/files
+++ /dev/null
@@ -1,4 +0,0 @@
-solidThermos.C
-
-
-LIB = $(FOAM_USER_LIBBIN)/libsolidTabulatedThermo
diff --git a/src/thermoDynamics/solidTabulatedThermo/Make/options b/src/thermoDynamics/solidTabulatedThermo/Make/options
deleted file mode 100755
index 57a706e3..00000000
--- a/src/thermoDynamics/solidTabulatedThermo/Make/options
+++ /dev/null
@@ -1,18 +0,0 @@
-EXE_INC = \
-    -I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/solidSpecie/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-    -I$(LIB_SRC)/transportModels/compressible/lnInclude
-
-LIB_LIBS = \
-    -lmeshTools \
-    -lfiniteVolume \
-    -lspecie \
-    -lsolidSpecie \
-    -lfluidThermophysicalModels \
-    -lreactionThermophysicalModels \
-    -lcompressibleTransportModels
diff --git a/src/thermoDynamics/solidTabulatedThermo/solidThermos.C b/src/thermoDynamics/solidTabulatedThermo/solidThermos.C
deleted file mode 100755
index 1cb2950a..00000000
--- a/src/thermoDynamics/solidTabulatedThermo/solidThermos.C
+++ /dev/null
@@ -1,87 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "makeSolidThermo.H"
-#include "solidThermo.H"
-#include "heSolidThermo.H"
-
-#include "specie.H"
-#include "rhoConst.H"
-#include "hConstThermo.H"
-#include "constIsoSolidTransport.H"
-#include "constAnIsoSolidTransport.H"
-#include "exponentialSolidTransport.H"
-#include "polynomialSolidTransport.H"
-#include "pureMixture.H"
-#include "sensibleEnthalpy.H"
-#include "sensibleInternalEnergy.H"
-#include "thermo.H"
-
-#include "solidTabulatedThermo.H"
-#include "tabulatedSolidTransport.H"
-
-
-
-#include "solidThermoPhysicsTypes.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-/* * * * * * * * * * * * * * * * * Enthalpy-based * * * * * * * * * * * * * */
-
-makeSolidThermo
-(
-    solidThermo,
-    heSolidThermo,
-    pureMixture,
-    tabulatedSolidTransport,
-    sensibleEnthalpy,
-    hConstThermo,
-    rhoConst,
-    specie
-);
-
-
-makeSolidThermo
-(
-    solidThermo,
-    heSolidThermo,
-    pureMixture,
-    tabulatedSolidTransport,
-    sensibleEnthalpy,
-    solidTabulatedThermo,
-    rhoConst,
-    specie
-);
-
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/thermoDynamics/solidTabulatedThermo/thermo/solidTabulatedThermo.C b/src/thermoDynamics/solidTabulatedThermo/thermo/solidTabulatedThermo.C
deleted file mode 100755
index c19b7c3b..00000000
--- a/src/thermoDynamics/solidTabulatedThermo/thermo/solidTabulatedThermo.C
+++ /dev/null
@@ -1,60 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2017 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "solidTabulatedThermo.H"
-#include "IOstreams.H"
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-template<class EquationOfState>
-Foam::solidTabulatedThermo<EquationOfState>::solidTabulatedThermo
-(
-    const dictionary& dict
-)
-:
-    EquationOfState(dict),
-    interpolCpTable_(dict.subDict("thermodynamics")),
-    Hf_(readScalar(dict.subDict("thermodynamics").lookup("Hf")))
-{
-    
-    Hf_ *= this->W();
-}
-
-
-// * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
-
-template<class EquationOfState>
-Foam::Ostream& Foam::operator<<
-(
-    Ostream& os,
-    const solidTabulatedThermo<EquationOfState>& et
-)
-{
-    et.write(os);
-    return os;
-}
-
-
-// ************************************************************************* //
diff --git a/src/thermoDynamics/solidTabulatedThermo/thermo/solidTabulatedThermo.H b/src/thermoDynamics/solidTabulatedThermo/thermo/solidTabulatedThermo.H
deleted file mode 100755
index 0abb2a2a..00000000
--- a/src/thermoDynamics/solidTabulatedThermo/thermo/solidTabulatedThermo.H
+++ /dev/null
@@ -1,213 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2017 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Class
-    Foam::solidTabulatedThermo
-
-Group
-    grpSpecieThermo
-
-Description
-    tabulated properties thermodynamics package
-    templated into the equationOfState.
-SourceFiles
-    solidTabulatedThermoI.H
-    solidTabulatedThermo.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef solidTabulatedThermo_H
-#define solidTabulatedThermo_H
-
-#include "interpolationTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// Forward declaration of friend functions and operators
-
-template<class EquationOfState> class solidTabulatedThermo;
-
-template<class EquationOfState>
-inline solidTabulatedThermo<EquationOfState> operator+
-(
-    const solidTabulatedThermo<EquationOfState>&,
-    const solidTabulatedThermo<EquationOfState>&
-);
-
-template<class EquationOfState>
-inline solidTabulatedThermo<EquationOfState> operator*
-(
-    const scalar,
-    const solidTabulatedThermo<EquationOfState>&
-);
-
-
-template<class EquationOfState>
-inline solidTabulatedThermo<EquationOfState> operator==
-(
-    const solidTabulatedThermo<EquationOfState>&,
-    const solidTabulatedThermo<EquationOfState>&
-);
-
-
-template<class EquationOfState>
-Ostream& operator<<
-(
-    Ostream&,
-    const solidTabulatedThermo<EquationOfState>&
-);
-
-
-/*---------------------------------------------------------------------------*\
-                         Class solidTabulatedThermo Declaration
-\*---------------------------------------------------------------------------*/
-
-template<class EquationOfState>
-class solidTabulatedThermo
-:
-    public EquationOfState
-{
-    // Private data
-
-        interpolationTable<scalar> interpolCpTable_;
-        scalar Hf_;
-
-
-    // Private Member Functions
-
-        //- Construct from components
-        inline solidTabulatedThermo
-        (
-            const EquationOfState& st,
-            const interpolationTable<scalar> interpolCpTable,
-            const scalar hf
-        );
-
-
-public:
-
-    // Constructors
-
-        //- Construct from dictionary
-        solidTabulatedThermo(const dictionary&);
-
-        //- Construct as a named copy
-        inline solidTabulatedThermo
-        (
-            const word&,
-            const solidTabulatedThermo&
-        );
-
-         //- Construct and return a clone
-        inline autoPtr<solidTabulatedThermo> clone() const;
-
-        //- Selector from dictionary
-        inline static autoPtr<solidTabulatedThermo> New(const dictionary& dict);
-
-
-    // Member Functions
-
-        //- Return the instantiated type name
-        static word typeName()
-        {
-            return "tabulated<" + EquationOfState::typeName() + '>';
-        }
-
-        //- Limit the temperature to be in the range Tlow_ to Thigh_
-        inline scalar limit(const scalar T) const;
-
-
-        // Fundamental properties
-
-            //- Heat capacity at constant pressure [J/(kg K)]
-            inline scalar Cp(const scalar p, const scalar T) const;
-
-            //- Absolute Enthalpy [J/kg]
-            inline scalar Ha(const scalar p, const scalar T) const;
-
-            //- Sensible enthalpy [J/kg]
-            inline scalar Hs(const scalar p, const scalar T) const;
-
-            //- Chemical enthalpy [J/kg]
-            inline scalar Hc() const;
-
-            //- Entropy [J/(kg K)]
-            inline scalar S(const scalar p, const scalar T) const;
-
-
-    // Member operators
-
-        // inline void operator+=(const solidTabulatedThermo&);
-
-
-    // Friend operators
-
-        friend solidTabulatedThermo operator+ <EquationOfState>
-        (
-            const solidTabulatedThermo&,
-            const solidTabulatedThermo&
-        );
-
-        friend solidTabulatedThermo operator* <EquationOfState>
-        (
-            const scalar,
-            const solidTabulatedThermo&
-        );
-
-
-        friend solidTabulatedThermo operator== <EquationOfState>
-        (
-            const solidTabulatedThermo&,
-            const solidTabulatedThermo&
-        );
-
-
-    // Ostream Operator
-
-        friend Ostream& operator<< <EquationOfState>
-        (
-            Ostream&,
-            const solidTabulatedThermo&
-        );
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#ifdef NoRepository
-    #include "solidTabulatedThermoI.H"
-    #include "solidTabulatedThermo.C"
-#endif
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/thermoDynamics/solidTabulatedThermo/thermo/solidTabulatedThermoI.H b/src/thermoDynamics/solidTabulatedThermo/thermo/solidTabulatedThermoI.H
deleted file mode 100755
index 1e98f0a8..00000000
--- a/src/thermoDynamics/solidTabulatedThermo/thermo/solidTabulatedThermoI.H
+++ /dev/null
@@ -1,242 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2017 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "solidTabulatedThermo.H"
-#include "specie.H"
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-template<class EquationOfState>
-inline Foam::solidTabulatedThermo<EquationOfState>::solidTabulatedThermo
-(
-    const word& name,
-    const solidTabulatedThermo& jt
-)
-:
-    EquationOfState(name, jt),
-    interpolCpTable_(jt.interpolCpTable_),
-    Hf_(jt.Hf_)
-{}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-template<class EquationOfState>
-inline Foam::solidTabulatedThermo<EquationOfState>::solidTabulatedThermo
-(
-    const EquationOfState& st,
-    const interpolationTable<scalar> cp,
-    const scalar hf
-)
-:
-    EquationOfState(st),
-    interpolCpTable_(cp),
-    Hf_(hf)
-{}
-
-
-template<class EquationOfState>
-inline Foam::autoPtr<Foam::solidTabulatedThermo<EquationOfState>>
-Foam::solidTabulatedThermo<EquationOfState>::clone() const
-{
-    return autoPtr<solidTabulatedThermo<EquationOfState>>::New(*this);
-}
-
-
-template<class EquationOfState>
-inline Foam::autoPtr<Foam::solidTabulatedThermo<EquationOfState>>
-Foam::solidTabulatedThermo<EquationOfState>::New(const dictionary& dict)
-{
-    return autoPtr<solidTabulatedThermo<EquationOfState>>::New(dict);
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-template<class EquationOfState>
-inline Foam::scalar Foam::solidTabulatedThermo<EquationOfState>::limit
-(
-    const scalar T
-) const
-{
-    return T;
-}
-
-
-template<class EquationOfState>
-inline Foam::scalar Foam::solidTabulatedThermo<EquationOfState>::Cp
-(
-    const scalar p, const scalar T
-) const
-{
-    return interpolCpTable_(T)*this->W();
-}
-
-
-template<class EquationOfState>
-inline Foam::scalar Foam::solidTabulatedThermo<EquationOfState>::Ha
-(
-    const scalar p, const scalar T
-) const
-{
-    return Hs(p, T) + Hc();
-}
-
-
-template<class EquationOfState>
-inline Foam::scalar Foam::solidTabulatedThermo<EquationOfState>::Hs
-(
-    const scalar p, const scalar T
-) const
-{
-    return interpolCpTable_(T)*T*this->W()
-            + EquationOfState::H(p, T);
-}
-
-
-template<class EquationOfState>
-inline Foam::scalar Foam::solidTabulatedThermo<EquationOfState>::Hc() const
-{
-    return Hf_;
-}
-
-
-template<class EquationOfState>
-inline Foam::scalar Foam::solidTabulatedThermo<EquationOfState>::S
-(
-    const scalar p, const scalar T
-) const
-{
-    notImplemented
-    (
-        "scalar solidTabulatedThermo<equationOfState>::"
-        "s(const scalar p, const scalar T) const"
-    );
-    return T;
-}
-
-
-// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
-
-// template<class EquationOfState>
-// inline void Foam::solidTabulatedThermo<EquationOfState>::operator+=
-// (
-    // const solidTabulatedThermo<EquationOfState>& ct
-// )
-// {
-    // scalar Y1 = this->Y();
-
-    // EquationOfState::operator+=(ct);
-
-    // if (mag(this->Y()) > SMALL)
-    // {
-    //     Y1 /= this->Y();
-    //     const scalar Y2 = ct.Y()/this->Y();
-
-    //     interpolCpTable_ = Y1*interpolCpTable_ + Y2*ct.interpolCpTable_;
-    //     Hf_ = Y1*Hf_ + Y2*ct.Hf_;
-    // }
-// }
-
-
-// * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
-
-template<class EquationOfState>
-inline Foam::solidTabulatedThermo<EquationOfState> Foam::operator+
-(
-    const solidTabulatedThermo<EquationOfState>& ct1,
-    const solidTabulatedThermo<EquationOfState>& ct2
-)
-{
-    EquationOfState eofs
-    (
-        static_cast<const EquationOfState&>(ct1)
-      + static_cast<const EquationOfState&>(ct2)
-    );
-
-    if (mag(eofs.Y()) < SMALL)
-    {
-        return solidTabulatedThermo<EquationOfState>
-        (
-            eofs,
-            ct1.interpolCpTable_,
-            ct1.Hf_
-        );
-    }
-    else
-    {
-        return solidTabulatedThermo<EquationOfState>
-        (
-            eofs,
-            ct1.Y()/eofs.Y()*ct1.interpolCpTable_
-          + ct2.Y()/eofs.Y()*ct2.interpolCpTable_,
-            ct1.Y()/eofs.Y()*ct1.Hf_
-          + ct2.Y()/eofs.Y()*ct2.Hf_
-        );
-    }
-}
-
-
-template<class EquationOfState>
-inline Foam::solidTabulatedThermo<EquationOfState> Foam::operator*
-(
-    const scalar s,
-    const solidTabulatedThermo<EquationOfState>& ct
-)
-{
-    return solidTabulatedThermo<EquationOfState>
-    (
-        s*static_cast<const EquationOfState&>(ct),
-        ct.interpolCpTable_,
-        ct.Hf_
-    );
-}
-
-
-template<class EquationOfState>
-inline Foam::solidTabulatedThermo<EquationOfState> Foam::operator==
-(
-    const solidTabulatedThermo<EquationOfState>& ct1,
-    const solidTabulatedThermo<EquationOfState>& ct2
-)
-{
-    EquationOfState eofs
-    (
-        static_cast<const EquationOfState&>(ct1)
-     == static_cast<const EquationOfState&>(ct2)
-    );
-
-    return solidTabulatedThermo<EquationOfState>
-    (
-        eofs,
-        ct2.Y()/eofs.Y()*ct2.interpolCpTable_
-      - ct1.Y()/eofs.Y()*ct1.interpolCpTable_,
-        ct2.Y()/eofs.Y()*ct2.Hf_
-      - ct1.Y()/eofs.Y()*ct1.Hf_
-    );
-}
-
-
-// ************************************************************************* //
diff --git a/src/thermoDynamics/solidTabulatedThermo/transport/tabulatedSolidTransport.C b/src/thermoDynamics/solidTabulatedThermo/transport/tabulatedSolidTransport.C
deleted file mode 100755
index 747b3030..00000000
--- a/src/thermoDynamics/solidTabulatedThermo/transport/tabulatedSolidTransport.C
+++ /dev/null
@@ -1,76 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "tabulatedSolidTransport.H"
-#include "IOstreams.H"
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-template<class Thermo>
-Foam::tabulatedSolidTransport<Thermo>::tabulatedSolidTransport
-(
-    const dictionary& dict
-)
-:
-    Thermo(dict),
-    interpolCpTable_(dict.subDict("transport"))
-    //kappa_(readScalar(dict.subDict("transport").lookup("kappa")))
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-template<class Thermo>
-void Foam::tabulatedSolidTransport<Thermo>::tabulatedSolidTransport::write
-(
-    Ostream& os
-) const
-{
-    Thermo::write(os);
-
-    // Entries in dictionary format
-    {
-        os.beginBlock("transport");
-        os.writeEntry("interpolCpTable_", interpolCpTable_);
-        os.endBlock();
-    }
-}
-
-
-// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
-
-template<class Thermo>
-Foam::Ostream& Foam::operator<<
-(
-    Ostream& os,
-    const tabulatedSolidTransport<Thermo>& ct
-)
-{
-    ct.write(os);
-    return os;
-}
-
-
-// ************************************************************************* //
diff --git a/src/thermoDynamics/solidTabulatedThermo/transport/tabulatedSolidTransport.H b/src/thermoDynamics/solidTabulatedThermo/transport/tabulatedSolidTransport.H
deleted file mode 100755
index 29468454..00000000
--- a/src/thermoDynamics/solidTabulatedThermo/transport/tabulatedSolidTransport.H
+++ /dev/null
@@ -1,177 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Class
-    Foam::tabulatedSolidTransport
-
-Description
-    Constant properties Transport package.
-    Templated into a given thermodynamics package (needed for thermal
-    conductivity).
-
-SourceFiles
-    tabulatedSolidTransportI.H
-    tabulatedSolidTransport.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef tabulatedSolidTransport_H
-#define tabulatedSolidTransport_H
-
-#include "vector.H"
-#include "interpolationTable.H"
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-template<class Thermo> class tabulatedSolidTransport;
-
-template<class Thermo>
-inline tabulatedSolidTransport<Thermo> operator*
-(
-    const scalar,
-    const tabulatedSolidTransport<Thermo>&
-);
-
-template<class Thermo>
-Ostream& operator<<
-(
-    Ostream&,
-    const tabulatedSolidTransport<Thermo>&
-);
-
-
-/*---------------------------------------------------------------------------*\
-                   Class tabulatedSolidTransport Declaration
-\*---------------------------------------------------------------------------*/
-
-template<class Thermo>
-class tabulatedSolidTransport
-:
-    public Thermo
-{
-    // Private data
-
-        //- Constant isotropic thermal conductivity
-//        scalar kappa_;
-        interpolationTable<scalar> interpolCpTable_;
-
-
-    // Private Member Functions
-
-        //- Construct from components
-        inline tabulatedSolidTransport(const Thermo& t, const interpolationTable<scalar> interpolCpTable);
-
-
-public:
-
-    // Constructors
-
-        //- Construct as named copy
-        inline tabulatedSolidTransport
-        (
-            const word&,
-            const tabulatedSolidTransport&
-        );
-
-        //- Construct from dictionary
-        tabulatedSolidTransport(const dictionary& dict);
-
-        // Selector from dictionary
-        inline static autoPtr<tabulatedSolidTransport> New
-        (
-            const dictionary& dict
-        );
-
-
-    // Member functions
-
-        //- Return the instantiated type name
-        static word typeName()
-        {
-            return "isoTabulated<" + Thermo::typeName() + '>';
-        }
-
-        //- Is the thermal conductivity isotropic
-        static const bool isotropic = true;
-
-        //- Isotropic thermal conductivity [W/mK]
-        inline scalar kappa(const scalar p, const scalar T) const;
-
-        //- Un-isotropic thermal conductivity [W/mK]
-        inline vector Kappa(const scalar p, const scalar T) const;
-
-         //- Dynamic viscosity [kg/ms]
-        inline scalar mu(const scalar p, const scalar T) const;
-
-        //- Thermal diffusivity of enthalpy [kg/ms]
-        inline scalar alphah(const scalar p, const scalar T) const;
-
-
-        //- Write to Ostream
-        void write(Ostream& os) const;
-
-
-    // Member operators
-
-        inline void operator=(const tabulatedSolidTransport&);
-        // inline void operator+=(const tabulatedSolidTransport&);
-
-
-    // Friend operators
-
-        friend tabulatedSolidTransport operator* <Thermo>
-        (
-            const scalar,
-            const tabulatedSolidTransport&
-        );
-
-
-    // Ostream Operator
-
-        friend Ostream& operator<< <Thermo>
-        (
-            Ostream&,
-            const tabulatedSolidTransport&
-        );
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#include "tabulatedSolidTransportI.H"
-
-#ifdef NoRepository
-    #include "tabulatedSolidTransport.C"
-#endif
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/thermoDynamics/solidTabulatedThermo/transport/tabulatedSolidTransportI.H b/src/thermoDynamics/solidTabulatedThermo/transport/tabulatedSolidTransportI.H
deleted file mode 100755
index 6bb329a6..00000000
--- a/src/thermoDynamics/solidTabulatedThermo/transport/tabulatedSolidTransportI.H
+++ /dev/null
@@ -1,142 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-template<class thermo>
-inline Foam::tabulatedSolidTransport<thermo>::tabulatedSolidTransport
-(
-    const thermo& t,
-    const interpolationTable<scalar> cp
-)
-:
-    thermo(t),
-    interpolCpTable_(cp)
-{}
-
-
-template<class thermo>
-inline Foam::tabulatedSolidTransport<thermo>::tabulatedSolidTransport
-(
-    const word& name,
-    const tabulatedSolidTransport& ct
-)
-:
-    thermo(name, ct),
-    interpolCpTable_(ct.interpolCpTable_)
-{}
-
-
-template<class Thermo>
-inline Foam::autoPtr<Foam::tabulatedSolidTransport<Thermo>>
-Foam::tabulatedSolidTransport<Thermo>::New
-(
-    const dictionary& dict
-)
-{
-    return autoPtr<tabulatedSolidTransport<Thermo>>::New(dict);
-}
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-template<class thermo>
-inline Foam::scalar Foam::tabulatedSolidTransport<thermo>::
-kappa(const scalar p, const scalar T) const
-{
-    return interpolCpTable_(T);
-}
-
-template<class thermo>
-inline Foam::vector Foam::tabulatedSolidTransport<thermo>::
-Kappa(const scalar p, const scalar T) const
-{
-    return vector(interpolCpTable_(T), interpolCpTable_(T), interpolCpTable_(T));
-}
-
-
-template<class thermo>
-inline Foam::scalar Foam::tabulatedSolidTransport<thermo>::
-mu(const scalar p, const scalar T) const
-{
-    NotImplemented;
-    return scalar(0);
-}
-
-
-template<class thermo>
-inline Foam::scalar Foam::tabulatedSolidTransport<thermo>::
-alphah(const scalar p, const scalar T) const
-{
-    return interpolCpTable_(T)/this->Cp(p, T);
-}
-
-// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
-
-template<class thermo>
-inline void Foam::tabulatedSolidTransport<thermo>::operator=
-(
-    const tabulatedSolidTransport<thermo>& ct
-)
-{
-    thermo::operator=(ct);
-    interpolCpTable_ = ct.interpolCpTable_;
-}
-
-
-// template<class thermo>
-// inline void Foam::tabulatedSolidTransport<thermo>::operator+=
-// (
-//     const tabulatedSolidTransport<thermo>& ct
-// )
-// {
-//     scalar Y1 = this->Y();
-//     thermo::operator+=(ct);
-
-//     Y1 /= this->Y();
-//     scalar Y2 = ct.Y()/this->Y();
-
-//     interpolCpTable_ = Y1*interpolCpTable_ + Y2*ct.interpolCpTable_;
-// }
-
-
-// * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
-
-
-template<class thermo>
-inline Foam::tabulatedSolidTransport<thermo> Foam::operator*
-(
-    const scalar s,
-    const tabulatedSolidTransport<thermo>& ct
-)
-{
-    return tabulatedSolidTransport<thermo>
-    (
-        s*static_cast<const thermo&>(ct),
-        ct.interpolCpTable_
-    );
-}
-
-
-// ************************************************************************* //
diff --git a/src/thermoDynamics/twoPhaseModelThermo/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.C b/src/thermoDynamics/twoPhaseModelThermo/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.C
index 2949b048..888f0794 100644
--- a/src/thermoDynamics/twoPhaseModelThermo/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.C
+++ b/src/thermoDynamics/twoPhaseModelThermo/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.C
@@ -66,7 +66,7 @@ MultiComponentPhaseModel
         mesh.solverDict("Yi")
     )
 {
-    thermoPtr_.set
+    thermoPtr_.reset
     (
         phaseThermo::New
         (
@@ -188,9 +188,9 @@ Foam::MultiComponentPhaseModel<BasePhaseModel, phaseThermo>::YiEqn
     }
 
     const volScalarField& alpha = *this;
-    const surfaceScalarField alphaRhoPhi = this->alphaPhi()*fvc::interpolate(this->rho());
+    const surfaceScalarField alphaRhoPhi(this->alphaPhi()*fvc::interpolate(this->rho()));
     const volScalarField& rho = this->rho();
-    const volScalarField continuityError = fvc::ddt(alpha, rho) + fvc::div(alphaRhoPhi);
+    const volScalarField continuityError(fvc::ddt(alpha, rho) + fvc::div(alphaRhoPhi));
 
     return
     (
diff --git a/src/thermoDynamics/twoPhaseModelThermo/phaseModel/PurePhaseModel/PurePhaseModel.C b/src/thermoDynamics/twoPhaseModelThermo/phaseModel/PurePhaseModel/PurePhaseModel.C
index 6c1ba965..35eb88a5 100644
--- a/src/thermoDynamics/twoPhaseModelThermo/phaseModel/PurePhaseModel/PurePhaseModel.C
+++ b/src/thermoDynamics/twoPhaseModelThermo/phaseModel/PurePhaseModel/PurePhaseModel.C
@@ -37,7 +37,7 @@ Foam::PurePhaseModel<BasePhaseModel, phaseThermo>::PurePhaseModel
 :
     BasePhaseModel(mesh,dict, phaseName)
 {
-    thermoPtr_.set
+    thermoPtr_.reset
     (
         phaseThermo::New
         (
diff --git a/src/thermoDynamics/twoPhaseModelThermo/phaseModel/phaseModel/phaseModel.C b/src/thermoDynamics/twoPhaseModelThermo/phaseModel/phaseModel/phaseModel.C
index dad1ad90..8acc63b9 100644
--- a/src/thermoDynamics/twoPhaseModelThermo/phaseModel/phaseModel/phaseModel.C
+++ b/src/thermoDynamics/twoPhaseModelThermo/phaseModel/phaseModel/phaseModel.C
@@ -207,6 +207,17 @@ Foam::tmp<Foam::scalarField> Foam::phaseModel::kappa(const label patchI) const
     return thermo().kappa(patchI);
 }
 
+Foam::tmp<Foam::volScalarField> Foam::phaseModel::alphahe() const
+{
+    return thermo().alphahe();
+}
+
+
+Foam::tmp<Foam::scalarField> Foam::phaseModel::alphahe(const label patchI) const
+{
+    return thermo().alphahe(patchI);
+}
+
 
 Foam::tmp<Foam::volScalarField>Foam::phaseModel::kappaEff
 (
diff --git a/src/thermoDynamics/twoPhaseModelThermo/phaseModel/phaseModel/phaseModel.H b/src/thermoDynamics/twoPhaseModelThermo/phaseModel/phaseModel/phaseModel.H
index 2abcec68..efa37f37 100644
--- a/src/thermoDynamics/twoPhaseModelThermo/phaseModel/phaseModel/phaseModel.H
+++ b/src/thermoDynamics/twoPhaseModelThermo/phaseModel/phaseModel/phaseModel.H
@@ -232,6 +232,13 @@ public:
         //- Thermal diffusivity for temperature of phase for patch [J/m/s/K]
         tmp<scalarField> kappa(const label patchi) const;
 
+        //- Thermal diffusivity for energy of mixture [kg/m/s]
+        tmp<volScalarField> alphahe() const;
+
+        //- Thermal diffusivity for energy of mixture for patch [kg/m/s]
+        tmp<scalarField> alphahe(const label patchi) const;
+
+
         //- Effective thermal diffusivity for temperature of phase [J/m/s/K]
         tmp<volScalarField> kappaEff(const volScalarField&) const;
 
diff --git a/src/thermoDynamics/twoPhaseModelThermo/twoPhaseMixtureThermo.C b/src/thermoDynamics/twoPhaseModelThermo/twoPhaseMixtureThermo.C
index 74d672ee..0d2b6fa5 100644
--- a/src/thermoDynamics/twoPhaseModelThermo/twoPhaseMixtureThermo.C
+++ b/src/thermoDynamics/twoPhaseModelThermo/twoPhaseMixtureThermo.C
@@ -237,6 +237,18 @@ Foam::tmp<Foam::scalarField> Foam::twoPhaseMixtureThermo::Cv
 }
 
 
+Foam::tmp<Foam::scalarField> Foam::twoPhaseMixtureThermo::rhoEoS
+(
+    const scalarField& p,
+    const scalarField& T,
+    const labelList& cells
+) const
+{
+    NotImplemented;
+    return nullptr;
+}
+
+
 Foam::tmp<Foam::volScalarField> Foam::twoPhaseMixtureThermo::gamma() const
 {
     return alpha1()*thermo1_->gamma() + alpha2()*thermo2_->gamma();
diff --git a/src/thermoDynamics/twoPhaseModelThermo/twoPhaseMixtureThermo.H b/src/thermoDynamics/twoPhaseModelThermo/twoPhaseMixtureThermo.H
index edf0fbd8..b1223339 100644
--- a/src/thermoDynamics/twoPhaseModelThermo/twoPhaseMixtureThermo.H
+++ b/src/thermoDynamics/twoPhaseModelThermo/twoPhaseMixtureThermo.H
@@ -206,6 +206,18 @@ public:
                 const label patchi
             ) const;
 
+            //- Heat capacity using pressure and temperature [J/kg/K]
+            virtual tmp<scalarField> Cp
+            (
+                const scalarField& p,
+                const scalarField& T,
+                const labelList& cells
+            )        
+            {
+                NotImplemented;
+                return tmp<scalarField>::New(p);
+            }
+
             //- Heat capacity at constant volume [J/kg/K]
             virtual tmp<volScalarField> Cv() const;
 
@@ -217,6 +229,14 @@ public:
                 const label patchi
             ) const;
 
+            //- Density from pressure and temperature
+            virtual tmp<scalarField> rhoEoS
+            (
+                const scalarField& p,
+                const scalarField& T,
+                const labelList& cells
+            ) const;
+
             //- Gamma = Cp/Cv []
             virtual tmp<volScalarField> gamma() const;
 
diff --git a/src/thermoDynamics/twoPhaseModelThermo/twoPhaseModelThermo.C b/src/thermoDynamics/twoPhaseModelThermo/twoPhaseModelThermo.C
index 81916b9a..d04ee073 100644
--- a/src/thermoDynamics/twoPhaseModelThermo/twoPhaseModelThermo.C
+++ b/src/thermoDynamics/twoPhaseModelThermo/twoPhaseModelThermo.C
@@ -255,6 +255,17 @@ Foam::tmp<Foam::scalarField> Foam::twoPhaseModelThermo::Cv
       + phase2_().boundaryField()[patchi]*phase2_->thermo().Cv(p, T, patchi);
 }
 
+Foam::tmp<Foam::scalarField> Foam::twoPhaseModelThermo::rhoEoS
+(
+    const scalarField& p,
+    const scalarField& T,
+    const labelList& cells
+) const
+{
+    NotImplemented;
+    return nullptr;
+}
+
 
 Foam::tmp<Foam::volScalarField> Foam::twoPhaseModelThermo::gamma() const
 {
@@ -361,6 +372,25 @@ Foam::tmp<Foam::scalarField> Foam::twoPhaseModelThermo::kappa
 }
 
 
+Foam::tmp<Foam::volScalarField> Foam::twoPhaseModelThermo::alphahe() const
+{
+    return phase1_()*phase1_->thermo().alphahe()
+         + phase2_()*phase2_->thermo().alphahe();
+}
+
+
+Foam::tmp<Foam::scalarField> Foam::twoPhaseModelThermo::alphahe
+(
+    const label patchi
+) const
+{
+    return
+        phase1_().boundaryField()[patchi]*phase1_->thermo().alphahe(patchi)
+      + phase2_().boundaryField()[patchi]*phase2_->thermo().alphahe(patchi);
+}
+
+
+
 Foam::tmp<Foam::volScalarField> Foam::twoPhaseModelThermo::kappaEff
 (
     const volScalarField& alphat
diff --git a/src/thermoDynamics/twoPhaseModelThermo/twoPhaseModelThermo.H b/src/thermoDynamics/twoPhaseModelThermo/twoPhaseModelThermo.H
index 5638ef7b..87664dc5 100644
--- a/src/thermoDynamics/twoPhaseModelThermo/twoPhaseModelThermo.H
+++ b/src/thermoDynamics/twoPhaseModelThermo/twoPhaseModelThermo.H
@@ -265,6 +265,18 @@ public:
                 const label patchi
             ) const;
 
+            //- Heat capacity using pressure and temperature [J/kg/K]
+            virtual tmp<scalarField> Cp
+            (
+                const scalarField& p,
+                const scalarField& T,
+                const labelList& cells
+            ) const   
+            {
+                NotImplemented;
+                return tmp<scalarField>::New(p);
+            }
+
             //- Heat capacity at constant volume [J/kg/K]
             virtual tmp<volScalarField> Cv() const;
 
@@ -276,6 +288,14 @@ public:
                 const label patchi
             ) const;
 
+            //- Density from pressure and temperature
+            virtual tmp<scalarField> rhoEoS
+            (
+                const scalarField& p,
+                const scalarField& T,
+                const labelList& cells
+            ) const;
+
             //- Gamma = Cp/Cv []
             virtual tmp<volScalarField> gamma() const;
 
@@ -330,6 +350,12 @@ public:
                 const label patchi
             ) const;
 
+            //- Thermal diffusivity for energy of mixture [kg/m/s]
+            virtual tmp<volScalarField> alphahe() const;
+
+            //- Thermal diffusivity for energy of mixture for patch [kg/m/s]
+            virtual tmp<scalarField> alphahe(const label patchi) const;
+
             //- Effective thermal diffusivity of mixture [J/m/s/K]
             virtual tmp<volScalarField> kappaEff
             (
diff --git a/testsuite/advection/test-Leveque/Allrun b/testsuite/advection/test-Leveque/Allrun
index b46575e7..63c62852 100755
--- a/testsuite/advection/test-Leveque/Allrun
+++ b/testsuite/advection/test-Leveque/Allrun
@@ -14,6 +14,6 @@ runApplication setAlphaField
 runApplication generateU
 
 runApplication decomposePar
-runParallel $(getApplication)
-cp postProcessing/volumeFractionError/0/volumeFractionError.dat volumeFractionError.dat
+mpirun -oversubscribe -np 4 $(getApplication) -parallel  > log.$(getApplication)
 
+cp postProcessing/volumeFractionError/0/volumeFractionError.dat volumeFractionError.dat
diff --git a/testsuite/advection/test-Leveque/system/blockMeshDict b/testsuite/advection/test-Leveque/system/blockMeshDict
index 83c6caa7..81be9735 100644
--- a/testsuite/advection/test-Leveque/system/blockMeshDict
+++ b/testsuite/advection/test-Leveque/system/blockMeshDict
@@ -16,7 +16,7 @@ FoamFile
 
 #include "simulationParameter"
 
-convertToMeters 1;
+scale 1;
 
 x1 0;
 x2 1;
diff --git a/testsuite/advection/test-Leveque/system/controlDict b/testsuite/advection/test-Leveque/system/controlDict
index 6ea26683..9cf4a573 100644
--- a/testsuite/advection/test-Leveque/system/controlDict
+++ b/testsuite/advection/test-Leveque/system/controlDict
@@ -63,7 +63,7 @@ functions
 		type        volumeFractionError;
 		libs        ("libpostProcess.so");
 		field       alpha.water;
-		function    sphere;
+		functionType    sphere;
 		radius      0.15;
 		origin          (0.35 0.35 0.35);
 		writeControl    adjustableRunTime;
diff --git a/testsuite/advection/test-Leveque/system/initAlphaFieldDict b/testsuite/advection/test-Leveque/system/initAlphaFieldDict
index 4a086f61..3e7b3712 100644
--- a/testsuite/advection/test-Leveque/system/initAlphaFieldDict
+++ b/testsuite/advection/test-Leveque/system/initAlphaFieldDict
@@ -16,7 +16,7 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 field   "alpha.water";
-function functionSphere;
+type functionSphere;
 radius      0.15;
 centre      (0.35 0.35 0.35);
 
diff --git a/testsuite/advection/test-Leveque/system/setAlphaFieldDict b/testsuite/advection/test-Leveque/system/setAlphaFieldDict
index 29935980..74ced0b5 100644
--- a/testsuite/advection/test-Leveque/system/setAlphaFieldDict
+++ b/testsuite/advection/test-Leveque/system/setAlphaFieldDict
@@ -18,5 +18,5 @@ FoamFile
 field       "alpha.water";
 type        sphere;
 radius      0.15;
-centre      (0.35 0.35 0.35);
+origin      (0.35 0.35 0.35);
 // ************************************************************************* //
diff --git a/testsuite/advection/test-Leveque/test_Levque.py b/testsuite/advection/test-Leveque/test_Levque.py
index 310e97ef..ec954905 100644
--- a/testsuite/advection/test-Leveque/test_Levque.py
+++ b/testsuite/advection/test-Leveque/test_Levque.py
@@ -38,12 +38,12 @@ def simMod(res, reconScheme):
 c_plicRDF128 = simMod(128, "plicRDF")
 
 parameters = [
-    c_isoAlpha32, 
-    c_isoAlpha64, 
-    c_isoAlpha128,
-    c_plicRDF32,  
-    c_plicRDF64,  
-    c_plicRDF128, 
+    c_isoAlpha32,
+    c_isoAlpha64,
+    pytest.param(c_isoAlpha128, marks=pytest.mark.slow),
+    c_plicRDF32,
+    c_plicRDF64,
+    pytest.param(c_plicRDF128, marks=pytest.mark.slow)
 ]
 
 
@@ -71,10 +71,13 @@ def simMod(res, reconScheme):
         "plicRDF128",
     ]
 )
-def test_deformation(run_reset_case, load_errorfiles):
+def test_levque(run_reset_case, load_errorfiles):
 
     print("runcase", run_reset_case)
     log = oftest.path_log()
+    assert oftest.case_status(log) == "completed"  # checks if run completes
+    with open(log, 'r') as fin:
+        print(fin.read())
     err = load_errorfiles
     max_err_shape = abs(err.iloc[1, 1].max())
     max_err_mass = abs(err.iloc[:, 2].max())
@@ -91,10 +94,9 @@ def test_deformation(run_reset_case, load_errorfiles):
     results["Res"].append(grid_res)
 
     exp_res = oftest.expected_results([3,4],(scheme,grid_res))
-    assert max_err_shape == pytest.approx(exp_res["err_shape"],rel=0.01)
+    assert max_err_shape <= exp_res["err_shape"]*1.01
     assert max_err_mass <= 1e-13
     assert max_err_bound <= 5e-6
-    assert oftest.case_status(log) == "completed"  # checks if run completes
 
 
 def test_results():
diff --git a/testsuite/advection/test-deformationSphere/Allrun b/testsuite/advection/test-deformationSphere/Allrun
index 92d8291b..a0ae578b 100755
--- a/testsuite/advection/test-deformationSphere/Allrun
+++ b/testsuite/advection/test-deformationSphere/Allrun
@@ -14,8 +14,5 @@ runApplication setAlphaField
 runApplication generateUDeform
 
 runApplication decomposePar
-runParallel $(getApplication)
+mpirun -oversubscribe -np 4 $(getApplication) -parallel  > log.$(getApplication)
 cp postProcessing/volumeFractionError/0/volumeFractionError.dat volumeFractionError.dat
-
-
-
diff --git a/testsuite/advection/test-deformationSphere/system/blockMeshDict b/testsuite/advection/test-deformationSphere/system/blockMeshDict
index 2bdaa163..50fc1244 100644
--- a/testsuite/advection/test-deformationSphere/system/blockMeshDict
+++ b/testsuite/advection/test-deformationSphere/system/blockMeshDict
@@ -16,7 +16,7 @@ FoamFile
 
 #include "simulationParameter"
 
-convertToMeters 1;
+scale 1;
 
 x1 0;
 x2 1;
diff --git a/testsuite/advection/test-deformationSphere/system/controlDict b/testsuite/advection/test-deformationSphere/system/controlDict
index e6a4fe8d..f52a93fe 100644
--- a/testsuite/advection/test-deformationSphere/system/controlDict
+++ b/testsuite/advection/test-deformationSphere/system/controlDict
@@ -63,7 +63,7 @@ functions
 		type volumeFractionError;
 		libs ("libpostProcess.so");
 		field alpha.water;
-		function    sphere;
+		functionType    sphere;
 		radius      0.15;
 		origin      (0.5 0.75 0.25);
 		centre      (0.5 0.75 0.25);
diff --git a/testsuite/advection/test-deformationSphere/test_deformationSphere.py b/testsuite/advection/test-deformationSphere/test_deformationSphere.py
index 9ed6b042..05874563 100644
--- a/testsuite/advection/test-deformationSphere/test_deformationSphere.py
+++ b/testsuite/advection/test-deformationSphere/test_deformationSphere.py
@@ -39,12 +39,12 @@ def simMod(res, reconScheme):
 
 
 parameters = [
-    c_isoAlpha32,  
-    c_isoAlpha64,  
-    c_isoAlpha128, 
-    c_plicRDF32,   
-    c_plicRDF64,   
-    c_plicRDF128,  
+    c_isoAlpha32,
+    c_isoAlpha64,
+    pytest.param(c_isoAlpha128, marks=pytest.mark.slow),
+    c_plicRDF32,
+    c_plicRDF64,
+    pytest.param(c_plicRDF128, marks=pytest.mark.slow)
 ]
 
 
@@ -73,6 +73,7 @@ def simMod(res, reconScheme):
 )
 def test_deformation(run_reset_case, load_errorfiles):
     log = oftest.path_log()
+    assert oftest.case_status(log) == "completed"  # checks if run completes
     err = load_errorfiles
     max_err_shape = abs(err.iloc[1, 1].max())
     max_err_mass = abs(err.iloc[:, 2].max())
@@ -90,10 +91,9 @@ def test_deformation(run_reset_case, load_errorfiles):
     results["Res"].append(grid_res)
 
     exp_res = oftest.expected_results([3,4],(scheme,grid_res))
-    assert max_err_shape == pytest.approx(exp_res["err_shape"],rel=0.01)
+    assert max_err_shape <= exp_res["err_shape"]*1.01
     assert max_err_mass <= 1e-13
     assert max_err_bound <= 5e-5
-    assert oftest.case_status(log) == "completed"  # checks if run completes
 
 
 def test_write_results():
diff --git a/testsuite/advection/test-discUniFlow/Allrun b/testsuite/advection/test-discUniFlow/Allrun
index 9d7a10ca..7cc6c131 100755
--- a/testsuite/advection/test-discUniFlow/Allrun
+++ b/testsuite/advection/test-discUniFlow/Allrun
@@ -13,6 +13,5 @@ runApplication $(getApplication)
 cp postProcessing/volumeFractionError/0/volumeFractionError.dat volumeFractionError.dat
 rm -r postProcessing
 runApplication decomposePar
-runParallel -s par $(getApplication)
+mpirun -oversubscribe -np 6 $(getApplication) -parallel  > log.$(getApplication)
 cp postProcessing/volumeFractionError/0/volumeFractionError.dat volumeFractionErrorPar.dat
-
diff --git a/testsuite/advection/test-discUniFlow/prof.py b/testsuite/advection/test-discUniFlow/prof.py
new file mode 100644
index 00000000..a852bc96
--- /dev/null
+++ b/testsuite/advection/test-discUniFlow/prof.py
@@ -0,0 +1,15 @@
+import pandas as pd
+import plotly.express as px
+
+from PyFoam.RunDictionary.ParsedParameterFile import ParsedParameterFile
+prof = ParsedParameterFile("4/uniform/profiling")
+print(prof["profiling"]) # print python dict
+
+df = pd.DataFrame(prof["profiling"]).T
+df.index = df.index.set_names(['trigger'])
+df = df.reset_index("trigger")
+df.to_csv("performance.csv",index=False)
+
+fig = px.treemap(df,names='id', parents = 'parentId',hover_name='description', values='totalTime',branchvalues="total")
+fig.show()
+
diff --git a/testsuite/advection/test-discUniFlow/system/blockMeshDict b/testsuite/advection/test-discUniFlow/system/blockMeshDict
index 66e16ca3..aa52bbf8 100755
--- a/testsuite/advection/test-discUniFlow/system/blockMeshDict
+++ b/testsuite/advection/test-discUniFlow/system/blockMeshDict
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-convertToMeters 1;
+scale 1;
 
 L	5;
 H	3;
diff --git a/testsuite/advection/test-discUniFlow/system/controlDict b/testsuite/advection/test-discUniFlow/system/controlDict
index 773732c5..dbcdacf1 100755
--- a/testsuite/advection/test-discUniFlow/system/controlDict
+++ b/testsuite/advection/test-discUniFlow/system/controlDict
@@ -63,7 +63,7 @@ functions
 		type volumeFractionError;
 		libs ("libpostProcess.so");
 		field alpha.water;
-        function cylinder;
+        functionType cylinder;
         radius 0.25;
         direction (0 1 0);
         origin (0.5 0 0.5);
diff --git a/testsuite/advection/test-discUniFlow/test_discUniFlow.py b/testsuite/advection/test-discUniFlow/test_discUniFlow.py
index 31081178..f7108c2f 100644
--- a/testsuite/advection/test-discUniFlow/test_discUniFlow.py
+++ b/testsuite/advection/test-discUniFlow/test_discUniFlow.py
@@ -1,7 +1,8 @@
 import os
 import pytest
 import oftest
-from oftest import run_case, clean_case
+
+from oftest import run_reset_case, clean_case
 
 @pytest.fixture(scope='class') # descruct all tests
 def load_errorfiles():
@@ -16,11 +17,11 @@ def load_errorfiles():
 
 class TestDiscUniFlow:
 
-    def test_completed(self,run_case):
+    def test_completed(self,run_reset_case):
         log = oftest.path_log()
         assert oftest.case_status(log) == 'completed' # checks if run completes
 
-    def test_parallel(self,run_case,load_errorfiles):
+    def test_parallel(self,run_reset_case,load_errorfiles):
         err_serial, err_parrallel = load_errorfiles
         # exlude last two lines
         error = abs(err_parrallel.iloc[:,:-2]) - abs(err_serial.iloc[:,:-2])
@@ -28,7 +29,7 @@ def test_parallel(self,run_case,load_errorfiles):
 
         assert max_error < 1e-14
 
-    def test_accuracy(self,run_case,load_errorfiles):
+    def test_accuracy(self,run_reset_case,load_errorfiles):
         err_serial, err_parrallel = load_errorfiles
 
         max_err_shape =  abs(err_serial.iloc[:,1].max())
diff --git a/testsuite/advection/test-vortexShearedDisc/Allrun b/testsuite/advection/test-vortexShearedDisc/Allrun
index 8f8bd203..1474d8b5 100755
--- a/testsuite/advection/test-vortexShearedDisc/Allrun
+++ b/testsuite/advection/test-vortexShearedDisc/Allrun
@@ -15,6 +15,5 @@ runApplication $(getApplication)
 cp postProcessing/volumeFractionError/0/volumeFractionError.dat volumeFractionError.dat
 rm -r postProcessing
 runApplication decomposePar
-runParallel -s par $(getApplication)
+mpirun -oversubscribe -np 4 $(getApplication) -parallel  > log.$(getApplication).par
 cp postProcessing/volumeFractionError/0/volumeFractionError.dat volumeFractionErrorPar.dat
-
diff --git a/testsuite/advection/test-vortexShearedDisc/Allrun.paraStudy b/testsuite/advection/test-vortexShearedDisc/Allrun.paraStudy
index 1e688de6..e7e93f07 100755
--- a/testsuite/advection/test-vortexShearedDisc/Allrun.paraStudy
+++ b/testsuite/advection/test-vortexShearedDisc/Allrun.paraStudy
@@ -12,6 +12,5 @@ runApplication setAlphaField
 runApplication generateUVortex2D
 
 runApplication decomposePar
-runParallel $(getApplication)
+mpirun -oversubscribe -np 4 $(getApplication) -parallel  > log.$(getApplication)
 cp postProcessing/volumeFractionError/0/volumeFractionError.dat volumeFractionError.dat
-
diff --git a/testsuite/advection/test-vortexShearedDisc/generateUVortex2D/generateUVortex2D.C b/testsuite/advection/test-vortexShearedDisc/generateUVortex2D/generateUVortex2D.C
index 8fb823a3..b0974261 100755
--- a/testsuite/advection/test-vortexShearedDisc/generateUVortex2D/generateUVortex2D.C
+++ b/testsuite/advection/test-vortexShearedDisc/generateUVortex2D/generateUVortex2D.C
@@ -60,10 +60,10 @@ int main(int argc, char *argv[])
 
     scalar PI = Foam::constant::mathematical::pi;
     {
-        scalarField X = mesh.C().component(0);
-        scalarField Z = mesh.C().component(2);
-        scalarField u = -sin(2.0*PI*Z)*pow(sin(PI*X),2.0);
-        scalarField w = sin(2.0*PI*X)*pow(sin(PI*Z),2.0);
+        scalarField X(mesh.C().component(0));
+        scalarField Z(mesh.C().component(2));
+        scalarField u(-sin(2.0*PI*Z)*pow(sin(PI*X),2.0));
+        scalarField w(sin(2.0*PI*X)*pow(sin(PI*Z),2.0));
         forAll(U,ci)
         {
             U[ci] = u[ci]*vector(1.0,0.0,0.0) + 0.0*vector(0.0,1.0,0.0) + w[ci]*vector(0.0,0.0,1.0);
@@ -86,10 +86,10 @@ int main(int argc, char *argv[])
     );
 
     {
-        const scalarField x = mesh.points().component(0);
-        const scalarField y = mesh.points().component(1);
-        const scalarField z = mesh.points().component(2);
-        scalarField psi = (1.0/PI)*pow(sin(PI*x),2.0)*pow(sin(PI*z),2.0);
+        const scalarField x(mesh.points().component(0));
+        const scalarField y(mesh.points().component(1));
+        const scalarField z(mesh.points().component(2));
+        scalarField psi((1.0/PI)*pow(sin(PI*x),2.0)*pow(sin(PI*z),2.0));
         forAll(phi,fi)
         {
             phi[fi] = 0.0;
diff --git a/testsuite/advection/test-vortexShearedDisc/prof.py b/testsuite/advection/test-vortexShearedDisc/prof.py
new file mode 100644
index 00000000..a852bc96
--- /dev/null
+++ b/testsuite/advection/test-vortexShearedDisc/prof.py
@@ -0,0 +1,15 @@
+import pandas as pd
+import plotly.express as px
+
+from PyFoam.RunDictionary.ParsedParameterFile import ParsedParameterFile
+prof = ParsedParameterFile("4/uniform/profiling")
+print(prof["profiling"]) # print python dict
+
+df = pd.DataFrame(prof["profiling"]).T
+df.index = df.index.set_names(['trigger'])
+df = df.reset_index("trigger")
+df.to_csv("performance.csv",index=False)
+
+fig = px.treemap(df,names='id', parents = 'parentId',hover_name='description', values='totalTime',branchvalues="total")
+fig.show()
+
diff --git a/testsuite/advection/test-vortexShearedDisc/system/blockMeshDict b/testsuite/advection/test-vortexShearedDisc/system/blockMeshDict
index d823cbb1..7fd44ec3 100755
--- a/testsuite/advection/test-vortexShearedDisc/system/blockMeshDict
+++ b/testsuite/advection/test-vortexShearedDisc/system/blockMeshDict
@@ -16,7 +16,7 @@ FoamFile
 
 #include "simulationParameter"
 
-convertToMeters 1;
+scale 1;
 
 L	1;
 
diff --git a/testsuite/advection/test-vortexShearedDisc/system/controlDict b/testsuite/advection/test-vortexShearedDisc/system/controlDict
index f0573e66..6cf92734 100755
--- a/testsuite/advection/test-vortexShearedDisc/system/controlDict
+++ b/testsuite/advection/test-vortexShearedDisc/system/controlDict
@@ -63,7 +63,7 @@ functions
 		type volumeFractionError;
 		libs ("libpostProcess.so");
 		field alpha.water;
-		function        cylinder;
+		functionType        cylinder;
 		radius          0.15;
 		direction       (0 1 0);
 		origin 			(0.5 0 0.75);
diff --git a/testsuite/advection/test-vortexShearedDisc/test_vortexShearedDisc.py b/testsuite/advection/test-vortexShearedDisc/test_vortexShearedDisc.py
index 40c21841..39585a80 100644
--- a/testsuite/advection/test-vortexShearedDisc/test_vortexShearedDisc.py
+++ b/testsuite/advection/test-vortexShearedDisc/test_vortexShearedDisc.py
@@ -51,7 +51,7 @@ def test_accuracy(self, run_reset_case, load_errorfiles):
         max_err_shape = abs(err.iloc[:, 1].max())
         max_err_mass = abs(err.iloc[:, 2].max())
         max_err_bound = abs(err.iloc[:, 3].max())
-        assert max_err_shape == pytest.approx(2.35e-03,rel=0.01)
+        assert max_err_shape <= 2.35e-03*1.01
         assert max_err_mass <= 1e-13
         assert max_err_bound <= 5e-5
 
@@ -89,12 +89,12 @@ def simMod(res, reconScheme):
     c_isoAlpha64,
     c_isoAlpha128,
     c_isoAlpha256,
-    c_isoAlpha512,
+    pytest.param(c_isoAlpha512, marks=pytest.mark.slow),
     c_plicRDF32,
     c_plicRDF64,
     c_plicRDF128,
     c_plicRDF256,
-    c_plicRDF512,
+    pytest.param(c_plicRDF512, marks=pytest.mark.slow),
 ]
 
 results = {
@@ -127,6 +127,7 @@ def simMod(res, reconScheme):
 def test_vortexShearedDisc(run_reset_case, expected, load_errorfile):
 
     log = oftest.path_log()
+    assert oftest.case_status(log) == "completed"  # checks if run completes
     err = load_errorfile
     max_err_shape = abs(err.iloc[1, 1].max())
     max_err_mass = abs(err.iloc[:, 2].max())
@@ -148,7 +149,6 @@ def test_vortexShearedDisc(run_reset_case, expected, load_errorfile):
     assert max_err_shape < expected_err_shape*1.05
     assert max_err_mass <= 1e-13
     assert max_err_bound <= 5e-5
-    assert oftest.case_status(log) == "completed"  # checks if run completes
 
 
 def test_results():
diff --git a/testsuite/cht/fixedFlux/0.orig/fluid/T b/testsuite/cht/fixedFlux/0.orig/fluid/T
new file mode 100755
index 00000000..fafff689
--- /dev/null
+++ b/testsuite/cht/fixedFlux/0.orig/fluid/T
@@ -0,0 +1,55 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    object      T;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 1 0 0 0];
+
+internalField   uniform 373.15;
+
+boundaryField
+{
+    sideWalls
+    {
+        type            zeroGradient;
+    }
+
+    faceWall
+    {
+        type            fixedValue;
+        value           uniform 378.15;
+    }
+
+    outlet
+    {
+        type            zeroGradient;
+    }
+
+    frontAndBack
+    {
+        type            empty;
+    }
+
+    fluid_to_solid
+    {
+        type            compressible::turbulentTemperatureRadCoupledMixed;
+        value           uniform 300;
+        Tnbr            T;
+        kappaMethod     fluidThermo;
+        kappaName       none;
+    }
+    
+}
+
+// ************************************************************************* //
diff --git a/testsuite/cht/fixedFlux/0.orig/fluid/T.air b/testsuite/cht/fixedFlux/0.orig/fluid/T.air
new file mode 100755
index 00000000..c1fa77b1
--- /dev/null
+++ b/testsuite/cht/fixedFlux/0.orig/fluid/T.air
@@ -0,0 +1,54 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    object      T.air;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 1 0 0 0];
+
+internalField   uniform 373.15;
+
+boundaryField
+{
+    sideWalls
+    {
+        type            zeroGradient;
+    }
+
+    faceWall
+    {
+        type            fixedValue;
+        value           uniform 378.15;
+    }
+
+    outlet
+    {
+        type            zeroGradient;
+    }
+
+    frontAndBack
+    {
+        type            empty;
+    }
+
+    fluid_to_solid
+    {
+        type            compressible::turbulentTemperatureRadCoupledMixed;
+        value           uniform 300;
+        Tnbr            T;
+        kappaMethod     fluidThermo;
+        kappaName       none;
+    }
+}
+
+// ************************************************************************* //
diff --git a/testsuite/cht/fixedFlux/0.orig/fluid/T.water b/testsuite/cht/fixedFlux/0.orig/fluid/T.water
new file mode 100755
index 00000000..b70bbacf
--- /dev/null
+++ b/testsuite/cht/fixedFlux/0.orig/fluid/T.water
@@ -0,0 +1,54 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    object      T.water;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 1 0 0 0];
+
+internalField   uniform 373.15;
+
+boundaryField
+{
+    sideWalls
+    {
+        type            zeroGradient;
+    }
+
+    faceWall
+    {
+        type            fixedValue;
+        value           uniform 378.15;
+    }
+
+    outlet
+    {
+        type            zeroGradient;
+    }
+
+    frontAndBack
+    {
+        type            empty;
+    }
+
+    fluid_to_solid
+    {
+        type            compressible::turbulentTemperatureRadCoupledMixed;
+        value           uniform 300;
+        Tnbr            T;
+        kappaMethod     fluidThermo;
+        kappaName       none;
+    }    
+}
+
+// ************************************************************************* //
diff --git a/testsuite/cht/fixedFlux/0.orig/fluid/U b/testsuite/cht/fixedFlux/0.orig/fluid/U
new file mode 100755
index 00000000..633b5eb2
--- /dev/null
+++ b/testsuite/cht/fixedFlux/0.orig/fluid/U
@@ -0,0 +1,51 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volVectorField;
+    object      U;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -1 0 0 0 0];
+
+internalField   uniform (0 0 0);
+
+boundaryField
+{
+    sideWalls
+    {
+        type            slip;
+        value           uniform (0 0 0);
+    }
+
+    faceWall
+    {
+        type            noSlip;
+    }
+
+    frontAndBack
+    {
+        type            empty;
+    }
+
+    outlet
+    {
+        type            pressureInletOutletVelocity;
+        value           uniform (0 0 0);
+    }
+
+    fluid_to_solid
+    {
+        type            noSlip;
+    }
+}
+
+// ************************************************************************* //
diff --git a/testsuite/cht/fixedFlux/0.orig/fluid/alpha.water b/testsuite/cht/fixedFlux/0.orig/fluid/alpha.water
new file mode 100755
index 00000000..fc0605d1
--- /dev/null
+++ b/testsuite/cht/fixedFlux/0.orig/fluid/alpha.water
@@ -0,0 +1,34 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    object      alpha.water;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    ".*"
+    {
+        type            zeroGradient;
+    }
+
+    frontAndBack
+    {
+        type            empty;
+    }
+}
+
+// ************************************************************************* //
diff --git a/testsuite/cht/fixedFlux/0.orig/fluid/p b/testsuite/cht/fixedFlux/0.orig/fluid/p
new file mode 100755
index 00000000..cd99f791
--- /dev/null
+++ b/testsuite/cht/fixedFlux/0.orig/fluid/p
@@ -0,0 +1,52 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    object      p;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [1 -1 -2 0 0 0 0];
+
+internalField   uniform 1e5;
+
+boundaryField
+{
+    sideWalls
+    {
+        type            fixedFluxPressure;
+    }
+
+    faceWall
+    {
+        type            fixedFluxPressure;
+    }
+
+    outlet
+    {
+        //type            fixedValue;
+        type            totalPressure;
+        rho             rho;
+        p0              uniform 1e5;
+        value           uniform 1e5;
+    }
+
+    frontAndBack
+    {
+        type            empty;
+    }
+        fluid_to_solid
+    {
+        type            fixedFluxPressure;
+    } 
+}
+
+// ************************************************************************* //
diff --git a/testsuite/cht/fixedFlux/0.orig/fluid/p_rgh b/testsuite/cht/fixedFlux/0.orig/fluid/p_rgh
new file mode 100755
index 00000000..50ecadf5
--- /dev/null
+++ b/testsuite/cht/fixedFlux/0.orig/fluid/p_rgh
@@ -0,0 +1,53 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    object      p_rgh;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [1 -1 -2 0 0 0 0];
+
+internalField   uniform 1e5;
+
+boundaryField
+{
+    sideWalls
+    {
+        type            fixedFluxPressure;
+    }
+
+    faceWall
+    {
+        type            fixedFluxPressure;
+    }
+
+    outlet
+    {
+        //type            fixedValue;
+        type            totalPressure;
+        rho             rho;
+        p0              uniform 1e5;
+        value           uniform 1e5;
+    }
+
+    frontAndBack
+    {
+        type            empty;
+    }
+
+        fluid_to_solid
+    {
+        type            fixedFluxPressure;
+    } 
+}
+
+// ************************************************************************* //
diff --git a/testsuite/cht/fixedFlux/0.orig/solid/T b/testsuite/cht/fixedFlux/0.orig/solid/T
new file mode 100755
index 00000000..d0d58022
--- /dev/null
+++ b/testsuite/cht/fixedFlux/0.orig/solid/T
@@ -0,0 +1,61 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    object      T;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 1 0 0 0];
+
+internalField   uniform 373.15;
+
+boundaryField
+{
+    sideWalls
+    {
+        type            zeroGradient;
+    }
+
+    faceWall
+    {
+        type            externalWallHeatFluxTemperature;
+
+        mode            power;
+
+        Q               constant 1e-6;
+
+        kappaMethod     fluidThermo;
+
+        value           $internalField;
+    }
+
+    outlet
+    {
+        type            zeroGradient;
+    }
+
+    frontAndBack
+    {
+        type            empty;
+    }
+
+    solid_to_fluid
+    {
+        type            compressible::turbulentTemperatureRadCoupledMixed;
+        value           uniform 300;
+        Tnbr            T;
+        kappaMethod     solidThermo;
+        kappaName       none;
+    }
+}
+
+// ************************************************************************* //
diff --git a/testsuite/cht/fixedFlux/0.orig/solid/p b/testsuite/cht/fixedFlux/0.orig/solid/p
new file mode 100755
index 00000000..49ce4f76
--- /dev/null
+++ b/testsuite/cht/fixedFlux/0.orig/solid/p
@@ -0,0 +1,53 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    object      p;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [1 -1 -2 0 0 0 0];
+
+internalField   uniform 1e5;
+
+boundaryField
+{
+  sideWalls
+  {
+      type            fixedFluxPressure;
+  }
+
+  faceWall
+  {
+      type            fixedFluxPressure;
+  }
+
+  outlet
+  {
+      //type            fixedValue;
+      type            totalPressure;
+      rho             rho;
+      p0              uniform 1e5;
+      value           uniform 1e5;
+  }
+
+  frontAndBack
+  {
+      type            empty;
+  }
+
+  solid_to_fluid
+  {
+      type            fixedFluxPressure;
+  }
+}
+
+// ************************************************************************* //
diff --git a/testsuite/cht/fixedFlux/Allclean b/testsuite/cht/fixedFlux/Allclean
new file mode 100755
index 00000000..a8ff90d0
--- /dev/null
+++ b/testsuite/cht/fixedFlux/Allclean
@@ -0,0 +1,13 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
+
+# Source tutorial clean functions
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+
+cleanCase
+rm -rf 0
+rm -rf isoFaces
+rm -rf stefan_problem.foam
+rm -r AlphaInit/
+
+#------------------------------------------------------------------------------
diff --git a/testsuite/cht/fixedFlux/Allrun b/testsuite/cht/fixedFlux/Allrun
new file mode 100755
index 00000000..d09c9011
--- /dev/null
+++ b/testsuite/cht/fixedFlux/Allrun
@@ -0,0 +1,22 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
+
+# Source tutorial run functions
+. $WM_PROJECT_DIR/bin/tools/RunFunctions
+
+runApplication blockMesh
+runApplication topoSet
+
+# Restore initial fields
+restore0Dir
+
+runApplication splitMeshRegions -cellZones -overwrite
+rm -r constant/polyMesh
+
+runApplication initAlphaField -region fluid
+
+touch cht.foam
+
+runApplication $(getApplication)
+
+#------------------------------------------------------------------------------
diff --git a/testsuite/cht/fixedFlux/constant/fluid/phaseChangeProperties b/testsuite/cht/fixedFlux/constant/fluid/phaseChangeProperties
new file mode 100755
index 00000000..9e4f052c
--- /dev/null
+++ b/testsuite/cht/fixedFlux/constant/fluid/phaseChangeProperties
@@ -0,0 +1,55 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      interfaceModels;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "<system>/simulationParameter"
+
+energySourceTermModel $PCM;
+selectedGradExplicitCoeffs
+{
+
+}
+implicitGradCoeffs
+{
+
+}
+SchrageCoeffs
+{
+
+}
+massSourceTermModel hardtWondra;
+hardtWondraCoeffs
+{
+    
+}
+hardtWondraGasPhaseCoeffs
+{
+    
+}
+
+satProperties
+{
+    singleComponentSatProp function;
+    Tmin 100;
+    Tmax 500;
+    pSat constant 1e5;
+    TSat constant 373.15;
+    L constant 1e6;
+}
+
+
+
+// ************************************************************************* //
diff --git a/testsuite/cht/fixedFlux/constant/fluid/polyMesh/boundary b/testsuite/cht/fixedFlux/constant/fluid/polyMesh/boundary
new file mode 100644
index 00000000..451fe0f3
--- /dev/null
+++ b/testsuite/cht/fixedFlux/constant/fluid/polyMesh/boundary
@@ -0,0 +1,46 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2106                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    arch        "LSB;label=32;scalar=64";
+    class       polyBoundaryMesh;
+    location    "constant/fluid/polyMesh";
+    object      boundary;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+3
+(
+    outlet
+    {
+        type            patch;
+        nFaces          1;
+        startFace       89;
+    }
+    frontAndBack
+    {
+        type            empty;
+        inGroups        1(empty);
+        nFaces          360;
+        startFace       90;
+    }
+    fluid_to_solid
+    {
+        type            mappedWall;
+        inGroups        1(wall);
+        nFaces          1;
+        startFace       450;
+        sampleMode      nearestPatchFace;
+        sampleRegion    solid;
+        samplePatch     solid_to_fluid;
+    }
+)
+
+// ************************************************************************* //
diff --git a/testsuite/cht/fixedFlux/constant/fluid/polyMesh/boundaryRegionAddressing b/testsuite/cht/fixedFlux/constant/fluid/polyMesh/boundaryRegionAddressing
new file mode 100644
index 00000000..fc03cb84
--- /dev/null
+++ b/testsuite/cht/fixedFlux/constant/fluid/polyMesh/boundaryRegionAddressing
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2106                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    arch        "LSB;label=32;scalar=64";
+    class       labelList;
+    location    "constant/fluid/polyMesh";
+    object      boundaryRegionAddressing;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+3(1 2 -1)
+
+// ************************************************************************* //
diff --git a/testsuite/cht/fixedFlux/constant/fluid/polyMesh/cellRegionAddressing b/testsuite/cht/fixedFlux/constant/fluid/polyMesh/cellRegionAddressing
new file mode 100644
index 00000000..6469bea3
--- /dev/null
+++ b/testsuite/cht/fixedFlux/constant/fluid/polyMesh/cellRegionAddressing
@@ -0,0 +1,115 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2106                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    arch        "LSB;label=32;scalar=64";
+    class       labelList;
+    location    "constant/fluid/polyMesh";
+    object      cellRegionAddressing;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+
+90
+(
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55
+56
+57
+58
+59
+60
+61
+62
+63
+64
+65
+66
+67
+68
+69
+70
+71
+72
+73
+74
+75
+76
+77
+78
+79
+80
+81
+82
+83
+84
+85
+86
+87
+88
+89
+90
+91
+92
+93
+94
+95
+96
+97
+98
+99
+)
+
+
+// ************************************************************************* //
diff --git a/testsuite/cht/fixedFlux/constant/fluid/polyMesh/cellZones b/testsuite/cht/fixedFlux/constant/fluid/polyMesh/cellZones
new file mode 100644
index 00000000..236afb56
--- /dev/null
+++ b/testsuite/cht/fixedFlux/constant/fluid/polyMesh/cellZones
@@ -0,0 +1,132 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2106                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    arch        "LSB;label=32;scalar=64";
+    class       regIOobject;
+    location    "constant/fluid/polyMesh";
+    object      cellZones;
+    meta
+    {
+        names           2 ( solid fluid );
+    }
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+2
+(
+solid
+{
+    type cellZone;
+cellLabels      List<label> 0();
+}
+
+fluid
+{
+    type cellZone;
+cellLabels      List<label> 
+90
+(
+0
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55
+56
+57
+58
+59
+60
+61
+62
+63
+64
+65
+66
+67
+68
+69
+70
+71
+72
+73
+74
+75
+76
+77
+78
+79
+80
+81
+82
+83
+84
+85
+86
+87
+88
+89
+)
+;
+}
+)
+
+// ************************************************************************* //
diff --git a/testsuite/cht/fixedFlux/constant/fluid/polyMesh/faceRegionAddressing b/testsuite/cht/fixedFlux/constant/fluid/polyMesh/faceRegionAddressing
new file mode 100644
index 00000000..e1198e6f
--- /dev/null
+++ b/testsuite/cht/fixedFlux/constant/fluid/polyMesh/faceRegionAddressing
@@ -0,0 +1,476 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2106                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    arch        "LSB;label=32;scalar=64";
+    class       labelList;
+    location    "constant/fluid/polyMesh";
+    object      faceRegionAddressing;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+
+451
+(
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55
+56
+57
+58
+59
+60
+61
+62
+63
+64
+65
+66
+67
+68
+69
+70
+71
+72
+73
+74
+75
+76
+77
+78
+79
+80
+81
+82
+83
+84
+85
+86
+87
+88
+89
+90
+91
+92
+93
+94
+95
+96
+97
+98
+99
+101
+112
+113
+114
+115
+116
+117
+118
+119
+120
+121
+122
+123
+124
+125
+126
+127
+128
+129
+130
+131
+132
+133
+134
+135
+136
+137
+138
+139
+140
+141
+142
+143
+144
+145
+146
+147
+148
+149
+150
+151
+152
+153
+154
+155
+156
+157
+158
+159
+160
+161
+162
+163
+164
+165
+166
+167
+168
+169
+170
+171
+172
+173
+174
+175
+176
+177
+178
+179
+180
+181
+182
+183
+184
+185
+186
+187
+188
+189
+190
+191
+192
+193
+194
+195
+196
+197
+198
+199
+200
+201
+212
+213
+214
+215
+216
+217
+218
+219
+220
+221
+222
+223
+224
+225
+226
+227
+228
+229
+230
+231
+232
+233
+234
+235
+236
+237
+238
+239
+240
+241
+242
+243
+244
+245
+246
+247
+248
+249
+250
+251
+252
+253
+254
+255
+256
+257
+258
+259
+260
+261
+262
+263
+264
+265
+266
+267
+268
+269
+270
+271
+272
+273
+274
+275
+276
+277
+278
+279
+280
+281
+282
+283
+284
+285
+286
+287
+288
+289
+290
+291
+292
+293
+294
+295
+296
+297
+298
+299
+300
+301
+312
+313
+314
+315
+316
+317
+318
+319
+320
+321
+322
+323
+324
+325
+326
+327
+328
+329
+330
+331
+332
+333
+334
+335
+336
+337
+338
+339
+340
+341
+342
+343
+344
+345
+346
+347
+348
+349
+350
+351
+352
+353
+354
+355
+356
+357
+358
+359
+360
+361
+362
+363
+364
+365
+366
+367
+368
+369
+370
+371
+372
+373
+374
+375
+376
+377
+378
+379
+380
+381
+382
+383
+384
+385
+386
+387
+388
+389
+390
+391
+392
+393
+394
+395
+396
+397
+398
+399
+400
+401
+412
+413
+414
+415
+416
+417
+418
+419
+420
+421
+422
+423
+424
+425
+426
+427
+428
+429
+430
+431
+432
+433
+434
+435
+436
+437
+438
+439
+440
+441
+442
+443
+444
+445
+446
+447
+448
+449
+450
+451
+452
+453
+454
+455
+456
+457
+458
+459
+460
+461
+462
+463
+464
+465
+466
+467
+468
+469
+470
+471
+472
+473
+474
+475
+476
+477
+478
+479
+480
+481
+482
+483
+484
+485
+486
+487
+488
+489
+490
+491
+492
+493
+494
+495
+496
+497
+498
+499
+500
+501
+-10
+)
+
+
+// ************************************************************************* //
diff --git a/testsuite/cht/fixedFlux/constant/fluid/polyMesh/faceZones b/testsuite/cht/fixedFlux/constant/fluid/polyMesh/faceZones
new file mode 100644
index 00000000..e2d359f1
--- /dev/null
+++ b/testsuite/cht/fixedFlux/constant/fluid/polyMesh/faceZones
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2106                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    arch        "LSB;label=32;scalar=64";
+    class       regIOobject;
+    location    "constant/fluid/polyMesh";
+    object      faceZones;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+0()
+
+// ************************************************************************* //
diff --git a/testsuite/cht/fixedFlux/constant/fluid/polyMesh/faces b/testsuite/cht/fixedFlux/constant/fluid/polyMesh/faces
new file mode 100644
index 00000000..7d16b522
--- /dev/null
+++ b/testsuite/cht/fixedFlux/constant/fluid/polyMesh/faces
@@ -0,0 +1,476 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2106                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    arch        "LSB;label=32;scalar=64";
+    class       faceList;
+    location    "constant/fluid/polyMesh";
+    object      faces;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+
+451
+(
+4(1 92 274 183)
+4(2 93 275 184)
+4(3 94 276 185)
+4(4 95 277 186)
+4(5 96 278 187)
+4(6 97 279 188)
+4(7 98 280 189)
+4(8 99 281 190)
+4(9 100 282 191)
+4(10 101 283 192)
+4(11 102 284 193)
+4(12 103 285 194)
+4(13 104 286 195)
+4(14 105 287 196)
+4(15 106 288 197)
+4(16 107 289 198)
+4(17 108 290 199)
+4(18 109 291 200)
+4(19 110 292 201)
+4(20 111 293 202)
+4(21 112 294 203)
+4(22 113 295 204)
+4(23 114 296 205)
+4(24 115 297 206)
+4(25 116 298 207)
+4(26 117 299 208)
+4(27 118 300 209)
+4(28 119 301 210)
+4(29 120 302 211)
+4(30 121 303 212)
+4(31 122 304 213)
+4(32 123 305 214)
+4(33 124 306 215)
+4(34 125 307 216)
+4(35 126 308 217)
+4(36 127 309 218)
+4(37 128 310 219)
+4(38 129 311 220)
+4(39 130 312 221)
+4(40 131 313 222)
+4(41 132 314 223)
+4(42 133 315 224)
+4(43 134 316 225)
+4(44 135 317 226)
+4(45 136 318 227)
+4(46 137 319 228)
+4(47 138 320 229)
+4(48 139 321 230)
+4(49 140 322 231)
+4(50 141 323 232)
+4(51 142 324 233)
+4(52 143 325 234)
+4(53 144 326 235)
+4(54 145 327 236)
+4(55 146 328 237)
+4(56 147 329 238)
+4(57 148 330 239)
+4(58 149 331 240)
+4(59 150 332 241)
+4(60 151 333 242)
+4(61 152 334 243)
+4(62 153 335 244)
+4(63 154 336 245)
+4(64 155 337 246)
+4(65 156 338 247)
+4(66 157 339 248)
+4(67 158 340 249)
+4(68 159 341 250)
+4(69 160 342 251)
+4(70 161 343 252)
+4(71 162 344 253)
+4(72 163 345 254)
+4(73 164 346 255)
+4(74 165 347 256)
+4(75 166 348 257)
+4(76 167 349 258)
+4(77 168 350 259)
+4(78 169 351 260)
+4(79 170 352 261)
+4(80 171 353 262)
+4(81 172 354 263)
+4(82 173 355 264)
+4(83 174 356 265)
+4(84 175 357 266)
+4(85 176 358 267)
+4(86 177 359 268)
+4(87 178 360 269)
+4(88 179 361 270)
+4(89 180 362 271)
+4(90 181 363 272)
+4(0 91 92 1)
+4(1 92 93 2)
+4(2 93 94 3)
+4(3 94 95 4)
+4(4 95 96 5)
+4(5 96 97 6)
+4(6 97 98 7)
+4(7 98 99 8)
+4(8 99 100 9)
+4(9 100 101 10)
+4(10 101 102 11)
+4(11 102 103 12)
+4(12 103 104 13)
+4(13 104 105 14)
+4(14 105 106 15)
+4(15 106 107 16)
+4(16 107 108 17)
+4(17 108 109 18)
+4(18 109 110 19)
+4(19 110 111 20)
+4(20 111 112 21)
+4(21 112 113 22)
+4(22 113 114 23)
+4(23 114 115 24)
+4(24 115 116 25)
+4(25 116 117 26)
+4(26 117 118 27)
+4(27 118 119 28)
+4(28 119 120 29)
+4(29 120 121 30)
+4(30 121 122 31)
+4(31 122 123 32)
+4(32 123 124 33)
+4(33 124 125 34)
+4(34 125 126 35)
+4(35 126 127 36)
+4(36 127 128 37)
+4(37 128 129 38)
+4(38 129 130 39)
+4(39 130 131 40)
+4(40 131 132 41)
+4(41 132 133 42)
+4(42 133 134 43)
+4(43 134 135 44)
+4(44 135 136 45)
+4(45 136 137 46)
+4(46 137 138 47)
+4(47 138 139 48)
+4(48 139 140 49)
+4(49 140 141 50)
+4(50 141 142 51)
+4(51 142 143 52)
+4(52 143 144 53)
+4(53 144 145 54)
+4(54 145 146 55)
+4(55 146 147 56)
+4(56 147 148 57)
+4(57 148 149 58)
+4(58 149 150 59)
+4(59 150 151 60)
+4(60 151 152 61)
+4(61 152 153 62)
+4(62 153 154 63)
+4(63 154 155 64)
+4(64 155 156 65)
+4(65 156 157 66)
+4(66 157 158 67)
+4(67 158 159 68)
+4(68 159 160 69)
+4(69 160 161 70)
+4(70 161 162 71)
+4(71 162 163 72)
+4(72 163 164 73)
+4(73 164 165 74)
+4(74 165 166 75)
+4(75 166 167 76)
+4(76 167 168 77)
+4(77 168 169 78)
+4(78 169 170 79)
+4(79 170 171 80)
+4(80 171 172 81)
+4(81 172 173 82)
+4(82 173 174 83)
+4(83 174 175 84)
+4(84 175 176 85)
+4(85 176 177 86)
+4(86 177 178 87)
+4(87 178 179 88)
+4(88 179 180 89)
+4(89 180 181 90)
+4(182 183 274 273)
+4(183 184 275 274)
+4(184 185 276 275)
+4(185 186 277 276)
+4(186 187 278 277)
+4(187 188 279 278)
+4(188 189 280 279)
+4(189 190 281 280)
+4(190 191 282 281)
+4(191 192 283 282)
+4(192 193 284 283)
+4(193 194 285 284)
+4(194 195 286 285)
+4(195 196 287 286)
+4(196 197 288 287)
+4(197 198 289 288)
+4(198 199 290 289)
+4(199 200 291 290)
+4(200 201 292 291)
+4(201 202 293 292)
+4(202 203 294 293)
+4(203 204 295 294)
+4(204 205 296 295)
+4(205 206 297 296)
+4(206 207 298 297)
+4(207 208 299 298)
+4(208 209 300 299)
+4(209 210 301 300)
+4(210 211 302 301)
+4(211 212 303 302)
+4(212 213 304 303)
+4(213 214 305 304)
+4(214 215 306 305)
+4(215 216 307 306)
+4(216 217 308 307)
+4(217 218 309 308)
+4(218 219 310 309)
+4(219 220 311 310)
+4(220 221 312 311)
+4(221 222 313 312)
+4(222 223 314 313)
+4(223 224 315 314)
+4(224 225 316 315)
+4(225 226 317 316)
+4(226 227 318 317)
+4(227 228 319 318)
+4(228 229 320 319)
+4(229 230 321 320)
+4(230 231 322 321)
+4(231 232 323 322)
+4(232 233 324 323)
+4(233 234 325 324)
+4(234 235 326 325)
+4(235 236 327 326)
+4(236 237 328 327)
+4(237 238 329 328)
+4(238 239 330 329)
+4(239 240 331 330)
+4(240 241 332 331)
+4(241 242 333 332)
+4(242 243 334 333)
+4(243 244 335 334)
+4(244 245 336 335)
+4(245 246 337 336)
+4(246 247 338 337)
+4(247 248 339 338)
+4(248 249 340 339)
+4(249 250 341 340)
+4(250 251 342 341)
+4(251 252 343 342)
+4(252 253 344 343)
+4(253 254 345 344)
+4(254 255 346 345)
+4(255 256 347 346)
+4(256 257 348 347)
+4(257 258 349 348)
+4(258 259 350 349)
+4(259 260 351 350)
+4(260 261 352 351)
+4(261 262 353 352)
+4(262 263 354 353)
+4(263 264 355 354)
+4(264 265 356 355)
+4(265 266 357 356)
+4(266 267 358 357)
+4(267 268 359 358)
+4(268 269 360 359)
+4(269 270 361 360)
+4(270 271 362 361)
+4(271 272 363 362)
+4(0 1 183 182)
+4(1 2 184 183)
+4(2 3 185 184)
+4(3 4 186 185)
+4(4 5 187 186)
+4(5 6 188 187)
+4(6 7 189 188)
+4(7 8 190 189)
+4(8 9 191 190)
+4(9 10 192 191)
+4(10 11 193 192)
+4(11 12 194 193)
+4(12 13 195 194)
+4(13 14 196 195)
+4(14 15 197 196)
+4(15 16 198 197)
+4(16 17 199 198)
+4(17 18 200 199)
+4(18 19 201 200)
+4(19 20 202 201)
+4(20 21 203 202)
+4(21 22 204 203)
+4(22 23 205 204)
+4(23 24 206 205)
+4(24 25 207 206)
+4(25 26 208 207)
+4(26 27 209 208)
+4(27 28 210 209)
+4(28 29 211 210)
+4(29 30 212 211)
+4(30 31 213 212)
+4(31 32 214 213)
+4(32 33 215 214)
+4(33 34 216 215)
+4(34 35 217 216)
+4(35 36 218 217)
+4(36 37 219 218)
+4(37 38 220 219)
+4(38 39 221 220)
+4(39 40 222 221)
+4(40 41 223 222)
+4(41 42 224 223)
+4(42 43 225 224)
+4(43 44 226 225)
+4(44 45 227 226)
+4(45 46 228 227)
+4(46 47 229 228)
+4(47 48 230 229)
+4(48 49 231 230)
+4(49 50 232 231)
+4(50 51 233 232)
+4(51 52 234 233)
+4(52 53 235 234)
+4(53 54 236 235)
+4(54 55 237 236)
+4(55 56 238 237)
+4(56 57 239 238)
+4(57 58 240 239)
+4(58 59 241 240)
+4(59 60 242 241)
+4(60 61 243 242)
+4(61 62 244 243)
+4(62 63 245 244)
+4(63 64 246 245)
+4(64 65 247 246)
+4(65 66 248 247)
+4(66 67 249 248)
+4(67 68 250 249)
+4(68 69 251 250)
+4(69 70 252 251)
+4(70 71 253 252)
+4(71 72 254 253)
+4(72 73 255 254)
+4(73 74 256 255)
+4(74 75 257 256)
+4(75 76 258 257)
+4(76 77 259 258)
+4(77 78 260 259)
+4(78 79 261 260)
+4(79 80 262 261)
+4(80 81 263 262)
+4(81 82 264 263)
+4(82 83 265 264)
+4(83 84 266 265)
+4(84 85 267 266)
+4(85 86 268 267)
+4(86 87 269 268)
+4(87 88 270 269)
+4(88 89 271 270)
+4(89 90 272 271)
+4(91 273 274 92)
+4(92 274 275 93)
+4(93 275 276 94)
+4(94 276 277 95)
+4(95 277 278 96)
+4(96 278 279 97)
+4(97 279 280 98)
+4(98 280 281 99)
+4(99 281 282 100)
+4(100 282 283 101)
+4(101 283 284 102)
+4(102 284 285 103)
+4(103 285 286 104)
+4(104 286 287 105)
+4(105 287 288 106)
+4(106 288 289 107)
+4(107 289 290 108)
+4(108 290 291 109)
+4(109 291 292 110)
+4(110 292 293 111)
+4(111 293 294 112)
+4(112 294 295 113)
+4(113 295 296 114)
+4(114 296 297 115)
+4(115 297 298 116)
+4(116 298 299 117)
+4(117 299 300 118)
+4(118 300 301 119)
+4(119 301 302 120)
+4(120 302 303 121)
+4(121 303 304 122)
+4(122 304 305 123)
+4(123 305 306 124)
+4(124 306 307 125)
+4(125 307 308 126)
+4(126 308 309 127)
+4(127 309 310 128)
+4(128 310 311 129)
+4(129 311 312 130)
+4(130 312 313 131)
+4(131 313 314 132)
+4(132 314 315 133)
+4(133 315 316 134)
+4(134 316 317 135)
+4(135 317 318 136)
+4(136 318 319 137)
+4(137 319 320 138)
+4(138 320 321 139)
+4(139 321 322 140)
+4(140 322 323 141)
+4(141 323 324 142)
+4(142 324 325 143)
+4(143 325 326 144)
+4(144 326 327 145)
+4(145 327 328 146)
+4(146 328 329 147)
+4(147 329 330 148)
+4(148 330 331 149)
+4(149 331 332 150)
+4(150 332 333 151)
+4(151 333 334 152)
+4(152 334 335 153)
+4(153 335 336 154)
+4(154 336 337 155)
+4(155 337 338 156)
+4(156 338 339 157)
+4(157 339 340 158)
+4(158 340 341 159)
+4(159 341 342 160)
+4(160 342 343 161)
+4(161 343 344 162)
+4(162 344 345 163)
+4(163 345 346 164)
+4(164 346 347 165)
+4(165 347 348 166)
+4(166 348 349 167)
+4(167 349 350 168)
+4(168 350 351 169)
+4(169 351 352 170)
+4(170 352 353 171)
+4(171 353 354 172)
+4(172 354 355 173)
+4(173 355 356 174)
+4(174 356 357 175)
+4(175 357 358 176)
+4(176 358 359 177)
+4(177 359 360 178)
+4(178 360 361 179)
+4(179 361 362 180)
+4(180 362 363 181)
+4(0 182 273 91)
+)
+
+
+// ************************************************************************* //
diff --git a/testsuite/cht/fixedFlux/constant/fluid/polyMesh/neighbour b/testsuite/cht/fixedFlux/constant/fluid/polyMesh/neighbour
new file mode 100644
index 00000000..d79512eb
--- /dev/null
+++ b/testsuite/cht/fixedFlux/constant/fluid/polyMesh/neighbour
@@ -0,0 +1,115 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2106                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    arch        "LSB;label=32;scalar=64";
+    note        "nPoints:364  nCells:90  nFaces:451  nInternalFaces:89";
+    class       labelList;
+    location    "constant/fluid/polyMesh";
+    object      neighbour;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+
+89
+(
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55
+56
+57
+58
+59
+60
+61
+62
+63
+64
+65
+66
+67
+68
+69
+70
+71
+72
+73
+74
+75
+76
+77
+78
+79
+80
+81
+82
+83
+84
+85
+86
+87
+88
+89
+)
+
+
+// ************************************************************************* //
diff --git a/testsuite/cht/fixedFlux/constant/fluid/polyMesh/owner b/testsuite/cht/fixedFlux/constant/fluid/polyMesh/owner
new file mode 100644
index 00000000..e01485fc
--- /dev/null
+++ b/testsuite/cht/fixedFlux/constant/fluid/polyMesh/owner
@@ -0,0 +1,477 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2106                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    arch        "LSB;label=32;scalar=64";
+    note        "nPoints:364  nCells:90  nFaces:451  nInternalFaces:89";
+    class       labelList;
+    location    "constant/fluid/polyMesh";
+    object      owner;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+
+451
+(
+0
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55
+56
+57
+58
+59
+60
+61
+62
+63
+64
+65
+66
+67
+68
+69
+70
+71
+72
+73
+74
+75
+76
+77
+78
+79
+80
+81
+82
+83
+84
+85
+86
+87
+88
+89
+0
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55
+56
+57
+58
+59
+60
+61
+62
+63
+64
+65
+66
+67
+68
+69
+70
+71
+72
+73
+74
+75
+76
+77
+78
+79
+80
+81
+82
+83
+84
+85
+86
+87
+88
+89
+0
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55
+56
+57
+58
+59
+60
+61
+62
+63
+64
+65
+66
+67
+68
+69
+70
+71
+72
+73
+74
+75
+76
+77
+78
+79
+80
+81
+82
+83
+84
+85
+86
+87
+88
+89
+0
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55
+56
+57
+58
+59
+60
+61
+62
+63
+64
+65
+66
+67
+68
+69
+70
+71
+72
+73
+74
+75
+76
+77
+78
+79
+80
+81
+82
+83
+84
+85
+86
+87
+88
+89
+0
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55
+56
+57
+58
+59
+60
+61
+62
+63
+64
+65
+66
+67
+68
+69
+70
+71
+72
+73
+74
+75
+76
+77
+78
+79
+80
+81
+82
+83
+84
+85
+86
+87
+88
+89
+0
+)
+
+
+// ************************************************************************* //
diff --git a/testsuite/cht/fixedFlux/constant/fluid/polyMesh/pointRegionAddressing b/testsuite/cht/fixedFlux/constant/fluid/polyMesh/pointRegionAddressing
new file mode 100644
index 00000000..84be9759
--- /dev/null
+++ b/testsuite/cht/fixedFlux/constant/fluid/polyMesh/pointRegionAddressing
@@ -0,0 +1,389 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2106                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    arch        "LSB;label=32;scalar=64";
+    class       labelList;
+    location    "constant/fluid/polyMesh";
+    object      pointRegionAddressing;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+
+364
+(
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55
+56
+57
+58
+59
+60
+61
+62
+63
+64
+65
+66
+67
+68
+69
+70
+71
+72
+73
+74
+75
+76
+77
+78
+79
+80
+81
+82
+83
+84
+85
+86
+87
+88
+89
+90
+91
+92
+93
+94
+95
+96
+97
+98
+99
+100
+111
+112
+113
+114
+115
+116
+117
+118
+119
+120
+121
+122
+123
+124
+125
+126
+127
+128
+129
+130
+131
+132
+133
+134
+135
+136
+137
+138
+139
+140
+141
+142
+143
+144
+145
+146
+147
+148
+149
+150
+151
+152
+153
+154
+155
+156
+157
+158
+159
+160
+161
+162
+163
+164
+165
+166
+167
+168
+169
+170
+171
+172
+173
+174
+175
+176
+177
+178
+179
+180
+181
+182
+183
+184
+185
+186
+187
+188
+189
+190
+191
+192
+193
+194
+195
+196
+197
+198
+199
+200
+201
+212
+213
+214
+215
+216
+217
+218
+219
+220
+221
+222
+223
+224
+225
+226
+227
+228
+229
+230
+231
+232
+233
+234
+235
+236
+237
+238
+239
+240
+241
+242
+243
+244
+245
+246
+247
+248
+249
+250
+251
+252
+253
+254
+255
+256
+257
+258
+259
+260
+261
+262
+263
+264
+265
+266
+267
+268
+269
+270
+271
+272
+273
+274
+275
+276
+277
+278
+279
+280
+281
+282
+283
+284
+285
+286
+287
+288
+289
+290
+291
+292
+293
+294
+295
+296
+297
+298
+299
+300
+301
+302
+313
+314
+315
+316
+317
+318
+319
+320
+321
+322
+323
+324
+325
+326
+327
+328
+329
+330
+331
+332
+333
+334
+335
+336
+337
+338
+339
+340
+341
+342
+343
+344
+345
+346
+347
+348
+349
+350
+351
+352
+353
+354
+355
+356
+357
+358
+359
+360
+361
+362
+363
+364
+365
+366
+367
+368
+369
+370
+371
+372
+373
+374
+375
+376
+377
+378
+379
+380
+381
+382
+383
+384
+385
+386
+387
+388
+389
+390
+391
+392
+393
+394
+395
+396
+397
+398
+399
+400
+401
+402
+403
+)
+
+
+// ************************************************************************* //
diff --git a/testsuite/cht/fixedFlux/constant/fluid/polyMesh/pointZones b/testsuite/cht/fixedFlux/constant/fluid/polyMesh/pointZones
new file mode 100644
index 00000000..c3521ea9
--- /dev/null
+++ b/testsuite/cht/fixedFlux/constant/fluid/polyMesh/pointZones
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2106                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    arch        "LSB;label=32;scalar=64";
+    class       regIOobject;
+    location    "constant/fluid/polyMesh";
+    object      pointZones;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+0()
+
+// ************************************************************************* //
diff --git a/testsuite/cht/fixedFlux/constant/fluid/polyMesh/points b/testsuite/cht/fixedFlux/constant/fluid/polyMesh/points
new file mode 100644
index 00000000..4ba608ec
--- /dev/null
+++ b/testsuite/cht/fixedFlux/constant/fluid/polyMesh/points
@@ -0,0 +1,389 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2106                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    arch        "LSB;label=32;scalar=64";
+    class       vectorField;
+    location    "constant/fluid/polyMesh";
+    object      points;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+
+364
+(
+(0.001 0 0)
+(0.0011 0 0)
+(0.0012 0 0)
+(0.0013 0 0)
+(0.0014 0 0)
+(0.0015 0 0)
+(0.0016 0 0)
+(0.0017 0 0)
+(0.0018 0 0)
+(0.0019 0 0)
+(0.002 0 0)
+(0.0021 0 0)
+(0.0022 0 0)
+(0.0023 0 0)
+(0.0024 0 0)
+(0.0025 0 0)
+(0.0026 0 0)
+(0.0027 0 0)
+(0.0028 0 0)
+(0.0029 0 0)
+(0.003 0 0)
+(0.0031 0 0)
+(0.0032 0 0)
+(0.0033 0 0)
+(0.0034 0 0)
+(0.0035 0 0)
+(0.0036 0 0)
+(0.0037 0 0)
+(0.0038 0 0)
+(0.0039 0 0)
+(0.004 0 0)
+(0.0041 0 0)
+(0.0042 0 0)
+(0.0043 0 0)
+(0.0044 0 0)
+(0.0045 0 0)
+(0.0046 0 0)
+(0.0047 0 0)
+(0.0048 0 0)
+(0.0049 0 0)
+(0.005 0 0)
+(0.0051 0 0)
+(0.0052 0 0)
+(0.0053 0 0)
+(0.0054 0 0)
+(0.0055 0 0)
+(0.0056 0 0)
+(0.0057 0 0)
+(0.0058 0 0)
+(0.0059 0 0)
+(0.006 0 0)
+(0.0061 0 0)
+(0.0062 0 0)
+(0.0063 0 0)
+(0.0064 0 0)
+(0.0065 0 0)
+(0.0066 0 0)
+(0.0067 0 0)
+(0.0068 0 0)
+(0.0069 0 0)
+(0.007 0 0)
+(0.0071 0 0)
+(0.0072 0 0)
+(0.0073 0 0)
+(0.0074 0 0)
+(0.0075 0 0)
+(0.0076 0 0)
+(0.0077 0 0)
+(0.0078 0 0)
+(0.0079 0 0)
+(0.008 0 0)
+(0.0081 0 0)
+(0.0082 0 0)
+(0.0083 0 0)
+(0.0084 0 0)
+(0.0085 0 0)
+(0.0086 0 0)
+(0.0087 0 0)
+(0.0088 0 0)
+(0.0089 0 0)
+(0.009 0 0)
+(0.0091 0 0)
+(0.0092 0 0)
+(0.0093 0 0)
+(0.0094 0 0)
+(0.0095 0 0)
+(0.0096 0 0)
+(0.0097 0 0)
+(0.0098 0 0)
+(0.0099 0 0)
+(0.01 0 0)
+(0.001 0.0002 0)
+(0.0011 0.0002 0)
+(0.0012 0.0002 0)
+(0.0013 0.0002 0)
+(0.0014 0.0002 0)
+(0.0015 0.0002 0)
+(0.0016 0.0002 0)
+(0.0017 0.0002 0)
+(0.0018 0.0002 0)
+(0.0019 0.0002 0)
+(0.002 0.0002 0)
+(0.0021 0.0002 0)
+(0.0022 0.0002 0)
+(0.0023 0.0002 0)
+(0.0024 0.0002 0)
+(0.0025 0.0002 0)
+(0.0026 0.0002 0)
+(0.0027 0.0002 0)
+(0.0028 0.0002 0)
+(0.0029 0.0002 0)
+(0.003 0.0002 0)
+(0.0031 0.0002 0)
+(0.0032 0.0002 0)
+(0.0033 0.0002 0)
+(0.0034 0.0002 0)
+(0.0035 0.0002 0)
+(0.0036 0.0002 0)
+(0.0037 0.0002 0)
+(0.0038 0.0002 0)
+(0.0039 0.0002 0)
+(0.004 0.0002 0)
+(0.0041 0.0002 0)
+(0.0042 0.0002 0)
+(0.0043 0.0002 0)
+(0.0044 0.0002 0)
+(0.0045 0.0002 0)
+(0.0046 0.0002 0)
+(0.0047 0.0002 0)
+(0.0048 0.0002 0)
+(0.0049 0.0002 0)
+(0.005 0.0002 0)
+(0.0051 0.0002 0)
+(0.0052 0.0002 0)
+(0.0053 0.0002 0)
+(0.0054 0.0002 0)
+(0.0055 0.0002 0)
+(0.0056 0.0002 0)
+(0.0057 0.0002 0)
+(0.0058 0.0002 0)
+(0.0059 0.0002 0)
+(0.006 0.0002 0)
+(0.0061 0.0002 0)
+(0.0062 0.0002 0)
+(0.0063 0.0002 0)
+(0.0064 0.0002 0)
+(0.0065 0.0002 0)
+(0.0066 0.0002 0)
+(0.0067 0.0002 0)
+(0.0068 0.0002 0)
+(0.0069 0.0002 0)
+(0.007 0.0002 0)
+(0.0071 0.0002 0)
+(0.0072 0.0002 0)
+(0.0073 0.0002 0)
+(0.0074 0.0002 0)
+(0.0075 0.0002 0)
+(0.0076 0.0002 0)
+(0.0077 0.0002 0)
+(0.0078 0.0002 0)
+(0.0079 0.0002 0)
+(0.008 0.0002 0)
+(0.0081 0.0002 0)
+(0.0082 0.0002 0)
+(0.0083 0.0002 0)
+(0.0084 0.0002 0)
+(0.0085 0.0002 0)
+(0.0086 0.0002 0)
+(0.0087 0.0002 0)
+(0.0088 0.0002 0)
+(0.0089 0.0002 0)
+(0.009 0.0002 0)
+(0.0091 0.0002 0)
+(0.0092 0.0002 0)
+(0.0093 0.0002 0)
+(0.0094 0.0002 0)
+(0.0095 0.0002 0)
+(0.0096 0.0002 0)
+(0.0097 0.0002 0)
+(0.0098 0.0002 0)
+(0.0099 0.0002 0)
+(0.01 0.0002 0)
+(0.001 0 2e-05)
+(0.0011 0 2e-05)
+(0.0012 0 2e-05)
+(0.0013 0 2e-05)
+(0.0014 0 2e-05)
+(0.0015 0 2e-05)
+(0.0016 0 2e-05)
+(0.0017 0 2e-05)
+(0.0018 0 2e-05)
+(0.0019 0 2e-05)
+(0.002 0 2e-05)
+(0.0021 0 2e-05)
+(0.0022 0 2e-05)
+(0.0023 0 2e-05)
+(0.0024 0 2e-05)
+(0.0025 0 2e-05)
+(0.0026 0 2e-05)
+(0.0027 0 2e-05)
+(0.0028 0 2e-05)
+(0.0029 0 2e-05)
+(0.003 0 2e-05)
+(0.0031 0 2e-05)
+(0.0032 0 2e-05)
+(0.0033 0 2e-05)
+(0.0034 0 2e-05)
+(0.0035 0 2e-05)
+(0.0036 0 2e-05)
+(0.0037 0 2e-05)
+(0.0038 0 2e-05)
+(0.0039 0 2e-05)
+(0.004 0 2e-05)
+(0.0041 0 2e-05)
+(0.0042 0 2e-05)
+(0.0043 0 2e-05)
+(0.0044 0 2e-05)
+(0.0045 0 2e-05)
+(0.0046 0 2e-05)
+(0.0047 0 2e-05)
+(0.0048 0 2e-05)
+(0.0049 0 2e-05)
+(0.005 0 2e-05)
+(0.0051 0 2e-05)
+(0.0052 0 2e-05)
+(0.0053 0 2e-05)
+(0.0054 0 2e-05)
+(0.0055 0 2e-05)
+(0.0056 0 2e-05)
+(0.0057 0 2e-05)
+(0.0058 0 2e-05)
+(0.0059 0 2e-05)
+(0.006 0 2e-05)
+(0.0061 0 2e-05)
+(0.0062 0 2e-05)
+(0.0063 0 2e-05)
+(0.0064 0 2e-05)
+(0.0065 0 2e-05)
+(0.0066 0 2e-05)
+(0.0067 0 2e-05)
+(0.0068 0 2e-05)
+(0.0069 0 2e-05)
+(0.007 0 2e-05)
+(0.0071 0 2e-05)
+(0.0072 0 2e-05)
+(0.0073 0 2e-05)
+(0.0074 0 2e-05)
+(0.0075 0 2e-05)
+(0.0076 0 2e-05)
+(0.0077 0 2e-05)
+(0.0078 0 2e-05)
+(0.0079 0 2e-05)
+(0.008 0 2e-05)
+(0.0081 0 2e-05)
+(0.0082 0 2e-05)
+(0.0083 0 2e-05)
+(0.0084 0 2e-05)
+(0.0085 0 2e-05)
+(0.0086 0 2e-05)
+(0.0087 0 2e-05)
+(0.0088 0 2e-05)
+(0.0089 0 2e-05)
+(0.009 0 2e-05)
+(0.0091 0 2e-05)
+(0.0092 0 2e-05)
+(0.0093 0 2e-05)
+(0.0094 0 2e-05)
+(0.0095 0 2e-05)
+(0.0096 0 2e-05)
+(0.0097 0 2e-05)
+(0.0098 0 2e-05)
+(0.0099 0 2e-05)
+(0.01 0 2e-05)
+(0.001 0.0002 2e-05)
+(0.0011 0.0002 2e-05)
+(0.0012 0.0002 2e-05)
+(0.0013 0.0002 2e-05)
+(0.0014 0.0002 2e-05)
+(0.0015 0.0002 2e-05)
+(0.0016 0.0002 2e-05)
+(0.0017 0.0002 2e-05)
+(0.0018 0.0002 2e-05)
+(0.0019 0.0002 2e-05)
+(0.002 0.0002 2e-05)
+(0.0021 0.0002 2e-05)
+(0.0022 0.0002 2e-05)
+(0.0023 0.0002 2e-05)
+(0.0024 0.0002 2e-05)
+(0.0025 0.0002 2e-05)
+(0.0026 0.0002 2e-05)
+(0.0027 0.0002 2e-05)
+(0.0028 0.0002 2e-05)
+(0.0029 0.0002 2e-05)
+(0.003 0.0002 2e-05)
+(0.0031 0.0002 2e-05)
+(0.0032 0.0002 2e-05)
+(0.0033 0.0002 2e-05)
+(0.0034 0.0002 2e-05)
+(0.0035 0.0002 2e-05)
+(0.0036 0.0002 2e-05)
+(0.0037 0.0002 2e-05)
+(0.0038 0.0002 2e-05)
+(0.0039 0.0002 2e-05)
+(0.004 0.0002 2e-05)
+(0.0041 0.0002 2e-05)
+(0.0042 0.0002 2e-05)
+(0.0043 0.0002 2e-05)
+(0.0044 0.0002 2e-05)
+(0.0045 0.0002 2e-05)
+(0.0046 0.0002 2e-05)
+(0.0047 0.0002 2e-05)
+(0.0048 0.0002 2e-05)
+(0.0049 0.0002 2e-05)
+(0.005 0.0002 2e-05)
+(0.0051 0.0002 2e-05)
+(0.0052 0.0002 2e-05)
+(0.0053 0.0002 2e-05)
+(0.0054 0.0002 2e-05)
+(0.0055 0.0002 2e-05)
+(0.0056 0.0002 2e-05)
+(0.0057 0.0002 2e-05)
+(0.0058 0.0002 2e-05)
+(0.0059 0.0002 2e-05)
+(0.006 0.0002 2e-05)
+(0.0061 0.0002 2e-05)
+(0.0062 0.0002 2e-05)
+(0.0063 0.0002 2e-05)
+(0.0064 0.0002 2e-05)
+(0.0065 0.0002 2e-05)
+(0.0066 0.0002 2e-05)
+(0.0067 0.0002 2e-05)
+(0.0068 0.0002 2e-05)
+(0.0069 0.0002 2e-05)
+(0.007 0.0002 2e-05)
+(0.0071 0.0002 2e-05)
+(0.0072 0.0002 2e-05)
+(0.0073 0.0002 2e-05)
+(0.0074 0.0002 2e-05)
+(0.0075 0.0002 2e-05)
+(0.0076 0.0002 2e-05)
+(0.0077 0.0002 2e-05)
+(0.0078 0.0002 2e-05)
+(0.0079 0.0002 2e-05)
+(0.008 0.0002 2e-05)
+(0.0081 0.0002 2e-05)
+(0.0082 0.0002 2e-05)
+(0.0083 0.0002 2e-05)
+(0.0084 0.0002 2e-05)
+(0.0085 0.0002 2e-05)
+(0.0086 0.0002 2e-05)
+(0.0087 0.0002 2e-05)
+(0.0088 0.0002 2e-05)
+(0.0089 0.0002 2e-05)
+(0.009 0.0002 2e-05)
+(0.0091 0.0002 2e-05)
+(0.0092 0.0002 2e-05)
+(0.0093 0.0002 2e-05)
+(0.0094 0.0002 2e-05)
+(0.0095 0.0002 2e-05)
+(0.0096 0.0002 2e-05)
+(0.0097 0.0002 2e-05)
+(0.0098 0.0002 2e-05)
+(0.0099 0.0002 2e-05)
+(0.01 0.0002 2e-05)
+)
+
+
+// ************************************************************************* //
diff --git a/testsuite/cht/fixedFlux/constant/fluid/thermophysicalProperties b/testsuite/cht/fixedFlux/constant/fluid/thermophysicalProperties
new file mode 100755
index 00000000..70f00735
--- /dev/null
+++ b/testsuite/cht/fixedFlux/constant/fluid/thermophysicalProperties
@@ -0,0 +1,45 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.3.0                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      thermophysicalProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+phases (water air);
+
+pMin            pMin [ 1 -1 -2 0 0 0 0 ] 10000;
+
+sigma           sigma [ 1 0 -2 0 0 0 0 ] 0.0;//0.0089004;
+
+TMin           TMin [ 0 0 0 1 0 0 0 ] 50;
+TMax           TMax [ 0 0 0 1 0 0 0 ] 500;
+
+water
+{
+    type pureMovingPhaseModel;
+}
+
+air
+{
+    type pureMovingPhaseModel;
+}
+
+surfaceForces
+{
+  sigma 0.0;
+  surfaceTensionForceModel gradAlpha;
+  accelerationModel gravity;
+  deltaFunctionModel alphaCSF;
+}
+
+// ************************************************************************* //
diff --git a/testsuite/cht/fixedFlux/constant/fluid/thermophysicalProperties.air b/testsuite/cht/fixedFlux/constant/fluid/thermophysicalProperties.air
new file mode 100755
index 00000000..4ecb34c5
--- /dev/null
+++ b/testsuite/cht/fixedFlux/constant/fluid/thermophysicalProperties.air
@@ -0,0 +1,50 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      thermophysicalProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+thermoType
+{
+    type            heRhoThermo;
+    mixture         pureMixture;
+    transport       const;
+    thermo          hConst;
+    equationOfState perfectGas;
+    specie          specie;
+    energy          sensibleInternalEnergy;
+}
+
+mixture
+{
+    specie
+    {
+        molWeight   18.0;
+    }
+    thermodynamics
+    {
+        Cp          2000;
+        Hf          0;
+    }
+    transport
+    {
+        mu          1e-04;
+        Pr          0.005;
+    }
+}
+
+dpdt off;
+
+
+// ************************************************************************* //
diff --git a/testsuite/cht/fixedFlux/constant/fluid/thermophysicalProperties.water b/testsuite/cht/fixedFlux/constant/fluid/thermophysicalProperties.water
new file mode 100755
index 00000000..0e0c4e3d
--- /dev/null
+++ b/testsuite/cht/fixedFlux/constant/fluid/thermophysicalProperties.water
@@ -0,0 +1,52 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      thermophysicalProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+thermoType
+{
+    type            heRhoThermo;
+    mixture         pureMixture;
+    transport       const;
+    thermo          hConst;
+    equationOfState perfectFluid;
+    specie          specie;
+    energy          sensibleInternalEnergy;
+}
+
+mixture
+{
+    specie
+    {
+        molWeight   18.0;
+    }
+    equationOfState
+    {
+        R           1e10;
+        rho0        958.4;
+    }
+    thermodynamics
+    {
+        Cp          5000;
+        Hf          0;
+    }
+    transport
+    {
+        mu          1e-3;
+        Pr          0.1;
+    }
+}
+
+// ************************************************************************* //
diff --git a/testsuite/cht/fixedFlux/constant/fluid/turbulenceProperties b/testsuite/cht/fixedFlux/constant/fluid/turbulenceProperties
new file mode 100755
index 00000000..5eec0426
--- /dev/null
+++ b/testsuite/cht/fixedFlux/constant/fluid/turbulenceProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType  laminar;
+
+
+// ************************************************************************* //
diff --git a/testsuite/cht/fixedFlux/constant/g b/testsuite/cht/fixedFlux/constant/g
new file mode 100755
index 00000000..06bf9cf2
--- /dev/null
+++ b/testsuite/cht/fixedFlux/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.0                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       uniformDimensionedVectorField;
+    location    "constant";
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           ( 0 0 0 );
+
+
+// ************************************************************************* //
diff --git a/testsuite/cht/fixedFlux/constant/regionProperties b/testsuite/cht/fixedFlux/constant/regionProperties
new file mode 100755
index 00000000..e34bf5d7
--- /dev/null
+++ b/testsuite/cht/fixedFlux/constant/regionProperties
@@ -0,0 +1,24 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      regionProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+regions
+(
+    fluid (fluid)
+    solid (solid)
+);
+
+// ************************************************************************* //
diff --git a/testsuite/cht/fixedFlux/constant/solid/polyMesh/boundary b/testsuite/cht/fixedFlux/constant/solid/polyMesh/boundary
new file mode 100644
index 00000000..97f18ec2
--- /dev/null
+++ b/testsuite/cht/fixedFlux/constant/solid/polyMesh/boundary
@@ -0,0 +1,47 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2106                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    arch        "LSB;label=32;scalar=64";
+    class       polyBoundaryMesh;
+    location    "constant/solid/polyMesh";
+    object      boundary;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+3
+(
+    faceWall
+    {
+        type            wall;
+        inGroups        1(wall);
+        nFaces          1;
+        startFace       9;
+    }
+    frontAndBack
+    {
+        type            empty;
+        inGroups        1(empty);
+        nFaces          40;
+        startFace       10;
+    }
+    solid_to_fluid
+    {
+        type            mappedWall;
+        inGroups        1(wall);
+        nFaces          1;
+        startFace       50;
+        sampleMode      nearestPatchFace;
+        sampleRegion    fluid;
+        samplePatch     fluid_to_solid;
+    }
+)
+
+// ************************************************************************* //
diff --git a/testsuite/cht/fixedFlux/constant/solid/polyMesh/boundaryRegionAddressing b/testsuite/cht/fixedFlux/constant/solid/polyMesh/boundaryRegionAddressing
new file mode 100644
index 00000000..b6c19f00
--- /dev/null
+++ b/testsuite/cht/fixedFlux/constant/solid/polyMesh/boundaryRegionAddressing
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2106                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    arch        "LSB;label=32;scalar=64";
+    class       labelList;
+    location    "constant/solid/polyMesh";
+    object      boundaryRegionAddressing;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+3(0 2 -1)
+
+// ************************************************************************* //
diff --git a/testsuite/cht/fixedFlux/constant/solid/polyMesh/cellRegionAddressing b/testsuite/cht/fixedFlux/constant/solid/polyMesh/cellRegionAddressing
new file mode 100644
index 00000000..6dfc0d33
--- /dev/null
+++ b/testsuite/cht/fixedFlux/constant/solid/polyMesh/cellRegionAddressing
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2106                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    arch        "LSB;label=32;scalar=64";
+    class       labelList;
+    location    "constant/solid/polyMesh";
+    object      cellRegionAddressing;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+10(0 1 2 3 4 5 6 7 8 9)
+
+// ************************************************************************* //
diff --git a/testsuite/cht/fixedFlux/constant/solid/polyMesh/cellZones b/testsuite/cht/fixedFlux/constant/solid/polyMesh/cellZones
new file mode 100644
index 00000000..4deda1b9
--- /dev/null
+++ b/testsuite/cht/fixedFlux/constant/solid/polyMesh/cellZones
@@ -0,0 +1,38 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2106                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    arch        "LSB;label=32;scalar=64";
+    class       regIOobject;
+    location    "constant/solid/polyMesh";
+    object      cellZones;
+    meta
+    {
+        names           2 ( solid fluid );
+    }
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+2
+(
+solid
+{
+    type cellZone;
+cellLabels      List<label> 10(0 1 2 3 4 5 6 7 8 9);
+}
+
+fluid
+{
+    type cellZone;
+cellLabels      List<label> 0();
+}
+)
+
+// ************************************************************************* //
diff --git a/testsuite/cht/fixedFlux/constant/solid/polyMesh/faceRegionAddressing b/testsuite/cht/fixedFlux/constant/solid/polyMesh/faceRegionAddressing
new file mode 100644
index 00000000..a1122a79
--- /dev/null
+++ b/testsuite/cht/fixedFlux/constant/solid/polyMesh/faceRegionAddressing
@@ -0,0 +1,76 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2106                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    arch        "LSB;label=32;scalar=64";
+    class       labelList;
+    location    "constant/solid/polyMesh";
+    object      faceRegionAddressing;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+
+51
+(
+1
+2
+3
+4
+5
+6
+7
+8
+9
+100
+102
+103
+104
+105
+106
+107
+108
+109
+110
+111
+202
+203
+204
+205
+206
+207
+208
+209
+210
+211
+302
+303
+304
+305
+306
+307
+308
+309
+310
+311
+402
+403
+404
+405
+406
+407
+408
+409
+410
+411
+10
+)
+
+
+// ************************************************************************* //
diff --git a/testsuite/cht/fixedFlux/constant/solid/polyMesh/faceZones b/testsuite/cht/fixedFlux/constant/solid/polyMesh/faceZones
new file mode 100644
index 00000000..fe0c5a17
--- /dev/null
+++ b/testsuite/cht/fixedFlux/constant/solid/polyMesh/faceZones
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2106                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    arch        "LSB;label=32;scalar=64";
+    class       regIOobject;
+    location    "constant/solid/polyMesh";
+    object      faceZones;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+0()
+
+// ************************************************************************* //
diff --git a/testsuite/cht/fixedFlux/constant/solid/polyMesh/faces b/testsuite/cht/fixedFlux/constant/solid/polyMesh/faces
new file mode 100644
index 00000000..2dff2c05
--- /dev/null
+++ b/testsuite/cht/fixedFlux/constant/solid/polyMesh/faces
@@ -0,0 +1,76 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2106                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    arch        "LSB;label=32;scalar=64";
+    class       faceList;
+    location    "constant/solid/polyMesh";
+    object      faces;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+
+51
+(
+4(1 12 34 23)
+4(2 13 35 24)
+4(3 14 36 25)
+4(4 15 37 26)
+4(5 16 38 27)
+4(6 17 39 28)
+4(7 18 40 29)
+4(8 19 41 30)
+4(9 20 42 31)
+4(0 22 33 11)
+4(0 11 12 1)
+4(1 12 13 2)
+4(2 13 14 3)
+4(3 14 15 4)
+4(4 15 16 5)
+4(5 16 17 6)
+4(6 17 18 7)
+4(7 18 19 8)
+4(8 19 20 9)
+4(9 20 21 10)
+4(22 23 34 33)
+4(23 24 35 34)
+4(24 25 36 35)
+4(25 26 37 36)
+4(26 27 38 37)
+4(27 28 39 38)
+4(28 29 40 39)
+4(29 30 41 40)
+4(30 31 42 41)
+4(31 32 43 42)
+4(0 1 23 22)
+4(1 2 24 23)
+4(2 3 25 24)
+4(3 4 26 25)
+4(4 5 27 26)
+4(5 6 28 27)
+4(6 7 29 28)
+4(7 8 30 29)
+4(8 9 31 30)
+4(9 10 32 31)
+4(11 33 34 12)
+4(12 34 35 13)
+4(13 35 36 14)
+4(14 36 37 15)
+4(15 37 38 16)
+4(16 38 39 17)
+4(17 39 40 18)
+4(18 40 41 19)
+4(19 41 42 20)
+4(20 42 43 21)
+4(10 21 43 32)
+)
+
+
+// ************************************************************************* //
diff --git a/testsuite/cht/fixedFlux/constant/solid/polyMesh/neighbour b/testsuite/cht/fixedFlux/constant/solid/polyMesh/neighbour
new file mode 100644
index 00000000..a152b432
--- /dev/null
+++ b/testsuite/cht/fixedFlux/constant/solid/polyMesh/neighbour
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2106                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    arch        "LSB;label=32;scalar=64";
+    note        "nPoints:44  nCells:10  nFaces:51  nInternalFaces:9";
+    class       labelList;
+    location    "constant/solid/polyMesh";
+    object      neighbour;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+9(1 2 3 4 5 6 7 8 9)
+
+// ************************************************************************* //
diff --git a/testsuite/cht/fixedFlux/constant/solid/polyMesh/owner b/testsuite/cht/fixedFlux/constant/solid/polyMesh/owner
new file mode 100644
index 00000000..1afbba01
--- /dev/null
+++ b/testsuite/cht/fixedFlux/constant/solid/polyMesh/owner
@@ -0,0 +1,77 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2106                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    arch        "LSB;label=32;scalar=64";
+    note        "nPoints:44  nCells:10  nFaces:51  nInternalFaces:9";
+    class       labelList;
+    location    "constant/solid/polyMesh";
+    object      owner;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+
+51
+(
+0
+1
+2
+3
+4
+5
+6
+7
+8
+0
+0
+1
+2
+3
+4
+5
+6
+7
+8
+9
+0
+1
+2
+3
+4
+5
+6
+7
+8
+9
+0
+1
+2
+3
+4
+5
+6
+7
+8
+9
+0
+1
+2
+3
+4
+5
+6
+7
+8
+9
+9
+)
+
+
+// ************************************************************************* //
diff --git a/testsuite/cht/fixedFlux/constant/solid/polyMesh/pointRegionAddressing b/testsuite/cht/fixedFlux/constant/solid/polyMesh/pointRegionAddressing
new file mode 100644
index 00000000..5a07e0be
--- /dev/null
+++ b/testsuite/cht/fixedFlux/constant/solid/polyMesh/pointRegionAddressing
@@ -0,0 +1,69 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2106                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    arch        "LSB;label=32;scalar=64";
+    class       labelList;
+    location    "constant/solid/polyMesh";
+    object      pointRegionAddressing;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+
+44
+(
+0
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+101
+102
+103
+104
+105
+106
+107
+108
+109
+110
+111
+202
+203
+204
+205
+206
+207
+208
+209
+210
+211
+212
+303
+304
+305
+306
+307
+308
+309
+310
+311
+312
+313
+)
+
+
+// ************************************************************************* //
diff --git a/testsuite/cht/fixedFlux/constant/solid/polyMesh/pointZones b/testsuite/cht/fixedFlux/constant/solid/polyMesh/pointZones
new file mode 100644
index 00000000..e1fdd7c9
--- /dev/null
+++ b/testsuite/cht/fixedFlux/constant/solid/polyMesh/pointZones
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2106                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    arch        "LSB;label=32;scalar=64";
+    class       regIOobject;
+    location    "constant/solid/polyMesh";
+    object      pointZones;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+0()
+
+// ************************************************************************* //
diff --git a/testsuite/cht/fixedFlux/constant/solid/polyMesh/points b/testsuite/cht/fixedFlux/constant/solid/polyMesh/points
new file mode 100644
index 00000000..007569a4
--- /dev/null
+++ b/testsuite/cht/fixedFlux/constant/solid/polyMesh/points
@@ -0,0 +1,69 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2106                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    arch        "LSB;label=32;scalar=64";
+    class       vectorField;
+    location    "constant/solid/polyMesh";
+    object      points;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+
+44
+(
+(0 0 0)
+(0.0001 0 0)
+(0.0002 0 0)
+(0.0003 0 0)
+(0.0004 0 0)
+(0.0005 0 0)
+(0.0006 0 0)
+(0.0007 0 0)
+(0.0008 0 0)
+(0.0009 0 0)
+(0.001 0 0)
+(0 0.0002 0)
+(0.0001 0.0002 0)
+(0.0002 0.0002 0)
+(0.0003 0.0002 0)
+(0.0004 0.0002 0)
+(0.0005 0.0002 0)
+(0.0006 0.0002 0)
+(0.0007 0.0002 0)
+(0.0008 0.0002 0)
+(0.0009 0.0002 0)
+(0.001 0.0002 0)
+(0 0 2e-05)
+(0.0001 0 2e-05)
+(0.0002 0 2e-05)
+(0.0003 0 2e-05)
+(0.0004 0 2e-05)
+(0.0005 0 2e-05)
+(0.0006 0 2e-05)
+(0.0007 0 2e-05)
+(0.0008 0 2e-05)
+(0.0009 0 2e-05)
+(0.001 0 2e-05)
+(0 0.0002 2e-05)
+(0.0001 0.0002 2e-05)
+(0.0002 0.0002 2e-05)
+(0.0003 0.0002 2e-05)
+(0.0004 0.0002 2e-05)
+(0.0005 0.0002 2e-05)
+(0.0006 0.0002 2e-05)
+(0.0007 0.0002 2e-05)
+(0.0008 0.0002 2e-05)
+(0.0009 0.0002 2e-05)
+(0.001 0.0002 2e-05)
+)
+
+
+// ************************************************************************* //
diff --git a/testsuite/cht/fixedFlux/constant/solid/radiationProperties b/testsuite/cht/fixedFlux/constant/solid/radiationProperties
new file mode 100644
index 00000000..729814e9
--- /dev/null
+++ b/testsuite/cht/fixedFlux/constant/solid/radiationProperties
@@ -0,0 +1,36 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.3.0                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      radiationProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+radiation off;
+
+radiationModel  opaqueSolid;
+
+absorptionEmissionModel constantAbsorptionEmission;
+
+constantAbsorptionEmissionCoeffs
+{
+    absorptivity    absorptivity [ 0 -1 0 0 0 0 0 ] 0.0;  //opaque
+    emissivity      emissivity [ 0 -1 0 0 0 0 0 ] 0.1;
+    E               E [ 1 -1 -3 0 0 0 0 ] 0;
+}
+
+scatterModel    none;
+
+sootModel       none;
+
+// ************************************************************************* //
diff --git a/testsuite/cht/fixedFlux/constant/solid/thermophysicalProperties b/testsuite/cht/fixedFlux/constant/solid/thermophysicalProperties
new file mode 100644
index 00000000..aad36894
--- /dev/null
+++ b/testsuite/cht/fixedFlux/constant/solid/thermophysicalProperties
@@ -0,0 +1,56 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.3.0                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      thermophysicalProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+thermoType
+{
+    type            heSolidThermo;
+    mixture         pureMixture;
+    transport       constIso;
+    thermo          hConst;
+    equationOfState rhoConst;
+    specie          specie;
+    energy          sensibleEnthalpy;
+}
+
+mixture
+{
+    specie
+    {
+        nMoles      1;
+        molWeight   50;
+    }
+
+    transport
+    {
+	    kappa       100;
+        //kappaCoeffs<8> (7 0 0 0 0 0 0 0);
+    }
+
+    thermodynamics
+    {
+        Sf          0;
+	    Hf          0;
+        Cp          100;
+        //CpCoeffs<8>      (400 0 0 0 0 0 0 0);
+    }
+
+    equationOfState
+    {
+        rho         1000;
+    }
+}
+
+// ************************************************************************* //
diff --git a/testsuite/cht/fixedFlux/system/blockMeshDict b/testsuite/cht/fixedFlux/system/blockMeshDict
new file mode 100755
index 00000000..76868bec
--- /dev/null
+++ b/testsuite/cht/fixedFlux/system/blockMeshDict
@@ -0,0 +1,63 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      blockMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+scale 0.001;
+
+vertices
+(
+    (0 0 -0.0)
+    (10 0 -0.0)
+    (10 0.2 -0.0)
+    (0 0.2 -0.0)
+    (0 0 0.02)
+    (10 0 0.02)
+    (10 0.2 0.02)
+    (0 0.2 0.02)
+);
+
+blocks
+(
+    hex (0 1 2 3 4 5 6 7) (100 1 1)
+    simpleGrading (1 1 1)
+);
+
+patches
+(
+   /* wall sideWalls
+    (
+        (1 5 4 0)
+        (3 7 6 2)
+    )*/
+    wall faceWall
+    (
+      (0 4 7 3)
+    )
+
+    patch outlet
+    (
+      (2 6 5 1)
+    )
+    empty frontAndBack
+    (
+        (0 3 2 1)
+        (4 5 6 7)
+        (1 5 4 0)
+        (3 7 6 2)
+
+    )
+);
+
+// ************************************************************************* //
diff --git a/testsuite/cht/fixedFlux/system/controlDict b/testsuite/cht/fixedFlux/system/controlDict
new file mode 100755
index 00000000..671475a7
--- /dev/null
+++ b/testsuite/cht/fixedFlux/system/controlDict
@@ -0,0 +1,98 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+
+isoAdvection 1;
+application     multiRegionPhaseChangeFlow;
+
+startFrom       latestTime;
+
+startTime       0;
+
+stopAt          endTime;
+
+endTime         0.5;
+
+deltaT          1e-7;
+
+writeControl    adjustableRunTime;
+
+writeInterval   0.1;
+
+purgeWrite      0;
+
+writeFormat     ascii;
+
+writePrecision  8;
+
+writeCompression off;
+
+timeFormat      general;
+
+timePrecision   10;
+
+runTimeModifiable yes;
+
+adjustTimeStep  yes;
+
+maxCo           0.1;
+maxAlphaCo      0.1;
+maxCapillaryNum 1e8;
+maxDi           10;
+// needed for the explicit time step criteria of explicitGrad
+maxDeltaT       1e-1;
+// requires for accurate results of the explicit scheme
+//maxDeltaT       1e-4;
+
+functions
+{
+
+    massFlux
+    {
+        type            volFieldValue;
+        libs            ("libfieldFunctionObjects.so");
+
+        writeControl    timeStep;
+        writeInterval   10;
+        writeFields     false;
+        log             true;
+        region          fluid;
+
+        operation       volIntegrate;
+
+        fields
+        (
+            psi0_
+        );
+
+    }
+
+    energyFluxes
+    {
+        type            interfaceEnergyFluxes;
+        libs            ("libpostProcess.so");
+
+        // Write at same frequency as fields
+        writeControl    timeStep;
+        writeInterval   10;
+        region fluid;
+    }
+
+
+}
+
+// ************************************************************************* //
diff --git a/testsuite/cht/fixedFlux/system/fluid/fvSchemes b/testsuite/cht/fixedFlux/system/fluid/fvSchemes
new file mode 100755
index 00000000..9f0dd45a
--- /dev/null
+++ b/testsuite/cht/fixedFlux/system/fluid/fvSchemes
@@ -0,0 +1,57 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+    default Euler;
+}
+
+gradSchemes
+{
+    default         Gauss linear;
+}
+
+divSchemes
+{
+    div(phi,alpha)  Gauss vanLeer;
+    div(phirb,alpha) Gauss linear;
+    div(rhoPhi,U)      Gauss vanLeerV;
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
+    div(rhoCpLPhi,T.water) Gauss upwind;
+    div(rhoCpVPhi,T.air) Gauss upwind;
+}
+
+laplacianSchemes
+{
+    default        Gauss linear uncorrected;
+}
+
+interpolationSchemes
+{
+    default         linear;
+}
+
+snGradSchemes
+{
+    default         uncorrected;
+}
+
+fluxRequired
+{
+    p_rgh;
+}
+
+// ************************************************************************* //
diff --git a/testsuite/cht/fixedFlux/system/fluid/fvSolution b/testsuite/cht/fixedFlux/system/fluid/fvSolution
new file mode 100755
index 00000000..8b7fae62
--- /dev/null
+++ b/testsuite/cht/fixedFlux/system/fluid/fvSolution
@@ -0,0 +1,132 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+    alpha.water
+    {
+        nAlphaCorr      2;
+        nAlphaSubCycles 2;
+        cAlpha          2;
+
+        MULESCorr       no;
+        nLimiterIter    5;
+
+        solver          smoothSolver;
+        smoother        symGaussSeidel;
+        tolerance       1e-8;
+        relTol          0;
+        advectionScheme isoAdvection;
+        reconstructionScheme isoAlpha;
+        vof2IsoTol 1e-8;
+        surfCellTol 1e-8;
+        writeVTK true;
+    }
+
+    psiFinal
+    {
+        solver           PCG;
+        preconditioner   DIC;
+        tolerance        1e-7;
+        relTol           0.00;
+    }
+
+    rhoCpLFinal
+    {
+        solver           diagonal;
+        preconditioner   DILU;
+        tolerance        1e-7;
+        relTol           0.1;
+    }
+
+    rhoCpVFinal
+    {
+        solver           diagonal;
+        preconditioner   DILU;
+        tolerance        1e-7;
+        relTol           0.1;
+    }
+
+    rho
+    {
+        solver          PCG;
+        preconditioner  DIC;
+        tolerance       1e-7;
+        relTol          0.1;
+    }
+
+    rhoFinal
+    {
+        $rho;
+        tolerance       1e-7;
+        relTol          0;
+    }
+
+    p_rgh
+    {
+        //solver           GAMG;
+        tolerance        1e-9;
+        solver          PCG;
+        preconditioner  DIC;
+        relTol           0.001;
+        smoother         GaussSeidel;
+        minIter 10;
+    }
+
+    p_rghFinal
+    {
+        $p_rgh;
+        tolerance        1e-9;
+        relTol           0;
+        minIter 10;
+    }
+
+    "(U|h|T.*|k|epsilon|R)"
+    {
+        solver           smoothSolver;
+        smoother         symGaussSeidel;
+        tolerance        1e-7;
+        relTol           0.0;
+        minIter          15;
+        maxIter          50;
+    }
+
+    "(U|h|T.*|k|epsilon|R)Final"
+    {
+        $U;
+        tolerance        1e-7;
+        relTol           0;
+        maxIter          50;
+    }
+}
+
+PIMPLE
+{
+    momentumPredictor   yes;
+    nCorrectors         2;
+    nNonOrthogonalCorrectors 0;
+}
+
+relaxationFactors
+{
+    equations
+    {
+        "h.*"           1;
+        "U.*"           1;
+    }
+}
+
+// ************************************************************************* //
diff --git a/testsuite/cht/fixedFlux/system/fluid/initAlphaFieldDict b/testsuite/cht/fixedFlux/system/fluid/initAlphaFieldDict
new file mode 100755
index 00000000..2a438aa2
--- /dev/null
+++ b/testsuite/cht/fixedFlux/system/fluid/initAlphaFieldDict
@@ -0,0 +1,25 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system/fluid";
+    object      setFieldsDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+field "alpha.water";
+
+type plane;
+origin (0.0017234 0 0);
+normal (-1 0 0);
+
+
+// ************************************************************************* //
diff --git a/testsuite/cht/fixedFlux/system/fluid/setFieldsDict b/testsuite/cht/fixedFlux/system/fluid/setFieldsDict
new file mode 100755
index 00000000..c3eb6bef
--- /dev/null
+++ b/testsuite/cht/fixedFlux/system/fluid/setFieldsDict
@@ -0,0 +1,44 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system/fluid";
+    object      setFieldsDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+defaultFieldValues
+(
+    volScalarFieldValue alpha.water 1
+    volScalarFieldValue p_rgh 1e5
+    volScalarFieldValue p 1e5
+);
+
+regions
+(
+    boxToCell
+    {
+        boxes
+        (
+            (0 -100 -100)
+            (0.500001e-3 100 100)
+        );
+        fieldValues
+        (
+            volScalarFieldValue alpha.water 0
+            volScalarFieldValue p_rgh 1e5
+            volScalarFieldValue p 1e5
+        );
+    }
+);
+
+
+// ************************************************************************* //
diff --git a/testsuite/cht/fixedFlux/system/fvSchemes b/testsuite/cht/fixedFlux/system/fvSchemes
new file mode 100755
index 00000000..975dbe07
--- /dev/null
+++ b/testsuite/cht/fixedFlux/system/fvSchemes
@@ -0,0 +1,59 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+    default         Euler;
+}
+
+gradSchemes
+{
+    default         Gauss linear;
+}
+
+divSchemes
+{
+    div(phi,alpha)  Gauss vanLeer;
+    div(phirb,alpha) Gauss linear;
+
+    div(rhoPhi,U)  Gauss upwind;
+    div(phi,thermo:rho.water) Gauss linearasd;
+    div(phi,thermo:rho.air) Gauss upwind;
+    div(rhoPhi,T)  Gauss upwind;
+    div(rhoPhi,K)  Gauss upwind;
+    div(phi,p)      Gauss upwind;
+    div(phi,k)      Gauss upwind;
+
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
+}
+
+laplacianSchemes
+{
+    default         Gauss linear uncorrected;
+}
+
+interpolationSchemes
+{
+    default         linear;
+}
+
+snGradSchemes
+{
+    default         uncorrected;
+}
+
+// ************************************************************************* //
diff --git a/testsuite/cht/fixedFlux/system/fvSolution b/testsuite/cht/fixedFlux/system/fvSolution
new file mode 100755
index 00000000..0e4e5224
--- /dev/null
+++ b/testsuite/cht/fixedFlux/system/fvSolution
@@ -0,0 +1,113 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+    "alpha.*"
+    {
+        nAlphaCorr      1;
+        nAlphaSubCycles 2;
+        cAlpha          1;
+
+        MULESCorr       no;
+        nLimiterIter    5;
+
+        solver          smoothSolver;
+        smoother        symGaussSeidel;
+        tolerance       1e-8;
+        relTol          0;
+        advectionScheme asasd;
+        reconstructionScheme plicRDFN;
+        vof2IsoTol 1e-8;
+        surfCellTol 1e-8;
+        writeVTK true;
+    }
+
+    ".*(rho|rhoFinal)"
+    {
+        solver          diagonal;
+    }
+
+    "pcorr.*"
+    {
+        solver          PCG;
+        preconditioner
+        {
+            preconditioner  GAMG;
+            tolerance       1e-05;
+            relTol          0;
+            smoother        DICGaussSeidel;
+        }
+        tolerance       1e-05;
+        relTol          0;
+        maxIter         100;
+    }
+
+    p_rgh
+    {
+        solver          GAMG;
+        tolerance       1e-07;
+        relTol          0.01;
+        smoother        DIC;
+    }
+
+    p_rghFinal
+    {
+        solver          PCG;
+        preconditioner
+        {
+            preconditioner  GAMG;
+            tolerance       1e-07;
+            relTol          0;
+            nVcycles        2;
+            smoother        DICGaussSeidel;
+            nPreSweeps      2;
+        }
+        tolerance       1e-07;
+        relTol          0;
+        maxIter         20;
+    }
+
+    U
+    {
+        solver          smoothSolver;
+        smoother        GaussSeidel;
+        tolerance       1e-06;
+        relTol          0;
+        nSweeps         1;
+    }
+
+    "(T|k|B|nuTilda).*"
+    {
+        solver          smoothSolver;
+        smoother        symGaussSeidel;
+        tolerance       1e-08;
+        relTol          0;
+    }
+}
+
+PIMPLE
+{
+    momentumPredictor no;
+    transonic       no;
+    nOuterCorrectors 1;
+    nCorrectors     2;
+    nNonOrthogonalCorrectors 0;
+}
+
+
+// ************************************************************************* //
diff --git a/testsuite/cht/fixedFlux/system/simulationParameter b/testsuite/cht/fixedFlux/system/simulationParameter
new file mode 100644
index 00000000..2afdccdf
--- /dev/null
+++ b/testsuite/cht/fixedFlux/system/simulationParameter
@@ -0,0 +1,20 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.0                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      simulationParameter;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+PCM implicitGrad;
+
+// ************************************************************************* //
\ No newline at end of file
diff --git a/testsuite/cht/fixedFlux/system/simulationParameter.orig b/testsuite/cht/fixedFlux/system/simulationParameter.orig
new file mode 100644
index 00000000..b5676a3c
--- /dev/null
+++ b/testsuite/cht/fixedFlux/system/simulationParameter.orig
@@ -0,0 +1,20 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.0                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      simulationParameter;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+PCM selectedGradExplicit;
+
+// ************************************************************************* //
\ No newline at end of file
diff --git a/testsuite/cht/fixedFlux/system/solid/changeDictionaryDict b/testsuite/cht/fixedFlux/system/solid/changeDictionaryDict
new file mode 100644
index 00000000..aa071a58
--- /dev/null
+++ b/testsuite/cht/fixedFlux/system/solid/changeDictionaryDict
@@ -0,0 +1,52 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.3.0                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      changeDictionaryDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+
+boundary
+{
+
+    top
+    {
+        type            mappedWall;
+        inGroups        2(wall mappedPatch);
+        sampleMode      nearestPatchFace;
+        sampleRegion    fluid;
+        samplePatch     top;
+    }
+
+    side
+    {
+        type            mappedWall;
+        inGroups        2(wall mappedPatch);
+        sampleMode      nearestPatchFace;
+        sampleRegion    fluid;
+        samplePatch     side;
+    }
+
+    bot
+    {
+        type            mappedWall;
+        inGroups        2(wall mappedPatch);
+        sampleMode      nearestPatchFace;
+        sampleRegion    fluid;
+        samplePatch     bot;
+    }
+
+
+}
+
+
+// ************************************************************************* //
diff --git a/testsuite/cht/fixedFlux/system/solid/decomposeParDict b/testsuite/cht/fixedFlux/system/solid/decomposeParDict
new file mode 100644
index 00000000..69eceab9
--- /dev/null
+++ b/testsuite/cht/fixedFlux/system/solid/decomposeParDict
@@ -0,0 +1,36 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.3.0                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      decomposeParDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+numberOfSubdomains 32;
+
+method          scotch;
+
+
+simpleCoeffs
+{
+    n               (8 1 1);
+    delta           0.001;
+}
+
+
+distributed     no;
+
+roots           
+(
+);
+
+// ************************************************************************* //
diff --git a/testsuite/cht/fixedFlux/system/solid/extrudeMeshDict b/testsuite/cht/fixedFlux/system/solid/extrudeMeshDict
new file mode 100644
index 00000000..b599e654
--- /dev/null
+++ b/testsuite/cht/fixedFlux/system/solid/extrudeMeshDict
@@ -0,0 +1,35 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v1812                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      extrudeMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+constructFrom patch;
+sourceCase "$FOAM_CASE";
+
+sourcePatches (back);
+exposedPatchName front;
+
+extrudeModel        wedge;
+
+sectorCoeffs
+{
+    axisPt          (0 0 0);
+    axis            (0 1 0);
+    angle           5;
+}
+
+flipNormals false;
+mergeFaces false;
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/testsuite/cht/fixedFlux/system/solid/fvSchemes b/testsuite/cht/fixedFlux/system/solid/fvSchemes
new file mode 100644
index 00000000..fdc8e7a5
--- /dev/null
+++ b/testsuite/cht/fixedFlux/system/solid/fvSchemes
@@ -0,0 +1,53 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.3.0                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+    default Euler;
+}
+
+gradSchemes
+{
+    default         Gauss linear;
+}
+
+divSchemes
+{
+    default         none;
+}
+
+laplacianSchemes
+{
+    default             none;
+    laplacian(alpha,h)  Gauss linear corrected;
+}
+
+interpolationSchemes
+{
+    default         linear;
+}
+
+snGradSchemes
+{
+    default         corrected;
+}
+
+fluxRequired
+{
+    default         no;
+}
+
+// ************************************************************************* //
diff --git a/testsuite/cht/fixedFlux/system/solid/fvSolution b/testsuite/cht/fixedFlux/system/solid/fvSolution
new file mode 100644
index 00000000..7241dfb1
--- /dev/null
+++ b/testsuite/cht/fixedFlux/system/solid/fvSolution
@@ -0,0 +1,42 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.3.0                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+    h
+    {
+        solver           PCG;
+        preconditioner   DIC;
+        tolerance        1e-06;
+        relTol           0.1;
+        minIter         5;
+    }
+
+    hFinal
+    {
+        $h;
+        tolerance        1e-09;
+        relTol           0;
+	    minIter         5;
+    }
+}
+
+PIMPLE
+{
+    nNonOrthogonalCorrectors 3;
+}
+
+// ************************************************************************* //
diff --git a/testsuite/cht/fixedFlux/system/solid/setFieldTableDict b/testsuite/cht/fixedFlux/system/solid/setFieldTableDict
new file mode 100644
index 00000000..6d78aa2c
--- /dev/null
+++ b/testsuite/cht/fixedFlux/system/solid/setFieldTableDict
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  2.2.0                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+field T;
+fileName "$FOAM_CASE/TSolid.dat";
+direction (0 0 1);
+
+
+// ************************************************************************* //
diff --git a/testsuite/cht/fixedFlux/system/topoSetDict b/testsuite/cht/fixedFlux/system/topoSetDict
new file mode 100644
index 00000000..4320608c
--- /dev/null
+++ b/testsuite/cht/fixedFlux/system/topoSetDict
@@ -0,0 +1,56 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2106                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      topoSetDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+actions
+(
+    
+    // solid
+    {
+        name    solidCellSet;
+        type    cellSet;
+        action  new;
+        source  boxToCell;
+        box     (-100 -100 -100) (0.001 100 100);
+    }
+    {
+        name    solid;
+        type    cellZoneSet;
+        action  new;
+        source  setToCellZone;
+        set     solidCellSet;
+    }
+
+    // fluid
+    {
+        name    fluidCellSet;
+        type    cellSet;
+        action  new;
+        source  boxToCell;
+        box     (0.001 -100 -100) (100 100 100);
+    }
+    {
+        name    fluid;
+        type    cellZoneSet;
+        action  new;
+        source  setToCellZone;
+        set     fluidCellSet;
+    }
+
+    
+);
+
+
+// ************************************************************************* //
diff --git a/testsuite/cht/fixedFlux/test_chtFixedFlux.py b/testsuite/cht/fixedFlux/test_chtFixedFlux.py
new file mode 100644
index 00000000..df55c602
--- /dev/null
+++ b/testsuite/cht/fixedFlux/test_chtFixedFlux.py
@@ -0,0 +1,34 @@
+import os
+import pytest
+import oftest
+import pandas as pd
+from oftest import run_case, run_reset_case
+import casefoam
+
+@pytest.fixture  
+def load_errorfile():
+    dir_name = os.path.dirname(os.path.abspath(__file__))
+
+    heatFlux = casefoam.time_series(
+        'fluid/energyFluxes/0', 'interfaceEnergyFluxes.dat',baseCase=dir_name)
+
+    massFlux = casefoam.time_series(
+        'fluid/massFlux/0', 'volFieldValue.dat',baseCase=dir_name)
+    return heatFlux, massFlux
+
+def test_chtFixedHeatFlux(run_reset_case, load_errorfile):
+
+    log = oftest.path_log()
+    assert oftest.case_status(log) == "completed"  # checks if run completes
+    
+    heatFlux, massFlux = load_errorfile
+
+    print(heatFlux.tail(1))
+    print(massFlux.tail(1))
+    q = heatFlux.tail(1)[1]
+    mdot = massFlux.tail(1)[1]
+
+    assert pytest.approx(q, rel=1e-4) == 1e-6
+    assert pytest.approx(mdot, rel=1e-4) == 1e-12
+
+
diff --git a/testsuite/phaseChange/stefanProblem/expected_results.csv b/testsuite/phaseChange/stefanProblem/expected_results.csv
index 8d7e0580..97d88f25 100644
--- a/testsuite/phaseChange/stefanProblem/expected_results.csv
+++ b/testsuite/phaseChange/stefanProblem/expected_results.csv
@@ -1,4 +1,4 @@
 err,PCM,runtime
-1.2013349513712267e-10,selectedGradExplicit,57.48
-2.0854956864710898e-11,implicitGrad,56.29
-2.8682250072866655e-11,Schrage,56.57
\ No newline at end of file
+1.8945876011643435e-10,selectedGradExplicit,57.25
+7.027075416575897e-11,implicitGrad,56.88
+8.044183030818324e-11,Schrage,57.06
diff --git a/testsuite/phaseChange/stefanProblem/system/controlDict b/testsuite/phaseChange/stefanProblem/system/controlDict
index cc90387c..a29bdd8f 100755
--- a/testsuite/phaseChange/stefanProblem/system/controlDict
+++ b/testsuite/phaseChange/stefanProblem/system/controlDict
@@ -64,7 +64,8 @@ functions
         type            surfaces;
         libs
         (
-            "libsampling.so"
+            sampling
+            postProcess
         );
 
         // Write at same frequency as fields
@@ -76,15 +77,13 @@ functions
             alpha.water
         );
         region fluid;
-        interpolationScheme cellPoint;
+        interpolationScheme cell;
         surfaces
         (
             constantIso
             {
-                type        isoSurfaceCell;
-                isoField    alpha.water;
-                isoValue    0.5;
-                interpolate true;
+                type        interface;
+                interpolate false;
             }
         );
     }
diff --git a/testsuite/phaseChange/stefanProblem/system/fluid/blockMeshDict b/testsuite/phaseChange/stefanProblem/system/fluid/blockMeshDict
index 4fcdf825..76868bec 100755
--- a/testsuite/phaseChange/stefanProblem/system/fluid/blockMeshDict
+++ b/testsuite/phaseChange/stefanProblem/system/fluid/blockMeshDict
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-convertToMeters 0.001;
+scale 0.001;
 
 vertices
 (
diff --git a/testsuite/phaseChange/stefanProblem/system/fluid/fvSolution b/testsuite/phaseChange/stefanProblem/system/fluid/fvSolution
index 12b816f1..bd30592c 100755
--- a/testsuite/phaseChange/stefanProblem/system/fluid/fvSolution
+++ b/testsuite/phaseChange/stefanProblem/system/fluid/fvSolution
@@ -94,31 +94,12 @@ solvers
         minIter 10;
     }
 
-/*    e
-    {
-        solver          PBiCGStab;
-        preconditioner  DILU;
-        nSweeps         2;
-        tolerance       1e-06;
-        relTol          0.1;
-        minIter         1;
-    }
-
-    eFinal
-    {
-        $e;
-        tolerance       1e-05;
-        relTol          0;
-        minIter         1;
-    }*/
-
     "(U|h|T.*|k|epsilon|R)"
     {
-        solver           smoothSolver; //PBiCGStab;
-        smoother        symGaussSeidel;
-        //preconditioner   DILU;
+        solver           smoothSolver;
+        smoother         symGaussSeidel;
         tolerance        1e-7;
-        relTol           0.;
+        relTol           0.0;
         minIter          15;
         maxIter          50;
     }
diff --git a/testsuite/phaseChange/stefanProblem/test_stefanProblem.py b/testsuite/phaseChange/stefanProblem/test_stefanProblem.py
index 1c6f44d7..616a2d1b 100644
--- a/testsuite/phaseChange/stefanProblem/test_stefanProblem.py
+++ b/testsuite/phaseChange/stefanProblem/test_stefanProblem.py
@@ -127,7 +127,7 @@ def test_StefanProblem(run_reset_case, expected, load_errorfile):
     results["PCM"].append(scheme)
 
     exp_res = oftest.expected_results([1],(scheme,))
-    assert err == pytest.approx(exp_res["err"],rel=0.001)
+    assert err <= exp_res["err"]*1.01
 
 
 
diff --git a/testsuite/phaseChange/suckingInterface/system/controlDict b/testsuite/phaseChange/suckingInterface/system/controlDict
index 4e4e1767..a285a14e 100755
--- a/testsuite/phaseChange/suckingInterface/system/controlDict
+++ b/testsuite/phaseChange/suckingInterface/system/controlDict
@@ -59,8 +59,8 @@ functions
         type            surfaces;
         libs
         (
-            "libsampling.so"
-            "libpostProcess.so"
+            sampling
+            postProcess
         );
 
         // Write at same frequency as fields
@@ -78,7 +78,6 @@ functions
             constantIso
             {
                 type        interface;
-                isoField    alpha.water;
                 interpolate false;
             }
         );
diff --git a/testsuite/phaseChange/suckingInterface/system/fluid/blockMeshDict b/testsuite/phaseChange/suckingInterface/system/fluid/blockMeshDict
index 9ba8eab9..caff05d3 100755
--- a/testsuite/phaseChange/suckingInterface/system/fluid/blockMeshDict
+++ b/testsuite/phaseChange/suckingInterface/system/fluid/blockMeshDict
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-convertToMeters 0.001;
+scale 0.001;
 
 vertices
 (
diff --git a/testsuite/phaseChange/suckingInterface/system/fluid/fvSolution b/testsuite/phaseChange/suckingInterface/system/fluid/fvSolution
index 38eea149..df0465e2 100755
--- a/testsuite/phaseChange/suckingInterface/system/fluid/fvSolution
+++ b/testsuite/phaseChange/suckingInterface/system/fluid/fvSolution
@@ -114,13 +114,13 @@ solvers
 
     "(U|h|T.*|k|epsilon|R)"
     {
-        solver          PBiCGStab;
-        preconditioner  DILU;
-        //olver           smoothSolver;;
-        //smoother        symGaussSeidel;
+        // solver          PBiCGStab;
+        // preconditioner  DILU;
+        solver           smoothSolver;;
+        smoother        symGaussSeidel;
         tolerance        1e-7;
         relTol           0.;
-        minIter          15;
+        minIter          3;
         maxIter          50;
     }
 
diff --git a/testsuite/phaseChange/suckingInterface/system/fluid/setFieldfromTableDict b/testsuite/phaseChange/suckingInterface/system/fluid/setFieldfromTableDict
index 00139af1..003c57d4 100644
--- a/testsuite/phaseChange/suckingInterface/system/fluid/setFieldfromTableDict
+++ b/testsuite/phaseChange/suckingInterface/system/fluid/setFieldfromTableDict
@@ -23,7 +23,7 @@ hasHeaderLine false;
 timeColumn 0;
 valueColumns (1);
 
-function plane;
+type plane;
 origin (0 0 0);
 normal (1 0 0);
 
diff --git a/testsuite/phaseChange/suckingInterface/test_suckingInterface.py b/testsuite/phaseChange/suckingInterface/test_suckingInterface.py
index 4362612a..1b27c187 100644
--- a/testsuite/phaseChange/suckingInterface/test_suckingInterface.py
+++ b/testsuite/phaseChange/suckingInterface/test_suckingInterface.py
@@ -113,7 +113,7 @@ def test_SuckingInterface(run_reset_case, expected, load_errorfile):
     results["PCM"].append(scheme)
 
     exp_res = oftest.expected_results([1],(scheme,))
-    assert err == pytest.approx(exp_res["err"],rel=0.001)
+    assert err <= exp_res["err"]*1.01
 
 
 
diff --git a/testsuite/surfaceTension/sinWave/getResults.py b/testsuite/surfaceTension/sinWave/getResults.py
index af36d61a..581bc4c4 100755
--- a/testsuite/surfaceTension/sinWave/getResults.py
+++ b/testsuite/surfaceTension/sinWave/getResults.py
@@ -39,30 +39,8 @@
 err = 1/wavelength*math.sqrt(1/25*int_err)
 print("err",err)
 print("omega0",omega0,1/omega0)
-# ax = analytical.plot(style='.', x='time', y='analytical',
-#                      c='black', marker='+', ms=7)
-# sns.set_style("ticks")
 
-# ax = sol.plot(x='time',y='max')
-# sol.plot(x='time',y='ana',ax=ax)
-
-sol.plot(x='time',y='error')
-# plicRDF = sol[sol['interfaceType'] == 'plicRDF']
-# ax = sns.lineplot(x='time', y='max', hue='Method', style="nCells", data=plicRDF,
-#                   hue_order=['gradAlpha', 'fitParaboloid', 'RDF'], ax=ax)
-# plt.ylabel('Relative amplitude')
-# plt.xlabel('Non-dimensional time')
-# plt.savefig("sinWaveHex_plicRDF.pdf")
-# plicRDF.to_csv("sinWaveHex_plicRDF.csv", index=False)
-
-
-# ax = analytical.plot(x='time', y='analytical', c='black', marker='o')
-# isoSurface = sol[sol['interfaceType'] == 'isoSurface']
-# sns.lineplot(x='time', y='max', hue='Method', style="nCells", data=isoSurface,
-#              hue_order=['gradAlpha', 'fitParaboloid', 'RDF'], ax=ax)
-# plt.ylabel('Relative amplitude')
-# plt.xlabel('Non-dimensional time')
-# plt.savefig("sinWaveHex_isoSurface.pdf")
-# isoSurface.to_csv("sinWaveHex_isoSurface.csv", index=False)
+ax = sol.plot(x='time',y='max')
+sol.plot(x='time',y='analytical',ax=ax)
 
 plt.show()
diff --git a/testsuite/surfaceTension/sinWave/system/blockMeshDict b/testsuite/surfaceTension/sinWave/system/blockMeshDict
index 069ffc48..fd63d949 100755
--- a/testsuite/surfaceTension/sinWave/system/blockMeshDict
+++ b/testsuite/surfaceTension/sinWave/system/blockMeshDict
@@ -16,7 +16,7 @@ FoamFile
 
 #include "simulationParameter"
 
-convertToMeters 0.0015;
+scale 0.0015;
 
 vertices        
 (
diff --git a/testsuite/surfaceTension/sinWave/system/controlDict b/testsuite/surfaceTension/sinWave/system/controlDict
index 47b121ae..dbac3619 100755
--- a/testsuite/surfaceTension/sinWave/system/controlDict
+++ b/testsuite/surfaceTension/sinWave/system/controlDict
@@ -69,9 +69,10 @@ functions
     surfaces
     {
         type            surfaces;
-        functionObjectLibs
+        libs
         (
-            "libsampling.so"
+            sampling
+            postProcess
         );
 
         // Write at same frequency as fields
@@ -84,15 +85,13 @@ functions
         (
             alpha.water
         );
-        interpolationScheme cellPoint;
+        interpolationScheme cell;
         surfaces
         (
             constantIso
             {
-                type        isoSurfaceCell;
-                isoField    alpha.water;
-                isoValue    0.5;
-                interpolate true;
+                type        interface;
+                interpolate false;
             }
         );
     }
diff --git a/testsuite/surfaceTension/sinWave/system/setAlphaFieldDict b/testsuite/surfaceTension/sinWave/system/setAlphaFieldDict
index 4f217690..1156481d 100755
--- a/testsuite/surfaceTension/sinWave/system/setAlphaFieldDict
+++ b/testsuite/surfaceTension/sinWave/system/setAlphaFieldDict
@@ -19,7 +19,7 @@ type sin;
 period 0.003; 
 direction (1 0 0);
 up (0 1 0);
-centre (-7.5e-4 0 0);
-amplitude 3e-5;;
+origin (-7.5e-4 0 0);
+amplitude 3e-5;
 
 // ************************************************************************* //
diff --git a/testsuite/surfaceTension/sinWave/test_sinWave.py b/testsuite/surfaceTension/sinWave/test_sinWave.py
index 18ffc41d..dcecba19 100644
--- a/testsuite/surfaceTension/sinWave/test_sinWave.py
+++ b/testsuite/surfaceTension/sinWave/test_sinWave.py
@@ -71,7 +71,7 @@ def expected():
 
 @pytest.fixture  # descruct all tests
 def load_errorfile():
-    
+
     solutionDir = 'surfaces'
     file = 'alpha.water_constantIso.raw'
     dir_name = os.path.dirname(os.path.abspath(__file__))
@@ -133,13 +133,13 @@ def simMod(res, STM):
 parameters = [
     c_gradAlpha32,
     c_gradAlpha64,
-    c_gradAlpha128,
+    pytest.param(c_gradAlpha128, marks=pytest.mark.slow),
     c_RDF32,
     c_RDF64,
-    c_RDF128,
+    pytest.param(c_RDF128, marks=pytest.mark.slow),
     c_fitParaboloid32,
     c_fitParaboloid64,
-    c_fitParaboloid128
+    pytest.param(c_fitParaboloid128, marks=pytest.mark.slow),
 ]
 
 results = {
@@ -169,6 +169,7 @@ def simMod(res, STM):
 def test_sinWave(run_reset_case, expected, load_errorfile):
 
     log = oftest.path_log()
+    assert oftest.case_status(log) == "completed"  # checks if run completes
     err = load_errorfile
     scheme = run_reset_case.meta_data["STM"]
     res = run_reset_case.meta_data["Res"]
@@ -179,7 +180,6 @@ def test_sinWave(run_reset_case, expected, load_errorfile):
     results["STM"].append(scheme)
     results["Res"].append(res)
 
-    assert oftest.case_status(log) == "completed"  # checks if run completes
 
 
 def test_results():