Fix configuration index bug in legacy output (a0563c33) · Commits · Giacomo Mulas / NP_TMcode

src/inclusion/inclusion.cpp

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1599,8 +1599,7 @@ int inclusion_jxi488_cycle(int jxi488, ScattererConfiguration *sconf, GeometryCo
	}		}
	}		}
	} // i168 loop		} // i168 loop
	last_configuration++;		oindex = (jindex - 1) * (num_configs + 1) + num_configs;
	oindex = (jindex - 1) * (num_configs + 1) + last_configuration - 1;
	output->vec_sphere_sizes[oindex] = sze;		output->vec_sphere_sizes[oindex] = sze;
	output->vec_sphere_ref_indices[oindex] = entn;		output->vec_sphere_ref_indices[oindex] = entn;
	// label 160		// label 160
	@@ -2081,6 +2080,7 @@ int inclusion_jxi488_cycle(int jxi488, ScattererConfiguration *sconf, GeometryCo
	#ifdef USE_NVTX		#ifdef USE_NVTX
	nvtxRangePop();		nvtxRangePop();
	#endif		#endif
			if (jer == 0) output->vec_jxi[jindex - 1] = jxi488;
	interval_end = chrono::high_resolution_clock::now();		interval_end = chrono::high_resolution_clock::now();
	elapsed = interval_end - interval_start;		elapsed = interval_end - interval_start;
	message = "INFO: angle loop for scale " + to_string(jxi488) + " took " + to_string(elapsed.count()) + "s.\n";		message = "INFO: angle loop for scale " + to_string(jxi488) + " took " + to_string(elapsed.count()) + "s.\n";

src/libnptm/outputs.cpp

+14 −10

Original line number	Original line	Diff line number	Diff line
	@@ -4058,7 +4058,7 @@ int InclusionOutputInfo::write_legacy(const std::string &output) {
	int result = 0;		int result = 0;
	FILE *p_outfile = fopen(output.c_str(), "w");		FILE *p_outfile = fopen(output.c_str(), "w");
	if (p_outfile != NULL) {		if (p_outfile != NULL) {
	if (vec_xi[0] == 1) {		if (vec_jxi[0] == 1) {
	fprintf(p_outfile, " READ(IR,*)NSPH,LI,LE,MXNDM,INPOL,NPNT,NPNTTS,IAVM,ISAM\n");		fprintf(p_outfile, " READ(IR,*)NSPH,LI,LE,MXNDM,INPOL,NPNT,NPNTTS,IAVM,ISAM\n");
	#ifdef USE_ILP64		#ifdef USE_ILP64
	fprintf(		fprintf(
	@@ -4102,6 +4102,9 @@ int InclusionOutputInfo::write_legacy(const std::string &output) {
	if (idfc < 0) {		if (idfc < 0) {
	fprintf( p_outfile, " VK=%15.7lE, XI IS SCALE FACTOR FOR LENGTHS\n \n", vec_vk[0]);		fprintf( p_outfile, " VK=%15.7lE, XI IS SCALE FACTOR FOR LENGTHS\n \n", vec_vk[0]);
	}		}
			// End preamble writing
			}
			// Wavelength loop
	for (int jxi = 0; jxi < xi_block_size; jxi++) {		for (int jxi = 0; jxi < xi_block_size; jxi++) {
	int done_dirs = 0;		int done_dirs = 0;
	double alamb = 2.0 * 3.141592653589793238 / vec_vk[jxi];		double alamb = 2.0 * 3.141592653589793238 / vec_vk[jxi];
	@@ -4119,20 +4122,22 @@ int InclusionOutputInfo::write_legacy(const std::string &output) {
	break;		break;
	}		}
	for (int i168 = 1; i168 <= configurations; i168++) {		for (int i168 = 1; i168 <= configurations; i168++) {
	if (vec_sphere_ref_indices[i168 - 1] == cc0) {		int cindex = jxi * (configurations + 1) + i168 - 1;
	fprintf(p_outfile, " SPHERE N.%2d: SIZE=%15.7lE\n", i168, vec_sphere_sizes[i168 - 1]);		if (vec_sphere_ref_indices[cindex] == cc0) {
			fprintf(p_outfile, " SPHERE N.%2d: SIZE=%15.7lE\n", i168, vec_sphere_sizes[cindex]);
	} else {		} else {
	fprintf(		fprintf(
	p_outfile, " SPHERE N.%2d: SIZE=%15.7lE, REFRACTIVE INDEX=%15.7lE%15.7lE\n",		p_outfile, " SPHERE N.%2d: SIZE=%15.7lE, REFRACTIVE INDEX=%15.7lE%15.7lE\n",
	i168, vec_sphere_sizes[i168 - 1], real(vec_sphere_ref_indices[i168 - 1]),		i168, vec_sphere_sizes[cindex], real(vec_sphere_ref_indices[cindex]),
	imag(vec_sphere_ref_indices[i168 - 1])		imag(vec_sphere_ref_indices[cindex])
	);		);
	}		}
	} // i168 configuration loop		} // i168 configuration loop
			int cindex = jxi * (configurations + 1) + configurations;
	fprintf(		fprintf(
	p_outfile, " EXT. SPHERE: SIZE=%15.7lE, REFRACTIVE INDEX=%15.7lE%15.7lE\n",		p_outfile, " EXT. SPHERE: SIZE=%15.7lE, REFRACTIVE INDEX=%15.7lE%15.7lE\n",
	vec_sphere_sizes[configurations], real(vec_sphere_ref_indices[configurations]),		vec_sphere_sizes[cindex], real(vec_sphere_ref_indices[cindex]),
	imag(vec_sphere_ref_indices[configurations])		imag(vec_sphere_ref_indices[cindex])
	);		);
	fprintf(p_outfile, " ENSEMBLE AVERAGE, MODE%2d\n", iavm);		fprintf(p_outfile, " ENSEMBLE AVERAGE, MODE%2d\n", iavm);
	if (inpol == 0) fprintf(p_outfile, " LIN -1\n");		if (inpol == 0) fprintf(p_outfile, " LIN -1\n");
	@@ -4466,7 +4471,6 @@ int InclusionOutputInfo::write_legacy(const std::string &output) {
	} // jph loop		} // jph loop
	} // jth loop		} // jth loop
	} // jxi wavelength loop		} // jxi wavelength loop
	}
	fclose(p_outfile);		fclose(p_outfile);
	} else {		} else {
	result = -1;		result = -1;

src/testing/test_inclusion_outputs.cpp

+4 −6

Original line number	Original line	Diff line number	Diff line
	@@ -27,23 +27,21 @@ int test_inclusion_devel();

	int main() {		int main() {
	int result = 0;		int result = 0;
	// result += test_inclusion_hdf5_output(); // 1 if failed		result += test_inclusion_hdf5_output(); // 1 if failed
	result += test_inclusion_devel(); // 10 if failed		result += test_inclusion_devel(); // 10 if failed
	return result;		return result;
	}		}

	int test_inclusion_hdf5_output() {		int test_inclusion_hdf5_output() {
	int result = 0;		int result = 0;
	/*
	try {		try {
	const string hdf5_file = "../../test_data/cluster/c_OCLU_24.hd5";		const string hdf5_file = "../../test_data/inclusion/c_OINCLU.hd5";
	ClusterOutputInfo *oi = new ClusterOutputInfo(hdf5_file);		InclusionOutputInfo *oi = new InclusionOutputInfo(hdf5_file);
	oi->write("c_OCLU_24", "LEGACY");		oi->write("c_OINCLU", "LEGACY");
	delete oi;		delete oi;
	} catch (const exception& ex) {		} catch (const exception& ex) {
	result = 1;		result = 1;
	}		}
	*/
	return result;		return result;
	}		}

test_data/inclusion/c_OINCLU.hd5

(55.2 KiB)

File changed.

No diff preview for this file type.

View original file

View changed file