Skip to content
Open
Show file tree
Hide file tree
Changes from 45 commits
Commits
Show all changes
84 commits
Select commit Hold shift + click to select a range
dddb144
Implementation of VOV
Greg-biot Nov 21, 2024
0bed61c
Delete src/tallies/tally (1).cpp:Zone.Identifier
Grego01-biot Nov 21, 2024
0406fa5
Delete src/tallies/tally_scoring (1).cpp:Zone.Identifier
Grego01-biot Nov 21, 2024
4aea85e
Modification on VOV formula
Greg-biot Nov 21, 2024
e046bac
Merge between origin and origin/stat_testing
Greg-biot Nov 21, 2024
5a44b61
Modifications of VOV + implementation of FOM
Greg-biot Dec 6, 2024
44763f5
Settings setup + FOM implementation
Greg-biot Dec 11, 2024
7708c4a
VOV for each tally bin implemented without error, ready for testing
Greg-biot Dec 11, 2024
6cc8b0d
Settings modifications + VOV modifications
Greg-biot Dec 18, 2024
bb56602
Merge remote-tracking branch 'upstream/develop' into stat_testing
Greg-biot Dec 18, 2024
66b3c4e
Tally optional VOV attribute
Greg-biot Dec 18, 2024
10d484c
New implementation of VOV + FOM
Greg-biot Jan 16, 2025
bc77d69
To stay up to date
Greg-biot Jan 16, 2025
fb4cdb0
Latest update of VOV and FOM
Greg-biot Feb 4, 2025
ec3eedd
Merge branch 'openmc-dev:develop' into stat_testing
Grego01-biot Feb 4, 2025
7cbf0a9
Missing files for FOM
Greg-biot Feb 4, 2025
dd5b6ae
New FOM and VOV
Feb 14, 2025
f905f0e
VOV implemented in Python API and C++
Feb 15, 2025
980961b
Merge remote-tracking branch 'upstream/develop' into vov_testing
Feb 19, 2025
8cd609d
Merging conflicts
Mar 27, 2025
6c9a608
VOV modifications
Mar 27, 2025
fbd173f
Removal of unnecessary elements for VOV implementation
Mar 27, 2025
4e236bc
test_tallies modified for VOV
Mar 28, 2025
5a6de69
Merge remote-tracking branch 'upstream/develop' into vov_testing
Apr 10, 2025
c94a83e
Python API modifications + addition of VOV flag
Apr 10, 2025
31c4bba
Deleting spaces
Apr 10, 2025
b1ecb55
Normality test and VOV test
Apr 12, 2025
9029b76
Merge remote-tracking branch 'upstream/develop' into vov_testing
Apr 15, 2025
3802484
new modifications for VOV and higher moments tests
Jun 11, 2025
af592d2
solving merging conflicts
Jun 11, 2025
58bf576
New tests for VOV and normality tests
Jun 17, 2025
96be75c
Merge remote-tracking branch 'upstream/develop' into vov_testing
Jun 17, 2025
2a038c7
Merge remote-tracking branch 'upstream/develop' into vov_testing
Aug 12, 2025
5179b45
Modifying the tally.cpp
Aug 18, 2025
0810f29
merging with upstream/develop
Aug 18, 2025
45ee452
New tests and modification of the VOV property
Aug 18, 2025
9be39c3
clang-format
Aug 18, 2025
f0e32be
New tests
Aug 19, 2025
ab8f2a1
matplotlib error
Aug 19, 2025
26b9a6d
New modifications for OpenMC tests
Aug 19, 2025
5411fb6
WW FW cadis mesh tests not passing
Aug 20, 2025
eab7bcb
Merge remote-tracking branch 'upstream/develop' into vov_testing
Aug 20, 2025
1386ffc
All tests passing
Aug 20, 2025
78a84ff
reduce tally results function modified
Aug 20, 2025
bb85820
Tally results planes allocations
Aug 21, 2025
1f17d14
Modifications due to PR comments
Aug 22, 2025
61e46ed
Update openmc/settings.py
Grego01-biot Aug 22, 2025
637c379
Update include/openmc/hdf5_interface.h
Grego01-biot Aug 22, 2025
4457f0e
Update include/openmc/hdf5_interface.h
Grego01-biot Aug 22, 2025
2e1e170
Update openmc/tallies.py
Grego01-biot Aug 22, 2025
da5ba9d
Update openmc/tallies.py
Grego01-biot Aug 22, 2025
67578ce
Update openmc/tallies.py
Grego01-biot Aug 22, 2025
c8d6a13
Update openmc/statepoint.py
Grego01-biot Aug 22, 2025
be41396
Update openmc/tallies.py
Grego01-biot Aug 22, 2025
9969fe1
Update openmc/tallies.py
Grego01-biot Aug 22, 2025
bc59753
Modifications due to comments
Aug 23, 2025
8bae09d
typo
Aug 23, 2025
627f68b
Updates with new properties for skewness and kurtosis despite the nor…
Grego01-biot Aug 31, 2025
6a63f48
Merge remote-tracking branch 'upstream/develop' into vov_testing
Grego01-biot Aug 31, 2025
6ec77e4
Formatting issue with double quotes
Grego01-biot Sep 2, 2025
bce5c5d
Python formatting and cleaning up the files
Grego01-biot Sep 4, 2025
4a222c7
Format comments and spacing in urr.h
Grego01-biot Sep 4, 2025
738cc42
Fix formatting of comments in urr.h
Grego01-biot Sep 4, 2025
9051093
Fix formatting issue in settings.py
Grego01-biot Sep 4, 2025
f0cd06d
Add newline at end of file in statepoint.py
Grego01-biot Sep 4, 2025
f0be4ce
Delete openmc/tally_stats.py
Grego01-biot Sep 4, 2025
c427966
Refactor test_stats.py for consistency and readability
Grego01-biot Sep 4, 2025
b254189
Resolve modify/delete for tally_stats.py during rebase
Grego01-biot Sep 5, 2025
da629ff
Deleting modifications in test_stats.py
Grego01-biot Sep 5, 2025
94ab834
Upstream commits
Grego01-biot Sep 5, 2025
dac8a0c
Delete openmc/tally_stats.py
Grego01-biot Sep 5, 2025
6bc3bf7
Delete tests/geometry.xml
Grego01-biot Sep 5, 2025
b4a0164
Delete tests/model.xml
Grego01-biot Sep 5, 2025
c2a13f0
Delete tests/regression_tests/source_dlopen/CMakeLists.txt
Grego01-biot Sep 5, 2025
ee55f4c
Delete tests/regression_tests/source_parameterized_dlopen/CMakeLists.txt
Grego01-biot Sep 5, 2025
90d1a92
Add newline at end of settings.py
Grego01-biot Sep 5, 2025
ae0b5fd
Fix indentation in return statement
Grego01-biot Sep 5, 2025
5f81e20
Fix missing newline at end of settings.py
Grego01-biot Sep 5, 2025
bbb568f
Clean up return statement in settings.py
Grego01-biot Sep 5, 2025
dabe583
Fix formatting by removing unnecessary whitespace
Grego01-biot Sep 5, 2025
a319c8b
Update test_stats.py
Grego01-biot Sep 5, 2025
58ea0bb
Update test_tallies.py
Grego01-biot Sep 5, 2025
178a31c
Documentation added to tallies.rst
Grego01-biot Sep 5, 2025
4fb5cd6
Merging upstream commit
Grego01-biot Sep 5, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/openmc/constants.h
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ enum class MgxsType {
// ============================================================================
// TALLY-RELATED CONSTANTS

enum class TallyResult { VALUE, SUM, SUM_SQ, SIZE };
enum class TallyResult { VALUE, SUM, SUM_SQ, SIZE, SUM_THIRD, SUM_FOURTH };

enum class TallyType { VOLUME, MESH_SURFACE, SURFACE, PULSE_HEIGHT };

Expand Down
10 changes: 5 additions & 5 deletions include/openmc/hdf5_interface.h
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,8 @@ void read_llong(hid_t obj_id, const char* name, long long* buffer, bool indep);
void read_string(
hid_t obj_id, const char* name, size_t slen, char* buffer, bool indep);

void read_tally_results(
hid_t group_id, hsize_t n_filter, hsize_t n_score, double* results);
void read_tally_results(hid_t group_id, hsize_t n_filter, hsize_t n_score,
double* results, bool vov_results);
void write_attr_double(hid_t obj_id, int ndim, const hsize_t* dims,
const char* name, const double* buffer);
void write_attr_int(hid_t obj_id, int ndim, const hsize_t* dims,
Expand All @@ -114,9 +114,9 @@ void write_int(hid_t group_id, int ndim, const hsize_t* dims, const char* name,
void write_llong(hid_t group_id, int ndim, const hsize_t* dims,
const char* name, const long long* buffer, bool indep);
void write_string(hid_t group_id, int ndim, const hsize_t* dims, size_t slen,
const char* name, char const* buffer, bool indep);
void write_tally_results(
hid_t group_id, hsize_t n_filter, hsize_t n_score, const double* results);
const char* name, const char* buffer, bool indep);
void write_tally_results(hid_t group_id, hsize_t n_filter, hsize_t n_score,
const double* results, bool vov_results);
} // extern "C"

//==============================================================================
Expand Down
6 changes: 6 additions & 0 deletions include/openmc/tallies/tally.h
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,8 @@ class Tally {

bool writable() const { return writable_; }

bool vov_results() const { return vov_; }

//----------------------------------------------------------------------------
// Other methods.

Expand All @@ -119,6 +121,8 @@ class Tally {

void accumulate();

void accumulate_vov();

//! return the index of a score specified by name
int score_index(const std::string& score) const;

Expand Down Expand Up @@ -190,6 +194,8 @@ class Tally {
//! Whether to multiply by atom density for reaction rates
bool multiply_density_ {true};

bool vov_ = {false};

int64_t index_;
};

Expand Down
8 changes: 4 additions & 4 deletions include/openmc/urr.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ class UrrData {
double heating;
};

Interpolation interp_; //!< interpolation type
int inelastic_flag_; //!< inelastic competition flag
int absorption_flag_; //!< other absorption flag
bool multiply_smooth_; //!< multiply by smooth cross section?
Interpolation interp_; //!< interpolation type
int inelastic_flag_; //!< inelastic competition flag
int absorption_flag_; //!< other absorption flag
bool multiply_smooth_; //!< multiply by smooth cross section?

vector<double> energy_; //!< incident energies
auto n_energy() const { return energy_.size(); }
Expand Down
1 change: 1 addition & 0 deletions openmc/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
from openmc.trigger import *
from openmc.tally_derivative import *
from openmc.tallies import *
from openmc.tally_stats import *
from openmc.mgxs_library import *
from openmc.executor import *
from openmc.statepoint import *
Expand Down
2 changes: 1 addition & 1 deletion openmc/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -2077,7 +2077,7 @@ def _max_tracks_from_xml_element(self, root):
text = get_text(root, 'max_tracks')
if text is not None:
self.max_tracks = int(text)

def _random_ray_from_xml_element(self, root):
elem = root.find('random_ray')
if elem is not None:
Expand Down
4 changes: 4 additions & 0 deletions openmc/statepoint.py
Original file line number Diff line number Diff line change
Expand Up @@ -429,6 +429,10 @@ def tallies(self):
if "multiply_density" in group.attrs:
tally.multiply_density = group.attrs["multiply_density"].item() > 0

# Check if tally has vov attribute
if "vov_results" in group.attrs:
tally._vov = group.attrs["vov_results"].item()

# Read the number of realizations
n_realizations = group['n_realizations'][()]

Expand Down
Loading