Skip to content

Full ALPB/GBSA with empirical parameters#142

Merged
awvwgk merged 58 commits intotblite:mainfrom
haneug:tblite_solvation
Dec 11, 2024
Merged

Full ALPB/GBSA with empirical parameters#142
awvwgk merged 58 commits intotblite:mainfrom
haneug:tblite_solvation

Conversation

@haneug
Copy link
Copy Markdown
Contributor

@haneug haneug commented Dec 5, 2023

Initial implementation of the 'full' ALPB and GBSA solvation models as in xtb.

  • implements new flags --alpb-xtb and --gbsa-xtb which employ the corresponding empirical parameters and give the same results as in xtb (for water in water the energy difference is below 10⁻⁸ Eh with GFN2-xTB)
  • No support for API yet

Looking forward for your suggestions how to improve this!

To Do:

  • implement Gshift
  • fix deviation for GFN1-xTB
  • check other solvents
  • clean up and add tests
  • C and python api

@haneug haneug added the enhancement New feature or request label Dec 5, 2023
@haneug haneug requested a review from awvwgk December 5, 2023 16:39
@haneug haneug linked an issue Dec 5, 2023 that may be closed by this pull request
@haneug haneug self-assigned this Dec 5, 2023
Comment thread app/driver_run.f90 Outdated
@codecov
Copy link
Copy Markdown

codecov bot commented Dec 21, 2023

Codecov Report

Attention: Patch coverage is 31.78974% with 545 lines in your changes missing coverage. Please review.

Project coverage is 71.69%. Comparing base (e4d82fb) to head (9d532aa).
Report is 3 commits behind head on main.

Files with missing lines Patch % Lines
src/tblite/solvation/data.f90 0.00% 70 Missing and 28 partials ⚠️
src/tblite/solvation/data/cds.f90 15.53% 1 Missing and 86 partials ⚠️
src/tblite/solvation/data/alpb.f90 17.64% 1 Missing and 83 partials ⚠️
src/tblite/solvation/data/shift.f90 16.32% 1 Missing and 81 partials ⚠️
app/cli.f90 25.35% 17 Missing and 36 partials ⚠️
src/tblite/api/solvation.f90 44.31% 8 Missing and 41 partials ⚠️
src/tblite/solvation.f90 33.33% 8 Missing and 14 partials ⚠️
src/tblite/solvation/shift.f90 59.25% 7 Missing and 15 partials ⚠️
app/driver_run.f90 27.27% 4 Missing and 12 partials ⚠️
src/tblite/solvation/cds.f90 71.73% 0 Missing and 13 partials ⚠️
... and 6 more
Additional details and impacted files
@@            Coverage Diff             @@
##             main     #142      +/-   ##
==========================================
- Coverage   72.19%   71.69%   -0.50%     
==========================================
  Files         143      143              
  Lines       18136    18134       -2     
  Branches     5616     6158     +542     
==========================================
- Hits        13093    13001      -92     
+ Misses       2590     2178     -412     
- Partials     2453     2955     +502     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@awvwgk awvwgk mentioned this pull request Jan 26, 2024
@haneug
Copy link
Copy Markdown
Contributor Author

haneug commented Feb 15, 2024

Differences for GFN1-xTB do not occur for molecules with only one species e.g., H2, F2, and O3, but for molecules with multiple species e.g., HF, H2O, and CO2.

@thfroitzheim
Copy link
Copy Markdown
Contributor

This should now be ready for review. It is tested for all solvents against xtb. Most remaining misses in code coverage are in the CLI for which there are additional test.

@thfroitzheim thfroitzheim requested a review from awvwgk November 6, 2024 13:22
Comment thread include/tblite/container.h Outdated
Comment thread include/tblite/container.h Outdated
@awvwgk awvwgk added this to the v0.5.0 milestone Nov 17, 2024
Comment thread app/tester.py Outdated
Comment thread app/cli.f90 Outdated
Comment thread python/tblite/library.py Fixed
Comment thread python/tblite/library.py Fixed
@awvwgk awvwgk merged commit 9ca469a into tblite:main Dec 11, 2024
@awvwgk
Copy link
Copy Markdown
Member

awvwgk commented Dec 11, 2024

Thanks Hagen @haneug, Philipp @pprcht, Thomas @thfroitzheim and Pit @pitsteinbach for the all the hard work on this.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

enhancement New feature or request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Different solvation energies in tblite and xtb

6 participants