diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/Make/options b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/Make/options index c14a8799f6ff63a71131dcce8786d9ac04a58c17..043be5d13c298185501429076996a3d19e6b678b 100644 --- a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/Make/options +++ b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/Make/options @@ -1,4 +1,5 @@ EXE_INC = \ + -I. \ -I../buoyantBoussinesqSimpleFoam \ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C index d522323fd3051eb82f5211d7cd09c02126200555..e082648b75057c2f1240174b7fba6599bc479839 100644 --- a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C +++ b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C @@ -56,19 +56,18 @@ Description int main(int argc, char *argv[]) { + #include "postProcess.H" + #include "setRootCase.H" #include "createTime.H" #include "createMesh.H" - - pimpleControl pimple(mesh); - + #include "createControl.H" #include "createFields.H" - #include "createIncompressibleRadiationModel.H" #include "createFvOptions.H" - #include "initContinuityErrs.H" #include "createTimeControls.H" #include "CourantNo.H" #include "setInitialDeltaT.H" + #include "initContinuityErrs.H" turbulence->validate(); diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/createFields.H b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/createFields.H index cc2c5f0b4ce77cef6a1041fb275f52352002b58a..def60953c47355de65f1fd66b26dff3520287227 100644 --- a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/createFields.H +++ b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/createFields.H @@ -122,3 +122,4 @@ if (p_rgh.needReference()) mesh.setFluxRequired(p_rgh.name()); #include "createMRF.H" +#include "createIncompressibleRadiationModel.H" diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C index 6c4955dfbfeec150b7e2a9cb0fcfe5113c16568b..de844ad96e11af70c5dba8993e6c951b188223e0 100644 --- a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C +++ b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C @@ -56,14 +56,13 @@ Description int main(int argc, char *argv[]) { + #include "postProcess.H" + #include "setRootCase.H" #include "createTime.H" #include "createMesh.H" - - simpleControl simple(mesh); - + #include "createControl.H" #include "createFields.H" - #include "createIncompressibleRadiationModel.H" #include "createFvOptions.H" #include "initContinuityErrs.H" diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/createFields.H b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/createFields.H index 583cbaf2d53fd57e807003de37c78a5b7efb4457..043440763fffe922296d2e8080978d41991c0fa6 100644 --- a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/createFields.H +++ b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/createFields.H @@ -122,3 +122,4 @@ if (p_rgh.needReference()) mesh.setFluxRequired(p_rgh.name()); #include "createMRF.H" +#include "createIncompressibleRadiationModel.H" diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C b/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C index 56ebdc5c8b91cd201ef20afcf0061c3d7a2a4265..d960e053d80ac4eb0f16490f787804fd900e3aa7 100644 --- a/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C +++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C @@ -44,15 +44,15 @@ Description int main(int argc, char *argv[]) { + #include "postProcess.H" + #include "setRootCase.H" #include "createTime.H" #include "createMesh.H" - - pimpleControl pimple(mesh); - + #include "createControl.H" #include "createFields.H" + #include "createFieldRefs.H" #include "createFvOptions.H" - #include "createRadiationModel.H" #include "initContinuityErrs.H" #include "createTimeControls.H" #include "compressibleCourantNo.H" diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/createFieldRefs.H b/applications/solvers/heatTransfer/buoyantPimpleFoam/createFieldRefs.H new file mode 100644 index 0000000000000000000000000000000000000000..502b3b423007919fa7a75206ecafe324f3ac8ed5 --- /dev/null +++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/createFieldRefs.H @@ -0,0 +1 @@ +const volScalarField& psi = thermo.psi(); diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/createFields.H b/applications/solvers/heatTransfer/buoyantPimpleFoam/createFields.H index b3c45fcaaf880a767b4adf48c9d27be4a555b6de..ff835c8a79928788818b4539eae05d83c448f20e 100644 --- a/applications/solvers/heatTransfer/buoyantPimpleFoam/createFields.H +++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/createFields.H @@ -18,8 +18,6 @@ volScalarField rho ); volScalarField& p = thermo.p(); -const volScalarField& psi = thermo.psi(); - Info<< "Reading field U\n" << endl; volVectorField U @@ -92,3 +90,4 @@ Info<< "Creating field kinetic energy K\n" << endl; volScalarField K("K", 0.5*magSqr(U)); #include "createMRF.H" +#include "createRadiationModel.H" diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C b/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C index cb4d67a0c22f62eb87af33c863d9a04458af134d..e9add9cd02a9813ddc40ab865f5f2369d33624a2 100644 --- a/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C +++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C @@ -41,15 +41,15 @@ Description int main(int argc, char *argv[]) { + #include "postProcess.H" + #include "setRootCase.H" #include "createTime.H" #include "createMesh.H" - - simpleControl simple(mesh); - + #include "createControl.H" #include "createFields.H" + #include "createFieldRefs.H" #include "createFvOptions.H" - #include "createRadiationModel.H" #include "initContinuityErrs.H" turbulence->validate(); diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/createFieldRefs.H b/applications/solvers/heatTransfer/buoyantSimpleFoam/createFieldRefs.H new file mode 100644 index 0000000000000000000000000000000000000000..502b3b423007919fa7a75206ecafe324f3ac8ed5 --- /dev/null +++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/createFieldRefs.H @@ -0,0 +1 @@ +const volScalarField& psi = thermo.psi(); diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H b/applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H index ca107c09281c70bf43056fe16a4a0c651ca55cbb..b9f275407f4ceb335c60de4158636dec4ded797c 100644 --- a/applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H +++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H @@ -18,7 +18,6 @@ volScalarField rho ); volScalarField& p = thermo.p(); -const volScalarField& psi = thermo.psi(); Info<< "Reading field U\n" << endl; volVectorField U @@ -88,3 +87,4 @@ dimensionedScalar initialMass = fvc::domainIntegrate(rho); dimensionedScalar totalVolume = sum(mesh.V()); #include "createMRF.H" +#include "createRadiationModel.H" diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options b/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options index 2b6f5e7e7041769229e5c72d946a7204ed0e422f..fd53d162e69b744ae81c31e3aa1824ee03dcc157 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/Make/options @@ -1,5 +1,6 @@ EXE_INC = \ + -I. \ -I./fluid \ -I./solid \ -I./porousFluid \ diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C index 1ad39c9d0814d1bd6d32c626726b494e353b5a77..7a396ee38916844b4b90cd29b6d870c18e3da2d3 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C @@ -50,22 +50,17 @@ Description int main(int argc, char *argv[]) { + #define NO_CONTROL + #define CREATE_MESH createMeshesPostProcess.H + #include "postProcess.H" + #include "setRootCase.H" #include "createTime.H" - - regionProperties rp(runTime); - - #include "createFluidMeshes.H" - #include "createSolidMeshes.H" - - #include "createFluidFields.H" - #include "createSolidFields.H" - + #include "createMeshes.H" + #include "createFields.H" #include "initContinuityErrs.H" #include "createTimeControls.H" #include "readSolidTimeControls.H" - - #include "compressibleMultiRegionCourantNo.H" #include "solidRegionDiffusionNo.H" #include "setInitialMultiRegionDeltaT.H" diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/options b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/options index 252ecae022bd6eaf17a00fa79edd984a4713045f..78fc5be02cb1270b92bf69f214578c2b367158f3 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/options +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/Make/options @@ -1,4 +1,6 @@ EXE_INC = \ + -I. \ + -I.. \ -Ifluid \ -Isolid \ -I../solid \ diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/chtMultiRegionSimpleFoam.C b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/chtMultiRegionSimpleFoam.C index 6b4811a026a6cbeaaea0ab39d5cc787eda6d2c46..9992f8f7050bd699e3e25b9da113326cbbe23b7c 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/chtMultiRegionSimpleFoam.C +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/chtMultiRegionSimpleFoam.C @@ -43,17 +43,14 @@ Description int main(int argc, char *argv[]) { + #define NO_CONTROL + #define CREATE_MESH createMeshesPostProcess.H + #include "postProcess.H" + #include "setRootCase.H" #include "createTime.H" - - regionProperties rp(runTime); - - #include "createFluidMeshes.H" - #include "createSolidMeshes.H" - - #include "createFluidFields.H" - #include "createSolidFields.H" - + #include "createMeshes.H" + #include "createFields.H" #include "initContinuityErrs.H" diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/createFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/createFields.H new file mode 100644 index 0000000000000000000000000000000000000000..30f4452304085c417671822e2233d1cb1db935db --- /dev/null +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/createFields.H @@ -0,0 +1,2 @@ +#include "createFluidFields.H" +#include "createSolidFields.H" diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/createMeshes.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/createMeshes.H new file mode 100644 index 0000000000000000000000000000000000000000..97aed217786299e3c91bc2aa0a68c0c5a9c9b275 --- /dev/null +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/createMeshes.H @@ -0,0 +1,4 @@ +regionProperties rp(runTime); + +#include "createFluidMeshes.H" +#include "createSolidMeshes.H" diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/createMeshesPostProcess.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/createMeshesPostProcess.H new file mode 100644 index 0000000000000000000000000000000000000000..61d94eb5c80936061a190a7042d2551cbc6c603f --- /dev/null +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/createMeshesPostProcess.H @@ -0,0 +1,2 @@ +#include "createMeshes.H" +fvMesh& mesh = fluidRegions[0]; diff --git a/applications/solvers/heatTransfer/thermoFoam/createFields.H b/applications/solvers/heatTransfer/thermoFoam/createFields.H index ffa6c3f3b52113c56d4bc5329c218a1c57f25162..3a217895f6754a38bbaa5ddbb81ad7342255667e 100644 --- a/applications/solvers/heatTransfer/thermoFoam/createFields.H +++ b/applications/solvers/heatTransfer/thermoFoam/createFields.H @@ -1,54 +1,56 @@ - Info<< "Reading thermophysical properties\n" << endl; +Info<< "Reading thermophysical properties\n" << endl; - autoPtr<rhoThermo> pThermo(rhoThermo::New(mesh)); - rhoThermo& thermo = pThermo(); - thermo.validate(args.executable(), "h", "e"); +autoPtr<rhoThermo> pThermo(rhoThermo::New(mesh)); +rhoThermo& thermo = pThermo(); +thermo.validate(args.executable(), "h", "e"); - volScalarField rho +volScalarField rho +( + IOobject ( - IOobject - ( - "rho", - runTime.timeName(), - mesh, - IOobject::NO_READ, - IOobject::NO_WRITE - ), - thermo.rho() - ); - - volScalarField& p = thermo.p(); - - Info<< "Reading field U\n" << endl; - volVectorField U + "rho", + runTime.timeName(), + mesh, + IOobject::NO_READ, + IOobject::NO_WRITE + ), + thermo.rho() +); + +volScalarField& p = thermo.p(); + +Info<< "Reading field U\n" << endl; +volVectorField U +( + IOobject ( - IOobject - ( - "U", - runTime.timeName(), - mesh, - IOobject::MUST_READ, - IOobject::AUTO_WRITE - ), - mesh - ); + "U", + runTime.timeName(), + mesh, + IOobject::MUST_READ, + IOobject::AUTO_WRITE + ), + mesh +); - #include "compressibleCreatePhi.H" +#include "compressibleCreatePhi.H" - #include "setAlphaEff.H" +#include "setAlphaEff.H" - Info<< "Creating field dpdt\n" << endl; - volScalarField dpdt +Info<< "Creating field dpdt\n" << endl; +volScalarField dpdt +( + IOobject ( - IOobject - ( - "dpdt", - runTime.timeName(), - mesh - ), - mesh, - dimensionedScalar("dpdt", p.dimensions()/dimTime, 0) - ); + "dpdt", + runTime.timeName(), + mesh + ), + mesh, + dimensionedScalar("dpdt", p.dimensions()/dimTime, 0) +); + +Info<< "Creating field kinetic energy K\n" << endl; +volScalarField K("K", 0.5*magSqr(U)); - Info<< "Creating field kinetic energy K\n" << endl; - volScalarField K("K", 0.5*magSqr(U)); +#include "createRadiationModel.H" diff --git a/applications/solvers/heatTransfer/thermoFoam/setAlphaEff.H b/applications/solvers/heatTransfer/thermoFoam/setAlphaEff.H index fff960526fe8e78c16e6dd01b43b148868d21205..73a157fc12735b083a3889f5171fd6bfff3b61d4 100644 --- a/applications/solvers/heatTransfer/thermoFoam/setAlphaEff.H +++ b/applications/solvers/heatTransfer/thermoFoam/setAlphaEff.H @@ -1,49 +1,47 @@ - Info<< "Creating turbulence model\n" << endl; - tmp<volScalarField> talphaEff; +Info<< "Creating turbulence model\n" << endl; +tmp<volScalarField> talphaEff; - IOobject turbulencePropertiesHeader - ( - "turbulenceProperties", - runTime.constant(), - mesh, - IOobject::MUST_READ_IF_MODIFIED, - IOobject::NO_WRITE, - false - ); +IOobject turbulencePropertiesHeader +( + "turbulenceProperties", + runTime.constant(), + mesh, + IOobject::MUST_READ_IF_MODIFIED, + IOobject::NO_WRITE, + false +); - if (turbulencePropertiesHeader.headerOk()) - { - autoPtr<compressible::turbulenceModel> turbulence +if (turbulencePropertiesHeader.headerOk()) +{ + autoPtr<compressible::turbulenceModel> turbulence + ( + compressible::turbulenceModel::New ( - compressible::turbulenceModel::New - ( - rho, - U, - phi, - thermo - ) - ); + rho, + U, + phi, + thermo + ) + ); - talphaEff = turbulence->alphaEff(); - } - else - { - talphaEff = tmp<volScalarField> + talphaEff = turbulence->alphaEff(); +} +else +{ + talphaEff = tmp<volScalarField> + ( + new volScalarField ( - new volScalarField + IOobject ( - IOobject - ( - "alphaEff", - runTime.timeName(), - mesh, - IOobject::NO_READ, - IOobject::NO_WRITE - ), + "alphaEff", + runTime.timeName(), mesh, - dimensionedScalar("0", dimMass/dimLength/dimTime, 0.0) - ) - ); - } - - const volScalarField& alphaEff = talphaEff(); + IOobject::NO_READ, + IOobject::NO_WRITE + ), + mesh, + dimensionedScalar("0", dimMass/dimLength/dimTime, 0.0) + ) + ); +} diff --git a/applications/solvers/heatTransfer/thermoFoam/thermoFoam.C b/applications/solvers/heatTransfer/thermoFoam/thermoFoam.C index a3687213df6556d596a1fa4965e82cc579e7d7bf..5770912322d71e656038c4f8f73e0c01e7a961eb 100644 --- a/applications/solvers/heatTransfer/thermoFoam/thermoFoam.C +++ b/applications/solvers/heatTransfer/thermoFoam/thermoFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -43,13 +43,16 @@ Description int main(int argc, char *argv[]) { - #include "setRootCase.H" + #define NO_CONTROL + #include "postProcess.H" + #include "setRootCase.H" #include "createTime.H" #include "createMesh.H" #include "createFields.H" #include "createFvOptions.H" - #include "createRadiationModel.H" + + const volScalarField& alphaEff = talphaEff(); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //