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

cleanup of time handling (cosmetic changes), used timeSelector in more places

Browse Source
This commit is contained in:
Mark Olesen
2009-05-20 15:40:30 +02:00
parent 7941b04785
commit 8edf105c45
43 changed files with 283 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/utilities/preProcessing/mapFields/createTimes.H
View File

@ -1,4 +1,4 @@
Info<< nl << "Create databases as time" << endl;
Info << "\nCreate databases as time" << endl;
Time runTimeSource
(

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

@ -43,31 +43,6 @@ Description
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
int getTimeIndex
(
const instantList& times,
const scalar t
)
{
int nearestIndex = -1;
scalar nearestDiff = Foam::GREAT;
forAll(times, timeIndex)
{
if (times[timeIndex].name() == "constant") continue;
scalar diff = fabs(times[timeIndex].value() - t);
if (diff < nearestDiff)
{
nearestDiff = diff;
nearestIndex = timeIndex;
}
}
return nearestIndex;
}
void mapConsistentMesh
(
const fvMesh& meshSource,
@ -254,9 +229,7 @@ wordList addProcessorPatches
int main(int argc, char *argv[])
{
# include "setRoots.H"
# include "createTimes.H"
# include "setTimeIndex.H"
runTimeSource.setTime(sourceTimes[sourceTimeIndex], sourceTimeIndex);
@ -357,7 +330,7 @@ int main(int argc, char *argv[])
}
}
}
else if(!parallelSource && parallelTarget)
else if (!parallelSource && parallelTarget)
{
IOdictionary decompositionDict
(
@ -426,7 +399,7 @@ int main(int argc, char *argv[])
}
}
}
else if(parallelSource && parallelTarget)
else if (parallelSource && parallelTarget)
{
IOdictionary decompositionDictSource
(

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

@ -8,12 +8,18 @@
}
else
{
scalar sourceTime = args.optionRead<scalar>("sourceTime");
sourceTimeIndex = getTimeIndex(sourceTimes, sourceTime);
sourceTimeIndex = Time::findClosestTimeIndex
(
sourceTimes,
args.optionRead<scalar>("sourceTime")
);
}
}
else
{
scalar sourceTime = runTimeTarget.time().value();
sourceTimeIndex = getTimeIndex(sourceTimes, sourceTime);
sourceTimeIndex = Time::findClosestTimeIndex
(
sourceTimes,
runTimeTarget.time().value()
);
}

19
applications/utilities/preProcessing/setFields/setFields.C
View File

@ -28,6 +28,7 @@ Description
\*---------------------------------------------------------------------------*/
#include "argList.H"
#include "timeSelector.H"
#include "Time.H"
#include "fvMesh.H"
#include "topoSetSource.H"
@ -174,19 +175,13 @@ public:
int main(int argc, char *argv[])
{
timeSelector::addOptions();
# include "addTimeOptions.H"
# include "setRootCase.H"
# include "createTime.H"
// Get times list
instantList Times = runTime.times();
// set startTime and endTime depending on -time and -latestTime options
# include "checkTimeOptions.H"
runTime.setTime(Times[startTime], startTime);
instantList timeDirs = timeSelector::select0(runTime, args);
# include "createMesh.H"
@ -220,11 +215,11 @@ int main(int argc, char *argv[])
PtrList<entry> regions(setFieldsDict.lookup("regions"));
forAll(regions, regioni)
forAll(regions, regionI)
{
const entry& region = regions[regioni];
const entry& region = regions[regionI];
autoPtr<topoSetSource> cellSelector =
autoPtr<topoSetSource> cellSelector =
topoSetSource::New(region.keyword(), mesh, region.dict());
cellSet selectedCellSet
@ -247,7 +242,7 @@ int main(int argc, char *argv[])
);
}
Info << nl << "End" << endl;
Info<< "\nEnd" << endl;
return 0;
}