updated to reflect change in lagrangian phase source term names

applications/solvers/Lagrangian/reactingParcelFoam/Make/options

@@ -4,7 +4,6 @@ EXE_INC = \
     -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
     -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \
-    -I$(LIB_SRC)/lagrangian/coalCombustion/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/pdfs/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
@@ -19,7 +18,6 @@ EXE_INC = \
     -I$(LIB_SRC)/ODE/lnInclude
 
 EXE_LIBS = \
-    -L$(FOAM_USER_LIBBIN) \
     -lfiniteVolume \
     -lmeshTools \
     -lcompressibleRASModels \

applications/solvers/Lagrangian/reactingParcelFoam/UEqn.H

@@ -5,7 +5,7 @@
       + turbulence->divDevRhoReff(U)
      ==
         rho.dimensionedInternalField()*g
-      + reactingParcels.SU1()
+      + parcels.SU()
     );
 
     UEqn.relax();

applications/solvers/Lagrangian/reactingParcelFoam/YEqn.H

-
 tmp<fv::convectionScheme<scalar> > mvConvection
 (
     fv::convectionScheme<scalar>::New
@@ -26,7 +25,7 @@ tmp<fv::convectionScheme<scalar> > mvConvection
               + mvConvection->fvmDiv(phi, Yi)
               - fvm::laplacian(turbulence->muEff(), Yi)
               ==
-                reactingParcels.Srho1(i)
+                parcels.Srho(i)
               + kappa*chemistry.RR(i)().dimensionedInternalField()
             );
 
@@ -41,5 +40,4 @@ tmp<fv::convectionScheme<scalar> > mvConvection
 
     Y[inertIndex] = scalar(1) - Yt;
     Y[inertIndex].max(0.0);
-
 }

applications/solvers/Lagrangian/reactingParcelFoam/createClouds.H

-Info<< "\nConstructing interpolation" << endl;
-
 Info << "\nConstructing gas properties" << endl;
 /*
 PtrList<specieConstProperties> gasProperties(Y.size());
@@ -31,7 +29,7 @@ forAll(gasProperties, i)
 }
 
 Info<< "\nConstructing reacting cloud" << endl;
-basicReactingCloud reactingParcels
+basicReactingCloud parcels
 (
     "reactingCloud1",
     rho,

applications/solvers/Lagrangian/reactingParcelFoam/createFields.H

@@ -28,51 +28,6 @@
         thermo->rho()
     );
 
-// lagrangian coal density field
-/*    volScalarField rholc
-    (
-        IOobject
-        (
-            "rholc",
-            runTime.timeName(),
-            mesh,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh,
-        dimensionedScalar("zero", dimensionSet(1, -3, 0, 0, 0, 0, 0), 0.0)
-    );
-
-// lagrangian limestone density field
-    volScalarField rhols
-    (
-        IOobject
-        (
-            "rhols",
-            runTime.timeName(),
-            mesh,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh,
-        dimensionedScalar("zero", dimensionSet(1, -3, 0, 0, 0, 0, 0), 0.0)
-    );
-
-// lagrangian total density field
-    volScalarField rhol
-    (
-        IOobject
-        (
-            "rhol",
-            runTime.timeName(),
-            mesh,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh,
-        dimensionedScalar("zero", dimensionSet(1, -3, 0, 0, 0, 0, 0), 0.0)
-    );*/
-
     Info<< "\nReading field U\n" << endl;
     volVectorField U
     (
@@ -133,9 +88,3 @@
         fields.add(Y[i]);
     }
     fields.add(h);
-
-    Info<< "Creating radiation model\n" << endl;
-    autoPtr<radiation::radiationModel> radiation
-    (
-        radiation::radiationModel::New(T)
-    );

applications/solvers/Lagrangian/reactingParcelFoam/hEqn.H

@@ -6,7 +6,7 @@
       - fvm::laplacian(turbulence->alphaEff(), h)
      ==
         DpDt
