From eb1e30ecdb4fcdf2ebf2bc94c2aa9346a56b9ac5 Mon Sep 17 00:00:00 2001
From: Vuko Vukcevic <v.vukcevic@wikki.co.uk>
Date: Thu, 12 Jul 2018 19:33:39 +0200
Subject: [PATCH] Updates to NACA4412-airfoil overset validationSuite case

---
 .../overset/NACA4412-airfoil/explicitOverset/0/nut          | 2 +-
 .../overset/NACA4412-airfoil/explicitOverset/Allclean       | 1 +
 .../overset/NACA4412-airfoil/explicitOverset/Allrun         | 2 +-
 .../overset/NACA4412-airfoil/explicitOverset/save/nut       | 2 +-
 .../NACA4412-airfoil/implicitConservativeOverset/0/nut      | 2 +-
 .../NACA4412-airfoil/implicitConservativeOverset/Allclean   | 1 +
 .../NACA4412-airfoil/implicitConservativeOverset/Allrun     | 6 +++---
 .../NACA4412-airfoil/implicitConservativeOverset/save/nut   | 2 +-
 .../NACA4412-airfoil/implicitNonConservativeOverset/0/nut   | 2 +-
 .../implicitNonConservativeOverset/Allclean                 | 1 +
 .../NACA4412-airfoil/implicitNonConservativeOverset/Allrun  | 6 +++---
 .../implicitNonConservativeOverset/save/nut                 | 2 +-
 .../validation/overset/NACA4412-airfoil/noOverset/0/nut     | 2 +-
 .../validation/overset/NACA4412-airfoil/noOverset/Allclean  | 1 +
 .../validation/overset/NACA4412-airfoil/noOverset/Allrun    | 2 +-
 .../validation/overset/NACA4412-airfoil/noOverset/save/nut  | 2 +-
 16 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/validationAndVerificationSuite/validation/overset/NACA4412-airfoil/explicitOverset/0/nut b/validationAndVerificationSuite/validation/overset/NACA4412-airfoil/explicitOverset/0/nut
