diff --git a/applications/solvers/compressible/rhoSimpleFoam/createFields.H b/applications/solvers/compressible/rhoSimpleFoam/createFields.H index e8c2ce6d548c113c162b290869c58d475099d6c9..176a61a0c1339a783f1e8b56402e9acc7410ecf4 100644 --- a/applications/solvers/compressible/rhoSimpleFoam/createFields.H +++ b/applications/solvers/compressible/rhoSimpleFoam/createFields.H @@ -1,10 +1,9 @@ Info<< "Reading thermophysical properties\n" << endl; - -autoPtr<psiThermo> pThermo +autoPtr<rhoThermo> pThermo ( - psiThermo::New(mesh) + rhoThermo::New(mesh) ); -psiThermo& thermo = pThermo(); +rhoThermo& thermo = pThermo(); thermo.validate(args.executable(), "h", "e"); volScalarField rho diff --git a/applications/solvers/compressible/rhoSimpleFoam/pEqn.H b/applications/solvers/compressible/rhoSimpleFoam/pEqn.H index e46f2a6691322c46462cb42961fcbd19ab1c8cc7..291c220b95b9dc34b6d1a2f439548a03fb1144a5 100644 --- a/applications/solvers/compressible/rhoSimpleFoam/pEqn.H +++ b/applications/solvers/compressible/rhoSimpleFoam/pEqn.H @@ -1,4 +1,6 @@ { + //const volScalarField& psi = thermo.psi(); + volScalarField rAU(1.0/UEqn.A()); surfaceScalarField rhorAUf("rhorAUf", fvc::interpolate(rho*rAU)); volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p)); @@ -93,6 +95,9 @@ rho = max(rho, rhoMin); rho = min(rho, rhoMax); + thermo.rho() = max(thermo.rho(), rhoMin); + thermo.rho() = min(thermo.rho(), rhoMax); + if (!simple.transonic()) { rho.relax(); diff --git a/applications/solvers/compressible/rhoSimpleFoam/pcEqn.H b/applications/solvers/compressible/rhoSimpleFoam/pcEqn.H index 67b962f80509f800763f0676e21f7fecfcf0e15c..446a7849d0c779a9bf148d18e01770143f62b7ab 100644 --- a/applications/solvers/compressible/rhoSimpleFoam/pcEqn.H +++ b/applications/solvers/compressible/rhoSimpleFoam/pcEqn.H @@ -109,6 +109,8 @@ if (closedVolume) rho = thermo.rho(); rho = max(rho, rhoMin); rho = min(rho, rhoMax); +thermo.rho() = max(thermo.rho(), rhoMin); +thermo.rho() = min(thermo.rho(), rhoMax); if (!simple.transonic()) { diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/pEqn.H b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/pEqn.H index 7b559831614b64ecec5b82ca1fb40b85a1d4e309..cdabc4dad9861ae71d19a708ef9301ec0642867c 100644 --- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/pEqn.H +++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/pEqn.H @@ -86,6 +86,10 @@ rho = thermo.rho(); rho = max(rho, rhoMin); rho = min(rho, rhoMax); + + thermo.rho() = max(thermo.rho(), rhoMin); + thermo.rho() = min(thermo.rho(), rhoMax); + rho.relax(); Info<< "rho max/min : " << max(rho).value() << " " diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C b/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C index 5cffb134113a593d3743f13d8a415b38950d0c8d..63f00f881d594f8335ed3f982e648b2c3ace60c3 100644 --- a/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C +++ b/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C @@ -33,7 +33,7 @@ Description \*---------------------------------------------------------------------------*/ #include "fvCFD.H" -#include "psiThermo.H" +#include "rhoThermo.H" #include "turbulentFluidThermoModel.H" #include "simpleControl.H" #include "fvOptions.H" diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/controlDict b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/controlDict index cedfba6ff56b2bb5b0e7e59926422ecccd83169c..b03a976296f63ce07d1f8535c23b77f28492c957 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/controlDict +++ b/tutorials/heatTransfer/chtMultiRegionFoam/externalSolarLoad/system/controlDict @@ -25,7 +25,7 @@ stopAt endTime; endTime 18000; -deltaT 10; +deltaT 1; writeControl adjustableRunTime; @@ -49,4 +49,8 @@ adjustTimeStep yes; maxCo 15; +maxDeltaT 10; + +maxDi 0.25; + // ************************************************************************* // diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/fvOptions b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/fvOptions index ae17055b8c45a3da3d4aefbcb708d6fd52682633..92a4b462c0a7fe08c8d70a05a0c9a1418111d984 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/fvOptions +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/fvOptions @@ -43,7 +43,7 @@ options } } } - +/* momentumSource1 { type vectorSemiImplicitSource; @@ -55,11 +55,11 @@ options volumeMode absolute; injectionRateSuSp { - U.steam ((0 1e-1 0) 0); // kg*m/s^2 + U.steam ((0 1e-2 0) 0); // kg*m/s^2 } } } - +*/ energySource1 { type scalarSemiImplicitSource;