From d80df70744899dde1b99bbad90d0ae03a3282393 Mon Sep 17 00:00:00 2001
From: Giovanni La Mura <giovanni.lamura@inaf.it>
Date: Fri, 9 May 2025 18:46:16 +0200
Subject: [PATCH] Update str() function signature to directly access
ScattererConfiguration::_rcf
---
src/include/clu_subs.h | 4 ++--
src/libnptm/clu_subs.cpp | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/include/clu_subs.h b/src/include/clu_subs.h
index 9c5feffe..40c5f0e3 100644
--- a/src/include/clu_subs.h
+++ b/src/include/clu_subs.h
@@ -369,10 +369,10 @@ void scr2(
* to radial coordinates, then it calls `sphar()` to calculate the vector of spherical
* harmonics of the incident field.
*
- * \param sconf: `ScattererConfiguration *` Pointer to scatterer configuration object.
+ * \param rcf: `double **` Matrix of sphere configuration fractional radii.
* \param c1: `ParticleDescriptor *` Pointer to a ParticleDescriptor instance.
*/
-void str(ScattererConfiguration *sconf, ParticleDescriptor *c1);
+void str(double **rcf, ParticleDescriptor *c1);
/*! \brief Compute radiation torques on particles on a k-vector oriented system.
*
diff --git a/src/libnptm/clu_subs.cpp b/src/libnptm/clu_subs.cpp
index 0199f31a..3548af3d 100644
--- a/src/libnptm/clu_subs.cpp
+++ b/src/libnptm/clu_subs.cpp
@@ -2442,7 +2442,7 @@ void scr2(
#endif
}
-void str(ScattererConfiguration *sconf, ParticleDescriptor *c1) {
+void str(double **rcf, ParticleDescriptor *c1) {
dcomplex *ylm;
const double pi = acos(-1.0);
int last_configuration;
@@ -2457,7 +2457,7 @@ void str(ScattererConfiguration *sconf, ParticleDescriptor *c1) {
c1->gcsv[i18 - 1] = gcss;
int nsh = c1->nshl[last_configuration - 1];
for (int j16 = 1; j16 <= nsh; j16++) {
- c1->rc[last_configuration - 1][j16 - 1] = sconf->get_rcf(last_configuration - 1, j16 - 1) * c1->ros[last_configuration - 1];
+ c1->rc[last_configuration - 1][j16 - 1] = rcf[last_configuration - 1][j16 - 1] * c1->ros[last_configuration - 1];
} // j16 loop
}
c1->gcs += gcss;
--
GitLab