zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GIT: Resolved conflict

Browse Source
This commit is contained in:
Andrew Heather
2015-12-09 16:19:28 +00:00
parent abeef3313d ed2db73e50
commit 0e01c44129
2311 changed files with 44974 additions and 26547 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
applications/utilities/thermophysical/adiabaticFlameT/adiabaticFlameT.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -62,7 +62,7 @@ int main(int argc, char *argv[])
// Check controlFile stream is OK
if (!controlFile.good())
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Cannot read file " << controlFileName
<< exit(FatalError);
}
@ -87,7 +87,7 @@ int main(int argc, char *argv[])
// Check thermoData stream is OK
if (!thermoDataFile.good())
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Cannot read file " << thermoDataFileName
<< exit(FatalError);
}

9
applications/utilities/thermophysical/chemkinToFoam/chemkinToFoam.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -42,6 +42,7 @@ int main(int argc, char *argv[])
{
argList::validArgs.append("CHEMKINFile");
argList::validArgs.append("CHEMKINThermodynamicsFile");
argList::validArgs.append("CHEMKINTransport");
argList::validArgs.append("FOAMChemistryFile");
argList::validArgs.append("FOAMThermodynamicsFile");
@ -57,16 +58,16 @@ int main(int argc, char *argv[])
speciesTable species;
chemkinReader cr(args[1], species, args[2], newFormat);
chemkinReader cr(species, args[1], args[3], args[2], newFormat);
OFstream reactionsFile(args[3]);
OFstream reactionsFile(args[4]);
reactionsFile
<< "species" << cr.species() << token::END_STATEMENT << nl << nl;
cr.reactions().write(reactionsFile);
OFstream thermoFile(args[4]);
OFstream thermoFile(args[5]);
cr.speciesThermo().write(thermoFile);
Info<< "End\n" << endl;

6
applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -64,7 +64,7 @@ int main(int argc, char *argv[])
// Check controlFile stream is OK
if (!controlFile.good())
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Cannot read file " << controlFileName
<< abort(FatalError);
}
@ -88,7 +88,7 @@ int main(int argc, char *argv[])
// Check thermoData stream is OK
if (!thermoDataFile.good())
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Cannot read file " << thermoDataFileName
<< abort(FatalError);
}

4
applications/utilities/thermophysical/mixtureAdiabaticFlameT/mixture.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -78,7 +78,7 @@ public:
if (volTot > 1.001 || volTot < 0.999)
{
FatalErrorIn("mixture::mixture(istream& is)")
FatalErrorInFunction
<< "Sum of volume fractions for Mixture " << name_
<< " = " << volTot << endl
<< "Should equal one."

6
applications/utilities/thermophysical/mixtureAdiabaticFlameT/mixtureAdiabaticFlameT.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -62,7 +62,7 @@ int main(int argc, char *argv[])
// Check controlFile stream is OK
if (!controlFile.good())
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Cannot read file " << controlFileName
<< abort(FatalError);
}
@ -86,7 +86,7 @@ int main(int argc, char *argv[])
// Check thermoData stream is OK
if (!thermoDataFile.good())
{
FatalErrorIn(args.executable())
FatalErrorInFunction
<< "Cannot read file " << thermoDataFileName
<< abort(FatalError);
}