Determine discrete velocities of D2Q9 and D3Q27

3 files changed, 10 insertions, 12 deletions

diff --git a/symbolic/D2Q9.py b/symbolic/D2Q9.py
index 9693477..e3ac9de 100644
--- a/symbolic/D2Q9.py
+++ b/symbolic/D2Q9.py
@@ -1,6 +1,7 @@
-from sympy import *
+from sympy import Matrix
+from itertools import product
 
-q = 9
 d = 2
+q = 9
 
-c = [ Matrix(x) for x in [(-1, 1), ( 0, 1), ( 1, 1), (-1, 0), ( 0, 0), ( 1, 0), (-1,-1), ( 0, -1), ( 1, -1)] ]
+c = [ Matrix(x) for x in product([-1,0,1], repeat=d) ]
diff --git a/symbolic/D3Q19.py b/symbolic/D3Q19.py
index 4e84908..e9e6eec 100644
--- a/symbolic/D3Q19.py
+++ b/symbolic/D3Q19.py
@@ -1,7 +1,7 @@
-from sympy import *
+from sympy import Matrix, Rational, sqrt
 
-q = 19
 d = 3
+q = 19
 
 c = [ Matrix(x) for x in [
     ( 0, 1, 1), (-1, 0, 1), ( 0, 0, 1), ( 1, 0, 1), ( 0, -1, 1),
diff --git a/symbolic/D3Q27.py b/symbolic/D3Q27.py
index d63aad8..6fb1f80 100644
--- a/symbolic/D3Q27.py
+++ b/symbolic/D3Q27.py
@@ -1,10 +1,7 @@
-from sympy import *
+from sympy import Matrix
+from itertools import product
 
-q = 27
 d = 3
+q = 27
 
-c = [ Matrix(x) for x in [
-    (-1, 1, 1), ( 0, 1, 1), ( 1, 1, 1), (-1, 0, 1), ( 0, 0, 1), ( 1, 0, 1), (-1,-1, 1), ( 0, -1, 1), ( 1, -1, 1),
-    (-1, 1, 0), ( 0, 1, 0), ( 1, 1, 0), (-1, 0, 0), ( 0, 0, 0), ( 1, 0, 0), (-1,-1, 0), ( 0, -1, 0), ( 1, -1, 0),
-    (-1, 1,-1), ( 0, 1,-1), ( 1, 1,-1), (-1, 0,-1), ( 0, 0,-1), ( 1, 0,-1), (-1,-1,-1), ( 0, -1,-1), ( 1, -1,-1)
-]]
+c = [ Matrix(x) for x in product([-1,0,1], repeat=d) ]