diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/SRF/SRFForce.C b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/SRF/SRFForce.C index 758e58743b..eed0c800d0 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/SRF/SRFForce.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/SRF/SRFForce.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -95,7 +95,9 @@ Foam::forceSuSp Foam::SRFForce::calcNonCoupled const vector& r = p.position(); // Coriolis and centrifugal acceleration terms - value.Su() = mass*(2.0*(p.U() ^ omega) + (omega ^ (r ^ omega))); + value.Su() = + mass*(1.0 - p.rhoc()/p.rho()) + *(2.0*(p.U() ^ omega) + (omega ^ (r ^ omega))); return value; } diff --git a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.C b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.C index d7ba9df79f..5a73765f93 100644 --- a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.C +++ b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverage.C @@ -144,11 +144,21 @@ void Foam::fieldAverage::initialize() } } } + + // ensure first averaging works unconditionally + prevTimeIndex_ = -1; + + initialised_ = true; } void Foam::fieldAverage::calcAverages() { + if (!initialised_) + { + initialize(); + } + const label currentTimeIndex = static_cast(obr_).time().timeIndex(); @@ -374,16 +384,6 @@ void Foam::fieldAverage::execute() { if (active_) { - if (!initialised_) - { - initialize(); - - // ensure first averaging works unconditionally - prevTimeIndex_ = -1; - - initialised_ = true; - } - calcAverages(); } } @@ -397,16 +397,6 @@ void Foam::fieldAverage::write() { if (active_) { - if (!initialised_) - { - initialize(); - - // ensure first averaging works unconditionally - prevTimeIndex_ = -1; - - initialised_ = true; - } - calcAverages(); writeAverages(); writeAveragingProperties();