tchange handling of Homebrew and WinRPM packages - 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 03e8bbf1609a3c7ad00bec79310c58e24c574e7b
(DIR) parent 76b9af233ee0645d46dc296fef27158599c492b1
(HTM) Author: Anders Damsgaard <andersd@riseup.net>
Date: Fri, 17 Nov 2017 17:49:19 -0500
change handling of Homebrew and WinRPM packages
Diffstat:
A deps/build.jl | 15 +++++++++++++++
M src/Granular.jl | 13 -------------
M src/grain.jl | 10 ++++++++++
3 files changed, 25 insertions(+), 13 deletions(-)
---
(DIR) diff --git a/deps/build.jl b/deps/build.jl
t@@ -0,0 +1,15 @@
+#!/usr/bin/env julia
+using Compat
+
+if is_apple()
+ using Homebrew
+ Homebrew.add("gnuplot")
+ Homebrew.add("imagemagick")
+end
+
+if is_windows()
+ using WinRPM
+ WinRPM.install("gnuplot")
+ WinRPM.install("imagemagick")
+end
+
(DIR) diff --git a/src/Granular.jl b/src/Granular.jl
t@@ -1,17 +1,4 @@
#!/usr/bin/env julia
-
-if is_apple()
- using Homebrew
- Homebrew.add("gnuplot")
- Homebrew.add("imagemagick")
-end
-
-if is_windows()
- using WinRPM
- WinRPM.install("gnuplot")
- WinRPM.install("imagemagick")
-end
-
"""
# Granular.jl
Offline granular dynamics simulator module.
(DIR) diff --git a/src/grain.jl b/src/grain.jl
t@@ -1,6 +1,16 @@
## Manage grains in the model
+
using Compat.Test
+# load Homebrew/WinRPM for gnuplot and imagemagick
+if is_apple()
+ using Homebrew
+end
+
+if is_windows()
+ using WinRPM
+end
+
export addGrainCylindrical!
"""
function addGrainCylindrical!(simulation, lin_pos, contact_radius,