crp/OpenMC
1
0
Fork 0
mirror of https://github.com/openmc-dev/openmc.git synced 2026-07-26 13:15:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixing bugs found from the mg_basic test which exercises many more Mgxs data formats

Browse source
This commit is contained in:
Adam G Nelson 2018-06-10 05:53:22 -04:00
parent 0054759c3a
commit 59c4bc3fc4
3 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/mgxs.cpp
View file

@ -646,8 +646,8 @@ void add_mgxs(hid_t file_id, char* name, int energy_groups,
bool query_fissionable(const int n_nuclides, const int i_nuclides[])
{
bool result = false;
for (int i = 0; i < n_nuclides; i++) {
if (nuclides_MG[i_nuclides[i]].fissionable) result = true;
for (int n = 0; n < n_nuclides; n++) {
if (nuclides_MG[i_nuclides[n] - 1].fissionable) result = true;
}
return result;
}

6
src/scattdata.cpp
View file

@ -267,7 +267,8 @@ void ScattDataLegendre::combine(std::vector<ScattData*> those_scatts,
int groups = dynamic_cast<ScattDataLegendre*>(those_scatts[0])->energy.size();
// Now allocate and zero our storage spaces
double_3dvec this_matrix = get_matrix(max_order);
double_3dvec this_matrix = double_3dvec(groups, double_2dvec(groups,
double_1dvec(max_order, 0.)));
double_2dvec mult_numer(groups, double_1dvec(groups, 0.));
double_2dvec mult_denom(groups, double_1dvec(groups, 0.));
@ -572,7 +573,8 @@ void ScattDataHistogram::combine(std::vector<ScattData*> those_scatts,
int groups = dynamic_cast<ScattDataHistogram*>(those_scatts[0])->energy.size();
// Now allocate and zero our storage spaces
double_3dvec this_matrix = get_matrix(max_order);
double_3dvec this_matrix = double_3dvec(groups, double_2dvec(groups,
double_1dvec(max_order, 0.)));
double_2dvec mult_numer(groups, double_1dvec(groups, 0.));
double_2dvec mult_denom(groups, double_1dvec(groups, 0.));

17
src/xsdata.cpp
View file

@ -35,9 +35,9 @@ XsData::XsData(int energy_groups, int num_delayed_groups, bool fissionable,
double_1dvec(num_delayed_groups, 0.)));
if (fissionable) {
// allocate delayed_nu_fission; [temperature][phi][theta][in group][out group]
// allocate delayed_nu_fission; [temperature][phi][theta][in group][delay group]
delayed_nu_fission = double_4dvec(n_pol, double_3dvec(n_azi,
double_2dvec(energy_groups, double_1dvec(energy_groups, 0.))));
double_2dvec(energy_groups, double_1dvec(num_delayed_groups, 0.))));
// chi_prompt; [temperature][phi][theta][in group][delayed group]
chi_prompt = double_4dvec(n_pol, double_3dvec(n_azi,
@ -129,11 +129,15 @@ void XsData::from_hdf5(hid_t xsdata_grp, bool fissionable, int scatter_format,
void XsData::_fissionable_from_hdf5(hid_t xsdata_grp, int n_pol, int n_azi,
int energy_groups, int delayed_groups, bool is_isotropic)
{
// Get the fission and kappa_fission data xs; these are optional
read_nd_vector(xsdata_grp, "fission", fission);
read_nd_vector(xsdata_grp, "kappa-fission", kappa_fission);
// Set/get beta
double_4dvec temp_beta =
double_4dvec(n_pol, double_3dvec(n_azi,
double_2dvec(energy_groups, double_1dvec(delayed_groups, 0.))));
// Set/get beta
if (object_exists(xsdata_grp, "beta")) {
hid_t xsdata = open_dataset(xsdata_grp, "beta");
int ndims = dataset_ndims(xsdata);
@ -442,6 +446,7 @@ void XsData::_fissionable_from_hdf5(hid_t xsdata_grp, int n_pol, int n_azi,
if (object_exists(xsdata_grp, "delayed-nu-fission")) {
hid_t xsdata = open_dataset(xsdata_grp, "delayed-nu-fission");
int ndims = dataset_ndims(xsdata);
close_dataset(xsdata);
if (is_isotropic) ndims += 2;
if (ndims == 3) {
@ -507,12 +512,8 @@ void XsData::_fissionable_from_hdf5(hid_t xsdata_grp, int n_pol, int n_azi,
fatal_error("prompt-nu-fission must be provided as a 3D, 4D, or 5D "
"array!");
}
close_dataset(xsdata);
}
// Get the fission and kappa_fission data xs
read_nd_vector(xsdata_grp, "fission", fission);
read_nd_vector(xsdata_grp, "kappa-fission", kappa_fission);
}