Skip to content

[pull] master from MRChemSoft:master #53

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.

Sign up for GitHub

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

Merged
pull merged 1 commit into from
Feb 20, 2025
Merged

[pull] master from MRChemSoft:master #53

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions src/utils/CompFunction.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,6 +432,7 @@ template class CompFunction<3>;
template <int D> void deep_copy(CompFunction<D> *out, const CompFunction<D> &inp) {
out->func_ptr->data = inp.func_ptr->data;
out->alloc(inp.Ncomp());
if (inp.getNNodes() == 0) return;
for (int i = 0; i < inp.Ncomp(); i++) {
if (inp.isreal()) {
inp.CompD[i]->deep_copy(out->CompD[i]);
Expand All @@ -448,6 +449,7 @@ template <int D> void deep_copy(CompFunction<D> *out, const CompFunction<D> &inp
template <int D> void deep_copy(CompFunction<D> &out, const CompFunction<D> &inp) {
out.func_ptr->data = inp.func_ptr->data;
out.alloc(inp.Ncomp());
if (inp.getNNodes() == 0) return;
for (int i = 0; i < inp.Ncomp(); i++) {
if (inp.isreal()) {
inp.CompD[i]->deep_copy(out.CompD[i]);
Expand Down Expand Up @@ -564,6 +566,10 @@ template <int D> void multiply(double prec, CompFunction<D> &out, double coef, C
out.func_ptr->data = inp_a.func_ptr->data;
out.func_ptr->data.shared = share; // we don't inherit the shareness
out.func_ptr->conj = false; // we don't inherit conjugaison
if (inp_a.getNNodes() == 0 or inp_b.getNNodes() == 0) {
if (!out_allocated) out.alloc(out.Ncomp());
return;
}
for (int comp = 0; comp < inp_a.Ncomp(); comp++) {
out.func_ptr->data.c1[comp] = inp_a.func_ptr->data.c1[comp] * inp_b.func_ptr->data.c1[comp]; // we could put this is coef if everything is real?
if (inp_a.isreal() and inp_b.isreal()) {
Expand Down
Loading