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

6
applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
View File

@ -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);
}
}
}

27
applications/utilities/preProcessing/mapFields/mapFields.C
View File

@ -228,15 +228,8 @@ wordList addProcessorPatches
int main(int argc, char *argv[])
{
# include "setRoots.H"
# include "createTimes.H"
# include "setTimeIndex.H"
runTimeSource.setTime(sourceTimes[sourceTimeIndex], sourceTimeIndex);
Info<< "\nSource time: " << runTimeSource.value()
<< "\nTarget time: " << runTimeTarget.value()
<< endl;
#include "setRoots.H"
#include "createTimes.H"
HashTable<word> patchMap;
wordList cuttingPatches;
@ -302,11 +295,7 @@ int main(int argc, char *argv[])
caseDirSource/fileName(word("processor") + name(procI))
);
runTimeSource.setTime
(
sourceTimes[sourceTimeIndex],
sourceTimeIndex
);
#include "setTimeIndex.H"
fvMesh meshSource
(
@ -348,6 +337,8 @@ int main(int argc, char *argv[])
Info<< "Create source mesh\n" << endl;
#include "setTimeIndex.H"
fvMesh meshSource
(
IOobject
@ -450,11 +441,7 @@ int main(int argc, char *argv[])
caseDirSource/fileName(word("processor") + name(procISource))
);
runTimeSource.setTime
(
sourceTimes[sourceTimeIndex],
sourceTimeIndex
);
#include "setTimeIndex.H"
fvMesh meshSource
(
@ -529,6 +516,8 @@ int main(int argc, char *argv[])
}
else
{
#include "setTimeIndex.H"
Info<< "Create meshes\n" << endl;
fvMesh meshSource

6
applications/utilities/preProcessing/mapFields/setTimeIndex.H
View File

@ -23,3 +23,9 @@
runTimeTarget.time().value()
);
}
runTimeSource.setTime(sourceTimes[sourceTimeIndex], sourceTimeIndex);
Info<< "\nSource time: " << runTimeSource.value()
<< "\nTarget time: " << runTimeTarget.value()
<< endl;

2
etc/bashrc
View File

@ -33,7 +33,7 @@
#------------------------------------------------------------------------------
export WM_PROJECT=OpenFOAM
export WM_PROJECT_VERSION=dev
[ -z "$WM_PROJECT_VERSION" ] && export WM_PROJECT_VERSION=1.6
################################################################################
# USER EDITABLE PART

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
(

2
tutorials/mesh/snappyHexMesh/Allrun Executable file
View 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.