Skip to content

Commit 58f899d

Browse files
author
Dou Du
committed
fix the pseudopotential bugs
1 parent 2d5aadb commit 58f899d

File tree

1 file changed

+39
-28
lines changed

1 file changed

+39
-28
lines changed

notebook/band-theory/pseudopotential.ipynb

+39-28
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,9 @@
277277
{
278278
"cell_type": "code",
279279
"execution_count": null,
280-
"metadata": {},
280+
"metadata": {
281+
"scrolled": true
282+
},
281283
"outputs": [],
282284
"source": [
283285
"img = plt.figure(tight_layout=True, figsize=(9,9))\n",
@@ -395,13 +397,13 @@
395397
" x1 = np.arange(0, 50.0, 0.01)\n",
396398
" y1 = rf(x1)*x1\n",
397399
" line_rho.set_data([x1, y1])\n",
398-
" line_rc1.set_data(s_rc.value, [-1, 1])\n",
400+
" line_rc1.set_data([s_rc.value], [-1, 1])\n",
399401
" ann_rc.set_position((s_rc.value + 1.0, rf(s_rc.value)*s_rc.value))\n",
400402
"\n",
401403
" x2 = np.arange(0, 50.0, 0.01)\n",
402404
" y2 = (rf(x2)*x2)**2\n",
403405
" line_rho2.set_data([x2, y2])\n",
404-
" line_rc2.set_data(s_rc.value, [-1, 1])\n",
406+
" line_rc2.set_data([s_rc.value], [-1, 1])\n",
405407
" ann_rc2.set_position((s_rc.value + 1.0, (rf(s_rc.value)*s_rc.value)**2))\n",
406408
" \n",
407409
"\n",
@@ -420,17 +422,19 @@
420422
" line_logdr_ps.set_data([],[])\n",
421423
" \n",
422424
" # line_logdr_rho.set_data([x3, y3])\n",
423-
" line_rc3.set_data(s_rc.value, [-1, 1])\n",
424-
" line_rc4.set_data(s_rc.value, [-1, 1])\n",
425+
" line_rc3.set_data([s_rc.value], [-1, 1])\n",
426+
" line_rc4.set_data([s_rc.value], [-1, 1])\n",
425427
"\n",
426428
" ann_rc2.set_position((s_rc.value + 1.0, (rf(s_rc.value)*s_rc.value)**2))\n",
427429
" \n",
428-
" \n",
429-
"\n",
430-
" ax1.collections.clear()\n",
431-
" ax2.collections.clear()\n",
432-
" ax3.collections.clear()\n",
430+
" for line in ax1.collections:\n",
431+
" line.remove()\n",
432+
" \n",
433+
" for line in ax2.collections:\n",
434+
" line.remove()\n",
433435
"\n",
436+
" for line in ax3.collections:\n",
437+
" line.remove()\n",
434438
"\n",
435439
" ax2.fill_between(x2, y2, 0, where=x2<s_rc.value, facecolor='yellow', alpha=0.5)\n",
436440
" ax1.hlines(0, 0, 50, 'k','--')\n",
@@ -440,8 +444,8 @@
440444
" line_pswf2.set_data([],[])\n",
441445
"\n",
442446
" line_psv.set_data([],[])\n",
443-
" point.set_data(s_rc.value, rf(s_rc.value)*s_rc.value)\n",
444-
" point2.set_data(s_rc.value, (rf(s_rc.value)*s_rc.value)**2)\n",
447+
" point.set_data([s_rc.value], [rf(s_rc.value)*s_rc.value])\n",
448+
" point2.set_data([s_rc.value], [(rf(s_rc.value)*s_rc.value)**2])\n",
445449
"\n",
446450
" ax1.set_ylim([y1.min()-0.04, y1.max()+0.04])\n",
447451
" ax2.set_ylim([y2.min()-0.04, y2.max()+0.04])\n",
@@ -466,24 +470,31 @@
466470
" x2 = np.arange(0, 50.0, 0.01)\n",
467471
" y2 = (rf(x2)*x2)**2\n",
468472
" \n",
469-
" line_rc1.set_data(s_rc.value, [-1, 1])\n",
470-
" line_rc2.set_data(s_rc.value, [-1, 1])\n",
471-
" line_rc3.set_data(s_rc.value, [-1, 1])\n",
472-
" line_rc4.set_data(s_rc.value, [-1, 1])\n",
473+
" line_rc1.set_data([s_rc.value], [-1, 1])\n",
474+
" line_rc2.set_data([s_rc.value], [-1, 1])\n",
475+
" line_rc3.set_data([s_rc.value], [-1, 1])\n",
476+
" line_rc4.set_data([s_rc.value], [-1, 1])\n",
473477
"\n",
474478
" ann_rc.set_position((s_rc.value + 1.0, rf(s_rc.value)*s_rc.value))\n",
475-
" ax1.collections.clear()\n",
476-
" ax2.collections.clear()\n",
477-
" ax3.collections.clear()\n",
479+
" \n",
480+
" for line in ax1.collections:\n",
481+
" line.remove()\n",
482+
" \n",
483+
" for line in ax2.collections:\n",
484+
" line.remove()\n",
485+
"\n",
486+
" for line in ax3.collections:\n",
487+
" line.remove()\n",
478488
"\n",
479489
"\n",
480490
" ax2.fill_between(x2, y2, 0, where=x2<s_rc.value, facecolor='yellow', alpha=0.5)\n",
481491
" ax2.hlines(0, 0, 50, 'k','--')\n",
482492
" line_pswf.set_data([],[])\n",
483493
" line_pswf2.set_data([],[])\n",
484494
" line_psv.set_data([],[])\n",
485-
" point.set_data(s_rc.value, rf(s_rc.value)*s_rc.value)\n",
486-
" point2.set_data(s_rc.value, (rf(s_rc.value)*s_rc.value)**2)\n",
495+
" point.set_data([s_rc.value], rf(s_rc.value)*s_rc.value)\n",
496+
" point2.set_data([s_rc.value], (rf(s_rc.value)*s_rc.value)**2)\n",
497+
" ax1.hlines(0, 0, 50, 'k','--')\n",
487498
"\n",
488499
" clear_texts()\n",
489500
" \n",
@@ -583,8 +594,8 @@
583594
" # x3 = np.linspace(0, rc, 800);\n",
584595
" x3 = np.arange(0, 50.0, 0.01)\n",
585596
"\n",
586-
" line_pswf.set_data(x1, psf(x1));\n",
587-
" line_pswf2.set_data(x2, psf2(x2));\n",
597+
" line_pswf.set_data([x1], [psf(x1)]);\n",
598+
" line_pswf2.set_data([x2], [psf2(x2)]);\n",
588599
"\n",
589600
" ax2.fill_between(x2, psf2(x2), 0, where=x2<s_rc.value, facecolor='green', alpha=0.5)\n",
590601
" \n",
@@ -595,10 +606,10 @@
595606
" logr = diff(ho, r).subs(r, rc).evalf()/ho.subs(r, rc).evalf()\n",
596607
" \n",
597608
" \n",
598-
" line_logdr_rho.set_data(x3,logr_r(x3))\n",
599-
" line_logdr_ps.set_data(x3,logl_r(x3))\n",
609+
" line_logdr_rho.set_data([x3],[logr_r(x3)])\n",
610+
" line_logdr_ps.set_data([x3],[logl_r(x3)])\n",
600611
" \n",
601-
" point3.set_data(s_rc.value, logr_r(s_rc.value))\n",
612+
" point3.set_data([s_rc.value], [logr_r(s_rc.value)])\n",
602613
" ann_rc3.remove()\n",
603614
" ann_rc3 = ax3.annotate(\"$R_c$\", xy=(s_rc.value + 1.0,logr_r(s_rc.value)) , fontsize=20)\n",
604615
" # ann_rc3.set_position((s_rc.value + 1.0,logr_r(s_rc.value)))\n",
@@ -640,7 +651,7 @@
640651
" \n",
641652
" x1 = np.linspace(0.001, rc, 800);\n",
642653
" x2 = np.linspace(rc, 50, 800);\n",
643-
" line_psv.set_data(np.concatenate((x1,x2)), np.concatenate((psfnl(x1),psfnr(x2))));\n",
654+
" line_psv.set_data([np.concatenate((x1,x2))], [np.concatenate((psfnl(x1),psfnr(x2)))]);\n",
644655
" ax4.set_ylim([psfnl(x1).min(axis=0)-0.05, max(psfnl(x1).max(axis=0)+0.1, 0.05)])\n",
645656
"\n",
646657
"def compute_pseudopotential(c):\n",
@@ -733,7 +744,7 @@
733744
"name": "python",
734745
"nbconvert_exporter": "python",
735746
"pygments_lexer": "ipython3",
736-
"version": "3.9.12"
747+
"version": "3.11.7"
737748
},
738749
"voila": {
739750
"authors": "Dou Du and Giovanni Pizzi"

0 commit comments

Comments
 (0)