minor

rajeshrinet · Mar 26, 2024 · f2dcc05 · f2dcc05
1 parent d3dab39
commit f2dcc05
Show file tree

Hide file tree

Showing 12 changed files with 87 additions and 29 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -29,6 +29,6 @@ jobs:
         run: python setup.py install 
 
       - name: Test pystokes
-        run: cd tests && python shortTests.py
+        run: cd tests && python test_short.pyx
 
 
diff --git a/.github/workflows/run_notebooks.yml b/.github/workflows/run_notebooks.yml
@@ -25,4 +25,4 @@ jobs:
         run: python setup.py install 
 
       - name: Test example notebooks
-        run: cd tests && python shortTests.py
+        run: cd tests && python test_notebooks.py
diff --git a/README.md b/README.md
@@ -86,14 +86,14 @@ Test installation and running
 
 ```bash
 >> cd tests
->> python shortTests.py
+>> python test_short.py
 ```
 
 Long test of example notebooks 
 
 ```bash
 >> cd tests
->> python notebookTests.py
+>> python test_notebooks.py
 ```
 
 

diff --git a/examples/ex1-unboundedFlow.ipynb b/examples/ex1-unboundedFlow.ipynb
diff --git a/examples/ex2-flowPlaneSurface.ipynb b/examples/ex2-flowPlaneSurface.ipynb
diff --git a/examples/ex3-crystalNucleation.ipynb b/examples/ex3-crystalNucleation.ipynb
diff --git a/examples/ex4-crystallization.ipynb b/examples/ex4-crystallization.ipynb
diff --git a/examples/ex5-phoreticField.ipynb b/examples/ex5-phoreticField.ipynb
diff --git a/pystokes/__init__.py b/pystokes/__init__.py
@@ -6,7 +6,9 @@
 import pystokes.wallBounded
 import pystokes.forceFields
 import pystokes.phoretic.unbounded
-import pystokes.phoretic.wallBounded
+import pystokes.phoretic.wallBounded 
+import pystokes.power.unbounded
+import pystokes.power.wallBounded
 
 
 

diff --git a/pystokes/utils.pyx b/pystokes/utils.pyx
@@ -386,7 +386,7 @@ def plotStreamlinesYZ(vv, rr, r, density=0.795, arrowSize=1.2, mask=0.6, ms=36,
             ss[1, ii]      = 1*(0 + j)
     plt.streamplot(yy, zz, vy, vz, color="black", arrowsize =arrowSize, arrowstyle='->', start_points=ss.T, density=density, zorder=1)
     for i in range(N):
-        ax.add_patch(patches.Circle((r[i],r[i+N]),1,color='k',alpha=1))
+        ax.add_patch(patches.Circle((r[i],r[i+2*N]),1,color='k',alpha=1))
 
     plt.xlim(np.min(yy), np.max(yy))
     plt.ylim(np.min(zz), np.max(zz))
@@ -489,7 +489,7 @@ def plotContoursYZ(vv, rr, r, density=1.2, arrowSize=1.2, mask=0.6, ms=36, offse
         plt.title(title, fontsize=26);
 
     for i in range(N):
-        ax.add_patch(patches.Circle((r[i],r[i+N]),1,color='k',alpha=1))
+        ax.add_patch(patches.Circle((r[i],r[i+2*N]),1,color='k',alpha=1))
 
 
 
@@ -518,7 +518,7 @@ def plotContoursYZsurf(vv, rr, r, density=1.2, arrowSize=1.2, mask=0.6, ms=36, o
     plt.axhspan(-ww, ww, facecolor='black');
     plt.axis('off')
     for i in range(N):
-        ax.add_patch(patches.Circle((r[i],r[i+N]),1,color='k',alpha=1))
+        ax.add_patch(patches.Circle((r[i],r[i+2*N]),1,color='k',alpha=1))
 
 
     if title==str('None'):

diff --git a/tests/notebookTests.py → tests/test_notebooks.py b/tests/notebookTests.py → tests/test_notebooks.py
diff --git a/tests/shortTests.py → tests/test_short.py b/tests/shortTests.py → tests/test_short.py