mirror of
https://github.com/PhasicFlow/phasicFlow.git
synced 2025-06-12 16:26:23 +00:00
bug fixes for build with float in cuda
This commit is contained in:
@ -431,7 +431,7 @@ T dictionary::getValOrSet
|
||||
template<typename T>
|
||||
T dictionary::getValOrSetMax(const word& keyword, const T& setMaxVal)const
|
||||
{
|
||||
return max(getValOrSet(keyword, setMaxVal), setMaxVal);
|
||||
return max(getValOrSet(keyword, setMaxVal), static_cast<T>(setMaxVal));
|
||||
}
|
||||
|
||||
template<typename T>
|
||||
|
@ -167,7 +167,7 @@ void pFlow::timeControl::checkForOutputToFile()
|
||||
lastSaved_ = currentTime_;
|
||||
save = true;
|
||||
}
|
||||
else if( std::abs(currentTime_ - lastSaved_) < std::min( pow(10.0,-1.0*timePrecision_), 0.5 *dt_) )
|
||||
else if( std::abs(currentTime_ - lastSaved_) < std::min( pow(10.0,-1.0*timePrecision_), static_cast<real>(0.5 *dt_)) )
|
||||
{
|
||||
lastSaved_ = currentTime_;
|
||||
save = true;
|
||||
|
@ -31,7 +31,7 @@ bool pFlow::simulationDomain::prepareBoundaryDicts()
|
||||
real neighborLength = boundaries.getVal<real>("neighborLength");
|
||||
|
||||
real boundaryExtntionLengthRatio =
|
||||
boundaries.getValOrSetMax("boundaryExtntionLengthRatio", 0.1);
|
||||
boundaries.getValOrSetMax("boundaryExtntionLengthRatio", static_cast<real>(0.1));
|
||||
|
||||
uint32 updateInterval =
|
||||
boundaries.getValOrSetMax<uint32>("updateInterval", 1u);
|
||||
|
@ -28,7 +28,7 @@ pFlow::infinitePlane::infinitePlane
|
||||
)
|
||||
{
|
||||
auto ln = cross(p2-p1, p3-p1);
|
||||
|
||||
|
||||
if( equal(ln.length(),0.0) )
|
||||
{
|
||||
fatalErrorInFunction<<
|
||||
|
@ -21,7 +21,6 @@ Licence:
|
||||
#include <algorithm>
|
||||
#include <iomanip>
|
||||
#include <sstream>
|
||||
|
||||
#include "bTypesFunctions.hpp"
|
||||
|
||||
pFlow::int32
|
||||
|
@ -26,7 +26,7 @@ Licence:
|
||||
#define __bTypesFunctions_hpp__
|
||||
|
||||
#include "builtinTypes.hpp"
|
||||
//#include "math.hpp"
|
||||
#include "math.hpp"
|
||||
#include "numericConstants.hpp"
|
||||
#include "pFlowMacros.hpp"
|
||||
|
||||
|
Reference in New Issue
Block a user