-     +  reactingParcels.Sh1()
+     +  parcels.Sh()
      +  radiation->Sh(thermo())
     );
 

applications/solvers/Lagrangian/reactingParcelFoam/pEqn.H

@@ -23,7 +23,7 @@ if (transonic)
           + fvm::div(phid, p)
           - fvm::laplacian(rho*rUA, p)
          ==
-            reactingParcels.Srho1()
+            parcels.Srho()
         );
 
         pEqn.solve();
@@ -51,7 +51,7 @@ else
           + fvc::div(phi)
           - fvm::laplacian(rho*rUA, p)
          ==
-            reactingParcels.Srho1()
+            parcels.Srho()
         );
 
         pEqn.solve();

applications/solvers/Lagrangian/reactingParcelFoam/reactingParcelFoam.C

@@ -23,8 +23,11 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Application
+    reactingParcelFoam
 
 Description
+    Transient PISO solver for compressible, laminar or turbulent flow with
+    reacting Lagrangian parcels.
 
 \*---------------------------------------------------------------------------*/
 
@@ -42,55 +45,54 @@ Description
 
 int main(int argc, char *argv[])
 {
-#   include "setRootCase.H"
-
-#   include "createTime.H"
-#   include "createMesh.H"
-#   include "readChemistryProperties.H"
-#   include "readEnvironmentalProperties.H"
-#   include "createFields.H"
-#   include "createClouds.H"
-#   include "readPISOControls.H"
-#   include "initContinuityErrs.H"
-#   include "readTimeControls.H"
-#   include "compressibleCourantNo.H"
-#   include "setInitialDeltaT.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+    #include "setRootCase.H"
+
+    #include "createTime.H"
+    #include "createMesh.H"
+    #include "readChemistryProperties.H"
+    #include "readEnvironmentalProperties.H"
+    #include "createFields.H"
+    #include "createClouds.H"
+    #include "createRadiationModel.H"
+    #include "readPISOControls.H"
+    #include "initContinuityErrs.H"
+    #include "readTimeControls.H"
+    #include "compressibleCourantNo.H"
+    #include "setInitialDeltaT.H"
+
+    // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
     Info<< "\nStarting time loop\n" << endl;
 
     while (runTime.run())
     {
-#       include "readTimeControls.H"
-#       include "readPISOControls.H"
-#       include "compressibleCourantNo.H"
-#       include "setDeltaT.H"
+        #include "readTimeControls.H"
+        #include "readPISOControls.H"
+        #include "compressibleCourantNo.H"
+        #include "setDeltaT.H"
 
         runTime++;
 
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-        Info << "Evolving reacting cloud" << endl;
-
-        reactingParcels.evolve();
+        parcels.evolve();
 
-        reactingParcels.info();
+        parcels.info();
 
-#       include "chemistry.H"
-#       include "rhoEqn.H"
+        #include "chemistry.H"
+        #include "rhoEqn.H"
 
         // --- PIMPLE loop
         for (int ocorr=1; ocorr<=nOuterCorr; ocorr++)
         {
-#           include "UEqn.H"
-#           include "YEqn.H"
+            #include "UEqn.H"
+            #include "YEqn.H"
 
             // --- PISO loop
             for (int corr=1; corr<=nCorr; corr++)
             {
-#               include "hEqn.H"
-#               include "pEqn.H"
+                #include "hEqn.H"
+                #include "pEqn.H"
             }
 
             Info<< "T gas min/max   = " << min(T).value() << ", "
@@ -103,7 +105,7 @@ int main(int argc, char *argv[])
 
         if (runTime.write())
         {
-#           include "additionalOutput.H"
+            #include "additionalOutput.H"
         }
 
         Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"

applications/solvers/Lagrangian/reactingParcelFoam/rhoEqn.H

@@ -36,7 +36,7 @@ Description
         fvm::ddt(rho)
       + fvc::div(phi)
       ==
-        reactingParcels.Srho1()
+        parcels.Srho()
     );
 }