index eb5d24443..4cd1316d0 100644
--- a/validationAndVerificationSuite/validation/overset/NACA4412-airfoil/explicitOverset/0/nut
+++ b/validationAndVerificationSuite/validation/overset/NACA4412-airfoil/explicitOverset/0/nut
@@ -62,7 +62,7 @@ boundaryField
 
     airfoil
     {
-        type    nutWallFunction;
+        type    nutkWallFunction;
         Cmu     0.09;
         kappa   0.41;
         E       9.8;
diff --git a/validationAndVerificationSuite/validation/overset/NACA4412-airfoil/explicitOverset/Allclean b/validationAndVerificationSuite/validation/overset/NACA4412-airfoil/explicitOverset/Allclean
index 58fa70e4d..e8c03ae22 100755
--- a/validationAndVerificationSuite/validation/overset/NACA4412-airfoil/explicitOverset/Allclean
+++ b/validationAndVerificationSuite/validation/overset/NACA4412-airfoil/explicitOverset/Allclean
@@ -12,6 +12,7 @@ cleanCase
 \rm -rf surfaces
 \rm -f *raw
 \rm -rf logs nohup.out
+\rm -rf postProcessing
 
 mkdir constant/polyMesh
 cp -r save 0
diff --git a/validationAndVerificationSuite/validation/overset/NACA4412-airfoil/explicitOverset/Allrun b/validationAndVerificationSuite/validation/overset/NACA4412-airfoil/explicitOverset/Allrun
index 4c3bcb919..e70fa852c 100755
--- a/validationAndVerificationSuite/validation/overset/NACA4412-airfoil/explicitOverset/Allrun
+++ b/validationAndVerificationSuite/validation/overset/NACA4412-airfoil/explicitOverset/Allrun
@@ -46,4 +46,4 @@ runApplication $application2
 # Perform sampling
 runApplication sample -latestTime
 timeStep=$(grep "^endTime" system/controlDict | awk '{ print $2 }' | sed 's/;//g')
-cp -v surfaces/$timeStep/p_solidWall.raw .
+cp -v postProcessing/surfaces/$timeStep/p_solidWall.raw .
diff --git a/validationAndVerificationSuite/validation/overset/NACA4412-airfoil/explicitOverset/save/nut b/validationAndVerificationSuite/validation/overset/NACA4412-airfoil/explicitOverset/save/nut
index eb5d24443..4cd1316d0 100644
--- a/validationAndVerificationSuite/validation/overset/NACA4412-airfoil/explicitOverset/save/nut
+++ b/validationAndVerificationSuite/validation/overset/NACA4412-airfoil/explicitOverset/save/nut
@@ -62,7 +62,7 @@ boundaryField
 
     airfoil
     {
-        type    nutWallFunction;
+        type    nutkWallFunction;
         Cmu     0.09;
         kappa   0.41;
         E       9.8;
diff --git a/validationAndVerificationSuite/validation/overset/NACA4412-airfoil/implicitConservativeOverset/0/nut b/validationAndVerificationSuite/validation/overset/NACA4412-airfoil/implicitConservativeOverset/0/nut
index eb5d24443..4cd1316d0 100644
--- a/validationAndVerificationSuite/validation/overset/NACA4412-airfoil/implicitConservativeOverset/0/nut
+++ b/validationAndVerificationSuite/validation/overset/NACA4412-airfoil/implicitConservativeOverset/0/nut
@@ -62,7 +62,7 @@ boundaryField
 
     airfoil
     {
-        type    nutWallFunction;
+        type    nutkWallFunction;
         Cmu     0.09;
         kappa   0.41;
         E       9.8;
diff --git a/validationAndVerificationSuite/validation/overset/NACA4412-airfoil/implicitConservativeOverset/Allclean b/validationAndVerificationSuite/validation/overset/NACA4412-airfoil/implicitConservativeOverset/Allclean
index 58fa70e4d..e8c03ae22 100755
--- a/validationAndVerificationSuite/validation/overset/NACA4412-airfoil/implicitConservativeOverset/Allclean
+++ b/validationAndVerificationSuite/validation/overset/NACA4412-airfoil/implicitConservativeOverset/Allclean
@@ -12,6 +12,7 @@ cleanCase
 \rm -rf surfaces
 \rm -f *raw
 \rm -rf logs nohup.out
+\rm -rf postProcessing
 
 mkdir constant/polyMesh
 cp -r save 0
diff --git a/validationAndVerificationSuite/validation/overset/NACA4412-airfoil/implicitConservativeOverset/Allrun b/validationAndVerificationSuite/validation/overset/NACA4412-airfoil/implicitConservativeOverset/Allrun
index 4c3bcb919..c3167bd24 100755
--- a/validationAndVerificationSuite/validation/overset/NACA4412-airfoil/implicitConservativeOverset/Allrun
+++ b/validationAndVerificationSuite/validation/overset/NACA4412-airfoil/implicitConservativeOverset/Allrun
@@ -10,14 +10,14 @@ application2="simpleOversetFoam"
 \cp -r ../oversetMeshes/backgroundMesh/constant/polyMesh constant/.
 
 # Merge meshes and clean up
-runApplication mergeMeshes .. explicitOverset . ../oversetMeshes/middleMesh
+runApplication mergeMeshes .. implicitConservativeOverset . ../oversetMeshes/middleMesh
 \rm -rf constant/polyMesh
 \mv 1/polyMesh constant
 rm -rf 1
 \rm -f constant/polyMesh/pointZones constant/polyMesh/pointZones.gz constant/polyMesh/faceZones constant/polyMesh/faceZones.gz constant/polyMesh/cellZones constant/polyMesh/cellZones.gz
 \mv log.mergeMeshes log.mergeMeshes-backgroundMiddle
 
-runApplication mergeMeshes .. explicitOverset . ../oversetMeshes/frontMesh
+runApplication mergeMeshes .. implicitConservativeOverset . ../oversetMeshes/frontMesh
 \rm -rf constant/polyMesh
 \mv 1/polyMesh constant
 rm -rf 1
@@ -46,4 +46,4 @@ runApplication $application2
 # Perform sampling
 runApplication sample -latestTime
 timeStep=$(grep "^endTime" system/controlDict | awk '{ print $2 }' | sed 's/;//g')
-cp -v surfaces/$timeStep/p_solidWall.raw .
+cp -v postProcessing/surfaces/$timeStep/p_solidWall.raw .
diff --git a/validationAndVerificationSuite/validation/overset/NACA4412-airfoil/implicitConservativeOverset/save/nut b/validationAndVerificationSuite/validation/overset/NACA4412-airfoil/implicitConservativeOverset/save/nut
index eb5d24443..4cd1316d0 100644
--- a/validationAndVerificationSuite/validation/overset/NACA4412-airfoil/implicitConservativeOverset/save/nut
+++ b/validationAndVerificationSuite/validation/overset/NACA4412-airfoil/implicitConservativeOverset/save/nut
@@ -62,7 +62,7 @@ boundaryField
 
     airfoil
     {
-        type    nutWallFunction;
+        type    nutkWallFunction;
         Cmu     0.09;
         kappa   0.41;
         E       9.8;
diff --git a/validationAndVerificationSuite/validation/overset/NACA4412-airfoil/implicitNonConservativeOverset/0/nut b/validationAndVerificationSuite/validation/overset/NACA4412-airfoil/implicitNonConservativeOverset/0/nut
index eb5d24443..4cd1316d0 100644
--- a/validationAndVerificationSuite/validation/overset/NACA4412-airfoil/implicitNonConservativeOverset/0/nut
+++ b/validationAndVerificationSuite/validation/overset/NACA4412-airfoil/implicitNonConservativeOverset/0/nut
@@ -62,7 +62,7 @@ boundaryField
 
     airfoil
     {
-        type    nutWallFunction;
+        type    nutkWallFunction;
         Cmu     0.09;
         kappa   0.41;
         E       9.8;
diff --git a/validationAndVerificationSuite/validation/overset/NACA4412-airfoil/implicitNonConservativeOverset/Allclean b/validationAndVerificationSuite/validation/overset/NACA4412-airfoil/implicitNonConservativeOverset/Allclean
index 58fa70e4d..e8c03ae22 100755
--- a/validationAndVerificationSuite/validation/overset/NACA4412-airfoil/implicitNonConservativeOverset/Allclean
+++ b/validationAndVerificationSuite/validation/overset/NACA4412-airfoil/implicitNonConservativeOverset/Allclean
@@ -12,6 +12,7 @@ cleanCase
 \rm -rf surfaces
 \rm -f *raw
 \rm -rf logs nohup.out
+\rm -rf postProcessing
 
 mkdir constant/polyMesh
 cp -r save 0
diff --git a/validationAndVerificationSuite/validation/overset/NACA4412-airfoil/implicitNonConservativeOverset/Allrun b/validationAndVerificationSuite/validation/overset/NACA4412-airfoil/implicitNonConservativeOverset/Allrun
index 4c3bcb919..2b68d4f86 100755
--- a/validationAndVerificationSuite/validation/overset/NACA4412-airfoil/implicitNonConservativeOverset/Allrun
+++ b/validationAndVerificationSuite/validation/overset/NACA4412-airfoil/implicitNonConservativeOverset/Allrun
@@ -10,14 +10,14 @@ application2="simpleOversetFoam"
 \cp -r ../oversetMeshes/backgroundMesh/constant/polyMesh constant/.
 
 # Merge meshes and clean up
-runApplication mergeMeshes .. explicitOverset . ../oversetMeshes/middleMesh
+runApplication mergeMeshes .. implicitNonConservativeOverset . ../oversetMeshes/middleMesh
 \rm -rf constant/polyMesh
 \mv 1/polyMesh constant
 rm -rf 1
 \rm -f constant/polyMesh/pointZones constant/polyMesh/pointZones.gz constant/polyMesh/faceZones constant/polyMesh/faceZones.gz constant/polyMesh/cellZones constant/polyMesh/cellZones.gz
 \mv log.mergeMeshes log.mergeMeshes-backgroundMiddle
 
-runApplication mergeMeshes .. explicitOverset . ../oversetMeshes/frontMesh
+runApplication mergeMeshes .. implicitNonConservativeOverset . ../oversetMeshes/frontMesh
 \rm -rf constant/polyMesh
 \mv 1/polyMesh constant
 rm -rf 1
@@ -46,4 +46,4 @@ runApplication $application2
 # Perform sampling
 runApplication sample -latestTime
 timeStep=$(grep "^endTime" system/controlDict | awk '{ print $2 }' | sed 's/;//g')
-cp -v surfaces/$timeStep/p_solidWall.raw .
+cp -v postProcessing/surfaces/$timeStep/p_solidWall.raw .
diff --git a/validationAndVerificationSuite/validation/overset/NACA4412-airfoil/implicitNonConservativeOverset/save/nut b/validationAndVerificationSuite/validation/overset/NACA4412-airfoil/implicitNonConservativeOverset/save/nut
index eb5d24443..4cd1316d0 100644
--- a/validationAndVerificationSuite/validation/overset/NACA4412-airfoil/implicitNonConservativeOverset/save/nut
+++ b/validationAndVerificationSuite/validation/overset/NACA4412-airfoil/implicitNonConservativeOverset/save/nut
@@ -62,7 +62,7 @@ boundaryField
 
     airfoil
     {
-        type    nutWallFunction;
+        type    nutkWallFunction;
         Cmu     0.09;
         kappa   0.41;
         E       9.8;
diff --git a/validationAndVerificationSuite/validation/overset/NACA4412-airfoil/noOverset/0/nut b/validationAndVerificationSuite/validation/overset/NACA4412-airfoil/noOverset/0/nut
index 6ca909b29..7d02f0461 100644
--- a/validationAndVerificationSuite/validation/overset/NACA4412-airfoil/noOverset/0/nut
+++ b/validationAndVerificationSuite/validation/overset/NACA4412-airfoil/noOverset/0/nut
@@ -37,7 +37,7 @@ boundaryField
     }
     solidWall
     {
-        type            nutWallFunction;
+        type            nutkWallFunction;
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
diff --git a/validationAndVerificationSuite/validation/overset/NACA4412-airfoil/noOverset/Allclean b/validationAndVerificationSuite/validation/overset/NACA4412-airfoil/noOverset/Allclean
index 10582d2e9..84cde0f91 100755
--- a/validationAndVerificationSuite/validation/overset/NACA4412-airfoil/noOverset/Allclean
+++ b/validationAndVerificationSuite/validation/overset/NACA4412-airfoil/noOverset/Allclean
@@ -9,5 +9,6 @@ cleanTimeDirectories
 \rm -rf forces
 \rm -f *raw
 \rm -rf logs nohup.out
+\rm -rf postProcessing
 
 cp -r save 0
diff --git a/validationAndVerificationSuite/validation/overset/NACA4412-airfoil/noOverset/Allrun b/validationAndVerificationSuite/validation/overset/NACA4412-airfoil/noOverset/Allrun
index 6237cfa3a..ab19634c5 100755
--- a/validationAndVerificationSuite/validation/overset/NACA4412-airfoil/noOverset/Allrun
+++ b/validationAndVerificationSuite/validation/overset/NACA4412-airfoil/noOverset/Allrun
@@ -9,4 +9,4 @@ runApplication $application
 # Perform sampling
 runApplication sample -latestTime
 timeStep=$(grep "^endTime" system/controlDict | awk '{ print $2 }' | sed 's/;//g')
-cp -v surfaces/$timeStep/p_solidWall.raw .
+cp -v postProcessing/surfaces/$timeStep/p_solidWall.raw .
diff --git a/validationAndVerificationSuite/validation/overset/NACA4412-airfoil/noOverset/save/nut b/validationAndVerificationSuite/validation/overset/NACA4412-airfoil/noOverset/save/nut
index 6ca909b29..7d02f0461 100644
--- a/validationAndVerificationSuite/validation/overset/NACA4412-airfoil/noOverset/save/nut
+++ b/validationAndVerificationSuite/validation/overset/NACA4412-airfoil/noOverset/save/nut
@@ -37,7 +37,7 @@ boundaryField
     }
     solidWall
     {
-        type            nutWallFunction;
+        type            nutkWallFunction;
         Cmu             0.09;
         kappa           0.41;
         E               9.8;