Commit ec5b9055 authored by Giovanni La Mura's avatar Giovanni La Mura
Browse files

Define common structures for cluster case

parent c31575c9

src/include/Commons.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -212,7 +212,7 @@ public: 
	//! \brief QUESTION: definition?

	//! \brief QUESTION: definition?

	std::complex<double> *vh;

	std::complex<double> *vh;

	//! \brief QUESTION: definition?

	//! \brief QUESTION: definition?

	std::complex<double> *vj;

	std::complex<double> *vj0;

	//! \brief QUESTION: definition?

	//! \brief QUESTION: definition?

	std::complex<double> *vyhj;

	std::complex<double> *vyhj;

	//! \brief QUESTION: definition?

	//! \brief QUESTION: definition?

src/libnptm/Commons.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -98,7 +98,7 @@ C1_AddOns::C1_AddOns(C4 *c4) { 
	lmpo = c4->lmpo;

	lmpo = c4->lmpo;

	nlemt = 2 * c4->nlem;

	nlemt = 2 * c4->nlem;

	vh = new complex<double>[(nsph * nsph - 1) * c4->litpo];

	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];

	vyhj = new complex<double>[nsph * (nsph - 1) * c4->litpo];

	vyj0 = new complex<double>[nsph * c4->lmtpo];

	vyj0 = new complex<double>[nsph * c4->lmtpo];

	am0m = new complex<double>*[nlemt];

	am0m = new complex<double>*[nlemt];
@@ -132,7 +132,7 @@ C1_AddOns::~C1_AddOns() { 
	delete[] ind3j;

	delete[] ind3j;

	delete[] v3j0;

	delete[] v3j0;

	delete[] vh;

	delete[] vh;

	delete[] vj;

	delete[] vj0;

	for (int ai = nlemt - 1; ai > -1; ai--) {

	for (int ai = nlemt - 1; ai > -1; ai--) {

		delete[] am0m[ai];

		delete[] am0m[ai];

	}

	}

src/sphere/sphere.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -19,13 +19,13 @@ void sphere() { 
	double *argi, *args, *gaps;

	double *argi, *args, *gaps;

	double th, ph;

	double th, ph;

	printf("INFO: making legacy configuration ...\n");

	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_formatted("c_OEDFB_sph");

	conf->write_binary("c_TEDF_sph");

	conf->write_binary("c_TEDF_sph");

	delete conf;

	delete conf;

	printf("INFO: reading binary configuration ...\n");

	printf("INFO: reading binary configuration ...\n");

	ScattererConfiguration *sconf = ScattererConfiguration::from_binary("c_TEDF_sph");

	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) {

	if (sconf->number_of_spheres == gconf->number_of_spheres) {

		int isq, ibf;

		int isq, ibf;

		double cost, sint, cosp, sinp;

		double cost, sint, cosp, sinp;