diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
index 48367ac507..36287119d3 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
+++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
@@ -141,7 +141,7 @@ int main(int argc, char *argv[])
                 }
             }
 
-            if (pimple.nCorrPimple() <= 1)
+            if (pimple.firstIter())
             {
                 #include "rhoEqn.H"
             }
diff --git a/applications/solvers/compressible/sonicFoam/EEqn.H b/applications/solvers/compressible/sonicFoam/EEqn.H
deleted file mode 100644
index 73ce837396..0000000000
--- a/applications/solvers/compressible/sonicFoam/EEqn.H
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    fvScalarMatrix EEqn
-    (
-        fvm::ddt(rho, e) + fvm::div(phi, e)
-      + fvc::ddt(rho, K) + fvc::div(phi, K)
-      + fvc::div(fvc::absolute(phi/fvc::interpolate(rho), U), p, "div(phiv,p)")
-      - fvm::laplacian(turbulence->alphaEff(), e)
-     ==
-        fvOptions(rho, e)
-    );
-
-    EEqn.relax();
-
-    fvOptions.constrain(EEqn);
-
-    EEqn.solve();
-
-    fvOptions.correct(e);
-
-    thermo.correct();
-}
diff --git a/applications/solvers/compressible/sonicFoam/Make/files b/applications/solvers/compressible/sonicFoam/Make/files
deleted file mode 100644
index c78af6be60..0000000000
--- a/applications/solvers/compressible/sonicFoam/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-sonicFoam.C
-
-EXE = $(FOAM_APPBIN)/sonicFoam
diff --git a/applications/solvers/compressible/sonicFoam/Make/options b/applications/solvers/compressible/sonicFoam/Make/options
deleted file mode 100644
index 35d223f265..0000000000
--- a/applications/solvers/compressible/sonicFoam/Make/options
+++ /dev/null
@@ -1,19 +0,0 @@
-EXE_INC = \
-    -I$(LIB_SRC)/transportModels/compressible/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude \
-    -I$(LIB_SRC)/finiteVolume/lnInclude
-
-EXE_LIBS = \
-    -lcompressibleTransportModels \
-    -lfluidThermophysicalModels \
-    -lspecie \
-    -lturbulenceModels \
-    -lcompressibleTurbulenceModels \
-    -lmeshTools \
-    -lsampling \
-    -lfvOptions \
-    -lfiniteVolume
diff --git a/applications/solvers/compressible/sonicFoam/UEqn.H b/applications/solvers/compressible/sonicFoam/UEqn.H
deleted file mode 100644
index c726eb40db..0000000000
--- a/applications/solvers/compressible/sonicFoam/UEqn.H
+++ /dev/null
@@ -1,24 +0,0 @@
-// Solve the Momentum equation
-
-MRF.correctBoundaryVelocity(U);
-
-fvVectorMatrix UEqn
-(
-    fvm::ddt(rho, U) + fvm::div(phi, U)
-  + MRF.DDt(rho, U)
-  + turbulence->divDevRhoReff(U)
- ==
-    fvOptions(rho, U)
-);
-
-UEqn.relax();
-
-fvOptions.constrain(UEqn);
-
-if (pimple.momentumPredictor())
-{
-    solve(UEqn == -fvc::grad(p));
-
-    fvOptions.correct(U);
-    K = 0.5*magSqr(U);
-}
diff --git a/applications/solvers/compressible/sonicFoam/createFieldRefs.H b/applications/solvers/compressible/sonicFoam/createFieldRefs.H
deleted file mode 100644
index a14057e9bc..0000000000
--- a/applications/solvers/compressible/sonicFoam/createFieldRefs.H
+++ /dev/null
@@ -1,2 +0,0 @@
-volScalarField& e = thermo.he();
-const volScalarField& psi = thermo.psi();
diff --git a/applications/solvers/compressible/sonicFoam/createFields.H b/applications/solvers/compressible/sonicFoam/createFields.H
deleted file mode 100644
index 901fe98e15..0000000000
--- a/applications/solvers/compressible/sonicFoam/createFields.H
+++ /dev/null
@@ -1,57 +0,0 @@
-Info<< "Reading thermophysical properties\n" << endl;
-
-autoPtr<psiThermo> pThermo
-(
-    psiThermo::New(mesh)
-);
-psiThermo& thermo = pThermo();
-thermo.validate(args.executable(), "e");
-
-volScalarField& p = thermo.p();
-
-volScalarField rho
-(
-    IOobject
-    (
-        "rho",
-        runTime.timeName(),
-        mesh
-    ),
-    thermo.rho()
-);
-
-Info<< "Reading field U\n" << endl;
-volVectorField U
-(
-    IOobject
-    (
-        "U",
-        runTime.timeName(),
-        mesh,
-        IOobject::MUST_READ,
-        IOobject::AUTO_WRITE
-    ),
-    mesh
-);
-
-#include "compressibleCreatePhi.H"
-
-mesh.setFluxRequired(p.name());
-
-Info<< "Creating turbulence model\n" << endl;
-autoPtr<compressible::turbulenceModel> turbulence
-(
-    compressible::turbulenceModel::New
-    (
-        rho,
-        U,
-        phi,
-        thermo
-    )
-);
-
-Info<< "Creating field kinetic energy K\n" << endl;
-volScalarField K("K", 0.5*magSqr(U));
-
-#include "createMRF.H"
-#include "createFvOptions.H"
diff --git a/applications/solvers/compressible/sonicFoam/pEqn.H b/applications/solvers/compressible/sonicFoam/pEqn.H
deleted file mode 100644
index 50a9ff240d..0000000000
--- a/applications/solvers/compressible/sonicFoam/pEqn.H
+++ /dev/null
@@ -1,44 +0,0 @@
-rho = thermo.rho();
-
-volScalarField rAU(1.0/UEqn.A());
-surfaceScalarField rhorAUf("rhorAUf", fvc::interpolate(rho*rAU));
-volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p));
-surfaceScalarField phid
-(
-    "phid",
-    fvc::interpolate(psi)
-   *(
-        fvc::flux(HbyA)
-      + MRF.zeroFilter(rhorAUf*fvc::ddtCorr(rho, U, phi)/fvc::interpolate(rho))
-    )
-);
-
-MRF.makeRelative(fvc::interpolate(psi), phid);
-
-// Non-orthogonal pressure corrector loop
-while (pimple.correctNonOrthogonal())
-{
-    fvScalarMatrix pEqn
-    (
-        fvm::ddt(psi, p)
-      + fvm::div(phid, p)
-      - fvm::laplacian(rhorAUf, p)
-     ==
-        fvOptions(psi, p, rho.name())
-    );
-
-    pEqn.solve();
-
-    if (pimple.finalNonOrthogonalIter())
-    {
-        phi = pEqn.flux();
-    }
-}
-
-#include "rhoEqn.H"
-#include "compressibleContinuityErrs.H"
-
-U = HbyA - rAU*fvc::grad(p);
-U.correctBoundaryConditions();
-fvOptions.correct(U);
-K = 0.5*magSqr(U);
diff --git a/applications/solvers/compressible/sonicFoam/sonicDyMFoam/Make/files b/applications/solvers/compressible/sonicFoam/sonicDyMFoam/Make/files
deleted file mode 100644
index 08fa87a2cc..0000000000
--- a/applications/solvers/compressible/sonicFoam/sonicDyMFoam/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-sonicDyMFoam.C
-
-EXE = $(FOAM_APPBIN)/sonicDyMFoam
diff --git a/applications/solvers/compressible/sonicFoam/sonicDyMFoam/Make/options b/applications/solvers/compressible/sonicFoam/sonicDyMFoam/Make/options
deleted file mode 100644
index fdca074204..0000000000
--- a/applications/solvers/compressible/sonicFoam/sonicDyMFoam/Make/options
+++ /dev/null
@@ -1,28 +0,0 @@
-EXE_INC = \
-    -I.. \
-    -I../../rhoPimpleFoam \
-    -I$(LIB_SRC)/transportModels/compressible/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
-    -I$(LIB_SRC)/finiteVolume/cfdTools \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude \
-    -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
-    -I$(LIB_SRC)/dynamicMesh/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
-
-EXE_LIBS = \
-    -lcompressibleTransportModels \
-    -lfluidThermophysicalModels \
-    -lspecie \
-    -lturbulenceModels \
-    -lcompressibleTurbulenceModels \
-    -lfiniteVolume \
-    -lmeshTools \
-    -lsampling \
-    -lfvOptions \
-    -ldynamicFvMesh \
-    -ltopoChangerFvMesh \
-    -ldynamicMesh \
-    -lmeshTools
diff --git a/applications/solvers/compressible/sonicFoam/sonicDyMFoam/pEqn.H b/applications/solvers/compressible/sonicFoam/sonicDyMFoam/pEqn.H
deleted file mode 100644
index 92e0bb3673..0000000000
--- a/applications/solvers/compressible/sonicFoam/sonicDyMFoam/pEqn.H
+++ /dev/null
@@ -1,51 +0,0 @@
-rho = thermo.rho();
-
-volScalarField rAU(1.0/UEqn.A());
-surfaceScalarField rhorAUf("rhorAUf", fvc::interpolate(rho*rAU));
-volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p));
-surfaceScalarField phid
-(
-    "phid",
-    fvc::interpolate(psi)
-   *(
-       fvc::flux(HbyA)
-     + rhorAUf*fvc::ddtCorr(rho, U, rhoUf)/fvc::interpolate(rho)
-    )
-);
-
-fvc::makeRelative(phid, psi, U);
-MRF.makeRelative(fvc::interpolate(psi), phid);
-
-// Non-orthogonal pressure corrector loop
-while (pimple.correctNonOrthogonal())
-{
-    fvScalarMatrix pEqn
-    (
-        fvm::ddt(psi, p)
-      + fvm::div(phid, p)
-      - fvm::laplacian(rhorAUf, p)
-     ==
-        fvOptions(psi, p, rho.name())
-    );
-
-    pEqn.solve();
-
-    if (pimple.finalNonOrthogonalIter())
-    {
-        phi = pEqn.flux();
-    }
-}
-
-#include "rhoEqn.H"
-#include "compressibleContinuityErrs.H"
-
-U = HbyA - rAU*fvc::grad(p);
-U.correctBoundaryConditions();
-fvOptions.correct(U);
-K = 0.5*magSqr(U);
-
-{
-    rhoUf = fvc::interpolate(rho*U);
-    surfaceVectorField n(mesh.Sf()/mesh.magSf());
-    rhoUf += n*(fvc::absolute(phi, rho, U)/mesh.magSf() - (n & rhoUf));
-}
diff --git a/applications/solvers/compressible/sonicFoam/sonicDyMFoam/sonicDyMFoam.C b/applications/solvers/compressible/sonicFoam/sonicDyMFoam/sonicDyMFoam.C
deleted file mode 100644
index 0a826053ba..0000000000
--- a/applications/solvers/compressible/sonicFoam/sonicDyMFoam/sonicDyMFoam.C
+++ /dev/null
@@ -1,151 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2017 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 <http://www.gnu.org/licenses/>.
-
-Application
-    sonicDyMFoam
-
-Group
-    grpCompressibleSolvers grpMovingMeshSolvers
-
-Description
-    Transient solver for trans-sonic/supersonic, turbulent flow of a
-    compressible gas, with optional mesh motion and mesh topology changes.
-
-\*---------------------------------------------------------------------------*/
-
-#include "fvCFD.H"
-#include "dynamicFvMesh.H"
-#include "psiThermo.H"
-#include "turbulentFluidThermoModel.H"
-#include "pimpleControl.H"
-#include "CorrectPhi.H"
-#include "fvOptions.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-int main(int argc, char *argv[])
-{
-    #include "postProcess.H"
-
-    #include "setRootCase.H"
-    #include "createTime.H"
-    #include "createDynamicFvMesh.H"
-    #include "createDyMControls.H"
-    #include "createFields.H"
-    #include "createFieldRefs.H"
-    #include "createRhoUf.H"
-    #include "compressibleCourantNo.H"
-    #include "setInitialDeltaT.H"
-    #include "initContinuityErrs.H"
-
-    turbulence->validate();
-
-    // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-    Info<< "\nStarting time loop\n" << endl;
-
-    while (runTime.run())
-    {
-        #include "readDyMControls.H"
-
-        {
-            // Store divrhoU from the previous mesh so that it can be mapped
-            // and used in correctPhi to ensure the corrected phi has the
-            // same divergence
-            volScalarField divrhoU
-            (
-                "divrhoU",
-                fvc::div(fvc::absolute(phi, rho, U))
-            );
-
-            #include "compressibleCourantNo.H"
-            #include "setDeltaT.H"
-
-            runTime++;
-
-            Info<< "Time = " << runTime.timeName() << nl << endl;
-
-            // Store momentum to set rhoUf for introduced faces.
-            volVectorField rhoU("rhoU", rho*U);
-
-            // Do any mesh changes
-            mesh.update();
-
-            if (mesh.changing())
-            {
-                MRF.update();
-
-                if (correctPhi)
-                {
-                    // Calculate absolute flux from the mapped surface velocity
-                    phi = mesh.Sf() & rhoUf;
-
-                    #include "correctPhi.H"
-
-                    // Make the fluxes relative to the mesh-motion
-                    fvc::makeRelative(phi, rho, U);
-                }
-            }
-
-            if (checkMeshCourantNo)
-            {
-                #include "meshCourantNo.H"
-            }
-        }
-
-        #include "rhoEqn.H"
-        Info<< "rhoEqn max/min : " << max(rho).value()
-            << " " << min(rho).value() << endl;
-
-        // --- Pressure-velocity PIMPLE corrector loop
-        while (pimple.loop())
-        {
-            #include "UEqn.H"
-            #include "EEqn.H"
-
-            // --- Pressure corrector loop
-            while (pimple.correct())
-            {
-                #include "pEqn.H"
-            }
-
-            if (pimple.turbCorr())
-            {
-                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/compressible/sonicFoam/sonicFoam.C b/applications/solvers/compressible/sonicFoam/sonicFoam.C
deleted file mode 100644
index cdd25e095c..0000000000
--- a/applications/solvers/compressible/sonicFoam/sonicFoam.C
+++ /dev/null
@@ -1,103 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2017 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 <http://www.gnu.org/licenses/>.
-
-Application
-    sonicFoam
-
-Group
-    grpCompressibleSolvers
-
-Description
-    Transient solver for trans-sonic/supersonic, turbulent flow of a
-    compressible gas.
-
-\*---------------------------------------------------------------------------*/
-
-#include "fvCFD.H"
-#include "psiThermo.H"
-#include "turbulentFluidThermoModel.H"
-#include "pimpleControl.H"
-#include "fvOptions.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-int main(int argc, char *argv[])
-{
-    #include "postProcess.H"
-
-    #include "setRootCase.H"
-    #include "createTime.H"
-    #include "createMesh.H"
-    #include "createControl.H"
-    #include "createFields.H"
-    #include "createFieldRefs.H"
-    #include "initContinuityErrs.H"
-
-    turbulence->validate();
-
-    // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-    Info<< "\nStarting time loop\n" << endl;
-
-    while (runTime.loop())
-    {
-        Info<< "Time = " << runTime.timeName() << nl << endl;
-
-        #include "compressibleCourantNo.H"
-
-        #include "rhoEqn.H"
-
-        // --- Pressure-velocity PIMPLE corrector loop
-        while (pimple.loop())
-        {
-            #include "UEqn.H"
-            #include "EEqn.H"
-
-            // --- Pressure corrector loop
-            while (pimple.correct())
-            {
-                #include "pEqn.H"
-            }
-
-            if (pimple.turbCorr())
-            {
-                turbulence->correct();
-            }
-        }
-
-        rho = thermo.rho();
-
-        runTime.write();
-
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
-    }
-
-    Info<< "End\n" << endl;
-
-    return 0;
-}
-
-
-// ************************************************************************* //
diff --git a/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/Make/files b/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/Make/files
deleted file mode 100644
index 17d1d393f4..0000000000
--- a/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-sonicLiquidFoam.C
-
-EXE = $(FOAM_APPBIN)/sonicLiquidFoam
diff --git a/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/Make/options b/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/Make/options
deleted file mode 100644
index d27c95d033..0000000000
--- a/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/Make/options
+++ /dev/null
@@ -1,7 +0,0 @@
-EXE_INC = \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude
-
-EXE_LIBS = \
-    -lfiniteVolume \
-    -lmeshTools
diff --git a/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/compressibleContinuityErrs.H b/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/compressibleContinuityErrs.H
deleted file mode 100644
index 9851dfb7a9..0000000000
--- a/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/compressibleContinuityErrs.H
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    scalar sumLocalContErr =
-        (sum(mag(rho - rho0 - psi*(p - p0)))/sum(rho)).value();
-
-    scalar globalContErr = (sum(rho - rho0 - psi*(p - p0))/sum(rho)).value();
-
-    cumulativeContErr += globalContErr;
-
-    Info<< "time step continuity errors : sum local = " << sumLocalContErr
-         << ", global = " << globalContErr
-         << ", cumulative = " << cumulativeContErr << endl;
-}
diff --git a/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/createFields.H b/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/createFields.H
deleted file mode 100644
index d94b173fee..0000000000
--- a/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/createFields.H
+++ /dev/null
@@ -1,49 +0,0 @@
-#include "readThermodynamicProperties.H"
-#include "readTransportProperties.H"
-
-Info<< "Reading field p\n" << endl;
-volScalarField p
-(
-    IOobject
-    (
-        "p",
-        runTime.timeName(),
-        mesh,
-        IOobject::MUST_READ,
-        IOobject::AUTO_WRITE
-    ),
-    mesh
-);
-
-
-Info<< "Reading field U\n" << endl;
-volVectorField U
-(
-    IOobject
-    (
-        "U",
-        runTime.timeName(),
-        mesh,
-        IOobject::MUST_READ,
-        IOobject::AUTO_WRITE
-    ),
-    mesh
-);
-
-volScalarField rho
-(
-    IOobject
-    (
-        "rho",
-        runTime.timeName(),
-        mesh,
-        IOobject::NO_READ,
-        IOobject::AUTO_WRITE
-    ),
-    rhoO + psi*p
-);
-
-
-#include "compressibleCreatePhi.H"
-
-mesh.setFluxRequired(p.name());
diff --git a/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/readThermodynamicProperties.H b/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/readThermodynamicProperties.H
deleted file mode 100644
index 82ebe7ae30..0000000000
--- a/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/readThermodynamicProperties.H
+++ /dev/null
@@ -1,37 +0,0 @@
-    Info<< "Reading thermodynamicProperties\n" << endl;
-
-    IOdictionary thermodynamicProperties
-    (
-        IOobject
-        (
-            "thermodynamicProperties",
-            runTime.constant(),
-            mesh,
-            IOobject::MUST_READ_IF_MODIFIED,
-            IOobject::NO_WRITE
-        )
-    );
-
-    dimensionedScalar rho0
-    (
-        "rho0",
-        dimDensity,
-        thermodynamicProperties
-    );
-
-    dimensionedScalar p0
-    (
-        "p0",
-        dimPressure,
-        thermodynamicProperties
-    );
-
-    dimensionedScalar psi
-    (
-        "psi",
-        dimCompressibility,
-        thermodynamicProperties
-    );
-
-    // Density offset, i.e. the constant part of the density
-    dimensionedScalar rhoO("rhoO", rho0 - psi*p0);
diff --git a/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/readTransportProperties.H b/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/readTransportProperties.H
deleted file mode 100644
index 379e211982..0000000000
--- a/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/readTransportProperties.H
+++ /dev/null
@@ -1,20 +0,0 @@
-Info<< "Reading transportProperties\n" << endl;
-
-IOdictionary transportProperties
-(
-    IOobject
-    (
-        "transportProperties",
-        runTime.constant(),
-        mesh,
-        IOobject::MUST_READ_IF_MODIFIED,
-        IOobject::NO_WRITE
-    )
-);
-
-dimensionedScalar mu
-(
-    "mu",
-    dimDynamicViscosity,
-    transportProperties
-);
diff --git a/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/sonicLiquidFoam.C b/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/sonicLiquidFoam.C
deleted file mode 100644
index 3622d2dd70..0000000000
--- a/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/sonicLiquidFoam.C
+++ /dev/null
@@ -1,132 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 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 <http://www.gnu.org/licenses/>.
-
-Application
-    sonicLiquidFoam
-
-Description
-    Transient solver for trans-sonic/supersonic, laminar flow of a
-    compressible liquid.
-
-\*---------------------------------------------------------------------------*/
-
-#include "fvCFD.H"
-#include "pimpleControl.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-int main(int argc, char *argv[])
-{
-    #include "postProcess.H"
-
-    #include "setRootCase.H"
-    #include "createTime.H"
-    #include "createMesh.H"
-    #include "createControl.H"
-    #include "createFields.H"
-    #include "initContinuityErrs.H"
-
-    // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-    Info<< "\nStarting time loop\n" << endl;
-
-    while (runTime.loop())
-    {
-        Info<< "Time = " << runTime.timeName() << nl << endl;
-
-        #include "compressibleCourantNo.H"
-
-        solve(fvm::ddt(rho) + fvc::div(phi));
-
-        // --- Pressure-velocity PIMPLE corrector loop
-        while (pimple.loop())
-        {
-            fvVectorMatrix UEqn
-            (
-                fvm::ddt(rho, U)
-              + fvm::div(phi, U)
-              - fvm::laplacian(mu, U)
-            );
-
-            solve(UEqn == -fvc::grad(p));
-
-            // --- Pressure corrector loop
-            while (pimple.correct())
-            {
-                volScalarField rAU("rAU", 1.0/UEqn.A());
-                surfaceScalarField rhorAUf
-                (
-                    "rhorAUf",
-                    fvc::interpolate(rho*rAU)
-                );
-
-                U = rAU*UEqn.H();
-
-                surfaceScalarField phid
-                (
-                    "phid",
-                    psi
-                   *(
-                       fvc::flux(U)
-                     + rhorAUf*fvc::ddtCorr(rho, U, phi)/fvc::interpolate(rho)
-                    )
-                );
-
-                phi = (rhoO/psi)*phid;
-
-                fvScalarMatrix pEqn
-                (
-                    fvm::ddt(psi, p)
-                  + fvc::div(phi)
-                  + fvm::div(phid, p)
-                  - fvm::laplacian(rhorAUf, p)
-                );
-
-                pEqn.solve();
-
-                phi += pEqn.flux();
-
-                solve(fvm::ddt(rho) + fvc::div(phi));
-                #include "compressibleContinuityErrs.H"
-
-                U -= rAU*fvc::grad(p);
-                U.correctBoundaryConditions();
-            }
-        }
-
-        rho = rhoO + psi*p;
-
-        runTime.write();
-
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
-    }
-
-    Info<< "End\n" << endl;
-
-    return 0;
-}
-
-
-// ************************************************************************* //
diff --git a/bin/sonicDyMFoam b/bin/sonicDyMFoam
new file mode 120000
index 0000000000..f9a4ea5582
--- /dev/null
+++ b/bin/sonicDyMFoam
@@ -0,0 +1 @@
+sonicFoam
\ No newline at end of file
diff --git a/bin/sonicFoam b/bin/sonicFoam
new file mode 100755
index 0000000000..118213b761
--- /dev/null
+++ b/bin/sonicFoam
@@ -0,0 +1,52 @@
+#!/bin/sh
+#------------------------------------------------------------------------------
+# =========                 |
+# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+#  \\    /   O peration     |
+#   \\  /    A nd           | Copyright (C) 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 <http://www.gnu.org/licenses/>.
+#
+# Script
+#     supersededByPostProcess
+#
+# Description
+#     Script to suggest using the new "postProcess" utility.
+#
+#------------------------------------------------------------------------------
+sonicFoam=${0##*/}
+
+cat <<EOF
+The $sonicFoam functionality has been merged into the transonic option of the
+latest rhoPimpleFoam solver and the $sonicFoam tutorials moved into the
+rhoPimpleFoam tutorials directory.
+
+To run rhoPimpleFoam in transonic mode set the transonic option in the
+PIMPLE sub-dictionary of fvSolution:
+
+PIMPLE
+{
+    .
+    .
+    .
+    transonic            yes;
+}
+
+EOF
+
+#------------------------------------------------------------------------------
diff --git a/bin/sonicLiquidFoam b/bin/sonicLiquidFoam
new file mode 120000
index 0000000000..f9a4ea5582
--- /dev/null
+++ b/bin/sonicLiquidFoam
@@ -0,0 +1 @@
+sonicFoam
\ No newline at end of file
diff --git a/etc/config.sh/bash_completion b/etc/config.sh/bash_completion
index 81b3355503..dc8055d5d5 100644
--- a/etc/config.sh/bash_completion
+++ b/etc/config.sh/bash_completion
@@ -4334,81 +4334,6 @@ _solidEquilibriumDisplacementFoam_ ()
 }
 complete -o filenames -o nospace -F _solidEquilibriumDisplacementFoam_ solidEquilibriumDisplacementFoam
 
-_sonicDyMFoam_ ()
-{
-    local cur="${COMP_WORDS[COMP_CWORD]}"
-    local prev="${COMP_WORDS[COMP_CWORD-1]}"
-    local line=${COMP_LINE}
-    local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ")
-
-    opts="-case -doc -fileHandler -help -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc"
-    for o in $used ; do opts="${opts/$o/}" ; done
-    extra=""
-
-    [ "$COMP_CWORD" = 1 ] || \
-    case "$prev" in
-        -case)
-            opts="" ; extra="-d" ;;
-        -fileHandler)
-            opts="uncollated collated masterUncollated" ; extra="" ;;
-        -roots)
-            opts="" ; extra="" ;;
-       *) ;;
-    esac
-    COMPREPLY=( $(compgen -W "${opts}" $extra -- ${cur}) )
-}
-complete -o filenames -o nospace -F _sonicDyMFoam_ sonicDyMFoam
-
-_sonicFoam_ ()
-{
-    local cur="${COMP_WORDS[COMP_CWORD]}"
-    local prev="${COMP_WORDS[COMP_CWORD-1]}"
-    local line=${COMP_LINE}
-    local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ")
-
-    opts="-case -doc -fileHandler -help -listFunctionObjects -listFvOptions -listRegisteredSwitches -listScalarBCs -listSwitches -listTurbulenceModels -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc"
-    for o in $used ; do opts="${opts/$o/}" ; done
-    extra=""
-
-    [ "$COMP_CWORD" = 1 ] || \
-    case "$prev" in
-        -case)
-            opts="" ; extra="-d" ;;
-        -fileHandler)
-            opts="uncollated collated masterUncollated" ; extra="" ;;
-        -roots)
-            opts="" ; extra="" ;;
-       *) ;;
-    esac
-    COMPREPLY=( $(compgen -W "${opts}" $extra -- ${cur}) )
-}
-complete -o filenames -o nospace -F _sonicFoam_ sonicFoam
-
-_sonicLiquidFoam_ ()
-{
-    local cur="${COMP_WORDS[COMP_CWORD]}"
-    local prev="${COMP_WORDS[COMP_CWORD-1]}"
-    local line=${COMP_LINE}
-    local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ")
-
-    opts="-case -doc -fileHandler -help -listFunctionObjects -listRegisteredSwitches -listScalarBCs -listSwitches -listUnsetSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc"
-    for o in $used ; do opts="${opts/$o/}" ; done
-    extra=""
-
-    [ "$COMP_CWORD" = 1 ] || \
-    case "$prev" in
-        -case)
-            opts="" ; extra="-d" ;;
-        -fileHandler)
-            opts="uncollated collated masterUncollated" ; extra="" ;;
-        -roots)
-            opts="" ; extra="" ;;
-       *) ;;
-    esac
-    COMPREPLY=( $(compgen -W "${opts}" $extra -- ${cur}) )
-}
-complete -o filenames -o nospace -F _sonicLiquidFoam_ sonicLiquidFoam
-
 _splitCells_ ()
 {
     local cur="${COMP_WORDS[COMP_CWORD]}"
diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/Allrun b/tutorials/compressible/rhoCentralFoam/shockTube/Allrun
index ed61ac5435..48dc65fef7 100755
--- a/tutorials/compressible/rhoCentralFoam/shockTube/Allrun
+++ b/tutorials/compressible/rhoCentralFoam/shockTube/Allrun
@@ -7,5 +7,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 runApplication blockMesh
 runApplication setFields
 runApplication $(getApplication)
+runApplication -s sample  postProcess -func sample
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/system/blockMeshDict b/tutorials/compressible/rhoCentralFoam/shockTube/system/blockMeshDict
index f34de7d825..f55c05e176 100644
--- a/tutorials/compressible/rhoCentralFoam/shockTube/system/blockMeshDict
+++ b/tutorials/compressible/rhoCentralFoam/shockTube/system/blockMeshDict
@@ -30,7 +30,7 @@ vertices
 
 blocks
 (
-    hex (0 1 2 3 4 5 6 7) (100 1 1) simpleGrading (1 1 1)
+    hex (0 1 2 3 4 5 6 7) (1000 1 1) simpleGrading (1 1 1)
 );
 
 edges
diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/system/controlDict b/tutorials/compressible/rhoCentralFoam/shockTube/system/controlDict
index 1f7712c3c2..2bf3a7a6c6 100644
--- a/tutorials/compressible/rhoCentralFoam/shockTube/system/controlDict
+++ b/tutorials/compressible/rhoCentralFoam/shockTube/system/controlDict
@@ -51,5 +51,9 @@ maxCo           0.2;
 
 maxDeltaT       1;
 
+functions
+{
+    #includeFunc mag(U)
+}
 
 // ************************************************************************* //
diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/system/fvSchemes b/tutorials/compressible/rhoCentralFoam/shockTube/system/fvSchemes
index c957f6991c..89a75f2a8c 100644
--- a/tutorials/compressible/rhoCentralFoam/shockTube/system/fvSchemes
+++ b/tutorials/compressible/rhoCentralFoam/shockTube/system/fvSchemes
@@ -41,9 +41,9 @@ laplacianSchemes
 interpolationSchemes
 {
     default         linear;
-    reconstruct(rho) vanLeer;
-    reconstruct(U)  vanLeerV;
-    reconstruct(T)  vanLeer;
+    reconstruct(rho) vanAlbada;
+    reconstruct(U)  vanAlbadaV;
+    reconstruct(T)  vanAlbada;
 }
 
 snGradSchemes
diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/system/sample b/tutorials/compressible/rhoCentralFoam/shockTube/system/sample
index c6c3c7bd00..49a179436f 100644
--- a/tutorials/compressible/rhoCentralFoam/shockTube/system/sample
+++ b/tutorials/compressible/rhoCentralFoam/shockTube/system/sample
@@ -24,17 +24,16 @@ setFormat       raw;
 
 sets
 (
-    line
+    data
     {
-        type    face;
+        type    uniform;
         axis    x;
-        start   (-5 0 0);
-        end     (5 0 0);
-        nPoints 100;
+        start   (-4.995 0 0);
+        end     (4.995 0 0);
+        nPoints 1000;
     }
 );
 
-fields          ( p U.component(0) T rho );
-
+fields          (T mag(U) p);
 
 // ************************************************************************* //
diff --git a/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/0/T b/tutorials/compressible/rhoPimpleFoam/RAS/nacaAirfoil/0/T
similarity index 100%
rename from tutorials/compressible/sonicFoam/RAS/nacaAirfoil/0/T
rename to tutorials/compressible/rhoPimpleFoam/RAS/nacaAirfoil/0/T
diff --git a/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/0/U b/tutorials/compressible/rhoPimpleFoam/RAS/nacaAirfoil/0/U
similarity index 100%
rename from tutorials/compressible/sonicFoam/RAS/nacaAirfoil/0/U
rename to tutorials/compressible/rhoPimpleFoam/RAS/nacaAirfoil/0/U
diff --git a/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/0/alphat b/tutorials/compressible/rhoPimpleFoam/RAS/nacaAirfoil/0/alphat
similarity index 100%
rename from tutorials/compressible/sonicFoam/RAS/nacaAirfoil/0/alphat
rename to tutorials/compressible/rhoPimpleFoam/RAS/nacaAirfoil/0/alphat
diff --git a/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/0/epsilon b/tutorials/compressible/rhoPimpleFoam/RAS/nacaAirfoil/0/epsilon
similarity index 100%
rename from tutorials/compressible/sonicFoam/RAS/nacaAirfoil/0/epsilon
rename to tutorials/compressible/rhoPimpleFoam/RAS/nacaAirfoil/0/epsilon
diff --git a/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/0/k b/tutorials/compressible/rhoPimpleFoam/RAS/nacaAirfoil/0/k
similarity index 100%
rename from tutorials/compressible/sonicFoam/RAS/nacaAirfoil/0/k
rename to tutorials/compressible/rhoPimpleFoam/RAS/nacaAirfoil/0/k
diff --git a/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/0/nut b/tutorials/compressible/rhoPimpleFoam/RAS/nacaAirfoil/0/nut
similarity index 100%
rename from tutorials/compressible/sonicFoam/RAS/nacaAirfoil/0/nut
rename to tutorials/compressible/rhoPimpleFoam/RAS/nacaAirfoil/0/nut
diff --git a/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/0/p b/tutorials/compressible/rhoPimpleFoam/RAS/nacaAirfoil/0/p
similarity index 100%
rename from tutorials/compressible/sonicFoam/RAS/nacaAirfoil/0/p
rename to tutorials/compressible/rhoPimpleFoam/RAS/nacaAirfoil/0/p
diff --git a/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/Allclean b/tutorials/compressible/rhoPimpleFoam/RAS/nacaAirfoil/Allclean
similarity index 100%
rename from tutorials/compressible/sonicFoam/RAS/nacaAirfoil/Allclean
rename to tutorials/compressible/rhoPimpleFoam/RAS/nacaAirfoil/Allclean
diff --git a/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/Allrun b/tutorials/compressible/rhoPimpleFoam/RAS/nacaAirfoil/Allrun
similarity index 100%
rename from tutorials/compressible/sonicFoam/RAS/nacaAirfoil/Allrun
rename to tutorials/compressible/rhoPimpleFoam/RAS/nacaAirfoil/Allrun
diff --git a/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/Running_Notes b/tutorials/compressible/rhoPimpleFoam/RAS/nacaAirfoil/Running_Notes
similarity index 100%
rename from tutorials/compressible/sonicFoam/RAS/nacaAirfoil/Running_Notes
rename to tutorials/compressible/rhoPimpleFoam/RAS/nacaAirfoil/Running_Notes
diff --git a/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/constant/thermophysicalProperties b/tutorials/compressible/rhoPimpleFoam/RAS/nacaAirfoil/constant/thermophysicalProperties
similarity index 100%
rename from tutorials/compressible/sonicFoam/RAS/nacaAirfoil/constant/thermophysicalProperties
rename to tutorials/compressible/rhoPimpleFoam/RAS/nacaAirfoil/constant/thermophysicalProperties
diff --git a/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/constant/turbulenceProperties b/tutorials/compressible/rhoPimpleFoam/RAS/nacaAirfoil/constant/turbulenceProperties
similarity index 100%
rename from tutorials/compressible/sonicFoam/RAS/nacaAirfoil/constant/turbulenceProperties
rename to tutorials/compressible/rhoPimpleFoam/RAS/nacaAirfoil/constant/turbulenceProperties
diff --git a/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/prostar/nacaAirfoil.bnd.gz b/tutorials/compressible/rhoPimpleFoam/RAS/nacaAirfoil/prostar/nacaAirfoil.bnd.gz
similarity index 100%
rename from tutorials/compressible/sonicFoam/RAS/nacaAirfoil/prostar/nacaAirfoil.bnd.gz
rename to tutorials/compressible/rhoPimpleFoam/RAS/nacaAirfoil/prostar/nacaAirfoil.bnd.gz
diff --git a/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/prostar/nacaAirfoil.cel.gz b/tutorials/compressible/rhoPimpleFoam/RAS/nacaAirfoil/prostar/nacaAirfoil.cel.gz
similarity index 100%
rename from tutorials/compressible/sonicFoam/RAS/nacaAirfoil/prostar/nacaAirfoil.cel.gz
rename to tutorials/compressible/rhoPimpleFoam/RAS/nacaAirfoil/prostar/nacaAirfoil.cel.gz
diff --git a/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/prostar/nacaAirfoil.vrt.gz b/tutorials/compressible/rhoPimpleFoam/RAS/nacaAirfoil/prostar/nacaAirfoil.vrt.gz
similarity index 100%
rename from tutorials/compressible/sonicFoam/RAS/nacaAirfoil/prostar/nacaAirfoil.vrt.gz
rename to tutorials/compressible/rhoPimpleFoam/RAS/nacaAirfoil/prostar/nacaAirfoil.vrt.gz
diff --git a/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/system/controlDict b/tutorials/compressible/rhoPimpleFoam/RAS/nacaAirfoil/system/controlDict
similarity index 98%
rename from tutorials/compressible/sonicFoam/RAS/nacaAirfoil/system/controlDict
rename to tutorials/compressible/rhoPimpleFoam/RAS/nacaAirfoil/system/controlDict
index a19ca584ff..f49e176279 100644
--- a/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/system/controlDict
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/nacaAirfoil/system/controlDict
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-application     sonicFoam;
+application     rhoPimpleFoam;
 
 startFrom       latestTime;
 
diff --git a/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/system/fvSchemes b/tutorials/compressible/rhoPimpleFoam/RAS/nacaAirfoil/system/fvSchemes
similarity index 100%
rename from tutorials/compressible/sonicFoam/RAS/nacaAirfoil/system/fvSchemes
rename to tutorials/compressible/rhoPimpleFoam/RAS/nacaAirfoil/system/fvSchemes
diff --git a/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/system/fvSolution b/tutorials/compressible/rhoPimpleFoam/RAS/nacaAirfoil/system/fvSolution
similarity index 97%
rename from tutorials/compressible/sonicFoam/RAS/nacaAirfoil/system/fvSolution
rename to tutorials/compressible/rhoPimpleFoam/RAS/nacaAirfoil/system/fvSolution
index 1a0146a644..0e1f10fee4 100644
--- a/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/system/fvSolution
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/nacaAirfoil/system/fvSolution
@@ -48,6 +48,8 @@ PIMPLE
     nOuterCorrectors 1;
     nCorrectors      2;
     nNonOrthogonalCorrectors 0;
+
+    transonic            yes;
 }
 
 
