diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/files b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/files deleted file mode 100644 index 95c98aff1d..0000000000 --- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/files +++ /dev/null @@ -1,3 +0,0 @@ -icoUncoupledKinematicParcelFoam.C - -EXE = $(FOAM_APPBIN)/icoUncoupledKinematicParcelFoam diff --git a/applications/solvers/lagrangian/particleFoam/Make/files b/applications/solvers/lagrangian/particleFoam/Make/files new file mode 100644 index 0000000000..c89a38a17b --- /dev/null +++ b/applications/solvers/lagrangian/particleFoam/Make/files @@ -0,0 +1,3 @@ +particleFoam.C + +EXE = $(FOAM_APPBIN)/particleFoam diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/options b/applications/solvers/lagrangian/particleFoam/Make/options similarity index 100% rename from applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/options rename to applications/solvers/lagrangian/particleFoam/Make/options diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/createFields.H b/applications/solvers/lagrangian/particleFoam/createFields.H similarity index 100% rename from applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/createFields.H rename to applications/solvers/lagrangian/particleFoam/createFields.H diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/createNonInertialFrameFields.H b/applications/solvers/lagrangian/particleFoam/createNonInertialFrameFields.H similarity index 100% rename from applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/createNonInertialFrameFields.H rename to applications/solvers/lagrangian/particleFoam/createNonInertialFrameFields.H diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelFoam.C b/applications/solvers/lagrangian/particleFoam/particleFoam.C similarity index 98% rename from applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelFoam.C rename to applications/solvers/lagrangian/particleFoam/particleFoam.C index 2aa793bdf8..8d455d2793 100644 --- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelFoam.C +++ b/applications/solvers/lagrangian/particleFoam/particleFoam.C @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Application - uncoupledKinematicParcelFoam + rhoParticleFoam Description Transient solver for the passive transport of a single kinematic diff --git a/applications/solvers/lagrangian/rhoParticleFoam/Make/files b/applications/solvers/lagrangian/rhoParticleFoam/Make/files new file mode 100644 index 0000000000..dab551e00f --- /dev/null +++ b/applications/solvers/lagrangian/rhoParticleFoam/Make/files @@ -0,0 +1,3 @@ +rhoParticleFoam.C + +EXE = $(FOAM_APPBIN)/rhoParticleFoam diff --git a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options b/applications/solvers/lagrangian/rhoParticleFoam/Make/options similarity index 100% rename from applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options rename to applications/solvers/lagrangian/rhoParticleFoam/Make/options diff --git a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/createFields.H b/applications/solvers/lagrangian/rhoParticleFoam/createFields.H similarity index 100% rename from applications/solvers/lagrangian/uncoupledKinematicParcelFoam/createFields.H rename to applications/solvers/lagrangian/rhoParticleFoam/createFields.H diff --git a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C b/applications/solvers/lagrangian/rhoParticleFoam/rhoParticleFoam.C similarity index 98% rename from applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C rename to applications/solvers/lagrangian/rhoParticleFoam/rhoParticleFoam.C index 73ba02fa5e..738916add4 100644 --- a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C +++ b/applications/solvers/lagrangian/rhoParticleFoam/rhoParticleFoam.C @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Application - uncoupledKinematicParcelFoam + rhoParticleFoam Description Transient solver for the passive transport of a particle cloud. diff --git a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/files b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/files deleted file mode 100644 index 387367f169..0000000000 --- a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/files +++ /dev/null @@ -1,3 +0,0 @@ -uncoupledKinematicParcelFoam.C - -EXE = $(FOAM_APPBIN)/uncoupledKinematicParcelFoam diff --git a/bin/icoUncoupledKinematicParcelFoam b/bin/icoUncoupledKinematicParcelFoam new file mode 100755 index 0000000000..b18e3d71c8 --- /dev/null +++ b/bin/icoUncoupledKinematicParcelFoam @@ -0,0 +1,36 @@ +#!/bin/sh +#------------------------------------------------------------------------------ +# ========= | +# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox +# \\ / O peration | Website: https://openfoam.org +# \\ / A nd | Copyright (C) 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 . +# +# Script +# icoUncoupledKinematicParcelFoam +# +# Description +# Script to inform the user that the icoUncoupledKinematicParcelFoam solver +# has been renamed particleFoam. +# +#------------------------------------------------------------------------------ + +echo "The icoUncoupledKinematicParcelFoam solver has been renamed particleFoam" + +#------------------------------------------------------------------------------ diff --git a/bin/uncoupledKinematicParcelFoam b/bin/uncoupledKinematicParcelFoam new file mode 100755 index 0000000000..ad4d087189 --- /dev/null +++ b/bin/uncoupledKinematicParcelFoam @@ -0,0 +1,36 @@ +#!/bin/sh +#------------------------------------------------------------------------------ +# ========= | +# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox +# \\ / O peration | Website: https://openfoam.org +# \\ / A nd | Copyright (C) 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 . +# +# Script +# uncoupledKinematicParcelFoam +# +# Description +# Script to inform the user that the uncoupledKinematicParcelFoam solver +# has been renamed rhoParticleFoam. +# +#------------------------------------------------------------------------------ + +echo "The uncoupledKinematicParcelFoam solver has been renamed rhoParticleFoam" + +#------------------------------------------------------------------------------ diff --git a/etc/caseDicts/postProcessing/solvers/particles/particles b/etc/caseDicts/postProcessing/solvers/particles/particles new file mode 100644 index 0000000000..b4e9be99a8 --- /dev/null +++ b/etc/caseDicts/postProcessing/solvers/particles/particles @@ -0,0 +1,20 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +------------------------------------------------------------------------------- +Description + Tracks a cloud of particles driven by the flow of the continuous phase. + + The cloud is specified by a kinematicCloudProperties file in the constant + directory. A template file is provided in: + $FOAM_ETC/caseDicts/solvers/lagrangian + +\*---------------------------------------------------------------------------*/ + +type particles; +libs ("liblagrangianFunctionObjects.so"); + +// ************************************************************************* // diff --git a/etc/caseDicts/solvers/lagrangian/kinematicCloudProperties b/etc/caseDicts/solvers/lagrangian/kinematicCloudProperties index e345d3eb42..995b813d5e 100644 --- a/etc/caseDicts/solvers/lagrangian/kinematicCloudProperties +++ b/etc/caseDicts/solvers/lagrangian/kinematicCloudProperties @@ -52,7 +52,7 @@ subModels particleForces { sphereDrag; -// gravity; + // gravity; } injectionModels @@ -71,7 +71,7 @@ subModels parcelsPerSecond 1000; flowRateProfile constant 1; -// nParticle 100; // Required for fixed parcelBasisType + // nParticle 100; // Required for fixed parcelBasisType sizeDistribution { type fixedValue; diff --git a/etc/config.sh/bash_completion b/etc/config.sh/bash_completion index 09f757df76..eda6ef34ee 100644 --- a/etc/config.sh/bash_completion +++ b/etc/config.sh/bash_completion @@ -1925,7 +1925,7 @@ _icoUncoupledKinematicParcelDyMFoam_ () } complete -o filenames -o nospace -F _icoUncoupledKinematicParcelDyMFoam_ icoUncoupledKinematicParcelDyMFoam -_icoUncoupledKinematicParcelFoam_ () +_particleFoam_ () { local cur="${COMP_WORDS[COMP_CWORD]}" local prev="${COMP_WORDS[COMP_CWORD-1]}" @@ -1948,7 +1948,7 @@ _icoUncoupledKinematicParcelFoam_ () esac COMPREPLY=( $(compgen -W "${opts}" $extra -- ${cur}) ) } -complete -o filenames -o nospace -F _icoUncoupledKinematicParcelFoam_ icoUncoupledKinematicParcelFoam +complete -o filenames -o nospace -F _particleFoam_ particleFoam _ideasUnvToFoam_ () { @@ -5366,7 +5366,7 @@ _uncoupledKinematicParcelDyMFoam_ () } complete -o filenames -o nospace -F _uncoupledKinematicParcelDyMFoam_ uncoupledKinematicParcelDyMFoam -_uncoupledKinematicParcelFoam_ () +_rhoParticleFoam_ () { local cur="${COMP_WORDS[COMP_CWORD]}" local prev="${COMP_WORDS[COMP_CWORD-1]}" @@ -5389,7 +5389,7 @@ _uncoupledKinematicParcelFoam_ () esac COMPREPLY=( $(compgen -W "${opts}" $extra -- ${cur}) ) } -complete -o filenames -o nospace -F _uncoupledKinematicParcelFoam_ uncoupledKinematicParcelFoam +complete -o filenames -o nospace -F _rhoParticleFoam_ rhoParticleFoam _viewFactorsGen_ () { diff --git a/src/functionObjects/lagrangian/Make/files b/src/functionObjects/lagrangian/Make/files index ee54eaf98e..7d1ee3c9ff 100644 --- a/src/functionObjects/lagrangian/Make/files +++ b/src/functionObjects/lagrangian/Make/files @@ -1,4 +1,5 @@ cloudInfo/cloudInfo.C dsmcFields/dsmcFields.C +particles/particles.C LIB = $(FOAM_LIBBIN)/liblagrangianFunctionObjects diff --git a/src/functionObjects/lagrangian/particles/particles.C b/src/functionObjects/lagrangian/particles/particles.C new file mode 100644 index 0000000000..be773aa30b --- /dev/null +++ b/src/functionObjects/lagrangian/particles/particles.C @@ -0,0 +1,144 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Copyright (C) 2016-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 "particles.H" +#include "singlePhaseTransportModel.H" +#include "addToRunTimeSelectionTable.H" + +// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // + +namespace Foam +{ +namespace functionObjects +{ + defineTypeNameAndDebug(particles, 0); + addToRunTimeSelectionTable + ( + functionObject, + particles, + dictionary + ); +} +} + + +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +Foam::functionObjects::particles::particles +( + const word& name, + const Time& runTime, + const dictionary& dict +) +: + fvMeshFunctionObject(name, runTime, dict), + g_ + ( + IOobject + ( + "g", + time_.constant(), + mesh_, + IOobject::READ_IF_PRESENT, + IOobject::NO_WRITE + ), + dimensionedVector(dimAcceleration, Zero) + ), + laminarTransport_ + ( + mesh_.lookupObject("transportProperties") + ), + rhoValue_ + ( + "rho", + dimDensity, + laminarTransport_ + ), + rho_ + ( + IOobject + ( + "rho", + time_.timeName(), + mesh_ + ), + mesh_, + rhoValue_ + ), + mu_("mu", rhoValue_*laminarTransport_.nu()), + U_ + ( + mesh_.lookupObject(dict.lookupOrDefault("U", "U")) + ), + kinematicCloudName_ + ( + dict.lookupOrDefault("kinematicCloud", "kinematicCloud") + ), + kinematicCloud_ + ( + kinematicCloudName_, + rho_, + U_, + mu_, + g_ + ) +{} + + +// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // + +Foam::functionObjects::particles::~particles() +{} + + +// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // + +bool Foam::functionObjects::particles::read +( + const dictionary& dict +) +{ + fvMeshFunctionObject::read(dict); + + return true; +} + + +bool Foam::functionObjects::particles::execute() +{ + mu_ = rhoValue_*laminarTransport_.nu(); + kinematicCloud_.evolve(); + + return true; +} + + +bool Foam::functionObjects::particles::write() +{ + return true; +} + + +// ************************************************************************* // diff --git a/src/functionObjects/lagrangian/particles/particles.H b/src/functionObjects/lagrangian/particles/particles.H new file mode 100644 index 0000000000..d0b29534a9 --- /dev/null +++ b/src/functionObjects/lagrangian/particles/particles.H @@ -0,0 +1,174 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Copyright (C) 2016-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 . + +Class + Foam::functionObjects::particles + +Description + This functionObject tracks a uncoupled kinematic particle cloud in the + specified velocity field of an incompressible flow (laminar, RANS or LES). + + It may be used in conjunction with any transient single-phase incompressible + flow solver such as pisoFoam or pimpleFoam and tracks the particles or + parcels without affecting the flow-field. + + The kinematicCloud requires the density of the fluid which is looked-up + from constant/transportProperties dictionary and the acceleration due to + gravity which is read from the constant/g file if present or defaults to + zero. + + The kinematicCloud properties are read from the + constant/kinematicCloudProperties dictionary in the usual manner. + + Example of function object specification: + \verbatim + particles + { + libs ("liblagrangianFunctionObjects.so"); + type particles; + } + \endverbatim + +Usage + \table + Property | Description | Required | Default value + type | Type name: particles | yes | + U | Name of the velocity field | no | U + kinematicCloud | Name of the kinematicCloud | no | kinematicCloud + \endtable + +See also + Foam::functionObjects::fvMeshFunctionObject + +SourceFiles + particles.C + +\*---------------------------------------------------------------------------*/ + +#ifndef functionObjects_particles_H +#define functionObjects_particles_H + +#include "fvMeshFunctionObject.H" +#include "basicKinematicCollidingCloud.H" +#include "volFieldsFwd.H" +#include "uniformDimensionedFields.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + +class singlePhaseTransportModel; + +namespace functionObjects +{ + +/*---------------------------------------------------------------------------*\ + Class particles Declaration +\*---------------------------------------------------------------------------*/ + +class particles +: + public fvMeshFunctionObject +{ + // Private member data + + //- Optional acceleration due to gravity + uniformDimensionedVectorField g_; + + //- Reference to the laminar transport model + const singlePhaseTransportModel& laminarTransport_; + + //- Uniform density value + dimensionedScalar rhoValue_; + + //- Density field needed to construct kinematicCloud + volScalarField rho_; + + //- Dynamic viscosity field needed to construct kinematicCloud + volScalarField mu_; + + //- Reference to the velocity field + const volVectorField& U_; + + //- Name of the cloud + word kinematicCloudName_; + + //- The kinematic cloud + basicKinematicCollidingCloud kinematicCloud_; + + +public: + + //- Runtime type information + TypeName("particles"); + + + // Constructors + + //- Construct for given objectRegistry and dictionary. + // Allow the possibility to load fields from files + particles + ( + const word& name, + const Time& runTime, + const dictionary& dict + ); + + //- Disallow default bitwise copy construction + particles(const particles&) = delete; + + + //- Destructor + virtual ~particles(); + + + // Member Functions + + //- Read the controls + virtual bool read(const dictionary&); + + //- Track the cloud + virtual bool execute(); + + //- Write the cloud + virtual bool write(); + + + // Member Operators + + //- Disallow default bitwise assignment + void operator==(const particles&) = delete; +}; + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace functionObjects +} // End namespace Foam + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // diff --git a/tutorials/IO/fileHandler/system/controlDict b/tutorials/IO/fileHandler/system/controlDict index 0afe613c93..f936e3f71c 100644 --- a/tutorials/IO/fileHandler/system/controlDict +++ b/tutorials/IO/fileHandler/system/controlDict @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -application icoUncoupledKinematicParcelFoam; +application particleFoam; startFrom latestTime; diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/Allclean b/tutorials/lagrangian/particleFoam/hopper/Allclean similarity index 100% rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/Allclean rename to tutorials/lagrangian/particleFoam/hopper/Allclean diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/Allrun b/tutorials/lagrangian/particleFoam/hopper/Allrun similarity index 100% rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/Allrun rename to tutorials/lagrangian/particleFoam/hopper/Allrun diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/0.orig/U b/tutorials/lagrangian/particleFoam/hopper/hopperEmptying/0.orig/U similarity index 100% rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/0.orig/U rename to tutorials/lagrangian/particleFoam/hopper/hopperEmptying/0.orig/U diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/0.orig/mu b/tutorials/lagrangian/particleFoam/hopper/hopperEmptying/0.orig/mu similarity index 100% rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/0.orig/mu rename to tutorials/lagrangian/particleFoam/hopper/hopperEmptying/0.orig/mu diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/0.orig/rho b/tutorials/lagrangian/particleFoam/hopper/hopperEmptying/0.orig/rho similarity index 100% rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/0.orig/rho rename to tutorials/lagrangian/particleFoam/hopper/hopperEmptying/0.orig/rho diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/g b/tutorials/lagrangian/particleFoam/hopper/hopperEmptying/constant/g similarity index 100% rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/g rename to tutorials/lagrangian/particleFoam/hopper/hopperEmptying/constant/g diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/kinematicCloudProperties b/tutorials/lagrangian/particleFoam/hopper/hopperEmptying/constant/kinematicCloudProperties similarity index 100% rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/kinematicCloudProperties rename to tutorials/lagrangian/particleFoam/hopper/hopperEmptying/constant/kinematicCloudProperties diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/momentumTransport b/tutorials/lagrangian/particleFoam/hopper/hopperEmptying/constant/momentumTransport similarity index 100% rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/momentumTransport rename to tutorials/lagrangian/particleFoam/hopper/hopperEmptying/constant/momentumTransport diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/transportProperties b/tutorials/lagrangian/particleFoam/hopper/hopperEmptying/constant/transportProperties similarity index 100% rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/transportProperties rename to tutorials/lagrangian/particleFoam/hopper/hopperEmptying/constant/transportProperties diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/blockMeshDict b/tutorials/lagrangian/particleFoam/hopper/hopperEmptying/system/blockMeshDict similarity index 100% rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/blockMeshDict rename to tutorials/lagrangian/particleFoam/hopper/hopperEmptying/system/blockMeshDict diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/controlDict b/tutorials/lagrangian/particleFoam/hopper/hopperEmptying/system/controlDict similarity index 95% rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/controlDict rename to tutorials/lagrangian/particleFoam/hopper/hopperEmptying/system/controlDict index 38475afa78..0da7371789 100644 --- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/controlDict +++ b/tutorials/lagrangian/particleFoam/hopper/hopperEmptying/system/controlDict @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -application icoUncoupledKinematicParcelFoam; +application particleFoam; startFrom startTime; diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/decomposeParDict b/tutorials/lagrangian/particleFoam/hopper/hopperEmptying/system/decomposeParDict similarity index 100% rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/decomposeParDict rename to tutorials/lagrangian/particleFoam/hopper/hopperEmptying/system/decomposeParDict diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/fvSchemes b/tutorials/lagrangian/particleFoam/hopper/hopperEmptying/system/fvSchemes similarity index 100% rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/fvSchemes rename to tutorials/lagrangian/particleFoam/hopper/hopperEmptying/system/fvSchemes diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/fvSolution b/tutorials/lagrangian/particleFoam/hopper/hopperEmptying/system/fvSolution similarity index 100% rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/fvSolution rename to tutorials/lagrangian/particleFoam/hopper/hopperEmptying/system/fvSolution diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/mapFieldsDict b/tutorials/lagrangian/particleFoam/hopper/hopperEmptying/system/mapFieldsDict similarity index 100% rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/system/mapFieldsDict rename to tutorials/lagrangian/particleFoam/hopper/hopperEmptying/system/mapFieldsDict diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/0/U b/tutorials/lagrangian/particleFoam/hopper/hopperInitialState/0/U similarity index 100% rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/0/U rename to tutorials/lagrangian/particleFoam/hopper/hopperInitialState/0/U diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/g b/tutorials/lagrangian/particleFoam/hopper/hopperInitialState/constant/g similarity index 100% rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/g rename to tutorials/lagrangian/particleFoam/hopper/hopperInitialState/constant/g diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/kinematicCloudPositions b/tutorials/lagrangian/particleFoam/hopper/hopperInitialState/constant/kinematicCloudPositions similarity index 100% rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/kinematicCloudPositions rename to tutorials/lagrangian/particleFoam/hopper/hopperInitialState/constant/kinematicCloudPositions diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/kinematicCloudProperties b/tutorials/lagrangian/particleFoam/hopper/hopperInitialState/constant/kinematicCloudProperties similarity index 100% rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/kinematicCloudProperties rename to tutorials/lagrangian/particleFoam/hopper/hopperInitialState/constant/kinematicCloudProperties diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/momentumTransport b/tutorials/lagrangian/particleFoam/hopper/hopperInitialState/constant/momentumTransport similarity index 100% rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/momentumTransport rename to tutorials/lagrangian/particleFoam/hopper/hopperInitialState/constant/momentumTransport diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/transportProperties b/tutorials/lagrangian/particleFoam/hopper/hopperInitialState/constant/transportProperties similarity index 100% rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/transportProperties rename to tutorials/lagrangian/particleFoam/hopper/hopperInitialState/constant/transportProperties diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/blockMeshDict b/tutorials/lagrangian/particleFoam/hopper/hopperInitialState/system/blockMeshDict similarity index 100% rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/blockMeshDict rename to tutorials/lagrangian/particleFoam/hopper/hopperInitialState/system/blockMeshDict diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/controlDict b/tutorials/lagrangian/particleFoam/hopper/hopperInitialState/system/controlDict similarity index 95% rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/controlDict rename to tutorials/lagrangian/particleFoam/hopper/hopperInitialState/system/controlDict index 84d0e374ae..3ca6c82a0a 100644 --- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/controlDict +++ b/tutorials/lagrangian/particleFoam/hopper/hopperInitialState/system/controlDict @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -application icoUncoupledKinematicParcelFoam; +application particleFoam; startFrom startTime; diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/decomposeParDict b/tutorials/lagrangian/particleFoam/hopper/hopperInitialState/system/decomposeParDict similarity index 100% rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/decomposeParDict rename to tutorials/lagrangian/particleFoam/hopper/hopperInitialState/system/decomposeParDict diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/fvSchemes b/tutorials/lagrangian/particleFoam/hopper/hopperInitialState/system/fvSchemes similarity index 100% rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/fvSchemes rename to tutorials/lagrangian/particleFoam/hopper/hopperInitialState/system/fvSchemes diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/fvSolution b/tutorials/lagrangian/particleFoam/hopper/hopperInitialState/system/fvSolution similarity index 100% rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/system/fvSolution rename to tutorials/lagrangian/particleFoam/hopper/hopperInitialState/system/fvSolution diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/mixerVesselAMI2D/0/U b/tutorials/lagrangian/particleFoam/mixerVesselAMI2D/0/U similarity index 100% rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/mixerVesselAMI2D/0/U rename to tutorials/lagrangian/particleFoam/mixerVesselAMI2D/0/U diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/mixerVesselAMI2D/Allrun b/tutorials/lagrangian/particleFoam/mixerVesselAMI2D/Allrun similarity index 100% rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/mixerVesselAMI2D/Allrun rename to tutorials/lagrangian/particleFoam/mixerVesselAMI2D/Allrun diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/mixerVesselAMI2D/constant/dynamicMeshDict b/tutorials/lagrangian/particleFoam/mixerVesselAMI2D/constant/dynamicMeshDict similarity index 100% rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/mixerVesselAMI2D/constant/dynamicMeshDict rename to tutorials/lagrangian/particleFoam/mixerVesselAMI2D/constant/dynamicMeshDict diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/mixerVesselAMI2D/constant/g b/tutorials/lagrangian/particleFoam/mixerVesselAMI2D/constant/g similarity index 100% rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/mixerVesselAMI2D/constant/g rename to tutorials/lagrangian/particleFoam/mixerVesselAMI2D/constant/g diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/mixerVesselAMI2D/constant/kinematicCloudPositions b/tutorials/lagrangian/particleFoam/mixerVesselAMI2D/constant/kinematicCloudPositions similarity index 100% rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/mixerVesselAMI2D/constant/kinematicCloudPositions rename to tutorials/lagrangian/particleFoam/mixerVesselAMI2D/constant/kinematicCloudPositions diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/mixerVesselAMI2D/constant/kinematicCloudProperties b/tutorials/lagrangian/particleFoam/mixerVesselAMI2D/constant/kinematicCloudProperties similarity index 100% rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/mixerVesselAMI2D/constant/kinematicCloudProperties rename to tutorials/lagrangian/particleFoam/mixerVesselAMI2D/constant/kinematicCloudProperties diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/mixerVesselAMI2D/constant/momentumTransport b/tutorials/lagrangian/particleFoam/mixerVesselAMI2D/constant/momentumTransport similarity index 100% rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/mixerVesselAMI2D/constant/momentumTransport rename to tutorials/lagrangian/particleFoam/mixerVesselAMI2D/constant/momentumTransport diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/mixerVesselAMI2D/constant/transportProperties b/tutorials/lagrangian/particleFoam/mixerVesselAMI2D/constant/transportProperties similarity index 100% rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/mixerVesselAMI2D/constant/transportProperties rename to tutorials/lagrangian/particleFoam/mixerVesselAMI2D/constant/transportProperties diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/mixerVesselAMI2D/system/blockMeshDict.m4 b/tutorials/lagrangian/particleFoam/mixerVesselAMI2D/system/blockMeshDict.m4 similarity index 100% rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/mixerVesselAMI2D/system/blockMeshDict.m4 rename to tutorials/lagrangian/particleFoam/mixerVesselAMI2D/system/blockMeshDict.m4 diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/mixerVesselAMI2D/system/controlDict b/tutorials/lagrangian/particleFoam/mixerVesselAMI2D/system/controlDict similarity index 95% rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/mixerVesselAMI2D/system/controlDict rename to tutorials/lagrangian/particleFoam/mixerVesselAMI2D/system/controlDict index 02ba8e1af4..afe9ee02f8 100644 --- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/mixerVesselAMI2D/system/controlDict +++ b/tutorials/lagrangian/particleFoam/mixerVesselAMI2D/system/controlDict @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -application icoUncoupledKinematicParcelFoam; +application particleFoam; startFrom startTime; diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/mixerVesselAMI2D/system/fvSchemes b/tutorials/lagrangian/particleFoam/mixerVesselAMI2D/system/fvSchemes similarity index 100% rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/mixerVesselAMI2D/system/fvSchemes rename to tutorials/lagrangian/particleFoam/mixerVesselAMI2D/system/fvSchemes diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/mixerVesselAMI2D/system/fvSolution b/tutorials/lagrangian/particleFoam/mixerVesselAMI2D/system/fvSolution similarity index 100% rename from tutorials/lagrangian/icoUncoupledKinematicParcelFoam/mixerVesselAMI2D/system/fvSolution rename to tutorials/lagrangian/particleFoam/mixerVesselAMI2D/system/fvSolution