ENH: Removing incompressibleInteractingKinematicParcelFoam - now

redunant.

Calling correct on the laminarTransport object in
incompressibleUncoupledKinematicParcelFoam and updating mu.

applications/solvers/lagrangian/incompressibleInteractingKinematicParcelFoam/Make/files

@@ -1,3 +0,0 @@
-incompressibleInteractingKinematicParcelFoam.C
-
-EXE = $(FOAM_APPBIN)/incompressibleInteractingKinematicParcelFoam

applications/solvers/lagrangian/incompressibleInteractingKinematicParcelFoam/Make/options

@@ -1,25 +0,0 @@
-EXE_INC = \
-    -I$(LIB_SRC)/lagrangian/basic/lnInclude \
-    -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \
-    -I$(LIB_SRC)/transportModels \
-    -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
-
-EXE_LIBS = \
-    -llagrangian \
-    -llagrangianIntermediate \
-    -lthermophysicalFunctions \
-    -lbasicThermophysicalModels \
-    -lspecie \
-    -lradiation \
-    -lincompressibleRASModels \
-    -lincompressibleLESModels \
-    -lincompressibleTransportModels \
-    -lfiniteVolume \
-    -lmeshTools

applications/solvers/lagrangian/incompressibleInteractingKinematicParcelFoam/createFields.H

@@ -1,85 +0,0 @@
-    Info<< "\nReading transportProperties\n" << endl;
-
-    IOdictionary transportProperties
-    (
-        IOobject
-        (
-            "transportProperties",
-            runTime.constant(),
-            mesh,
-            IOobject::MUST_READ,
-            IOobject::NO_WRITE
-        )
-    );
-
-    dimensionedScalar rhoValue
-    (
-        transportProperties.lookup("rho")
-    );
-
-    volScalarField rho
-    (
-        IOobject
-        (
-            "rho",
-            runTime.timeName(),
-            mesh,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh,
-        rhoValue
-    );
-
-    Info<< "\nReading field U\n" << endl;
-    volVectorField U
-    (
-        IOobject
-        (
-            "U",
-            runTime.timeName(),
-            mesh,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh
-    );
-
-    #include "createPhi.H"
-
-    Info<< "Creating turbulence model\n" << endl;
-
-    singlePhaseTransportModel laminarTransport(U, phi);
-
-    autoPtr<incompressible::turbulenceModel> turbulence
-    (
-        incompressible::turbulenceModel::New(U, phi, laminarTransport)
-    );
-
-    volScalarField mu
-    (
-        IOobject
-        (
-            "mu",
-            runTime.timeName(),
-            mesh,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        laminarTransport.nu()*rhoValue
-    );
-
-    word kinematicCloudName("kinematicCloud");
-    args.optionReadIfPresent("cloudName", kinematicCloudName);
-
-    Info<< "Constructing kinematicCloud "
-        << kinematicCloudName << endl;
-
-    basicKinematicCloud kinematicCloud
-    (
-        kinematicCloudName,
-        rho,
-        U,
-        mu,
-        g
-    );

applications/solvers/lagrangian/incompressibleInteractingKinematicParcelFoam/incompressibleInteractingKinematicParcelFoam.C

@@ -1,78 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM; if not, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Application
-    interactingKinematicParcelFoam
-
-Description
-    Transient solver for the passive transport of a single interactingKinematic
-    particle could, where the particles interact.
-
-    Uses a pre-calculated velocity field to evolve the cloud.
-
-\*---------------------------------------------------------------------------*/
-
-#include "fvCFD.H"
-#include "singlePhaseTransportModel.H"
-#include "turbulenceModel.H"
-#include "basicKinematicCloud.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-int main(int argc, char *argv[])
-{
-    argList::validOptions.insert("cloudName", "cloud name");
-
-    #include "setRootCase.H"
-    #include "createTime.H"
-    #include "createMesh.H"
-    #include "readGravitationalAcceleration.H"
-    #include "createFields.H"
-
-    // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-    Info<< "\nStarting time loop\n" << endl;
-
-    while (runTime.loop())
-    {
-        Info<< "Time = " << runTime.timeName() << nl << endl;
-
-        Info<< "Evolving " << kinematicCloud.name() << endl;
-        kinematicCloud.evolve();
-        kinematicCloud.info();
-
-        runTime.write();
-
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
-    }
-
-    Info<< "End\n" << endl;
-
-    return 0;
-}
-
-
-// ************************************************************************* //

applications/solvers/lagrangian/incompressibleUncoupledKinematicParcelFoam/createFields.H

@@ -12,12 +12,12 @@
         )
     );
 
-    dimensionedScalar rhoValue
+    dimensionedScalar rhoInfValue
     (
-        transportProperties.lookup("rho")
+        transportProperties.lookup("rhoInf")
     );
 
-    volScalarField rho
+    volScalarField rhoInf
     (
         IOobject
         (
@@ -28,7 +28,7 @@
             IOobject::AUTO_WRITE
         ),
         mesh,
-        rhoValue
+        rhoInfValue
     );
 
     Info<< "\nReading field U\n" << endl;
@@ -51,6 +51,8 @@
 
     singlePhaseTransportModel laminarTransport(U, phi);
 
+    const volScalarField nu = laminarTransport.nu();
+
     autoPtr<incompressible::turbulenceModel> turbulence
     (
         incompressible::turbulenceModel::New(U, phi, laminarTransport)
@@ -66,7 +68,7 @@
             IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
-        laminarTransport.nu()*rhoValue
+        nu*rhoInfValue
     );
 
     word kinematicCloudName("kinematicCloud");
@@ -76,7 +78,7 @@
     basicKinematicCloud kinematicCloud
     (
         kinematicCloudName,
-        rho,
+        rhoInf,
         U,
         mu,
         g

applications/solvers/lagrangian/incompressibleUncoupledKinematicParcelFoam/incompressibleUncoupledKinematicParcelFoam.C

@@ -29,7 +29,7 @@ Description
     Transient solver for the passive transport of a single kinematic
     particle could.
 
-    Uses a pre- calculated velocity field to evolve the cloud.
+    Uses a pre-calculated velocity field to evolve the cloud.
 
 \*---------------------------------------------------------------------------*/
 
@@ -42,14 +42,13 @@ Description
 
 int main(int argc, char *argv[])
 {
-    argList::validOptions.insert("cloudName", "cloud name");
+    argList::addOption("cloudName", "cloud name");
 
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
     #include "readGravitationalAcceleration.H"
     #include "createFields.H"
-    #include "compressibleCourantNo.H"
 
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -60,8 +59,12 @@ int main(int argc, char *argv[])
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
         Info<< "Evolving " << kinematicCloud.name() << endl;
+
+        laminarTransport.correct();
+
+        mu = nu*rhoInfValue;
+
         kinematicCloud.evolve();
-        kinematicCloud.info();
 
         runTime.write();