diff --git a/src/cluster/cluster.cpp b/src/cluster/cluster.cpp
index 257d52138cab10034378bea751b57ff2cd1c6933..999a6835c731b679c526f0bbf40ac72ca90e96f4 100644
--- a/src/cluster/cluster.cpp
+++ b/src/cluster/cluster.cpp
@@ -95,7 +95,7 @@ using namespace std;
// double *tqsv;
// }
-int cluster_jxi488_cycle(int jxi488, ScattererConfiguration *sconf, GeometryConfiguration *gconf, C1 *c1, C1_AddOns *c1ao, C2 *c2, C3 *c3, C4 *c4, C6 *c6, C9 *c9, FILE *output, string output_path, double *gaps, double **tqse, dcomplex **tqspe, double **tqss, dcomplex **tqsps, double ****zpv, double **gapm, dcomplex **gappm, int nth, int nths, int nph, int nphs, int nk, int nks, int nkks, double *argi, double *args, double **gap, dcomplex **gapp, double **tqce, dcomplex **tqcpe, double **tqcs, dcomplex **tqcps, double *duk, fstream &tppoan, double **cextlr, double **cext, double **cmullr, double **cmul, double *gapv, double *tqev, double *tqsv, int nxi, int nsph, np_int mxndm, int inpol, int iavm, int npnt, int npntts, int isam, int lm, double th, double thstp, double thlst, double ths, double thsstp, double thslst, double ph, double phstp, double phlst, double phs, double phsstp, double phslst, double th1, double ph1, double ths1, double phs1, double thsca, double *u, double *us, double *un, double *uns, double *up, double *ups, double *unmp, double *unsmp, double *upmp, double *upsmp, double scan, double cfmp, double sfmp, double cfsp, double sfsp, double sqsfi, double exri, int lcalc, dcomplex arg, double wn, double vk, np_int ndit, dcomplex **am, int isq, int ibf);
+int cluster_jxi488_cycle(int &jxi488, ScattererConfiguration *sconf, GeometryConfiguration *gconf, C1 *c1, C1_AddOns *c1ao, C2 *c2, C3 *c3, C4 *c4, C6 *c6, C9 *c9, FILE *output, string output_path, double *gaps, double **tqse, dcomplex **tqspe, double **tqss, dcomplex **tqsps, double ****zpv, double **gapm, dcomplex **gappm, int &nth, int &nths, int &nph, int &nphs, int &nk, int &nks, int &nkks, double *argi, double *args, double **gap, dcomplex **gapp, double **tqce, dcomplex **tqcpe, double **tqcs, dcomplex **tqcps, double *duk, fstream &tppoan, double **cextlr, double **cext, double **cmullr, double **cmul, double *gapv, double *tqev, double *tqsv, int &nxi, int &nsph, np_int &mxndm, int &inpol, int &iavm, int &npnt, int &npntts, int &isam, int &lm, double &th, double &thstp, double &thlst, double &ths, double &thsstp, double &thslst, double &ph, double &phstp, double &phlst, double &phs, double &phsstp, double &phslst, double &th1, double &ph1, double &ths1, double &phs1, double &thsca, double *u, double *us, double *un, double *uns, double *up, double *ups, double *unmp, double *unsmp, double *upmp, double *upsmp, double &scan, double &cfmp, double &sfmp, double &cfsp, double &sfsp, double &sqsfi, double &exri, int &lcalc, dcomplex &arg, double &wn, double &vk, np_int &ndit, dcomplex **am, int &isq, int &ibf);
/*! \brief C++ implementation of CLU
*
@@ -454,32 +454,32 @@ void cluster(string config_file, string data_file, string output_path) {
tqev_2[ti] = tqev[ti];
tqsv_2[ti] = tqsv[ti];
}
- // int nxi_2 = nxi;
- // int nsph_2 = nsph;
- // np_int mxndm_2 = mxndm;
- // int inpol_2 = inpol;
- // int iavm_2 = iavm;
- // int npnt_2 = npnt;
- // int npntts_2 = npntts;
- // int isam_2 = isam;
- // int lm_2 = lm;
- // double th_2 = th;
- // double thstp_2 = thstp;
- // double thlst_2 = thlst;
- // double ths_2 = ths;
- // double thsstp_2 = thsstp;
- // double thslst_2 = thslst;
- // double ph_2 = ph;
- // double phstp_2 = phstp;
- // double phlst_2 = phlst;
- // double phs_2 = phs;
- // double phsstp_2 = phsstp;
- // double phslst_2 = phslst;
- // double th1_2 = th1;
- // double ph1_2 = ph1;
- // double ths1_2 = ths1;
- // double phs1_2 = phs1;
- // double thsca_2 = thsca;
+ int nxi_2 = nxi;
+ int nsph_2 = nsph;
+ np_int mxndm_2 = mxndm;
+ int inpol_2 = inpol;
+ int iavm_2 = iavm;
+ int npnt_2 = npnt;
+ int npntts_2 = npntts;
+ int isam_2 = isam;
+ int lm_2 = lm;
+ double th_2 = th;
+ double thstp_2 = thstp;
+ double thlst_2 = thlst;
+ double ths_2 = ths;
+ double thsstp_2 = thsstp;
+ double thslst_2 = thslst;
+ double ph_2 = ph;
+ double phstp_2 = phstp;
+ double phlst_2 = phlst;
+ double phs_2 = phs;
+ double phsstp_2 = phsstp;
+ double phslst_2 = phslst;
+ double th1_2 = th1;
+ double ph1_2 = ph1;
+ double ths1_2 = ths1;
+ double phs1_2 = phs1;
+ double thsca_2 = thsca;
double *u_2 = new double[3]();
double *us_2 = new double[3]();
double *un_2 = new double[3]();
@@ -502,29 +502,36 @@ void cluster(string config_file, string data_file, string output_path) {
upmp_2[ti] = upmp[ti];
upsmp_2[ti] = upsmp[ti];
}
- // double scan_2 = scan;
- // double cfmp_2 = cfmp;
- // double sfmp_2 = sfmp;
- // double cfsp_2 = cfsp;
- // double sfsp_2 = sfsp;
- // double sqsfi_2 = sqsfi;
- // double exri_2 = exri;
- // int lcalc_2 = lcalc;
- // dcomplex arg_2 = arg;
- // double wn_2 = wn;
- // double vk_2 = vk;
- // np_int ndit_2 = ndit;
+ double scan_2 = scan;
+ double cfmp_2 = cfmp;
+ double sfmp_2 = sfmp;
+ double cfsp_2 = cfsp;
+ double sfsp_2 = sfsp;
+ double sqsfi_2 = sqsfi;
+ double exri_2 = exri;
+ int lcalc_2 = lcalc;
+ dcomplex arg_2 = arg;
+ double wn_2 = wn;
+ double vk_2 = vk;
+ np_int ndit_2 = ndit;
dcomplex **am_2 = new dcomplex*[ndit];
dcomplex *am_vector_2 = new dcomplex[ndit * ndit]();
for (int ai = 0; ai < ndit; ai++) {
am_2[ai] = (am_vector_2 + ai * ndit);
}
- // int isq_2 = isq;
- // int ibf_2 = ibf;
+ int isq_2 = isq;
+ int ibf_2 = ibf;
+ int nth_2 = nth;
+ int nths_2 = nths;
+ int nph_2 = nph;
+ int nphs_2 = nph;
+ int nk_2 = nk;
+ int nks_2 = nks;
+ int nkks_2 = nkks;
#pragma omp for
for (jxi488 = 2; jxi488 <= nxi; jxi488++) {
- jer = cluster_jxi488_cycle(jxi488, sconf_2, gconf_2, c1_2, c1ao_2, c2_2, c3_2, c4_2, c6_2, c9_2, output_2, output_path, gaps_2, tqse_2, tqspe_2, tqss_2, tqsps_2, zpv_2, gapm_2, gappm_2, nth, nths, nph, nphs, nk, nks, nkks, argi_2, args_2, gap_2, gapp_2, tqce_2, tqcpe_2, tqcs_2, tqcps_2, duk_2, tppoan_2, cextlr_2, cext_2, cmullr_2, cmul_2, gapv_2, tqev_2, tqsv_2, nxi, nsph, mxndm, inpol, iavm, npnt, npntts, isam, lm, th, thstp, thlst, ths, thsstp, thslst, ph, phstp, phlst, phs, phsstp, phslst, th1, ph1, ths1, phs1, thsca, u_2, us_2, un_2, uns_2, up_2, ups_2, unmp_2, unsmp_2, upmp_2, upsmp_2, scan, cfmp, sfmp, cfsp, sfsp, sqsfi, exri, lcalc, arg, wn, vk, ndit, am_2, isq, ibf);
+ jer = cluster_jxi488_cycle(jxi488, sconf_2, gconf_2, c1_2, c1ao_2, c2_2, c3_2, c4_2, c6_2, c9_2, output_2, output_path, gaps_2, tqse_2, tqspe_2, tqss_2, tqsps_2, zpv_2, gapm_2, gappm_2, nth_2, nths_2, nph_2, nphs_2, nk_2, nks_2, nkks_2, argi_2, args_2, gap_2, gapp_2, tqce_2, tqcpe_2, tqcs_2, tqcps_2, duk_2, tppoan_2, cextlr_2, cext_2, cmullr_2, cmul_2, gapv_2, tqev_2, tqsv_2, nxi_2, nsph_2, mxndm_2, inpol_2, iavm_2, npnt_2, npntts_2, isam_2, lm_2, th_2, thstp_2, thlst_2, ths_2, thsstp_2, thslst_2, ph_2, phstp_2, phlst_2, phs_2, phsstp_2, phslst_2, th1_2, ph1_2, ths1_2, phs1_2, thsca_2, u_2, us_2, un_2, uns_2, up_2, ups_2, unmp_2, unsmp_2, upmp_2, upsmp_2, scan_2, cfmp_2, sfmp_2, cfsp_2, sfsp_2, sqsfi_2, exri_2, lcalc_2, arg_2, wn_2, vk_2, ndit_2, am_2, isq_2, ibf_2);
}
delete sconf_2;
@@ -727,7 +734,7 @@ void cluster(string config_file, string data_file, string output_path) {
}
-int cluster_jxi488_cycle(int jxi488, ScattererConfiguration *sconf, GeometryConfiguration *gconf, C1 *c1, C1_AddOns *c1ao, C2 *c2, C3 *c3, C4 *c4, C6 *c6, C9 *c9, FILE *output, string output_path, double *gaps, double **tqse, dcomplex **tqspe, double **tqss, dcomplex **tqsps, double ****zpv, double **gapm, dcomplex **gappm, int nth, int nths, int nph, int nphs, int nk, int nks, int nkks, double *argi, double *args, double **gap, dcomplex **gapp, double **tqce, dcomplex **tqcpe, double **tqcs, dcomplex **tqcps, double *duk, fstream &tppoan, double **cextlr, double **cext, double **cmullr, double **cmul, double *gapv, double *tqev, double *tqsv, int nxi, int nsph, np_int mxndm, int inpol, int iavm, int npnt, int npntts, int isam, int lm, double th, double thstp, double thlst, double ths, double thsstp, double thslst, double ph, double phstp, double phlst, double phs, double phsstp, double phslst, double th1, double ph1, double ths1, double phs1, double thsca, double *u, double *us, double *un, double *uns, double *up, double *ups, double *unmp, double *unsmp, double *upmp, double *upsmp, double scan, double cfmp, double sfmp, double cfsp, double sfsp, double sqsfi, double exri, int lcalc, dcomplex arg, double wn, double vk, np_int ndit, dcomplex **am, int isq, int ibf)
+int cluster_jxi488_cycle(int &jxi488, ScattererConfiguration *sconf, GeometryConfiguration *gconf, C1 *c1, C1_AddOns *c1ao, C2 *c2, C3 *c3, C4 *c4, C6 *c6, C9 *c9, FILE *output, string output_path, double *gaps, double **tqse, dcomplex **tqspe, double **tqss, dcomplex **tqsps, double ****zpv, double **gapm, dcomplex **gappm, int &nth, int &nths, int &nph, int &nphs, int &nk, int &nks, int &nkks, double *argi, double *args, double **gap, dcomplex **gapp, double **tqce, dcomplex **tqcpe, double **tqcs, dcomplex **tqcps, double *duk, fstream &tppoan, double **cextlr, double **cext, double **cmullr, double **cmul, double *gapv, double *tqev, double *tqsv, int &nxi, int &nsph, np_int &mxndm, int &inpol, int &iavm, int &npnt, int &npntts, int &isam, int &lm, double &th, double &thstp, double &thlst, double &ths, double &thsstp, double &thslst, double &ph, double &phstp, double &phlst, double &phs, double &phsstp, double &phslst, double &th1, double &ph1, double &ths1, double &phs1, double &thsca, double *u, double *us, double *un, double *uns, double *up, double *ups, double *unmp, double *unsmp, double *upmp, double *upsmp, double &scan, double &cfmp, double &sfmp, double &cfsp, double &sfsp, double &sqsfi, double &exri, int &lcalc, dcomplex &arg, double &wn, double &vk, np_int &ndit, dcomplex **am, int &isq, int &ibf)
{
// int nxi = sconf->number_of_scales;
diff --git a/src/include/Configuration.h b/src/include/Configuration.h
index 3fc569b34657239327e41c6adae8cd068f9edb97..0800d77523f51616a92eb68ba6e620f04cecd06c 100644
--- a/src/include/Configuration.h
+++ b/src/include/Configuration.h
@@ -53,7 +53,7 @@ class C9;
class GeometryConfiguration {
//! Temporary work-around to allow cluster() and sphere() peeking in.
friend void cluster(std::string, std::string, std::string);
- friend int cluster_jxi488_cycle(int, ScattererConfiguration *, GeometryConfiguration *, C1 *, C1_AddOns *, C2 *, C3 *, C4 *, C6 *, C9 *, std::FILE *, std::string, double *, double **, dcomplex **, double **, dcomplex **, double ****, double **, dcomplex **, int, int, int, int, int, int, int, double *, double *, double **, dcomplex **, double **, dcomplex **, double **, dcomplex **, double *, std::fstream &, double **, double **, double **, double **, double *, double *, double *, int, int, np_int, int, int, int, int, int, int, double, double, double, double, double, double, double, double, double, double, double, double, double, double, double, double, double, double *, double *, double *, double *, double *, double *, double *, double *, double *, double *, double, double, double, double, double, double, double, int, dcomplex, double, double, np_int, dcomplex **, int, int);
+ friend int cluster_jxi488_cycle(int &, ScattererConfiguration *, GeometryConfiguration *, C1 *, C1_AddOns *, C2 *, C3 *, C4 *, C6 *, C9 *, std::FILE *, std::string, double *, double **, dcomplex **, double **, dcomplex **, double ****, double **, dcomplex **, int &, int &, int &, int &, int &, int &, int &, double *, double *, double **, dcomplex **, double **, dcomplex **, double **, dcomplex **, double *, std::fstream &, double **, double **, double **, double **, double *, double *, double *, int &, int &, np_int &, int &, int &, int &, int &, int &, int &, double &, double &, double &, double &, double &, double &, double &, double &, double &, double &, double &, double &, double &, double &, double &, double &, double &, double *, double *, double *, double *, double *, double *, double *, double *, double *, double *, double &, double &, double &, double &, double &, double &, double &, int &, dcomplex &, double &, double &, np_int &, dcomplex **, int &, int &);
friend void sphere(std::string, std::string, std::string);
protected:
//! \brief Number of spherical components.
@@ -185,7 +185,7 @@ public:
class ScattererConfiguration {
//! Temporary work-around to allow cluster() and sphere() peeking in.
friend void cluster(std::string, std::string, std::string);
- friend int cluster_jxi488_cycle(int, ScattererConfiguration *, GeometryConfiguration *, C1 *, C1_AddOns *, C2 *, C3 *, C4 *, C6 *, C9 *, std::FILE *, std::string, double *, double **, dcomplex **, double **, dcomplex **, double ****, double **, dcomplex **, int, int, int, int, int, int, int, double *, double *, double **, dcomplex **, double **, dcomplex **, double **, dcomplex **, double *, std::fstream &, double **, double **, double **, double **, double *, double *, double *, int, int, np_int, int, int, int, int, int, int, double, double, double, double, double, double, double, double, double, double, double, double, double, double, double, double, double, double *, double *, double *, double *, double *, double *, double *, double *, double *, double *, double, double, double, double, double, double, double, int, dcomplex, double, double, np_int, dcomplex **, int, int);
+ friend int cluster_jxi488_cycle(int &, ScattererConfiguration *, GeometryConfiguration *, C1 *, C1_AddOns *, C2 *, C3 *, C4 *, C6 *, C9 *, std::FILE *, std::string, double *, double **, dcomplex **, double **, dcomplex **, double ****, double **, dcomplex **, int &, int &, int &, int &, int &, int &, int &, double *, double *, double **, dcomplex **, double **, dcomplex **, double **, dcomplex **, double *, std::fstream &, double **, double **, double **, double **, double *, double *, double *, int &, int &, np_int &, int &, int &, int &, int &, int &, int &, double &, double &, double &, double &, double &, double &, double &, double &, double &, double &, double &, double &, double &, double &, double &, double &, double &, double *, double *, double *, double *, double *, double *, double *, double *, double *, double *, double &, double &, double &, double &, double &, double &, double &, int &, dcomplex &, double &, double &, np_int &, dcomplex **, int &, int &);
friend void sphere(std::string, std::string, std::string);
protected:
//! \brief Matrix of dielectric parameters with size [NON_TRANS_LAYERS x N_SPHERES x N_SCALES].