From 45461bfcfe585a723540fb5cabd2ae41ead28781 Mon Sep 17 00:00:00 2001 From: Henry Date: Tue, 10 Feb 2015 18:33:45 +0000 Subject: [PATCH] solvers: rationalize the construction of the fvOptions --- .../solvers/multiphase/interFoam/LTSInterFoam/LTSInterFoam.C | 1 + applications/solvers/multiphase/interFoam/createFields.H | 3 --- .../solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C | 1 + applications/solvers/multiphase/interFoam/interFoam.C | 1 + .../multiphase/interFoam/interMixingFoam/createFields.H | 2 -- .../multiphase/interFoam/interMixingFoam/interMixingFoam.C | 1 + .../multiphase/interFoam/porousInterFoam/porousInterFoam.C | 1 + .../solvers/multiphase/interPhaseChangeFoam/createFields.H | 2 -- .../interPhaseChangeDyMFoam/interPhaseChangeDyMFoam.C | 1 + .../multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C | 1 + .../solvers/multiphase/multiphaseInterFoam/createFields.H | 2 -- .../multiphaseInterDyMFoam/multiphaseInterDyMFoam.C | 1 + .../multiphase/multiphaseInterFoam/multiphaseInterFoam.C | 1 + 13 files changed, 9 insertions(+), 9 deletions(-) diff --git a/applications/solvers/multiphase/interFoam/LTSInterFoam/LTSInterFoam.C b/applications/solvers/multiphase/interFoam/LTSInterFoam/LTSInterFoam.C index fa0a219340..f08ab03306 100644 --- a/applications/solvers/multiphase/interFoam/LTSInterFoam/LTSInterFoam.C +++ b/applications/solvers/multiphase/interFoam/LTSInterFoam/LTSInterFoam.C @@ -59,6 +59,7 @@ int main(int argc, char *argv[]) #include "initContinuityErrs.H" #include "createFields.H" + #include "createFvOptions.H" #include "createPrghCorrTypes.H" #include "correctPhi.H" #include "CourantNo.H" diff --git a/applications/solvers/multiphase/interFoam/createFields.H b/applications/solvers/multiphase/interFoam/createFields.H index fd82e8a556..30505b2fc9 100644 --- a/applications/solvers/multiphase/interFoam/createFields.H +++ b/applications/solvers/multiphase/interFoam/createFields.H @@ -128,8 +128,5 @@ } - fv::IOoptionList fvOptions(mesh); - - // MULES Correction tmp tphiAlphaCorr0; diff --git a/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C b/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C index ba40cc3e17..b517d082c8 100644 --- a/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C +++ b/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C @@ -54,6 +54,7 @@ int main(int argc, char *argv[]) pimpleControl pimple(mesh); #include "createFields.H" + #include "createFvOptions.H" #include "readTimeControls.H" #include "createPrghCorrTypes.H" diff --git a/applications/solvers/multiphase/interFoam/interFoam.C b/applications/solvers/multiphase/interFoam/interFoam.C index deb001c4fb..8250667ce6 100644 --- a/applications/solvers/multiphase/interFoam/interFoam.C +++ b/applications/solvers/multiphase/interFoam/interFoam.C @@ -58,6 +58,7 @@ int main(int argc, char *argv[]) #include "initContinuityErrs.H" #include "createFields.H" + #include "createFvOptions.H" #include "readTimeControls.H" #include "createPrghCorrTypes.H" #include "correctPhi.H" diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/createFields.H b/applications/solvers/multiphase/interFoam/interMixingFoam/createFields.H index 45d276b9e5..284d9ed035 100644 --- a/applications/solvers/multiphase/interFoam/interMixingFoam/createFields.H +++ b/applications/solvers/multiphase/interFoam/interMixingFoam/createFields.H @@ -118,5 +118,3 @@ ); p_rgh = p - rho*gh; } - - fv::IOoptionList fvOptions(mesh); diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C b/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C index fa72c15125..62b02ddd9c 100644 --- a/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C +++ b/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C @@ -52,6 +52,7 @@ int main(int argc, char *argv[]) #include "readGravitationalAcceleration.H" #include "initContinuityErrs.H" #include "createFields.H" + #include "createFvOptions.H" #include "readTimeControls.H" #include "CourantNo.H" #include "setInitialDeltaT.H" diff --git a/applications/solvers/multiphase/interFoam/porousInterFoam/porousInterFoam.C b/applications/solvers/multiphase/interFoam/porousInterFoam/porousInterFoam.C index ac926a7308..f6d7e157c5 100644 --- a/applications/solvers/multiphase/interFoam/porousInterFoam/porousInterFoam.C +++ b/applications/solvers/multiphase/interFoam/porousInterFoam/porousInterFoam.C @@ -60,6 +60,7 @@ int main(int argc, char *argv[]) #include "initContinuityErrs.H" #include "createFields.H" + #include "createFvOptions.H" #include "createPorousZones.H" #include "readTimeControls.H" #include "createPrghCorrTypes.H" diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/createFields.H b/applications/solvers/multiphase/interPhaseChangeFoam/createFields.H index 5bb6a6a22f..d8b06da38d 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/createFields.H +++ b/applications/solvers/multiphase/interPhaseChangeFoam/createFields.H @@ -105,5 +105,3 @@ ); p_rgh = p - rho*gh; } - - fv::IOoptionList fvOptions(mesh); diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/interPhaseChangeDyMFoam.C b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/interPhaseChangeDyMFoam.C index c71ca6ef0f..aa21bdecb4 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/interPhaseChangeDyMFoam.C +++ b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/interPhaseChangeDyMFoam.C @@ -65,6 +65,7 @@ int main(int argc, char *argv[]) #include "readGravitationalAcceleration.H" #include "initContinuityErrs.H" #include "createFields.H" + #include "createFvOptions.H" #include "readTimeControls.H" #include "createPcorrTypes.H" diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C index 617e6fd8f4..372e072671 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C +++ b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C @@ -63,6 +63,7 @@ int main(int argc, char *argv[]) #include "readGravitationalAcceleration.H" #include "initContinuityErrs.H" #include "createFields.H" + #include "createFvOptions.H" #include "readTimeControls.H" #include "createPrghCorrTypes.H" #include "CourantNo.H" diff --git a/applications/solvers/multiphase/multiphaseInterFoam/createFields.H b/applications/solvers/multiphase/multiphaseInterFoam/createFields.H index 51536b2e05..26d7a17dc0 100644 --- a/applications/solvers/multiphase/multiphaseInterFoam/createFields.H +++ b/applications/solvers/multiphase/multiphaseInterFoam/createFields.H @@ -91,5 +91,3 @@ pRefValue - getRefCellValue(p, pRefCell) ); } - - fv::IOoptionList fvOptions(mesh); diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterDyMFoam/multiphaseInterDyMFoam.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterDyMFoam/multiphaseInterDyMFoam.C index 7e31d9e420..61b8d719af 100644 --- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterDyMFoam/multiphaseInterDyMFoam.C +++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterDyMFoam/multiphaseInterDyMFoam.C @@ -52,6 +52,7 @@ int main(int argc, char *argv[]) pimpleControl pimple(mesh); #include "createFields.H" + #include "createFvOptions.H" #include "readTimeControls.H" #include "createPrghCorrTypes.H" diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C index aceeac09c0..e942c62231 100644 --- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C +++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C @@ -51,6 +51,7 @@ int main(int argc, char *argv[]) #include "initContinuityErrs.H" #include "createFields.H" + #include "createFvOptions.H" #include "readTimeControls.H" #include "createPrghCorrTypes.H" #include "correctPhi.H"