diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/options b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/options index aebc4519bb..83385b8ab4 100644 --- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/options +++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/options @@ -1,33 +1,26 @@ EXE_INC = \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ - -I$(LIB_SRC)/transportModels/compressible/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ -I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \ -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/regionModels/regionModel/lnInclude \ - -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude + -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \ + -I$(LIB_SRC)/dynamicFvMesh/lnInclude \ + -I$(LIB_SRC)/meshTools/lnInclude EXE_LIBS = \ -llagrangian \ -llagrangianIntermediate \ -llagrangianTurbulence \ - -lcompressibleTransportModels \ - -lfluidThermophysicalModels \ - -lspecie \ - -lradiationModels \ -lturbulenceModels \ -lincompressibleTurbulenceModels \ -lincompressibleTransportModels \ -lfiniteVolume \ - -lfvOptions \ - -lmeshTools \ -lregionModels \ - -lsurfaceFilmModels + -lsurfaceFilmModels \ + -ldynamicFvMesh \ + -ltopoChangerFvMesh \ + -lmeshTools diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/Make/files b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/Make/files deleted file mode 100644 index 2cce02e105..0000000000 --- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/Make/files +++ /dev/null @@ -1,3 +0,0 @@ -icoUncoupledKinematicParcelDyMFoam.C - -EXE = $(FOAM_APPBIN)/icoUncoupledKinematicParcelDyMFoam diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/Make/options b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/Make/options deleted file mode 100644 index 76fa725a3a..0000000000 --- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/Make/options +++ /dev/null @@ -1,40 +0,0 @@ -EXE_INC = \ - -I.. \ - -I$(LIB_SRC)/lagrangian/basic/lnInclude \ - -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ - -I$(LIB_SRC)/transportModels/compressible/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ - -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ - -I$(LIB_SRC)/transportModels \ - -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/regionModels/regionModel/lnInclude \ - -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \ - -I$(LIB_SRC)/dynamicMesh/lnInclude \ - -I$(LIB_SRC)/dynamicFvMesh/lnInclude - - -EXE_LIBS = \ - -llagrangian \ - -llagrangianIntermediate \ - -llagrangianTurbulence \ - -lcompressibleTransportModels \ - -lfluidThermophysicalModels \ - -lspecie \ - -lradiationModels \ - -lturbulenceModels \ - -lincompressibleTurbulenceModels \ - -lincompressibleTransportModels \ - -lfiniteVolume \ - -lfvOptions \ - -lmeshTools \ - -lregionModels \ - -lsurfaceFilmModels \ - -ldynamicMesh \ - -ldynamicFvMesh \ - -ltopoChangerFvMesh diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/icoUncoupledKinematicParcelDyMFoam.C b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/icoUncoupledKinematicParcelDyMFoam.C deleted file mode 100644 index 3b22621a16..0000000000 --- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/icoUncoupledKinematicParcelDyMFoam.C +++ /dev/null @@ -1,95 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2011-2018 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 . - -Application - uncoupledKinematicParcelDyMFoam - -Description - Transient solver for the passive transport of a single kinematic - particle cloud, with optional mesh motion and mesh topology changes. - - Uses a pre-calculated velocity field to evolve the cloud. - -\*---------------------------------------------------------------------------*/ - -#include "fvCFD.H" -#include "dynamicFvMesh.H" -#include "singlePhaseTransportModel.H" -#include "turbulentTransportModel.H" -#include "basicKinematicCollidingCloud.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -int main(int argc, char *argv[]) -{ - argList::addOption - ( - "cloudName", - "name", - "specify alternative cloud name. default is 'kinematicCloud'" - ); - - #include "postProcess.H" - - #include "setRootCaseLists.H" - #include "createTime.H" - #include "createDynamicFvMesh.H" - #include "createControl.H" - #include "createFields.H" - - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - - Info<< "\nStarting time loop\n" << endl; - - while (runTime.loop()) - { - Info<< "Time = " << runTime.timeName() << nl << endl; - - kinematicCloud.storeGlobalPositions(); - - mesh.update(); - - U.correctBoundaryConditions(); - - Info<< "Evolving " << kinematicCloud.name() << endl; - - laminarTransport.correct(); - - mu = laminarTransport.nu()*rhoInfValue; - - kinematicCloud.evolve(); - - runTime.write(); - - Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" - << " ClockTime = " << runTime.elapsedClockTime() << " s" - << nl << endl; - } - - Info<< "End\n" << endl; - - return 0; -} - - -// ************************************************************************* // diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelFoam.C b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelFoam.C index 7b91a57e19..9143204a1f 100644 --- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelFoam.C +++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelFoam.C @@ -22,17 +22,18 @@ License along with OpenFOAM. If not, see . Application - icoUncoupledKinematicParcelFoam + uncoupledKinematicParcelFoam Description Transient solver for the passive transport of a single kinematic - particle cloud. + particle cloud, with optional mesh motion and mesh topology changes. Uses a pre-calculated velocity field to evolve the cloud. \*---------------------------------------------------------------------------*/ #include "fvCFD.H" +#include "dynamicFvMesh.H" #include "singlePhaseTransportModel.H" #include "turbulentTransportModel.H" #include "basicKinematicCollidingCloud.H" @@ -52,7 +53,7 @@ int main(int argc, char *argv[]) #include "setRootCaseLists.H" #include "createTime.H" - #include "createMesh.H" + #include "createDynamicFvMesh.H" #include "createControl.H" #include "createFields.H" @@ -64,6 +65,15 @@ int main(int argc, char *argv[]) { Info<< "Time = " << runTime.timeName() << nl << endl; + kinematicCloud.storeGlobalPositions(); + + mesh.update(); + + if (mesh.changing()) + { + U.correctBoundaryConditions(); + } + Info<< "Evolving " << kinematicCloud.name() << endl; laminarTransport.correct(); diff --git a/bin/icoUncoupledKinematicParcelDyMFoam b/bin/icoUncoupledKinematicParcelDyMFoam new file mode 120000 index 0000000000..d9fcbed5a0 --- /dev/null +++ b/bin/icoUncoupledKinematicParcelDyMFoam @@ -0,0 +1 @@ +mergedDyM \ No newline at end of file diff --git a/bin/potentialFreeSurfaceDyMFoam b/bin/potentialFreeSurfaceDyMFoam deleted file mode 100755 index be2ca1ee8c..0000000000 --- a/bin/potentialFreeSurfaceDyMFoam +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh -#------------------------------------------------------------------------------ -# ========= | -# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox -# \\ / O peration | -# \\ / A nd | Copyright (C) 2017-2018 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 -# supersededByPostProcess -# -# Description -# Script to suggest using the new "postProcess" utility. -# -#------------------------------------------------------------------------------ -DyMsolver=${0##*/} -solver=$(echo $DyMsolver | sed 's/DyM//') - -echo "The dynamic mesh functionality in $DyMsolver has been merged into $solver" -echo "and the $DyMsolver tutorials moved into the $solver tutorials directory" - -#------------------------------------------------------------------------------ diff --git a/bin/potentialFreeSurfaceDyMFoam b/bin/potentialFreeSurfaceDyMFoam new file mode 120000 index 0000000000..d9fcbed5a0 --- /dev/null +++ b/bin/potentialFreeSurfaceDyMFoam @@ -0,0 +1 @@ +mergedDyM \ No newline at end of file diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/0/U b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/mixerVesselAMI2D/0/U similarity index 100% rename from tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/0/U rename to tutorials/lagrangian/icoUncoupledKinematicParcelFoam/mixerVesselAMI2D/0/U diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/Allrun b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/mixerVesselAMI2D/Allrun similarity index 100% rename from tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/Allrun rename to tutorials/lagrangian/icoUncoupledKinematicParcelFoam/mixerVesselAMI2D/Allrun diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/dynamicMeshDict b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/mixerVesselAMI2D/constant/dynamicMeshDict similarity index 100% rename from tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/dynamicMeshDict rename to tutorials/lagrangian/icoUncoupledKinematicParcelFoam/mixerVesselAMI2D/constant/dynamicMeshDict diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/g b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/mixerVesselAMI2D/constant/g similarity index 100% rename from tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/g rename to tutorials/lagrangian/icoUncoupledKinematicParcelFoam/mixerVesselAMI2D/constant/g diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/kinematicCloudPositions b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/mixerVesselAMI2D/constant/kinematicCloudPositions similarity index 100% rename from tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/kinematicCloudPositions rename to tutorials/lagrangian/icoUncoupledKinematicParcelFoam/mixerVesselAMI2D/constant/kinematicCloudPositions diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/kinematicCloudProperties b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/mixerVesselAMI2D/constant/kinematicCloudProperties similarity index 100% rename from tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/kinematicCloudProperties rename to tutorials/lagrangian/icoUncoupledKinematicParcelFoam/mixerVesselAMI2D/constant/kinematicCloudProperties diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/transportProperties b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/mixerVesselAMI2D/constant/transportProperties similarity index 100% rename from tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/transportProperties rename to tutorials/lagrangian/icoUncoupledKinematicParcelFoam/mixerVesselAMI2D/constant/transportProperties diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/turbulenceProperties b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/mixerVesselAMI2D/constant/turbulenceProperties similarity index 100% rename from tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/turbulenceProperties rename to tutorials/lagrangian/icoUncoupledKinematicParcelFoam/mixerVesselAMI2D/constant/turbulenceProperties diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/system/blockMeshDict.m4 b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/mixerVesselAMI2D/system/blockMeshDict.m4 similarity index 100% rename from tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/system/blockMeshDict.m4 rename to tutorials/lagrangian/icoUncoupledKinematicParcelFoam/mixerVesselAMI2D/system/blockMeshDict.m4 diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/system/controlDict b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/mixerVesselAMI2D/system/controlDict similarity index 95% rename from tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/system/controlDict rename to tutorials/lagrangian/icoUncoupledKinematicParcelFoam/mixerVesselAMI2D/system/controlDict index b615f9fd3d..2cbf720a08 100644 --- a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/system/controlDict +++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/mixerVesselAMI2D/system/controlDict @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -application icoUncoupledKinematicParcelDyMFoam; +application icoUncoupledKinematicParcelFoam; startFrom startTime; diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/system/fvSchemes b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/mixerVesselAMI2D/system/fvSchemes similarity index 100% rename from tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/system/fvSchemes rename to tutorials/lagrangian/icoUncoupledKinematicParcelFoam/mixerVesselAMI2D/system/fvSchemes diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/system/fvSolution b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/mixerVesselAMI2D/system/fvSolution similarity index 100% rename from tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/system/fvSolution rename to tutorials/lagrangian/icoUncoupledKinematicParcelFoam/mixerVesselAMI2D/system/fvSolution