GIT: Resolve conflict

2025-11-28 03:28:01 +00:00 · 2011-11-02 12:50:27 +00:00
parent b1c932c144 e9a297b045
commit f18f1ca15c
77 changed files with 1262 additions and 2878 deletions
--- a/applications/solvers/incompressible/simpleFoam/windSimpleFoam/UEqn.H
+++ b/applications/solvers/incompressible/simpleFoam/windSimpleFoam/UEqn.H
@ -7,7 +7,7 @@
    );

    // Add resistance on the actuation disks
-    actuationDisks.addSu(UEqn());
+    sources.apply(UEqn());

    UEqn().relax();

--- a/applications/solvers/incompressible/simpleFoam/windSimpleFoam/windSimpleFoam.C
+++ b/applications/solvers/incompressible/simpleFoam/windSimpleFoam/windSimpleFoam.C
@ -46,7 +46,7 @@ int main(int argc, char *argv[])
    #include "createFields.H"
    #include "initContinuityErrs.H"

-    IObasicSourceList actuationDisks(mesh);
+    IObasicSourceList sources(mesh);

    simpleControl simple(mesh);

--- a/applications/solvers/lagrangian/LTSReactingParcelFoam/LTSReactingParcelFoam.C
+++ b/applications/solvers/lagrangian/LTSReactingParcelFoam/LTSReactingParcelFoam.C
@ -41,7 +41,7 @@ Description
 #include "rhoChemistryCombustionModel.H"
 #include "radiationModel.H"
 #include "porousZones.H"
-#include "timeActivatedExplicitSource.H"
+#include "IObasicSourceList.H"
 #include "SLGThermo.H"
 #include "fvcSmooth.H"
 #include "pimpleControl.H"
--- a/applications/solvers/lagrangian/LTSReactingParcelFoam/UEqn.H
+++ b/applications/solvers/lagrangian/LTSReactingParcelFoam/UEqn.H
@ -7,9 +7,10 @@
     ==
        rho.dimensionedInternalField()*g
      + parcels.SU(U)
-      + momentumSource.Su()
    );

+    sources.apply(UEqn);
+
    pZones.addResistance(UEqn);

    if (pimple.momentumPredictor())
--- a/applications/solvers/lagrangian/LTSReactingParcelFoam/YEqn.H
+++ b/applications/solvers/lagrangian/LTSReactingParcelFoam/YEqn.H
@ -23,7 +23,7 @@ if (solveSpecies)
        {
            volScalarField& Yi = Y[i];

-            solve
+            fvScalarMatrix YEqn
            (
                fvm::ddt(rho, Yi)
              + mvConvection->fvmDiv(phi, Yi)
@ -31,10 +31,12 @@ if (solveSpecies)
             ==
                parcels.SYi(i, Yi)
              + combustion->R(Yi)
-              + massSource.Su(i),
-                mesh.solver("Yi")
            );

+            sources.apply(YEqn);
+
+            YEqn.solve(mesh.solver("Yi"));
+
            Yi.max(0.0);
            Yt += Yi;
        }
--- a/applications/solvers/lagrangian/LTSReactingParcelFoam/createExplicitSources.H
+++ b/applications/solvers/lagrangian/LTSReactingParcelFoam/createExplicitSources.H
@ -1,27 +1,2 @@
-Info<< "Creating mass source\n" << endl;
-scalarTimeActivatedExplicitSourceList massSource
-(
-    "mass",
-    mesh,
-    dimMass/dimTime/dimVolume,
-    composition.species()
-);
-
-
-Info<< "Creating momentum source\n" << endl;
-vectorTimeActivatedExplicitSourceList momentumSource
-(
-    "momentum",
-    mesh,
-    dimMass*dimVelocity/dimTime/dimVolume,
-    "U"
-);
-
-Info<< "Creating energy source\n" << endl;
-scalarTimeActivatedExplicitSourceList energySource
-(
-    "energy",
-    mesh,
-    dimEnergy/dimTime/dimVolume,
-    "h"
-);
+Info<< "Creating sources\n" << endl;
+IObasicSourceList sources(mesh);
--- a/applications/solvers/lagrangian/LTSReactingParcelFoam/hsEqn.H
+++ b/applications/solvers/lagrangian/LTSReactingParcelFoam/hsEqn.H
@ -8,10 +8,11 @@
        DpDt
      + parcels.Sh(hs)
      + radiation->Shs(thermo)
-      + energySource.Su()
      + combustion->Sh()
    );

