From ec5b905542329f90e7339922046cf57b37b6ec0e Mon Sep 17 00:00:00 2001
From: Giovanni La Mura <giovanni.lamura@inaf.it>
Date: Fri, 10 Nov 2023 14:02:49 +0100
Subject: [PATCH] Define common structures for cluster case
---
src/include/Commons.h | 2 +-
src/libnptm/Commons.cpp | 4 ++--
src/sphere/sphere.cpp | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/include/Commons.h b/src/include/Commons.h
index 5db51887..db9a134d 100644
--- a/src/include/Commons.h
+++ b/src/include/Commons.h
@@ -212,7 +212,7 @@ public:
//! \brief QUESTION: definition?
std::complex<double> *vh;
//! \brief QUESTION: definition?
- std::complex<double> *vj;
+ std::complex<double> *vj0;
//! \brief QUESTION: definition?
std::complex<double> *vyhj;
//! \brief QUESTION: definition?
diff --git a/src/libnptm/Commons.cpp b/src/libnptm/Commons.cpp
index 2140c69a..004ee59e 100644
--- a/src/libnptm/Commons.cpp
+++ b/src/libnptm/Commons.cpp
@@ -98,7 +98,7 @@ C1_AddOns::C1_AddOns(C4 *c4) {
lmpo = c4->lmpo;
nlemt = 2 * c4->nlem;
vh = new complex<double>[(nsph * nsph - 1) * c4->litpo];
- vj = new complex<double>[nsph * c4->lmtpo];
+ vj0 = new complex<double>[nsph * c4->lmtpo];
vyhj = new complex<double>[nsph * (nsph - 1) * c4->litpo];
vyj0 = new complex<double>[nsph * c4->lmtpo];
am0m = new complex<double>*[nlemt];
@@ -132,7 +132,7 @@ C1_AddOns::~C1_AddOns() {
delete[] ind3j;
delete[] v3j0;
delete[] vh;
- delete[] vj;
+ delete[] vj0;
for (int ai = nlemt - 1; ai > -1; ai--) {
delete[] am0m[ai];
}
diff --git a/src/sphere/sphere.cpp b/src/sphere/sphere.cpp
index fd677722..3c5ce46d 100644
--- a/src/sphere/sphere.cpp
+++ b/src/sphere/sphere.cpp
@@ -19,13 +19,13 @@ void sphere() {
double *argi, *args, *gaps;
double th, ph;
printf("INFO: making legacy configuration ...\n");
- ScattererConfiguration *conf = ScattererConfiguration::from_dedfb("DEDFB_sph");
+ ScattererConfiguration *conf = ScattererConfiguration::from_dedfb("../../test_data/sphere/DEDFB");
conf->write_formatted("c_OEDFB_sph");
conf->write_binary("c_TEDF_sph");
delete conf;
printf("INFO: reading binary configuration ...\n");
ScattererConfiguration *sconf = ScattererConfiguration::from_binary("c_TEDF_sph");
- GeometryConfiguration *gconf = GeometryConfiguration::from_legacy("DSPH");
+ GeometryConfiguration *gconf = GeometryConfiguration::from_legacy("../../test_data/sphere/DSPH");
if (sconf->number_of_spheres == gconf->number_of_spheres) {
int isq, ibf;
double cost, sint, cosp, sinp;
--
GitLab