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

ENH: more stringent checks for fileName concatenation

Browse Source 
- avoids some doubled slashes

STYLE: simplify concatenation of processor directory names
This commit is contained in:
Mark Olesen
2018-10-11 10:07:11 +02:00
parent a77ab5d4eb
commit c4542294a8
11 changed files with 38 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
applications/utilities/parallelProcessing/decomposePar/decomposePar.C
View File

@ -589,7 +589,7 @@ int main(int argc, char *argv[])
(
Time::controlDictName,
args.rootPath(),
args.caseName()/fileName(word("processor") + name(proci))
args.caseName()/("processor" + Foam::name(proci))
);
processorDb.setTime(runTime);
@ -1016,7 +1016,7 @@ int main(int argc, char *argv[])
Time::controlDictName,
args.rootPath(),
args.caseName()
/fileName(word("processor") + name(proci))
/ ("processor" + Foam::name(proci))
)
);
}
@ -1374,8 +1374,8 @@ int main(int argc, char *argv[])
(
Time::controlDictName,
args.rootPath(),
args.caseName()/
fileName(word("processor") + name(procI))
args.caseName()
/ ("processor" + Foam::name(procI))
);
processorDb.setTime(runTime);

2
applications/utilities/parallelProcessing/decomposePar/domainDecomposition.C
View File

@ -305,7 +305,7 @@ bool Foam::domainDecomposition::writeDecomposition(const bool decomposeSets)
fileName processorCasePath
(
time().caseName()/fileName(word("processor") + Foam::name(proci))
time().caseName()/("processor" + Foam::name(proci))
);
// create a database

9
applications/utilities/parallelProcessing/decomposePar/faMeshDecomposition.C
View File

@ -50,7 +50,7 @@ void Foam::faMeshDecomposition::distributeFaces()
(
Time::controlDictName,
time().rootPath(),
time().caseName()/fileName(word("processor") + Foam::name(procI))
time().caseName()/("processor" + Foam::name(procI))
);
fvMesh procMesh
@ -250,7 +250,7 @@ void Foam::faMeshDecomposition::decomposeMesh()
(
Time::controlDictName,
time().rootPath(),
time().caseName()/fileName(word("processor") + Foam::name(procI))
time().caseName()/("processor" + Foam::name(procI))
);
fvMesh procFvMesh
@ -1059,8 +1059,7 @@ void Foam::faMeshDecomposition::decomposeMesh()
{
fileName processorCasePath
(
time().caseName()/fileName(word("processor")
+ Foam::name(procI))
time().caseName()/("processor" + Foam::name(procI))
);
// create a database
@ -1179,7 +1178,7 @@ bool Foam::faMeshDecomposition::writeDecomposition()
fileName processorCasePath
(
time().caseName()/fileName(word("processor") + Foam::name(procI))
time().caseName()/("processor" + Foam::name(procI))
);
// create a database

2
applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C
View File

@ -223,7 +223,7 @@ int main(int argc, char *argv[])
(
Time::controlDictName,
args.rootPath(),
args.caseName()/fileName(word("processor") + name(proci))
args.caseName()/("processor" + Foam::name(proci))
)
);
}

4
applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
View File

@ -550,7 +550,7 @@ int main(int argc, char *argv[])
forAll(databases, proci)
{
Info<< "Reading database "
<< args.caseName()/fileName(word("processor") + name(proci))
<< args.caseName()/("processor" + Foam::name(proci))
<< endl;
databases.set
@ -560,7 +560,7 @@ int main(int argc, char *argv[])
(
Time::controlDictName,
args.rootPath(),
args.caseName()/fileName(word("processor") + name(proci))
args.caseName()/("processor" + Foam::name(proci))
)
);
}