From 97309e5538332c00890c64aacdef45e804e7a1fd Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Mon, 2 Jul 2018 21:51:58 +0100 Subject: [PATCH] potentialFreeSurfaceFoam: Merged with potentialFreeSurfaceDyMFoam potentialFreeSurfaceFoam can now run with static or dynamic meshes selected in the constant/dynamicMeshDict dictionary. --- .../potentialFreeSurfaceFoam/Make/options | 4 +- .../correctPhi.H | 0 .../potentialFreeSurfaceFoam/pEqn.H | 30 +++- .../potentialFreeSurfaceDyMFoam/Make/files | 3 - .../potentialFreeSurfaceDyMFoam/Make/options | 25 --- .../potentialFreeSurfaceDyMFoam/pEqn.H | 67 -------- .../potentialFreeSurfaceDyMFoam.C | 159 ------------------ .../potentialFreeSurfaceFoam.C | 73 +++++++- bin/potentialFreeSurfaceDyMFoam | 38 +++++ .../movingOscillatingBox}/0.orig/U | 0 .../movingOscillatingBox}/0.orig/p | 0 .../movingOscillatingBox}/0.orig/p_gh | 0 .../0.orig/pointDisplacement | 0 .../movingOscillatingBox}/Allclean | 0 .../movingOscillatingBox}/Allrun | 0 .../constant/dynamicMeshDict | 0 .../movingOscillatingBox}/constant/g | 0 .../constant/transportProperties | 0 .../constant/turbulenceProperties | 0 .../movingOscillatingBox}/extractHeightData | 0 .../system/blockMeshDict | 0 .../movingOscillatingBox}/system/controlDict | 2 +- .../system/createPatchDict | 0 .../movingOscillatingBox}/system/fvSchemes | 0 .../movingOscillatingBox}/system/fvSolution | 0 .../movingOscillatingBox}/system/topoSetDict | 0 .../system/topoSetDict-selectBottom | 0 27 files changed, 129 insertions(+), 272 deletions(-) rename applications/solvers/multiphase/potentialFreeSurfaceFoam/{potentialFreeSurfaceDyMFoam => }/correctPhi.H (100%) delete mode 100644 applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/Make/files delete mode 100644 applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/Make/options delete mode 100644 applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/pEqn.H delete mode 100644 applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/potentialFreeSurfaceDyMFoam.C create mode 100755 bin/potentialFreeSurfaceDyMFoam rename tutorials/multiphase/{potentialFreeSurfaceDyMFoam/oscillatingBox => potentialFreeSurfaceFoam/movingOscillatingBox}/0.orig/U (100%) rename tutorials/multiphase/{potentialFreeSurfaceDyMFoam/oscillatingBox => potentialFreeSurfaceFoam/movingOscillatingBox}/0.orig/p (100%) rename tutorials/multiphase/{potentialFreeSurfaceDyMFoam/oscillatingBox => potentialFreeSurfaceFoam/movingOscillatingBox}/0.orig/p_gh (100%) rename tutorials/multiphase/{potentialFreeSurfaceDyMFoam/oscillatingBox => potentialFreeSurfaceFoam/movingOscillatingBox}/0.orig/pointDisplacement (100%) rename tutorials/multiphase/{potentialFreeSurfaceDyMFoam/oscillatingBox => potentialFreeSurfaceFoam/movingOscillatingBox}/Allclean (100%) rename tutorials/multiphase/{potentialFreeSurfaceDyMFoam/oscillatingBox => potentialFreeSurfaceFoam/movingOscillatingBox}/Allrun (100%) rename tutorials/multiphase/{potentialFreeSurfaceDyMFoam/oscillatingBox => potentialFreeSurfaceFoam/movingOscillatingBox}/constant/dynamicMeshDict (100%) rename tutorials/multiphase/{potentialFreeSurfaceDyMFoam/oscillatingBox => potentialFreeSurfaceFoam/movingOscillatingBox}/constant/g (100%) rename tutorials/multiphase/{potentialFreeSurfaceDyMFoam/oscillatingBox => potentialFreeSurfaceFoam/movingOscillatingBox}/constant/transportProperties (100%) rename tutorials/multiphase/{potentialFreeSurfaceDyMFoam/oscillatingBox => potentialFreeSurfaceFoam/movingOscillatingBox}/constant/turbulenceProperties (100%) rename tutorials/multiphase/{potentialFreeSurfaceDyMFoam/oscillatingBox => potentialFreeSurfaceFoam/movingOscillatingBox}/extractHeightData (100%) rename tutorials/multiphase/{potentialFreeSurfaceDyMFoam/oscillatingBox => potentialFreeSurfaceFoam/movingOscillatingBox}/system/blockMeshDict (100%) rename tutorials/multiphase/{potentialFreeSurfaceDyMFoam/oscillatingBox => potentialFreeSurfaceFoam/movingOscillatingBox}/system/controlDict (97%) rename tutorials/multiphase/{potentialFreeSurfaceDyMFoam/oscillatingBox => potentialFreeSurfaceFoam/movingOscillatingBox}/system/createPatchDict (100%) rename tutorials/multiphase/{potentialFreeSurfaceDyMFoam/oscillatingBox => potentialFreeSurfaceFoam/movingOscillatingBox}/system/fvSchemes (100%) rename tutorials/multiphase/{potentialFreeSurfaceDyMFoam/oscillatingBox => potentialFreeSurfaceFoam/movingOscillatingBox}/system/fvSolution (100%) rename tutorials/multiphase/{potentialFreeSurfaceDyMFoam/oscillatingBox => potentialFreeSurfaceFoam/movingOscillatingBox}/system/topoSetDict (100%) rename tutorials/multiphase/{potentialFreeSurfaceDyMFoam/oscillatingBox => potentialFreeSurfaceFoam/movingOscillatingBox}/system/topoSetDict-selectBottom (100%) diff --git a/applications/solvers/multiphase/potentialFreeSurfaceFoam/Make/options b/applications/solvers/multiphase/potentialFreeSurfaceFoam/Make/options index 2026e36fb6..a4d71be758 100644 --- a/applications/solvers/multiphase/potentialFreeSurfaceFoam/Make/options +++ b/applications/solvers/multiphase/potentialFreeSurfaceFoam/Make/options @@ -4,15 +4,17 @@ EXE_INC = \ -I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \ -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/dynamicFvMesh/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude - EXE_LIBS = \ -lincompressibleTransportModels \ -lturbulenceModels \ -lincompressibleTurbulenceModels \ -lfiniteVolume \ + -ldynamicFvMesh \ + -ltopoChangerFvMesh \ -lmeshTools \ -lfvOptions \ -lsampling diff --git a/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/correctPhi.H b/applications/solvers/multiphase/potentialFreeSurfaceFoam/correctPhi.H similarity index 100% rename from applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/correctPhi.H rename to applications/solvers/multiphase/potentialFreeSurfaceFoam/correctPhi.H diff --git a/applications/solvers/multiphase/potentialFreeSurfaceFoam/pEqn.H b/applications/solvers/multiphase/potentialFreeSurfaceFoam/pEqn.H index 0e259d8809..773efc099a 100644 --- a/applications/solvers/multiphase/potentialFreeSurfaceFoam/pEqn.H +++ b/applications/solvers/multiphase/potentialFreeSurfaceFoam/pEqn.H @@ -1,4 +1,4 @@ -volScalarField rAU(1.0/UEqn.A()); +rAU = 1.0/UEqn.A(); surfaceScalarField rAUf("rAUf", fvc::interpolate(rAU)); volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p_gh)); @@ -11,11 +11,17 @@ surfaceScalarField phiHbyA ( "phiHbyA", fvc::flux(HbyA) - + MRF.zeroFilter(rAUf*fvc::ddtCorr(U, phi)) + + MRF.zeroFilter(rAUf*fvc::ddtCorr(U, phi, Uf)) ); MRF.makeRelative(phiHbyA); -adjustPhi(phiHbyA, U, p_gh); + +if (p_gh.needReference()) +{ + fvc::makeRelative(phiHbyA, U); + adjustPhi(phiHbyA, U, p_gh); + fvc::makeAbsolute(phiHbyA, U); +} // Update the pressure BCs to ensure flux consistency constrainPressure(p_gh, U, phiHbyA, rAUf); @@ -35,16 +41,22 @@ while (pimple.correctNonOrthogonal()) if (pimple.finalNonOrthogonalIter()) { phi = phiHbyA - p_ghEqn.flux(); + + // Explicitly relax pressure for momentum corrector + p_gh.relax(); + + U = HbyA - rAU*fvc::grad(p_gh); + U.correctBoundaryConditions(); + fvOptions.correct(U); } } #include "continuityErrs.H" -// Explicitly relax pressure for momentum corrector -p_gh.relax(); +// Correct Uf if the mesh is moving +fvc::correctUf(Uf, U, phi); + +// Make the fluxes relative to the mesh motion +fvc::makeRelative(phi, U); p = p_gh + (g & mesh.C()); - -U = HbyA - rAU*fvc::grad(p_gh); -U.correctBoundaryConditions(); -fvOptions.correct(U); diff --git a/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/Make/files b/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/Make/files deleted file mode 100644 index b572d7b364..0000000000 --- a/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/Make/files +++ /dev/null @@ -1,3 +0,0 @@ -potentialFreeSurfaceDyMFoam.C - -EXE = $(FOAM_APPBIN)/potentialFreeSurfaceDyMFoam diff --git a/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/Make/options b/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/Make/options deleted file mode 100644 index eca0dd4fcc..0000000000 --- a/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/Make/options +++ /dev/null @@ -1,25 +0,0 @@ -EXE_INC = \ - -I.. \ - -I../../interFoam \ - -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)/dynamicMesh/lnInclude \ - -I$(LIB_SRC)/dynamicFvMesh/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude - - -EXE_LIBS = \ - -lincompressibleTransportModels \ - -lturbulenceModels \ - -lincompressibleTurbulenceModels \ - -lfiniteVolume \ - -ldynamicMesh \ - -ldynamicFvMesh \ - -ltopoChangerFvMesh \ - -lmeshTools \ - -lfvOptions \ - -lsampling diff --git a/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/pEqn.H b/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/pEqn.H deleted file mode 100644 index 9f7da03a11..0000000000 --- a/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/pEqn.H +++ /dev/null @@ -1,67 +0,0 @@ -{ - rAU = 1.0/UEqn.A(); - surfaceScalarField rAUf("rAUf", fvc::interpolate(rAU)); - volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p_gh)); - - if (pimple.nCorrPISO() <= 1) - { - tUEqn.clear(); - } - - surfaceScalarField phiHbyA - ( - "phiHbyA", - fvc::flux(HbyA) - + MRF.zeroFilter(rAUf*fvc::ddtCorr(U, Uf)) - ); - - MRF.makeRelative(phiHbyA); - - if (p_gh.needReference()) - { - fvc::makeRelative(phiHbyA, U); - adjustPhi(phiHbyA, U, p_gh); - fvc::makeAbsolute(phiHbyA, U); - } - - // Update the pressure BCs to ensure flux consistency - constrainPressure(p_gh, U, phiHbyA, rAUf); - - // Non-orthogonal pressure corrector loop - while (pimple.correctNonOrthogonal()) - { - fvScalarMatrix p_ghEqn - ( - fvm::laplacian(rAUf, p_gh) == fvc::div(phiHbyA) - ); - - p_ghEqn.setReference(p_ghRefCell, p_ghRefValue); - - p_ghEqn.solve(mesh.solver(p_gh.select(pimple.finalInnerIter()))); - - if (pimple.finalNonOrthogonalIter()) - { - phi = phiHbyA - p_ghEqn.flux(); - - // Explicitly relax pressure for momentum corrector - p_gh.relax(); - - U = HbyA - rAU*fvc::grad(p_gh); - U.correctBoundaryConditions(); - fvOptions.correct(U); - } - } - - #include "continuityErrs.H" - - { - Uf = fvc::interpolate(U); - surfaceVectorField n(mesh.Sf()/mesh.magSf()); - Uf += n*(phi/mesh.magSf() - (n & Uf)); - } - - // Make the fluxes relative to the mesh motion - fvc::makeRelative(phi, U); - - p = p_gh + (g & mesh.C()); -} diff --git a/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/potentialFreeSurfaceDyMFoam.C b/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/potentialFreeSurfaceDyMFoam.C deleted file mode 100644 index c6c3184e55..0000000000 --- a/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/potentialFreeSurfaceDyMFoam.C +++ /dev/null @@ -1,159 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2014-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 - potentialFreeSurfaceDyMFoam - -Description - Incompressible Navier-Stokes solver with inclusion of a wave height field - to enable single-phase free-surface approximations, with optional mesh - motion and mesh topology changes. - - Wave height field, zeta, used by pressure boundary conditions. - - Optional mesh motion and mesh topology changes including adaptive - re-meshing. - - Turbulence modelling is generic, i.e. laminar, RAS or LES may be selected. - -\*---------------------------------------------------------------------------*/ - -#include "fvCFD.H" -#include "dynamicFvMesh.H" -#include "singlePhaseTransportModel.H" -#include "turbulentTransportModel.H" -#include "pimpleControl.H" -#include "fvOptions.H" -#include "CorrectPhi.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -int main(int argc, char *argv[]) -{ - #include "postProcess.H" - - #include "setRootCaseLists.H" - #include "createTime.H" - #include "createDynamicFvMesh.H" - #include "initContinuityErrs.H" - #include "createDyMControls.H" - #include "createFields.H" - - volScalarField rAU - ( - IOobject - ( - "rAU", - runTime.timeName(), - mesh, - IOobject::READ_IF_PRESENT, - IOobject::AUTO_WRITE - ), - mesh, - dimensionedScalar("rAUf", dimTime, 1.0) - ); - - #include "correctPhi.H" - #include "createUf.H" - - turbulence->validate(); - - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - - Info<< "\nStarting time loop\n" << endl; - - while (runTime.run()) - { - #include "readDyMControls.H" - #include "CourantNo.H" - #include "setDeltaT.H" - - runTime++; - - Info<< "Time = " << runTime.timeName() << nl << endl; - - // --- Pressure-velocity PIMPLE corrector loop - while (pimple.loop()) - { - if (pimple.firstIter() || moveMeshOuterCorrectors) - { - scalar timeBeforeMeshUpdate = runTime.elapsedCpuTime(); - - mesh.update(); - - if (mesh.changing()) - { - Info<< "Execution time for mesh.update() = " - << runTime.elapsedCpuTime() - timeBeforeMeshUpdate - << " s" << endl; - - MRF.update(); - - if (correctPhi) - { - // Calculate absolute flux - // from the mapped surface velocity - phi = mesh.Sf() & Uf; - - #include "correctPhi.H" - - // Make the flux relative to the mesh motion - fvc::makeRelative(phi, U); - } - - if (checkMeshCourantNo) - { - #include "meshCourantNo.H" - } - } - } - - #include "UEqn.H" - - // --- Pressure corrector loop - while (pimple.correct()) - { - #include "pEqn.H" - } - - if (pimple.turbCorr()) - { - laminarTransport.correct(); - turbulence->correct(); - } - } - - runTime.write(); - - Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" - << " ClockTime = " << runTime.elapsedClockTime() << " s" - << nl << endl; - } - - Info<< "End\n" << endl; - - return 0; -} - - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceFoam.C b/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceFoam.C index 559f7608a5..7338435c34 100644 --- a/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceFoam.C +++ b/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceFoam.C @@ -26,19 +26,25 @@ Application Description Incompressible Navier-Stokes solver with inclusion of a wave height field - to enable single-phase free-surface approximations + to enable single-phase free-surface approximations, with optional mesh + motion and mesh topology changes. - Wave height field, zeta, used by pressure boundary conditions + Wave height field, zeta, used by pressure boundary conditions. + + Optional mesh motion and mesh topology changes including adaptive + re-meshing. Turbulence modelling is generic, i.e. laminar, RAS or LES may be selected. \*---------------------------------------------------------------------------*/ #include "fvCFD.H" +#include "dynamicFvMesh.H" #include "singlePhaseTransportModel.H" #include "turbulentTransportModel.H" #include "pimpleControl.H" #include "fvOptions.H" +#include "CorrectPhi.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -48,11 +54,31 @@ int main(int argc, char *argv[]) #include "setRootCaseLists.H" #include "createTime.H" - #include "createMesh.H" - #include "createControl.H" - #include "createTimeControls.H" - #include "createFields.H" + #include "createDynamicFvMesh.H" #include "initContinuityErrs.H" + #include "createDyMControls.H" + #include "createFields.H" + + volScalarField rAU + ( + IOobject + ( + "rAU", + runTime.timeName(), + mesh, + IOobject::READ_IF_PRESENT, + IOobject::AUTO_WRITE + ), + mesh, + dimensionedScalar("rAUf", dimTime, 1.0) + ); + + if (correctPhi) + { + #include "correctPhi.H" + } + + #include "createUfIfPresent.H" turbulence->validate(); @@ -62,7 +88,7 @@ int main(int argc, char *argv[]) while (runTime.run()) { - #include "readTimeControls.H" + #include "readDyMControls.H" #include "CourantNo.H" #include "setDeltaT.H" @@ -73,6 +99,39 @@ int main(int argc, char *argv[]) // --- Pressure-velocity PIMPLE corrector loop while (pimple.loop()) { + if (pimple.firstIter() || moveMeshOuterCorrectors) + { + scalar timeBeforeMeshUpdate = runTime.elapsedCpuTime(); + + mesh.update(); + + if (mesh.changing()) + { + Info<< "Execution time for mesh.update() = " + << runTime.elapsedCpuTime() - timeBeforeMeshUpdate + << " s" << endl; + + MRF.update(); + + if (correctPhi) + { + // Calculate absolute flux + // from the mapped surface velocity + phi = mesh.Sf() & Uf(); + + #include "correctPhi.H" + + // Make the flux relative to the mesh motion + fvc::makeRelative(phi, U); + } + + if (checkMeshCourantNo) + { + #include "meshCourantNo.H" + } + } + } + #include "UEqn.H" // --- Pressure corrector loop diff --git a/bin/potentialFreeSurfaceDyMFoam b/bin/potentialFreeSurfaceDyMFoam new file mode 100755 index 0000000000..be2ca1ee8c --- /dev/null +++ b/bin/potentialFreeSurfaceDyMFoam @@ -0,0 +1,38 @@ +#!/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/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/0.orig/U b/tutorials/multiphase/potentialFreeSurfaceFoam/movingOscillatingBox/0.orig/U similarity index 100% rename from tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/0.orig/U rename to tutorials/multiphase/potentialFreeSurfaceFoam/movingOscillatingBox/0.orig/U diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/0.orig/p b/tutorials/multiphase/potentialFreeSurfaceFoam/movingOscillatingBox/0.orig/p similarity index 100% rename from tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/0.orig/p rename to tutorials/multiphase/potentialFreeSurfaceFoam/movingOscillatingBox/0.orig/p diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/0.orig/p_gh b/tutorials/multiphase/potentialFreeSurfaceFoam/movingOscillatingBox/0.orig/p_gh similarity index 100% rename from tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/0.orig/p_gh rename to tutorials/multiphase/potentialFreeSurfaceFoam/movingOscillatingBox/0.orig/p_gh diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/0.orig/pointDisplacement b/tutorials/multiphase/potentialFreeSurfaceFoam/movingOscillatingBox/0.orig/pointDisplacement similarity index 100% rename from tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/0.orig/pointDisplacement rename to tutorials/multiphase/potentialFreeSurfaceFoam/movingOscillatingBox/0.orig/pointDisplacement diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/Allclean b/tutorials/multiphase/potentialFreeSurfaceFoam/movingOscillatingBox/Allclean similarity index 100% rename from tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/Allclean rename to tutorials/multiphase/potentialFreeSurfaceFoam/movingOscillatingBox/Allclean diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/Allrun b/tutorials/multiphase/potentialFreeSurfaceFoam/movingOscillatingBox/Allrun similarity index 100% rename from tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/Allrun rename to tutorials/multiphase/potentialFreeSurfaceFoam/movingOscillatingBox/Allrun diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/dynamicMeshDict b/tutorials/multiphase/potentialFreeSurfaceFoam/movingOscillatingBox/constant/dynamicMeshDict similarity index 100% rename from tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/dynamicMeshDict rename to tutorials/multiphase/potentialFreeSurfaceFoam/movingOscillatingBox/constant/dynamicMeshDict diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/g b/tutorials/multiphase/potentialFreeSurfaceFoam/movingOscillatingBox/constant/g similarity index 100% rename from tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/g rename to tutorials/multiphase/potentialFreeSurfaceFoam/movingOscillatingBox/constant/g diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/transportProperties b/tutorials/multiphase/potentialFreeSurfaceFoam/movingOscillatingBox/constant/transportProperties similarity index 100% rename from tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/transportProperties rename to tutorials/multiphase/potentialFreeSurfaceFoam/movingOscillatingBox/constant/transportProperties diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/turbulenceProperties b/tutorials/multiphase/potentialFreeSurfaceFoam/movingOscillatingBox/constant/turbulenceProperties similarity index 100% rename from tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/constant/turbulenceProperties rename to tutorials/multiphase/potentialFreeSurfaceFoam/movingOscillatingBox/constant/turbulenceProperties diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/extractHeightData b/tutorials/multiphase/potentialFreeSurfaceFoam/movingOscillatingBox/extractHeightData similarity index 100% rename from tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/extractHeightData rename to tutorials/multiphase/potentialFreeSurfaceFoam/movingOscillatingBox/extractHeightData diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/blockMeshDict b/tutorials/multiphase/potentialFreeSurfaceFoam/movingOscillatingBox/system/blockMeshDict similarity index 100% rename from tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/blockMeshDict rename to tutorials/multiphase/potentialFreeSurfaceFoam/movingOscillatingBox/system/blockMeshDict diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/controlDict b/tutorials/multiphase/potentialFreeSurfaceFoam/movingOscillatingBox/system/controlDict similarity index 97% rename from tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/controlDict rename to tutorials/multiphase/potentialFreeSurfaceFoam/movingOscillatingBox/system/controlDict index 15434ce121..688958a9f6 100644 --- a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/controlDict +++ b/tutorials/multiphase/potentialFreeSurfaceFoam/movingOscillatingBox/system/controlDict @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -application potentialFreeSurfaceDyMFoam; +application potentialFreeSurfaceFoam; startFrom startTime; diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/createPatchDict b/tutorials/multiphase/potentialFreeSurfaceFoam/movingOscillatingBox/system/createPatchDict similarity index 100% rename from tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/createPatchDict rename to tutorials/multiphase/potentialFreeSurfaceFoam/movingOscillatingBox/system/createPatchDict diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/fvSchemes b/tutorials/multiphase/potentialFreeSurfaceFoam/movingOscillatingBox/system/fvSchemes similarity index 100% rename from tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/fvSchemes rename to tutorials/multiphase/potentialFreeSurfaceFoam/movingOscillatingBox/system/fvSchemes diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/fvSolution b/tutorials/multiphase/potentialFreeSurfaceFoam/movingOscillatingBox/system/fvSolution similarity index 100% rename from tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/fvSolution rename to tutorials/multiphase/potentialFreeSurfaceFoam/movingOscillatingBox/system/fvSolution diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/topoSetDict b/tutorials/multiphase/potentialFreeSurfaceFoam/movingOscillatingBox/system/topoSetDict similarity index 100% rename from tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/topoSetDict rename to tutorials/multiphase/potentialFreeSurfaceFoam/movingOscillatingBox/system/topoSetDict diff --git a/tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/topoSetDict-selectBottom b/tutorials/multiphase/potentialFreeSurfaceFoam/movingOscillatingBox/system/topoSetDict-selectBottom similarity index 100% rename from tutorials/multiphase/potentialFreeSurfaceDyMFoam/oscillatingBox/system/topoSetDict-selectBottom rename to tutorials/multiphase/potentialFreeSurfaceFoam/movingOscillatingBox/system/topoSetDict-selectBottom