Merge pull request #25 from PhasicFlow/solvers
time precision corrected
This commit is contained in:
commit
a4123179ea
|
@ -54,7 +54,7 @@ bool pFlow::Time::write
|
||||||
{
|
{
|
||||||
if(outputToFile())
|
if(outputToFile())
|
||||||
{
|
{
|
||||||
Report(0)<<"\nWriting to file at time: "<< cyanText(currentTime())<<endReport;
|
Report(0)<<"\nWriting to file at time: "<< cyanText(currentTimeWord())<<endReport;
|
||||||
return repository::write(verbose);
|
return repository::write(verbose);
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
|
|
|
@ -59,8 +59,7 @@ public:
|
||||||
//// - Methods
|
//// - Methods
|
||||||
virtual fileSystem localPath()const
|
virtual fileSystem localPath()const
|
||||||
{
|
{
|
||||||
real ct = currentTime();
|
word lp = currentTimeWord();
|
||||||
word lp = real2Word( ct, timePrecision());
|
|
||||||
return lp;
|
return lp;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -103,6 +103,12 @@ public:
|
||||||
return currentTime_;
|
return currentTime_;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
word currentTimeWord() const
|
||||||
|
{
|
||||||
|
word ctw = real2Word( currentTime(), timePrecision());
|
||||||
|
return ctw;
|
||||||
|
}
|
||||||
|
|
||||||
int32 currentIter()const
|
int32 currentIter()const
|
||||||
{
|
{
|
||||||
return currentIter_;
|
return currentIter_;
|
||||||
|
@ -132,7 +138,7 @@ public:
|
||||||
currentTime_ += dt_;
|
currentTime_ += dt_;
|
||||||
if(screenReport())
|
if(screenReport())
|
||||||
{
|
{
|
||||||
Report(0)<<"Time (s): "<<cyanText(currentTime_)<<endReport;
|
Report(0)<<"Time (s): "<<cyanText( currentTimeWord() )<<endReport;
|
||||||
}
|
}
|
||||||
// switch outputToFile_ on/off
|
// switch outputToFile_ on/off
|
||||||
checkForOutputToFile();
|
checkForOutputToFile();
|
||||||
|
|
Loading…
Reference in New Issue