diff --git a/tutorials/compressible/sonicFoam/RAS/prism/0/T b/tutorials/compressible/rhoPimpleFoam/RAS/prism/0/T
similarity index 100%
rename from tutorials/compressible/sonicFoam/RAS/prism/0/T
rename to tutorials/compressible/rhoPimpleFoam/RAS/prism/0/T
diff --git a/tutorials/compressible/sonicFoam/RAS/prism/0/U b/tutorials/compressible/rhoPimpleFoam/RAS/prism/0/U
similarity index 100%
rename from tutorials/compressible/sonicFoam/RAS/prism/0/U
rename to tutorials/compressible/rhoPimpleFoam/RAS/prism/0/U
diff --git a/tutorials/compressible/sonicFoam/RAS/prism/0/alphat b/tutorials/compressible/rhoPimpleFoam/RAS/prism/0/alphat
similarity index 100%
rename from tutorials/compressible/sonicFoam/RAS/prism/0/alphat
rename to tutorials/compressible/rhoPimpleFoam/RAS/prism/0/alphat
diff --git a/tutorials/compressible/sonicFoam/RAS/prism/0/epsilon b/tutorials/compressible/rhoPimpleFoam/RAS/prism/0/epsilon
similarity index 100%
rename from tutorials/compressible/sonicFoam/RAS/prism/0/epsilon
rename to tutorials/compressible/rhoPimpleFoam/RAS/prism/0/epsilon
diff --git a/tutorials/compressible/sonicFoam/RAS/prism/0/k b/tutorials/compressible/rhoPimpleFoam/RAS/prism/0/k
similarity index 100%
rename from tutorials/compressible/sonicFoam/RAS/prism/0/k
rename to tutorials/compressible/rhoPimpleFoam/RAS/prism/0/k
diff --git a/tutorials/compressible/sonicFoam/RAS/prism/0/nut b/tutorials/compressible/rhoPimpleFoam/RAS/prism/0/nut
similarity index 100%
rename from tutorials/compressible/sonicFoam/RAS/prism/0/nut
rename to tutorials/compressible/rhoPimpleFoam/RAS/prism/0/nut
diff --git a/tutorials/compressible/sonicFoam/RAS/prism/0/p b/tutorials/compressible/rhoPimpleFoam/RAS/prism/0/p
similarity index 100%
rename from tutorials/compressible/sonicFoam/RAS/prism/0/p
rename to tutorials/compressible/rhoPimpleFoam/RAS/prism/0/p
diff --git a/tutorials/compressible/sonicFoam/RAS/prism/constant/thermophysicalProperties b/tutorials/compressible/rhoPimpleFoam/RAS/prism/constant/thermophysicalProperties
similarity index 100%
rename from tutorials/compressible/sonicFoam/RAS/prism/constant/thermophysicalProperties
rename to tutorials/compressible/rhoPimpleFoam/RAS/prism/constant/thermophysicalProperties
diff --git a/tutorials/compressible/sonicFoam/RAS/prism/constant/turbulenceProperties b/tutorials/compressible/rhoPimpleFoam/RAS/prism/constant/turbulenceProperties
similarity index 100%
rename from tutorials/compressible/sonicFoam/RAS/prism/constant/turbulenceProperties
rename to tutorials/compressible/rhoPimpleFoam/RAS/prism/constant/turbulenceProperties
diff --git a/tutorials/compressible/sonicFoam/RAS/prism/system/blockMeshDict b/tutorials/compressible/rhoPimpleFoam/RAS/prism/system/blockMeshDict
similarity index 100%
rename from tutorials/compressible/sonicFoam/RAS/prism/system/blockMeshDict
rename to tutorials/compressible/rhoPimpleFoam/RAS/prism/system/blockMeshDict
diff --git a/tutorials/compressible/sonicFoam/RAS/prism/system/controlDict b/tutorials/compressible/rhoPimpleFoam/RAS/prism/system/controlDict
similarity index 97%
rename from tutorials/compressible/sonicFoam/RAS/prism/system/controlDict
rename to tutorials/compressible/rhoPimpleFoam/RAS/prism/system/controlDict
index f5dcfb9881..c7831d0ebb 100644
--- a/tutorials/compressible/sonicFoam/RAS/prism/system/controlDict
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/prism/system/controlDict
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-application     sonicFoam;
+application     rhoPimpleFoam;
 
 startFrom       startTime;
 
