Skip to content
Permalink
Browse files

Merge branch 'mergeDyM'

  • Loading branch information...
Henry Weller
Henry Weller committed Jul 11, 2018
2 parents 5ed4fe7 + 68f9486 commit e0cf9706ca3aaeb0ce22bd7be4bcd57e43fd5cf2
Showing 312 changed files with 1,029 additions and 4,320 deletions.
@@ -1,9 +1,6 @@
EXE_INC = \
-I. \
-I$(FOAM_SOLVERS)/combustion/reactingFoam \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
@@ -12,20 +9,26 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \
-I$(LIB_SRC)/ODE/lnInclude \
-I$(LIB_SRC)/combustionModels/lnInclude

-I$(LIB_SRC)/combustionModels/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/finiteVolume/cfdTools \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/dynamicFvMesh/lnInclude

EXE_LIBS = \
-lfiniteVolume \
-lfvOptions \
-lmeshTools \
-lsampling \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
-lreactionThermophysicalModels \
-lspecie \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
-lspecie \
-lchemistryModel \
-lODE \
-lcombustionModels
-lcombustionModels \
-lreactionThermophysicalModels \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
-lfiniteVolume \
-ldynamicFvMesh \
-ltopoChangerFvMesh \
-lmeshTools \
-lsampling \
-lfvOptions
@@ -31,12 +31,14 @@ Description
\*---------------------------------------------------------------------------*/

#include "fvCFD.H"
#include "dynamicFvMesh.H"
#include "rhoReactionThermo.H"
#include "CombustionModel.H"
#include "turbulentFluidThermoModel.H"
#include "multivariateScheme.H"
#include "pimpleControl.H"
#include "pressureControl.H"
#include "CorrectPhi.H"
#include "fvOptions.H"
#include "localEulerDdtScheme.H"
#include "fvcSmooth.H"
@@ -49,13 +51,12 @@ int main(int argc, char *argv[])

#include "setRootCaseLists.H"
#include "createTime.H"
#include "createMesh.H"
#include "createControl.H"
#include "createDynamicFvMesh.H"
#include "createDyMControls.H"
#include "initContinuityErrs.H"
#include "createFields.H"
#include "createFieldRefs.H"
#include "createRhoUfIfPresent.H"
#include "createTimeControls.H"

turbulence->validate();

@@ -71,7 +72,20 @@ int main(int argc, char *argv[])

while (runTime.run())
{
#include "readTimeControls.H"
#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
autoPtr<volScalarField> divrhoU;
if (correctPhi)
{
divrhoU = new volScalarField
(
"divrhoU",
fvc::div(fvc::absolute(phi, rho, U))
);
}

if (LTS)
{
@@ -87,11 +101,49 @@ int main(int argc, char *argv[])

Info<< "Time = " << runTime.timeName() << nl << endl;

#include "rhoEqn.H"

// --- Pressure-velocity PIMPLE corrector loop
while (pimple.loop())
{
if (pimple.firstIter() || moveMeshOuterCorrectors)
{
// Store momentum to set rhoUf for introduced faces.
autoPtr<volVectorField> rhoU;
if (rhoUf.valid())
{
rhoU = new volVectorField("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 "../../../compressible/rhoPimpleFoam/correctPhi.H"

// Make the fluxes relative to the mesh-motion
fvc::makeRelative(phi, rho, U);
}

if (checkMeshCourantNo)
{
#include "meshCourantNo.H"
}
}
}

if (pimple.firstIter() && !pimple.simpleRho())
{
#include "rhoEqn.H"
}

#include "UEqn.H"
#include "YEqn.H"
#include "EEqn.H"
@@ -3,6 +3,5 @@ cd ${0%/*} || exit 1 # Run from this directory

wclean libso BCs
wclean
wclean rhoCentralDyMFoam

#------------------------------------------------------------------------------
@@ -4,6 +4,6 @@ cd ${0%/*} || exit 1 # Run from this directory
# Parse arguments for library compilation
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments

(wmake $targetType BCs && wmake $targetType && wmake $targetType rhoCentralDyMFoam)
(wmake $targetType BCs && wmake $targetType)

#------------------------------------------------------------------------------
@@ -6,7 +6,7 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
-I$(LIB_SRC)/dynamicMesh/lnInclude \
-I$(LIB_SRC)/dynamicFvMesh/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude

EXE_LIBS = \
@@ -18,4 +18,6 @@ EXE_LIBS = \
-lrhoCentralFoam \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
-ldynamicFvMesh \
-ltopoChangerFvMesh \
-lmeshTools

This file was deleted.

This file was deleted.

0 comments on commit e0cf970

Please sign in to comment.
You can’t perform that action at this time.