From 473dbd4497e49b9d4b24366e1426c40e98f06467 Mon Sep 17 00:00:00 2001
From: hamidrezanorouzi <hamid.r.norouzi@gmail.com>
Date: Fri, 17 Mar 2023 16:35:57 +0330
Subject: [PATCH] timeName correction

---
 src/MotionModel/entities/vibrating/vibrating.hpp |  2 +-
 src/phasicFlow/Timer/Timer.hpp                   |  4 ++--
 src/phasicFlow/Timer/Timers.hpp                  |  4 +++-
 src/phasicFlow/repository/Time/Time.cpp          |  2 +-
 src/phasicFlow/repository/Time/Time.hpp          |  3 +--
 src/phasicFlow/repository/Time/timeControl.cpp   | 10 +++++++++-
 src/phasicFlow/repository/Time/timeControl.hpp   |  2 ++
 7 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/MotionModel/entities/vibrating/vibrating.hpp b/src/MotionModel/entities/vibrating/vibrating.hpp
index 980ab0e4..5e41e195 100644
--- a/src/MotionModel/entities/vibrating/vibrating.hpp
+++ b/src/MotionModel/entities/vibrating/vibrating.hpp
@@ -95,7 +95,7 @@ public:
 	realx3 transferPoint(const realx3& p, real dt)
 	{
 		if(!inTimeRange()) return p;
-		return p + 0.5*dt*(velocity0_+velocity_);
+		return p + static_cast<real>(0.5)*dt*(velocity0_+velocity_);
 	}
 
 	// - IO operation
diff --git a/src/phasicFlow/Timer/Timer.hpp b/src/phasicFlow/Timer/Timer.hpp
index 54e30317..4c731444 100644
--- a/src/phasicFlow/Timer/Timer.hpp
+++ b/src/phasicFlow/Timer/Timer.hpp
@@ -19,8 +19,8 @@ Licence:
 -----------------------------------------------------------------------------*/
 
 
-#ifndef __Timer_hpp__
-#define __Timer_hpp__
+#ifndef __Timerr_hpp__
+#define __Timerr_hpp__
 
 
 #include <chrono>
diff --git a/src/phasicFlow/Timer/Timers.hpp b/src/phasicFlow/Timer/Timers.hpp
index cd2630fb..fea6604b 100644
--- a/src/phasicFlow/Timer/Timers.hpp
+++ b/src/phasicFlow/Timer/Timers.hpp
@@ -22,8 +22,10 @@ Licence:
 #define __Timerss_hpp__
 
 
-#include "Timer.hpp"
+
 #include "List.hpp"
+#include "Timer.hpp"
+
 
 namespace pFlow
 {
diff --git a/src/phasicFlow/repository/Time/Time.cpp b/src/phasicFlow/repository/Time/Time.cpp
index 4f80061b..625b1bc1 100644
--- a/src/phasicFlow/repository/Time/Time.cpp
+++ b/src/phasicFlow/repository/Time/Time.cpp
@@ -85,7 +85,7 @@ bool pFlow::Time::write
 {
 	if(outputToFile())
 	{
-		REPORT(0)<<"\nWriting to file at time: "<< cyanText(currentTimeWord())<<endREPORT;
+		REPORT(0)<<"\nWriting to file at time: "<< cyanText(timeName())<<endREPORT;
 		return repository::write(verbose);
 	}
 	return true;
diff --git a/src/phasicFlow/repository/Time/Time.hpp b/src/phasicFlow/repository/Time/Time.hpp
index b4f49d07..fd39e37e 100644
--- a/src/phasicFlow/repository/Time/Time.hpp
+++ b/src/phasicFlow/repository/Time/Time.hpp
@@ -67,8 +67,7 @@ public:
 	//// -  Methods
 		virtual fileSystem localPath()const
 		{
-			word lp = currentTimeWord();
-			return lp;
+			return timeName();
 		}
 	
 		// - geometry repository 
diff --git a/src/phasicFlow/repository/Time/timeControl.cpp b/src/phasicFlow/repository/Time/timeControl.cpp
index d27aac1a..6fbad2ad 100644
--- a/src/phasicFlow/repository/Time/timeControl.cpp
+++ b/src/phasicFlow/repository/Time/timeControl.cpp
@@ -100,6 +100,14 @@ pFlow::timeControl::timeControl(
 	checkForOutputToFile();
 }
 
+pFlow::word pFlow::timeControl::timeName()const
+{
+	if(managedExternaly_)
+		return timeName_;
+	else
+		return currentTimeWord();
+}
+
 bool pFlow::timeControl::finalTime()const
 {
 	if( currentTime_ >= endTime_ ) return true;
@@ -171,7 +179,7 @@ bool pFlow::timeControl::operator ++(int)
 	currentIter_++;
 
 	currentTime_ += dt_;
-	if(screenReport())
+	if(screenReport() && !managedExternaly_)
 	{
 		REPORT(0)<<"Time (s): "<<cyanText( currentTimeWord() )<<endREPORT;
 	}
diff --git a/src/phasicFlow/repository/Time/timeControl.hpp b/src/phasicFlow/repository/Time/timeControl.hpp
index 59d9fc21..b3ac5c1b 100644
--- a/src/phasicFlow/repository/Time/timeControl.hpp
+++ b/src/phasicFlow/repository/Time/timeControl.hpp
@@ -126,6 +126,8 @@ public:
 		return startTime_;
 	}
 
+	word timeName()const;	
+
 	real currentTime() const 
 	{
 		return currentTime_;