zhyang-dev/OpenFOAM-12
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lagrangian: Merged parcel and parcelTurbulence libraries

Browse Source 
Lagrangian's dependency set is simpler than it used to be. There is no
longer a need to maintain a separate library for models that depend on
the momentum transport modelling.
This commit is contained in:
Will Bainbridge
2023-06-27 08:38:16 +01:00
parent 24085443bf
commit 9fb9a8cc8c
35 changed files with 58 additions and 411 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
applications/modules/compressibleVoF/fvModels/VoFClouds/Make/options
View File

@ -13,5 +13,4 @@ EXE_INC = \
LIB_LIBS = \
-llagrangian \
-llagrangianParcel \
-llagrangianParcelTurbulence
-llagrangianParcel

1
applications/modules/incompressibleDenseParticleFluid/Make/options
View File

@ -17,7 +17,6 @@ LIB_LIBS = \
-lphysicalProperties \
-llagrangian \
-llagrangianParcel \
-llagrangianParcelTurbulence \
-lfiniteVolume \
-lfvModels \
-lfvConstraints \

6
etc/caseDicts/fvModels/clouds
View File

@ -15,10 +15,6 @@ FoamFile
type clouds;
libs
(
"liblagrangianParcel.so"
"liblagrangianParcelTurbulence.so"
);
libs ("liblagrangianParcel.so");
// ************************************************************************* //

1
src/lagrangian/Allwmake
View File

