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

Merge branch 'master' into particleInteractions

Browse Source
This commit is contained in:
graham
2009-09-02 14:44:16 +01:00
parent bd3e435764 33a2ec60de
commit a39f80e565
7 changed files with 29 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/postProcessing/functionObjects/forces/forces/forces.C
View File

@ -211,12 +211,6 @@ Foam::forces::forces
}
read(dict);
if (active_)
{
// Create the forces file if not already created
makeFile();
}
}
@ -317,16 +311,18 @@ void Foam::forces::makeFile()
if (Pstream::master())
{
fileName forcesDir;
word startTimeName =
obr_.time().timeName(obr_.time().startTime().value());
if (Pstream::parRun())
{
// Put in undecomposed case (Note: gives problems for
// distributed data running)
forcesDir =
obr_.time().path()/".."/name_/obr_.time().timeName();
forcesDir = obr_.time().path()/".."/name_/startTimeName;
}
else
{
forcesDir = obr_.time().path()/name_/obr_.time().timeName();
forcesDir = obr_.time().path()/name_/startTimeName;
}
// Create directory if does not exist.

7
src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinLexer.L
View File

@ -67,8 +67,9 @@ int yyFlexLexer::yywrap()
Foam::string foamSpecieString(const char* YYText)
{
Foam::string specieString(YYText);
specieString.replaceAll('(', '<');
specieString.replaceAll(')', '>');
// Transforming parentheses is no longer necessary
//specieString.replaceAll('(', '<');
//specieString.replaceAll(')', '>');
return specieString;
}
@ -804,7 +805,7 @@ bool finishReaction = false;
}
else
{
currentSpecieName = keyword;
currentSpecieName = foamName(foamSpecieString(YYText()));
HashTable<label>::iterator specieIndexIter
(