Merge remote-tracking branch 'origin/develop' into develop

applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H

@@ -3,7 +3,6 @@ PtrList<rhoReactionThermo> thermoFluid(fluidRegions.size());
 PtrList<volScalarField> rhoFluid(fluidRegions.size());
 PtrList<volVectorField> UFluid(fluidRegions.size());
 PtrList<surfaceScalarField> phiFluid(fluidRegions.size());
-PtrList<uniformDimensionedVectorField> gFluid(fluidRegions.size());
 PtrList<uniformDimensionedScalarField> hRefFluid(fluidRegions.size());
 PtrList<volScalarField> ghFluid(fluidRegions.size());
 PtrList<surfaceScalarField> ghfFluid(fluidRegions.size());
@@ -26,6 +25,8 @@ PtrList<fv::options> fluidFvOptions(fluidRegions.size());
 List<label> pRefCellFluid(fluidRegions.size());
 List<scalar> pRefValueFluid(fluidRegions.size());
 
+const uniformDimensionedVectorField& g = meshObjects::gravity::New(runTime);
+
 // Populate fluid field pointer lists
 forAll(fluidRegions, i)
 {
@@ -90,23 +91,6 @@ forAll(fluidRegions, i)
         )
     );
 
-    Info<< "    Adding to gFluid\n" << endl;
-    gFluid.set
-    (
-        i,
-        new uniformDimensionedVectorField
-        (
-            IOobject
-            (
-                "g",
-                runTime.constant(),
-                fluidRegions[i],
-                IOobject::MUST_READ,
-                IOobject::NO_WRITE
-            )
-        )
-    );
-
     Info<< "    Adding to hRefFluid\n" << endl;
     hRefFluid.set
     (
@@ -127,10 +111,9 @@ forAll(fluidRegions, i)
 
     dimensionedScalar ghRef
     (
-        mag(gFluid[i].value()) > SMALL
+        mag(g.value()) > SMALL
-      ? gFluid[i]
+      ? g & (cmptMag(g.value())/mag(g.value()))*hRefFluid[i]
-          & (cmptMag(gFluid[i].value())/mag(gFluid[i].value()))*hRefFluid[i]
+      : dimensionedScalar("ghRef", g.dimensions()*dimLength, 0)
-      : dimensionedScalar("ghRef", gFluid[i].dimensions()*dimLength, 0)
     );
 
     Info<< "    Adding to ghFluid\n" << endl;
@@ -140,7 +123,7 @@ forAll(fluidRegions, i)
         new volScalarField
         (
             "gh",
-            (gFluid[i] & fluidRegions[i].C()) - ghRef
+            (g & fluidRegions[i].C()) - ghRef
         )
     );
 
@@ -151,7 +134,7 @@ forAll(fluidRegions, i)
         new surfaceScalarField
         (
             "ghf",
-            (gFluid[i] & fluidRegions[i].Cf()) - ghRef
+            (g & fluidRegions[i].Cf()) - ghRef
         )
     );
 

applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H

@@ -36,7 +36,6 @@
 
     volScalarField& p_rgh = p_rghFluid[i];
 
-    const dimensionedVector& g = gFluid[i];
     const volScalarField& gh = ghFluid[i];
     const surfaceScalarField& ghf = ghfFluid[i];
 

tutorials/heatTransfer/chtMultiRegionSimpleFoam/externalCoupledHeater/constant/topAir/g

@@ -1 +0,0 @@
-../bottomWater/g

tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeaterRadiation/constant/topAir/g

@@ -1 +0,0 @@
-../bottomAir/g

tutorials/multiphase/interFoam/laminar/waveMakerPiston/0.orig/U

@@ -0,0 +1,59 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v1806                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volVectorField;
+    location    "0";
+    object      U;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -1 0 0 0 0];
+
+internalField   uniform (0 0 0);
+
+boundaryField
+{
+    bottom1
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+    bottom2
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+    leftwall
+    {
+        type            movingWallVelocity;
+        value           uniform (0 0 0);
+    }
+    back
+    {
+        type            empty;
+    }
+    front
+    {
+        type            empty;
+    }
+    rightwall
+    {
+        type            waveVelocity;
+        value           uniform (0 0 0);
+    }
+    top
+    {
+          type          pressureInletOutletVelocity;
+          value         uniform (0 0 0);
+    }
+}
+
+// ************************************************************************* //

tutorials/multiphase/interFoam/laminar/waveMakerPiston/0.orig/alpha.water

@@ -0,0 +1,55 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v1806                                 |
+|   \\  /    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
+{
+    bottom1
+    {
+        type            zeroGradient;
+    }
+    bottom2
+    {
+        type            zeroGradient;
+    }
+    front
+    {
+        type            empty;
+    }
+    back
+    {
+        type            empty;
+    }
+    leftwall
+    {
+        type            zeroGradient;
+    }
+    rightwall
+    {
+        type            zeroGradient;
+    }
+    top
+    {
+        type            inletOutlet;
+        inletValue      uniform 0;
+        value           uniform 0;
+    }
+}
+
+// ************************************************************************* //

tutorials/multiphase/interFoam/laminar/waveMakerPiston/0.orig/p_rgh

@@ -0,0 +1,65 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v1806                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      p_rgh;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [1 -1 -2 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    bottom1
+    {
+        type            fixedFluxPressure;
+        value           uniform 0;
+    }
+    bottom2
+    {
+        type            fixedFluxPressure;
+        value           uniform 0;
+    }
+    front
+    {
+        type            empty;
+    }
+    back
+    {
+        type            empty;
+    }
+    leftwall
+    {
+        type            fixedFluxPressure;
+        value           uniform 0;
+    }
+    rightwall
+    {
+        type            fixedFluxPressure;
+        value           uniform 0;
+    }
+    top
+    {
+        type            totalPressure;
+        U               U;
+        phi             phi;
+        rho             rho;
+        psi             none;
+        gamma           1;
+        p0              uniform 0;
+        value           uniform 0;
+    }
+}
+
+// ************************************************************************* //

tutorials/multiphase/interFoam/laminar/waveMakerPiston/0.orig/pointDisplacement

@@ -0,0 +1,66 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v1806                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       pointVectorField;
+    object      pointDisplacement;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 0 0 0 0 0];
+
+internalField   uniform (0 0 0);
+
+boundaryField
+{
+    bottom1
+    {
+        type            zeroGradient;
+    }
+    bottom2
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+    leftwall
+    {
+        type            waveMaker; 
+        value           uniform (0 0 0);
+
+        motionType      piston;
+        x0              (0 0 0);
+        n               (1 0 0);
+        waveHeight      0.06;
+        initialDepth    0.25;
+        wavePeriod      2.0;
+        rampTime        2.0;
+        wavePhase       0;
+    }
+    back
+    {
+        type            empty;
+    }
+    front
+    {
+        type            empty;
+    }
+    rightwall
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+    top
+    {
+        type            zeroGradient;
+    }
+}
+
+
+// ************************************************************************* //

tutorials/multiphase/interFoam/laminar/waveMakerPiston/Allclean

@@ -0,0 +1,7 @@
+#!/bin/sh
+cd ${0%/*} || exit 1                        # Run from this directory
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions  # Tutorial clean functions
+
+cleanCase0
+
+#------------------------------------------------------------------------------

tutorials/multiphase/interFoam/laminar/waveMakerPiston/Allrun

@@ -0,0 +1,15 @@
+#!/bin/sh
+cd ${0%/*} || exit 1                        # Run from this directory
+. $WM_PROJECT_DIR/bin/tools/RunFunctions    # Tutorial run functions
+
+restore0Dir
+
+runApplication blockMesh
+
+runApplication decomposePar
+
+runParallel setFields
+
+runParallel $(getApplication)
+
+#------------------------------------------------------------------------------

tutorials/multiphase/interFoam/laminar/waveMakerPiston/system/decomposeParDict

@@ -9,15 +9,20 @@ FoamFile
 {
     version     2.0;
     format      ascii;
-    class       uniformDimensionedVectorField;
+    class       dictionary;
-    location    "constant";
+    location    "system";
-    object      g;
+    object      decomposeParDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions      [0 1 -2 0 0 0 0];
+numberOfSubdomains 4;
-//value           ( 0 0 9.81);
-value           ( 0 0 0);
 
+method          simple;
+
+simpleCoeffs
+{
+    n               ( 4 1 1 );
+    order           xyz;
+}
 
 // ************************************************************************* //