Skip to content

Commit

Permalink
Merge pull request #1614 from paulromano/release-0.12
Browse files Browse the repository at this point in the history
Final change for version 0.12.0
  • Loading branch information
Andrew Johnson authored Jul 22, 2020
2 parents 1040276 + 2549c70 commit 93d6165
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
# The short X.Y version.
version = "0.12"
# The full version, including alpha/beta/rc tags.
release = "0.12.0-dev"
release = "0.12.0"

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
14 changes: 7 additions & 7 deletions include/openmc/constants.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ using double_4dvec = std::vector<std::vector<std::vector<std::vector<double>>>>;
constexpr int VERSION_MAJOR {0};
constexpr int VERSION_MINOR {12};
constexpr int VERSION_RELEASE {0};
constexpr bool VERSION_DEV {true};
constexpr bool VERSION_DEV {false};
constexpr std::array<int, 3> VERSION {VERSION_MAJOR, VERSION_MINOR, VERSION_RELEASE};

// HDF5 data format
Expand Down Expand Up @@ -256,7 +256,7 @@ enum class URRTableParam {
ELASTIC,
FISSION,
N_GAMMA,
HEATING
HEATING
};

// Maximum number of partial fission reactions
Expand Down Expand Up @@ -328,7 +328,7 @@ enum class TallyEvent {
LATTICE,
KILL,
SCATTER,
ABSORB
ABSORB
};

// Tally score type -- if you change these, make sure you also update the
Expand Down Expand Up @@ -359,10 +359,10 @@ enum TallyScore {
// Global tally parameters
constexpr int N_GLOBAL_TALLIES {4};
enum class GlobalTally {
K_COLLISION,
K_ABSORPTION,
K_TRACKLENGTH,
LEAKAGE
K_COLLISION,
K_ABSORPTION,
K_TRACKLENGTH,
LEAKAGE
};

// Miscellaneous
Expand Down
2 changes: 1 addition & 1 deletion openmc/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@
# Import a few convencience functions that used to be here
from openmc.model import rectangular_prism, hexagonal_prism

__version__ = '0.12.0-dev'
__version__ = '0.12.0'

0 comments on commit 93d6165

Please sign in to comment.