Merge pull request #35 from PhasicFlow/solvers

correction for time control and precision

src/phasicFlow/repository/Time/timeControl.H

@@ -105,8 +105,7 @@ public:
 
 	word currentTimeWord() const
 	{
-		word ctw = real2Word( currentTime(), timePrecision());
+		return real2FixedStripZeros( currentTime(), timePrecision());;
-		return ctw;
 	}
 
 	int32 currentIter()const

src/phasicFlow/types/basicTypes/bTypesFunctions.C

@@ -72,6 +72,38 @@ pFlow::word pFlow::int322Word(const int32 & v)
     return ss.str();
 }
 
+pFlow::word pFlow::removeDecimalZeros(const word& str)
+{
+    auto dec = str.find('.');
+    if(dec == word::npos) return str;
+    
+    auto len = str.size();
+    if(len == word::npos) return str;
+    
+    auto  firstZero = word::npos;
+    for(auto n=len-1; n>dec;n--)
+    {
+        if( str[n] == '0' ) 
+        {
+            firstZero = n;
+        }
+        else
+        {
+            break;
+        }
+    }
+
+    if(firstZero == dec+1) firstZero = dec;
+    
+    return str.substr(0,firstZero);
+}
+
+pFlow::word pFlow::real2FixedStripZeros(const real & v, int32 numPrecision)
+{
+    word strVal = real2Fixed(v, numPrecision);
+    return removeDecimalZeros(strVal);
+}
+
 pFlow::word pFlow::toUpper(const word & inStr)
 {
     word oStr(inStr);

src/phasicFlow/types/basicTypes/bTypesFunctions.H

@@ -57,6 +57,10 @@ word real2Fixed(const real & v, int32 numPrecision = 6);
 
 word real2Word(const real & v, int32 numPrecision = 6);
 
+word removeDecimalZeros(const word& str);
+
+word real2FixedStripZeros(const real & v, int32 numPrecision = 6);
+
 word int322Word(const int32 & v);