diff --git a/cmake/Modules/FindLIBMESH.cmake b/cmake/Modules/FindLIBMESH.cmake index 82d806343..df5b5b9d8 100644 --- a/cmake/Modules/FindLIBMESH.cmake +++ b/cmake/Modules/FindLIBMESH.cmake @@ -17,5 +17,5 @@ endif() include(FindPkgConfig) set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:${LIBMESH_PC}") set(PKG_CONFIG_USE_CMAKE_PREFIX_PATH True) -pkg_check_modules(LIBMESH REQUIRED ${LIBMESH_PC_FILE}>=1.6.0 IMPORTED_TARGET) -pkg_get_variable(LIBMESH_PREFIX ${LIBMESH_PC_FILE} prefix) \ No newline at end of file +pkg_check_modules(LIBMESH REQUIRED ${LIBMESH_PC_FILE}>=1.7.0 IMPORTED_TARGET) +pkg_get_variable(LIBMESH_PREFIX ${LIBMESH_PC_FILE} prefix) diff --git a/cmake/OpenMCConfig.cmake.in b/cmake/OpenMCConfig.cmake.in index 3279e5ba8..d0e2beb82 100644 --- a/cmake/OpenMCConfig.cmake.in +++ b/cmake/OpenMCConfig.cmake.in @@ -13,7 +13,7 @@ if(@OPENMC_USE_LIBMESH@) include(FindPkgConfig) list(APPEND CMAKE_PREFIX_PATH @LIBMESH_PREFIX@) set(PKG_CONFIG_USE_CMAKE_PREFIX_PATH True) - pkg_check_modules(LIBMESH REQUIRED @LIBMESH_PC_FILE@>=1.6.0 IMPORTED_TARGET) + pkg_check_modules(LIBMESH REQUIRED @LIBMESH_PC_FILE@>=1.7.0 IMPORTED_TARGET) endif() find_package(PNG) diff --git a/src/mesh.cpp b/src/mesh.cpp index de29233fb..664036885 100644 --- a/src/mesh.cpp +++ b/src/mesh.cpp @@ -2393,7 +2393,7 @@ void LibMesh::initialize() Position LibMesh::centroid(int bin) const { const auto& elem = this->get_element_from_bin(bin); - auto centroid = elem.centroid(); + auto centroid = elem.vertex_average(); return {centroid(0), centroid(1), centroid(2)}; } diff --git a/tools/ci/gha-install-libmesh.sh b/tools/ci/gha-install-libmesh.sh index 132963820..d592616ed 100755 --- a/tools/ci/gha-install-libmesh.sh +++ b/tools/ci/gha-install-libmesh.sh @@ -5,7 +5,7 @@ set -ex # libMESH install pushd $HOME mkdir LIBMESH && cd LIBMESH -git clone https://github.com/libmesh/libmesh -b v1.6.0 --recurse-submodules +git clone https://github.com/libmesh/libmesh -b v1.7.0 --recurse-submodules mkdir build && cd build export METHODS="opt"