diff --git a/tutorials/compressible/sonicFoam/RAS/prism/system/fvSchemes b/tutorials/compressible/rhoPimpleFoam/RAS/prism/system/fvSchemes
similarity index 100%
rename from tutorials/compressible/sonicFoam/RAS/prism/system/fvSchemes
rename to tutorials/compressible/rhoPimpleFoam/RAS/prism/system/fvSchemes
diff --git a/tutorials/compressible/sonicFoam/RAS/prism/system/fvSolution b/tutorials/compressible/rhoPimpleFoam/RAS/prism/system/fvSolution
similarity index 97%
rename from tutorials/compressible/sonicFoam/RAS/prism/system/fvSolution
rename to tutorials/compressible/rhoPimpleFoam/RAS/prism/system/fvSolution
index b1a21b1f9a..dbc62a5f82 100644
--- a/tutorials/compressible/sonicFoam/RAS/prism/system/fvSolution
+++ b/tutorials/compressible/rhoPimpleFoam/RAS/prism/system/fvSolution
@@ -48,6 +48,8 @@ PIMPLE
     nOuterCorrectors 2;
     nCorrectors      1;
     nNonOrthogonalCorrectors 0;
+
+    transonic            yes;
 }
 
 
diff --git a/tutorials/compressible/sonicLiquidFoam/Allclean b/tutorials/compressible/rhoPimpleFoam/laminar/decompressionTank/Allclean
similarity index 100%
rename from tutorials/compressible/sonicLiquidFoam/Allclean
rename to tutorials/compressible/rhoPimpleFoam/laminar/decompressionTank/Allclean
diff --git a/tutorials/compressible/sonicLiquidFoam/Allrun b/tutorials/compressible/rhoPimpleFoam/laminar/decompressionTank/Allrun
similarity index 100%
rename from tutorials/compressible/sonicLiquidFoam/Allrun
rename to tutorials/compressible/rhoPimpleFoam/laminar/decompressionTank/Allrun
diff --git a/tutorials/compressible/sonicDyMFoam/movingCone/0/T b/tutorials/compressible/rhoPimpleFoam/laminar/decompressionTank/decompressionTank/0/T
similarity index 74%
rename from tutorials/compressible/sonicDyMFoam/movingCone/0/T
rename to tutorials/compressible/rhoPimpleFoam/laminar/decompressionTank/decompressionTank/0/T
index 6cfc544728..a3e0a8746b 100644
--- a/tutorials/compressible/sonicDyMFoam/movingCone/0/T
+++ b/tutorials/compressible/rhoPimpleFoam/laminar/decompressionTank/decompressionTank/0/T
@@ -20,40 +20,30 @@ internalField   uniform 300;
 
 boundaryField
 {
-    movingWall
+    outerWall
     {
-        type            zeroGradient;
+        type            fixedValue;
+        value           $internalField;
     }
 
-    farFieldMoving
+    axis
     {
-        type            zeroGradient;
+        type            symmetryPlane;
     }
 
-    fixedWall
-    {
-        type            zeroGradient;
-    }
-
-    left
-    {
-        type            inletOutlet;
-        inletValue      $internalField;
-    }
-
-    farField
+    nozzle
     {
         type            zeroGradient;
     }
 
     back
     {
-        type            wedge;
+        type            empty;
     }
 
     front
     {
-        type            wedge;
+        type            empty;
     }
 }
 
diff --git a/tutorials/compressible/sonicLiquidFoam/decompressionTank/0/U b/tutorials/compressible/rhoPimpleFoam/laminar/decompressionTank/decompressionTank/0/U
similarity index 100%
rename from tutorials/compressible/sonicLiquidFoam/decompressionTank/0/U
rename to tutorials/compressible/rhoPimpleFoam/laminar/decompressionTank/decompressionTank/0/U
diff --git a/tutorials/compressible/sonicLiquidFoam/decompressionTank/0/p b/tutorials/compressible/rhoPimpleFoam/laminar/decompressionTank/decompressionTank/0/p
similarity index 100%
rename from tutorials/compressible/sonicLiquidFoam/decompressionTank/0/p
rename to tutorials/compressible/rhoPimpleFoam/laminar/decompressionTank/decompressionTank/0/p
diff --git a/tutorials/compressible/sonicDyMFoam/movingCone/constant/thermophysicalProperties b/tutorials/compressible/rhoPimpleFoam/laminar/decompressionTank/decompressionTank/constant/thermophysicalProperties
similarity index 70%
rename from tutorials/compressible/sonicDyMFoam/movingCone/constant/thermophysicalProperties
rename to tutorials/compressible/rhoPimpleFoam/laminar/decompressionTank/decompressionTank/constant/thermophysicalProperties
index 112ba7f12b..8ec23fd2d6 100644
--- a/tutorials/compressible/sonicDyMFoam/movingCone/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoPimpleFoam/laminar/decompressionTank/decompressionTank/constant/thermophysicalProperties
@@ -15,13 +15,26 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+thermoType0
+{
+    type            heRhoThermo;
+    mixture         pureMixture;
+    properties      liquid;
+    energy          sensibleInternalEnergy;
+}
+
+mixture0
+{
+    H2O;
+}
+
 thermoType
 {
-    type            hePsiThermo;
+    type            heRhoThermo;
     mixture         pureMixture;
     transport       const;
     thermo          hConst;
-    equationOfState perfectGas;
+    equationOfState perfectFluid;
     specie          specie;
     energy          sensibleInternalEnergy;
 }