+    sources.apply(hsEqn);
+
    hsEqn.solve();

    thermo.correct();
--- a/applications/solvers/lagrangian/LTSReactingParcelFoam/pEqn.H
+++ b/applications/solvers/lagrangian/LTSReactingParcelFoam/pEqn.H
@ -29,9 +29,10 @@
      + fvc::div(phi)
     ==
        parcels.Srho()
-      + massSource.SuTot()
    );

+    sources.apply(pDDtEqn);
+
    while (pimple.correctNonOrthogonal())
    {
        fvScalarMatrix pEqn
--- a/applications/solvers/lagrangian/LTSReactingParcelFoam/rhoEqn.H
+++ b/applications/solvers/lagrangian/LTSReactingParcelFoam/rhoEqn.H
@ -36,9 +36,10 @@ Description
      + fvc::div(phi)
      ==
        parcels.Srho(rho)
-      + massSource.SuTot()
    );

+    sources.apply(rhoEqn);
+
    rhoEqn.solve();

    Info<< "rho min/max = " << min(rho).value() << ", " << max(rho).value()
--- a/applications/solvers/lagrangian/LTSReactingParcelFoam/timeScales.H
+++ b/applications/solvers/lagrangian/LTSReactingParcelFoam/timeScales.H
@ -76,7 +76,7 @@ Info<< "Time scales min/max:" << endl;
            (
                DpDt
              + parcels.hsTrans()/(mesh.V()*runTime.deltaT())
-              + energySource.Su()
+//              + energySource.Su()
              + combustion->Sh()()
            )
           /rho
--- a/applications/solvers/lagrangian/coalChemistryFoam/UEqn.H
+++ b/applications/solvers/lagrangian/coalChemistryFoam/UEqn.H
@ -9,6 +9,8 @@
      + limestoneParcels.SU(U)
    );

+    sources.apply(UEqn);
+
    UEqn.relax();

    if (pimple.momentumPredictor())
--- a/applications/solvers/lagrangian/coalChemistryFoam/YEqn.H
+++ b/applications/solvers/lagrangian/coalChemistryFoam/YEqn.H
@ -32,6 +32,8 @@ tmp<fv::convectionScheme<scalar> > mvConvection
              + combustion->R(Yi)
            );

+            sources.apply(YiEqn);
+
            YiEqn.relax();
            YiEqn.solve(mesh.solver("Yi"));

--- a/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C
+++ b/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C
@ -40,7 +40,7 @@ Description
 #include "basicThermoCloud.H"
 #include "coalCloud.H"
 #include "psiChemistryCombustionModel.H"
-#include "timeActivatedExplicitSource.H"
+#include "IObasicSourceList.H"
 #include "radiationModel.H"
 #include "SLGThermo.H"
 #include "pimpleControl.H"
--- a/applications/solvers/lagrangian/coalChemistryFoam/createFields.H
+++ b/applications/solvers/lagrangian/coalChemistryFoam/createFields.H
@ -122,14 +122,8 @@
        fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p)
    );

-    Info<< "\nConstructing explicit enthalpy source" << endl;
-    scalarTimeActivatedExplicitSourceList enthalpySource
-    (
-        "energy",
-        mesh,
-        dimEnergy/dimTime/dimVolume,
-        "hs"
-    );
+    Info<< "\nConstructing sources" << endl;
+    IObasicSourceList sources(mesh);

    volScalarField dQ
    (
--- a/applications/solvers/lagrangian/coalChemistryFoam/hsEqn.H
+++ b/applications/solvers/lagrangian/coalChemistryFoam/hsEqn.H
@ -9,10 +9,11 @@
     +  combustion->Sh()
     +  coalParcels.Sh(hs)
     +  limestoneParcels.Sh(hs)
-     +  enthalpySource.Su()
     +  radiation->Shs(thermo)
    );

+    sources.apply(hsEqn);
+
    hsEqn.relax();
    hsEqn.solve();

--- a/applications/solvers/lagrangian/coalChemistryFoam/pEqn.H
+++ b/applications/solvers/lagrangian/coalChemistryFoam/pEqn.H
@ -26,6 +26,8 @@ if (pimple.transonic())
            coalParcels.Srho()
        );

+        sources.apply(pEqn);
+
        pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));

        if (pimple.finalNonOrthogonalIter())
@ -54,6 +56,8 @@ else
            coalParcels.Srho()
        );

