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

Merge branch 'develop' into expand-natural

Browse source
This commit is contained in:
Paul Romano 2014-04-24 23:06:02 -04:00
commit ff3122ee69
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/CMakeLists.txt
View file

@ -161,7 +161,7 @@ endif()
# git SHA1 hash
#===============================================================================
execute_process(COMMAND git rev-parse -q HEAD
execute_process(COMMAND git rev-parse HEAD
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
RESULT_VARIABLE GIT_SHA1_SUCCESS
OUTPUT_VARIABLE GIT_SHA1

2
tests/test_void/results_true.dat
View file

@ -1,2 +1,2 @@
k-combined:
1.017100E+00 4.424122E-02
9.749932E-01 3.202569E-02

4
tests/test_void/settings.xml
View file

@ -9,8 +9,8 @@
<source>
<space>
<type>box</type>
<parameters>-.6 -.6 5.17 .6 .6 6.17</parameters>
<type>point</type>
<parameters>0.0 0.0 0.0</parameters>
</space>
</source>