@@ -30,19 +43,23 @@ mixture
 {
     specie
     {
-        molWeight   28.9;
+        molWeight       18;
+    }
+    equationOfState
+    {
+        R               7342;
+        rho0            1000;
     }
     thermodynamics
     {
-        Cp          1007;
-        Hf          2.544e+06;
+        Cp              4185;
+        Hf              0;
     }
     transport
     {
-        mu          1e-3;
-        Pr          0.7;
+        mu              0.001;
+        Pr              1;
     }
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/constant/turbulenceProperties b/tutorials/compressible/rhoPimpleFoam/laminar/decompressionTank/decompressionTank/constant/turbulenceProperties
similarity index 99%
rename from tutorials/compressible/sonicFoam/laminar/shockTube/constant/turbulenceProperties
rename to tutorials/compressible/rhoPimpleFoam/laminar/decompressionTank/decompressionTank/constant/turbulenceProperties
index c2c3b28a1b..aefe0c27d7 100644
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/constant/turbulenceProperties
+++ b/tutorials/compressible/rhoPimpleFoam/laminar/decompressionTank/decompressionTank/constant/turbulenceProperties
@@ -17,5 +17,4 @@ FoamFile
 
 simulationType  laminar;
 
-
 // ************************************************************************* //
diff --git a/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/blockMeshDict b/tutorials/compressible/rhoPimpleFoam/laminar/decompressionTank/decompressionTank/system/blockMeshDict
similarity index 100%
rename from tutorials/compressible/sonicLiquidFoam/decompressionTank/system/blockMeshDict
rename to tutorials/compressible/rhoPimpleFoam/laminar/decompressionTank/decompressionTank/system/blockMeshDict
diff --git a/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/controlDict b/tutorials/compressible/rhoPimpleFoam/laminar/decompressionTank/decompressionTank/system/controlDict
similarity index 97%
rename from tutorials/compressible/sonicLiquidFoam/decompressionTank/system/controlDict
rename to tutorials/compressible/rhoPimpleFoam/laminar/decompressionTank/decompressionTank/system/controlDict
index a48accc6ba..cdd4a240fe 100644
--- a/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/controlDict
+++ b/tutorials/compressible/rhoPimpleFoam/laminar/decompressionTank/decompressionTank/system/controlDict
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-application     sonicLiquidFoam;
+application     rhoPimpleFoam;
 
 startFrom       startTime;
 
diff --git a/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/fvSchemes b/tutorials/compressible/rhoPimpleFoam/laminar/decompressionTank/decompressionTank/system/fvSchemes
similarity index 87%
rename from tutorials/compressible/sonicLiquidFoam/decompressionTank/system/fvSchemes
rename to tutorials/compressible/rhoPimpleFoam/laminar/decompressionTank/decompressionTank/system/fvSchemes
index 85de5505e1..89f900b561 100644
--- a/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/fvSchemes
+++ b/tutorials/compressible/rhoPimpleFoam/laminar/decompressionTank/decompressionTank/system/fvSchemes
@@ -28,8 +28,14 @@ gradSchemes
 divSchemes
 {
     default         none;
+
     div(phi,U)      Gauss limitedLinearV 1;
     div(phid,p)     Gauss limitedLinear 1;
+    div(phi,e)      Gauss limitedLinear 1;
+    div(phi,K)      Gauss limitedLinear 1;
+    div(phiv,p)     Gauss limitedLinear 1;
+
+    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSolution b/tutorials/compressible/rhoPimpleFoam/laminar/decompressionTank/decompressionTank/system/fvSolution
similarity index 97%
rename from tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSolution
rename to tutorials/compressible/rhoPimpleFoam/laminar/decompressionTank/decompressionTank/system/fvSolution
index 2875f8c7aa..1e7bfdaebc 100644
--- a/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSolution
+++ b/tutorials/compressible/rhoPimpleFoam/laminar/decompressionTank/decompressionTank/system/fvSolution
@@ -46,6 +46,8 @@ PIMPLE
     nOuterCorrectors 2;
     nCorrectors      1;
     nNonOrthogonalCorrectors 0;
+
+    transonic            yes;
 }
 
 
diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/0/T b/tutorials/compressible/rhoPimpleFoam/laminar/forwardStep/0/T
similarity index 100%
rename from tutorials/compressible/sonicFoam/laminar/forwardStep/0/T
rename to tutorials/compressible/rhoPimpleFoam/laminar/forwardStep/0/T
diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/0/U b/tutorials/compressible/rhoPimpleFoam/laminar/forwardStep/0/U
similarity index 100%
rename from tutorials/compressible/sonicFoam/laminar/forwardStep/0/U
rename to tutorials/compressible/rhoPimpleFoam/laminar/forwardStep/0/U
diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/0/p b/tutorials/compressible/rhoPimpleFoam/laminar/forwardStep/0/p
similarity index 100%
rename from tutorials/compressible/sonicFoam/laminar/forwardStep/0/p
rename to tutorials/compressible/rhoPimpleFoam/laminar/forwardStep/0/p
diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/thermophysicalProperties b/tutorials/compressible/rhoPimpleFoam/laminar/forwardStep/constant/thermophysicalProperties
similarity index 100%
rename from tutorials/compressible/sonicFoam/laminar/forwardStep/constant/thermophysicalProperties
rename to tutorials/compressible/rhoPimpleFoam/laminar/forwardStep/constant/thermophysicalProperties
diff --git a/tutorials/compressible/sonicDyMFoam/movingCone/constant/turbulenceProperties b/tutorials/compressible/rhoPimpleFoam/laminar/forwardStep/constant/turbulenceProperties
similarity index 100%
rename from tutorials/compressible/sonicDyMFoam/movingCone/constant/turbulenceProperties
rename to tutorials/compressible/rhoPimpleFoam/laminar/forwardStep/constant/turbulenceProperties
diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/system/blockMeshDict b/tutorials/compressible/rhoPimpleFoam/laminar/forwardStep/system/blockMeshDict
similarity index 100%
rename from tutorials/compressible/sonicFoam/laminar/forwardStep/system/blockMeshDict
rename to tutorials/compressible/rhoPimpleFoam/laminar/forwardStep/system/blockMeshDict
diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/system/controlDict b/tutorials/compressible/rhoPimpleFoam/laminar/forwardStep/system/controlDict
similarity index 97%
rename from tutorials/compressible/sonicFoam/laminar/forwardStep/system/controlDict
rename to tutorials/compressible/rhoPimpleFoam/laminar/forwardStep/system/controlDict
index dc32355432..43d0e74350 100644
--- a/tutorials/compressible/sonicFoam/laminar/forwardStep/system/controlDict
+++ b/tutorials/compressible/rhoPimpleFoam/laminar/forwardStep/system/controlDict
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-application     sonicFoam;
+application     rhoPimpleFoam;
 
 startFrom       startTime;
 
diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSchemes b/tutorials/compressible/rhoPimpleFoam/laminar/forwardStep/system/fvSchemes
similarity index 100%
rename from tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSchemes
rename to tutorials/compressible/rhoPimpleFoam/laminar/forwardStep/system/fvSchemes
diff --git a/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/fvSolution b/tutorials/compressible/rhoPimpleFoam/laminar/forwardStep/system/fvSolution
similarity index 96%
rename from tutorials/compressible/sonicLiquidFoam/decompressionTank/system/fvSolution
rename to tutorials/compressible/rhoPimpleFoam/laminar/forwardStep/system/fvSolution
index 438b2dd3c4..1e7bfdaebc 100644
--- a/tutorials/compressible/sonicLiquidFoam/decompressionTank/system/fvSolution
+++ b/tutorials/compressible/rhoPimpleFoam/laminar/forwardStep/system/fvSolution
@@ -25,7 +25,7 @@ solvers
         relTol          0;
     }
 
