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

Rename one_group_xs -> collapse_rate

Browse source
This commit is contained in:
Paul Romano 2020-07-28 14:58:56 -05:00
parent 0b572b85d1
commit fb68943ca2
5 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/openmc/nuclide.h
View file

@ -58,7 +58,7 @@ public:
//! from probability tables.
void calculate_urr_xs(int i_temp, Particle& p) const;
double one_group_xs(int MT, gsl::span<const double> energy, gsl::span<const double> flux) const;
double collapse_rate(int MT, gsl::span<const double> energy, gsl::span<const double> flux) const;
// Data members
std::string name_; //!< Name of nuclide, e.g. "U235"

2
include/openmc/reaction.h
View file

@ -27,7 +27,7 @@ public:
//! \param[in] temperatures Desired temperatures for cross sections
explicit Reaction(hid_t group, const std::vector<int>& temperatures);
double one_group_xs(gsl::span<const double> energy, gsl::span<const double> flux, const std::vector<double>& grid) const;
double collapse_rate(gsl::span<const double> energy, gsl::span<const double> flux, const std::vector<double>& grid) const;
//! Cross section at a single temperature
struct TemperatureXS {

6
openmc/lib/nuclide.py
View file

@ -25,7 +25,7 @@ _dll.openmc_load_nuclide.errcheck = _error_handler
_dll.openmc_nuclide_name.argtypes = [c_int, POINTER(c_char_p)]
_dll.openmc_nuclide_name.restype = c_int
_dll.openmc_nuclide_name.errcheck = _error_handler
_dll.openmc_nuclide_one_group_xs.argtypes = [c_int, c_int, _array_1d_dble,
_dll.openmc_nuclide_collapse_rate.argtypes = [c_int, c_int, _array_1d_dble,
_array_1d_dble, c_int, POINTER(c_double)]
_dll.nuclides_size.restype = c_size_t
@ -77,11 +77,11 @@ class Nuclide(_FortranObject):
_dll.openmc_nuclide_name(self._index, name)
return name.value.decode()
def one_group_xs(self, MT, energy, flux):
def collapse_rate(self, MT, energy, flux):
energy = np.asarray(energy, dtype=float)
flux = np.asarray(flux, dtype=float)
xs = c_double()
_dll.openmc_nuclide_one_group_xs(self._index, MT, energy, flux, len(flux), xs)
_dll.openmc_nuclide_collapse_rate(self._index, MT, energy, flux, len(flux), xs)
return xs.value

8
src/nuclide.cpp
View file

@ -908,7 +908,7 @@ void Nuclide::calculate_urr_xs(int i_temp, Particle& p) const
}
double Nuclide::one_group_xs(int MT, gsl::span<const double> energy, gsl::span<const double> flux) const
double Nuclide::collapse_rate(int MT, gsl::span<const double> energy, gsl::span<const double> flux) const
{
Expects(MT > 0);
Expects(energy.size() > 0);
@ -919,7 +919,7 @@ double Nuclide::one_group_xs(int MT, gsl::span<const double> energy, gsl::span<c
const auto& rx = reactions_[i_rx];
const auto& grid = grid_[0].energy;
return rx->one_group_xs(energy, flux, grid);
return rx->collapse_rate(energy, flux, grid);
}
//==============================================================================
@ -1044,14 +1044,14 @@ openmc_nuclide_name(int index, const char** name)
}
extern "C" int
openmc_nuclide_one_group_xs(int index, int MT, const double* energy, const double* flux, int n, double* xs)
openmc_nuclide_collapse_rate(int index, int MT, const double* energy, const double* flux, int n, double* xs)
{
if (index < 0 || index >= data::nuclides.size()) {
set_errmsg("Index in nuclides vector is out of bounds.");
return OPENMC_E_OUT_OF_BOUNDS;
}
*xs = data::nuclides[index]->one_group_xs(MT, {energy, energy + n + 1}, {flux, flux + n});
*xs = data::nuclides[index]->collapse_rate(MT, {energy, energy + n + 1}, {flux, flux + n});
return 0;
}

2
src/reaction.cpp
View file

@ -85,7 +85,7 @@ Reaction::Reaction(hid_t group, const std::vector<int>& temperatures)
}
double
Reaction::one_group_xs(gsl::span<const double> energy, gsl::span<const double> flux, const std::vector<double>& grid) const
Reaction::collapse_rate(gsl::span<const double> energy, gsl::span<const double> flux, const std::vector<double>& grid) const
{
// TODO: Figure out how to deal with temperature
int i_temp = 0;