crp/OpenMC
1
0
Fork 0
mirror of https://github.com/openmc-dev/openmc.git synced 2026-07-27 05:35:49 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Tally.writeable -> Tally.writable

Browse source 
Oops

Co-Authored-By: Paul Romano <paul.k.romano@gmail.com>
This commit is contained in:
Andrew Johnson 2019-09-26 20:34:11 -04:00 • committed by GitHub
parent 72212f60a2
commit 7a1a424d0f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/openmc/capi.h
View file

@ -110,7 +110,7 @@ extern "C" {
int openmc_tally_get_nuclides(int32_t index, int** nuclides, int* n);
int openmc_tally_get_scores(int32_t index, int** scores, int* n);
int openmc_tally_get_type(int32_t index, int32_t* type);
int openmc_tally_get_writeable(int32_t index, bool* writeable);
int openmc_tally_get_writable(int32_t index, bool* writable);
int openmc_tally_reset(int32_t index);
int openmc_tally_results(int32_t index, double** ptr, size_t shape_[3]);
int openmc_tally_set_active(int32_t index, bool active);
@ -120,7 +120,7 @@ extern "C" {
int openmc_tally_set_nuclides(int32_t index, int n, const char** nuclides);
int openmc_tally_set_scores(int32_t index, int n, const char** scores);
int openmc_tally_set_type(int32_t index, const char* type);
int openmc_tally_set_writeable(int32_t index, bool writeable);
int openmc_tally_set_writable(int32_t index, bool writable);
int openmc_zernike_filter_get_order(int32_t index, int* order);
int openmc_zernike_filter_get_params(int32_t index, double* x, double* y, double* r);
int openmc_zernike_filter_set_order(int32_t index, int order);

2
include/openmc/tallies/tally.h
View file

@ -99,7 +99,7 @@ public:
xt::xtensor<double, 3> results_;
//! True if this tally should be written to statepoint files
bool writeable_ {true};
bool writable_ {true};
//----------------------------------------------------------------------------
// Miscellaneous public members.

2
openmc/deplete/abc.py
View file

@ -539,7 +539,7 @@ class TalliedFissionYieldHelper(FissionYieldHelper):
# Tally group-wise fission reaction rates
self._fission_rate_tally = Tally()
self._fission_rate_tally.writeable = False
self._fission_rate_tally.writable = False
self._fission_rate_tally.scores = ['fission']
self._fission_rate_tally.filters = [MaterialFilter(materials)]

6
openmc/deplete/helpers.py
View file

@ -59,7 +59,7 @@ class DirectReactionRateHelper(ReactionRateHelper):
``"(n, gamma)"``, needed for the reaction rate tally.
"""
self._rate_tally = Tally()
self._rate_tally.writeable = False
self._rate_tally.writable = False
self._rate_tally.scores = scores
self._rate_tally.filters = [MaterialFilter(materials)]
@ -195,7 +195,7 @@ class EnergyScoreHelper(EnergyHelper):
"""
self._tally = Tally()
self._tally.writeable = False
self._tally.writable = False
self._tally.scores = [self.score]
def reset(self):
@ -572,7 +572,7 @@ class AveragedFissionYieldHelper(TalliedFissionYieldHelper):
func_filter = EnergyFunctionFilter()
func_filter.set_data((0, self._upper_energy), (0, self._upper_energy))
weighted_tally = Tally()
weighted_tally.writeable = False
weighted_tally.writable = False
weighted_tally.scores = ['fission']
weighted_tally.filters = filters + [func_filter]
self._weighted_tally = weighted_tally

26
openmc/lib/tally.py
View file

@ -53,9 +53,9 @@ _dll.openmc_tally_get_scores.errcheck = _error_handler
_dll.openmc_tally_get_type.argtypes = [c_int32, POINTER(c_int32)]
_dll.openmc_tally_get_type.restype = c_int
_dll.openmc_tally_get_type.errcheck = _error_handler
_dll.openmc_tally_get_writeable.argtypes = [c_int32, POINTER(c_bool)]
_dll.openmc_tally_get_writeable.restype = c_int
_dll.openmc_tally_get_writeable.errcheck = _error_handler
_dll.openmc_tally_get_writable.argtypes = [c_int32, POINTER(c_bool)]
_dll.openmc_tally_get_writable.restype = c_int
_dll.openmc_tally_get_writable.errcheck = _error_handler
_dll.openmc_tally_reset.argtypes = [c_int32]
_dll.openmc_tally_reset.restype = c_int
_dll.openmc_tally_reset.errcheck = _error_handler
@ -84,9 +84,9 @@ _dll.openmc_tally_set_scores.errcheck = _error_handler
_dll.openmc_tally_set_type.argtypes = [c_int32, c_char_p]
_dll.openmc_tally_set_type.restype = c_int
_dll.openmc_tally_set_type.errcheck = _error_handler
_dll.openmc_tally_set_writeable.argtypes = [c_int32, c_bool]
_dll.openmc_tally_set_writeable.restype = c_int
_dll.openmc_tally_set_writeable.errcheck = _error_handler
_dll.openmc_tally_set_writable.argtypes = [c_int32, c_bool]
_dll.openmc_tally_set_writable.restype = c_int
_dll.openmc_tally_set_writable.errcheck = _error_handler
_dll.tallies_size.restype = c_size_t
@ -351,14 +351,14 @@ class Tally(_FortranObjectWithID):
return std_dev
@property
def writeable(self):
writeable = c_bool()
_dll.openmc_tally_get_writeable(self._index, writeable)
return writeable.value
def writable(self):
writable = c_bool()
_dll.openmc_tally_get_writable(self._index, writable)
return writable.value
@writeable.setter
def writeable(self, writeable):
_dll.openmc_tally_set_writeable(self._index, writeable)
@writable.setter
def writable(self, writable):
_dll.openmc_tally_set_writable(self._index, writable)
def reset(self):
"""Reset results and num_realizations of tally"""