-    "U.*"
+    "(U|e).*"
     {
         $p;
         tolerance       1e-05;
@@ -46,6 +46,8 @@ PIMPLE
     nOuterCorrectors 2;
     nCorrectors      1;
     nNonOrthogonalCorrectors 0;
+
+    transonic            yes;
 }
 
 
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/0/T.orig b/tutorials/compressible/rhoPimpleFoam/laminar/shockTube/0/T.orig
similarity index 100%
rename from tutorials/compressible/sonicFoam/laminar/shockTube/0/T.orig
rename to tutorials/compressible/rhoPimpleFoam/laminar/shockTube/0/T.orig
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/0/U.orig b/tutorials/compressible/rhoPimpleFoam/laminar/shockTube/0/U.orig
similarity index 100%
rename from tutorials/compressible/sonicFoam/laminar/shockTube/0/U.orig
rename to tutorials/compressible/rhoPimpleFoam/laminar/shockTube/0/U.orig
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/0/p.orig b/tutorials/compressible/rhoPimpleFoam/laminar/shockTube/0/p.orig
similarity index 100%
rename from tutorials/compressible/sonicFoam/laminar/shockTube/0/p.orig
rename to tutorials/compressible/rhoPimpleFoam/laminar/shockTube/0/p.orig
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/Allrun b/tutorials/compressible/rhoPimpleFoam/laminar/shockTube/Allrun
similarity index 100%
rename from tutorials/compressible/sonicFoam/laminar/shockTube/Allrun
rename to tutorials/compressible/rhoPimpleFoam/laminar/shockTube/Allrun
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/constant/thermophysicalProperties b/tutorials/compressible/rhoPimpleFoam/laminar/shockTube/constant/thermophysicalProperties
similarity index 100%
rename from tutorials/compressible/sonicFoam/laminar/shockTube/constant/thermophysicalProperties
rename to tutorials/compressible/rhoPimpleFoam/laminar/shockTube/constant/thermophysicalProperties
diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/turbulenceProperties b/tutorials/compressible/rhoPimpleFoam/laminar/shockTube/constant/turbulenceProperties
similarity index 100%
rename from tutorials/compressible/sonicFoam/laminar/forwardStep/constant/turbulenceProperties
rename to tutorials/compressible/rhoPimpleFoam/laminar/shockTube/constant/turbulenceProperties
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/system/blockMeshDict b/tutorials/compressible/rhoPimpleFoam/laminar/shockTube/system/blockMeshDict
similarity index 100%
rename from tutorials/compressible/sonicFoam/laminar/shockTube/system/blockMeshDict
rename to tutorials/compressible/rhoPimpleFoam/laminar/shockTube/system/blockMeshDict
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/system/controlDict b/tutorials/compressible/rhoPimpleFoam/laminar/shockTube/system/controlDict
similarity index 97%
rename from tutorials/compressible/sonicFoam/laminar/shockTube/system/controlDict
rename to tutorials/compressible/rhoPimpleFoam/laminar/shockTube/system/controlDict
index 7c916f2a5e..500035d9ed 100644
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/system/controlDict
+++ b/tutorials/compressible/rhoPimpleFoam/laminar/shockTube/system/controlDict
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-application     sonicFoam;
+application     rhoPimpleFoam;
 
 startFrom       startTime;
 
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSchemes b/tutorials/compressible/rhoPimpleFoam/laminar/shockTube/system/fvSchemes
similarity index 100%
rename from tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSchemes
rename to tutorials/compressible/rhoPimpleFoam/laminar/shockTube/system/fvSchemes
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSolution b/tutorials/compressible/rhoPimpleFoam/laminar/shockTube/system/fvSolution
similarity index 97%
rename from tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSolution
rename to tutorials/compressible/rhoPimpleFoam/laminar/shockTube/system/fvSolution
index 11b41801ae..e6ddd484a8 100644
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSolution
+++ b/tutorials/compressible/rhoPimpleFoam/laminar/shockTube/system/fvSolution
@@ -39,6 +39,8 @@ PIMPLE
     nOuterCorrectors     2;
     nCorrectors          1;
     nNonOrthogonalCorrectors 0;
