From 77858f24016c41df68d7fab8020a9e1177e98dc0 Mon Sep 17 00:00:00 2001 From: andy <andy> Date: Wed, 26 Sep 2012 11:28:19 +0100 Subject: [PATCH] ENH: removed solveSpecies flag from lagrangian solvers --- .../LTSReactingParcelFoam/LTSReactingParcelFoam.C | 2 -- applications/solvers/lagrangian/reactingParcelFoam/YEqn.H | 6 ++---- .../lagrangian/reactingParcelFoam/reactingParcelFoam.C | 1 - .../reactingParcelFoam/readAdditionalSolutionControls.H | 4 ---- .../lagrangian/sprayFoam/sprayEngineFoam/sprayEngineFoam.C | 1 - applications/solvers/lagrangian/sprayFoam/sprayFoam.C | 1 - 6 files changed, 2 insertions(+), 13 deletions(-) delete mode 100644 applications/solvers/lagrangian/reactingParcelFoam/readAdditionalSolutionControls.H diff --git a/applications/solvers/lagrangian/reactingParcelFoam/LTSReactingParcelFoam/LTSReactingParcelFoam.C b/applications/solvers/lagrangian/reactingParcelFoam/LTSReactingParcelFoam/LTSReactingParcelFoam.C index 0841d458b41..fabb0bba609 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/LTSReactingParcelFoam/LTSReactingParcelFoam.C +++ b/applications/solvers/lagrangian/reactingParcelFoam/LTSReactingParcelFoam/LTSReactingParcelFoam.C @@ -59,7 +59,6 @@ int main(int argc, char *argv[]) pimpleControl pimple(mesh); #include "readTimeControls.H" - #include "readAdditionalSolutionControls.H" #include "createFields.H" #include "createRDeltaT.H" #include "createRadiationModel.H" @@ -74,7 +73,6 @@ int main(int argc, char *argv[]) while (runTime.run()) { - #include "readAdditionalSolutionControls.H" #include "readTimeControls.H" runTime++; diff --git a/applications/solvers/lagrangian/reactingParcelFoam/YEqn.H b/applications/solvers/lagrangian/reactingParcelFoam/YEqn.H index 8ef6c610dd4..a22267d9be2 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/YEqn.H +++ b/applications/solvers/lagrangian/reactingParcelFoam/YEqn.H @@ -9,11 +9,9 @@ tmp<fv::convectionScheme<scalar> > mvConvection ) ); -combustion->correct(); -dQ = combustion->dQ(); - -if (solveSpecies) { + combustion->correct(); + dQ = combustion->dQ(); label inertIndex = -1; volScalarField Yt(0.0*Y[0]); diff --git a/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C b/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C index d1c735f658f..8ef6838c597 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C +++ b/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C @@ -78,7 +78,6 @@ int main(int argc, char *argv[]) while (runTime.run()) { #include "readTimeControls.H" - #include "readAdditionalSolutionControls.H" #include "compressibleCourantNo.H" #include "setDeltaT.H" diff --git a/applications/solvers/lagrangian/reactingParcelFoam/readAdditionalSolutionControls.H b/applications/solvers/lagrangian/reactingParcelFoam/readAdditionalSolutionControls.H deleted file mode 100644 index d04dfc406d1..00000000000 --- a/applications/solvers/lagrangian/reactingParcelFoam/readAdditionalSolutionControls.H +++ /dev/null @@ -1,4 +0,0 @@ -dictionary additional = mesh.solutionDict().subDict("additional"); - -// flag to activate solve transport for each specie (Y vector) -bool solveSpecies = additional.lookupOrDefault("solveSpecies", true); diff --git a/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/sprayEngineFoam.C b/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/sprayEngineFoam.C index 06ed6e1c2bb..1b4f46289fc 100644 --- a/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/sprayEngineFoam.C +++ b/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/sprayEngineFoam.C @@ -60,7 +60,6 @@ int main(int argc, char *argv[]) #include "startSummary.H" pimpleControl pimple(mesh); - bool solveSpecies = true; // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/lagrangian/sprayFoam/sprayFoam.C b/applications/solvers/lagrangian/sprayFoam/sprayFoam.C index 78713032f3c..02739bda71d 100644 --- a/applications/solvers/lagrangian/sprayFoam/sprayFoam.C +++ b/applications/solvers/lagrangian/sprayFoam/sprayFoam.C @@ -57,7 +57,6 @@ int main(int argc, char *argv[]) #include "setInitialDeltaT.H" pimpleControl pimple(mesh); - bool solveSpecies = true; // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -- GitLab