Merge branch 'basicSolidthermo'

2025-11-28 03:28:01 +00:00 · 2010-12-08 16:44:57 +00:00
parent a964515708 262e6be2f8
commit e7e3a607c7
130 changed files with 9045 additions and 1000 deletions
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options
@ -5,6 +5,7 @@ EXE_INC = \
    -I$(LIB_SRC)/meshTools/lnInclude \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
    -I$(LIB_SRC)/thermophysicalModels/basicSolidThermo/lnInclude \
    -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel/lnInclude

--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/options
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/options
@ -7,6 +7,7 @@ EXE_INC = \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/meshTools/lnInclude \
    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
    -I$(LIB_SRC)/thermophysicalModels/basicSolidThermo/lnInclude \
    -I$(LIB_SRC)/turbulenceModels \
    -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel/lnInclude \
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/setRegionSolidFields.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/setRegionSolidFields.H
@ -4,7 +4,7 @@
    tmp<volScalarField> trho = thermo.rho();
    const volScalarField& rho = trho();

-    tmp<volScalarField> tcp = thermo.cp();
+    tmp<volScalarField> tcp = thermo.Cp();
    const volScalarField& cp = tcp();

    tmp<volScalarField> tK = thermo.K();
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/setRegionSolidFields.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/setRegionSolidFields.H
@ -4,11 +4,12 @@
    tmp<volScalarField> trho = thermo.rho();
    const volScalarField& rho = trho();

-    tmp<volScalarField> tcp = thermo.cp();
+    tmp<volScalarField> tcp = thermo.Cp();
    const volScalarField& cp = tcp();

    tmp<volScalarField> tK = thermo.K();
    //tmp<volSymmTensorField> tK = thermo.directionalK();
    const volScalarField& K = tK();
+    //const volSymmTensorField& K = tK();

    volScalarField& T = thermo.T();
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solidRegionDiffNo.C
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solidRegionDiffNo.C
@ -55,4 +55,35 @@ Foam::scalar Foam::solidRegionDiffNo
 }


+Foam::scalar Foam::solidRegionDiffNo
+(
+    const fvMesh& mesh,
+    const Time& runTime,
+    const volScalarField& Cprho,
+    const volSymmTensorField& Kdirectional
+)
+{
+    scalar DiNum = 0.0;
+    scalar meanDiNum = 0.0;
+
+    volScalarField K = mag(Kdirectional);
+
+    //- Take care: can have fluid domains with 0 cells so do not test for
+    //  zero internal faces.
+    surfaceScalarField KrhoCpbyDelta =
+        mesh.surfaceInterpolation::deltaCoeffs()
+      * fvc::interpolate(K)
+      / fvc::interpolate(Cprho);
+
+    DiNum = gMax(KrhoCpbyDelta.internalField())*runTime.deltaT().value();
+
+    meanDiNum = (average(KrhoCpbyDelta)).value()*runTime.deltaT().value();
+
+    Info<< "Region: " << mesh.name() << " Diffusion Number mean: " << meanDiNum
+        << " max: " << DiNum << endl;
+
+    return DiNum;
+}
+
+
 // ************************************************************************* //
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solidRegionDiffNo.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solidRegionDiffNo.H
@ -41,6 +41,15 @@ namespace Foam
        const volScalarField& Cprho,
        const volScalarField& K
    );
+
+    scalar solidRegionDiffNo
+    (
+        const fvMesh& mesh,
+        const Time& runTime,
+        const volScalarField& Cprho,
+        const volSymmTensorField& K
+    );
+
 }

 #endif
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solveSolid.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solveSolid.H
@ -18,6 +18,8 @@ if (finalIter)
    Info<< "Min/max T:" << min(T) << ' ' << max(T) << endl;
 }

