Skip to content

Commit

Permalink
Merge pull request #116 from TheoChem-VU/115-deprecate-adfjobscf_conv…
Browse files Browse the repository at this point in the history
…ergence

115 deprecate adfjobscf convergence
  • Loading branch information
SEBeutick authored Feb 6, 2024
2 parents 80aca05 + 6c81699 commit 33ec052
Showing 1 changed file with 18 additions and 2 deletions.
20 changes: 18 additions & 2 deletions src/tcutility/job/adf.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ def __init__(self, *args, **kwargs):
self.solvent('vacuum')
self.basis_set('TZ2P')
self.quality('Good')
self.SCF_convergence(1e-8)
self.SCF(thresh=1e-8)
self.single_point()

def __str__(self):
Expand Down Expand Up @@ -94,8 +94,23 @@ def SCF_convergence(self, thresh: float = 1e-8):
Args:
thresh: the convergence criteria for the SCF procedure. Defaults to 1e-8.
.. deprecated:: 0.9.2
Please use :meth:`ADFJob.SCF` instead of this method.
'''
log.warn('This method has been deprecated, please use ADFJob.SCF instead.')
self.SCF(thresh=thresh)

def SCF(self, iterations: int = 300, thresh: float = 1e-8):
'''
Set the SCF settings for this calculations.
Args:
iterations: number of iterations to perform for this calculation. Defaults to 300.
thresh: the convergence criteria for the SCF procedure. Defaults to 1e-8.
'''
self.settings.input.adf.SCF.converge = thresh
self.settings.input.adf.SCF.Iterations = iterations
self.settings.input.adf.SCF.Converge = thresh

def functional(self, funtional_name: str, dispersion: str = None):
'''
Expand Down Expand Up @@ -348,5 +363,6 @@ def run(self):
job.sbatch(p='tc', ntasks_per_node=15)
job.solvent('')
job.basis_set('tz2p')
job.SCF_convergence(1e-10)
job.quality('veryGood')
job.functional('LYP-D3BJ')

0 comments on commit 33ec052

Please sign in to comment.