Commit 5b3fd9bd authored by incardon's avatar incardon

Latest modules

parent 3eb1564c
......@@ -2,22 +2,22 @@
parallel (
"gin" : {node ('gin')
"cifarm-ubuntu-node" : {node ('cifarm-ubuntu-node')
{
deleteDir()
checkout scm
stage ('build_gin')
stage ('build ubuntu')
{
sh "./build.sh $WORKSPACE $NODE_NAME pdata full && make install"
}
stage ('run_example_gin')
stage ('run example ubuntu')
{
sh "export PATH=\"/usr/local/binutils/bin/:$PATH\" && source $HOME/openfpm_vars_master && cd example && make"
}
}},
"sb15" : {node ('sbalzarini-mac-15')
"cifarm-mac-node" : {node ('cifarm-mac-node')
{
deleteDir()
checkout scm
......@@ -32,6 +32,23 @@ parallel (
sh "source $HOME/openfpm_vars_master && cd example && make"
}
}
},
"cifarm-centos-node" : {node ('cifarm-centos-node')
{
deleteDir()
checkout scm
stage ('build centos')
{
sh "./build.sh $WORKSPACE $NODE_NAME pdata full && make install"
}
stage ('run example centos')
{
sh "export PATH=\"/usr/local/binutils/bin/:$PATH\" && source $HOME/openfpm_vars_master && cd example && make"
}
}},
)
......@@ -87,7 +87,7 @@ int main(int argc, char* argv[])
// and non-periodic boundary conditions
//
openfpm_init(&argc,&argv);
Vcluster & v_cl = create_vcluster();
Vcluster<> & v_cl = create_vcluster();
size_t bc[1]={NON_PERIODIC};
Ghost<1,double> g(12*eps);
......
......@@ -210,7 +210,7 @@ int main(int argc, char* argv[])
// and non-periodic boundary conditions
//
openfpm_init(&argc,&argv);
Vcluster & v_cl = create_vcluster();
Vcluster<> & v_cl = create_vcluster();
size_t bc[1]={NON_PERIODIC};
Ghost<1,double> g(12*eps);
......
......@@ -189,7 +189,7 @@ template<typename grid> void calc_and_print_max_div_and_int(grid & g_vort)
++it5;
}
Vcluster & v_cl = create_vcluster();
Vcluster<> & v_cl = create_vcluster();
v_cl.max(max_vort);
v_cl.sum(int_vort[0]);
v_cl.sum(int_vort[1]);
......@@ -760,7 +760,7 @@ void comp_vel(Box<3,float> & domain, grid_type & g_vort,grid_type & g_vel, petsc
solError serr;
serr = solver.get_residual_error(phi_s[i],b);
Vcluster & v_cl = create_vcluster();
Vcluster<> & v_cl = create_vcluster();
if (v_cl.getProcessUnitID() == 0)
{std::cout << "Solved component " << i << " Error: " << serr.err_inf << std::endl;}
......@@ -1117,7 +1117,7 @@ template<typename vector, typename grid> void check_point_and_save(vector & part
grid & g_dvort,
size_t i)
{
Vcluster & v_cl = create_vcluster();
Vcluster<> & v_cl = create_vcluster();
if (v_cl.getProcessingUnits() < 24)
{
......@@ -1215,7 +1215,7 @@ int main(int argc, char* argv[])
Vector<double,PETSC_BASE> x_;
// Parallel object
Vcluster & v_cl = create_vcluster();
Vcluster<> & v_cl = create_vcluster();
// print out the spacing of the grid
if (v_cl.getProcessUnitID() == 0)
......
......@@ -44,15 +44,27 @@ constexpr int z = 2;
constexpr unsigned int phi = 0;
// The type of the grids
typedef grid_dist_id<3,float,aggregate<float[3]>,CartDecomposition<3,float,HeapMemory,SpaceDistribution<3,float>>> grid_type;
typedef grid_dist_id<3,float,aggregate<float[3]>,CartDecomposition<3,float,HeapMemory,memory_traits_lin,SpaceDistribution<3,float>>> grid_type;
// The type of the grids
typedef grid_dist_id<3,float,aggregate<float>,CartDecomposition<3,float,HeapMemory,SpaceDistribution<3,float>>> grid_type_s;
typedef grid_dist_id<3,float,aggregate<float>,CartDecomposition<3,float,HeapMemory,memory_traits_lin,SpaceDistribution<3,float>>> grid_type_s;
// The type of the particles
typedef vector_dist<3,float,aggregate<float[3],float[3],float[3],float[3],float[3]>,memory_traits_lin<aggregate<float[3],float[3],float[3],float[3],float[3]>>::type,memory_traits_lin,CartDecomposition<3,float,HeapMemory,SpaceDistribution<3,float>>> particles_type;
typedef vector_dist<3,float,aggregate<float>,memory_traits_lin<aggregate<float>>::type,memory_traits_lin,CartDecomposition<3,float,HeapMemory,SpaceDistribution<3,float>>> particles_type_s;
typedef vector_dist<3,
float,
aggregate<float[3],float[3],float[3],float[3],float[3]>,
CartDecomposition<3,float,HeapMemory,
memory_traits_lin,SpaceDistribution<3,float>>,
HeapMemory,
memory_traits_lin> particles_type;
typedef vector_dist<3,
float,
aggregate<float>,
CartDecomposition<3,float,HeapMemory,
memory_traits_lin,SpaceDistribution<3,float>>,
HeapMemory,
memory_traits_lin> particles_type_s;
// radius of the torus
float ringr1 = 1.0;
......@@ -112,7 +124,7 @@ template<typename grid> void calc_and_print_max_div_and_int(grid & g_vort)
++it5;
}
Vcluster & v_cl = create_vcluster();
Vcluster<> & v_cl = create_vcluster();
v_cl.max(max_vort);
v_cl.sum(int_vort[0]);
v_cl.sum(int_vort[1]);
......@@ -202,7 +214,7 @@ struct poisson_nn_helm
const bool poisson_nn_helm::boundary[] = {PERIODIC,PERIODIC,PERIODIC};
void helmotz_hodge_projection(grid_dist_id<3,float,aggregate<float>,CartDecomposition<3,float,HeapMemory,SpaceDistribution<3,float>>> & psi,
void helmotz_hodge_projection(grid_dist_id<3,float,aggregate<float>,CartDecomposition<3,float,HeapMemory,memory_traits_lin,SpaceDistribution<3,float>>> & psi,
FDScheme<poisson_nn_helm> & fd,
grid_type & gr,
const Box<3,float> & domain,
......
openfpm_numerics @ e9a2083b
Subproject commit 33821d701496cf6e418b43e9011b542e337cb324
Subproject commit e9a2083b6c4d9ce84519bc8163fbff032db4ff1c
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