diff --git a/src/include/Commons.h b/src/include/Commons.h index 5db518871432ddad3a4be591d03ab2b4819ded64..db9a134de6f7521d9f60c8a8c4b8b82b0ceb252f 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 2140c69ab0140cc9f561fb547f7d630f649fc5e2..004ee59e73c2c06753ea3313f0b3cea2c04ecbd1 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 fd6777227501b0f1dbf083a064f395714c85cdf4..3c5ce46daf658993295405cbac5f52c2198b5cc3 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;