diff --git a/applications/solvers/incompressible/simpleFoam/Allwmake b/applications/solvers/incompressible/simpleFoam/Allwmake index 79109c8f04..c73703955a 100755 --- a/applications/solvers/incompressible/simpleFoam/Allwmake +++ b/applications/solvers/incompressible/simpleFoam/Allwmake @@ -6,7 +6,6 @@ wmake wmake SRFSimpleFoam wmake MRFSimpleFoam -wmake windSimpleFoam wmake porousSimpleFoam # ----------------------------------------------------------------- end-of-file diff --git a/applications/solvers/incompressible/simpleFoam/windSimpleFoam/Make/files b/applications/solvers/incompressible/simpleFoam/windSimpleFoam/Make/files deleted file mode 100644 index d7fe780806..0000000000 --- a/applications/solvers/incompressible/simpleFoam/windSimpleFoam/Make/files +++ /dev/null @@ -1,3 +0,0 @@ -windSimpleFoam.C - -EXE = $(FOAM_APPBIN)/windSimpleFoam diff --git a/applications/solvers/incompressible/simpleFoam/windSimpleFoam/Make/options b/applications/solvers/incompressible/simpleFoam/windSimpleFoam/Make/options deleted file mode 100644 index 057788a483..0000000000 --- a/applications/solvers/incompressible/simpleFoam/windSimpleFoam/Make/options +++ /dev/null @@ -1,14 +0,0 @@ -EXE_INC = \ - -I.. \ - -I$(LIB_SRC)/turbulenceModels \ - -I$(LIB_SRC)/turbulenceModels/incompressible/RAS/RASModel \ - -I$(LIB_SRC)/transportModels \ - -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude - -EXE_LIBS = \ - -lincompressibleRASModels \ - -lincompressibleTransportModels \ - -lfiniteVolume \ - -lmeshTools diff --git a/applications/solvers/incompressible/simpleFoam/windSimpleFoam/UEqn.H b/applications/solvers/incompressible/simpleFoam/windSimpleFoam/UEqn.H deleted file mode 100644 index f431c1042f..0000000000 --- a/applications/solvers/incompressible/simpleFoam/windSimpleFoam/UEqn.H +++ /dev/null @@ -1,14 +0,0 @@ - // Solve the Momentum equation - - tmp UEqn - ( - fvm::div(phi, U) - + turbulence->divDevReff(U) - ); - - // Add resistance on the actuation disks - sources.apply(UEqn()); - - UEqn().relax(); - - solve(UEqn() == -fvc::grad(p)); diff --git a/applications/solvers/incompressible/simpleFoam/windSimpleFoam/windSimpleFoam.C b/applications/solvers/incompressible/simpleFoam/windSimpleFoam/windSimpleFoam.C deleted file mode 100644 index 771c3ee733..0000000000 --- a/applications/solvers/incompressible/simpleFoam/windSimpleFoam/windSimpleFoam.C +++ /dev/null @@ -1,82 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2011 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 - windSimpleFoam - -Description - Steady-state solver for incompressible, turbulent flow with external - source in the momentum equation. - -\*---------------------------------------------------------------------------*/ - -#include "fvCFD.H" -#include "singlePhaseTransportModel.H" -#include "RASModel.H" -#include "IObasicSourceList.H" -#include "simpleControl.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -int main(int argc, char *argv[]) -{ - #include "setRootCase.H" - #include "createTime.H" - #include "createMesh.H" - #include "createFields.H" - #include "initContinuityErrs.H" - - IObasicSourceList sources(mesh); - - simpleControl simple(mesh); - - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - - Info<< "\nStarting time loop\n" << endl; - - while (simple.loop()) - { - Info<< "Time = " << runTime.timeName() << nl << endl; - - // Pressure-velocity SIMPLE corrector - { - #include "UEqn.H" - #include "pEqn.H" - } - - turbulence->correct(); - - runTime.write(); - - Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" - << " ClockTime = " << runTime.elapsedClockTime() << " s" - << nl << endl; - } - - Info<< "End\n" << endl; - - return 0; -} - - -// ************************************************************************* // diff --git a/tutorials/incompressible/windSimpleFoam/turbineSiting/0/U b/tutorials/incompressible/simpleFoam/turbineSiting/0/U similarity index 100% rename from tutorials/incompressible/windSimpleFoam/turbineSiting/0/U rename to tutorials/incompressible/simpleFoam/turbineSiting/0/U diff --git a/tutorials/incompressible/windSimpleFoam/turbineSiting/0/epsilon b/tutorials/incompressible/simpleFoam/turbineSiting/0/epsilon similarity index 100% rename from tutorials/incompressible/windSimpleFoam/turbineSiting/0/epsilon rename to tutorials/incompressible/simpleFoam/turbineSiting/0/epsilon diff --git a/tutorials/incompressible/windSimpleFoam/turbineSiting/0/include/ABLConditions b/tutorials/incompressible/simpleFoam/turbineSiting/0/include/ABLConditions similarity index 100% rename from tutorials/incompressible/windSimpleFoam/turbineSiting/0/include/ABLConditions rename to tutorials/incompressible/simpleFoam/turbineSiting/0/include/ABLConditions diff --git a/tutorials/incompressible/windSimpleFoam/turbineSiting/0/include/fixedInlet b/tutorials/incompressible/simpleFoam/turbineSiting/0/include/fixedInlet similarity index 100% rename from tutorials/incompressible/windSimpleFoam/turbineSiting/0/include/fixedInlet rename to tutorials/incompressible/simpleFoam/turbineSiting/0/include/fixedInlet diff --git a/tutorials/incompressible/windSimpleFoam/turbineSiting/0/include/initialConditions b/tutorials/incompressible/simpleFoam/turbineSiting/0/include/initialConditions similarity index 100% rename from tutorials/incompressible/windSimpleFoam/turbineSiting/0/include/initialConditions rename to tutorials/incompressible/simpleFoam/turbineSiting/0/include/initialConditions diff --git a/tutorials/incompressible/windSimpleFoam/turbineSiting/0/include/sideAndTopPatches b/tutorials/incompressible/simpleFoam/turbineSiting/0/include/sideAndTopPatches similarity index 100% rename from tutorials/incompressible/windSimpleFoam/turbineSiting/0/include/sideAndTopPatches rename to tutorials/incompressible/simpleFoam/turbineSiting/0/include/sideAndTopPatches diff --git a/tutorials/incompressible/windSimpleFoam/turbineSiting/0/k b/tutorials/incompressible/simpleFoam/turbineSiting/0/k similarity index 100% rename from tutorials/incompressible/windSimpleFoam/turbineSiting/0/k rename to tutorials/incompressible/simpleFoam/turbineSiting/0/k diff --git a/tutorials/incompressible/windSimpleFoam/turbineSiting/0/nut b/tutorials/incompressible/simpleFoam/turbineSiting/0/nut similarity index 100% rename from tutorials/incompressible/windSimpleFoam/turbineSiting/0/nut rename to tutorials/incompressible/simpleFoam/turbineSiting/0/nut diff --git a/tutorials/incompressible/windSimpleFoam/turbineSiting/0/p b/tutorials/incompressible/simpleFoam/turbineSiting/0/p similarity index 100% rename from tutorials/incompressible/windSimpleFoam/turbineSiting/0/p rename to tutorials/incompressible/simpleFoam/turbineSiting/0/p diff --git a/tutorials/incompressible/windSimpleFoam/turbineSiting/Allclean b/tutorials/incompressible/simpleFoam/turbineSiting/Allclean similarity index 100% rename from tutorials/incompressible/windSimpleFoam/turbineSiting/Allclean rename to tutorials/incompressible/simpleFoam/turbineSiting/Allclean diff --git a/tutorials/incompressible/windSimpleFoam/turbineSiting/Allrun b/tutorials/incompressible/simpleFoam/turbineSiting/Allrun similarity index 100% rename from tutorials/incompressible/windSimpleFoam/turbineSiting/Allrun rename to tutorials/incompressible/simpleFoam/turbineSiting/Allrun diff --git a/tutorials/incompressible/windSimpleFoam/turbineSiting/constant/RASProperties b/tutorials/incompressible/simpleFoam/turbineSiting/constant/RASProperties similarity index 100% rename from tutorials/incompressible/windSimpleFoam/turbineSiting/constant/RASProperties rename to tutorials/incompressible/simpleFoam/turbineSiting/constant/RASProperties diff --git a/tutorials/incompressible/windSimpleFoam/turbineSiting/constant/polyMesh/blockMeshDict b/tutorials/incompressible/simpleFoam/turbineSiting/constant/polyMesh/blockMeshDict similarity index 100% rename from tutorials/incompressible/windSimpleFoam/turbineSiting/constant/polyMesh/blockMeshDict rename to tutorials/incompressible/simpleFoam/turbineSiting/constant/polyMesh/blockMeshDict diff --git a/tutorials/incompressible/windSimpleFoam/turbineSiting/constant/polyMesh/boundary b/tutorials/incompressible/simpleFoam/turbineSiting/constant/polyMesh/boundary similarity index 100% rename from tutorials/incompressible/windSimpleFoam/turbineSiting/constant/polyMesh/boundary rename to tutorials/incompressible/simpleFoam/turbineSiting/constant/polyMesh/boundary diff --git a/tutorials/incompressible/windSimpleFoam/turbineSiting/constant/sourcesProperties b/tutorials/incompressible/simpleFoam/turbineSiting/constant/sourcesProperties similarity index 100% rename from tutorials/incompressible/windSimpleFoam/turbineSiting/constant/sourcesProperties rename to tutorials/incompressible/simpleFoam/turbineSiting/constant/sourcesProperties diff --git a/tutorials/incompressible/windSimpleFoam/turbineSiting/constant/transportProperties b/tutorials/incompressible/simpleFoam/turbineSiting/constant/transportProperties similarity index 100% rename from tutorials/incompressible/windSimpleFoam/turbineSiting/constant/transportProperties rename to tutorials/incompressible/simpleFoam/turbineSiting/constant/transportProperties diff --git a/tutorials/incompressible/windSimpleFoam/turbineSiting/constant/triSurface/terrain.stl b/tutorials/incompressible/simpleFoam/turbineSiting/constant/triSurface/terrain.stl similarity index 100% rename from tutorials/incompressible/windSimpleFoam/turbineSiting/constant/triSurface/terrain.stl rename to tutorials/incompressible/simpleFoam/turbineSiting/constant/triSurface/terrain.stl diff --git a/tutorials/incompressible/windSimpleFoam/turbineSiting/makeZones b/tutorials/incompressible/simpleFoam/turbineSiting/makeZones similarity index 100% rename from tutorials/incompressible/windSimpleFoam/turbineSiting/makeZones rename to tutorials/incompressible/simpleFoam/turbineSiting/makeZones diff --git a/tutorials/incompressible/windSimpleFoam/turbineSiting/system/changeDictionaryDict b/tutorials/incompressible/simpleFoam/turbineSiting/system/changeDictionaryDict similarity index 100% rename from tutorials/incompressible/windSimpleFoam/turbineSiting/system/changeDictionaryDict rename to tutorials/incompressible/simpleFoam/turbineSiting/system/changeDictionaryDict diff --git a/tutorials/incompressible/windSimpleFoam/turbineSiting/system/controlDict b/tutorials/incompressible/simpleFoam/turbineSiting/system/controlDict similarity index 97% rename from tutorials/incompressible/windSimpleFoam/turbineSiting/system/controlDict rename to tutorials/incompressible/simpleFoam/turbineSiting/system/controlDict index f2df1da69d..f930bfe648 100644 --- a/tutorials/incompressible/windSimpleFoam/turbineSiting/system/controlDict +++ b/tutorials/incompressible/simpleFoam/turbineSiting/system/controlDict @@ -14,7 +14,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -application windSimpleFoam; +application simpleFoam; startFrom latestTime; diff --git a/tutorials/incompressible/windSimpleFoam/turbineSiting/system/decomposeParDict b/tutorials/incompressible/simpleFoam/turbineSiting/system/decomposeParDict similarity index 100% rename from tutorials/incompressible/windSimpleFoam/turbineSiting/system/decomposeParDict rename to tutorials/incompressible/simpleFoam/turbineSiting/system/decomposeParDict diff --git a/tutorials/incompressible/windSimpleFoam/turbineSiting/system/decomposeParDict-4proc b/tutorials/incompressible/simpleFoam/turbineSiting/system/decomposeParDict-4proc similarity index 100% rename from tutorials/incompressible/windSimpleFoam/turbineSiting/system/decomposeParDict-4proc rename to tutorials/incompressible/simpleFoam/turbineSiting/system/decomposeParDict-4proc diff --git a/tutorials/incompressible/windSimpleFoam/turbineSiting/system/decomposeParDict-nonPar b/tutorials/incompressible/simpleFoam/turbineSiting/system/decomposeParDict-nonPar similarity index 100% rename from tutorials/incompressible/windSimpleFoam/turbineSiting/system/decomposeParDict-nonPar rename to tutorials/incompressible/simpleFoam/turbineSiting/system/decomposeParDict-nonPar diff --git a/tutorials/incompressible/windSimpleFoam/turbineSiting/system/decomposeParDict-par b/tutorials/incompressible/simpleFoam/turbineSiting/system/decomposeParDict-par similarity index 100% rename from tutorials/incompressible/windSimpleFoam/turbineSiting/system/decomposeParDict-par rename to tutorials/incompressible/simpleFoam/turbineSiting/system/decomposeParDict-par diff --git a/tutorials/incompressible/windSimpleFoam/turbineSiting/system/fvSchemes b/tutorials/incompressible/simpleFoam/turbineSiting/system/fvSchemes similarity index 100% rename from tutorials/incompressible/windSimpleFoam/turbineSiting/system/fvSchemes rename to tutorials/incompressible/simpleFoam/turbineSiting/system/fvSchemes diff --git a/tutorials/incompressible/windSimpleFoam/turbineSiting/system/fvSolution b/tutorials/incompressible/simpleFoam/turbineSiting/system/fvSolution similarity index 100% rename from tutorials/incompressible/windSimpleFoam/turbineSiting/system/fvSolution rename to tutorials/incompressible/simpleFoam/turbineSiting/system/fvSolution diff --git a/tutorials/incompressible/windSimpleFoam/turbineSiting/system/snappyHexMeshDict b/tutorials/incompressible/simpleFoam/turbineSiting/system/snappyHexMeshDict similarity index 100% rename from tutorials/incompressible/windSimpleFoam/turbineSiting/system/snappyHexMeshDict rename to tutorials/incompressible/simpleFoam/turbineSiting/system/snappyHexMeshDict