From 4d6823c3eb330d89f608cdbd505938a20572b89b Mon Sep 17 00:00:00 2001 From: Henry Weller <http://cfd.direct> Date: Thu, 25 Jun 2015 22:43:22 +0100 Subject: [PATCH] reactingTwoPhaseEulerFoam: Minor reorganization --- .../multiphase/reactingTwoPhaseEulerFoam/CourantNos.H | 2 +- .../multiphase/reactingTwoPhaseEulerFoam/createFields.H | 3 +++ .../phaseSystems/phaseSystem/phaseSystem.H | 2 ++ .../reactingTwoPhaseEulerFoam/reactingTwoPhaseEulerFoam.C | 8 ++------ 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/CourantNos.H b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/CourantNos.H index 248f4c0602f..7ab578dd3f7 100644 --- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/CourantNos.H +++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/CourantNos.H @@ -1,4 +1,4 @@ - #include "CourantNo.H" +#include "CourantNo.H" { scalar UrCoNum = 0.5*gMax diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/createFields.H b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/createFields.H index 41eb6e0e746..85bb8be45e1 100644 --- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/createFields.H +++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/createFields.H @@ -71,3 +71,6 @@ pRefCell, pRefValue ); + + const IOMRFZoneList& MRF = fluid.MRF(); + fv::IOoptionList& fvOptions = fluid.fvOptions(); diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phaseSystem/phaseSystem.H b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phaseSystem/phaseSystem.H index 691a663ffbe..81bfd708f8a 100644 --- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phaseSystem/phaseSystem.H +++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phaseSystem/phaseSystem.H @@ -41,6 +41,8 @@ SourceFiles #include "phaseModel.H" #include "phasePair.H" #include "orderedPhasePair.H" +#include "HashPtrTable.H" + #include "IOMRFZoneList.H" #include "fvIOoptionList.H" diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/reactingTwoPhaseEulerFoam.C b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/reactingTwoPhaseEulerFoam.C index f74e3e93f08..27826f12a19 100644 --- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/reactingTwoPhaseEulerFoam.C +++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/reactingTwoPhaseEulerFoam.C @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>. Application - twoPhaseEulerFoam + reactingTwoPhaseEulerFoam Description Solver for a system of 2 compressible fluid phases with a common pressure, @@ -36,9 +36,8 @@ Description #include "fvCFD.H" #include "twoPhaseSystem.H" #include "PhaseCompressibleTurbulenceModel.H" -#include "pimpleControl.H" #include "fixedFluxPressureFvPatchScalarField.H" -#include "HashPtrTable.H" +#include "pimpleControl.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -72,9 +71,6 @@ int main(int argc, char *argv[]) #include "pUf/createDDtU.H" - const IOMRFZoneList& MRF = fluid.MRF(); - fv::IOoptionList& fvOptions = fluid.fvOptions(); - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // Info<< "\nStarting time loop\n" << endl; -- GitLab