Skip to content

Commit

Permalink
Fix * imports and class docs
Browse files Browse the repository at this point in the history
  • Loading branch information
jochym committed Jan 6, 2016
1 parent 53d6f70 commit e8799e6
Showing 1 changed file with 10 additions and 3 deletions.
13 changes: 10 additions & 3 deletions parcalc/parcalc.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@

from __future__ import print_function, division

from ase.calculators.vasp import *
from ase.calculators.siesta import *
from ase.calculators.vasp import Vasp
from ase.calculators.siesta import Siesta
from queue import Empty
from multiprocessing import Process, Queue

Expand All @@ -58,6 +58,9 @@
from subprocess import check_output

class _NonBlockingRunException(Exception):
'''
Internal exception. Should never be propagated outside.
'''
def __str__(self):
return '''The __NonBlockingRunException should be caught inside
the calculator class. If you got it outside it is a bug.
Expand All @@ -66,6 +69,10 @@ def __str__(self):
from traceback import print_stack

class _workdir:
'''
Context menager for executing commands in some working directory.
Returns to the previous wd when finished.
'''
def __init__(self,wd):
self.wd=wd

Expand Down Expand Up @@ -260,7 +267,7 @@ def get_potential_energy(self, atoms):
Siesta.get_potential_energy(self, atoms)

def clean(self):
Siesta.converged = False
self.converged = False
return

verbose=True
Expand Down

0 comments on commit e8799e6

Please sign in to comment.