diff --git a/Meshes/single_drop_1_5.geo b/Meshes/single_drop_1_5.geo index 4f2513bf1a4e8917960e015cd6e150a86366f139..d0f3b3dc2513e31dc37ba22291d3d739fd8e50eb 100644 --- a/Meshes/single_drop_1_5.geo +++ b/Meshes/single_drop_1_5.geo @@ -5,7 +5,7 @@ Physical Surface("surfacedomain") = {1}; Physical Volume("volumedomain") = {1}; Field[3] = MathEval; -Field[3].F = ".25 - (.25-0.01)*exp(-(1./0.025) *((sqrt((x-4)*(x-4)+(y-4)*(y-4)+(z-1.5)*(z-1.5))-0.25))*((sqrt((x-4)*(x-4)+(y-4)*(y-4)+(z-1.5)*(z-1.5))-0.25)))"; +Field[3].F = ".25 - (.24)*exp(-(1./0.25) *((sqrt((x-4)*(x-4)+(y-4)*(y-4)+(z-1.5)*(z-1.5))-0.25))*((sqrt((x-4)*(x-4)+(y-4)*(y-4)+(z-1.5)*(z-1.5))-0.25)))"; Field[8] = Min; Field[8].FieldsList = {3}; diff --git a/Plots_Droplet_FRAP.ipynb b/Plots_Droplet_FRAP.ipynb index 18f75a2763fe03a52ea0285a57ecd6bb0c225773..c10bb9ceab73e2af7e804664ec171daea83da780 100644 --- a/Plots_Droplet_FRAP.ipynb +++ b/Plots_Droplet_FRAP.ipynb @@ -225,8 +225,8 @@ "outputs": [], "source": [ "# Define parameters for all simulations\n", - "point_list = [[4, 4, 0.5], [4, 4, 1.5], [4, 4, 4],\n", - " [4, 4, 0.5], [4, 4, 1.5], [4, 4, 4]]\n", + "point_list = [[4, 4, 0.25], [4, 4, 1.5], [4, 4, 4],\n", + " [4, 4, 0.25], [4, 4, 1.5], [4, 4, 4]]\n", "me = ['coverslip.xml', '1_5.xml', 'symmetric.xml',\n", " 'coverslip.xml', '1_5.xml', 'symmetric.xml']\n", "phi_tot_int = [.99, .99, .99, .9, .9, .9]\n", @@ -236,12 +236,13 @@ "f_cs = []\n", "\n", "# Zip all parameters, iterate\n", - "for p, m, p_i, p_e, G_i, G_o in zip(point_list, me, phi_tot_int,\n", - " phi_tot_ext, G_in, G_out):\n", - " f_cs.append(frap_solver(p, 'Meshes/single_drop_'+m,\n", - " name='FRAP_'+m[:-4]+str(G_i), T=60, phi_tot_int=p_i,\n", - " phi_tot_ext=p_e, G_in=G_i, G_out=G_o))\n", - " f_cs[-1].solve_frap()" + "for p, m, p_i, p_e, G_i, G_o, i in zip(point_list, me, phi_tot_int,\n", + " phi_tot_ext, G_in, G_out, range(len(me))):\n", + " if i in [0, 1, 2, 3, 4, 5]:\n", + " f_cs.append(frap_solver(p, 'Meshes/single_drop_'+m,\n", + " name='FRAP_'+m[:-4]+str(G_i), T=240, phi_tot_int=p_i, dt=0.02,\n", + " phi_tot_ext=p_e, G_in=G_i, G_out=G_o))\n", + " f_cs[-1].solve_frap()" ] }, { @@ -250,14 +251,14 @@ "metadata": {}, "outputs": [], "source": [ - "z = [0.5, 1.5, 4, 0.5, 1.5, 4]\n", + "z = [0.25, 1.5, 4, 0.25, 1.5, 4]\n", "profs_cs = []\n", "for i, z_i in enumerate(z):\n", " profs_cs.append([])\n", - " for j in range(50):\n", + " for j in range(240):\n", " values=[]\n", - " fs = fem_utils.load_time_point(f_cs[i].name+'t_p_'+str(j)+'.h5',\n", - " f_cs[i].mesh)\n", + " fs = fem_utils.load_time_point('FRAP_coverslip/' + f_cs[i].name+\n", + " 't_p_'+str(j)+'.h5', f_cs[i].mesh)\n", " for n in ns:\n", " values.append([fs([4, 4, z_i]+e*n) for e in eps])\n", " profs_cs[i].append(np.mean(np.transpose(values), 1))"