tuse "png" gnuplot terminal by default, fix PHONY makefile target - Granular.jl - Julia package for granular dynamics simulation
(HTM) git clone git://src.adamsgaard.dk/Granular.jl
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) README
(DIR) LICENSE
---
(DIR) commit c48addad81b25ae643e2d198d96bee7b161ce47b
(DIR) parent 05f958f204e5f1c0a7b127c0c7df87cbb6050dc2
(HTM) Author: Anders Damsgaard <andersd@riseup.net>
Date: Fri, 17 Nov 2017 17:21:13 -0500
use "png" gnuplot terminal by default, fix PHONY makefile target
Diffstat:
M Makefile | 2 +-
M src/grain.jl | 4 ++--
M test/grain.jl | 14 ++++++--------
3 files changed, 9 insertions(+), 11 deletions(-)
---
(DIR) diff --git a/Makefile b/Makefile
t@@ -7,7 +7,7 @@ test: test-julia-0.6 test-julia-0.7
test-julia-0.6:
julia --color=yes -e 'Pkg.test("Granular")'
-.PHONY: test-julia-0.6
+.PHONY: test-julia-0.7
test-julia-0.7:
julia-0.7 --color=yes -e 'Pkg.test("Granular")'
(DIR) diff --git a/src/grain.jl b/src/grain.jl
t@@ -744,8 +744,8 @@ function plotGrainSizeDistribution(simulation::Simulation;
nbins::Int=12,
size_type::String = "contact",
figsize::Tuple = (6,4),
- filetype::String = "pdf",
- gnuplot_terminal::String = "pdfcairo",
+ filetype::String = "png",
+ gnuplot_terminal::String = "png",
verbose::Bool = true,
skip_fixed::Bool = true,
log_y::Bool = false,
(DIR) diff --git a/test/grain.jl b/test/grain.jl
t@@ -32,18 +32,16 @@ Granular.compareGrains(sim.grains[1], sim.grains[2])
info("Testing GSD plotting ")
Granular.plotGrainSizeDistribution(sim)
-@test isfile("test-grain-size-distribution.pdf")
-rm("test-grain-size-distribution.pdf")
-Granular.plotGrainSizeDistribution(sim, filetype="png",
- gnuplot_terminal="pngcairo")
+@test isfile("test-grain-size-distribution.png")
+rm("test-grain-size-distribution.png")
@test isfile("test-grain-size-distribution.png")
rm("test-grain-size-distribution.png")
Granular.plotGrainSizeDistribution(sim, skip_fixed=false)
-@test isfile("test-grain-size-distribution.pdf")
-rm("test-grain-size-distribution.pdf")
+@test isfile("test-grain-size-distribution.png")
+rm("test-grain-size-distribution.png")
Granular.plotGrainSizeDistribution(sim, size_type="areal")
-@test isfile("test-grain-size-distribution.pdf")
-rm("test-grain-size-distribution.pdf")
+@test isfile("test-grain-size-distribution.png")
+rm("test-grain-size-distribution.png")
@test_throws ErrorException Granular.plotGrainSizeDistribution(sim, size_type="asdf")
info("Testing external body force routines")