of2206 port

.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

.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*/

.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"
         }
     ],

.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 @@
                 }
             ]
         }
-    ]
+    ],
 }

.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"
 }

.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"
         }
     ]
 }

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 \

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,15 +220,15 @@ int main(int argc, char *argv[])
                 initAlphaFieldDict.set<vector>("origin",centrePos);
             }
 
-            centre = initAlphaFieldDict.lookup("origin");
+            centre = initAlphaFieldDict.get<vector>("origin");
 
             Info << "centre " <<  centre << endl;
 
             Foam::autoPtr<Foam::implicitFunction> func
             (
                 implicitFunction::New
                 (
-                    word(initAlphaFieldDict.lookup("type")),
+                    word(initAlphaFieldDict.get<word>("type")),
                     initAlphaFieldDict
                 )
             );

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 \

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"

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 \

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
     );
 

apps/setFieldfromTable/setFieldfromTableDict

@@ -23,29 +23,29 @@ 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);
 
     }
 
     sphere
     {
-        function impSphere;
+        type impSphere;
         radius 0.4;
         centre (0.5 0.8 0.5);
         scale 1;
     }
 
     sphere2
     {
-        function impSphere;
+        type impSphere;
         radius 0.4;
         centre (0.5 0.5 0.5);
     }

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

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

run/Reorientation/system/blockMeshDict

@@ -15,7 +15,7 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 
-convertToMeters 0.001;
+scale 0.001;
 
 vertices // testZelle is 80 mm hoch galube ich
 (

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);
 

run/benchmark/acceleration/tiltedBox/tiltedBox/system/blockMeshDict

@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-convertToMeters 1;
+scale 1;
 
 vertices
 (