From 2d39e5e28abc33c3675f0bf67f1397ed01244f53 Mon Sep 17 00:00:00 2001
From: Lars Hubatsch <hubatsch@pks.mpg.de>
Date: Tue, 22 Sep 2020 21:58:05 +0200
Subject: [PATCH] WIP: trying to decide which forms to use.

---
 FloryHugg_DiffUnbleached.ipynb | 44 +++++++++++++++++-----------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/FloryHugg_DiffUnbleached.ipynb b/FloryHugg_DiffUnbleached.ipynb
index fec750d..b8ed007 100644
--- a/FloryHugg_DiffUnbleached.ipynb
+++ b/FloryHugg_DiffUnbleached.ipynb
@@ -32,28 +32,28 @@
     "#     X.interpolate(df.Expression('x[0]', degree=1))\n",
     "    if sym == 0:\n",
     "    # Weak form 1D:\n",
-    "        form = ((df.inner((c-c0)/dt, tc) +\n",
-    "             df.inner(df.grad(c), df.grad((1-c_tot)*Ga0*tc))) -\n",
-    "             df.inner(df.grad(c_tot), df.grad((1-c_tot)*Ga0/c_tot*c*tc))-\n",
-    "             tc*df.inner(df.grad(c), df.grad((1-c_tot)*Ga0))+\n",
-    "             tc*df.inner(df.grad(c_tot), df.grad((1-c_tot)/c_tot*c*Ga0))) * df.dx\n",
+    "#         form = (df.inner((c-c0)/dt, tc) +\n",
+    "#              df.inner(df.grad(c), df.grad((1-c_tot)*Ga0*tc)) -\n",
+    "#              df.inner(df.grad(c_tot), df.grad((1-c_tot)*Ga0/c_tot*c*tc))-\n",
+    "#              tc*df.inner(df.grad(c), df.grad((1-c_tot)*Ga0))+\n",
+    "#              tc*df.inner(df.grad(c_tot), df.grad((1-c_tot)/c_tot*c*Ga0))) * df.dx\n",
+    "#     # Weak form 1D short:\n",
+    "        form = (df.inner((c-c0)/dt, tc) +\n",
+    "                df.inner((1-c_tot)*Ga0*(df.grad(c)-c/c_tot*df.grad(c_tot)),\n",
+    "                          df.grad(tc))) * df.dx\n",
     "    elif sym == 2:\n",
     "    # Weak form radial symmetry:\n",
-    "        form = ((df.inner((c-c0)/dt, tc*X[0]*X[0]) +\n",
-    "             df.inner(df.grad(c), df.grad((1-c_tot)*Ga0*tc*X[0]*X[0]))) -\n",
-    "             df.inner(df.grad(c_tot), df.grad((1-c_tot)*Ga0/c_tot*c*tc*X[0]*X[0]))-\n",
-    "             tc*df.inner(df.grad(c), df.grad((1-c_tot)*Ga0*X[0]*X[0]))+\n",
-    "             tc*df.inner(df.grad(c_tot), df.grad((1-c_tot)/c_tot*c*Ga0*X[0]*X[0]))-\n",
-    "             (1-c_tot)*Ga0*2*X[0]*c.dx(0)*tc+\n",
-    "             (1-c_tot)*Ga0/c_tot*c*2*X[0]*c_tot.dx(0)*tc) * df.dx\n",
-    "  # Weak form radial symmetry:\n",
-    "#     form = ((df.inner((c-c0)/dt, tc*X[0]*X[0]) +\n",
-    "#              df.inner(df.grad(c), df.grad((1-c_tot+Ga0*c_tot*c_tot)*tc*X[0]*X[0]))) -\n",
-    "#              df.inner(df.grad(c_tot), df.grad((1-c_tot+Ga0*c_tot*c_tot)/c_tot*c*tc*X[0]*X[0]))-\n",
-    "#              tc*df.inner(df.grad(c), df.grad((1-c_tot+Ga0*c_tot*c_tot)*X[0]*X[0]))+\n",
-    "#              tc*df.inner(df.grad(c_tot), df.grad((1-c_tot+Ga0*c_tot*c_tot)/c_tot*c*X[0]*X[0]))-\n",
-    "#              (1-c_tot+Ga0*c_tot*c_tot)*2*X[0]*c.dx(0)*tc+\n",
-    "#              (1-c_tot+Ga0*c_tot*c_tot)/c_tot*c*2*X[0]*c_tot.dx(0)*tc) * df.dx\n",
+    "#         form = (df.inner((c-c0)/dt, tc*X[0]*X[0]) +\n",
+    "#              df.inner(df.grad(c), df.grad((1-c_tot)*Ga0*tc*X[0]*X[0])) -\n",
+    "#              df.inner(df.grad(c_tot), df.grad((1-c_tot)*Ga0/c_tot*c*tc*X[0]*X[0]))-\n",
+    "#              tc*df.inner(df.grad(c), df.grad((1-c_tot)*Ga0*X[0]*X[0]))+\n",
+    "#              tc*df.inner(df.grad(c_tot), df.grad((1-c_tot)/c_tot*c*Ga0*X[0]*X[0]))-\n",
+    "#              (1-c_tot)*Ga0*2*X[0]*c.dx(0)*tc+\n",
+    "#              (1-c_tot)*Ga0/c_tot*c*2*X[0]*c_tot.dx(0)*tc) * df.dx\n",
+    "#     # Weak form radial symmetry:\n",
+    "        form = (df.inner((c-c0)/dt, tc*X[0]**2) +\n",
+    "                df.inner((1-c_tot)*Ga0*(df.grad(c)-c/c_tot*df.grad(c_tot)),\n",
+    "                         df.grad(tc)*X[0]**2)) * df.dx\n",
     "    \n",
     "    t = 0\n",
     "    # Solve in time\n",
@@ -92,8 +92,8 @@
     "c0_9 = create_func(F, 'x[0]<0.1 ? 0 :'+p_tot(0.9, 0.1), 1)\n",
     "Ga0_9 = create_func(F,p_tot(1, 1), 1)\n",
     "\n",
-    "c0_1 = calc_sim(c0_1, c_tot_1, Ga0_1, 0.001, 10, 0)\n",
-    "c0_9 = calc_sim(c0_9, c_tot_9, Ga0_9, 0.001, 10, 0)"
+    "c0_1 = calc_sim(c0_1, c_tot_1, Ga0_1, 0.001, 10, 2)\n",
+    "c0_9 = calc_sim(c0_9, c_tot_9, Ga0_9, 0.001, 10, 2)"
    ]
   },
   {
-- 
GitLab