Merge branch 'develop' of develop.openfoam.com:Development/OpenFOAM-plus into develop

Conflicts: tutorials/basic/overLaplacianDyMFoam/heatTransfer/0.orig/T tutorials/basic/overLaplacianDyMFoam/heatTransfer/0.orig/zoneID
2025-11-28 03:28:01 +00:00 · 2017-06-22 09:48:31 +01:00
parent 00cbae5126 57346f63e9
commit e17e8e4e96
246 changed files with 8730 additions and 215 deletions
--- a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/U
+++ b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/U
@ -22,8 +22,7 @@ internalField   uniform $flowVelocity;

 boundaryField
 {
-    //- Set patchGroups for constraint patches
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"

    overset
    {
--- a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/epsilon
+++ b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/epsilon
@ -22,8 +22,7 @@ internalField   uniform $turbulentEpsilon;

 boundaryField
 {
-    //- Set patchGroups for constraint patches
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"

    overset
    {
--- a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/k
+++ b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/k
@ -22,8 +22,7 @@ internalField   uniform $turbulentKE;

 boundaryField
 {
-    //- Set patchGroups for constraint patches
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"

    overset
    {
--- a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/nut
+++ b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/nut
@ -20,8 +20,7 @@ internalField   uniform 0;

 boundaryField
 {
-    //- Set patchGroups for constraint patches
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"

    overset
    {
--- a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/p
+++ b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/p
@ -22,8 +22,7 @@ internalField   uniform $pressure;

 boundaryField
 {
-    //- Set patchGroups for constraint patches
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"

    overset
    {
--- a/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/zoneID
+++ b/tutorials/incompressible/overPimpleDyMFoam/cylinder/cylinderAndBackground/0.orig/zoneID
@ -20,8 +20,7 @@ internalField   uniform 0;

 boundaryField
 {
-    //- Set patchGroups for constraint patches
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"

    overset
    {
--- a/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/U
+++ b/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/U
@ -20,8 +20,7 @@ internalField   uniform (0 0 0);

 boundaryField
 {
-    //- Set patchGroups for constraint patches
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"

    walls
    {
--- a/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/epsilon
+++ b/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/epsilon
@ -21,8 +21,7 @@ internalField   uniform 200;

 boundaryField
 {
-    //- Set patchGroups for constraint patches
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"

    "(walls|hole)"
    {
--- a/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/k
+++ b/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/k
@ -20,8 +20,7 @@ internalField   uniform 0.2;

 boundaryField
 {
-    //- Set patchGroups for constraint patches
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"

    "(walls|hole)"
    {
--- a/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/nuTilda
+++ b/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/nuTilda
@ -20,8 +20,7 @@ internalField   uniform 0;

 boundaryField
 {
-    //- Set patchGroups for constraint patches
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"

    overset
    {
--- a/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/nut
+++ b/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/nut
@ -20,8 +20,7 @@ internalField   uniform 0;

 boundaryField
 {
-    //- Set patchGroups for constraint patches
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"

    "(walls|hole)"
    {
--- a/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/p
+++ b/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/p
@ -20,8 +20,7 @@ internalField   uniform 0;

 boundaryField
 {
-    //- Set patchGroups for constraint patches
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"

    "(walls|hole)"
    {
--- a/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/zoneID
+++ b/tutorials/incompressible/overPimpleDyMFoam/simpleRotor/0.orig/zoneID
@ -20,8 +20,7 @@ internalField   uniform 0;

 boundaryField
 {
-    //- Set patchGroups for constraint patches
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"

    ".*"
    {
--- a/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/0.orig/U
+++ b/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/0.orig/U
@ -20,8 +20,7 @@ internalField   uniform (0.1 0 0);

 boundaryField
 {
-    //- Set patchGroups for constraint patches
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"

    walls
    {
--- a/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/0.orig/p
+++ b/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/0.orig/p
@ -20,8 +20,7 @@ internalField   uniform 0;

 boundaryField
 {
-    //- Set patchGroups for constraint patches
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"

    "(walls|hole)"
    {
--- a/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/0.orig/zoneID
+++ b/tutorials/incompressible/overPimpleDyMFoam/twoSimpleRotors/0.orig/zoneID
@ -20,8 +20,7 @@ internalField   uniform 0;

 boundaryField
 {
-    //- Set patchGroups for constraint patches
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"

    overset
    {
--- a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/U
+++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/U
@ -22,8 +22,7 @@ internalField   uniform $flowVelocity;

 boundaryField
 {
-    //- Set patchGroups for constraint patches
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"

    walls
    {
--- a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/epsilon
+++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/epsilon
@ -22,8 +22,7 @@ internalField   uniform $turbulentEpsilon;

 boundaryField
 {
-    //- Set patchGroups for constraint patches
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"

    wall
    {
--- a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/k
+++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/k
@ -22,8 +22,7 @@ internalField   uniform $turbulentKE;

 boundaryField
 {
-    //- Set patchGroups for constraint patches
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"

    wall
    {
--- a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/nuTilda
+++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/nuTilda
@ -20,8 +20,7 @@ internalField   uniform 0;

 boundaryField
 {
-    //- Set patchGroups for constraint patches
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"

    ".*"
    {
--- a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/nut
+++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/nut
@ -20,8 +20,7 @@ internalField   uniform 0;

 boundaryField
 {
-    //- Set patchGroups for constraint patches
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"

    wall
    {
--- a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/omega
+++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/omega
@ -22,8 +22,7 @@ internalField   uniform $turbulentOmega;

 boundaryField
 {
-    //- Set patchGroups for constraint patches
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"

    wall
    {
--- a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/p
+++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/p
@ -22,8 +22,7 @@ internalField   uniform $pressure;

 boundaryField
 {
-    //- Set patchGroups for constraint patches
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"

    wall
    {
--- a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/zoneID
+++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/0.orig/zoneID
@ -20,8 +20,7 @@ internalField   uniform 0;

 boundaryField
 {
-    //- Set patchGroups for constraint patches
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"

    ".*"
    {
--- a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/0/U
+++ b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/0/U
@ -21,7 +21,7 @@ internalField   uniform (0 0 0);

 boundaryField
 {
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"

    inlet
    {
--- a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/0/epsilon
+++ b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/0/epsilon
@ -21,7 +21,7 @@ internalField   uniform 1.8e-3;

 boundaryField
 {
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"

    inlet
    {
--- a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/0/k
+++ b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/0/k
@ -21,7 +21,7 @@ internalField   uniform 3.75e-3;

 boundaryField
 {
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"

    inlet
    {
--- a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/0/nut
+++ b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/0/nut
@ -21,7 +21,7 @@ internalField   uniform 0;

 boundaryField
 {
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"

    inlet
    {
--- a/tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/0/p
+++ b/tutorials/incompressible/pimpleDyMFoam/oscillatingInletPeriodicAMI2D/0/p
@ -21,7 +21,7 @@ internalField   uniform 0;

 boundaryField
 {
-    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+    #includeEtc "caseDicts/setConstraintTypes"

    inlet
    {
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/0.orig/U
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/0.orig/U
@ -21,7 +21,6 @@ internalField   uniform (0 0 0);

 boundaryField
 {
-    //- Set patchGroups for constraint patches
    #includeEtc "caseDicts/setConstraintTypes"

    inlet
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/0.orig/epsilon
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/0.orig/epsilon
@ -21,7 +21,6 @@ internalField   uniform 0.0495;

 boundaryField
 {
-    //- Set patchGroups for constraint patches
    #includeEtc "caseDicts/setConstraintTypes"

    inlet
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/0.orig/k
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/0.orig/k
@ -21,7 +21,6 @@ internalField   uniform 0.06;

 boundaryField
 {
-    //- Set patchGroups for constraint patches
    #includeEtc "caseDicts/setConstraintTypes"

    inlet
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/0.orig/nut
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/0.orig/nut
@ -21,7 +21,6 @@ internalField   uniform 0;

 boundaryField
 {
-    //- Set patchGroups for constraint patches
    #includeEtc "caseDicts/setConstraintTypes"

    inlet
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/0.orig/p
+++ b/tutorials/incompressible/pimpleDyMFoam/propeller/0.orig/p
@ -21,7 +21,6 @@ internalField   uniform 0;

 boundaryField
 {
-    //- Set patchGroups for constraint patches
    #includeEtc "caseDicts/setConstraintTypes"

    inlet
--- a/tutorials/incompressible/pisoFoam/laminar/porousBlockage/0/U
+++ b/tutorials/incompressible/pisoFoam/laminar/porousBlockage/0/U
@ -20,7 +20,6 @@ internalField   uniform (1 0 0);

 boundaryField
 {
-    //- Set patchGroups for constraint patches
    #includeEtc "caseDicts/setConstraintTypes"

    inlet
--- a/tutorials/incompressible/pisoFoam/laminar/porousBlockage/0/p
+++ b/tutorials/incompressible/pisoFoam/laminar/porousBlockage/0/p
@ -20,7 +20,6 @@ internalField   uniform 0;

 boundaryField
 {
-    //- Set patchGroups for constraint patches
    #includeEtc "caseDicts/setConstraintTypes"

    inlet
--- a/tutorials/incompressible/simpleFoam/motorBike/0.orig/U
+++ b/tutorials/incompressible/simpleFoam/motorBike/0.orig/U
@ -23,7 +23,6 @@ internalField   uniform $flowVelocity;

 boundaryField
 {
-    //- Set patchGroups for constraint patches
    #includeEtc "caseDicts/setConstraintTypes"

    #include "include/fixedInlet"
--- a/tutorials/incompressible/simpleFoam/motorBike/0.orig/k
+++ b/tutorials/incompressible/simpleFoam/motorBike/0.orig/k
@ -22,7 +22,6 @@ internalField   uniform $turbulentKE;

 boundaryField
 {
-    //- Set patchGroups for constraint patches
    #includeEtc "caseDicts/setConstraintTypes"

    //- Define inlet conditions
--- a/tutorials/incompressible/simpleFoam/motorBike/0.orig/nut
+++ b/tutorials/incompressible/simpleFoam/motorBike/0.orig/nut
@ -21,7 +21,6 @@ internalField   uniform 0;

 boundaryField
 {
-    //- Set patchGroups for constraint patches
    #includeEtc "caseDicts/setConstraintTypes"

    frontAndBack
--- a/tutorials/incompressible/simpleFoam/motorBike/0.orig/omega
+++ b/tutorials/incompressible/simpleFoam/motorBike/0.orig/omega
@ -22,7 +22,6 @@ internalField   uniform $turbulentOmega;

 boundaryField
 {
-    //- Set patchGroups for constraint patches
    #includeEtc "caseDicts/setConstraintTypes"

    #include "include/fixedInlet"
--- a/tutorials/incompressible/simpleFoam/motorBike/0.orig/p
+++ b/tutorials/incompressible/simpleFoam/motorBike/0.orig/p
@ -22,7 +22,6 @@ internalField   uniform $pressure;

 boundaryField
 {
-    //- Set patchGroups for constraint patches
    #includeEtc "caseDicts/setConstraintTypes"

    inlet
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/0.orig/U
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/0.orig/U
@ -20,7 +20,6 @@ internalField   uniform (1 0 0);

 boundaryField
 {
-    //- Set patchGroups for constraint patches
    #includeEtc "caseDicts/setConstraintTypes"

    inlet
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/0.orig/epsilon
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/0.orig/epsilon
@ -21,7 +21,6 @@ internalField   uniform 1;

 boundaryField
 {
-    //- Set patchGroups for constraint patches
    #includeEtc "caseDicts/setConstraintTypes"

    inlet
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/0.orig/k
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/0.orig/k
@ -21,7 +21,6 @@ internalField   uniform 1;

 boundaryField
 {
-    //- Set patchGroups for constraint patches
    #includeEtc "caseDicts/setConstraintTypes"

    inlet
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/0.orig/nuTilda
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/0.orig/nuTilda
@ -20,7 +20,6 @@ internalField   uniform 0;

 boundaryField
 {
-    //- Set patchGroups for constraint patches
    #includeEtc "caseDicts/setConstraintTypes"

    inlet
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/0.orig/nut
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/0.orig/nut
@ -21,7 +21,6 @@ internalField   uniform 0;

 boundaryField
 {
-    //- Set patchGroups for constraint patches
    #includeEtc "caseDicts/setConstraintTypes"

    inlet
--- a/tutorials/incompressible/simpleFoam/pipeCyclic/0.orig/p
+++ b/tutorials/incompressible/simpleFoam/pipeCyclic/0.orig/p
@ -20,7 +20,6 @@ internalField   uniform 0;

 boundaryField
 {
-    //- Set patchGroups for constraint patches
    #includeEtc "caseDicts/setConstraintTypes"

    inlet