Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NWCHEM: added keyword dft to xc_functionals list. If method == "dft" #204

Merged
merged 8 commits into from
Dec 20, 2019

Conversation

ahurta92
Copy link
Contributor

Description

NWChem: added "dft" to list of exchange functionals. If method == "dft" let exchange functional be handled by keywords. Works with mixed functionals like "xc becke88 lyp". This doesn't deal with cases like 'dft__xc': 'xc vwn_1_rpa 0.19 lyp 0.81 HFexch 0.20 slater 0.80 becke88 nonlocal 0.72'.

Changelog description

NWChem: added "dft" to list of exchange functionals and let xc option be handled by keywords

Status

  • Code base linted
  • Ready to go

@codecov
Copy link

codecov bot commented Dec 18, 2019

Codecov Report

Merging #204 into master will increase coverage by 1.59%.
The diff coverage is n/a.

@@ -174,7 +175,8 @@ def muster_modelchem(method: str, derint: int, use_tce: bool) -> Tuple[str, Dict
)

elif method in _xc_functionals:
opts["dft__xc"] = method
if method != "dft":
opts["dft__xc"] = method
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A slight comment here, we may want to consider reordering this so that the for looks more like the following:

elif method in _xc_functionals:
...
elif method == "dft":
....

This keeps the _xc_functionals list "pure" which may make a difference down the road. There is some duplicate use_tce commands however, but may be worth it.

@@ -181,6 +181,9 @@ def muster_modelchem(method: str, derint: int, use_tce: bool) -> Tuple[str, Dict
else:
mdccmd = f"task dft {runtyp}\n\n"

elif method == "dft":
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need the same use_tce part as above?

@dgasmith dgasmith merged commit 5edba6b into MolSSI:master Dec 20, 2019
muammar added a commit to muammar/QCEngine that referenced this pull request Jan 9, 2020
* master: (29 commits)
  CI for NWChem (MolSSI#212)
  Make sure input extras tags get to the output
  Added NWChem to the canonical harness tests
  Calls to rtdb must use all threads
  Remove assumption that NWChem uses original order of atoms
  Fixed test for cores_per_rank
  Correctly determine memory sizes, when MPI should be used
  Account for cores_per_rank when computing total ranks
  Added a more difficult test for the nwchem hessian
  Read hessian array in proper order
  Use pep8 variable names
  Rotate gradients and hessian to match input molecule
  Linted with black
  Added Hessian support and improved gradient accuracy
  Allow for methods that are combinations of several functionals
  psi4 windows version and outfile psiapi mode (MolSSI#201)
  NWCHEM:  added keyword dft to xc_functionals list.  If method == "dft" (MolSSI#204)
  entos: Updated QCER hash and program_overview.rst
  black reformatting
  entos: AO reordering added to unrestricted wavefunction properties
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants