From 5d96cfa89799286251d177b91bbe0f390572e617 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Tue, 13 May 2008 11:23:28 +0100
Subject: [PATCH] removed hard-coded averaging - can now use fieldAverage
 unction object

---
 .../multiphase/lesCavitatingFoam/UEqn.H       |  2 +-
 .../lesCavitatingFoam/calculateAverages.H     | 12 -----
 .../lesCavitatingFoam/createAverages.H        | 53 -------------------
 .../lesCavitatingFoam/lesCavitatingFoam.C     |  3 --
 4 files changed, 1 insertion(+), 69 deletions(-)
 delete mode 100644 applications/solvers/multiphase/lesCavitatingFoam/calculateAverages.H
 delete mode 100644 applications/solvers/multiphase/lesCavitatingFoam/createAverages.H

diff --git a/applications/solvers/multiphase/lesCavitatingFoam/UEqn.H b/applications/solvers/multiphase/lesCavitatingFoam/UEqn.H
index 1ffad7a6a0..73033ddfaa 100644
--- a/applications/solvers/multiphase/lesCavitatingFoam/UEqn.H
+++ b/applications/solvers/multiphase/lesCavitatingFoam/UEqn.H
@@ -1,4 +1,4 @@
-    surfaceScalarField muf =
+    surfaceScalarField muEff
     (
         "muEff",
         twoPhaseProperties.muf()
diff --git a/applications/solvers/multiphase/lesCavitatingFoam/calculateAverages.H b/applications/solvers/multiphase/lesCavitatingFoam/calculateAverages.H
deleted file mode 100644
index 1d5aace302..0000000000
--- a/applications/solvers/multiphase/lesCavitatingFoam/calculateAverages.H
+++ /dev/null
@@ -1,12 +0,0 @@
-Info << "Calculating averages" << endl;
-
-scalar alpha = 
-     (runTime.value() - timeToStartAveraging - runTime.deltaT().value())
-    /(runTime.value() - timeToStartAveraging);
-
-scalar onemAlpha = 1.0 - alpha;
-
-Umean == alpha*Umean + onemAlpha*U;
-rhoMean == alpha*rhoMean + onemAlpha*rho;
-pMean == alpha*pMean + onemAlpha*p;
-gammaMean == alpha*gammaMean + onemAlpha*gamma;
diff --git a/applications/solvers/multiphase/lesCavitatingFoam/createAverages.H b/applications/solvers/multiphase/lesCavitatingFoam/createAverages.H
deleted file mode 100644
index d1ffac2958..0000000000
--- a/applications/solvers/multiphase/lesCavitatingFoam/createAverages.H
+++ /dev/null
@@ -1,53 +0,0 @@
-scalar timeToStartAveraging = runTime.value();
-
-volVectorField Umean
-(
-    IOobject
-    (
-        "Umean",
-        runTime.timeName(),
-        mesh,
-        IOobject::NO_READ,
-        IOobject::AUTO_WRITE
-    ),
-    U
-);
-
-volScalarField rhoMean
-(
-    IOobject
-    (
-        "rhoMean",
-        runTime.timeName(),
-        mesh,
-        IOobject::NO_READ,
-        IOobject::AUTO_WRITE
-    ),
-    rho
-);
-
-volScalarField pMean
-(
-    IOobject
-    (
-        "pMean",
-        runTime.timeName(),
-        mesh,
-        IOobject::NO_READ,
-        IOobject::AUTO_WRITE
-    ),
-    p
-);
-
-volScalarField gammaMean
-(
-    IOobject
-    (
-        "gammaMean",
-        runTime.timeName(),
-        mesh,
-        IOobject::NO_READ,
-        IOobject::AUTO_WRITE
-    ),
-    gamma
-);
diff --git a/applications/solvers/multiphase/lesCavitatingFoam/lesCavitatingFoam.C b/applications/solvers/multiphase/lesCavitatingFoam/lesCavitatingFoam.C
index a8f99ce905..b66186d43c 100644
--- a/applications/solvers/multiphase/lesCavitatingFoam/lesCavitatingFoam.C
+++ b/applications/solvers/multiphase/lesCavitatingFoam/lesCavitatingFoam.C
@@ -46,7 +46,6 @@ int main(int argc, char *argv[])
 #   include "readThermodynamicProperties.H"
 #   include "readControls.H"
 #   include "createFields.H"
-#   include "createAverages.H"
 #   include "initContinuityErrs.H"
 #   include "compressibleCourantNo.H"
 #   include "setInitialDeltaT.H"
@@ -78,8 +77,6 @@ int main(int argc, char *argv[])
             }
         }
 
-#       include "calculateAverages.H"
-
         runTime.write();
 
         Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"