Commit 4c5941c6 authored by Lynn Garren's avatar Lynn Garren
Browse files

make Windows happy

parent 4eaf1e05
......@@ -38,7 +38,7 @@ namespace Genfun {
stepsize=sStepsize;
}
const unsigned int p = eeStepper->order(); // Order of the stepper
const double deltaMax = T*pow(S/Rmax, p+1); // Maximum error 4 adjustment.
const double deltaMax = T*std::pow(S/Rmax, (int)(p+1)); // Maximum error 4 adjustment.
const double TINY = 1.0E-30; // Denominator regularization
double hnext;
//
......@@ -64,7 +64,7 @@ namespace Genfun {
//
// Bail out and try a smaller step.
//
h = std::max(S*h*pow(T/(delta + TINY), 1.0/(p+1)),Rmin*h);
h = std::max(S*h*std::pow(T/(delta + TINY), 1.0/(p+1)),Rmin*h);
if (!(((float) s.time+h - (float) s.time) > 0) ) {
std::cerr << "Warning, RK Integrator step underflow" << std::endl;
}
......@@ -74,7 +74,7 @@ namespace Genfun {
}
else {
if (delta > deltaMax) {
hnext = S*h*pow(T/(delta + TINY),1.0/(p+1));
hnext = S*h*std::pow(T/(delta + TINY),1.0/(p+1));
}
else {
hnext = Rmax*h;
......
......@@ -30,7 +30,7 @@ namespace Genfun {
for (size_t v=0;v<nvar;v++) errors[v]=fabs(d2.variable[v]-d.variable[v]);
// Final correction:
for (size_t v=0;v<nvar;v++) d.variable[v] = d2.variable[v] + ((d2.variable[v]-d.variable[v])/double(pow(2,tableau.order())-1));
for (size_t v=0;v<nvar;v++) d.variable[v] = d2.variable[v] + ((d2.variable[v]-d.variable[v])/double(std::pow(2.,(int)(tableau.order())-1)));
}
......
......@@ -183,6 +183,13 @@ macro( _clhep_lib_suffix_64 )
set(LIBSUFFIX "")
endif()
endif()
elseif( ${CMAKE_SYSTEM_NAME} MATCHES "Windows" )
message(STATUS "checking LIB_SUFFIX ${LIB_SUFFIX} against ${CMAKE_SYSTEM_PROCESSOR} ")
if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86")
set(LIBSUFFIX ${LIB_SUFFIX})
else()
set(LIBSUFFIX "")
endif()
else()
message(STATUS "checking LIB_SUFFIX ${LIB_SUFFIX} against ${CMAKE_SYSTEM_PROCESSOR} ")
if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment