Skip to content

Commit

Permalink
Finished clearing output from MP2 module.
Browse files Browse the repository at this point in the history
  • Loading branch information
dsirianni committed Feb 17, 2017
1 parent f2ff4bb commit 4512c7e
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 66 deletions.
49 changes: 12 additions & 37 deletions Interactive-Tutorials/05_Moller-Plesset/5a_conventional-mp2.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
},
{
"cell_type": "code",
"execution_count": 2,
"execution_count": null,
"metadata": {
"collapsed": true
},
Expand All @@ -105,7 +105,7 @@
},
{
"cell_type": "code",
"execution_count": 3,
"execution_count": null,
"metadata": {
"collapsed": true
},
Expand Down Expand Up @@ -136,7 +136,7 @@
},
{
"cell_type": "code",
"execution_count": 4,
"execution_count": null,
"metadata": {
"collapsed": true
},
Expand All @@ -155,7 +155,7 @@
},
{
"cell_type": "code",
"execution_count": 5,
"execution_count": null,
"metadata": {
"collapsed": true
},
Expand All @@ -181,20 +181,11 @@
},
{
"cell_type": "code",
"execution_count": 6,
"execution_count": null,
"metadata": {
"collapsed": false
},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
"\n",
"Size of the ERI tensor will be 0.00 GB.\n"
]
}
],
"outputs": [],
"source": [
"# ==> ERIs <==\n",
"# Create instance of MintsHelper class\n",
Expand Down Expand Up @@ -242,7 +233,7 @@
},
{
"cell_type": "code",
"execution_count": 7,
"execution_count": null,
"metadata": {
"collapsed": true
},
Expand All @@ -264,19 +255,11 @@
},
{
"cell_type": "code",
"execution_count": 8,
"execution_count": null,
"metadata": {
"collapsed": false
},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
"Do our transformed ERIs match Psi4's? True\n"
]
}
],
"outputs": [],
"source": [
"# ==> Compare our Imo to MintsHelper <==\n",
"Co = scf_wfn.Ca_subset('AO','OCC')\n",
Expand Down Expand Up @@ -316,7 +299,7 @@
},
{
"cell_type": "code",
"execution_count": 9,
"execution_count": null,
"metadata": {
"collapsed": false
},
Expand All @@ -336,19 +319,11 @@
},
{
"cell_type": "code",
"execution_count": 10,
"execution_count": null,
"metadata": {
"collapsed": false
},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
"\tMP2 Energy........................................................PASSED\n"
]
}
],
"outputs": [],
"source": [
"# ==> Compare to Psi4 <==\n",
"psi4.driver.p4util.compare_values(psi4.energy('mp2'), MP2_E, 6, 'MP2 Energy')"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
},
{
"cell_type": "code",
"execution_count": 1,
"execution_count": null,
"metadata": {
"collapsed": true
},
Expand All @@ -37,7 +37,7 @@
},
{
"cell_type": "code",
"execution_count": 2,
"execution_count": null,
"metadata": {
"collapsed": false
},
Expand Down Expand Up @@ -85,7 +85,7 @@
},
{
"cell_type": "code",
"execution_count": 5,
"execution_count": null,
"metadata": {
"collapsed": false
},
Expand Down Expand Up @@ -127,7 +127,7 @@
},
{
"cell_type": "code",
"execution_count": 6,
"execution_count": null,
"metadata": {
"collapsed": false
},
Expand Down Expand Up @@ -172,23 +172,11 @@
},
{
"cell_type": "code",
"execution_count": 1,
"execution_count": null,
"metadata": {
"collapsed": false
},
"outputs": [
{
"ename": "NameError",
"evalue": "name 'e_ab' is not defined",
"output_type": "error",
"traceback": [
"\u001b[0;31m---------------------------------------------------------------------------\u001b[0m",
"\u001b[0;31mNameError\u001b[0m Traceback (most recent call last)",
"\u001b[0;32m<ipython-input-1-8caf388a074f>\u001b[0m in \u001b[0;36m<module>\u001b[0;34m()\u001b[0m\n\u001b[1;32m 1\u001b[0m \u001b[0;31m# ==> Build VV Epsilon Tensor <==\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0;32m----> 2\u001b[0;31m \u001b[0me_vv\u001b[0m \u001b[0;34m=\u001b[0m \u001b[0me_ab\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0mreshape\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m-\u001b[0m\u001b[0;36m1\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0;36m1\u001b[0m\u001b[0;34m)\u001b[0m \u001b[0;34m+\u001b[0m \u001b[0me_ab\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m",
"\u001b[0;31mNameError\u001b[0m: name 'e_ab' is not defined"
]
}
],
"outputs": [],
"source": [
"# ==> Build VV Epsilon Tensor <==\n",
"e_vv = e_ab.reshape(-1, 1) + e_ab"
Expand All @@ -213,7 +201,7 @@
},
{
"cell_type": "code",
"execution_count": 74,
"execution_count": null,
"metadata": {
"collapsed": false
},
Expand Down Expand Up @@ -255,19 +243,11 @@
},
{
"cell_type": "code",
"execution_count": 75,
"execution_count": null,
"metadata": {
"collapsed": false
},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
"\tMP2 Energy........................................................PASSED\n"
]
}
],
"outputs": [],
"source": [
"# ==> Compare to Psi4 <==\n",
"psi4.driver.p4util.compare_values(psi4.energy('mp2'), MP2_E, 6, 'MP2 Energy')"
Expand Down

0 comments on commit 4512c7e

Please sign in to comment.