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

Patch 0.17.3 #43

Merged
merged 1 commit into from
Sep 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion COMPILATION.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ pipx run cibuildwheel --only cp310-manylinux_x86_64
To install the `whl` file

```bash
pip3 install wheelhouse/pyqint-0.17.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
pip3 install wheelhouse/pyqint-0.17.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
```

and to locally test
Expand Down
2 changes: 1 addition & 1 deletion meta.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package:
name: "pyqint"
version: "0.17.2"
version: "0.17.3"

source:
path: .
Expand Down
2 changes: 1 addition & 1 deletion pyqint/_version.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
__version__ = "0.17.2"
__version__ = "0.17.3"

12 changes: 9 additions & 3 deletions pyqint/cgf.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ const double GTO::get_amp(const Vec3& r) const {
* @return gradient
*/
Vec3 GTO::get_grad(const Vec3& r) const {
// calculate exponential term and its product with the cartesian terms
// for x,y,z components
const double ex = std::exp(-this->alpha * std::pow(r[0]-this->position[0],2));
const double fx = std::pow(r[0] - this->position[0], this->l) * ex;

Expand All @@ -93,20 +95,24 @@ Vec3 GTO::get_grad(const Vec3& r) const {
const double ez = std::exp(-this->alpha * std::pow(r[2]-this->position[2],2));
const double fz = std::pow(r[2] - this->position[2], this->n) * ez;

// calculate first derivative of the exponential term
double gx = -2.0 * this->alpha * (r[0]-this->position[0]) * fx;
double gy = -2.0 * this->alpha * (r[1]-this->position[1]) * fy;
double gz = -2.0 * this->alpha * (r[2]-this->position[2]) * fz;

// if there is a Cartesian component (l,m,n > 0), apply the product rule
// and add the contribution of this term
if(this->l > 0) {
gx += std::pow(r[0] - this->position[0], this->l-1) * ex;
gx += this->l * std::pow(r[0] - this->position[0], this->l-1) * ex;
}
if(this->m > 0) {
gy += std::pow(r[1] - this->position[1], this->m-1) * ey;
gy += this->m * std::pow(r[1] - this->position[1], this->m-1) * ey;
}
if(this->n > 0) {
gz += std::pow(r[2] - this->position[2], this->n-1) * ez;
gz += this->n * std::pow(r[2] - this->position[2], this->n-1) * ez;
}

// return vector with derivative towards x,y and z
return Vec3(this->norm * gx * fy * fz,
this->norm * fx * gy * fz,
this->norm * fx * fy * gz);
Expand Down
6 changes: 4 additions & 2 deletions tests/test_grad.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import unittest
from pyqint import cgf
import numpy as np
import itertools

class TestGrad(unittest.TestCase):
"""
Expand All @@ -14,7 +15,8 @@ def test_cgf_grad(self):
"""
h = 1e-4 # set step size for finite difference

pp = [[0,0,0], [1,0,0], [0,1,0], [0,0,1], [1,1,0], [0,1,1], [1,0,1], [1,1,1]]
pp = list(itertools.product(range(4), repeat=3))

for exp in pp:
for p in pp:
l,m,n = exp
Expand All @@ -32,7 +34,7 @@ def test_grad_density(self):
"""
h = 1e-4 # set step size for finite difference

pp = [[0,0,0], [1,0,0], [0,1,0], [0,0,1], [1,1,0], [0,1,1], [1,0,1], [1,1,1]]
pp = list(itertools.product(range(4), repeat=3))
for exp in pp:
for p in pp:
l,m,n = exp
Expand Down
Loading