+thermo.correct();
+
 if (finalIter)
 {
    mesh.data::remove("finalIteration");
--- a/applications/solvers/lagrangian/coalChemistryFoam/Make/options
+++ b/applications/solvers/lagrangian/coalChemistryFoam/Make/options
@ -10,8 +10,8 @@ EXE_INC = \
    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
    -I$(LIB_SRC)/thermophysicalModels/liquids/lnInclude \
    -I$(LIB_SRC)/thermophysicalModels/liquidMixture/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/solids/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/solidMixture/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/pointSolids/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/pointSolidMixture/lnInclude \
    -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
    -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
    -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
@ -33,8 +33,8 @@ EXE_LIBS = \
    -lbasicThermophysicalModels \
    -lliquids \
    -lliquidMixture \
-    -lsolids \
-    -lsolidMixture \
+    -lpointSolids \
+    -lpointSolidMixture \
    -lthermophysicalFunctions \
    -lreactionThermophysicalModels \
    -lSLGThermo \
--- a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/Make/options
@ -10,8 +10,8 @@ EXE_INC = \
    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
    -I$(LIB_SRC)/thermophysicalModels/liquids/lnInclude \
    -I$(LIB_SRC)/thermophysicalModels/liquidMixture/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/solids/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/solidMixture/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/pointSolids/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/pointSolidMixture/lnInclude \
    -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
    -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
    -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
@ -32,8 +32,8 @@ EXE_LIBS = \
    -lbasicThermophysicalModels \
    -lliquids \
    -lliquidMixture \
-    -lsolids \
-    -lsolidMixture \
+    -lpointSolids \
+    -lpointSolidMixture \
    -lthermophysicalFunctions \
    -lreactionThermophysicalModels \
    -lSLGThermo \
--- a/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options
+++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options
@ -5,8 +5,8 @@ EXE_INC = \
    -I$(LIB_SRC)/thermophysicalModels/pdfs/lnInclude \
    -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/solids/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/solidMixture/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/pointSolids/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/pointSolidMixture/lnInclude \
    -I$(LIB_SRC)/thermophysicalModels/liquids/lnInclude \
    -I$(LIB_SRC)/thermophysicalModels/liquidMixture/lnInclude \
    -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
@ -26,8 +26,8 @@ EXE_LIBS = \
    -lcompressibleLESModels \
    -lspecie \
    -lbasicThermophysicalModels \
-    -lsolids \
-    -lsolidMixture \
+    -lpointSolids \
+    -lpointSolidMixture \
    -lthermophysicalFunctions \
    -lreactionThermophysicalModels \
    -lSLGThermo \
--- a/applications/solvers/lagrangian/reactingParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/reactingParcelFoam/Make/options
@ -9,8 +9,8 @@ EXE_INC = \
    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
    -I$(LIB_SRC)/thermophysicalModels/liquids/lnInclude \
    -I$(LIB_SRC)/thermophysicalModels/liquidMixture/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/solids/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/solidMixture/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/pointSolids/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/pointSolidMixture/lnInclude \
    -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
    -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
    -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
@ -31,8 +31,8 @@ EXE_LIBS = \
    -lbasicThermophysicalModels \
    -lliquids \
    -lliquidMixture \
-    -lsolids \
-    -lsolidMixture \
+    -lpointSolids \
+    -lpointSolidMixture \
    -lthermophysicalFunctions \
    -lreactionThermophysicalModels \
    -lSLGThermo \
--- a/applications/solvers/lagrangian/steadyReactingParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/steadyReactingParcelFoam/Make/options
@ -10,8 +10,8 @@ EXE_INC = \
    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
    -I$(LIB_SRC)/thermophysicalModels/liquids/lnInclude \
    -I$(LIB_SRC)/thermophysicalModels/liquidMixture/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/solids/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/solidMixture/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/pointSolids/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/pointSolidMixture/lnInclude \
    -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
    -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
    -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
@ -32,8 +32,8 @@ EXE_LIBS = \
    -lbasicThermophysicalModels \
    -lliquids \
    -lliquidMixture \
-    -lsolids \
-    -lsolidMixture \
+    -lpointSolids \
+    -lpointSolidMixture \
    -lthermophysicalFunctions \
    -lreactionThermophysicalModels \
    -lSLGThermo \
--- a/applications/utilities/miscellaneous/foamDebugSwitches/Make/options
+++ b/applications/utilities/miscellaneous/foamDebugSwitches/Make/options
@ -47,9 +47,9 @@ EXE_LIBS = \
    -lrandomProcesses \
    -lreactionThermophysicalModels \
    -lsampling \
-    -lsolidMixture \
+    -lpointSolidMixture \
    -lsolidParticle \
-    -lsolids \
+    -lpointSolids \
    -lspecie \
    -lsurfMesh \
    -lsystemCall \