testcase drop

testcases/goutte/liqDrop.py

@@ -37,7 +37,7 @@ ii = 0
 
 
 #physical parameters
-g = 0# -9.81                
+g =  0#-9.81                
 rhof = 1030                                      # fluid density
 rhop = 2450                                     # grains density
 r=154e-6                                        # grains radii
@@ -63,7 +63,7 @@ def outerBndV(x) :
     print(.4*max(np.sin(t*np.pi*2./1),0))
     return 0.4*max(np.sin(t*np.pi*2./1),0)
 
-fluid = fluid.FluidProblem(2,g,[num*rhom,nuf*rhof],[rhom,rhof],coeff_stab=1e-6)
+fluid = fluid.FluidProblem(2,g,[nuf*rhof,num*rhom],[rhof,rhom],coeff_stab=1e-6)
 fluid.load_msh("mesh.msh")
 fluid.set_wall_boundary("Bottom")
 fluid.set_wall_boundary("Lateral")
@@ -76,15 +76,13 @@ c = np.ndarray((fluid.n_nodes()))
 x = fluid.coordinates()
 
 c[:] = 0
-c[np.logical_and(np.abs(x[:,0])< R,np.abs(x[:,1])<R)] = 1
-#for i in range(len(x[:,0])):
-#    z = (x[i,0])**2+(x[i,1])**2
-#    R1 = (0.7*R)**2
-#    R2 = (1.3*R)**2
+#c[np.logical_and(np.abs(x[:,0])< R,np.abs(x[:,1])<R)] = 1
+for i in range(len(x[:,0])):
+    z = (x[i,0])**2+(x[i,1])**2
+    R1 = (0.7*R)**2
+    R2 = (1.3*R)**2
 #    #s[i,1] = -0.01
-#    c[i] = min(max(0,1/(R1-R2)*z-R2/(R1-R2)),1)
-#    c[: ] 
-#    c[i] = np.where(np.abs(x[i,0] < R)
+    c[i] = min(max(0,1/(R2-R1)*z-R1/(R2-R1)),1)
 
 fluid.set_concentration_cg(c)