@ -7,7 +7,6 @@ cd ${0%/*} || exit 1 # Run from this directory
wmake $targetType basic
wmake $targetType solidParticle
wmake $targetType parcel
wmake $targetType parcelTurbulence
wmake $targetType DSMC
molecularDynamics/Allwmake $targetType $*

1
src/lagrangian/functionObjects/Make/options
View File

@ -13,5 +13,4 @@ LIB_LIBS = \
-lmeshTools \
-llagrangian \
-llagrangianParcel \
-llagrangianParcelTurbulence \
-lutilityFunctionObjects

8
src/lagrangian/parcel/Make/options
View File

@ -5,6 +5,9 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/multicomponentThermo/lnInclude \
-I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \
-I$(LIB_SRC)/MomentumTransportModels/incompressible/lnInclude \
-I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \
-I$(LIB_SRC)/radiationModels/lnInclude \
-I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
@ -12,12 +15,15 @@ EXE_INC = \
LIB_LIBS = \
-llagrangian \
-lphysicalProperties \
-lspecie \
-lfluidThermophysicalModels \
-lthermophysicalProperties \
-lmulticomponentThermophysicalModels \
-lmomentumTransportModels \
-lincompressibleMomentumTransportModels \
-lcompressibleMomentumTransportModels \
-lradiationModels \
-lphysicalProperties \
-lsampling \
-lfiniteVolume \
-lmeshTools

10
src/lagrangian/parcel/parcels/derived/reactingMultiphaseParcel/makeReactingMultiphaseParcelSubmodels.C
View File

@ -28,18 +28,18 @@ License
#include "makeParcelCloudFunctionObjects.H"
// Momentum
#include "makeParcelForces.H"
#include "makeThermoParcelForces.H"
#include "makeParcelDispersionModels.H"
#include "makeReactingMultiphaseParcelInjectionModels.H" // MP variant
#include "makeReactingMultiphaseParcelInjectionModels.H"
#include "makeParcelPatchInteractionModels.H"
#include "makeReactingMultiphaseParcelStochasticCollisionModels.H" // MP variant
#include "makeReactingMultiphaseParcelStochasticCollisionModels.H"
#include "makeParcelSurfaceFilmModels.H"
// Thermodynamic
#include "makeParcelHeatTransferModels.H"
// Reacting
#include "makeReactingMultiphaseParcelCompositionModels.H" // MP Variant
#include "makeReactingMultiphaseParcelCompositionModels.H"
#include "makeReactingParcelPhaseChangeModels.H"
// Reacting multiphase
@ -51,7 +51,7 @@ License
makeParcelCloudFunctionObjects(reactingMultiphaseCloud);
// Momentum sub-models
makeParcelForces(reactingMultiphaseCloud);
makeThermoParcelForces(reactingMultiphaseCloud);
makeParcelDispersionModels(reactingMultiphaseCloud);
makeReactingMultiphaseParcelInjectionModels(reactingMultiphaseCloud);
makeParcelPatchInteractionModels(reactingMultiphaseCloud);

6
src/lagrangian/parcel/parcels/derived/reactingParcel/makeReactingParcelSubmodels.C
View File

@ -28,9 +28,9 @@ License
#include "makeParcelCloudFunctionObjects.H"
// Momentum
#include "makeParcelForces.H"
#include "makeThermoParcelForces.H"
#include "makeParcelDispersionModels.H"
#include "makeReactingParcelInjectionModels.H" // Reacting variant
#include "makeReactingParcelInjectionModels.H"
#include "makeParcelPatchInteractionModels.H"
#include "makeParcelStochasticCollisionModels.H"
#include "makeParcelSurfaceFilmModels.H"
@ -47,7 +47,7 @@ License
makeParcelCloudFunctionObjects(reactingCloud);
// Momentum sub-models
makeParcelForces(reactingCloud);
makeThermoParcelForces(reactingCloud);
makeParcelDispersionModels(reactingCloud);
makeReactingParcelInjectionModels(reactingCloud);
makeParcelPatchInteractionModels(reactingCloud);

8
src/lagrangian/parcel/parcels/derived/sprayParcel/makeSprayParcelSubmodels.C
View File

@ -28,11 +28,11 @@ License
#include "makeParcelCloudFunctionObjects.H"
// Momentum
#include "makeParcelForces.H"
#include "makeThermoParcelForces.H"
#include "makeParcelDispersionModels.H"
#include "makeSprayParcelInjectionModels.H" // Spray variant
#include "makeSprayParcelInjectionModels.H"
#include "makeParcelPatchInteractionModels.H"
#include "makeSprayParcelStochasticCollisionModels.H" // Spray variant
#include "makeSprayParcelStochasticCollisionModels.H"
// Thermodynamic
#include "makeParcelHeatTransferModels.H"
@ -52,7 +52,7 @@ License
makeParcelCloudFunctionObjects(sprayCloud);
// Momentum sub-models
makeParcelForces(sprayCloud);
makeThermoParcelForces(sprayCloud);
makeParcelDispersionModels(sprayCloud);
makeSprayParcelInjectionModels(sprayCloud);
makeParcelPatchInteractionModels(sprayCloud);

4
src/lagrangian/parcel/parcels/derived/thermoParcel/makeThermoParcelSubmodels.C
View File

@ -28,7 +28,7 @@ License
#include "makeParcelCloudFunctionObjects.H"
// Momentum
#include "makeParcelForces.H"
#include "makeThermoParcelForces.H"
#include "makeParcelDispersionModels.H"
#include "makeThermoParcelInjectionModels.H"
#include "makeParcelPatchInteractionModels.H"
@ -47,7 +47,7 @@ License
makeParcelCloudFunctionObjects(thermoCloud);
// Momentum sub-models
makeParcelForces(thermoCloud);
makeThermoParcelForces(thermoCloud);
makeParcelDispersionModels(thermoCloud);
makeThermoParcelInjectionModels(thermoCloud);
makeParcelPatchInteractionModels(thermoCloud);

16
src/lagrangian/parcel/parcels/include/makeParcelDispersionModels.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -29,13 +29,25 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#include "NoDispersion.H"
#include "GradientDispersionRAS.H"
#include "StochasticDispersionRAS.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#define makeParcelDispersionModels(CloudType) \
\
typedef Foam::CloudType::momentumCloudType momentumCloudType; \
\
defineNamedTemplateTypeNameAndDebug \
( \
Foam::DispersionRASModel<momentumCloudType>, \
0 \
); \
\
makeDispersionModel(CloudType); \
makeDispersionModelType(NoDispersion, CloudType);
makeDispersionModelType(NoDispersion, CloudType); \
makeDispersionModelType(GradientDispersionRAS, CloudType); \
makeDispersionModelType(StochasticDispersionRAS, CloudType); \
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

12
src/lagrangian/parcelTurbulence/parcels/include/makeThermoParcelTurbulenceForces.H → src/lagrangian/parcel/parcels/include/makeThermoParcelForces.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2014-2020 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -23,16 +23,20 @@ License
\*---------------------------------------------------------------------------*/
#ifndef makeThermoParcelTurbulenceForces_h
#define makeThermoParcelTurbulenceForces_h
#ifndef makeThermoParcelForces_H
#define makeThermoParcelForces_H
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#include "makeParcelForces.H"
#include "BrownianMotionForce.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#define makeThermoParcelTurbulenceForces(CloudType) \
#define makeThermoParcelForces(CloudType) \
\
makeParcelForces(CloudType); \
\
makeParticleForceModelType(BrownianMotionForce, CloudType);

2
src/lagrangian/parcelTurbulence/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C → src/lagrangian/parcel/submodels/Momentum/DispersionModel/DispersionRASModel/DispersionRASModel.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License

2
src/lagrangian/parcelTurbulence/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.H → src/lagrangian/parcel/submodels/Momentum/DispersionModel/DispersionRASModel/DispersionRASModel.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License

2
src/lagrangian/parcelTurbulence/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.C → src/lagrangian/parcel/submodels/Momentum/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License

2
src/lagrangian/parcelTurbulence/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.H → src/lagrangian/parcel/submodels/Momentum/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License

2
src/lagrangian/parcelTurbulence/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.C → src/lagrangian/parcel/submodels/Momentum/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License

2
src/lagrangian/parcelTurbulence/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.H → src/lagrangian/parcel/submodels/Momentum/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License

2
src/lagrangian/parcelTurbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C → src/lagrangian/parcel/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License

2
src/lagrangian/parcelTurbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.H → src/lagrangian/parcel/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License

2
src/lagrangian/parcelTurbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForceI.H → src/lagrangian/parcel/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForceI.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License

13
src/lagrangian/parcelTurbulence/Make/files
View File

@ -1,13 +0,0 @@
PARCELS=parcels
DERIVEDPARCELS=$(PARCELS)/derived
# sub-models
$(DERIVEDPARCELS)/momentumParcel/makeMomentumParcelSubmodels.C
$(DERIVEDPARCELS)/collidingParcel/makeCollidingParcelSubmodels.C
$(DERIVEDPARCELS)/mppicParcel/makeMppicParcelSubmodels.C
$(DERIVEDPARCELS)/thermoParcel/makeThermoParcelSubmodels.C
$(DERIVEDPARCELS)/reactingParcel/makeReactingParcelSubmodels.C
$(DERIVEDPARCELS)/reactingMultiphaseParcel/makeReactingMultiphaseParcelSubmodels.C
$(DERIVEDPARCELS)/sprayParcel/makeSprayParcelSubmodels.C
LIB = $(FOAM_LIBBIN)/liblagrangianParcelTurbulence

30
src/lagrangian/parcelTurbulence/Make/options
View File

@ -1,30 +0,0 @@
EXE_INC = \
-I$(LIB_SRC)/lagrangian/basic/lnInclude \
-I$(LIB_SRC)/lagrangian/parcel/lnInclude \
-I$(LIB_SRC)/physicalProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/multicomponentThermo/lnInclude \
-I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \
-I$(LIB_SRC)/MomentumTransportModels/incompressible/lnInclude \
-I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \
-I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude
LIB_LIBS = \
-llagrangian \
-llagrangianParcel \
-lspecie \
-lfluidThermophysicalModels \
-lthermophysicalProperties \
-lmulticomponentThermophysicalModels \
-lradiationModels \
-lmomentumTransportModels \
-lincompressibleMomentumTransportModels \
-lcompressibleMomentumTransportModels \
-lphysicalProperties \
-lsampling \
-lfiniteVolume \
-lmeshTools

37
src/lagrangian/parcelTurbulence/parcels/derived/collidingParcel/makeCollidingParcelSubmodels.C
View File

@ -1,37 +0,0 @@
/*---------------------------------------------------------------------------*\
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ 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 3 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, see <http://www.gnu.org/licenses/>.
\*---------------------------------------------------------------------------*/
#include "collidingCloud.H"
#include "makeParcelTurbulenceDispersionModels.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
makeParcelTurbulenceDispersionModels(collidingCloud);
}
// ************************************************************************* //

