Commit ca2becb0 authored by Pietro Incardona's avatar Pietro Incardona
Browse files

Small changes

parent 088fa4a3
SUBDIRS = src SUBDIRS = src
bin_PROGRAMS = bin_PROGRAMS =
\ No newline at end of file
test:
cd src && make test
...@@ -15,3 +15,7 @@ Plot/GoogleChart.hpp Plot/util.hpp ...@@ -15,3 +15,7 @@ Plot/GoogleChart.hpp Plot/util.hpp
.cu.o : .cu.o :
$(NVCC) $(NVCCFLAGS) -o $@ -c $< $(NVCC) $(NVCCFLAGS) -o $@ -c $<
test: io
source $(HOME)/openfpm_vars && cd .. && ./src/io
...@@ -204,7 +204,7 @@ class VTKWriter<pair,VECTOR_GRIDS> ...@@ -204,7 +204,7 @@ class VTKWriter<pair,VECTOR_GRIDS>
{ {
Point<pair::first::dims,typename pair::second> p; Point<pair::first::dims,typename pair::second> p;
p = it.get().toPoint(); p = it.get().toPoint();
p = p * vg.get(i).spacing + vg.get(i).offset; p = pmul(p,vg.get(i).spacing) + vg.get(i).offset;
if (pair::first::dims == 2) if (pair::first::dims == 2)
v_out << p.toString() << " 0.0" << "\n"; v_out << p.toString() << " 0.0" << "\n";
......
...@@ -249,14 +249,14 @@ class VTKWriter<pair,VECTOR_ST_GRIDS> ...@@ -249,14 +249,14 @@ class VTKWriter<pair,VECTOR_ST_GRIDS>
Point<pair::first::dims,typename pair::second> one; Point<pair::first::dims,typename pair::second> one;
one.one(); one.one();
one = one + toPoint<pair::first::dims,typename pair::second>::convert(vg.get(i).g.get(j).cmb); one = one + toPoint<pair::first::dims,typename pair::second>::convert(vg.get(i).g.get(j).cmb);
Point<pair::first::dims,typename pair::second> offset = middle * one + vg.get(i).offset; Point<pair::first::dims,typename pair::second> offset = pmul(middle,one) + vg.get(i).offset;
// if there is the next element // if there is the next element
while (it.isNext()) while (it.isNext())
{ {
Point<pair::first::dims,typename pair::second> p; Point<pair::first::dims,typename pair::second> p;
p = it.get().toPoint(); p = it.get().toPoint();
p = p * vg.get(i).spacing + offset; p = pmul(p,vg.get(i).spacing) + offset;
if (pair::first::dims == 2) if (pair::first::dims == 2)
v_out << p.toString() << " 0.0" << "\n"; v_out << p.toString() << " 0.0" << "\n";
......
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