Skip to content

Commit 7e5bf8a

Browse files
committed
Updated orbital notebook and bugfixes to gaussian
1 parent 39eb5b0 commit 7e5bf8a

6 files changed

Lines changed: 331 additions & 664 deletions

File tree

docs/source/notebooks/03_orbitals.ipynb

Lines changed: 177 additions & 233 deletions
Large diffs are not rendered by default.

docs/source/notebooks/water-demo.ipynb

Lines changed: 0 additions & 298 deletions
This file was deleted.

exatomic/algorithms/basis.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -297,13 +297,12 @@ def evaluate(self, xs=None, ys=None, zs=None, irrep=None, verbose=False):
297297
if self._meta['gaussian']:
298298
if self._meta.get('symmetrized', False):
299299
func = self._evaluate_gau_bso_sym
300-
elif self._meta['program'] in ['nwchem']:
301-
func = self._evaluate_gau_bso
302300
elif self._meta['program'] in ['molcas']:
303301
func = self._evaluate_gau_mag
302+
else:
303+
func = self._evaluate_gau_bso
304304
else:
305305
func = self._evaluate_sto
306-
# if verbose: print('calling {}'.format(func.__name__))
307306
return func(xs=xs, ys=ys, zs=zs, irrep=irrep)
308307

309308

exatomic/base.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import os
99
from exa.util import isotopes
1010
from platform import system
11+
from IPython.display import display_html
1112

1213
# For numba compiled functions
1314
sysname= system().lower()
@@ -69,3 +70,10 @@ def list_resources():
6970
for path, _, files_ in os.walk(staticdir()):
7071
files.extend(files_)
7172
return files
73+
74+
75+
def display_side_by_side(*args):
76+
"""Simple function to display 2 dataframes side by side in a notebook."""
77+
html_str = ''.join([df.to_html() for df in args])
78+
display_html(html_str.replace('table','table style=\"display:inline\"'),
79+
raw=True)

exatomic/core/universe.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ def enumerate_shells(self, frame=0):
204204
frame (int): state of the universe (default 0)
205205
"""
206206
atom = self.atom.groupby('frame').get_group(frame)
207-
if self.meta['program'] not in ['molcas', 'adf', 'nwchem']:
207+
if self.meta['program'] not in ['molcas', 'adf', 'nwchem', 'gaussian']:
208208
print('Warning: Check spherical shell parameter for {} '
209209
'molecular orbital generation'.format(self.meta['program']))
210210
shls = self.basis_set.shells(self.meta['program'],

0 commit comments

Comments
 (0)