37
src/lagrangian/parcelTurbulence/parcels/derived/momentumParcel/makeMomentumParcelSubmodels.C
View File

@ -1,37 +0,0 @@
/*---------------------------------------------------------------------------*\
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ 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 3 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, see <http://www.gnu.org/licenses/>.
\*---------------------------------------------------------------------------*/
#include "momentumCloud.H"
#include "makeParcelTurbulenceDispersionModels.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
makeParcelTurbulenceDispersionModels(momentumCloud);
}
// ************************************************************************* //

37
src/lagrangian/parcelTurbulence/parcels/derived/mppicParcel/makeMppicParcelSubmodels.C
View File

@ -1,37 +0,0 @@
/*---------------------------------------------------------------------------*\
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ 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 3 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, see <http://www.gnu.org/licenses/>.
\*---------------------------------------------------------------------------*/
#include "mppicCloud.H"
#include "makeParcelTurbulenceDispersionModels.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
makeParcelTurbulenceDispersionModels(mppicCloud);
}
// ************************************************************************* //

40
src/lagrangian/parcelTurbulence/parcels/derived/reactingMultiphaseParcel/makeReactingMultiphaseParcelSubmodels.C
View File

@ -1,40 +0,0 @@
/*---------------------------------------------------------------------------*\
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ 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 3 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, see <http://www.gnu.org/licenses/>.
\*---------------------------------------------------------------------------*/
#include "reactingMultiphaseCloud.H"
#include "makeParcelTurbulenceDispersionModels.H"
#include "makeThermoParcelTurbulenceForces.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
makeThermoParcelTurbulenceForces(reactingMultiphaseCloud);
makeParcelTurbulenceDispersionModels(reactingMultiphaseCloud);
}
// ************************************************************************* //