+        sources.apply(pEqn);
+
        pEqn.solve(mesh.solver(p.select(pimple.finalInnerIter())));

        if (pimple.finalNonOrthogonalIter())
--- a/applications/solvers/lagrangian/coalChemistryFoam/rhoEqn.H
+++ b/applications/solvers/lagrangian/coalChemistryFoam/rhoEqn.H
@ -30,13 +30,17 @@ Description
 \*---------------------------------------------------------------------------*/

 {
-    solve
+    fvScalarMatrix rhoEqn
    (
        fvm::ddt(rho)
      + fvc::div(phi)
      ==
        coalParcels.Srho(rho)
    );
+
+    sources.apply(rhoEqn);
+
+    rhoEqn.solve();
 }

 // ************************************************************************* //
--- a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/UEqn.H
+++ b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/UEqn.H
@ -7,9 +7,10 @@
     ==
        rho.dimensionedInternalField()*g
      + parcels.SU(U)
-      + momentumSource.Su()
    );

+    sources.apply(UEqn);
+
    pZones.addResistance(UEqn);

    if (pimple.momentumPredictor())
--- a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/YEqn.H
+++ b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/YEqn.H
@ -24,7 +24,7 @@ if (solveSpecies)
        {
            volScalarField& Yi = Y[i];

-            solve
+            fvScalarMatrix YiEqn
            (
                fvm::ddt(rho, Yi)
              + mvConvection->fvmDiv(phi, Yi)
@ -32,10 +32,12 @@ if (solveSpecies)
              ==
                parcels.SYi(i, Yi)
              + combustion->R(Yi)
-              + massSource.Su(i),
-                mesh.solver("Yi")
            );

+            sources.apply(YiEqn);
+
+            YiEqn.solve(mesh.solver("Yi"));
+
            Yi.max(0.0);
            Yt += Yi;
        }
--- a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/createExplicitSources.H
+++ b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/createExplicitSources.H
@ -1,27 +1,2 @@
-Info<< "Creating mass source\n" << endl;
-scalarTimeActivatedExplicitSourceList massSource
-(
-    "mass",
-    mesh,
-    dimMass/dimTime/dimVolume,
-    composition.species()
-);
-
-
-Info<< "Creating momentum source\n" << endl;
-vectorTimeActivatedExplicitSourceList momentumSource
-(
-    "momentum",
-    mesh,
-    dimMass*dimVelocity/dimTime/dimVolume,
-    "U"
-);
-
-Info<< "Creating energy source\n" << endl;
-scalarTimeActivatedExplicitSourceList energySource
-(
-    "energy",
-    mesh,
-    dimEnergy/dimTime/dimVolume,
-    "h"
-);
+Info<< "Creating sources\n" << endl;
+IObasicSourceList sources(mesh);
--- a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/hsEqn.H
+++ b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/hsEqn.H
@ -29,7 +29,7 @@
    }

    {
-        solve
+        fvScalarMatrix hsEqn
        (
            fvm::ddt(rho, hs)
          + mvConvection->fvmDiv(phi, hs)
@ -38,10 +38,13 @@
            pWork()
          + parcels.Sh(hs)
          + radiation->Shs(thermo)
-          + energySource.Su()
          + combustion->Sh()
        );

+        sources.apply(hsEqn);
+
+        hsEqn.solve();
+
        thermo.correct();

        radiation->correct();
--- a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/pEqn.H
+++ b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/pEqn.H
@ -29,9 +29,10 @@
      + fvc::div(phi)
     ==
        parcels.Srho()
-      + massSource.SuTot()
    );

+    sources.apply(pDDtEqn);
+
    while (pimple.correctNonOrthogonal())
    {
        fvScalarMatrix pEqn
--- a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/porousExplicitSourceReactingParcelFoam.C
+++ b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/porousExplicitSourceReactingParcelFoam.C
@ -45,7 +45,7 @@ Description
 #include "rhoChemistryCombustionModel.H"
 #include "radiationModel.H"
 #include "porousZones.H"
-#include "timeActivatedExplicitSource.H"
+#include "IObasicSourceList.H"
 #include "SLGThermo.H"
 #include "pimpleControl.H"

--- a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/rhoEqn.H
+++ b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/rhoEqn.H
@ -36,9 +36,10 @@ Description
      + fvc::div(phi)
      ==
        parcels.Srho(rho)
-      + massSource.SuTot()
    );

+    sources.apply(rhoEqn);
+
    rhoEqn.solve();
 }