Merge pull request #183 from psnbaba/gtvf

added set wall velocity before CE solids
pypr · Mar 13, 2019 · 9b075eb · 9b075eb
2 parents 1bf42fd + e5a5966
commit 9b075eb
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/pysph/sph/wc/gtvf.py b/pysph/sph/wc/gtvf.py
@@ -590,7 +590,14 @@ def get_equations(self):
         )
         all = self.fluids + self.solids
 
-        eq1, stage1 = [], []
+        stage1 = []
+        if self.solids:
+            eq0 = []
+            for solid in self.solids:
+                eq0.append(SetWallVelocity(dest=solid, sources=self.fluids))
+            stage1.append(Group(equations=eq0, real=False))
+
+        eq1 = []
         for fluid in self.fluids:
             eq1.append(ContinuityEquationGTVF(dest=fluid, sources=self.fluids))
             if self.solids:
@@ -615,7 +622,6 @@ def get_equations(self):
         g2_s = []
         for solid in self.solids:
             g2_s.append(VolumeSummation(dest=solid, sources=all))
-            g2_s.append(SetWallVelocity(dest=solid, sources=self.fluids))
             g2_s.append(SolidWallPressureBC(
                 dest=solid, sources=self.fluids, b=1.0, rho0=self.rho0,
                 p0=self.pref, gx=self.gx, gy=self.gy, gz=self.gz