diff --git a/apptainer/mpich.def b/apptainer/mpich.def index 5c6baac8f7ed..0b07aa2aa16c 100644 --- a/apptainer/mpich.def +++ b/apptainer/mpich.def @@ -4,11 +4,15 @@ {#- Optional jinja arguments -#} {#- ALTERNATE_FROM: Set an alternate from (currently supported: rocky9) -#} +{%- if ALTERNATE_FROM == "clang" %} +Bootstrap: docker +{%- else %} BootStrap: oras +{%- endif %} {%- if ALTERNATE_FROM == "rocky9" %} From: mooseharbor.hpc.inl.gov/moose-hpcbase/rocky9-{{ ARCH }}:9.0-0 {%- elif ALTERNATE_FROM == "clang" %} -From: mooseharbor.hpc.inl.gov/moose-hpcbase/rocky8-clang-{{ ARCH }}:8.6-0 +From: rockylinux:8 {%- elif ALTERNATE_FROM == "cuda" %} From: mooseharbor.hpc.inl.gov/moose-hpcbase/rocky8-cuda-{{ ARCH }}:8.6-cuda11.4.0-0 {%- else %} @@ -20,8 +24,12 @@ From: harbor.hpc.inl.gov/hpcbase/mpi_03:1.1.0 export LC_ALL=C %post +{%- if ALTERNATE_FROM == "clang" %} + export MOOSE_MPICH_DIR=${MOOSE_MPICH_DIR:-"/opt/mpi/mpich-4.1.2"} +{%- else %} export MOOSE_MPICH_DIR=${MOOSE_MPICH_DIR:-"/opt/mpi/mpich-3.4.3"} export MOOSE_OPENMPI_DIR=${MOOSE_OPENMPI_DIR:-"/opt/mpi/openmpi-4.1.5"} +{%- endif %} # Get the RHEL version RHEL_VERSION=$(awk -F'=' '/VERSION_ID/{ gsub(/"/,""); print $2}' /etc/os-release) @@ -44,6 +52,14 @@ From: harbor.hpc.inl.gov/hpcbase/mpi_03:1.1.0 libtirpc libtirpc-devel zlib-devel patch patchutils epel-release file \ libpng libpng-devel unzip jq valgrind cppunit doxygen fftw-devel gsl-devel \ libtool autoconf automake cppunit-devel + +{%- if ALTERNATE_FROM == "clang" %} + # Installing Clang, and its dependencies + dnf install -y clang.x86_64 clang-devel.x86_64 clang-libs.x86_64 clang-tools-extra.x86_64 \ + git-clang-format.x86_64 python3-clang.x86_64 clang-analyzer.noarch \ + libomp.x86_64 gcc-toolset-12-gcc-gfortran.x86_64 lldb +{%- endif %} + # After epel-release dnf install -y glpk-devel patchelf lcov @@ -99,10 +115,46 @@ EOF cd git-lfs-3.2.0 ./install.sh +{%- if ALTERNATE_FROM == "clang" %} + # Build and Install MPICH Clang + mkdir ${TEMP_LOC}/mpich + cd ${TEMP_LOC}/mpich + curl -L -O http://www.mpich.org/static/downloads/4.1.2/mpich-4.1.2.tar.gz + tar -xf mpich-4.1.2.tar.gz + mkdir mpich-4.1.2/build + cd mpich-4.1.2/build + export PATH=/opt/rh/gcc-toolset-12/root/bin:${PATH} + export LD_LIBRARY_PATH=/opt/rh/gcc-toolset-12/root/lib:/opt/rh/gcc-toolset-12/root/lib64:${LD_LIBRARY_PATH} + ../configure --prefix=${MOOSE_MPICH_DIR} \ + --enable-shared \ + --enable-sharedlibs=clang \ + --enable-fast=O2 \ + --enable-debuginfo \ + --enable-totalview \ + --enable-two-level-namespace \ + CC=clang \ + CXX=clang++ \ + FC=gfortran \ + F77=gfortran \ + F90='' \ + CFLAGS='' \ + CXXFLAGS='' \ + FFLAGS='-fallow-argument-mismatch' \ + FCFLAGS='-fallow-argument-mismatch' \ + F90FLAGS='' \ + F77FLAGS='' + make -j ${MOOSE_JOBS:-6} + make install +{%- endif %} + # Basic script for setting mpich environment USE_MPI_SCRIPT='export LD_LIBRARY_PATH=${MOOSE_MPI_DIR}/lib:${LD_LIBRARY_PATH} export MANPATH=${MOOSE_MPI_DIR}/share/man:${MANPATH} export PATH=${MOOSE_MPI_DIR}/bin:${PATH} +{%- if ALTERNATE_FROM == "clang" %} +export PATH=/opt/rh/gcc-toolset-12/root/bin:${PATH} +export LD_LIBRARY_PATH=/opt/rh/gcc-toolset-12/root/lib:/opt/rh/gcc-toolset-12/root/lib64:${LD_LIBRARY_PATH} +{%- endif %} export CC=mpicc CXX=mpicxx FC=mpif90 F90=mpif90 F77=mpif77' # Add script for loading mpich environment diff --git a/conda/libmesh-vtk/conda_build_config.yaml b/conda/libmesh-vtk/conda_build_config.yaml index 71654cb29052..3c186e387d6e 100644 --- a/conda/libmesh-vtk/conda_build_config.yaml +++ b/conda/libmesh-vtk/conda_build_config.yaml @@ -1,5 +1,5 @@ moose_mpich: - - moose-mpich 4.0.2 build_12 + - moose-mpich 4.0.2 build_13 #### Darwin SDK SYSROOT CONDA_BUILD_SYSROOT: # [osx] diff --git a/conda/libmesh-vtk/meta.yaml b/conda/libmesh-vtk/meta.yaml index 8dd335e6376f..c105324655ab 100644 --- a/conda/libmesh-vtk/meta.yaml +++ b/conda/libmesh-vtk/meta.yaml @@ -3,7 +3,7 @@ # libmesh/* # # As well as any directions pertaining to modifying those files. -{% set build = 5 %} +{% set build = 6 %} {% set vtk_version = "9.2.6" %} {% set vtk_friendly_version = "9.2" %} {% set sha256 = "06fc8d49c4e56f498c40fcb38a563ed8d4ec31358d0101e8988f0bb4d539dd12" %} diff --git a/conda/libmesh/conda_build_config.yaml b/conda/libmesh/conda_build_config.yaml index 1187d6fe143b..147a7cb42389 100644 --- a/conda/libmesh/conda_build_config.yaml +++ b/conda/libmesh/conda_build_config.yaml @@ -1,8 +1,8 @@ moose_petsc: - - moose-petsc 3.20.0 build_0 + - moose-petsc 3.20.0 build_1 moose_libmesh_vtk: - - moose-libmesh-vtk 9.2.6 build_5 + - moose-libmesh-vtk 9.2.6 build_6 #### Darwin SDK SYSROOT CONDA_BUILD_SYSROOT: # [osx] diff --git a/conda/libmesh/meta.yaml b/conda/libmesh/meta.yaml index 2a1461d2f6e5..b234e1b117bb 100644 --- a/conda/libmesh/meta.yaml +++ b/conda/libmesh/meta.yaml @@ -4,8 +4,8 @@ # # As well as any directions pertaining to modifying those files. # ALSO: Follow the directions in scripts/tests/versioner_hashes.yaml -{% set build = 4 %} -{% set version = "2023.09.06" %} +{% set build = 0 %} +{% set version = "2023.11.06" %} {% set vtk_friendly_version = "9.2" %} # permanent diff --git a/conda/moose-dev/conda_build_config.yaml b/conda/moose-dev/conda_build_config.yaml index 553d44a26803..04e90ddb64b5 100644 --- a/conda/moose-dev/conda_build_config.yaml +++ b/conda/moose-dev/conda_build_config.yaml @@ -1,11 +1,11 @@ moose_libmesh: - - moose-libmesh 2023.09.06 build_4 + - moose-libmesh 2023.11.06 build_0 moose_wasp: - - moose-wasp 2023.10.24 + - moose-wasp 2023.11.06 moose_tools: - moose-tools 2023.10.27 moose_peacock: - - moose-peacock 2023.10.23 + - moose-peacock 2023.11.06 diff --git a/conda/moose-dev/meta.yaml b/conda/moose-dev/meta.yaml index ba85b4f31ccd..1837c0ce2bd5 100644 --- a/conda/moose-dev/meta.yaml +++ b/conda/moose-dev/meta.yaml @@ -3,8 +3,11 @@ # moose/conda_build_config.yaml # template/conda_build_config.yaml # +# And documentation: +# framework/doc/packages_config.yml +# # As well as any directions pertaining to modifying those files. -{% set version = "2023.10.27" %} +{% set version = "2023.11.06" %} package: name: moose-dev diff --git a/conda/moose/conda_build_config.yaml b/conda/moose/conda_build_config.yaml index 6f225dfdec37..2bf78eb8f5c4 100644 --- a/conda/moose/conda_build_config.yaml +++ b/conda/moose/conda_build_config.yaml @@ -1,5 +1,5 @@ moose_dev: - - moose-dev 2023.10.27 + - moose-dev 2023.11.06 #### Darwin SDK SYSROOT CONDA_BUILD_SYSROOT: # [osx] diff --git a/conda/mpich/meta.yaml b/conda/mpich/meta.yaml index 2a72f050df18..029af9317e97 100644 --- a/conda/mpich/meta.yaml +++ b/conda/mpich/meta.yaml @@ -6,7 +6,7 @@ # # As well as any directions pertaining to modifying those files. # ALSO: Follow the directions in scripts/tests/versioner_hashes.yaml -{% set build = 12 %} +{% set build = 13 %} {% set version = "4.0.2" %} # permanent diff --git a/conda/peacock/conda_build_config.yaml b/conda/peacock/conda_build_config.yaml index 0721d5ea1795..736ead8a8b76 100644 --- a/conda/peacock/conda_build_config.yaml +++ b/conda/peacock/conda_build_config.yaml @@ -1,5 +1,5 @@ moose_mpich: - - moose-mpich 4.0.2 build_12 + - moose-mpich 4.0.2 build_13 # Pesky packages that break internal CI # Note: Modifying/Updating this will require changes to conda/mpich! diff --git a/conda/peacock/meta.yaml b/conda/peacock/meta.yaml index 30b745f53a6e..6097086edd53 100644 --- a/conda/peacock/meta.yaml +++ b/conda/peacock/meta.yaml @@ -3,7 +3,7 @@ # moose-dev/* # # As well as any directions pertaining to modifying those files. -{% set version = "2023.10.23" %} +{% set version = "2023.11.06" %} package: name: moose-peacock diff --git a/conda/petsc/conda_build_config.yaml b/conda/petsc/conda_build_config.yaml index 71654cb29052..3c186e387d6e 100644 --- a/conda/petsc/conda_build_config.yaml +++ b/conda/petsc/conda_build_config.yaml @@ -1,5 +1,5 @@ moose_mpich: - - moose-mpich 4.0.2 build_12 + - moose-mpich 4.0.2 build_13 #### Darwin SDK SYSROOT CONDA_BUILD_SYSROOT: # [osx] diff --git a/conda/petsc/meta.yaml b/conda/petsc/meta.yaml index f5fd9b89d716..4f9bbf9cbd77 100644 --- a/conda/petsc/meta.yaml +++ b/conda/petsc/meta.yaml @@ -2,9 +2,12 @@ # REMEMBER TO UPDATE the .yaml files for the following packages: # libmesh/* # +# And documentation: +# framework/doc/packages_config.yml +# # As well as any directions pertaining to modifying those files. # ALSO: Follow the directions in scripts/tests/versioner_hashes.yaml -{% set build = 0 %} +{% set build = 1 %} {% set version = "3.20.0" %} # permanent diff --git a/conda/pyhit/conda_build_config.yaml b/conda/pyhit/conda_build_config.yaml index 5f62695f0b78..d1406514d262 100644 --- a/conda/pyhit/conda_build_config.yaml +++ b/conda/pyhit/conda_build_config.yaml @@ -1,5 +1,5 @@ moose_wasp: - moose-wasp 2023.10.24 + moose-wasp 2023.11.06 moose_python: - python 3.10 diff --git a/conda/pyhit/meta.yaml b/conda/pyhit/meta.yaml index 15a8dd032c4f..0f2a2bf1efe2 100644 --- a/conda/pyhit/meta.yaml +++ b/conda/pyhit/meta.yaml @@ -1,5 +1,4 @@ -{% set build = 0 %} -{% set version = "2023.10.24" %} +{% set version = "2023.11.06" %} package: name: moose-pyhit @@ -9,7 +8,8 @@ source: git_url: https://github.com/milljm/moose-pyhit.git build: - number: # [linux,osx] + number: 0 + string: build_0 skip: true # [win] pin_depends: record diff --git a/conda/template/conda_build_config.yaml b/conda/template/conda_build_config.yaml index 6f225dfdec37..2bf78eb8f5c4 100644 --- a/conda/template/conda_build_config.yaml +++ b/conda/template/conda_build_config.yaml @@ -1,5 +1,5 @@ moose_dev: - - moose-dev 2023.10.27 + - moose-dev 2023.11.06 #### Darwin SDK SYSROOT CONDA_BUILD_SYSROOT: # [osx] diff --git a/conda/wasp/meta.yaml b/conda/wasp/meta.yaml index d139c112752a..655e96d890c2 100644 --- a/conda/wasp/meta.yaml +++ b/conda/wasp/meta.yaml @@ -5,9 +5,7 @@ # # As well as any directions pertaining to modifying those files. # ALSO: Follow the directions in scripts/tests/versioner_hashes.yaml -{% set build = 0 %} -{% set strbuild = "build_" + build|string %} -{% set version = "2023.10.24" %} +{% set version = "2023.11.06" %} package: name: moose-wasp @@ -18,8 +16,8 @@ source: - path: ../../scripts/configure_wasp.sh build: - number: {{ build }} - string: {{ strbuild }} + number: 0 + string: build_0 skip: true # [win] script_env: - MOOSE_JOBS diff --git a/docker_ci/Dockerfile b/docker_ci/Dockerfile index 000b7b300a85..c63e306234a6 100644 --- a/docker_ci/Dockerfile +++ b/docker_ci/Dockerfile @@ -114,7 +114,7 @@ if [ ! -d $PETSC_DIR/lib/petsc ]; then exit 1; fi #-----------------------------------------------------------------------------# # Install Libmesh to system path #-----------------------------------------------------------------------------# -ARG LIBMESH_REV=ceff84386bdc83d87e9eb98ac3a9b745711e415a +ARG LIBMESH_REV=b2248b506847fd72d37cff56b6f4d8432f6c7e92 ARG LIBMESH_OPTIONS ARG LIBMESH_METHODS="opt dbg" ENV LIBMESH_DIR=/usr/local \ diff --git a/framework/doc/packages_config.yml b/framework/doc/packages_config.yml index c499a7988855..7ba0f9f6c1aa 100644 --- a/framework/doc/packages_config.yml +++ b/framework/doc/packages_config.yml @@ -5,4 +5,5 @@ minimum_clang: 10.0.1 minimum_python: 3.7 mpich: 4.0.2 petsc_alt: 3.11.4 -petsc: 3.16.6 +petsc: 3.20.0 +moose_dev: 2023.11.06 diff --git a/framework/include/utils_nonunity/SymmetricRankTwoTensor.h b/framework/include/utils_nonunity/SymmetricRankTwoTensor.h index b65ebdf7e80b..f480f449a3ee 100644 --- a/framework/include/utils_nonunity/SymmetricRankTwoTensor.h +++ b/framework/include/utils_nonunity/SymmetricRankTwoTensor.h @@ -143,9 +143,6 @@ class SymmetricRankTwoTensorTempl const T & S11, const T & S22, const T & S33, const T & S23, const T & S13, const T & S12); public: - /// Copy assignment operator must be defined if used - SymmetricRankTwoTensorTempl(const SymmetricRankTwoTensorTempl & a) = default; - /// Copy constructor from TensorValue explicit SymmetricRankTwoTensorTempl(const TensorValue & a); diff --git a/framework/src/meshgenerators/XYDelaunayGenerator.C b/framework/src/meshgenerators/XYDelaunayGenerator.C index 8c0ddae244ca..950edcbec079 100644 --- a/framework/src/meshgenerators/XYDelaunayGenerator.C +++ b/framework/src/meshgenerators/XYDelaunayGenerator.C @@ -363,7 +363,9 @@ XYDelaunayGenerator::generate() next_hole_boundary_point[mh.point(pi - 1)] = mh.point(pi); next_hole_boundary_point[mh.point(np - 1)] = mh.point(0); +#ifndef NDEBUG int found_hole_sides = 0; +#endif for (auto elem : hole_mesh.element_ptr_range()) { if (elem->dim() != 2) @@ -377,14 +379,18 @@ XYDelaunayGenerator::generate() if (it_s->second == elem->point((s + 1) % ns)) { hole_boundary_info.add_side(elem, s, new_hole_bcid); +#ifndef NDEBUG ++found_hole_sides; +#endif } } } mooseAssert(found_hole_sides == np, "Failed to find full outer boundary of meshed hole"); auto & mesh_boundary_info = mesh->get_boundary_info(); +#ifndef NDEBUG int found_inner_sides = 0; +#endif for (auto elem : mesh->element_ptr_range()) { auto ns = elem->n_sides(); @@ -395,7 +401,9 @@ XYDelaunayGenerator::generate() if (it_s->second == elem->point(s)) { mesh_boundary_info.add_side(elem, s, inner_bcid); +#ifndef NDEBUG ++found_inner_sides; +#endif } } } diff --git a/framework/src/utils/FillBetweenPointVectorsTools.C b/framework/src/utils/FillBetweenPointVectorsTools.C index f28da3ab8b6c..5f2ea8a419c9 100644 --- a/framework/src/utils/FillBetweenPointVectorsTools.C +++ b/framework/src/utils/FillBetweenPointVectorsTools.C @@ -508,13 +508,11 @@ isBoundarySimpleClosedLoop(MeshBase & mesh, max_node_radius = 0.0; BoundaryInfo & boundary_info = mesh.get_boundary_info(); auto side_list_tmp = boundary_info.build_side_list(); - unsigned int elem_counter = 0; std::vector> boundary_node_assm; for (unsigned int i = 0; i < side_list_tmp.size(); i++) { if (std::get<2>(side_list_tmp[i]) == bid) { - elem_counter++; // store two nodes of each side boundary_node_assm.push_back(std::make_pair(mesh.elem_ptr(std::get<0>(side_list_tmp[i])) ->side_ptr(std::get<1>(side_list_tmp[i])) diff --git a/libmesh b/libmesh index ceff84386bdc..b2248b506847 160000 --- a/libmesh +++ b/libmesh @@ -1 +1 @@ -Subproject commit ceff84386bdc83d87e9eb98ac3a9b745711e415a +Subproject commit b2248b506847fd72d37cff56b6f4d8432f6c7e92 diff --git a/modules/doc/content/getting_started/installation/install_conda_moose.md b/modules/doc/content/getting_started/installation/install_conda_moose.md index a77ea24ac3d6..8d378cb952bf 100644 --- a/modules/doc/content/getting_started/installation/install_conda_moose.md +++ b/modules/doc/content/getting_started/installation/install_conda_moose.md @@ -5,9 +5,9 @@ Create a unique conda environment for [!ac](MOOSE), named `moose`, and install t packages: !style-end! -```bash -mamba create -n moose moose-dev -``` +!package! code +mamba create -n moose moose-dev=__MOOSE_DEV__ +!package-end! After the installation completes, activate the new environment: diff --git a/modules/doc/content/getting_started/installation/true_update_conda.md b/modules/doc/content/getting_started/installation/true_update_conda.md index a043965e314d..e468041766a7 100644 --- a/modules/doc/content/getting_started/installation/true_update_conda.md +++ b/modules/doc/content/getting_started/installation/true_update_conda.md @@ -1,9 +1,11 @@ Update Conda: -```bash +!package! code +mamba activate base +mamba env remove -n moose +mamba create moose moose-dev=__MOOSE_DEV__ mamba activate moose -mamba update moose-dev -``` +!package-end! !alert note title=Always Update MOOSE and the Conda/Mamba packages together There is a tight dependency between libraries being provided by Conda, and what libraries MOOSE diff --git a/modules/doc/content/help/faq/build_issues.md b/modules/doc/content/help/faq/build_issues.md index 28ed4695208a..7b533bfea6be 100644 --- a/modules/doc/content/help/faq/build_issues.md +++ b/modules/doc/content/help/faq/build_issues.md @@ -7,10 +7,12 @@ date. - Verify the Conda Environment is active and up to date, with the latest version of our moose packages: - ```bash + !package! code + mamba activate base + mamba env remove -n moose + mamba create -n moose moose-dev=__MOOSE_DEV__ mamba activate moose - mamba update moose-dev - ``` + !package-end! if `mamba activate moose` failed, see [Conda Issues](help/troubleshooting.md#condaissues) above. diff --git a/modules/doc/content/help/faq/conda_issues.md b/modules/doc/content/help/faq/conda_issues.md index ae6eb4b303a5..d2ab524cb32c 100644 --- a/modules/doc/content/help/faq/conda_issues.md +++ b/modules/doc/content/help/faq/conda_issues.md @@ -115,12 +115,12 @@ section for what may look familiar, and follow those instructions: The quick fix-attempt, is to delete the faulty environment and re-install it: - ```bash + !package! code mamba activate base mamba env remove -n moose - mamba create -n moose moose-dev + mamba create -n moose moose-dev=__MOOSE_DEV__ mamba activate moose - ``` + !package-end! If the above re-install method ultimately failed, it is time to submit your errors to the [discussion forum](faq/discussion_forum.md). diff --git a/modules/doc/content/ncrc/applications/ncrc_develop.md.template b/modules/doc/content/ncrc/applications/ncrc_develop.md.template index 17722715fc4d..3f821a73e6f1 100644 --- a/modules/doc/content/ncrc/applications/ncrc_develop.md.template +++ b/modules/doc/content/ncrc/applications/ncrc_develop.md.template @@ -21,9 +21,9 @@ operating on one of our [!ac](INL) [!ac](HPC) clusters, you need only load a cou - If +Personal Machine+: Follow the [Conda Installation](ncrc/applications/ncrc_install_conda.md) instructions and then install our MOOSE Conda packages: - ```bash - mamba create -n moose moose-dev - ``` +!package! code + mamba create -n moose moose-dev=__MOOSE_DEV__ +!package-end! - If +[!ac](INL) [!ac](HPC) Sawtooth or Lemhi+ (required each time you log in): @@ -117,10 +117,12 @@ either a Conda update, or rebuild PETSc/libMesh: - If +Personal Machine (Conda)+: - ```bash + !package! code + mamba activate base + mamba env remove -n moose + mamba create -n moose moose-dev=__MOOSE_DEV__ mamba activate moose - mamba update moose-dev - ``` + !package-end! - If +[!ac](INL) [!ac](HPC) Sawtooth or Lemhi+: diff --git a/modules/doc/content/newsletter/2023/2023_11.md b/modules/doc/content/newsletter/2023/2023_11.md index c09382086130..9609116ccf8e 100644 --- a/modules/doc/content/newsletter/2023/2023_11.md +++ b/modules/doc/content/newsletter/2023/2023_11.md @@ -16,6 +16,49 @@ when transferring between applications. ## libMesh-level Changes +### `2023.11.06` Update + +- Added low-order `RAVIART_THOMAS` finite element support, including + general H(div) mapping support for future divergence-conforming + finite element families. Added `L2_RAVIART_THOMAS` support for the + broken/L2 version of that space. Example codes for each, using mixed + and hybridized formulations. +- Option to remove a boundary id globally from a mesh without + re-preparing it afterward +- Option to merge subdomains when stitching meshes based on inspection + of both subdomain ids and subdomain names +- Better matching of input file ids when reading Abaqus files +- Fixes for independent control over which variables see p-refinement +- Added `QBase::clone()` method +- Added parameter for user-supplied hash when doing Just-In-Time + compilation with fparser +- Added `Packing` specializations for `Eigen` matrices; this enables + parallel communication of these classes and of many derived types + including them. +- Bug fixes for nodal interpolation of rational elements; this + corrects an error in VTK output of many IsoGeometric Analysis mesh + results. +- Bug fix for overzealous caching of rational elements' shape + functions. This corrects an error in computation on many + IsoGeometric Analysis meshes +- Bug fixes for refinement of Tet14 elements. +- More robust `reduced_basis` EIM error indicator calculations +- Higher-order default quadrature choice in integration-based error + estimators and error indicators, avoiding underintegration on + superconvergent results +- Removal of Fortran/C++ detection for HDF5 libraries, so we can more + easily find the desired C HDF5 library we do use. +- Upgrade to latest autotools versions in libMesh, TIMPI, and + MetaPhysicL +- Update VTK compatibility to support VTK 9.3 +- GCC warning workarounds to allow --enable-werror builds with -Wextra + in GCC 13 +- Minor refactoring in Threads/PerfLog interactions +- More parallel synchronization assertions during System setup and + update operations +- Minor fixes to documentation, comments, and unit tests, including + VexCL-enabled unit tests of MetaPhysicL + ## PETSc-level Changes ## Bug Fixes and Minor Enhancements diff --git a/modules/reactor/src/meshgenerators/PolygonConcentricCircleMeshGeneratorBase.C b/modules/reactor/src/meshgenerators/PolygonConcentricCircleMeshGeneratorBase.C index 19c52c8abb1f..8bf68219c538 100644 --- a/modules/reactor/src/meshgenerators/PolygonConcentricCircleMeshGeneratorBase.C +++ b/modules/reactor/src/meshgenerators/PolygonConcentricCircleMeshGeneratorBase.C @@ -710,7 +710,6 @@ PolygonConcentricCircleMeshGeneratorBase::generate() // Set up customized Block Names and/or IDs unsigned int block_it = 0; unsigned ring_block_num = 0; - unsigned background_block_num = 1; std::vector block_ids_old; std::vector block_ids_new; std::vector block_names; @@ -722,7 +721,6 @@ PolygonConcentricCircleMeshGeneratorBase::generate() { if (_background_intervals > 1) { - background_block_num++; block_ids_old.push_back(_block_id_shift + 1 + block_it); block_ids_new.push_back(_background_block_ids.empty() ? block_ids_old.back() : _background_block_ids.front()); diff --git a/scripts/tests/versioner_hashes.yaml b/scripts/tests/versioner_hashes.yaml index b5b9b6b11026..0dade98d41bd 100644 --- a/scripts/tests/versioner_hashes.yaml +++ b/scripts/tests/versioner_hashes.yaml @@ -153,3 +153,9 @@ d5e3e09267e1f2b47684a089150bec587178e1cf: #25784 libmesh: 50463c4 moose: 176f779 wasp: 2fdee60 +48886cc54d59c608feeb74572833469b892477c1: #25939 + mpich: e018192 + petsc: a7b458a + libmesh: 9ed7d66 + moose: c223a73 + wasp: 3740200 diff --git a/scripts/update_and_rebuild_wasp.sh b/scripts/update_and_rebuild_wasp.sh index 2571c6275e47..70b4b79c352c 100755 --- a/scripts/update_and_rebuild_wasp.sh +++ b/scripts/update_and_rebuild_wasp.sh @@ -38,71 +38,40 @@ fi # If we are going fast then check and make sure the build directory exists if [[ -n "${FAST}" ]] ; then - if [[ ! -d "${WASP_SRC_DIR}"/build ]] ; then - echo "Error: a build directory must exist to use the --fast option" - exit 1 - fi - cd "${WASP_SRC_DIR}"/build # If we are not going fast then update WASP, remove build, and reconfigure - else - git rev-parse 2> /dev/null - if [[ $? -eq 0 ]] && [ -z "$SKIP_SUBMODULE_UPDATE" ]; then - git submodule update --init --recursive "${WASP_SRC_DIR}" - if [[ $? -ne 0 ]] ; then - echo "Error: git submodule update failed to complete successfully" - mkdir -p "${WASP_SRC_DIR}" - exit 1 - fi - fi rm -rf "${WASP_SRC_DIR}"/build - mkdir -p "${WASP_SRC_DIR}"/build - cd "${WASP_SRC_DIR}"/build - - WASP_OPTIONS="-DCMAKE_INSTALL_PREFIX:STRING=${WASP_SRC_DIR}/install" - + WASP_OPTIONS="-DCMAKE_INSTALL_PREFIX:STRING=${WASP_PREFIX:-${WASP_SRC_DIR}/install}" source $SCRIPT_DIR/configure_wasp.sh - configure_wasp "$WASP_OPTIONS" ../ $* - if [[ $? -ne 0 ]] ; then - echo "Error: configure step for WASP failed to complete successfully" - exit 1 - fi - fi # Build with MOOSE_JOBS jobs if defined, otherwise build with a single job - make -j ${MOOSE_JOBS:-1} install - if [[ $? -ne 0 ]] ; then - echo "Error: build step for WASP failed to complete successfully" - exit 1 - fi - exit 0 diff --git a/scripts/versioner.yaml b/scripts/versioner.yaml index 8e81e7f6cb8c..802fd27ba169 100644 --- a/scripts/versioner.yaml +++ b/scripts/versioner.yaml @@ -42,6 +42,7 @@ packages: - conda/libmesh-vtk/build.sh wasp: influential: + - scripts/update_and_rebuild_wasp.sh - framework/contrib/wasp - conda/wasp/meta.yaml - conda/wasp/conda_build_config.yaml @@ -55,6 +56,8 @@ packages: influential: - apptainer/moose.def - apptainer/remove_channels.def + - conda/peacock/meta.yaml + - conda/peacock/conda_build_config.yaml - conda/tools/meta.yaml - conda/tools/conda_build_config.yaml - conda/moose/build.sh