almost finished switch to fresh variables in the scales loop of cluster

src/cluster/cluster.cpp

@@ -466,8 +466,30 @@ void cluster(string config_file, string data_file, string output_path) {
 	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]();
+	double *uns_2 = new double[3]();
+	double *up_2 = new double[3]();
+	double *ups_2 = new double[3]();
+	double *unmp_2 = new double[3]();
+	double *unsmp_2 = new double[3]();
+	double *upmp_2 = new double[3]();
+	double *upsmp_2 = new double[3]();
+	for (int ti=0; ti<3; ti++) {
+	  u_2[ti] = u[ti];
+	  us_2[ti] = us[ti];
+	  un_2[ti] = un[ti];
+	  uns_2[ti] = uns[ti];
+	  up_2[ti] = up[ti];
+	  ups_2[ti] = ups[ti];
+	  unmp_2[ti] = unmp[ti];
+	  unsmp_2[ti] = unsmp[ti];
+	  upmp_2[ti] = upmp[ti];
+	  upsmp_2[ti] = upsmp[ti];
+	}
     
-	jer = cluster_jxi488_cycle(jxi488, sconf_2, gconf_2, c1_2, c1ao_2, c2_2, c3_2, c4_2, c6_2, c9_2, output, 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, 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, us, un, uns, up, ups, unmp, unsmp, upmp, upsmp, scan, cfmp, sfmp, cfsp, sfsp, sqsfi, exri, lcalc, arg, wn, vk, ndit, am, 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, 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, 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, cfmp, sfmp, cfsp, sfsp, sqsfi, exri, lcalc, arg, wn, vk, ndit, am, isq, ibf);
 
 	delete sconf_2;
 	delete gconf_2;
@@ -535,6 +557,16 @@ void cluster(string config_file, string data_file, string output_path) {
 	delete[] gapv_2;
 	delete[] tqev_2;
 	delete[] tqsv_2;
+	delete[] u_2;
+	delete[] us_2;
+	delete[] un_2;
+	delete[] uns_2;
+	delete[] up_2;
+	delete[] ups_2;
+	delete[] unmp_2;
+	delete[] unsmp_2;
+	delete[] upmp_2;
+	delete[] upsmp_2;
 	
       } // jxi488 loop
       tppoan.close();