incorporate recommended name changes

This commit is contained in:
Gavin Ridley 2020-01-21 13:04:39 -05:00
parent d37688a549
commit 1d33aca9bd
22 changed files with 108 additions and 108 deletions

View file

@ -114,7 +114,7 @@ constexpr int NUCLIDE_NONE {-1};
// CROSS SECTION RELATED CONSTANTS
// Temperature treatment method
enum class TemperatureInterpolationType {
enum class TemperatureMethod {
NEAREST,
INTERPOLATION
};
@ -250,7 +250,7 @@ enum ReactionType {
constexpr std::array<int, 6> DEPLETION_RX {N_GAMMA, N_P, N_A, N_2N, N_3N, N_4N};
enum class UnresolvProbTableParam {
enum class URRTableParam {
CUM_PROB,
TOTAL,
ELASTIC,
@ -376,7 +376,7 @@ enum class Interpolation {
enum class RunMode {
UNSET, // default value, OpenMC throws error if left to this
FIXEDSOURCE,
FIXED_SOURCE,
EIGENVALUE,
PLOTTING,
PARTICLE,

View file

@ -80,7 +80,7 @@ extern std::vector<std::string> res_scat_nuclides; //!< Nuclides using res. ups
extern RunMode run_mode; //!< Run mode (eigenvalue, fixed src, etc.)
extern std::unordered_set<int> sourcepoint_batch; //!< Batches when source should be written
extern std::unordered_set<int> statepoint_batch; //!< Batches when state should be written
extern TemperatureInterpolationType temperature_method; //!< method for choosing temperatures
extern TemperatureMethod temperature_method; //!< method for choosing temperatures
extern double temperature_tolerance; //!< Tolerance in [K] on choosing temperatures
extern double temperature_default; //!< Default T in [K]
extern std::array<double, 2> temperature_range; //!< Min/max T in [K] over which to load xs

View file

@ -84,7 +84,7 @@ class Surface
public:
// Types of available boundary conditions on a surface
enum class Bc {
enum class BoundaryType {
TRANSMIT,
VACUUM,
REFLECT,

View file

@ -15,7 +15,7 @@
namespace openmc {
// Different independent variables
enum class WithRespectTo {
enum class DerivativeVariable {
DENSITY,
NUCLIDE_DENSITY,
TEMPERATURE
@ -23,7 +23,7 @@ enum class WithRespectTo {
struct TallyDerivative {
WithRespectTo variable; //!< Independent variable (like temperature)
DerivativeVariable variable; //!< Independent variable (like temperature)
int id; //!< User-defined identifier
int diff_material; //!< Material this derivative is applied to
int diff_nuclide; //!< Nuclide this material is applied to