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

Small refactor of distribution_spatial.cpp and change default of volume_normalized to True

Browse source
This commit is contained in:
NybergWISC 2022-08-15 09:30:57 -05:00 • committed by Patrick Shriwise
parent bd60956d20
commit 115be68953
3 changed files with 17 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
openmc/stats/multivariate.py
View file

@ -643,7 +643,7 @@ class MeshSpatial(Spatial):
"""
def __init__(self, mesh, strengths=None, volume_normalized=False):
def __init__(self, mesh, strengths=None, volume_normalized=True):
self.mesh = mesh
self.strengths = strengths
self.volume_normalized = volume_normalized

33
src/distribution_spatial.cpp
View file

@ -212,34 +212,27 @@ MeshSpatial::MeshSpatial(pugi::xml_node node)
// Volume scheme is weighted by the volume of each tet
// File scheme is weighted by an array given in the xml file
mesh_strengths_ = std::vector<double>(tot_bins_, 1.0);
if (check_for_node(node, "strengths")) {
mesh_strengths_ = get_node_array<double>(node, "strengths");
if (mesh_strengths_.size() != tot_bins_){
fatal_error("The size of the strengths array from the xml file does not equal the number of elements in the mesh.");
} if (get_node_value_bool(node, "volume_normalized")){
for (int i = 0; i < tot_bins_; i++){
strengths[i] = mesh_strengths_[i]*mesh_ptr_->volume(i);
}
} else if (!get_node_value_bool(node, "volume_normalized")){
for (int i = 0; i < tot_bins_; i++){
strengths[i] = mesh_strengths_[i];
strengths = get_node_array<double>(node, "strengths");
if (strengths.size() != mesh_strengths_.size()){
fatal_error("Number of entries in the strength matrix does not match the number of mesh entities");
}
}
} else if (get_node_value_bool(node, "volume_normalized")){
for (int i = 0; i<tot_bins_; i++){
strengths[i] = mesh_ptr_->volume(i);
}
} else {
for (int i = 0; i<tot_bins_; i++){
strengths[i] = 1;
mesh_strengths_ = strengths;
}
if (get_node_value_bool(node, "volume_normalized")) {
for (int i = 0; i < tot_bins_; i++) {
mesh_strengths_[i] *= mesh_ptr_->volume(i);
}
}
for (int i = 0; i<tot_bins_; i++){
temp_total_strength = temp_total_strength + strengths[i];
temp_total_strength = temp_total_strength + mesh_strengths_[i];
}
total_strength_ = temp_total_strength;
for (int i = 0; i<tot_bins_; i++){
mesh_CDF_[i+1] = mesh_CDF_[i] + strengths[i]/total_strength_;
mesh_CDF_[i+1] = mesh_CDF_[i] + mesh_strengths_[i]/total_strength_;
}
}

4
tests/regression_tests/unstructured_mesh/source_sampling/test.py
View file

@ -35,7 +35,9 @@ class UnstructuredMeshSourceTest(PyAPITestHarness):
average_in_hex = 10.0
# Load in tracks
openmc.Tracks.combine(glob.glob('tracks_p*.h5'))
if config['mpi']:
openmc.Tracks.combine(glob.glob('tracks_p*.h5'))
tracks = openmc.Tracks(filepath='tracks.h5')
tracks_born = np.empty((len(tracks), 1))