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

update gCP levels and extend D4 defaults #393

Merged
merged 8 commits into from
Aug 10, 2023
Merged

Conversation

hokru
Copy link
Contributor

@hokru hokru commented Jan 5, 2023

Description

For psi4 to run B97-3c and r2SCAN-3c the gCP harness needs an update to the allowed methods (limited to the new 'mctc-gcp'). (psi4/psi4#2842) r2SCAN-3c requires manipulation of additional parameters. dftd4 has been updated to allow this. The D4 harness update sets the additional defaults. Because the dftd4 toml file does not contain these parameters the D4 harness sets them.

Closes #392

Changelog description

Adds b973c and r2scan3c methods to the gcp and dftd4 harness.

Status

  • Code base linted
  • Ready to go

@codecov
Copy link

codecov bot commented Jan 5, 2023

Codecov Report

Merging #393 (e461863) into master (5935117) will decrease coverage by 8.57%.
The diff coverage is 70.00%.

Additional details and impacted files

Copy link
Collaborator

@loriab loriab left a comment

Choose a reason for hiding this comment

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

This looks good to me, thanks! Possib;y will have to rebase after #394 merged to fix CI.

@loriab
Copy link
Collaborator

loriab commented Jan 5, 2023

Ok, this will need a rebase. And possibly you'll want to add a dftd4_350 to testing.py

@hokru
Copy link
Contributor Author

hokru commented Jan 13, 2023

Rebased and added a dftd4_350. Also made the D4 harness compatible with older dftd4 versions. Can't seem to import testing._programs so added a manual solution to check the version.

qcengine/testing.py Outdated Show resolved Hide resolved
@@ -160,16 +160,25 @@ def build_input(
# thus code blocks with FILE below are not used yet.
# 'file',
]
# some methods not available in legacy version
mctc_gcp_levels = ["B973C", "R2SCAN3C"]
Copy link
Contributor

Choose a reason for hiding this comment

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

B97-3c should be supported with the original version of gcp already.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Holger was pretty sure otherwise. See "Dev notes" at psi4/psi4#2842 (comment) . v2.0.2 at https://anaconda.org/psi4/gcp/files is the relevant "classic" one that I'm trying to wean psi4 folks off of. mctc-gcp is preferred as of psi4 v1.8.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Ah, inclusion of the b97-3c explained at more psi4/psi4#1898 (comment) . I'm going to leave the code here as-is/exclusionary since "classic" is usually the tarball-from-Grimme-website build variously labeled 2.2 or 2.0.2.

@loriab
Copy link
Collaborator

loriab commented Aug 10, 2023

Thanks, @awvwgk, I think I've implemented all your suggestions here, except the b973c uncertainty (which I don't mind using as an extra push for users to switch).

I think this is ready to go, unless someone posts reservations. My plan is to merge it tomorrow after I get a clean CI at psi4/psi4#2842 .

@loriab loriab merged commit 8c9f0ab into MolSSI:master Aug 10, 2023
15 checks passed
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.

add r2scan-3c and b97-3c to gcp harness
3 participants