Merge branch 'master' of ssh://noisy/home/noisy3/OpenFOAM/OpenFOAM-dev

2025-11-28 03:28:01 +00:00 · 2009-07-08 19:10:55 +01:00
parent 54f9cc3fe9 f4d7096d45
commit e55c47478d
113 changed files with 678 additions and 659 deletions
--- 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"
--- 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();
--- 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"
--- 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();
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"

--- 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"
--- 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"

--- 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"
--- 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
        (
--- 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();
    }
--- 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"));
--- a/applications/solvers/incompressible/shallowWaterFoam/readGravitationalAcceleration.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;
--- 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"

    // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
--- 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"
--- 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"
--- 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"
--- 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"

--- 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"

--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"

--- 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"
--- 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"