From 852616ba88f5ccb209b8b598a826ed692f015fa6 Mon Sep 17 00:00:00 2001
From: sergio <sergio>
Date: Mon, 12 Jun 2017 13:53:52 -0700
Subject: [PATCH] interpolationTable: Correcting header documentation
 fanPressureFvPatchScalarField.H:  Correcting header documentation
 RAS/TJunctionFan/0.orig: Creating tutorial for fanPressure Adding pRef and
 pValue for tutorial createZeroDirectory/snappyMultiRegionHeater

---
 .../interpolationTable/interpolationTable.H     |  2 +-
 .../fanPressure/fanPressureFvPatchScalarField.H |  2 +-
 .../pimpleFoam/RAS/TJunctionFan/0.orig/p        | 17 +++++++++++------
 .../RAS/TJunctionFan/constant/FluxVsdP.dat      |  5 +++++
 .../system/bottomAir/fvSolution                 |  2 ++
 .../system/topAir/fvSolution                    |  2 ++
 6 files changed, 22 insertions(+), 8 deletions(-)
 create mode 100644 tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/constant/FluxVsdP.dat

diff --git a/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.H b/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.H
index 6ba129558ac..09f2e744425 100644
--- a/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.H
+++ b/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.H
@@ -42,7 +42,7 @@ Description
     Read csv format:
     \verbatim
         readerType      csv;
-        fileName        "$FOAM_CASE/constant/p0vsTime.csv";
+        file            "$FOAM_CASE/constant/p0vsTime.csv";
         hasHeaderLine   true;   // skip first line
         timeColumn      0;      // time is in column 0
         valueColumns    (1);    // value starts in column 1
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fanPressure/fanPressureFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/fanPressure/fanPressureFvPatchScalarField.H
index e8744b192c9..caaf220b7c8 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fanPressure/fanPressureFvPatchScalarField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fanPressure/fanPressureFvPatchScalarField.H
@@ -52,7 +52,7 @@ Description
 Usage
     \table
         Property     | Description             | Required    | Default value
-        fileName     | fan curve file name     | yes         |
+        file         | fan curve file name     | yes         |
         outOfBounds  | out of bounds handling  | yes         |
         direction    | direction of flow through fan [in/out] | yes |
         p0           | environmental total pressure | yes    |
diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/0.orig/p b/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/0.orig/p
index 8260a694a24..ea329891574 100644
--- a/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/0.orig/p
+++ b/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/0.orig/p
@@ -23,12 +23,17 @@ boundaryField
 {
     inlet
     {
-        type            uniformTotalPressure;
-        p0              table
-        (
-            (0 10)
-            (1 40)
-        );
+        type            fanPressure;
+        outOfBounds     clamp;
+        direction       in;
+        readerType      openFoam;
+        hasHeaderLine   true;
+        file            "$FOAM_CASE/constant/FluxVsdP.dat";
+        //nonDimensional  true;
+        //rpm             300;
+        //dm              2e-2;
+        outOfBounds     clamp;
+        p0              uniform 30;
     }
     outlet1
     {
diff --git a/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/constant/FluxVsdP.dat b/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/constant/FluxVsdP.dat
new file mode 100644
index 00000000000..94cdf398acb
--- /dev/null
+++ b/tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/constant/FluxVsdP.dat
@@ -0,0 +1,5 @@
+(
+    (0      20)
+    (0.0023 10)
+    (0.003  5)
+);
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/bottomAir/fvSolution b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/bottomAir/fvSolution
index 99a5b3879c7..0c04403a673 100644
--- a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/bottomAir/fvSolution
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/bottomAir/fvSolution
@@ -68,6 +68,8 @@ PIMPLE
     momentumPredictor   on;
     nCorrectors         2;
     nNonOrthogonalCorrectors 0;
+    pRefCell            0;
+    pRefValue           1e5;
 }
 
 relaxationFactors
diff --git a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/topAir/fvSolution b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/topAir/fvSolution
index 7f5e19a75e5..cf4dd593b86 100644
--- a/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/topAir/fvSolution
+++ b/tutorials/preProcessing/createZeroDirectory/snappyMultiRegionHeater/system/topAir/fvSolution
@@ -68,6 +68,8 @@ PIMPLE
     momentumPredictor   on;
     nCorrectors         2;
     nNonOrthogonalCorrectors 0;
+    pRefCell            0;
+    pRefValue           1e5;
 }
 
 relaxationFactors
-- 
GitLab