mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
Merge branch 'master' of ssh://noisy/home/noisy3/OpenFOAM/OpenFOAM-dev
This commit is contained in:
@ -1010,9 +1010,9 @@ int main(int argc, char *argv[])
|
||||
writer.writeIOField<label>(labelNames);
|
||||
writer.writeIOField<scalar>(scalarNames);
|
||||
writer.writeIOField<vector>(vectorNames);
|
||||
writer.writeIOField<vector>(sphereNames);
|
||||
writer.writeIOField<vector>(symmNames);
|
||||
writer.writeIOField<vector>(tensorNames);
|
||||
writer.writeIOField<sphericalTensor>(sphereNames);
|
||||
writer.writeIOField<symmTensor>(symmNames);
|
||||
writer.writeIOField<tensor>(tensorNames);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -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.
|
||||
|
||||
@ -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
|
||||
(
|
||||
|
||||
2
tutorials/mesh/snappyHexMesh/Allrun
Executable file
2
tutorials/mesh/snappyHexMesh/Allrun
Executable file
@ -0,0 +1,2 @@
|
||||
# These cases are links to solver test cases and are run when the Allrun scripts of those solvers are run.
|
||||
# This empty Allrun script avoids the meshing of theses cases to be run twice.
|
||||
Reference in New Issue
Block a user