Commit 0bd3857f authored by Pietro Incardona's avatar Pietro Incardona

Fixing image generation

parent e6a85d31
...@@ -18,6 +18,10 @@ All notable changes to this project will be documented in this file. ...@@ -18,6 +18,10 @@ All notable changes to this project will be documented in this file.
### Changed ### Changed
### Known Bugs
- On gcc 6.1 the project does not compile
- Distributed grids on 1D do not work
## [0.4.0] - 26-05-2016 ## [0.4.0] - 26-05-2016
......
This diff is collapsed.
This diff is collapsed.
...@@ -4,10 +4,10 @@ from paraview.simple import * ...@@ -4,10 +4,10 @@ from paraview.simple import *
paraview.simple._DisableFirstRenderCameraReset() paraview.simple._DisableFirstRenderCameraReset()
# create a new 'CSV Reader' # create a new 'CSV Reader'
vector_move0_1csv = CSVReader(FileName=['Vector/vector_move0_1.csv']) vector_move0_1csv = CSVReader(FileName=['Vector/vector_move_0_1.csv'])
# create a new 'CSV Reader' # create a new 'CSV Reader'
vector_move1_1csv = CSVReader(FileName=['Vector/vector_move1_1.csv']) vector_move1_1csv = CSVReader(FileName=['Vector/vector_move_1_1.csv'])
# get active view # get active view
renderView1 = GetActiveViewOrCreate('RenderView') renderView1 = GetActiveViewOrCreate('RenderView')
...@@ -143,10 +143,10 @@ glyph1Display = Show(glyph1, renderView1) ...@@ -143,10 +143,10 @@ glyph1Display = Show(glyph1, renderView1)
glyph1Display.SetScalarBarVisibility(renderView1, True) glyph1Display.SetScalarBarVisibility(renderView1, True)
# create a new 'CSV Reader' # create a new 'CSV Reader'
vector_move_before_map0_2csv = CSVReader(FileName=['Vector/vector_move_before_map0_2.csv']) vector_move_before_map0_2csv = CSVReader(FileName=['Vector/vector_move_before_map_0_2.csv'])
# create a new 'CSV Reader' # create a new 'CSV Reader'
vector_move_before_map1_2csv = CSVReader(FileName=['Vector/vector_move_before_map1_2.csv']) vector_move_before_map1_2csv = CSVReader(FileName=['Vector/vector_move_before_map_1_2.csv'])
# create a new 'Table To Points' # create a new 'Table To Points'
tableToPoints3 = TableToPoints(Input=vector_move_before_map0_2csv) tableToPoints3 = TableToPoints(Input=vector_move_before_map0_2csv)
...@@ -204,10 +204,10 @@ SetActiveSource(glyph2) ...@@ -204,10 +204,10 @@ SetActiveSource(glyph2)
glyph2.GlyphMode = 'All Points' glyph2.GlyphMode = 'All Points'
# create a new 'CSV Reader' # create a new 'CSV Reader'
vector_move1_2csv = CSVReader(FileName=['Vector/vector_move1_2.csv']) vector_move1_2csv = CSVReader(FileName=['Vector/vector_move_1_2.csv'])
# create a new 'CSV Reader' # create a new 'CSV Reader'
vector_move0_2csv = CSVReader(FileName=['Vector/vector_move0_2.csv']) vector_move0_2csv = CSVReader(FileName=['Vector/vector_move_0_2.csv'])
# create a new 'Table To Points' # create a new 'Table To Points'
tableToPoints5 = TableToPoints(Input=vector_move1_2csv) tableToPoints5 = TableToPoints(Input=vector_move1_2csv)
......
...@@ -85,9 +85,9 @@ int main(int argc, char* argv[]) ...@@ -85,9 +85,9 @@ int main(int argc, char* argv[])
++it; ++it;
} }
vd.write("Vector/vector_move_before_map",i); vd.write("Vector/vector_move_before_map",i,CSV_WRITER);
vd.map(); vd.map();
vd.write("Vector/vector_move",i); vd.write("Vector/vector_move",i,CSV_WRITER);
} }
openfpm_finalize(); openfpm_finalize();
......
...@@ -4,7 +4,7 @@ from paraview.simple import * ...@@ -4,7 +4,7 @@ from paraview.simple import *
paraview.simple._DisableFirstRenderCameraReset() paraview.simple._DisableFirstRenderCameraReset()
# create a new 'CSV Reader' # create a new 'CSV Reader'
vector_before_map0csv = CSVReader(FileName=['Vector/vector_before_map0.csv']) vector_before_map0csv = CSVReader(FileName=['Vector/vector_before_map_0.csv'])
# get active view # get active view
renderView1 = GetActiveViewOrCreate('RenderView') renderView1 = GetActiveViewOrCreate('RenderView')
...@@ -29,7 +29,7 @@ tableToPoints1Display.ColorArrayName = [None, ''] ...@@ -29,7 +29,7 @@ tableToPoints1Display.ColorArrayName = [None, '']
tableToPoints1Display.SetRepresentationType('Points') tableToPoints1Display.SetRepresentationType('Points')
# create a new 'CSV Reader' # create a new 'CSV Reader'
vector_before_map1csv = CSVReader(FileName=['Vector/vector_before_map1.csv']) vector_before_map1csv = CSVReader(FileName=['Vector/vector_before_map_1.csv'])
# set active view # set active view
SetActiveView(renderView1) SetActiveView(renderView1)
...@@ -52,7 +52,7 @@ tableToPoints2Display.SetRepresentationType('Points') ...@@ -52,7 +52,7 @@ tableToPoints2Display.SetRepresentationType('Points')
tableToPoints2Display.AmbientColor = [0.0, 1.0, 0.0] tableToPoints2Display.AmbientColor = [0.0, 1.0, 0.0]
# create a new 'CSV Reader' # create a new 'CSV Reader'
vector_before_map2csv = CSVReader(FileName=['Vector/vector_before_map2.csv']) vector_before_map2csv = CSVReader(FileName=['Vector/vector_before_map_2.csv'])
# set active view # set active view
SetActiveView(renderView1) SetActiveView(renderView1)
...@@ -105,7 +105,7 @@ Delete(vector_before_map2csv) ...@@ -105,7 +105,7 @@ Delete(vector_before_map2csv)
del vector_before_map2csv del vector_before_map2csv
# create a new 'CSV Reader' # create a new 'CSV Reader'
vector_before_map0csv = CSVReader(FileName=['Vector/vector_after_map0.csv']) vector_before_map0csv = CSVReader(FileName=['Vector/vector_after_map_0.csv'])
# get active view # get active view
renderView1 = GetActiveViewOrCreate('RenderView') renderView1 = GetActiveViewOrCreate('RenderView')
...@@ -130,7 +130,7 @@ tableToPoints1Display.ColorArrayName = [None, ''] ...@@ -130,7 +130,7 @@ tableToPoints1Display.ColorArrayName = [None, '']
tableToPoints1Display.SetRepresentationType('Points') tableToPoints1Display.SetRepresentationType('Points')
# create a new 'CSV Reader' # create a new 'CSV Reader'
vector_before_map1csv = CSVReader(FileName=['Vector/vector_after_map1.csv']) vector_before_map1csv = CSVReader(FileName=['Vector/vector_after_map_1.csv'])
# set active view # set active view
SetActiveView(renderView1) SetActiveView(renderView1)
...@@ -153,7 +153,7 @@ tableToPoints2Display.SetRepresentationType('Points') ...@@ -153,7 +153,7 @@ tableToPoints2Display.SetRepresentationType('Points')
tableToPoints2Display.AmbientColor = [0.0, 1.0, 0.0] tableToPoints2Display.AmbientColor = [0.0, 1.0, 0.0]
# create a new 'CSV Reader' # create a new 'CSV Reader'
vector_before_map2csv = CSVReader(FileName=['Vector/vector_after_map2.csv']) vector_before_map2csv = CSVReader(FileName=['Vector/vector_after_map_2.csv'])
# set active view # set active view
SetActiveView(renderView1) SetActiveView(renderView1)
......
...@@ -4,7 +4,7 @@ from paraview.simple import * ...@@ -4,7 +4,7 @@ from paraview.simple import *
paraview.simple._DisableFirstRenderCameraReset() paraview.simple._DisableFirstRenderCameraReset()
# create a new 'CSV Reader' # create a new 'CSV Reader'
vector_ghost_fill = CSVReader(FileName=['Vector/vector_ghost_fill0.csv']) vector_ghost_fill = CSVReader(FileName=['Vector/vector_ghost_fill_0.csv'])
# get animation scene # get animation scene
animationScene1 = GetAnimationScene() animationScene1 = GetAnimationScene()
...@@ -69,7 +69,7 @@ Delete(vect_decompositionexternal_ghost_0vtk) ...@@ -69,7 +69,7 @@ Delete(vect_decompositionexternal_ghost_0vtk)
del vect_decompositionexternal_ghost_0vtk del vect_decompositionexternal_ghost_0vtk
# create a new 'CSV Reader' # create a new 'CSV Reader'
vector_after_map0csv = CSVReader(FileName=['Vector/vector_after_map0.csv']) vector_after_map0csv = CSVReader(FileName=['Vector/vector_after_map_0.csv'])
# Create a new 'SpreadSheet View' # Create a new 'SpreadSheet View'
spreadSheetView1 = CreateView('SpreadSheetView') spreadSheetView1 = CreateView('SpreadSheetView')
......
...@@ -4,7 +4,7 @@ from paraview.simple import * ...@@ -4,7 +4,7 @@ from paraview.simple import *
paraview.simple._DisableFirstRenderCameraReset() paraview.simple._DisableFirstRenderCameraReset()
# create a new 'CSV Reader' # create a new 'CSV Reader'
vector_before_map0csv = CSVReader(FileName=['Vector/vector_before_map0.csv']) vector_before_map0csv = CSVReader(FileName=['Vector/vector_before_map_0.csv'])
# get active view # get active view
renderView1 = GetActiveViewOrCreate('RenderView') renderView1 = GetActiveViewOrCreate('RenderView')
...@@ -29,7 +29,7 @@ tableToPoints1Display.ColorArrayName = [None, ''] ...@@ -29,7 +29,7 @@ tableToPoints1Display.ColorArrayName = [None, '']
tableToPoints1Display.SetRepresentationType('Points') tableToPoints1Display.SetRepresentationType('Points')
# create a new 'CSV Reader' # create a new 'CSV Reader'
vector_before_map1csv = CSVReader(FileName=['Vector/vector_before_map1.csv']) vector_before_map1csv = CSVReader(FileName=['Vector/vector_before_map_1.csv'])
# set active view # set active view
SetActiveView(renderView1) SetActiveView(renderView1)
...@@ -52,7 +52,7 @@ tableToPoints2Display.SetRepresentationType('Points') ...@@ -52,7 +52,7 @@ tableToPoints2Display.SetRepresentationType('Points')
tableToPoints2Display.AmbientColor = [1.0, 1.0, 1.0] tableToPoints2Display.AmbientColor = [1.0, 1.0, 1.0]
# create a new 'CSV Reader' # create a new 'CSV Reader'
vector_before_map2csv = CSVReader(FileName=['Vector/vector_before_map2.csv']) vector_before_map2csv = CSVReader(FileName=['Vector/vector_before_map_2.csv'])
# set active view # set active view
SetActiveView(renderView1) SetActiveView(renderView1)
...@@ -103,7 +103,7 @@ Delete(vector_before_map2csv) ...@@ -103,7 +103,7 @@ Delete(vector_before_map2csv)
del vector_before_map2csv del vector_before_map2csv
# create a new 'CSV Reader' # create a new 'CSV Reader'
vector_before_map0csv = CSVReader(FileName=['Vector/vector_after_map0.csv']) vector_before_map0csv = CSVReader(FileName=['Vector/vector_after_map_0.csv'])
# get active view # get active view
renderView1 = GetActiveViewOrCreate('RenderView') renderView1 = GetActiveViewOrCreate('RenderView')
...@@ -128,7 +128,7 @@ tableToPoints1Display.ColorArrayName = [None, ''] ...@@ -128,7 +128,7 @@ tableToPoints1Display.ColorArrayName = [None, '']
tableToPoints1Display.SetRepresentationType('Points') tableToPoints1Display.SetRepresentationType('Points')
# create a new 'CSV Reader' # create a new 'CSV Reader'
vector_before_map1csv = CSVReader(FileName=['Vector/vector_after_map1.csv']) vector_before_map1csv = CSVReader(FileName=['Vector/vector_after_map_1.csv'])
# set active view # set active view
SetActiveView(renderView1) SetActiveView(renderView1)
...@@ -151,7 +151,7 @@ tableToPoints2Display.SetRepresentationType('Points') ...@@ -151,7 +151,7 @@ tableToPoints2Display.SetRepresentationType('Points')
tableToPoints2Display.AmbientColor = [1.0, 1.0, 1.0] tableToPoints2Display.AmbientColor = [1.0, 1.0, 1.0]
# create a new 'CSV Reader' # create a new 'CSV Reader'
vector_before_map2csv = CSVReader(FileName=['Vector/vector_after_map2.csv']) vector_before_map2csv = CSVReader(FileName=['Vector/vector_after_map_2.csv'])
# set active view # set active view
SetActiveView(renderView1) SetActiveView(renderView1)
......
...@@ -4,7 +4,7 @@ from paraview.simple import * ...@@ -4,7 +4,7 @@ from paraview.simple import *
paraview.simple._DisableFirstRenderCameraReset() paraview.simple._DisableFirstRenderCameraReset()
# create a new 'CSV Reader' # create a new 'CSV Reader'
vector_before_map0csv = CSVReader(FileName=['Vector/vector_before_map0.csv']) vector_before_map0csv = CSVReader(FileName=['Vector/vector_before_map_0.csv'])
# get active view # get active view
renderView1 = GetActiveViewOrCreate('RenderView') renderView1 = GetActiveViewOrCreate('RenderView')
......
...@@ -1841,7 +1841,7 @@ public: ...@@ -1841,7 +1841,7 @@ public:
// CSVWriter test // CSVWriter test
CSVWriter<openfpm::vector<Point<dim, St>>, openfpm::vector<prop> > csv_writer; CSVWriter<openfpm::vector<Point<dim, St>>, openfpm::vector<prop> > csv_writer;
std::string output = std::to_string(out + std::to_string(v_cl.getProcessUnitID()) + "_" + std::to_string(iteration) + std::to_string(".csv")); std::string output = std::to_string(out + "_" + std::to_string(v_cl.getProcessUnitID()) + "_" + std::to_string(iteration) + std::to_string(".csv"));
// Write the CSV // Write the CSV
return csv_writer.write(output, v_pos, v_prp); return csv_writer.write(output, v_pos, v_prp);
......
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