From 9fb9a8cc8c02a01339122a23dbe1750aa558ccf0 Mon Sep 17 00:00:00 2001 From: Will Bainbridge Date: Tue, 27 Jun 2023 08:38:16 +0100 Subject: [PATCH] lagrangian: Merged parcel and parcelTurbulence libraries 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. --- .../fvModels/VoFClouds/Make/options | 3 +- .../Make/options | 1 - etc/caseDicts/fvModels/clouds | 6 +-- src/lagrangian/Allwmake | 1 - src/lagrangian/functionObjects/Make/options | 1 - src/lagrangian/parcel/Make/options | 8 ++- .../makeReactingMultiphaseParcelSubmodels.C | 10 ++-- .../makeReactingParcelSubmodels.C | 6 +-- .../sprayParcel/makeSprayParcelSubmodels.C | 8 +-- .../thermoParcel/makeThermoParcelSubmodels.C | 4 +- .../include/makeParcelDispersionModels.H | 16 +++++- .../parcels/include/makeThermoParcelForces.H} | 12 +++-- .../DispersionRASModel/DispersionRASModel.C | 2 +- .../DispersionRASModel/DispersionRASModel.H | 2 +- .../GradientDispersionRAS.C | 2 +- .../GradientDispersionRAS.H | 2 +- .../StochasticDispersionRAS.C | 2 +- .../StochasticDispersionRAS.H | 2 +- .../BrownianMotion/BrownianMotionForce.C | 2 +- .../BrownianMotion/BrownianMotionForce.H | 2 +- .../BrownianMotion/BrownianMotionForceI.H | 2 +- src/lagrangian/parcelTurbulence/Make/files | 13 ----- src/lagrangian/parcelTurbulence/Make/options | 30 ----------- .../makeCollidingParcelSubmodels.C | 37 ------------- .../makeMomentumParcelSubmodels.C | 37 ------------- .../mppicParcel/makeMppicParcelSubmodels.C | 37 ------------- .../makeReactingMultiphaseParcelSubmodels.C | 40 -------------- .../makeReactingParcelSubmodels.C | 40 -------------- .../sprayParcel/makeSprayParcelSubmodels.C | 40 -------------- .../thermoParcel/makeThermoParcelSubmodels.C | 40 -------------- .../makeParcelTurbulenceDispersionModels.H | 53 ------------------- .../simplifiedSiwek/constant/fvModels | 2 +- .../verticalChannel/constant/fvModels | 2 +- .../verticalChannelLTS/constant/fvModels | 2 +- .../verticalChannelSteady/constant/fvModels | 2 +- 35 files changed, 58 insertions(+), 411 deletions(-) rename src/lagrangian/{parcelTurbulence/parcels/include/makeThermoParcelTurbulenceForces.H => parcel/parcels/include/makeThermoParcelForces.H} (80%) rename src/lagrangian/{parcelTurbulence/submodels/Kinematic => parcel/submodels/Momentum}/DispersionModel/DispersionRASModel/DispersionRASModel.C (98%) rename src/lagrangian/{parcelTurbulence/submodels/Kinematic => parcel/submodels/Momentum}/DispersionModel/DispersionRASModel/DispersionRASModel.H (98%) rename src/lagrangian/{parcelTurbulence/submodels/Kinematic => parcel/submodels/Momentum}/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.C (98%) rename src/lagrangian/{parcelTurbulence/submodels/Kinematic => parcel/submodels/Momentum}/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.H (98%) rename src/lagrangian/{parcelTurbulence/submodels/Kinematic => parcel/submodels/Momentum}/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.C (98%) rename src/lagrangian/{parcelTurbulence/submodels/Kinematic => parcel/submodels/Momentum}/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.H (98%) rename src/lagrangian/{parcelTurbulence => parcel}/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C (98%) rename src/lagrangian/{parcelTurbulence => parcel}/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.H (98%) rename src/lagrangian/{parcelTurbulence => parcel}/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForceI.H (96%) delete mode 100644 src/lagrangian/parcelTurbulence/Make/files delete mode 100644 src/lagrangian/parcelTurbulence/Make/options delete mode 100644 src/lagrangian/parcelTurbulence/parcels/derived/collidingParcel/makeCollidingParcelSubmodels.C delete mode 100644 src/lagrangian/parcelTurbulence/parcels/derived/momentumParcel/makeMomentumParcelSubmodels.C delete mode 100644 src/lagrangian/parcelTurbulence/parcels/derived/mppicParcel/makeMppicParcelSubmodels.C delete mode 100644 src/lagrangian/parcelTurbulence/parcels/derived/reactingMultiphaseParcel/makeReactingMultiphaseParcelSubmodels.C delete mode 100644 src/lagrangian/parcelTurbulence/parcels/derived/reactingParcel/makeReactingParcelSubmodels.C delete mode 100644 src/lagrangian/parcelTurbulence/parcels/derived/sprayParcel/makeSprayParcelSubmodels.C delete mode 100644 src/lagrangian/parcelTurbulence/parcels/derived/thermoParcel/makeThermoParcelSubmodels.C delete mode 100644 src/lagrangian/parcelTurbulence/parcels/include/makeParcelTurbulenceDispersionModels.H diff --git a/applications/modules/compressibleVoF/fvModels/VoFClouds/Make/options b/applications/modules/compressibleVoF/fvModels/VoFClouds/Make/options index 60d21e403d..ad50719746 100644 --- a/applications/modules/compressibleVoF/fvModels/VoFClouds/Make/options +++ b/applications/modules/compressibleVoF/fvModels/VoFClouds/Make/options @@ -13,5 +13,4 @@ EXE_INC = \ LIB_LIBS = \ -llagrangian \ - -llagrangianParcel \ - -llagrangianParcelTurbulence + -llagrangianParcel diff --git a/applications/modules/incompressibleDenseParticleFluid/Make/options b/applications/modules/incompressibleDenseParticleFluid/Make/options index 98d76c6fc7..536a7710ce 100644 --- a/applications/modules/incompressibleDenseParticleFluid/Make/options +++ b/applications/modules/incompressibleDenseParticleFluid/Make/options @@ -17,7 +17,6 @@ LIB_LIBS = \ -lphysicalProperties \ -llagrangian \ -llagrangianParcel \ - -llagrangianParcelTurbulence \ -lfiniteVolume \ -lfvModels \ -lfvConstraints \ diff --git a/etc/caseDicts/fvModels/clouds b/etc/caseDicts/fvModels/clouds index 4563ca9742..dbe0bc2fa2 100644 --- a/etc/caseDicts/fvModels/clouds +++ b/etc/caseDicts/fvModels/clouds @@ -15,10 +15,6 @@ FoamFile type clouds; -libs -( - "liblagrangianParcel.so" - "liblagrangianParcelTurbulence.so" -); +libs ("liblagrangianParcel.so"); // ************************************************************************* // diff --git a/src/lagrangian/Allwmake b/src/lagrangian/Allwmake index a3d696d9b9..5d3cf2d058 100755 --- a/src/lagrangian/Allwmake +++ b/src/lagrangian/Allwmake @@ -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 $* diff --git a/src/lagrangian/functionObjects/Make/options b/src/lagrangian/functionObjects/Make/options index 9cc215b820..44545d692a 100644 --- a/src/lagrangian/functionObjects/Make/options +++ b/src/lagrangian/functionObjects/Make/options @@ -13,5 +13,4 @@ LIB_LIBS = \ -lmeshTools \ -llagrangian \ -llagrangianParcel \ - -llagrangianParcelTurbulence \ -lutilityFunctionObjects diff --git a/src/lagrangian/parcel/Make/options b/src/lagrangian/parcel/Make/options index 69084cc5d7..c30389eb8e 100644 --- a/src/lagrangian/parcel/Make/options +++ b/src/lagrangian/parcel/Make/options @@ -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 diff --git a/src/lagrangian/parcel/parcels/derived/reactingMultiphaseParcel/makeReactingMultiphaseParcelSubmodels.C b/src/lagrangian/parcel/parcels/derived/reactingMultiphaseParcel/makeReactingMultiphaseParcelSubmodels.C index ff16394ada..564bc5166d 100644 --- a/src/lagrangian/parcel/parcels/derived/reactingMultiphaseParcel/makeReactingMultiphaseParcelSubmodels.C +++ b/src/lagrangian/parcel/parcels/derived/reactingMultiphaseParcel/makeReactingMultiphaseParcelSubmodels.C @@ -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); diff --git a/src/lagrangian/parcel/parcels/derived/reactingParcel/makeReactingParcelSubmodels.C b/src/lagrangian/parcel/parcels/derived/reactingParcel/makeReactingParcelSubmodels.C index b20a8e5217..35ed610a9e 100644 --- a/src/lagrangian/parcel/parcels/derived/reactingParcel/makeReactingParcelSubmodels.C +++ b/src/lagrangian/parcel/parcels/derived/reactingParcel/makeReactingParcelSubmodels.C @@ -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); diff --git a/src/lagrangian/parcel/parcels/derived/sprayParcel/makeSprayParcelSubmodels.C b/src/lagrangian/parcel/parcels/derived/sprayParcel/makeSprayParcelSubmodels.C index e38a9d5f0d..47f3d3fa1e 100644 --- a/src/lagrangian/parcel/parcels/derived/sprayParcel/makeSprayParcelSubmodels.C +++ b/src/lagrangian/parcel/parcels/derived/sprayParcel/makeSprayParcelSubmodels.C @@ -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); diff --git a/src/lagrangian/parcel/parcels/derived/thermoParcel/makeThermoParcelSubmodels.C b/src/lagrangian/parcel/parcels/derived/thermoParcel/makeThermoParcelSubmodels.C index 4efd9f9239..840d45cb97 100644 --- a/src/lagrangian/parcel/parcels/derived/thermoParcel/makeThermoParcelSubmodels.C +++ b/src/lagrangian/parcel/parcels/derived/thermoParcel/makeThermoParcelSubmodels.C @@ -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); diff --git a/src/lagrangian/parcel/parcels/include/makeParcelDispersionModels.H b/src/lagrangian/parcel/parcels/include/makeParcelDispersionModels.H index 16ff0bac62..4c54eb7e35 100644 --- a/src/lagrangian/parcel/parcels/include/makeParcelDispersionModels.H +++ b/src/lagrangian/parcel/parcels/include/makeParcelDispersionModels.H @@ -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, \ + 0 \ + ); \ + \ makeDispersionModel(CloudType); \ - makeDispersionModelType(NoDispersion, CloudType); + makeDispersionModelType(NoDispersion, CloudType); \ + makeDispersionModelType(GradientDispersionRAS, CloudType); \ + makeDispersionModelType(StochasticDispersionRAS, CloudType); \ // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/lagrangian/parcelTurbulence/parcels/include/makeThermoParcelTurbulenceForces.H b/src/lagrangian/parcel/parcels/include/makeThermoParcelForces.H similarity index 80% rename from src/lagrangian/parcelTurbulence/parcels/include/makeThermoParcelTurbulenceForces.H rename to src/lagrangian/parcel/parcels/include/makeThermoParcelForces.H index 8f05fea2c4..71276ee772 100644 --- a/src/lagrangian/parcelTurbulence/parcels/include/makeThermoParcelTurbulenceForces.H +++ b/src/lagrangian/parcel/parcels/include/makeThermoParcelForces.H @@ -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); diff --git a/src/lagrangian/parcelTurbulence/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C b/src/lagrangian/parcel/submodels/Momentum/DispersionModel/DispersionRASModel/DispersionRASModel.C similarity index 98% rename from src/lagrangian/parcelTurbulence/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C rename to src/lagrangian/parcel/submodels/Momentum/DispersionModel/DispersionRASModel/DispersionRASModel.C index a0885db313..f6732b9834 100644 --- a/src/lagrangian/parcelTurbulence/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C +++ b/src/lagrangian/parcel/submodels/Momentum/DispersionModel/DispersionRASModel/DispersionRASModel.C @@ -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 diff --git a/src/lagrangian/parcelTurbulence/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.H b/src/lagrangian/parcel/submodels/Momentum/DispersionModel/DispersionRASModel/DispersionRASModel.H similarity index 98% rename from src/lagrangian/parcelTurbulence/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.H rename to src/lagrangian/parcel/submodels/Momentum/DispersionModel/DispersionRASModel/DispersionRASModel.H index d7f1aa4e8e..98eaeb7729 100644 --- a/src/lagrangian/parcelTurbulence/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.H +++ b/src/lagrangian/parcel/submodels/Momentum/DispersionModel/DispersionRASModel/DispersionRASModel.H @@ -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 diff --git a/src/lagrangian/parcelTurbulence/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.C b/src/lagrangian/parcel/submodels/Momentum/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.C similarity index 98% rename from src/lagrangian/parcelTurbulence/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.C rename to src/lagrangian/parcel/submodels/Momentum/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.C index fc5a3539f9..7e4c4845cd 100644 --- a/src/lagrangian/parcelTurbulence/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.C +++ b/src/lagrangian/parcel/submodels/Momentum/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.C @@ -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 diff --git a/src/lagrangian/parcelTurbulence/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.H b/src/lagrangian/parcel/submodels/Momentum/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.H similarity index 98% rename from src/lagrangian/parcelTurbulence/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.H rename to src/lagrangian/parcel/submodels/Momentum/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.H index d34066d17f..c0d0bac3dc 100644 --- a/src/lagrangian/parcelTurbulence/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.H +++ b/src/lagrangian/parcel/submodels/Momentum/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.H @@ -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 diff --git a/src/lagrangian/parcelTurbulence/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.C b/src/lagrangian/parcel/submodels/Momentum/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.C similarity index 98% rename from src/lagrangian/parcelTurbulence/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.C rename to src/lagrangian/parcel/submodels/Momentum/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.C index 22305f6bf4..b561980bab 100644 --- a/src/lagrangian/parcelTurbulence/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.C +++ b/src/lagrangian/parcel/submodels/Momentum/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.C @@ -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 diff --git a/src/lagrangian/parcelTurbulence/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.H b/src/lagrangian/parcel/submodels/Momentum/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.H similarity index 98% rename from src/lagrangian/parcelTurbulence/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.H rename to src/lagrangian/parcel/submodels/Momentum/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.H index e5b0d5228a..3420ecd50d 100644 --- a/src/lagrangian/parcelTurbulence/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.H +++ b/src/lagrangian/parcel/submodels/Momentum/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.H @@ -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 diff --git a/src/lagrangian/parcelTurbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C b/src/lagrangian/parcel/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C similarity index 98% rename from src/lagrangian/parcelTurbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C rename to src/lagrangian/parcel/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C index 6254369e99..3a1d7f8a6e 100644 --- a/src/lagrangian/parcelTurbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C +++ b/src/lagrangian/parcel/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C @@ -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 diff --git a/src/lagrangian/parcelTurbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.H b/src/lagrangian/parcel/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.H similarity index 98% rename from src/lagrangian/parcelTurbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.H rename to src/lagrangian/parcel/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.H index 356020f433..f94d6401b2 100644 --- a/src/lagrangian/parcelTurbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.H +++ b/src/lagrangian/parcel/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.H @@ -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 diff --git a/src/lagrangian/parcelTurbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForceI.H b/src/lagrangian/parcel/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForceI.H similarity index 96% rename from src/lagrangian/parcelTurbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForceI.H rename to src/lagrangian/parcel/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForceI.H index d3f0b16274..423ef08fd1 100644 --- a/src/lagrangian/parcelTurbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForceI.H +++ b/src/lagrangian/parcel/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForceI.H @@ -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 diff --git a/src/lagrangian/parcelTurbulence/Make/files b/src/lagrangian/parcelTurbulence/Make/files deleted file mode 100644 index a347c47738..0000000000 --- a/src/lagrangian/parcelTurbulence/Make/files +++ /dev/null @@ -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 diff --git a/src/lagrangian/parcelTurbulence/Make/options b/src/lagrangian/parcelTurbulence/Make/options deleted file mode 100644 index b6ba0a0446..0000000000 --- a/src/lagrangian/parcelTurbulence/Make/options +++ /dev/null @@ -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 diff --git a/src/lagrangian/parcelTurbulence/parcels/derived/collidingParcel/makeCollidingParcelSubmodels.C b/src/lagrangian/parcelTurbulence/parcels/derived/collidingParcel/makeCollidingParcelSubmodels.C deleted file mode 100644 index a81a19da73..0000000000 --- a/src/lagrangian/parcelTurbulence/parcels/derived/collidingParcel/makeCollidingParcelSubmodels.C +++ /dev/null @@ -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 . - -\*---------------------------------------------------------------------------*/ - -#include "collidingCloud.H" -#include "makeParcelTurbulenceDispersionModels.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - makeParcelTurbulenceDispersionModels(collidingCloud); -} - - -// ************************************************************************* // diff --git a/src/lagrangian/parcelTurbulence/parcels/derived/momentumParcel/makeMomentumParcelSubmodels.C b/src/lagrangian/parcelTurbulence/parcels/derived/momentumParcel/makeMomentumParcelSubmodels.C deleted file mode 100644 index d083012948..0000000000 --- a/src/lagrangian/parcelTurbulence/parcels/derived/momentumParcel/makeMomentumParcelSubmodels.C +++ /dev/null @@ -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 . - -\*---------------------------------------------------------------------------*/ - -#include "momentumCloud.H" -#include "makeParcelTurbulenceDispersionModels.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - makeParcelTurbulenceDispersionModels(momentumCloud); -} - - -// ************************************************************************* // diff --git a/src/lagrangian/parcelTurbulence/parcels/derived/mppicParcel/makeMppicParcelSubmodels.C b/src/lagrangian/parcelTurbulence/parcels/derived/mppicParcel/makeMppicParcelSubmodels.C deleted file mode 100644 index cb5cb5dbc3..0000000000 --- a/src/lagrangian/parcelTurbulence/parcels/derived/mppicParcel/makeMppicParcelSubmodels.C +++ /dev/null @@ -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 . - -\*---------------------------------------------------------------------------*/ - -#include "mppicCloud.H" -#include "makeParcelTurbulenceDispersionModels.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - makeParcelTurbulenceDispersionModels(mppicCloud); -} - - -// ************************************************************************* // diff --git a/src/lagrangian/parcelTurbulence/parcels/derived/reactingMultiphaseParcel/makeReactingMultiphaseParcelSubmodels.C b/src/lagrangian/parcelTurbulence/parcels/derived/reactingMultiphaseParcel/makeReactingMultiphaseParcelSubmodels.C deleted file mode 100644 index 564224d04a..0000000000 --- a/src/lagrangian/parcelTurbulence/parcels/derived/reactingMultiphaseParcel/makeReactingMultiphaseParcelSubmodels.C +++ /dev/null @@ -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 . - -\*---------------------------------------------------------------------------*/ - -#include "reactingMultiphaseCloud.H" - -#include "makeParcelTurbulenceDispersionModels.H" -#include "makeThermoParcelTurbulenceForces.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - makeThermoParcelTurbulenceForces(reactingMultiphaseCloud); - makeParcelTurbulenceDispersionModels(reactingMultiphaseCloud); -} - - -// ************************************************************************* // diff --git a/src/lagrangian/parcelTurbulence/parcels/derived/reactingParcel/makeReactingParcelSubmodels.C b/src/lagrangian/parcelTurbulence/parcels/derived/reactingParcel/makeReactingParcelSubmodels.C deleted file mode 100644 index fa0a0d4ad8..0000000000 --- a/src/lagrangian/parcelTurbulence/parcels/derived/reactingParcel/makeReactingParcelSubmodels.C +++ /dev/null @@ -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 . - -\*---------------------------------------------------------------------------*/ - -#include "reactingCloud.H" - -#include "makeParcelTurbulenceDispersionModels.H" -#include "makeThermoParcelTurbulenceForces.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - makeThermoParcelTurbulenceForces(reactingCloud); - makeParcelTurbulenceDispersionModels(reactingCloud); -} - - -// ************************************************************************* // diff --git a/src/lagrangian/parcelTurbulence/parcels/derived/sprayParcel/makeSprayParcelSubmodels.C b/src/lagrangian/parcelTurbulence/parcels/derived/sprayParcel/makeSprayParcelSubmodels.C deleted file mode 100644 index 4e221a05fe..0000000000 --- a/src/lagrangian/parcelTurbulence/parcels/derived/sprayParcel/makeSprayParcelSubmodels.C +++ /dev/null @@ -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 . - -\*---------------------------------------------------------------------------*/ - -#include "sprayCloud.H" - -#include "makeParcelTurbulenceDispersionModels.H" -#include "makeThermoParcelTurbulenceForces.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - makeThermoParcelTurbulenceForces(sprayCloud); - makeParcelTurbulenceDispersionModels(sprayCloud); -} - - -// ************************************************************************* // diff --git a/src/lagrangian/parcelTurbulence/parcels/derived/thermoParcel/makeThermoParcelSubmodels.C b/src/lagrangian/parcelTurbulence/parcels/derived/thermoParcel/makeThermoParcelSubmodels.C deleted file mode 100644 index 4a5d1e3946..0000000000 --- a/src/lagrangian/parcelTurbulence/parcels/derived/thermoParcel/makeThermoParcelSubmodels.C +++ /dev/null @@ -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 . - -\*---------------------------------------------------------------------------*/ - -#include "thermoCloud.H" - -#include "makeParcelTurbulenceDispersionModels.H" -#include "makeThermoParcelTurbulenceForces.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - makeThermoParcelTurbulenceForces(thermoCloud); - makeParcelTurbulenceDispersionModels(thermoCloud); -} - - -// ************************************************************************* // diff --git a/src/lagrangian/parcelTurbulence/parcels/include/makeParcelTurbulenceDispersionModels.H b/src/lagrangian/parcelTurbulence/parcels/include/makeParcelTurbulenceDispersionModels.H deleted file mode 100644 index 6dcdb48de8..0000000000 --- a/src/lagrangian/parcelTurbulence/parcels/include/makeParcelTurbulenceDispersionModels.H +++ /dev/null @@ -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 . - -\*---------------------------------------------------------------------------*/ - -#ifndef makeParcelTurbulenceDispersionModels_h -#define makeParcelTurbulenceDispersionModels_h - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#include "GradientDispersionRAS.H" -#include "StochasticDispersionRAS.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#define makeParcelTurbulenceDispersionModels(CloudType) \ - \ - typedef Foam::CloudType::momentumCloudType momentumCloudType; \ - defineNamedTemplateTypeNameAndDebug \ - ( \ - Foam::DispersionRASModel, \ - 0 \ - ); \ - \ - makeDispersionModelType(GradientDispersionRAS, CloudType); \ - makeDispersionModelType(StochasticDispersionRAS, CloudType); \ - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/tutorials/multicomponentFluid/simplifiedSiwek/constant/fvModels b/tutorials/multicomponentFluid/simplifiedSiwek/constant/fvModels index 2e3ad0b14f..ffb37342f4 100644 --- a/tutorials/multicomponentFluid/simplifiedSiwek/constant/fvModels +++ b/tutorials/multicomponentFluid/simplifiedSiwek/constant/fvModels @@ -22,7 +22,7 @@ buoyancyForce clouds { type clouds; - libs ("liblagrangianParcel.so" "liblagrangianParcelTurbulence.so"); + libs ("liblagrangianParcel.so"); clouds (coalCloud limestoneCloud); } diff --git a/tutorials/multicomponentFluid/verticalChannel/constant/fvModels b/tutorials/multicomponentFluid/verticalChannel/constant/fvModels index 1d8fbf0943..88e2e5361b 100644 --- a/tutorials/multicomponentFluid/verticalChannel/constant/fvModels +++ b/tutorials/multicomponentFluid/verticalChannel/constant/fvModels @@ -22,7 +22,7 @@ buoyancyForce clouds { type clouds; - libs ("liblagrangianParcel.so" "liblagrangianParcelTurbulence.so"); + libs ("liblagrangianParcel.so"); } // ************************************************************************* // diff --git a/tutorials/multicomponentFluid/verticalChannelLTS/constant/fvModels b/tutorials/multicomponentFluid/verticalChannelLTS/constant/fvModels index 1d8fbf0943..88e2e5361b 100644 --- a/tutorials/multicomponentFluid/verticalChannelLTS/constant/fvModels +++ b/tutorials/multicomponentFluid/verticalChannelLTS/constant/fvModels @@ -22,7 +22,7 @@ buoyancyForce clouds { type clouds; - libs ("liblagrangianParcel.so" "liblagrangianParcelTurbulence.so"); + libs ("liblagrangianParcel.so"); } // ************************************************************************* // diff --git a/tutorials/multicomponentFluid/verticalChannelSteady/constant/fvModels b/tutorials/multicomponentFluid/verticalChannelSteady/constant/fvModels index 1d8fbf0943..88e2e5361b 100644 --- a/tutorials/multicomponentFluid/verticalChannelSteady/constant/fvModels +++ b/tutorials/multicomponentFluid/verticalChannelSteady/constant/fvModels @@ -22,7 +22,7 @@ buoyancyForce clouds { type clouds; - libs ("liblagrangianParcel.so" "liblagrangianParcelTurbulence.so"); + libs ("liblagrangianParcel.so"); } // ************************************************************************* //