-
Notifications
You must be signed in to change notification settings - Fork 81
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
running Madness with QCengine #242
Open
ahurta92
wants to merge
126
commits into
MolSSI:master
Choose a base branch
from
ahurta92:MADNESS
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 119 commits
Commits
Show all changes
126 commits
Select commit
Hold shift + click to select a range
8e34efc
Merge pull request #6 from ahurta92/adrian-Dipole
ahurta92 00de251
Formating and added preceding 0
ahurta92 e5f3c63
Merge branch 'master' of https://github.com/ahurta92/QCEngine
ahurta92 ab8ec4c
Merge remote-tracking branch 'upstream/master'
ahurta92 f59dbc9
add madness dir
ahurta92 f368814
init madness dir
ahurta92 8d7ac78
changin base and test to add madness
ahurta92 eb0bc38
Add madnessHarness to qca
ahurta92 e695d7d
first attempt at get_version
ahurta92 fb3570a
Got a version of get_version that may work
ahurta92 7d6a24a
simple build_input
ahurta92 b83169e
simple execuate function
ahurta92 3a00543
add madness pytest dft w/ xc hf
ahurta92 61cfa4a
updating
ahurta92 4a05965
got variables for scf calculation
ahurta92 82352ff
add gopts method to germinate
ahurta92 18b721a
added h20MAD for debuggin I think I can get rid of this
ahurta92 43ec24a
pytest passed madness with h20()
ahurta92 0e7668c
split output by Converged! STILL Need to read format stuff
ahurta92 98e0f4c
wrote compute, fix mol.keywords, wrote parse_output
ahurta92 70b0c15
make format
ahurta92 61bbf8e
alphabetize
ahurta92 2c28fb6
which madness and use helium for command
ahurta92 b9d24a2
add scratch_directory to input for execute
ahurta92 b1b05fc
the quadrupole work should have been in a different branch
ahurta92 2e6c2fc
added k=7 to keywords of test. k=7 is a default but its okay to define
ahurta92 7c4f2d8
limit to collecting qc vars in results.py
ahurta92 0312265
return scf_exchange_correlation
ahurta92 4eb4a75
Add none
ahurta92 8e73a4f
make format
ahurta92 379c96f
move madness test into separate file
ahurta92 dfe6afd
got rid of stuff from nwchem
ahurta92 5829ad4
format
ahurta92 d6a83d6
add madness dir
ahurta92 f16796d
init madness dir
ahurta92 bfa4c55
changin base and test to add madness
ahurta92 4c306e8
Add madnessHarness to qca
ahurta92 739c5b5
first attempt at get_version
ahurta92 e2d83be
Got a version of get_version that may work
ahurta92 9d4c5f0
simple build_input
ahurta92 103c031
simple execuate function
ahurta92 e9d8f3c
add madness pytest dft w/ xc hf
ahurta92 1373f71
updating
ahurta92 0cba478
got variables for scf calculation
ahurta92 8b20a74
add gopts method to germinate
ahurta92 41e0149
added h20MAD for debuggin I think I can get rid of this
ahurta92 0574ffe
pytest passed madness with h20()
ahurta92 56ffcf5
split output by Converged! STILL Need to read format stuff
ahurta92 b6c21cb
wrote compute, fix mol.keywords, wrote parse_output
ahurta92 8b93e47
make format
ahurta92 9d8c950
alphabetize
ahurta92 f5bb2d8
which madness and use helium for command
ahurta92 acc9bda
add scratch_directory to input for execute
ahurta92 98f59be
the quadrupole work should have been in a different branch
ahurta92 38aa762
added k=7 to keywords of test. k=7 is a default but its okay to define
ahurta92 19f002e
limit to collecting qc vars in results.py
ahurta92 eb21253
return scf_exchange_correlation
ahurta92 32fce65
Add none
ahurta92 eabe89d
make format
ahurta92 f18a0de
move madness test into separate file
ahurta92 f4f89f9
got rid of stuff from nwchem
ahurta92 a30be69
format
ahurta92 19baac9
Merge branch 'MADNESS' of https://github.com/ahurta92/QCEngine into M…
ahurta92 1d33d2b
get rid of extra arguments
ahurta92 4a316f2
Merge branch 'master' into MADNESS
ahurta92 20be271
make format
ahurta92 0357d40
remove some imports and format
ahurta92 5df4552
Merge branch 'master' of https://github.com/MolSSI/QCEngine into MADNESS
ahurta92 82d110b
add @using("madness") to madness test
ahurta92 100656e
qca looks for moldft executable for scf calculations
ahurta92 a7d86eb
debugging madness harvester...split by "Converged!"
ahurta92 5a10bf5
trying to debug harvester...Converged!
ahurta92 e937e62
using moldft executable...it's easier for now
ahurta92 c632313
change test values to reflect changes in master madness
ahurta92 6eb6491
Merge branch 'MADNESS' of https://github.com/ahurta92/QCEngine into M…
ahurta92 afd940b
Getting rid of debugging print statemtments
ahurta92 b87a7a8
Merge branch 'master' of https://github.com/MolSSI/QCEngine into MADNESS
ahurta92 72e3ec5
Merge pull request #7 from MolSSI/master
ahurta92 af74ce2
Merge branch 'MADNESS' into master
ahurta92 f8b64bf
Merge pull request #8 from ahurta92/master
ahurta92 00a4974
Merge branch 'MADNESS' of https://github.com/ahurta92/QCEngine into M…
ahurta92 f8e70ca
formatting
ahurta92 f250cff
comments- don't use mpi command as default
ahurta92 53fc940
add lda to list of functionals
ahurta92 cc9c9b4
Merge branch 'master' of https://github.com/MolSSI/QCEngine into MADNESS
ahurta92 09f55e3
Merge branch 'master' of github.com:MolSSI/QCEngine
ahurta92 5243a46
Merge branch 'master' of https://github.com/MolSSI/QCEngine
ahurta92 69c3cd0
black formatting
ahurta92 c073146
Merge branch 'master' of https://github.com/MolSSI/QCEngine
ahurta92 8479cf8
Get runner.py to read moldft using new format
ahurta92 4699aa1
read new moldft output
ahurta92 1ebe945
Set up initial molresponse runner.
ahurta92 9085d52
Run black
ahurta92 835920b
Add initial molresponse test
ahurta92 e85db37
Add initial molresponse runner and test
ahurta92 7e74828
black formatting
ahurta92 240f48f
harvest using the new scf_info and calcinfo json files
ahurta92 3a35cc9
build input can now deal with geomtry related keywords like "eprec"
ahurta92 924ffb1
Update germinate.py
ahurta92 16b0182
We now use json files to read output
ahurta92 921ad3d
Merge master into MADNESS branch
ahurta92 a980001
formatting
ahurta92 59acb7e
Merge remote-tracking branch 'upstream/master' into MADNESS
ahurta92 508cabe
Merge remote-tracking branch 'upstream/master' into MADNESS
ahurta92 f89847c
some additions
ahurta92 4e6e977
Merge branch 'MolSSI:master' into master
ahurta92 ea814e5
formatting
ahurta92 5e5c8c5
Merge pull request #9 from ahurta92/master
ahurta92 68a9193
fix the geometry input for get_version function
ahurta92 4c74677
remove reading scf_info.json
ahurta92 3feaf7e
first attempt at saving calc_info.json into "native_files"
ahurta92 2a70856
save calc_info.json in results.extras[outfiles][calcinfo.json]
ahurta92 839fb03
remove native_files line
ahurta92 cc192ef
Merge remote-tracking branch 'upstream/master' into MADNESS
ahurta92 54b09b4
save calc_info json as dictionary into extras
ahurta92 3db2391
black
ahurta92 c04a005
save calc json and input in native files
ahurta92 b1b23b0
Merge remote-tracking branch 'upstream/master'
ahurta92 170d422
Merge
ahurta92 cc86262
typo
ahurta92 48bffb7
MADNESS runs
ahurta92 d14841b
Ran black....was this a mistake?
ahurta92 a1c1b96
Starting new implementation for multiple executables
ahurta92 fd9fb82
A running implementation that can run both moldft and molresponse
ahurta92 3de261b
format
ahurta92 cbe29d9
Add some test lines
ahurta92 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -22,4 +22,4 @@ | |
model={"method": "pbe0", "basis": "6-31g"}, | ||
) | ||
ret = prog.compute(inp) | ||
print(ret) | ||
print(ret) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
from .runner import MadnessHarness |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,141 @@ | ||
from typing import Any, Dict, Tuple | ||
|
||
from qcengine.exceptions import InputError | ||
|
||
# List of XC functionals known to NWChem | ||
_xc_functionals = [ | ||
"hf", | ||
"lda", | ||
"acm", | ||
"b3lyp", | ||
"beckehandh", | ||
"pbe0", | ||
"becke97", | ||
"becke97-1", | ||
"becke97-2", | ||
"becke97-3", | ||
"becke97-d", | ||
"becke98", | ||
"hcth", | ||
"hcth120", | ||
"hcth147", | ||
"hcth407", | ||
"becke97gga1", | ||
"hcth407p", | ||
"mpw91", | ||
"mpw1k", | ||
"xft97", | ||
"cft97", | ||
"ft97", | ||
"op", | ||
"bop", | ||
"pbeop", | ||
"xpkzb99", | ||
"cpkzb99", | ||
"xtpss03", | ||
"ctpss03", | ||
"xctpssh", | ||
"b1b95", | ||
"bb1k", | ||
"mpw1b95", | ||
"mpwb1k", | ||
"pw6b95", | ||
"pwb6k", | ||
"m05", | ||
"m05-2x", | ||
"vs98", | ||
"m06", | ||
"m06-hf", | ||
"m06-L", | ||
"m06-2x", | ||
"HFexch", | ||
"becke88", | ||
"xperdew91", | ||
"xpbe96", | ||
"gill96", | ||
"lyp", | ||
"perdew81", | ||
"perdew86", | ||
"perdew91", | ||
"cpbe96", | ||
"pw91lda", | ||
"slater", | ||
"vwn_1", | ||
"vwn_2", | ||
"vwn_3", | ||
"vwn_4", | ||
"vwn_5", | ||
"vwn_1_rpa", | ||
"xtpss03", | ||
"ctpss03", | ||
"bc95", | ||
"xpw6b95", | ||
"xpwb6k", | ||
"xm05", | ||
"xm05-2x", | ||
"cpw6b95", | ||
"cpwb6k", | ||
"cm05", | ||
"cm05-2x", | ||
"xvs98", | ||
"cvs98", | ||
"xm06-L", | ||
"xm06-hf", | ||
"xm06", | ||
"xm06-2x", | ||
"cm06-L", | ||
"cm06-hf", | ||
"cm06", | ||
"cm06-2x", | ||
] | ||
|
||
|
||
# def muster_modelchem(method: str, derint: int, use_tce: bool) -> Tuple[str, Dict[str, Any]]: | ||
def muster_modelchem( | ||
method: str, | ||
derint: int, | ||
) -> Tuple[str, Dict[str, Any]]: | ||
"""Converts the QC method into MADNESS keywords | ||
Options include energy calculation with moldft | ||
Geometry optimiazation with moldft | ||
propreties calculation with molresponse...runs moldft then molresponse | ||
|
||
Args: | ||
method (str): Name of the QC method to use | ||
derint (str): Index of the run type | ||
Returns: | ||
(str): Task command for MADNESS | ||
(dict): Any options for MADNESS | ||
""" | ||
|
||
# Standardize the method name | ||
method = method.lower() | ||
|
||
opts = {} | ||
|
||
# Map the run type to | ||
# runtyp = {"energy": "energy", "gradient": "gradient", "hessian": "hessian", "properties": "property"}[derint] | ||
runtyp = {"energy": "energy", "optimization": "gopt", "hessian": "hessian", "properties": "molresponse"}[derint] | ||
|
||
# Write out the theory directive | ||
if runtyp == "energy": | ||
if method == "optimization": | ||
opts["dft__gopt"] = True | ||
elif method.split()[0] in _xc_functionals: | ||
opts["dft__xc"] = method | ||
else: | ||
raise InputError(f"Method not recognized: {method}") | ||
mdccmd = f"" | ||
elif runtyp == "molresponse": | ||
if method.split()[0] in _xc_functionals: | ||
opts["dft__xc"] = method | ||
opts["response__xc"] = method | ||
opts["response__archive"] = "restartdata" | ||
else: | ||
raise InputError(f"Method not recognized: {method}") | ||
mdccmd = f"response" ## we will split the options with the word response later | ||
|
||
## all we have to do is add options to the dft block in order to change the run type | ||
## default in energy | ||
# do nothing | ||
return mdccmd, opts | ||
|
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Check notice
Code scanning / CodeQL
Unused import Note