Commit a11b93be authored by Mark Olesen's avatar Mark Olesen
Browse files

Merge remote-tracking branch 'origin/master' into develop

parents 0e669fcb 1ac7f2e8
......@@ -57,10 +57,10 @@ Description
#include <sys/stat.h>
#include <sys/socket.h>
#include <netdb.h>
#include <netinet/in.h>
#include <dlfcn.h>
#include <link.h>
#include <netinet/in.h>
#ifdef USE_RANDOM
#include <climits>
#if INT_MAX != 2147483647
......@@ -679,12 +679,12 @@ double Foam::highResLastModified(const fileName& name, const bool followLink)
// Ignore an empty name
if (!name.empty())
{
fileStat fileStatus(name);
fileStat fileStatus(name, followLink);
if (fileStatus.isValid())
{
return
fileStatus.status().st_mtime
+ 1e-9*fileStatus.status().st_atim.tv_nsec;
+ 1e-9*fileStatus.status().st_mtim.tv_nsec;
}
}
......
......@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2012-2017 OpenFOAM Foundation
\\/ M anipulation |
\\/ M anipulation | Copyright (C) 2018 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
......@@ -260,6 +260,14 @@ makeReactionMixtureThermo
icoPoly8EThermoPhysics
);
makeReactionMixtureThermo
(
rhoThermo,
rhoReactionThermo,
heRhoThermo,
multiComponentMixture,
icoPoly8TranspJanafEThermoPhysics
);
// Multi-component reaction thermo
......@@ -365,6 +373,14 @@ makeReactionMixtureThermo
icoPoly8HThermoPhysics
);
makeReactionMixtureThermo
(
rhoThermo,
rhoReactionThermo,
heRhoThermo,
multiComponentMixture,
icoPoly8TranspJanafHThermoPhysics
);
// Multi-component reaction thermo
......
......@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
\\/ M anipulation | Copyright (C) 2018 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
......@@ -120,6 +120,20 @@ namespace Foam
8
> icoPoly8HThermoPhysics;
typedef
polynomialTransport
<
species::thermo
<
janafThermo
<
perfectGas<specie>
>,
sensibleEnthalpy
>,
8
> icoPoly8TranspJanafHThermoPhysics;
// thermo physics types based on sensibleInternalEnergy
typedef
......@@ -188,6 +202,20 @@ namespace Foam
>,
8
> icoPoly8EThermoPhysics;
typedef
polynomialTransport
<
species::thermo
<
janafThermo
<
perfectGas<specie>
>,
sensibleInternalEnergy
>,
8
> icoPoly8TranspJanafEThermoPhysics;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment