From b07a783fdda6fed8f8f05be8b5fa45ebb6247058 Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Mon, 19 Sep 2016 22:08:39 +0100 Subject: [PATCH] solvers: Moved createRDeltaT.H into createFields.H so that it is available with the -postProcess option Required to support LTS with the -postProcess option with sub-models dependent on ddt terms during construction, in particular reactingTwoPhaseEulerFoam. --- applications/solvers/combustion/reactingFoam/createFields.H | 2 ++ applications/solvers/combustion/reactingFoam/reactingFoam.C | 1 - .../reactingFoam/rhoReactingBuoyantFoam/createFields.H | 2 ++ .../rhoReactingBuoyantFoam/rhoReactingBuoyantFoam.C | 1 - .../combustion/reactingFoam/rhoReactingFoam/createFields.H | 2 ++ .../combustion/reactingFoam/rhoReactingFoam/rhoReactingFoam.C | 1 - applications/solvers/compressible/rhoCentralFoam/createFields.H | 2 ++ .../rhoCentralFoam/rhoCentralDyMFoam/rhoCentralDyMFoam.C | 2 ++ .../solvers/compressible/rhoCentralFoam/rhoCentralFoam.C | 1 - applications/solvers/compressible/rhoPimpleFoam/createFields.H | 2 ++ .../rhoPimpleFoam/rhoPimpleDyMFoam/rhoPimpleDyMFoam.C | 1 - applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C | 1 - .../solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C | 1 - .../solvers/lagrangian/coalChemistryFoam/createFields.H | 2 ++ .../solvers/lagrangian/reactingParcelFoam/createFields.H | 2 ++ .../solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C | 1 - applications/solvers/multiphase/interFoam/createFields.H | 2 ++ .../solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C | 1 - applications/solvers/multiphase/interFoam/interFoam.C | 1 - .../solvers/multiphase/interFoam/interMixingFoam/createFields.H | 2 ++ .../multiphase/interFoam/interMixingFoam/interMixingFoam.C | 1 - .../reactingMultiphaseEulerFoam/createFields.H | 1 + .../reactingMultiphaseEulerFoam/reactingMultiphaseEulerFoam.C | 1 - .../reactingEulerFoam/reactingTwoPhaseEulerFoam/createFields.H | 1 + .../reactingTwoPhaseEulerFoam/reactingTwoPhaseEulerFoam.C | 1 - 25 files changed, 22 insertions(+), 13 deletions(-) diff --git a/applications/solvers/combustion/reactingFoam/createFields.H b/applications/solvers/combustion/reactingFoam/createFields.H index bebae9978..e4475e5d1 100644 --- a/applications/solvers/combustion/reactingFoam/createFields.H +++ b/applications/solvers/combustion/reactingFoam/createFields.H @@ -1,3 +1,5 @@ +#include "createRDeltaT.H" + Info<< "Creating reaction model\n" << endl; autoPtr reaction diff --git a/applications/solvers/combustion/reactingFoam/reactingFoam.C b/applications/solvers/combustion/reactingFoam/reactingFoam.C index efcc5eb0e..1ad756802 100644 --- a/applications/solvers/combustion/reactingFoam/reactingFoam.C +++ b/applications/solvers/combustion/reactingFoam/reactingFoam.C @@ -49,7 +49,6 @@ int main(int argc, char *argv[]) #include "createMesh.H" #include "createControl.H" #include "createTimeControls.H" - #include "createRDeltaT.H" #include "initContinuityErrs.H" #include "createFields.H" #include "createFieldRefs.H" diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/createFields.H b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/createFields.H index 02e1e65b5..a4b328f36 100644 --- a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/createFields.H +++ b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/createFields.H @@ -1,3 +1,5 @@ +#include "createRDeltaT.H" + Info<< "Creating reaction model\n" << endl; autoPtr reaction diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/rhoReactingBuoyantFoam.C b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/rhoReactingBuoyantFoam.C index 8c8681753..4d9258e3d 100644 --- a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/rhoReactingBuoyantFoam.C +++ b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/rhoReactingBuoyantFoam.C @@ -50,7 +50,6 @@ int main(int argc, char *argv[]) #include "createMesh.H" #include "createControl.H" #include "createTimeControls.H" - #include "createRDeltaT.H" #include "initContinuityErrs.H" #include "createFields.H" #include "createFieldRefs.H" diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/createFields.H b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/createFields.H index c5d3bf6a6..fbd45dd20 100644 --- a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/createFields.H +++ b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/createFields.H @@ -1,3 +1,5 @@ +#include "createRDeltaT.H" + Info<< "Creating reaction model\n" << endl; autoPtr reaction diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/rhoReactingFoam.C b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/rhoReactingFoam.C index 479399a2b..b6cda2184 100644 --- a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/rhoReactingFoam.C +++ b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/rhoReactingFoam.C @@ -50,7 +50,6 @@ int main(int argc, char *argv[]) #include "createMesh.H" #include "createControl.H" #include "createTimeControls.H" - #include "createRDeltaT.H" #include "initContinuityErrs.H" #include "createFields.H" #include "createFieldRefs.H" diff --git a/applications/solvers/compressible/rhoCentralFoam/createFields.H b/applications/solvers/compressible/rhoCentralFoam/createFields.H index d42559381..b7cbdd067 100644 --- a/applications/solvers/compressible/rhoCentralFoam/createFields.H +++ b/applications/solvers/compressible/rhoCentralFoam/createFields.H @@ -1,3 +1,5 @@ +#include "createRDeltaT.H" + Info<< "Reading thermophysical properties\n" << endl; autoPtr pThermo diff --git a/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/rhoCentralDyMFoam.C b/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/rhoCentralDyMFoam.C index 3a61fcaab..7f31cf3cb 100644 --- a/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/rhoCentralDyMFoam.C +++ b/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/rhoCentralDyMFoam.C @@ -36,6 +36,8 @@ Description #include "turbulentFluidThermoModel.H" #include "fixedRhoFvPatchScalarField.H" #include "directionInterpolate.H" +#include "localEulerDdtScheme.H" +#include "fvcSmooth.H" #include "motionSolver.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C b/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C index d276cce80..2d5357bf2 100644 --- a/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C +++ b/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C @@ -51,7 +51,6 @@ int main(int argc, char *argv[]) #include "createFields.H" #include "createFieldRefs.H" #include "createTimeControls.H" - #include "createRDeltaT.H" turbulence->validate(); diff --git a/applications/solvers/compressible/rhoPimpleFoam/createFields.H b/applications/solvers/compressible/rhoPimpleFoam/createFields.H index 8d1ccb82f..a7ee3eca4 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/createFields.H +++ b/applications/solvers/compressible/rhoPimpleFoam/createFields.H @@ -1,3 +1,5 @@ +#include "createRDeltaT.H" + Info<< "Reading thermophysical properties\n" << endl; autoPtr pThermo diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/rhoPimpleDyMFoam.C b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/rhoPimpleDyMFoam.C index 9613b4a9a..c7046bb9b 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/rhoPimpleDyMFoam.C +++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/rhoPimpleDyMFoam.C @@ -57,7 +57,6 @@ int main(int argc, char *argv[]) #include "createTime.H" #include "createDynamicFvMesh.H" #include "createControl.H" - #include "createRDeltaT.H" #include "initContinuityErrs.H" #include "createFields.H" #include "createFieldRefs.H" diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C index 94df91270..108ad9aa0 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C +++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C @@ -53,7 +53,6 @@ int main(int argc, char *argv[]) #include "createMesh.H" #include "createControl.H" #include "createTimeControls.H" - #include "createRDeltaT.H" #include "initContinuityErrs.H" #include "createFields.H" #include "createFieldRefs.H" diff --git a/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C b/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C index 809571a35..cb12fc2b9 100644 --- a/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C +++ b/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C @@ -53,7 +53,6 @@ int main(int argc, char *argv[]) #include "createMesh.H" #include "createControl.H" #include "createTimeControls.H" - #include "createRDeltaT.H" #include "createFields.H" #include "createFieldRefs.H" #include "createFvOptions.H" diff --git a/applications/solvers/lagrangian/coalChemistryFoam/createFields.H b/applications/solvers/lagrangian/coalChemistryFoam/createFields.H index 33313ca07..d3daf7265 100644 --- a/applications/solvers/lagrangian/coalChemistryFoam/createFields.H +++ b/applications/solvers/lagrangian/coalChemistryFoam/createFields.H @@ -1,3 +1,5 @@ +#include "createRDeltaT.H" + #include "readGravitationalAcceleration.H" Info<< "Creating combustion model\n" << endl; diff --git a/applications/solvers/lagrangian/reactingParcelFoam/createFields.H b/applications/solvers/lagrangian/reactingParcelFoam/createFields.H index c04c242f4..e5ed566eb 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/createFields.H +++ b/applications/solvers/lagrangian/reactingParcelFoam/createFields.H @@ -1,3 +1,5 @@ +#include "createRDeltaT.H" + #include "readGravitationalAcceleration.H" Info<< "Creating combustion model\n" << endl; diff --git a/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C b/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C index 06838171f..dc9fd5c49 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C +++ b/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C @@ -52,7 +52,6 @@ int main(int argc, char *argv[]) #include "createMesh.H" #include "createControl.H" #include "createTimeControls.H" - #include "createRDeltaT.H" #include "createFields.H" #include "createFieldRefs.H" #include "createFvOptions.H" diff --git a/applications/solvers/multiphase/interFoam/createFields.H b/applications/solvers/multiphase/interFoam/createFields.H index 77cabdc4c..4a82afbd2 100644 --- a/applications/solvers/multiphase/interFoam/createFields.H +++ b/applications/solvers/multiphase/interFoam/createFields.H @@ -1,3 +1,5 @@ +#include "createRDeltaT.H" + Info<< "Reading field p_rgh\n" << endl; volScalarField p_rgh ( diff --git a/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C b/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C index 07206d3c5..0534896b6 100644 --- a/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C +++ b/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C @@ -60,7 +60,6 @@ int main(int argc, char *argv[]) #include "createControl.H" #include "createTimeControls.H" #include "createDyMControls.H" - #include "createRDeltaT.H" #include "createFields.H" #include "createFvOptions.H" diff --git a/applications/solvers/multiphase/interFoam/interFoam.C b/applications/solvers/multiphase/interFoam/interFoam.C index c5c4be315..5db4d7d32 100644 --- a/applications/solvers/multiphase/interFoam/interFoam.C +++ b/applications/solvers/multiphase/interFoam/interFoam.C @@ -62,7 +62,6 @@ int main(int argc, char *argv[]) #include "createMesh.H" #include "createControl.H" #include "createTimeControls.H" - #include "createRDeltaT.H" #include "initContinuityErrs.H" #include "createFields.H" #include "createFvOptions.H" diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/createFields.H b/applications/solvers/multiphase/interFoam/interMixingFoam/createFields.H index 07e174717..5b152b78a 100644 --- a/applications/solvers/multiphase/interFoam/interMixingFoam/createFields.H +++ b/applications/solvers/multiphase/interFoam/interMixingFoam/createFields.H @@ -1,3 +1,5 @@ +#include "createRDeltaT.H" + Info<< "Reading field p_rgh\n" << endl; volScalarField p_rgh ( diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C b/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C index 28d8d6d4b..b26630d36 100644 --- a/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C +++ b/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C @@ -52,7 +52,6 @@ int main(int argc, char *argv[]) #include "createMesh.H" #include "createControl.H" #include "createTimeControls.H" - #include "createRDeltaT.H" #include "initContinuityErrs.H" #include "createFields.H" #include "createFvOptions.H" diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/createFields.H b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/createFields.H index 8eafafb2f..1fc5b19ca 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/createFields.H +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/createFields.H @@ -1,3 +1,4 @@ +#include "createRDeltaT.H" #include "readGravitationalAcceleration.H" #include "readhRef.H" diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/reactingMultiphaseEulerFoam.C b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/reactingMultiphaseEulerFoam.C index d1b161956..11af0415f 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/reactingMultiphaseEulerFoam.C +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/reactingMultiphaseEulerFoam.C @@ -50,7 +50,6 @@ int main(int argc, char *argv[]) #include "createMesh.H" #include "createControl.H" #include "createTimeControls.H" - #include "createRDeltaT.H" #include "createFields.H" #include "createFieldRefs.H" diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/createFields.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/createFields.H index 932c05cb0..697269ff4 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/createFields.H +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/createFields.H @@ -1,3 +1,4 @@ +#include "createRDeltaT.H" #include "readGravitationalAcceleration.H" #include "readhRef.H" diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/reactingTwoPhaseEulerFoam.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/reactingTwoPhaseEulerFoam.C index 032b9bce4..e6fe5259d 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/reactingTwoPhaseEulerFoam.C +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/reactingTwoPhaseEulerFoam.C @@ -51,7 +51,6 @@ int main(int argc, char *argv[]) #include "createMesh.H" #include "createControl.H" #include "createTimeControls.H" - #include "createRDeltaT.H" #include "createFields.H" #include "createFieldRefs.H"