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

conflict resolution

Browse Source
This commit is contained in:
andy
2009-03-23 11:58:03 +00:00
parent 9035b3e419 302f901bf8
commit ff78c6d637
289 changed files with 13459 additions and 5377 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -282,7 +282,7 @@ int main(int argc, char *argv[])
(
readDir
(
databases[procI].timePath()/regionPrefix/"lagrangian",
databases[procI].timePath()/regionPrefix/cloud::prefix,
fileName::DIRECTORY
)
);
@ -300,7 +300,7 @@ int main(int argc, char *argv[])
(
procMeshes.meshes()[procI],
databases[procI].timeName(),
"lagrangian"/cloudDirs[i]
cloud::prefix/cloudDirs[i]
);
IOobject* positionsPtr = sprayObjs.lookup("positions");