+
+    transonic            yes;
 }
 
 
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/system/sample b/tutorials/compressible/rhoPimpleFoam/laminar/shockTube/system/sample
similarity index 100%
rename from tutorials/compressible/sonicFoam/laminar/shockTube/system/sample
rename to tutorials/compressible/rhoPimpleFoam/laminar/shockTube/system/sample
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/system/setFieldsDict b/tutorials/compressible/rhoPimpleFoam/laminar/shockTube/system/setFieldsDict
similarity index 100%
rename from tutorials/compressible/sonicFoam/laminar/shockTube/system/setFieldsDict
rename to tutorials/compressible/rhoPimpleFoam/laminar/shockTube/system/setFieldsDict
diff --git a/tutorials/compressible/sonicDyMFoam/movingCone/0/U b/tutorials/compressible/sonicDyMFoam/movingCone/0/U
deleted file mode 100644
index 8fa2c6c004..0000000000
--- a/tutorials/compressible/sonicDyMFoam/movingCone/0/U
+++ /dev/null
@@ -1,61 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       volVectorField;
-    object      U;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 1 -1 0 0 0 0];
-
-internalField   uniform (0 0 0);
-
-boundaryField
-{
-    movingWall
-    {
-        type            movingWallVelocity;
-        value           $internalField;
-    }
-
-    farFieldMoving
-    {
-        type            noSlip;
-    }
-
-    fixedWall
-    {
-        type            noSlip;
-    }
-
-    left
-    {
-        type            pressureInletOutletVelocity;
-        value           $internalField;
-    }
-
-    farField
-    {
-        type            noSlip;
-    }
-
-    back
-    {
-        type            wedge;
-    }
-
-    front
-    {
-        type            wedge;
-    }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/compressible/sonicDyMFoam/movingCone/0/p b/tutorials/compressible/sonicDyMFoam/movingCone/0/p
deleted file mode 100644
index 196f5c7f2a..0000000000
--- a/tutorials/compressible/sonicDyMFoam/movingCone/0/p
+++ /dev/null
@@ -1,60 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       volScalarField;
-    object      p;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [1 -1 -2 0 0 0 0];
-
-internalField   uniform 1e5;
-
-boundaryField
-{
-    movingWall
-    {
-        type            zeroGradient;
-    }
-
-    farFieldMoving
-    {
-        type            zeroGradient;
-    }
-
-    fixedWall
-    {
-        type            zeroGradient;
-    }
-
-    left
-    {
-        type            totalPressure;
-        p0              $internalField;
-    }
-
-    farField
-    {
-        type            zeroGradient;
-    }
-
-    back
-    {
-        type            wedge;
-    }
-
-    front
-    {
-        type            wedge;
-    }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/compressible/sonicDyMFoam/movingCone/0/pointMotionUx b/tutorials/compressible/sonicDyMFoam/movingCone/0/pointMotionUx
deleted file mode 100644
index 520fbd4b1a..0000000000
--- a/tutorials/compressible/sonicDyMFoam/movingCone/0/pointMotionUx
+++ /dev/null
@@ -1,56 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       pointScalarField;
-    object      pointMotionU;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 1 -1 0 0 0 0];
-
-internalField   uniform 0;
-
-boundaryField
-{
-    movingWall
-    {
-        type            uniformFixedValue;
-        uniformValue    constant 160;
-    }
-    farFieldMoving
-    {
-        type            slip;
-    }
-    fixedWall
-    {
-        type            uniformFixedValue;
-        uniformValue    constant 0;
-    }
-    left
-    {
-        type            uniformFixedValue;
-        uniformValue    constant 0;
-    }
-    farField
-    {
-        type            slip;
-    }
-    back
-    {
-        type            wedge;
-    }
-    front
-    {
-        type            wedge;
-    }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/compressible/sonicDyMFoam/movingCone/constant/dynamicMeshDict b/tutorials/compressible/sonicDyMFoam/movingCone/constant/dynamicMeshDict
deleted file mode 100644
index a6f0ba59da..0000000000
--- a/tutorials/compressible/sonicDyMFoam/movingCone/constant/dynamicMeshDict
+++ /dev/null
@@ -1,28 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      dynamicMeshDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dynamicFvMesh   dynamicMotionSolverFvMesh;
-
-motionSolverLibs ("libfvMotionSolvers.so");
-
-motionSolver    velocityComponentLaplacian;
-
-component       x;
-diffusivity     directional (1 200 0);
-
-
-// ************************************************************************* //
diff --git a/tutorials/compressible/sonicDyMFoam/movingCone/system/blockMeshDict b/tutorials/compressible/sonicDyMFoam/movingCone/system/blockMeshDict
deleted file mode 100644
index af8f8bfda3..0000000000
--- a/tutorials/compressible/sonicDyMFoam/movingCone/system/blockMeshDict
+++ /dev/null
@@ -1,142 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      blockMeshDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-convertToMeters 0.001;
-
-vertices
-(
-    (-7.5 0 0)
-    (-7 0 0)
-    (-3.5 0 0)
-    (0 0 0)
-    (-7.5 0.75 -0.032745707)
-    (-7 0.75 -0.032745707)
-    (-3.5 2 -0.087321886)
-    (0 2 -0.087321886)
-    (-7.5 2.5 -0.10915236)
-    (-7 2.5 -0.10915236)
-    (-3.5 2.5 -0.10915236)
-    (0 2.5 -0.10915236)
-    (-7.5 0.75 0.032745707)
-    (-7 0.75 0.032745707)
-    (-3.5 2 0.087321886)
-    (0 2 0.087321886)
-    (-7.5 2.5 0.10915236)
-    (-7 2.5 0.10915236)
-    (-3.5 2.5 0.10915236)
-    (0 2.5 0.10915236)
-);
-
-blocks
-(
-    hex (0 1 5 4 0 1 13 12) (15 15 1) simpleGrading (1 1 1)
-    hex (2 3 7 6 2 3 15 14) (20 20 1) simpleGrading (2 0.25 1)
-    hex (4 5 9 8 12 13 17 16) (15 15 1) simpleGrading (1 1 1)
-    hex (5 6 10 9 13 14 18 17) (50 15 1) simpleGrading (1 1 1)
-    hex (6 7 11 10 14 15 19 18) (20 15 1) simpleGrading (2 1 1)
-);
-
-edges
-(
-);
-
-boundary
-(
-    movingWall
-    {
-        type wall;
-        faces
-        (
-            (1 5 13 1)
-            (5 6 14 13)
-            (2 2 14 6)
-        );
-    }
-    farFieldMoving
-    {
-        type patch;
-        faces
-        (
-            (9 17 18 10)
-        );
-    }
-    fixedWall
-    {
-        type wall;
-        faces
-        (
-            (3 7 15 3)
-            (7 11 19 15)
-        );
-    }
-    axis
-    {
-        type empty;
-        faces
-        (
-            (0 1 1 0)
-            (2 3 3 2)
-        );
-    }
-    left
-    {
-        type patch;
-        faces
-        (
-            (0 0 12 4)
-            (4 12 16 8)
-        );
-    }
-    farField
-    {
-        type patch;
-        faces
-        (
-            (8 16 17 9)
-            (10 18 19 11)
-        );
-    }
-    back
-    {
-        type wedge;
-        faces
-        (
-            (0 4 5 1)
-            (2 6 7 3)
-            (4 8 9 5)
-            (5 9 10 6)
-            (6 10 11 7)
-        );
-    }
-    front
-    {
-        type wedge;
-        faces
-        (
-            (0 1 13 12)
-            (2 3 15 14)
-            (12 13 17 16)
-            (13 14 18 17)
-            (14 15 19 18)
-        );
-    }
-);
-
-mergePatchPairs
-(
-);
-
-// ************************************************************************* //
diff --git a/tutorials/compressible/sonicDyMFoam/movingCone/system/controlDict b/tutorials/compressible/sonicDyMFoam/movingCone/system/controlDict
deleted file mode 100644
index 00464ce893..0000000000
--- a/tutorials/compressible/sonicDyMFoam/movingCone/system/controlDict
+++ /dev/null
@@ -1,52 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "system";
-    object      controlDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-application     sonicDyMFoam;
-
-startFrom       startTime;
-
-startTime       0;
-
-stopAt          endTime;
-
-endTime         0.00002;
-
-deltaT          1e-08;
-
-writeControl    adjustableRunTime;
-
-writeInterval   5e-7;
-
-purgeWrite      0;
-
-writeFormat     binary;
-
-writePrecision  6;
-
-writeCompression off;
-
-timeFormat      general;
-
-timePrecision   6;
-
-runTimeModifiable true;
-
-adjustTimeStep  yes;
-
-maxCo           0.2;
-
-// ************************************************************************* //
diff --git a/tutorials/compressible/sonicDyMFoam/movingCone/system/cuttingPlane b/tutorials/compressible/sonicDyMFoam/movingCone/system/cuttingPlane
deleted file mode 100644
index 5dc66fc2df..0000000000
--- a/tutorials/compressible/sonicDyMFoam/movingCone/system/cuttingPlane
+++ /dev/null
@@ -1,38 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-
-cuttingPlane
-{
-    type            surfaces;
-    libs            ("libsampling.so");
-
-    writeControl    writeTime;
-
-    surfaceFormat   vtk;
-    fields          ( p U );
-
-    interpolationScheme cellPoint;
-
-    surfaces
-    (
-        zNormal
-        {
-            type            cuttingPlane;
-            planeType       pointAndNormal;
-            pointAndNormalDict
-            {
-                point   (0 0 0);
-                normal  (0 0 1);
-            }
-            interpolate     true;
-        }
-    );
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/compressible/sonicDyMFoam/movingCone/system/fvSchemes b/tutorials/compressible/sonicDyMFoam/movingCone/system/fvSchemes
deleted file mode 100644
index 823e92a106..0000000000
--- a/tutorials/compressible/sonicDyMFoam/movingCone/system/fvSchemes
+++ /dev/null
@@ -1,58 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "system";
-    object      fvSchemes;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-ddtSchemes
-{
-    default         Euler;
-}
-
-gradSchemes
-{
-    default         Gauss linear;
-}
-
-divSchemes
-{
-    default         none;
-
-    div(phi,U)      Gauss vanLeerV;
-    div(phid,p)     Gauss vanLeer;
-    div(phi,K)      Gauss vanLeer;
-    div(phi,e)      Gauss vanLeer;
-
-    div(phiv,p)     Gauss linear;
-    div(((rho*nuEff)*dev2(T(grad(U))))) Gauss linear;
-}
-
-laplacianSchemes
-{
-    default         Gauss linear corrected;
-
-    laplacian(diffusivity,cellMotionU) Gauss linear uncorrected;
-}
-
-interpolationSchemes
-{
-    default         linear;
-}
-
-snGradSchemes
-{
-    default         corrected;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/compressible/sonicDyMFoam/movingCone/system/fvSolution b/tutorials/compressible/sonicDyMFoam/movingCone/system/fvSolution
deleted file mode 100644
index 8847ff2179..0000000000
--- a/tutorials/compressible/sonicDyMFoam/movingCone/system/fvSolution
+++ /dev/null
@@ -1,94 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "system";
-    object      fvSolution;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-solvers
-{
-    p
-    {
-        solver          PBiCGStab;
-        preconditioner  DILU;
-        tolerance       1e-06;
-        relTol          0.01;
-    }
-
-    pFinal
-    {
-        $p;
-        relTol          0;
-    }
-
-    "pcorr.*"
-    {
-        solver          PCG;
-        preconditioner  DIC;
-        tolerance       1e-2;
-        relTol          0;
-    }
-
-    "rho.*"
-    {
-        solver          diagonal;
-        tolerance       1e-05;
-        relTol          0;
-    }
-
-    "(U|h|e|R|k|epsilon|omega)"
-    {
-        solver          smoothSolver;
-        smoother        symGaussSeidel;
-        tolerance       1e-05;
-        relTol          0.1;
-    }
-
-    "(U|h|e|R|k|epsilon|omega)Final"
-    {
-        $U;
-        relTol          0;
-    }
-
-    cellMotionUx
-    {
-        solver          PCG;
-        preconditioner  DIC;
-        tolerance       1e-08;
-        relTol          0;
-    }
-}
-
-PIMPLE
-{
-    momentumPredictor   yes;
-    correctPhi          yes;
-    nOuterCorrectors    2;
-    nCorrectors         2;
-    transonic           yes;
-    nNonOrthogonalCorrectors 0;
-
-    rhoMin              0.1;
-    rhoMax              100.0;
-}
-
-relaxationFactors
-{
-    equations
-    {
-        ".*"        1;
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/thermodynamicProperties b/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/thermodynamicProperties
deleted file mode 100644
index 93c3dbbd46..0000000000
--- a/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/thermodynamicProperties
+++ /dev/null
@@ -1,25 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      thermodynamicProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-rho0            rho0 [1 -3 0 0 0 0 0] 1000;
-
-p0              p0 [1 -1 -2 0 0 0 0] 100000;
-
-psi             psi [0 -2 2 0 0 0 0] 4.54e-07;
-
-
-// ************************************************************************* //
diff --git a/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/transportProperties b/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/transportProperties
deleted file mode 100644
index ae4876ed06..0000000000
--- a/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/transportProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      transportProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-mu              mu [1 -1 -1 0 0 0 0] 0.001;
-
-
-// ************************************************************************* //