From 71c3248f1afa8cd290ce88eef7e6a43f0d8235d9 Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Mon, 23 Nov 2015 08:39:32 -0600 Subject: [PATCH 1/4] Increase list depth so 'make latexpdf' works again --- docs/source/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/conf.py b/docs/source/conf.py index 05559aab08..79a7604e39 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -200,7 +200,7 @@ latex_elements = { \usepackage{enumitem} \usepackage{amsfonts} \usepackage{amsmath} -\setlistdepth{9} +\setlistdepth{99} \usepackage{tikz} \usetikzlibrary{shapes,snakes,shadows,arrows,calc,decorations.markings,patterns,fit,matrix,spy} \usepackage{fixltx2e} From 5d65f2557e822406b6b7f1d0a89905b7acfa0804 Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Mon, 23 Nov 2015 08:39:58 -0600 Subject: [PATCH 2/4] Fix warning on definition list in mgxs.Library.get_mgxs --- openmc/mgxs/library.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/openmc/mgxs/library.py b/openmc/mgxs/library.py index 0bf9732549..4a17b95e41 100644 --- a/openmc/mgxs/library.py +++ b/openmc/mgxs/library.py @@ -382,9 +382,7 @@ class Library(object): ---------- domain : Material or Cell or Universe or Integral The material, cell, or universe object of interest (or its ID) - mgxs_type : {'total', 'transport', 'absorption', 'capture', 'fission', - 'nu-fission', 'scatter', 'nu-scatter', 'scatter matrix', - 'nu-scatter matrix', 'chi'} + mgxs_type : {'total', 'transport', 'absorption', 'capture', 'fission', 'nu-fission', 'scatter', 'nu-scatter', 'scatter matrix', 'nu-scatter matrix', 'chi'} The type of multi-group cross section object to return Returns From 556dd2de03ad914b31731f811cb3cdbc48a1c762 Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Fri, 4 Dec 2015 10:38:27 -0600 Subject: [PATCH 3/4] Allow setup.py to be called properly for debian installations --- CMakeLists.txt | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 36501c9185..57a49508b3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -278,14 +278,21 @@ target_link_libraries(${program} ${ldflags} ${HDF5_LIBRARIES} fox_dom) install(TARGETS ${program} RUNTIME DESTINATION bin) install(DIRECTORY src/relaxng DESTINATION share/openmc) install(FILES man/man1/openmc.1 DESTINATION share/man/man1) -install(FILES LICENSE DESTINATION "share/doc/${program}/copyright") +install(FILES LICENSE DESTINATION "share/doc/${program}" RENAME copyright) find_package(PythonInterp) if(PYTHONINTERP_FOUND) - install(CODE "execute_process( - COMMAND ${PYTHON_EXECUTABLE} setup.py install - --prefix=${CMAKE_INSTALL_PREFIX} - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})") + if(debian) + install(CODE "execute_process( + COMMAND ${PYTHON_EXECUTABLE} setup.py install + --root=debian/openmc --install-layout=deb + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})") + else() + install(CODE "execute_process( + COMMAND ${PYTHON_EXECUTABLE} setup.py install + --prefix=${CMAKE_INSTALL_PREFIX} + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})") + endif() endif() #=============================================================================== From ba3a6689b90fd729236f710d03dd23c6ad009dbd Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Fri, 4 Dec 2015 20:31:57 -0600 Subject: [PATCH 4/4] Fix integer kind on arguments to h5tget_size_f and h5tset_size_f --- src/hdf5_interface.F90 | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/hdf5_interface.F90 b/src/hdf5_interface.F90 index 656039d197..fc7a462e6a 100644 --- a/src/hdf5_interface.F90 +++ b/src/hdf5_interface.F90 @@ -1483,7 +1483,7 @@ contains integer(HID_T) :: dspace ! data or file space handle integer(HID_T) :: filetype integer(HID_T) :: memtype - integer(HSIZE_T) :: n + integer(SIZE_T) :: n type(c_ptr) :: f_ptr ! Set up collective vs. independent I/O @@ -1544,8 +1544,8 @@ contains integer(HID_T) :: dspace ! data or file space handle integer(HID_T) :: filetype integer(HID_T) :: memtype - integer(HSIZE_T) :: size - integer(HSIZE_T) :: n + integer(SIZE_T) :: size + integer(SIZE_T) :: n type(c_ptr) :: f_ptr ! Set up collective vs. independent I/O @@ -1628,7 +1628,7 @@ contains integer(HID_T) :: dspace ! data or file space handle integer(HID_T) :: filetype integer(HID_T) :: memtype - integer(HSIZE_T) :: n + integer(SIZE_T) :: n type(c_ptr) :: f_ptr ! Set up collective vs. independent I/O @@ -1644,7 +1644,7 @@ contains ! Create datatype in memory based on Fortran character call h5tcopy_f(H5T_FORTRAN_S1, memtype, hdf5_err) - call h5tset_size_f(memtype, int(len(buffer(1)), HSIZE_T), hdf5_err) + call h5tset_size_f(memtype, int(len(buffer(1)), SIZE_T), hdf5_err) ! Create dataspace/dataset call h5screate_simple_f(1, dims, dspace, hdf5_err) @@ -1706,8 +1706,8 @@ contains integer(HID_T) :: dspace ! data or file space handle integer(HID_T) :: filetype integer(HID_T) :: memtype - integer(HSIZE_T) :: size - integer(HSIZE_T) :: n + integer(SIZE_T) :: size + integer(SIZE_T) :: n type(c_ptr) :: f_ptr ! Set up collective vs. independent I/O