From 2647d178fa86ffb3d8fc9713a9cf7135da190bbd Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Wed, 16 Dec 2015 10:13:09 +0000 Subject: [PATCH] solvers: Change from pure RAS to any turbulence model Provides support for running laminar. --- .../compressible/rhoSimpleFoam/createFields.H | 4 +- .../rhoPorousSimpleFoam/createFields.H | 4 +- .../createFields.H | 4 +- .../createFields.H | 4 +- .../buoyantSimpleFoam/createFields.H | 4 +- .../heatTransfer/thermoFoam/setAlphaEff.H | 54 ++----------------- .../createFields.H | 4 +- .../boundaryFoam/createFields.H | 4 +- 8 files changed, 19 insertions(+), 63 deletions(-) diff --git a/applications/solvers/compressible/rhoSimpleFoam/createFields.H b/applications/solvers/compressible/rhoSimpleFoam/createFields.H index 80f317cd85..61cea5c2e5 100644 --- a/applications/solvers/compressible/rhoSimpleFoam/createFields.H +++ b/applications/solvers/compressible/rhoSimpleFoam/createFields.H @@ -69,9 +69,9 @@ dimensionedScalar rhoMin ); Info<< "Creating turbulence model\n" << endl; -autoPtr turbulence +autoPtr turbulence ( - compressible::New + compressible::turbulenceModel::New ( rho, U, diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/createFields.H b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/createFields.H index 537eea2ea3..2fe0e53dbc 100644 --- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/createFields.H +++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/createFields.H @@ -68,9 +68,9 @@ dimensionedScalar rhoMin ); Info<< "Creating turbulence model\n" << endl; -autoPtr turbulence +autoPtr turbulence ( - compressible::New + compressible::turbulenceModel::New ( rho, U, diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/createFields.H b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/createFields.H index b8d07b1f1a..0916e2788d 100644 --- a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/createFields.H +++ b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/createFields.H @@ -47,9 +47,9 @@ volVectorField U #include "readTransportProperties.H" Info<< "Creating turbulence model\n" << endl; -autoPtr turbulence +autoPtr turbulence ( - incompressible::New(U, phi, laminarTransport) + incompressible::turbulenceModel::New(U, phi, laminarTransport) ); // Kinematic density for buoyancy force diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/createFields.H b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/createFields.H index 014bf8045c..e78daa67b3 100644 --- a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/createFields.H +++ b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/createFields.H @@ -47,9 +47,9 @@ volVectorField U #include "readTransportProperties.H" Info<< "Creating turbulence model\n" << endl; -autoPtr turbulence +autoPtr turbulence ( - incompressible::New(U, phi, laminarTransport) + incompressible::turbulenceModel::New(U, phi, laminarTransport) ); // Kinematic density for buoyancy force diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H b/applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H index d7cf3eb704..35c6c59560 100644 --- a/applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H +++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H @@ -37,9 +37,9 @@ volVectorField U #include "compressibleCreatePhi.H" Info<< "Creating turbulence model\n" << endl; -autoPtr turbulence +autoPtr turbulence ( - compressible::New + compressible::turbulenceModel::New ( rho, U, diff --git a/applications/solvers/heatTransfer/thermoFoam/setAlphaEff.H b/applications/solvers/heatTransfer/thermoFoam/setAlphaEff.H index 4af3af3ce4..fff960526f 100644 --- a/applications/solvers/heatTransfer/thermoFoam/setAlphaEff.H +++ b/applications/solvers/heatTransfer/thermoFoam/setAlphaEff.H @@ -1,31 +1,17 @@ Info<< "Creating turbulence model\n" << endl; tmp talphaEff; - IOobject turbulenceHeader + IOobject turbulencePropertiesHeader ( "turbulenceProperties", runTime.constant(), mesh, - IOobject::MUST_READ + IOobject::MUST_READ_IF_MODIFIED, + IOobject::NO_WRITE, + false ); - IOobject RASHeader - ( - "RASProperties", - runTime.constant(), - mesh, - IOobject::MUST_READ - ); - - IOobject LESHeader - ( - "LESProperties", - runTime.constant(), - mesh, - IOobject::MUST_READ - ); - - if (turbulenceHeader.headerOk()) + if (turbulencePropertiesHeader.headerOk()) { autoPtr turbulence ( @@ -40,36 +26,6 @@ talphaEff = turbulence->alphaEff(); } - else if (RASHeader.headerOk()) - { - autoPtr turbulence - ( - compressible::New - ( - rho, - U, - phi, - thermo - ) - ); - - talphaEff = turbulence->alphaEff(); - } - else if (LESHeader.headerOk()) - { - autoPtr turbulence - ( - compressible::New - ( - rho, - U, - phi, - thermo - ) - ); - - talphaEff = turbulence->alphaEff(); - } else { talphaEff = tmp diff --git a/applications/solvers/incompressible/adjointShapeOptimizationFoam/createFields.H b/applications/solvers/incompressible/adjointShapeOptimizationFoam/createFields.H index cb7da73687..93da72123d 100644 --- a/applications/solvers/incompressible/adjointShapeOptimizationFoam/createFields.H +++ b/applications/solvers/incompressible/adjointShapeOptimizationFoam/createFields.H @@ -80,9 +80,9 @@ mesh.setFluxRequired(pa.name()); singlePhaseTransportModel laminarTransport(U, phi); -autoPtr turbulence +autoPtr turbulence ( - incompressible::New(U, phi, laminarTransport) + incompressible::turbulenceModel::New(U, phi, laminarTransport) ); diff --git a/applications/solvers/incompressible/boundaryFoam/createFields.H b/applications/solvers/incompressible/boundaryFoam/createFields.H index 5ecfebfcb4..0298c8339c 100644 --- a/applications/solvers/incompressible/boundaryFoam/createFields.H +++ b/applications/solvers/incompressible/boundaryFoam/createFields.H @@ -31,9 +31,9 @@ surfaceScalarField phi singlePhaseTransportModel laminarTransport(U, phi); -autoPtr turbulence +autoPtr turbulence ( - incompressible::New(U, phi, laminarTransport) + incompressible::turbulenceModel::New(U, phi, laminarTransport) ); dimensionedVector Ubar("Ubar", dimVelocity, laminarTransport);