Commit 5b1769ca authored by incardon's avatar incardon

Fixing Umfpack on GCC7 compilation

parent cac8e24c
...@@ -214,11 +214,16 @@ template<typename solver_type,typename lid_nn_3d> void lid_driven_cavity_3d() ...@@ -214,11 +214,16 @@ template<typename solver_type,typename lid_nn_3d> void lid_driven_cavity_3d()
std::string file1 = std::string("test/") + s + "lid_driven_cavity_3d_p" + std::to_string(v_cl.getProcessingUnits()) + "_grid_" + std::to_string(v_cl.getProcessUnitID()) + "_test_GCC5.vtk"; std::string file1 = std::string("test/") + s + "lid_driven_cavity_3d_p" + std::to_string(v_cl.getProcessingUnits()) + "_grid_" + std::to_string(v_cl.getProcessUnitID()) + "_test_GCC5.vtk";
std::string file2 = s + "lid_driven_cavity_3d_p" + std::to_string(v_cl.getProcessingUnits()) + "_grid_" + std::to_string(v_cl.getProcessUnitID()) + ".vtk"; std::string file2 = s + "lid_driven_cavity_3d_p" + std::to_string(v_cl.getProcessingUnits()) + "_grid_" + std::to_string(v_cl.getProcessUnitID()) + ".vtk";
#elif __GNUC__ == 6 || __GNUC__ == 7 #elif __GNUC__ == 6
std::string file1 = std::string("test/") + s + "lid_driven_cavity_3d_p" + std::to_string(v_cl.getProcessingUnits()) + "_grid_" + std::to_string(v_cl.getProcessUnitID()) + "_test_GCC6.vtk"; std::string file1 = std::string("test/") + s + "lid_driven_cavity_3d_p" + std::to_string(v_cl.getProcessingUnits()) + "_grid_" + std::to_string(v_cl.getProcessUnitID()) + "_test_GCC6.vtk";
std::string file2 = s + "lid_driven_cavity_3d_p" + std::to_string(v_cl.getProcessingUnits()) + "_grid_" + std::to_string(v_cl.getProcessUnitID()) + ".vtk"; std::string file2 = s + "lid_driven_cavity_3d_p" + std::to_string(v_cl.getProcessingUnits()) + "_grid_" + std::to_string(v_cl.getProcessUnitID()) + ".vtk";
#elif __GNUC__ == 7
std::string file1 = std::string("test/") + s + "lid_driven_cavity_3d_p" + std::to_string(v_cl.getProcessingUnits()) + "_grid_" + std::to_string(v_cl.getProcessUnitID()) + "_test_GCC7.vtk";
std::string file2 = s + "lid_driven_cavity_3d_p" + std::to_string(v_cl.getProcessingUnits()) + "_grid_" + std::to_string(v_cl.getProcessUnitID()) + ".vtk";
#else #else
std::string file1 = std::string("test/") + s + "lid_driven_cavity_3d_p" + std::to_string(v_cl.getProcessingUnits()) + "_grid_" + std::to_string(v_cl.getProcessUnitID()) + "_test_GCC4.vtk"; std::string file1 = std::string("test/") + s + "lid_driven_cavity_3d_p" + std::to_string(v_cl.getProcessingUnits()) + "_grid_" + std::to_string(v_cl.getProcessUnitID()) + "_test_GCC4.vtk";
......
...@@ -433,24 +433,24 @@ struct inte_calc_impl ...@@ -433,24 +433,24 @@ struct inte_calc_impl
// calculate the position of the particle in the grid // calculate the position of the particle in the grid
// coordinated // coordinated
for (size_t i = 0 ; i < vector::dims ; i++) for (size_t i = 0 ; i < vector::dims ; i++)
x0[i] = (p.get(i)-domain.getLow(i))*dx[i]; {x0[i] = (p.get(i)-domain.getLow(i))*dx[i];}
// convert into integer // convert into integer
for (size_t i = 0 ; i < vector::dims ; i++) for (size_t i = 0 ; i < vector::dims ; i++)
ip[i][0] = (int)x0[i]; {ip[i][0] = (int)x0[i];}
// convert the global grid position into local grid position // convert the global grid position into local grid position
grid_key_dx<vector::dims> base; grid_key_dx<vector::dims> base;
for (size_t i = 0 ; i < vector::dims ; i++) for (size_t i = 0 ; i < vector::dims ; i++)
base.set_d(i,ip[i][0] - gd.getLocalGridsInfo().get(sub).origin.get(i) - (long int)kernel::np/2 + 1); {base.set_d(i,ip[i][0] - gd.getLocalGridsInfo().get(sub).origin.get(i) - (long int)kernel::np/2 + 1);}
// convenient grid of points // convenient grid of points
for (size_t j = 0 ; j < kernel::np-1 ; j++) for (size_t j = 0 ; j < kernel::np-1 ; j++)
{ {
for (size_t i = 0 ; i < vector::dims ; i++) for (size_t i = 0 ; i < vector::dims ; i++)
ip[i][j+1] = (int)ip[i][j]+1; {ip[i][j+1] = (int)ip[i][j]+1;}
} }
for (size_t i = 0 ; i < vector::dims ; i++) for (size_t i = 0 ; i < vector::dims ; i++)
...@@ -459,13 +459,13 @@ struct inte_calc_impl ...@@ -459,13 +459,13 @@ struct inte_calc_impl
for (long int j = 0 ; j < kernel::np ; j++) for (long int j = 0 ; j < kernel::np ; j++)
{ {
for (size_t i = 0 ; i < vector::dims ; i++) for (size_t i = 0 ; i < vector::dims ; i++)
x[i][j] = - xp[i] + typename vector::stype((long int)j - (long int)kernel::np/2 + 1); {x[i][j] = - xp[i] + typename vector::stype((long int)j - (long int)kernel::np/2 + 1);}
} }
for (size_t j = 0 ; j < kernel::np ; j++) for (size_t j = 0 ; j < kernel::np ; j++)
{ {
for (size_t i = 0 ; i < vector::dims ; i++) for (size_t i = 0 ; i < vector::dims ; i++)
a[i][j] = kernel::value(x[i][j],j); {a[i][j] = kernel::value(x[i][j],j);}
} }
calculate_aint<vector::dims,vector,kernel::np>::value(sz,a_int,a); calculate_aint<vector::dims,vector,kernel::np>::value(sz,a_int,a);
......
Markdown is supported
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