From d76820dc57beb42611876ccd9e82bcdaed750649 Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Wed, 8 Jul 2009 17:09:51 +0100
Subject: [PATCH] Changed g from being read from environmentalProperties to
being read directly as a uniformDimensionedVectorField.
---
.../solvers/combustion/PDRFoam/PDRFoam.C | 2 +-
.../combustion/PDRFoam/PDRFoamAutoRefine.C | 48 +++++++++----------
.../solvers/combustion/XiFoam/XiFoam.C | 2 +-
.../combustion/dieselEngineFoam/createSpray.H | 2 +-
.../dieselEngineFoam/dieselEngineFoam.C | 2 +-
.../combustion/dieselFoam/dieselFoam.C | 2 +-
.../combustion/reactingFoam/reactingFoam.C | 2 +-
.../rhoReactingFoam/rhoReactingFoam.C | 2 +-
.../buoyantBoussinesqPisoFoam.C | 2 +-
.../buoyantBoussinesqSimpleFoam.C | 2 +-
.../buoyantPisoFoam/buoyantPisoFoam.C | 2 +-
.../buoyantSimpleFoam/buoyantSimpleFoam.C | 2 +-
.../buoyantSimpleRadiationFoam.C | 2 +-
.../fluid/createFluidFields.H | 18 +++++++
.../fluid/createFluidMeshes.H | 23 ---------
.../fluid/setRegionFluidFields.H | 8 +---
...ties.H => readGravitationalAcceleration.H} | 12 ++---
.../shallowWaterFoam/shallowWaterFoam.C | 2 +-
.../coalChemistryFoam/coalChemistryFoam.C | 2 +-
.../porousExplicitSourceReactingParcelFoam.C | 2 +-
.../reactingParcelFoam/reactingParcelFoam.C | 2 +-
.../uncoupledKinematicParcelFoam.C | 2 +-
.../multiphase/bubbleFoam/bubbleFoam.C | 2 +-
.../compressibleInterDyMFoam.C | 2 +-
.../compressibleInterFoam.C | 2 +-
.../multiphase/interDyMFoam/interDyMFoam.C | 2 +-
.../solvers/multiphase/interFoam/interFoam.C | 2 +-
.../interPhaseChangeFoam.C | 2 +-
.../multiphaseInterFoam/multiphaseInterFoam.C | 2 +-
.../multiphase/settlingFoam/settlingFoam.C | 2 +-
.../twoLiquidMixingFoam/twoLiquidMixingFoam.C | 2 +-
.../twoPhaseEulerFoam/twoPhaseEulerFoam.C | 2 +-
.../cfdTools/general/include/fvCFD.H | 1 +
.../include/readEnvironmentalProperties.H | 15 ------
.../include/readGravitationalAcceleration.H | 12 +++++
.../buoyantPressureFvPatchScalarField.C | 7 ++-
...ityHydrostaticPressureFvPatchScalarField.C | 8 ++--
src/lagrangian/dieselSpray/spray/spray.C | 6 +--
src/lagrangian/dieselSpray/spray/spray.H | 4 +-
.../alphaFixedPressureFvPatchScalarField.C | 7 ++-
.../constant/environmentalProperties | 21 --------
.../XiFoam/les/pitzDaily/constant/g} | 6 ++-
.../constant/{environmentalProperties => g} | 5 +-
.../ras/moriyoshiHomogeneous/constant/g} | 5 +-
.../dieselFoam/aachenBomb/constant/g} | 5 +-
.../kivaTest/constant/g} | 5 +-
.../hotRoom/constant/environmentalProperties | 21 --------
.../hotRoom/constant/g} | 5 +-
.../hotRoom/constant/environmentalProperties | 21 --------
.../hotRoom/constant/g | 22 +++++++++
.../constant/{environmentalProperties => g} | 5 +-
.../hotRoom/constant/environmentalProperties | 21 --------
.../buoyantPisoFoam/hotRoom/constant/g | 22 +++++++++
.../hotRoom/constant/environmentalProperties | 21 --------
.../buoyantSimpleFoam/hotRoom/constant/g | 22 +++++++++
.../constant/environmentalProperties | 21 --------
.../hotRadiationRoom/constant/g | 22 +++++++++
.../constant/environmentalProperties | 21 --------
.../hotRadiationRoomFvDOM/constant/g | 22 +++++++++
.../bottomAir/environmentalProperties | 19 --------
.../multiRegionHeater/constant/bottomAir/g | 20 ++++++++
.../constant/topAir/environmentalProperties | 1 -
.../multiRegionHeater/constant/topAir/g | 0
.../constant/{environmentalProperties => g} | 7 +--
.../simplifiedSiwek/constant/g} | 5 +-
.../filter/constant/g} | 5 +-
.../evaporationTest/constant/g} | 5 +-
.../rhoPisoTwinParcelFoam.C | 2 +-
.../constant/environmentalProperties | 21 --------
.../simplifiedSiwek/constant/g | 22 +++++++++
.../bottomAir/environmentalProperties | 19 --------
.../multiRegionMesh/constant/bottomAir/g | 20 ++++++++
.../constant/topAir/environmentalProperties | 1 -
.../multiRegionMesh/constant/topAir/g | 0
.../constant/environmentalProperties | 21 --------
.../bubbleFoam/bubbleColumn/constant/g | 22 +++++++++
.../constant/{environmentalProperties => g} | 5 +-
.../constant/{environmentalProperties => g} | 5 +-
.../constant/environmentalProperties | 21 --------
.../ras/damBreakWithObstacle/constant/g | 22 +++++++++
.../constant/{environmentalProperties => g} | 5 +-
.../constant/environmentalProperties | 21 --------
.../ras/sloshingTank2D3DoF/constant/g | 22 +++++++++
.../constant/environmentalProperties | 21 --------
.../ras/sloshingTank3D/constant/g | 22 +++++++++
.../constant/environmentalProperties | 21 --------
.../ras/sloshingTank3D3DoF/constant/g | 22 +++++++++
.../constant/environmentalProperties | 21 --------
.../ras/sloshingTank3D6DoF/constant/g | 22 +++++++++
.../MRFInterFoam/MRFInterFoam/MRFInterFoam.C | 2 +-
.../MRFInterFoam/mixerVessel2D/constant/g | 21 ++++++++
.../damBreak/constant/environmentalProperties | 21 --------
.../interFoam/laminar/damBreak/constant/g | 22 +++++++++
.../interFoam/les/nozzleFlow2D/constant/g | 22 +++++++++
.../damBreak/constant/environmentalProperties | 21 --------
.../interFoam/ras/damBreak/constant/g | 22 +++++++++
.../constant/environmentalProperties | 21 --------
.../laminar/damBreak4phase/constant/g | 22 +++++++++
.../constant/environmentalProperties | 21 --------
.../laminar/damBreak4phaseFine/constant/g | 22 +++++++++
.../ras/dahl/constant/environmentalProperties | 21 --------
.../settlingFoam/ras/dahl/constant/g | 22 +++++++++
.../tank3D/constant/environmentalProperties | 21 --------
.../settlingFoam/ras/tank3D/constant/g | 22 +++++++++
.../twoPhaseEulerFoam/bed/constant/g} | 5 +-
.../bed2/constant/environmentalProperties | 21 --------
.../twoPhaseEulerFoam/bed2/constant/g | 22 +++++++++
.../constant/environmentalProperties | 21 --------
.../twoPhaseEulerFoam/bubbleColumn/constant/g | 22 +++++++++
109 files changed, 676 insertions(+), 654 deletions(-)
rename applications/solvers/incompressible/shallowWaterFoam/{readEnvironmentalProperties.H => readGravitationalAcceleration.H} (50%)
delete mode 100644 src/finiteVolume/cfdTools/general/include/readEnvironmentalProperties.H
create mode 100644 src/finiteVolume/cfdTools/general/include/readGravitationalAcceleration.H
delete mode 100644 tutorials/combustion/XiFoam/les/pitzDaily/constant/environmentalProperties
rename tutorials/{multiphase/interFoam/MRFInterFoam/mixerVessel2D/constant/environmentalProperties => combustion/XiFoam/les/pitzDaily/constant/g} (90%)
rename tutorials/combustion/XiFoam/les/pitzDaily3D/constant/{environmentalProperties => g} (90%)
rename tutorials/{multiphase/interFoam/les/nozzleFlow2D/constant/environmentalProperties => combustion/XiFoam/ras/moriyoshiHomogeneous/constant/g} (90%)
rename tutorials/{multiphase/twoPhaseEulerFoam/bed/constant/environmentalProperties => combustion/dieselFoam/aachenBomb/constant/g} (90%)
rename tutorials/combustion/{XiFoam/ras/moriyoshiHomogeneous/constant/environmentalProperties => engineFoam/kivaTest/constant/g} (90%)
delete mode 100644 tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/constant/environmentalProperties
rename tutorials/{combustion/engineFoam/kivaTest/constant/environmentalProperties => heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/constant/g} (90%)
delete mode 100644 tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/environmentalProperties
create mode 100644 tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/g
rename tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/{environmentalProperties => g} (90%)
delete mode 100644 tutorials/heatTransfer/buoyantPisoFoam/hotRoom/constant/environmentalProperties
create mode 100644 tutorials/heatTransfer/buoyantPisoFoam/hotRoom/constant/g
delete mode 100644 tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/environmentalProperties
create mode 100644 tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/g
delete mode 100644 tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/environmentalProperties
create mode 100644 tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/g
delete mode 100644 tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/environmentalProperties
create mode 100644 tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/g
delete mode 100644 tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/environmentalProperties
create mode 100644 tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/g
delete mode 120000 tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/environmentalProperties
create mode 100644 tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/g
rename tutorials/incompressible/shallowWaterFoam/squareBump/constant/{environmentalProperties => g} (84%)
rename tutorials/lagrangian/{porousExplicitSourceReactingParcelFoam/filter/constant/environmentalProperties => coalChemistryFoam/simplifiedSiwek/constant/g} (90%)
rename tutorials/lagrangian/{reactingParcelFoam/evaporationTest/constant/environmentalProperties => porousExplicitSourceReactingParcelFoam/filter/constant/g} (90%)
rename tutorials/lagrangian/{coalChemistryFoam/simplifiedSiwek/constant/environmentalProperties => reactingParcelFoam/evaporationTest/constant/g} (89%)
delete mode 100644 tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/environmentalProperties
create mode 100644 tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/g
delete mode 100644 tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/bottomAir/environmentalProperties
create mode 100644 tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/bottomAir/g
delete mode 120000 tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/topAir/environmentalProperties
create mode 100644 tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/topAir/g
delete mode 100644 tutorials/multiphase/bubbleFoam/bubbleColumn/constant/environmentalProperties
create mode 100644 tutorials/multiphase/bubbleFoam/bubbleColumn/constant/g
rename tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/{environmentalProperties => g} (89%)
rename tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/{environmentalProperties => g} (89%)
delete mode 100644 tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/environmentalProperties
create mode 100644 tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/g
rename tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/{environmentalProperties => g} (89%)
delete mode 100644 tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/environmentalProperties
create mode 100644 tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/g
delete mode 100644 tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/environmentalProperties
create mode 100644 tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/g
delete mode 100644 tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/environmentalProperties
create mode 100644 tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/g
delete mode 100644 tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/environmentalProperties
create mode 100644 tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/g
create mode 100644 tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/constant/g
delete mode 100644 tutorials/multiphase/interFoam/laminar/damBreak/constant/environmentalProperties
create mode 100644 tutorials/multiphase/interFoam/laminar/damBreak/constant/g
create mode 100644 tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/g
delete mode 100644 tutorials/multiphase/interFoam/ras/damBreak/constant/environmentalProperties
create mode 100644 tutorials/multiphase/interFoam/ras/damBreak/constant/g
delete mode 100644 tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/environmentalProperties
create mode 100644 tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/g
delete mode 100644 tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/environmentalProperties
create mode 100644 tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/g
delete mode 100644 tutorials/multiphase/settlingFoam/ras/dahl/constant/environmentalProperties
create mode 100644 tutorials/multiphase/settlingFoam/ras/dahl/constant/g
delete mode 100644 tutorials/multiphase/settlingFoam/ras/tank3D/constant/environmentalProperties
create mode 100644 tutorials/multiphase/settlingFoam/ras/tank3D/constant/g
rename tutorials/{combustion/dieselFoam/aachenBomb/constant/environmentalProperties => multiphase/twoPhaseEulerFoam/bed/constant/g} (90%)
delete mode 100644 tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/environmentalProperties
create mode 100644 tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/g
delete mode 100644 tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/environmentalProperties
create mode 100644 tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/g
diff --git a/applications/solvers/combustion/PDRFoam/PDRFoam.C b/applications/solvers/combustion/PDRFoam/PDRFoam.C
index 58bea3ed998..61171f27b3a 100644
--- a/applications/solvers/combustion/PDRFoam/PDRFoam.C
+++ b/applications/solvers/combustion/PDRFoam/PDRFoam.C
@@ -75,7 +75,7 @@ int main(int argc, char *argv[])
#include "createTime.H"
#include "createMesh.H"
#include "readCombustionProperties.H"
- #include "readEnvironmentalProperties.H"
+ #include "readGravitationalAcceleration.H"
#include "createFields.H"
#include "initContinuityErrs.H"
#include "readTimeControls.H"
diff --git a/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C b/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
index 1320b19d314..9b0344165af 100644
--- a/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
+++ b/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
@@ -72,31 +72,31 @@ Description
int main(int argc, char *argv[])
{
-# include "setRootCase.H"
+ #include "setRootCase.H"
-# include "createTime.H"
-# include "createDynamicFvMesh.H"
-# include "readCombustionProperties.H"
-# include "readEnvironmentalProperties.H"
-# include "createFields.H"
-# include "readPISOControls.H"
-# include "initContinuityErrs.H"
-# include "readTimeControls.H"
-# include "setInitialDeltaT.H"
+ #include "createTime.H"
+ #include "createDynamicFvMesh.H"
+ #include "readCombustionProperties.H"
+ #include "readGravitationalAcceleration.H"
+ #include "createFields.H"
+ #include "readPISOControls.H"
+ #include "initContinuityErrs.H"
+ #include "readTimeControls.H"
+ #include "setInitialDeltaT.H"
-scalar StCoNum = 0.0;
+ scalar StCoNum = 0.0;
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+ // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
Info<< "\nStarting time loop\n" << endl;
while (runTime.run())
{
-# include "readTimeControls.H"
-# include "readPISOControls.H"
-# include "CourantNo.H"
+ #include "readTimeControls.H"
+ #include "readPISOControls.H"
+ #include "CourantNo.H"
-# include "setDeltaT.H"
+ #include "setDeltaT.H"
runTime++;
@@ -157,7 +157,7 @@ scalar StCoNum = 0.0;
// if (mesh.moving() || meshChanged)
// {
-//# include "correctPhi.H"
+// #include "correctPhi.H"
// }
// Make the fluxes relative to the mesh motion
@@ -165,23 +165,23 @@ scalar StCoNum = 0.0;
}
-# include "rhoEqn.H"
-# include "UEqn.H"
+ #include "rhoEqn.H"
+ #include "UEqn.H"
// --- PISO loop
for (int corr=1; corr<=nCorr; corr++)
{
-# include "bEqn.H"
-# include "ftEqn.H"
-# include "huEqn.H"
-# include "hEqn.H"
+ #include "bEqn.H"
+ #include "ftEqn.H"
+ #include "huEqn.H"
+ #include "hEqn.H"
if (!ign.ignited())
{
hu == h;
}
-# include "pEqn.H"
+ #include "pEqn.H"
}
turbulence->correct();
diff --git a/applications/solvers/combustion/XiFoam/XiFoam.C b/applications/solvers/combustion/XiFoam/XiFoam.C
index 13a464a7550..4c544b433e3 100644
--- a/applications/solvers/combustion/XiFoam/XiFoam.C
+++ b/applications/solvers/combustion/XiFoam/XiFoam.C
@@ -66,7 +66,7 @@ int main(int argc, char *argv[])
#include "createTime.H"
#include "createMesh.H"
#include "readCombustionProperties.H"
- #include "readEnvironmentalProperties.H"
+ #include "readGravitationalAcceleration.H"
#include "createFields.H"
#include "initContinuityErrs.H"
#include "readTimeControls.H"
diff --git a/applications/solvers/combustion/dieselEngineFoam/createSpray.H b/applications/solvers/combustion/dieselEngineFoam/createSpray.H
index 4bc1a32f11b..ea4d0121b69 100644
--- a/applications/solvers/combustion/dieselEngineFoam/createSpray.H
+++ b/applications/solvers/combustion/dieselEngineFoam/createSpray.H
@@ -23,7 +23,7 @@ spray dieselSpray
composition,
gasProperties,
thermo,
- environmentalProperties
+ g
);
scalar gasMass0 = fvc::domainIntegrate(rho).value();
diff --git a/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C b/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C
index ba910bcf56e..e6b68fed3f9 100644
--- a/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C
+++ b/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C
@@ -52,7 +52,7 @@ int main(int argc, char *argv[])
#include "createEngineTime.H"
#include "createEngineMesh.H"
#include "createFields.H"
- #include "readEnvironmentalProperties.H"
+ #include "readGravitationalAcceleration.H"
#include "readCombustionProperties.H"
#include "createSpray.H"
#include "initContinuityErrs.H"
diff --git a/applications/solvers/combustion/dieselFoam/dieselFoam.C b/applications/solvers/combustion/dieselFoam/dieselFoam.C
index 11cd91a488e..77b77137968 100644
--- a/applications/solvers/combustion/dieselFoam/dieselFoam.C
+++ b/applications/solvers/combustion/dieselFoam/dieselFoam.C
@@ -50,7 +50,7 @@ int main(int argc, char *argv[])
#include "createTime.H"
#include "createMesh.H"
#include "createFields.H"
- #include "readEnvironmentalProperties.H"
+ #include "readGravitationalAcceleration.H"
#include "readCombustionProperties.H"
#include "createSpray.H"
#include "initContinuityErrs.H"
diff --git a/applications/solvers/combustion/reactingFoam/reactingFoam.C b/applications/solvers/combustion/reactingFoam/reactingFoam.C
index 2a9e34e5773..1aecd98887b 100644
--- a/applications/solvers/combustion/reactingFoam/reactingFoam.C
+++ b/applications/solvers/combustion/reactingFoam/reactingFoam.C
@@ -45,7 +45,7 @@ int main(int argc, char *argv[])
#include "createTime.H"
#include "createMesh.H"
#include "readChemistryProperties.H"
- #include "readEnvironmentalProperties.H"
+ #include "readGravitationalAcceleration.H"
#include "createFields.H"
#include "initContinuityErrs.H"
#include "readTimeControls.H"
diff --git a/applications/solvers/combustion/rhoReactingFoam/rhoReactingFoam.C b/applications/solvers/combustion/rhoReactingFoam/rhoReactingFoam.C
index 16f49a197fe..58b338f4307 100644
--- a/applications/solvers/combustion/rhoReactingFoam/rhoReactingFoam.C
+++ b/applications/solvers/combustion/rhoReactingFoam/rhoReactingFoam.C
@@ -45,7 +45,7 @@ int main(int argc, char *argv[])
#include "createTime.H"
#include "createMesh.H"
#include "readChemistryProperties.H"
- #include "readEnvironmentalProperties.H"
+ #include "readGravitationalAcceleration.H"
#include "createFields.H"
#include "initContinuityErrs.H"
#include "readTimeControls.H"
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/buoyantBoussinesqPisoFoam.C b/applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/buoyantBoussinesqPisoFoam.C
index a8ff1837422..efe70a07086 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/buoyantBoussinesqPisoFoam.C
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqPisoFoam/buoyantBoussinesqPisoFoam.C
@@ -57,7 +57,7 @@ int main(int argc, char *argv[])
#include "setRootCase.H"
#include "createTime.H"
#include "createMesh.H"
- #include "readEnvironmentalProperties.H"
+ #include "readGravitationalAcceleration.H"
#include "createFields.H"
#include "initContinuityErrs.H"
#include "readTimeControls.H"
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C
index 63b938fa362..fbb5b6c5dc0 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C
@@ -57,7 +57,7 @@ int main(int argc, char *argv[])
#include "setRootCase.H"
#include "createTime.H"
#include "createMesh.H"
- #include "readEnvironmentalProperties.H"
+ #include "readGravitationalAcceleration.H"
#include "createFields.H"
#include "initContinuityErrs.H"
diff --git a/applications/solvers/heatTransfer/buoyantPisoFoam/buoyantPisoFoam.C b/applications/solvers/heatTransfer/buoyantPisoFoam/buoyantPisoFoam.C
index b5055812c40..fb6ad9571ad 100644
--- a/applications/solvers/heatTransfer/buoyantPisoFoam/buoyantPisoFoam.C
+++ b/applications/solvers/heatTransfer/buoyantPisoFoam/buoyantPisoFoam.C
@@ -44,7 +44,7 @@ int main(int argc, char *argv[])
#include "setRootCase.H"
#include "createTime.H"
#include "createMesh.H"
- #include "readEnvironmentalProperties.H"
+ #include "readGravitationalAcceleration.H"
#include "createFields.H"
#include "initContinuityErrs.H"
#include "readTimeControls.H"
diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C b/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C
index 52f915bd7ab..c3a453bc4e3 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C
+++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C
@@ -42,7 +42,7 @@ int main(int argc, char *argv[])
#include "setRootCase.H"
#include "createTime.H"
#include "createMesh.H"
- #include "readEnvironmentalProperties.H"
+ #include "readGravitationalAcceleration.H"
#include "createFields.H"
#include "initContinuityErrs.H"
diff --git a/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/buoyantSimpleRadiationFoam.C b/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/buoyantSimpleRadiationFoam.C
index c869eff8995..491ce1a091d 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/buoyantSimpleRadiationFoam.C
+++ b/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/buoyantSimpleRadiationFoam.C
@@ -44,7 +44,7 @@ int main(int argc, char *argv[])
#include "setRootCase.H"
#include "createTime.H"
#include "createMesh.H"
- #include "readEnvironmentalProperties.H"
+ #include "readGravitationalAcceleration.H"
#include "createFields.H"
#include "createRadiationModel.H"
#include "initContinuityErrs.H"
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H
index 7aa01dee793..1826a77217e 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H
@@ -4,6 +4,7 @@
PtrList<volScalarField> KFluid(fluidRegions.size());
PtrList<volVectorField> UFluid(fluidRegions.size());
PtrList<surfaceScalarField> phiFluid(fluidRegions.size());
+ PtrList<uniformDimensionedVectorField> gFluid(fluidRegions.size());
PtrList<compressible::turbulenceModel> turbulence(fluidRegions.size());
PtrList<volScalarField> DpDtFluid(fluidRegions.size());
@@ -95,6 +96,23 @@
)
);
+ 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 turbulence\n" << endl;
turbulence.set
(
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidMeshes.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidMeshes.H
index aec08349eca..30a2e1089f8 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidMeshes.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidMeshes.H
@@ -19,27 +19,4 @@
)
)
);
-
- // Force calculation of geometric properties to prevent it being done
- // later in e.g. some boundary evaluation
- //(void)fluidRegions[i].weights();
- //(void)fluidRegions[i].deltaCoeffs();
-
- // Attach environmental properties to each region
- autoPtr<IOdictionary> environmentalProperties
- (
- new IOdictionary
- (
- IOobject
- (
- "environmentalProperties",
- runTime.constant(),
- fluidRegions[i],
- IOobject::MUST_READ,
- IOobject::NO_WRITE
- )
- )
- );
-
- environmentalProperties.ptr()->store();
}
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H
index 29aea044664..50a30114846 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H
@@ -5,6 +5,8 @@
volScalarField& K = KFluid[i];
volVectorField& U = UFluid[i];
surfaceScalarField& phi = phiFluid[i];
+ const dimensionedVector& g = gFluid[i];
+
compressible::turbulenceModel& turb = turbulence[i];
volScalarField& DpDt = DpDtFluid[i];
@@ -13,9 +15,3 @@
volScalarField& h = thermo.h();
const dimensionedScalar massIni("massIni", dimMass, initialMassFluid[i]);
-
- const dictionary& environmentalProperties =
- fluidRegions[i].lookupObject<IOdictionary>
- ("environmentalProperties");
-
- const dimensionedVector g(environmentalProperties.lookup("g"));
diff --git a/applications/solvers/incompressible/shallowWaterFoam/readEnvironmentalProperties.H b/applications/solvers/incompressible/shallowWaterFoam/readGravitationalAcceleration.H
similarity index 50%
rename from applications/solvers/incompressible/shallowWaterFoam/readEnvironmentalProperties.H
rename to applications/solvers/incompressible/shallowWaterFoam/readGravitationalAcceleration.H
index 866335eef14..d609c186144 100644
--- a/applications/solvers/incompressible/shallowWaterFoam/readEnvironmentalProperties.H
+++ b/applications/solvers/incompressible/shallowWaterFoam/readGravitationalAcceleration.H
@@ -1,10 +1,10 @@
-Info<< "\nReading environmentalProperties" << endl;
+Info<< "\nReading gravitationalProperties" << endl;
-IOdictionary environmentalProperties
+IOdictionary gravitationalProperties
(
IOobject
(
- "environmentalProperties",
+ "gravitationalProperties",
runTime.constant(),
mesh,
IOobject::MUST_READ,
@@ -12,10 +12,10 @@ IOdictionary environmentalProperties
)
);
-const dimensionedVector g(environmentalProperties.lookup("g"));
-const Switch rotating(environmentalProperties.lookup("rotating"));
+const dimensionedVector g(gravitationalProperties.lookup("g"));
+const Switch rotating(gravitationalProperties.lookup("rotating"));
const dimensionedVector Omega =
- rotating ? environmentalProperties.lookup("Omega")
+ rotating ? gravitationalProperties.lookup("Omega")
: dimensionedVector("Omega", -dimTime, vector(0,0,0));
const dimensionedScalar magg = mag(g);
const dimensionedVector gHat = g/magg;
diff --git a/applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C b/applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C
index 162d81ddaab..3fb6dee9fc2 100644
--- a/applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C
+++ b/applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C
@@ -41,7 +41,7 @@ int main(int argc, char *argv[])
#include "setRootCase.H"
#include "createTime.H"
#include "createMesh.H"
- #include "readEnvironmentalProperties.H"
+ #include "readGravitationalAcceleration.H"
#include "createFields.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C b/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C
index 0791c2e3583..8f0607bafa2 100644
--- a/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C
+++ b/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C
@@ -51,7 +51,7 @@ int main(int argc, char *argv[])
#include "createTime.H"
#include "createMesh.H"
#include "readChemistryProperties.H"
- #include "readEnvironmentalProperties.H"
+ #include "readGravitationalAcceleration.H"
#include "createFields.H"
#include "createClouds.H"
#include "createRadiationModel.H"
diff --git a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/porousExplicitSourceReactingParcelFoam.C b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/porousExplicitSourceReactingParcelFoam.C
index 760627de80f..a18e1775812 100644
--- a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/porousExplicitSourceReactingParcelFoam.C
+++ b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/porousExplicitSourceReactingParcelFoam.C
@@ -56,7 +56,7 @@ int main(int argc, char *argv[])
#include "createTime.H"
#include "createMesh.H"
#include "readChemistryProperties.H"
- #include "readEnvironmentalProperties.H"
+ #include "readGravitationalAcceleration.H"
#include "createFields.H"
#include "createRadiationModel.H"
#include "createClouds.H"
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C b/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C
index 8c26cb65282..4b4015c990a 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C
+++ b/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C
@@ -49,7 +49,7 @@ int main(int argc, char *argv[])
#include "createTime.H"
#include "createMesh.H"
#include "readChemistryProperties.H"
- #include "readEnvironmentalProperties.H"
+ #include "readGravitationalAcceleration.H"
#include "createFields.H"
#include "createClouds.H"
#include "createRadiationModel.H"
diff --git a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C
index 2039346411b..98ec825db48 100644
--- a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C
+++ b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C
@@ -45,7 +45,7 @@ int main(int argc, char *argv[])
#include "setRootCase.H"
#include "createTime.H"
#include "createMesh.H"
- #include "readEnvironmentalProperties.H"
+ #include "readGravitationalAcceleration.H"
#include "createFields.H"
#include "compressibleCourantNo.H"
diff --git a/applications/solvers/multiphase/bubbleFoam/bubbleFoam.C b/applications/solvers/multiphase/bubbleFoam/bubbleFoam.C
index af6de6def0b..e544c6e30bb 100644
--- a/applications/solvers/multiphase/bubbleFoam/bubbleFoam.C
+++ b/applications/solvers/multiphase/bubbleFoam/bubbleFoam.C
@@ -44,7 +44,7 @@ int main(int argc, char *argv[])
#include "createTime.H"
#include "createMesh.H"
- #include "readEnvironmentalProperties.H"
+ #include "readGravitationalAcceleration.H"
#include "createFields.H"
#include "initContinuityErrs.H"
diff --git a/applications/solvers/multiphase/compressibleInterDyMFoam/compressibleInterDyMFoam.C b/applications/solvers/multiphase/compressibleInterDyMFoam/compressibleInterDyMFoam.C
index 176900f0c63..afe1114d22d 100644
--- a/applications/solvers/multiphase/compressibleInterDyMFoam/compressibleInterDyMFoam.C
+++ b/applications/solvers/multiphase/compressibleInterDyMFoam/compressibleInterDyMFoam.C
@@ -50,7 +50,7 @@ int main(int argc, char *argv[])
#include "setRootCase.H"
#include "createTime.H"
#include "createDynamicFvMesh.H"
- #include "readEnvironmentalProperties.H"
+ #include "readGravitationalAcceleration.H"
#include "readControls.H"
#include "initContinuityErrs.H"
#include "createFields.H"
diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C
index ff5a6691238..1ab9361f0b4 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C
@@ -49,7 +49,7 @@ int main(int argc, char *argv[])
#include "setRootCase.H"
#include "createTime.H"
#include "createMesh.H"
- #include "readEnvironmentalProperties.H"
+ #include "readGravitationalAcceleration.H"
#include "readControls.H"
#include "initContinuityErrs.H"
#include "createFields.H"
diff --git a/applications/solvers/multiphase/interDyMFoam/interDyMFoam.C b/applications/solvers/multiphase/interDyMFoam/interDyMFoam.C
index 466333ff301..d353012e48b 100644
--- a/applications/solvers/multiphase/interDyMFoam/interDyMFoam.C
+++ b/applications/solvers/multiphase/interDyMFoam/interDyMFoam.C
@@ -48,7 +48,7 @@ int main(int argc, char *argv[])
#include "setRootCase.H"
#include "createTime.H"
#include "createDynamicFvMesh.H"
- #include "readEnvironmentalProperties.H"
+ #include "readGravitationalAcceleration.H"
#include "readPISOControls.H"
#include "initContinuityErrs.H"
#include "createFields.H"
diff --git a/applications/solvers/multiphase/interFoam/interFoam.C b/applications/solvers/multiphase/interFoam/interFoam.C
index b111351c39d..c752b300e17 100644
--- a/applications/solvers/multiphase/interFoam/interFoam.C
+++ b/applications/solvers/multiphase/interFoam/interFoam.C
@@ -51,7 +51,7 @@ int main(int argc, char *argv[])
#include "setRootCase.H"
#include "createTime.H"
#include "createMesh.H"
- #include "readEnvironmentalProperties.H"
+ #include "readGravitationalAcceleration.H"
#include "readPISOControls.H"
#include "initContinuityErrs.H"
#include "createFields.H"
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C
index d50dcc0b0e9..d08eec41599 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C
@@ -53,7 +53,7 @@ int main(int argc, char *argv[])
#include "setRootCase.H"
#include "createTime.H"
#include "createMesh.H"
- #include "readEnvironmentalProperties.H"
+ #include "readGravitationalAcceleration.H"
#include "readPISOControls.H"
#include "initContinuityErrs.H"
#include "createFields.H"
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C
index b6968ca1a11..e2c9c643a67 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C
+++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C
@@ -44,7 +44,7 @@ int main(int argc, char *argv[])
#include "setRootCase.H"
#include "createTime.H"
#include "createMesh.H"
- #include "readEnvironmentalProperties.H"
+ #include "readGravitationalAcceleration.H"
#include "readPISOControls.H"
#include "initContinuityErrs.H"
#include "createFields.H"
diff --git a/applications/solvers/multiphase/settlingFoam/settlingFoam.C b/applications/solvers/multiphase/settlingFoam/settlingFoam.C
index e68ddbb0f07..942ed729bed 100644
--- a/applications/solvers/multiphase/settlingFoam/settlingFoam.C
+++ b/applications/solvers/multiphase/settlingFoam/settlingFoam.C
@@ -47,7 +47,7 @@ int main(int argc, char *argv[])
#include "createTime.H"
#include "createMesh.H"
- #include "readEnvironmentalProperties.H"
+ #include "readGravitationalAcceleration.H"
#include "createFields.H"
#include "initContinuityErrs.H"
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C b/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C
index 63991f149e5..f7ebe5f721e 100644
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C
+++ b/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C
@@ -43,7 +43,7 @@ int main(int argc, char *argv[])
#include "setRootCase.H"
#include "createTime.H"
#include "createMesh.H"
- #include "readEnvironmentalProperties.H"
+ #include "readGravitationalAcceleration.H"
#include "readPIMPLEControls.H"
#include "initContinuityErrs.H"
#include "createFields.H"
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C
index a28d9295780..05888429bf5 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C
@@ -51,7 +51,7 @@ int main(int argc, char *argv[])
#include "createTime.H"
#include "createMesh.H"
- #include "readEnvironmentalProperties.H"
+ #include "readGravitationalAcceleration.H"
#include "createFields.H"
#include "readPPProperties.H"
#include "initContinuityErrs.H"
diff --git a/src/finiteVolume/cfdTools/general/include/fvCFD.H b/src/finiteVolume/cfdTools/general/include/fvCFD.H
index 4c893564527..95f566bb1b3 100644
--- a/src/finiteVolume/cfdTools/general/include/fvCFD.H
+++ b/src/finiteVolume/cfdTools/general/include/fvCFD.H
@@ -9,6 +9,7 @@
#include "fvMatrices.H"
#include "fvm.H"
#include "linear.H"
+#include "uniformDimensionedFields.H"
#include "calculatedFvPatchFields.H"
#include "fixedValueFvPatchFields.H"
#include "adjustPhi.H"
diff --git a/src/finiteVolume/cfdTools/general/include/readEnvironmentalProperties.H b/src/finiteVolume/cfdTools/general/include/readEnvironmentalProperties.H
deleted file mode 100644
index 7f99d0153fe..00000000000
--- a/src/finiteVolume/cfdTools/general/include/readEnvironmentalProperties.H
+++ /dev/null
@@ -1,15 +0,0 @@
- Info << "\nReading environmentalProperties" << endl;
-
- IOdictionary environmentalProperties
- (
- IOobject
- (
- "environmentalProperties",
- runTime.constant(),
- mesh,
- IOobject::MUST_READ,
- IOobject::NO_WRITE
- )
- );
-
- dimensionedVector g(environmentalProperties.lookup("g"));
diff --git a/src/finiteVolume/cfdTools/general/include/readGravitationalAcceleration.H b/src/finiteVolume/cfdTools/general/include/readGravitationalAcceleration.H
new file mode 100644
index 00000000000..2389d0bd2b7
--- /dev/null
+++ b/src/finiteVolume/cfdTools/general/include/readGravitationalAcceleration.H
@@ -0,0 +1,12 @@
+ Info << "\nReading g" << endl;
+ uniformDimensionedVectorField g
+ (
+ IOobject
+ (
+ "g",
+ runTime.constant(),
+ mesh,
+ IOobject::MUST_READ,
+ IOobject::NO_WRITE
+ )
+ );
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/buoyantPressure/buoyantPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/buoyantPressure/buoyantPressureFvPatchScalarField.C
index cafc55aa3a5..12544a105f2 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/buoyantPressure/buoyantPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/buoyantPressure/buoyantPressureFvPatchScalarField.C
@@ -28,6 +28,7 @@ License
#include "addToRunTimeSelectionTable.H"
#include "fvPatchFieldMapper.H"
#include "volFields.H"
+#include "uniformDimensionedFields.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -110,10 +111,8 @@ void buoyantPressureFvPatchScalarField::updateCoeffs()
return;
}
- const dictionary& environmentalProperties
- = db().lookupObject<IOdictionary>("environmentalProperties");
-
- dimensionedVector g(environmentalProperties.lookup("g"));
+ const uniformDimensionedVectorField& g =
+ db().lookupObject<uniformDimensionedVectorField>("g");
const fvPatchField<scalar>& rho =
patch().lookupPatchField<volScalarField, scalar>(rhoName_);
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.C
index dfda8caf521..f47606f86e4 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformDensityHydrostaticPressure/uniformDensityHydrostaticPressureFvPatchScalarField.C
@@ -29,7 +29,7 @@ License
#include "fvPatchFieldMapper.H"
#include "volFields.H"
#include "surfaceFields.H"
-
+#include "uniformDimensionedFields.H"
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@@ -126,10 +126,8 @@ void Foam::uniformDensityHydrostaticPressureFvPatchScalarField::updateCoeffs()
return;
}
- const dictionary& environmentalProperties
- = db().lookupObject<IOdictionary>("environmentalProperties");
-
- dimensionedVector g(environmentalProperties.lookup("g"));
+ const uniformDimensionedVectorField& g =
+ db().lookupObject<uniformDimensionedVectorField>("g");
operator==
(
diff --git a/src/lagrangian/dieselSpray/spray/spray.C b/src/lagrangian/dieselSpray/spray/spray.C
index 07dbcdbe7ef..b6ab574d1db 100644
--- a/src/lagrangian/dieselSpray/spray/spray.C
+++ b/src/lagrangian/dieselSpray/spray/spray.C
@@ -59,7 +59,7 @@ Foam::spray::spray
const basicMultiComponentMixture& composition,
const PtrList<gasThermoPhysics>& gasProperties,
const dictionary&,
- const dictionary& environmentalProperties
+ const dimensionedVector& g
)
:
Cloud<parcel>(U.mesh(), false), // suppress className checking on positions
@@ -181,7 +181,7 @@ Foam::spray::spray
),
subCycles_(readLabel(sprayProperties_.lookup("subCycles"))),
- g_(dimensionedVector(environmentalProperties.lookup("g")).value()),
+ g_(g.value()),
gasProperties_(gasProperties),
composition_(composition),
@@ -266,7 +266,7 @@ Foam::spray::spray
"const volScalarField& T, const combustionMixture& composition,"
"const PtrList<gasThermoPhsyics>& gaseousFuelProperties, "
"const dictionary& thermophysicalProperties, "
- "const dictionary& environmentalProperties)"
+ "const dimensionedScalar& g)"
) << "spray::(...) only one wedgePolyPatch found. "
"Please check you BC-setup."
<< abort(FatalError);
diff --git a/src/lagrangian/dieselSpray/spray/spray.H b/src/lagrangian/dieselSpray/spray/spray.H
index 044423fc752..27ec6a43ec4 100644
--- a/src/lagrangian/dieselSpray/spray/spray.H
+++ b/src/lagrangian/dieselSpray/spray/spray.H
@@ -122,7 +122,7 @@ class spray
//- Acceleration due to gravity
- vector g_;
+ const vector& g_;
// Composition properties
@@ -195,7 +195,7 @@ public:
const basicMultiComponentMixture& composition,
const PtrList<gasThermoPhysics>& gasProperties,
const dictionary& thermophysicalProperties,
- const dictionary& environmentalProperties
+ const dimensionedVector& g
);
diff --git a/src/transportModels/interfaceProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C b/src/transportModels/interfaceProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C
index c158c8b2ba8..6c73d638f8b 100644
--- a/src/transportModels/interfaceProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C
+++ b/src/transportModels/interfaceProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C
@@ -29,6 +29,7 @@ License
#include "fvPatchFieldMapper.H"
#include "volFields.H"
#include "surfaceFields.H"
+#include "uniformDimensionedFields.H"
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@@ -140,10 +141,8 @@ void Foam::alphaFixedPressureFvPatchScalarField::updateCoeffs()
return;
}
- const dictionary& environmentalProperties
- = db().lookupObject<IOdictionary>("environmentalProperties");
-
- dimensionedVector g(environmentalProperties.lookup("g"));
+ const uniformDimensionedVectorField& g =
+ db().lookupObject<uniformDimensionedVectorField>("g");
const fvPatchField<scalar>& rho =
patch().lookupPatchField<volScalarField, scalar>("rho");
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/constant/environmentalProperties b/tutorials/combustion/XiFoam/les/pitzDaily/constant/environmentalProperties
deleted file mode 100644
index a866ff549fd..00000000000
--- a/tutorials/combustion/XiFoam/les/pitzDaily/constant/environmentalProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- location "constant";
- object environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 );
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/constant/environmentalProperties b/tutorials/combustion/XiFoam/les/pitzDaily/constant/g
similarity index 90%
rename from tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/constant/environmentalProperties
rename to tutorials/combustion/XiFoam/les/pitzDaily/constant/g
index 1f0ea06a3cb..22bddf9891b 100644
--- a/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/constant/environmentalProperties
+++ b/tutorials/combustion/XiFoam/les/pitzDaily/constant/g
@@ -11,10 +11,12 @@ FoamFile
format ascii;
class dictionary;
location "constant";
- object environmentalProperties;
+ object g;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-g g [0 1 -2 0 0 0 0] (0 0 0);
+dimensions [0 1 -2 0 0 0 0];
+value ( 0 -9.81 0 );
+
// ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/environmentalProperties b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/g
similarity index 90%
rename from tutorials/combustion/XiFoam/les/pitzDaily3D/constant/environmentalProperties
rename to tutorials/combustion/XiFoam/les/pitzDaily3D/constant/g
index ce7f648b7fa..e6c990ee7a9 100644
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/environmentalProperties
+++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/g
@@ -11,11 +11,12 @@ FoamFile
format ascii;
class dictionary;
location "constant";
- object environmentalProperties;
+ object g;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-g g [ 0 1 -2 0 0 0 0 ] ( 0 0 0 );
+dimensions [0 1 -2 0 0 0 0];
+value ( 0 0 0 );
// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/environmentalProperties b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/g
similarity index 90%
rename from tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/environmentalProperties
rename to tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/g
index 645c9af0992..c86cc8bb1f9 100644
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/environmentalProperties
+++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/g
@@ -11,11 +11,12 @@ FoamFile
format ascii;
class dictionary;
location "constant";
- object environmentalProperties;
+ object g;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-g g [ 0 1 -2 0 0 0 0 ] ( 0 0 0 );
+dimensions [0 1 -2 0 0 0 0];
+value ( 0 0 0 );
// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/environmentalProperties b/tutorials/combustion/dieselFoam/aachenBomb/constant/g
similarity index 90%
rename from tutorials/multiphase/twoPhaseEulerFoam/bed/constant/environmentalProperties
rename to tutorials/combustion/dieselFoam/aachenBomb/constant/g
index d1abb1921fc..71a0e647890 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/environmentalProperties
+++ b/tutorials/combustion/dieselFoam/aachenBomb/constant/g
@@ -11,11 +11,12 @@ FoamFile
format binary;
class dictionary;
location "constant";
- object environmentalProperties;
+ object g;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-g g [ 0 1 -2 0 0 ] ( 0 0 -9.81 );
+dimensions [0 1 -2 0 0 0 0];
+value ( 0 -9.81 0 );
// ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/environmentalProperties b/tutorials/combustion/engineFoam/kivaTest/constant/g
similarity index 90%
rename from tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/environmentalProperties
rename to tutorials/combustion/engineFoam/kivaTest/constant/g
index 645c9af0992..c86cc8bb1f9 100644
--- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/environmentalProperties
+++ b/tutorials/combustion/engineFoam/kivaTest/constant/g
@@ -11,11 +11,12 @@ FoamFile
format ascii;
class dictionary;
location "constant";
- object environmentalProperties;
+ object g;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-g g [ 0 1 -2 0 0 0 0 ] ( 0 0 0 );
+dimensions [0 1 -2 0 0 0 0];
+value ( 0 0 0 );
// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/constant/environmentalProperties b/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/constant/environmentalProperties
deleted file mode 100644
index a866ff549fd..00000000000
--- a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/constant/environmentalProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- location "constant";
- object environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 );
-
-
-// ************************************************************************* //
diff --git a/tutorials/combustion/engineFoam/kivaTest/constant/environmentalProperties b/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/constant/g
similarity index 90%
rename from tutorials/combustion/engineFoam/kivaTest/constant/environmentalProperties
rename to tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/constant/g
index 645c9af0992..22bddf9891b 100644
--- a/tutorials/combustion/engineFoam/kivaTest/constant/environmentalProperties
+++ b/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/constant/g
@@ -11,11 +11,12 @@ FoamFile
format ascii;
class dictionary;
location "constant";
- object environmentalProperties;
+ object g;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-g g [ 0 1 -2 0 0 0 0 ] ( 0 0 0 );
+dimensions [0 1 -2 0 0 0 0];
+value ( 0 -9.81 0 );
// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/environmentalProperties b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/environmentalProperties
deleted file mode 100644
index a866ff549fd..00000000000
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/environmentalProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- location "constant";
- object environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 );
-
-
-// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/g b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/g
new file mode 100644
index 00000000000..22bddf9891b
--- /dev/null
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [0 1 -2 0 0 0 0];
+value ( 0 -9.81 0 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/environmentalProperties b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/g
similarity index 90%
rename from tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/environmentalProperties
rename to tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/g
index 8ecb2a44020..4f395927146 100644
--- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/environmentalProperties
+++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/g
@@ -11,10 +11,11 @@ FoamFile
format ascii;
class dictionary;
location "constant";
- object environmentalProperties;
+ object g;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-g g [0 1 -2 0 0 0 0] (0 0 -9.81);
+dimensions [0 1 -2 0 0 0 0];
+value (0 0 -9.81);
// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/constant/environmentalProperties b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/constant/environmentalProperties
deleted file mode 100644
index a866ff549fd..00000000000
--- a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/constant/environmentalProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- location "constant";
- object environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 );
-
-
-// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/constant/g b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/constant/g
new file mode 100644
index 00000000000..22bddf9891b
--- /dev/null
+++ b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [0 1 -2 0 0 0 0];
+value ( 0 -9.81 0 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/environmentalProperties b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/environmentalProperties
deleted file mode 100644
index a866ff549fd..00000000000
--- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/environmentalProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- location "constant";
- object environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 );
-
-
-// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/g b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/g
new file mode 100644
index 00000000000..22bddf9891b
--- /dev/null
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [0 1 -2 0 0 0 0];
+value ( 0 -9.81 0 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/environmentalProperties b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/environmentalProperties
deleted file mode 100644
index 639bd90b066..00000000000
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/environmentalProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- location "constant";
- object environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g g [ 0 1 -2 0 0 0 0 ] ( 0 0 -9.81 );
-
-
-// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/g b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/g
new file mode 100644
index 00000000000..427e0d5515d
--- /dev/null
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [0 1 -2 0 0 0 0];
+value ( 0 0 -9.81 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/environmentalProperties b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/environmentalProperties
deleted file mode 100644
index 639bd90b066..00000000000
--- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/environmentalProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- location "constant";
- object environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g g [ 0 1 -2 0 0 0 0 ] ( 0 0 -9.81 );
-
-
-// ************************************************************************* //
diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/g b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/g
new file mode 100644
index 00000000000..427e0d5515d
--- /dev/null
+++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [0 1 -2 0 0 0 0];
+value ( 0 0 -9.81 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/environmentalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/environmentalProperties
deleted file mode 100644
index 03e0adce892..00000000000
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/environmentalProperties
+++ /dev/null
@@ -1,19 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g g [0 1 -2 0 0 0 0] (0 -9.81 0);
-
-// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/g b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/g
new file mode 100644
index 00000000000..4c5b83c8435
--- /dev/null
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/g
@@ -0,0 +1,20 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [0 1 -2 0 0 0 0];
+value (0 -9.81 0);
+
+// ************************************************************************* //
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/environmentalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/environmentalProperties
deleted file mode 120000
index 9cb87f23955..00000000000
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/environmentalProperties
+++ /dev/null
@@ -1 +0,0 @@
-../bottomAir/environmentalProperties
\ No newline at end of file
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/g b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/g
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tutorials/incompressible/shallowWaterFoam/squareBump/constant/environmentalProperties b/tutorials/incompressible/shallowWaterFoam/squareBump/constant/g
similarity index 84%
rename from tutorials/incompressible/shallowWaterFoam/squareBump/constant/environmentalProperties
rename to tutorials/incompressible/shallowWaterFoam/squareBump/constant/g
index 81880398320..0125923f1eb 100644
--- a/tutorials/incompressible/shallowWaterFoam/squareBump/constant/environmentalProperties
+++ b/tutorials/incompressible/shallowWaterFoam/squareBump/constant/g
@@ -2,7 +2,7 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -10,11 +10,12 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
- object environmentalProperties;
+ object g;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-g g [0 1 -2 0 0 0 0] (0 0 -9.81);
+dimensions [0 1 -2 0 0 0 0];
+value (0 0 -9.81);
rotating true;
Omega Omega [0 0 -1 0 0] (0 0 7.292e-5);
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/environmentalProperties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/g
similarity index 90%
rename from tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/environmentalProperties
rename to tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/g
index e5124f24528..c9406d1b60f 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/environmentalProperties
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/g
@@ -11,11 +11,12 @@ FoamFile
format ascii;
class dictionary;
location "constant";
- object environmentalProperties;
+ object g;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-g g [ 0 1 -2 0 0 0 0 ] ( 0 0 0 );
+dimensions [0 1 -2 0 0 0 0];
+value ( 0 -9.81 0 );
// ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/environmentalProperties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/g
similarity index 90%
rename from tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/environmentalProperties
rename to tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/g
index e5124f24528..6d927430326 100644
--- a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/environmentalProperties
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/g
@@ -11,11 +11,12 @@ FoamFile
format ascii;
class dictionary;
location "constant";
- object environmentalProperties;
+ object g;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-g g [ 0 1 -2 0 0 0 0 ] ( 0 0 0 );
+dimensions [0 1 -2 0 0 0 0];
+value ( 0 0 0 );
// ************************************************************************* //
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/environmentalProperties b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/g
similarity index 89%
rename from tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/environmentalProperties
rename to tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/g
index 4baaea2a25a..6d927430326 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/environmentalProperties
+++ b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/g
@@ -11,11 +11,12 @@ FoamFile
format ascii;
class dictionary;
location "constant";
- object environmentalProperties;
+ object g;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-g g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 );
+dimensions [0 1 -2 0 0 0 0];
+value ( 0 0 0 );
// ************************************************************************* //
diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam.C b/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam.C
index 77715fd48c1..b20e73b487e 100644
--- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam.C
+++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam.C
@@ -45,7 +45,7 @@ int main(int argc, char *argv[])
#include "createTime.H"
#include "createMesh.H"
- #include "readEnvironmentalProperties.H"
+ #include "readGravitationalAcceleration.H"
#include "createFields.H"
#include "createClouds.H"
#include "readPISOControls.H"
diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/environmentalProperties b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/environmentalProperties
deleted file mode 100644
index a866ff549fd..00000000000
--- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/environmentalProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- location "constant";
- object environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 );
-
-
-// ************************************************************************* //
diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/g b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/g
new file mode 100644
index 00000000000..22bddf9891b
--- /dev/null
+++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [0 1 -2 0 0 0 0];
+value ( 0 -9.81 0 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/bottomAir/environmentalProperties b/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/bottomAir/environmentalProperties
deleted file mode 100644
index 03e0adce892..00000000000
--- a/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/bottomAir/environmentalProperties
+++ /dev/null
@@ -1,19 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- object environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g g [0 1 -2 0 0 0 0] (0 -9.81 0);
-
-// ************************************************************************* //
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/bottomAir/g b/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/bottomAir/g
new file mode 100644
index 00000000000..4c5b83c8435
--- /dev/null
+++ b/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/bottomAir/g
@@ -0,0 +1,20 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ object g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [0 1 -2 0 0 0 0];
+value (0 -9.81 0);
+
+// ************************************************************************* //
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/topAir/environmentalProperties b/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/topAir/environmentalProperties
deleted file mode 120000
index 9cb87f23955..00000000000
--- a/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/topAir/environmentalProperties
+++ /dev/null
@@ -1 +0,0 @@
-../bottomAir/environmentalProperties
\ No newline at end of file
diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/topAir/g b/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/topAir/g
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/environmentalProperties b/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/environmentalProperties
deleted file mode 100644
index a866ff549fd..00000000000
--- a/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/environmentalProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- location "constant";
- object environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 );
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/g b/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/g
new file mode 100644
index 00000000000..22bddf9891b
--- /dev/null
+++ b/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [0 1 -2 0 0 0 0];
+value ( 0 -9.81 0 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/environmentalProperties b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/g
similarity index 89%
rename from tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/environmentalProperties
rename to tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/g
index 938322374a1..5eec6f2b2eb 100644
--- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/environmentalProperties
+++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/g
@@ -11,11 +11,12 @@ FoamFile
format ascii;
class dictionary;
location "constant";
- object environmentalProperties;
+ object g;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-g g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 );
+dimensions [0 1 -2 0 0 0 0];
+value ( 0 -9.81 0 );
// ************************************************************************* //
diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/environmentalProperties b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/g
similarity index 89%
rename from tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/environmentalProperties
rename to tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/g
index 938322374a1..5eec6f2b2eb 100644
--- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/environmentalProperties
+++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/g
@@ -11,11 +11,12 @@ FoamFile
format ascii;
class dictionary;
location "constant";
- object environmentalProperties;
+ object g;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-g g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 );
+dimensions [0 1 -2 0 0 0 0];
+value ( 0 -9.81 0 );
// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/environmentalProperties b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/environmentalProperties
deleted file mode 100644
index 639bd90b066..00000000000
--- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/environmentalProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- location "constant";
- object environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g g [ 0 1 -2 0 0 0 0 ] ( 0 0 -9.81 );
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/g b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/g
new file mode 100644
index 00000000000..427e0d5515d
--- /dev/null
+++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [0 1 -2 0 0 0 0];
+value ( 0 0 -9.81 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/environmentalProperties b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/g
similarity index 89%
rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/environmentalProperties
rename to tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/g
index 9fd11e4ef26..c6d6aa8eef2 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/environmentalProperties
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/g
@@ -11,11 +11,12 @@ FoamFile
format ascii;
class dictionary;
location "constant";
- object environmentalProperties;
+ object g;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-g g [ 0 1 -2 0 0 0 0 ] ( 0 0 -9.81 );
+dimensions [0 1 -2 0 0 0 0];
+value ( 0 0 -9.81 );
// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/environmentalProperties b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/environmentalProperties
deleted file mode 100644
index 9fd11e4ef26..00000000000
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/environmentalProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- location "constant";
- object environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g g [ 0 1 -2 0 0 0 0 ] ( 0 0 -9.81 );
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/g b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/g
new file mode 100644
index 00000000000..c6d6aa8eef2
--- /dev/null
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [0 1 -2 0 0 0 0];
+value ( 0 0 -9.81 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/environmentalProperties b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/environmentalProperties
deleted file mode 100644
index 9fd11e4ef26..00000000000
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/environmentalProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- location "constant";
- object environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g g [ 0 1 -2 0 0 0 0 ] ( 0 0 -9.81 );
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/g b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/g
new file mode 100644
index 00000000000..c6d6aa8eef2
--- /dev/null
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [0 1 -2 0 0 0 0];
+value ( 0 0 -9.81 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/environmentalProperties b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/environmentalProperties
deleted file mode 100644
index 9fd11e4ef26..00000000000
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/environmentalProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- location "constant";
- object environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g g [ 0 1 -2 0 0 0 0 ] ( 0 0 -9.81 );
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/g b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/g
new file mode 100644
index 00000000000..c6d6aa8eef2
--- /dev/null
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [0 1 -2 0 0 0 0];
+value ( 0 0 -9.81 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/environmentalProperties b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/environmentalProperties
deleted file mode 100644
index 9fd11e4ef26..00000000000
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/environmentalProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- location "constant";
- object environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g g [ 0 1 -2 0 0 0 0 ] ( 0 0 -9.81 );
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/g b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/g
new file mode 100644
index 00000000000..c6d6aa8eef2
--- /dev/null
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [0 1 -2 0 0 0 0];
+value ( 0 0 -9.81 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/MRFInterFoam/MRFInterFoam/MRFInterFoam.C b/tutorials/multiphase/interFoam/MRFInterFoam/MRFInterFoam/MRFInterFoam.C
index 9f1efad337f..9daeb845544 100644
--- a/tutorials/multiphase/interFoam/MRFInterFoam/MRFInterFoam/MRFInterFoam.C
+++ b/tutorials/multiphase/interFoam/MRFInterFoam/MRFInterFoam/MRFInterFoam.C
@@ -52,7 +52,7 @@ int main(int argc, char *argv[])
#include "setRootCase.H"
#include "createTime.H"
#include "createMesh.H"
- #include "readEnvironmentalProperties.H"
+ #include "readGravitationalAcceleration.H"
#include "readPISOControls.H"
#include "initContinuityErrs.H"
#include "createFields.H"
diff --git a/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/constant/g b/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/constant/g
new file mode 100644
index 00000000000..844d7a83785
--- /dev/null
+++ b/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/constant/g
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [0 1 -2 0 0 0 0];
+value (0 0 0);
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/constant/environmentalProperties b/tutorials/multiphase/interFoam/laminar/damBreak/constant/environmentalProperties
deleted file mode 100644
index a866ff549fd..00000000000
--- a/tutorials/multiphase/interFoam/laminar/damBreak/constant/environmentalProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- location "constant";
- object environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 );
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/constant/g b/tutorials/multiphase/interFoam/laminar/damBreak/constant/g
new file mode 100644
index 00000000000..22bddf9891b
--- /dev/null
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [0 1 -2 0 0 0 0];
+value ( 0 -9.81 0 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/g b/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/g
new file mode 100644
index 00000000000..c86cc8bb1f9
--- /dev/null
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [0 1 -2 0 0 0 0];
+value ( 0 0 0 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/constant/environmentalProperties b/tutorials/multiphase/interFoam/ras/damBreak/constant/environmentalProperties
deleted file mode 100644
index a866ff549fd..00000000000
--- a/tutorials/multiphase/interFoam/ras/damBreak/constant/environmentalProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- location "constant";
- object environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 );
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/constant/g b/tutorials/multiphase/interFoam/ras/damBreak/constant/g
new file mode 100644
index 00000000000..22bddf9891b
--- /dev/null
+++ b/tutorials/multiphase/interFoam/ras/damBreak/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [0 1 -2 0 0 0 0];
+value ( 0 -9.81 0 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/environmentalProperties b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/environmentalProperties
deleted file mode 100644
index a866ff549fd..00000000000
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/environmentalProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- location "constant";
- object environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 );
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/g b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/g
new file mode 100644
index 00000000000..22bddf9891b
--- /dev/null
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [0 1 -2 0 0 0 0];
+value ( 0 -9.81 0 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/environmentalProperties b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/environmentalProperties
deleted file mode 100644
index a866ff549fd..00000000000
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/environmentalProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- location "constant";
- object environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 );
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/g b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/g
new file mode 100644
index 00000000000..22bddf9891b
--- /dev/null
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [0 1 -2 0 0 0 0];
+value ( 0 -9.81 0 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/settlingFoam/ras/dahl/constant/environmentalProperties b/tutorials/multiphase/settlingFoam/ras/dahl/constant/environmentalProperties
deleted file mode 100644
index a866ff549fd..00000000000
--- a/tutorials/multiphase/settlingFoam/ras/dahl/constant/environmentalProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- location "constant";
- object environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 );
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/settlingFoam/ras/dahl/constant/g b/tutorials/multiphase/settlingFoam/ras/dahl/constant/g
new file mode 100644
index 00000000000..22bddf9891b
--- /dev/null
+++ b/tutorials/multiphase/settlingFoam/ras/dahl/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [0 1 -2 0 0 0 0];
+value ( 0 -9.81 0 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/settlingFoam/ras/tank3D/constant/environmentalProperties b/tutorials/multiphase/settlingFoam/ras/tank3D/constant/environmentalProperties
deleted file mode 100644
index 938322374a1..00000000000
--- a/tutorials/multiphase/settlingFoam/ras/tank3D/constant/environmentalProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: dev |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- location "constant";
- object environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 );
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/settlingFoam/ras/tank3D/constant/g b/tutorials/multiphase/settlingFoam/ras/tank3D/constant/g
new file mode 100644
index 00000000000..5eec6f2b2eb
--- /dev/null
+++ b/tutorials/multiphase/settlingFoam/ras/tank3D/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: dev |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [0 1 -2 0 0 0 0];
+value ( 0 -9.81 0 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/dieselFoam/aachenBomb/constant/environmentalProperties b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/g
similarity index 90%
rename from tutorials/combustion/dieselFoam/aachenBomb/constant/environmentalProperties
rename to tutorials/multiphase/twoPhaseEulerFoam/bed/constant/g
index b5ad4b1cfd6..03586845f30 100644
--- a/tutorials/combustion/dieselFoam/aachenBomb/constant/environmentalProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/g
@@ -11,11 +11,12 @@ FoamFile
format binary;
class dictionary;
location "constant";
- object environmentalProperties;
+ object g;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-g g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 );
+dimensions [0 1 -2 0 0 0 0];
+value ( 0 0 -9.81 );
// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/environmentalProperties b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/environmentalProperties
deleted file mode 100644
index 6a8eb74fb89..00000000000
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/environmentalProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- location "constant";
- object environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g g [ 0 1 -2 0 0 ] ( 0 -9.81 0 );
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/g b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/g
new file mode 100644
index 00000000000..22bddf9891b
--- /dev/null
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [0 1 -2 0 0 0 0];
+value ( 0 -9.81 0 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/environmentalProperties b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/environmentalProperties
deleted file mode 100644
index a866ff549fd..00000000000
--- a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/environmentalProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- location "constant";
- object environmentalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-g g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 );
-
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/g b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/g
new file mode 100644
index 00000000000..22bddf9891b
--- /dev/null
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/g
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: 1.5 |
+| \\ / A nd | Web: www.OpenFOAM.org |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "constant";
+ object g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions [0 1 -2 0 0 0 0];
+value ( 0 -9.81 0 );
+
+
+// ************************************************************************* //
--
GitLab