mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
Merge branch 'master' into particleInteractions
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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -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
|
||||
|
||||
@ -23,3 +23,9 @@
|
||||
runTimeTarget.time().value()
|
||||
);
|
||||
}
|
||||
|
||||
runTimeSource.setTime(sourceTimes[sourceTimeIndex], sourceTimeIndex);
|
||||
|
||||
Info<< "\nSource time: " << runTimeSource.value()
|
||||
<< "\nTarget time: " << runTimeTarget.value()
|
||||
<< endl;
|
||||
|
||||
Reference in New Issue
Block a user