40
src/lagrangian/parcelTurbulence/parcels/derived/reactingParcel/makeReactingParcelSubmodels.C
View File

@ -1,40 +0,0 @@
/*---------------------------------------------------------------------------*\
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ 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 3 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, see <http://www.gnu.org/licenses/>.
\*---------------------------------------------------------------------------*/
#include "reactingCloud.H"
#include "makeParcelTurbulenceDispersionModels.H"
#include "makeThermoParcelTurbulenceForces.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
makeThermoParcelTurbulenceForces(reactingCloud);
makeParcelTurbulenceDispersionModels(reactingCloud);
}
// ************************************************************************* //

40
src/lagrangian/parcelTurbulence/parcels/derived/sprayParcel/makeSprayParcelSubmodels.C
View File

@ -1,40 +0,0 @@
/*---------------------------------------------------------------------------*\
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ 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 3 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, see <http://www.gnu.org/licenses/>.
\*---------------------------------------------------------------------------*/
#include "sprayCloud.H"
#include "makeParcelTurbulenceDispersionModels.H"
#include "makeThermoParcelTurbulenceForces.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
makeThermoParcelTurbulenceForces(sprayCloud);
makeParcelTurbulenceDispersionModels(sprayCloud);
}
// ************************************************************************* //

40
src/lagrangian/parcelTurbulence/parcels/derived/thermoParcel/makeThermoParcelSubmodels.C
View File

@ -1,40 +0,0 @@
/*---------------------------------------------------------------------------*\
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ 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 3 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, see <http://www.gnu.org/licenses/>.
\*---------------------------------------------------------------------------*/
#include "thermoCloud.H"
#include "makeParcelTurbulenceDispersionModels.H"
#include "makeThermoParcelTurbulenceForces.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
makeThermoParcelTurbulenceForces(thermoCloud);
makeParcelTurbulenceDispersionModels(thermoCloud);
}
// ************************************************************************* //

53
src/lagrangian/parcelTurbulence/parcels/include/makeParcelTurbulenceDispersionModels.H
View File

@ -1,53 +0,0 @@
/*---------------------------------------------------------------------------*\
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ 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 3 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, see <http://www.gnu.org/licenses/>.
\*---------------------------------------------------------------------------*/
#ifndef makeParcelTurbulenceDispersionModels_h
#define makeParcelTurbulenceDispersionModels_h
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#include "GradientDispersionRAS.H"
#include "StochasticDispersionRAS.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#define makeParcelTurbulenceDispersionModels(CloudType) \
\
typedef Foam::CloudType::momentumCloudType momentumCloudType; \
defineNamedTemplateTypeNameAndDebug \
( \
Foam::DispersionRASModel<momentumCloudType>, \
0 \
); \
\
makeDispersionModelType(GradientDispersionRAS, CloudType); \
makeDispersionModelType(StochasticDispersionRAS, CloudType); \
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#endif
// ************************************************************************* //

2
tutorials/multicomponentFluid/simplifiedSiwek/constant/fvModels
View File

@ -22,7 +22,7 @@ buoyancyForce
clouds
{
type clouds;
libs ("liblagrangianParcel.so" "liblagrangianParcelTurbulence.so");
libs ("liblagrangianParcel.so");
clouds (coalCloud limestoneCloud);
}

2
tutorials/multicomponentFluid/verticalChannel/constant/fvModels
View File

@ -22,7 +22,7 @@ buoyancyForce
clouds
{
type clouds;
libs ("liblagrangianParcel.so" "liblagrangianParcelTurbulence.so");
libs ("liblagrangianParcel.so");
}
// ************************************************************************* //

2
tutorials/multicomponentFluid/verticalChannelLTS/constant/fvModels
View File

@ -22,7 +22,7 @@ buoyancyForce
clouds
{
type clouds;
libs ("liblagrangianParcel.so" "liblagrangianParcelTurbulence.so");
libs ("liblagrangianParcel.so");
}
// ************************************************************************* //

2
tutorials/multicomponentFluid/verticalChannelSteady/constant/fvModels
View File

@ -22,7 +22,7 @@ buoyancyForce
clouds
{
type clouds;
libs ("liblagrangianParcel.so" "liblagrangianParcelTurbulence.so");
libs ("liblagrangianParcel.so");
}
// ************************************************************************* //