Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/devel'
Browse files Browse the repository at this point in the history
  • Loading branch information
@hugary1995
hugary1995 committed Jul 21, 2024
2 parents aada21d + 78705a7 commit 0be3728
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion moose
Submodule moose updated 31 files
+2 −2 conda/libmesh/meta.yaml
+2 −2 conda/moose-dev/conda_build_config.yaml
+1 −1 conda/moose-dev/meta.yaml
+1 −1 conda/moose/conda_build_config.yaml
+1 −1 docker_ci/Dockerfile
+1 −1 framework/doc/packages_config.yml
+2 −1 framework/include/geomsearch/FindContactPoint.h
+1 −1 framework/src/constraints/MortarConstraintBase.C
+68 −20 framework/src/geomsearch/FindContactPoint.C
+33 −23 framework/src/geomsearch/PenetrationThread.C
+1 −1 libmesh
+49 −0 modules/doc/content/newsletter/2024/2024_07.md
+2 −0 modules/reactor/doc/content/source/meshgenerators/PatternedCartesianMeshGenerator.md
+2 −0 modules/reactor/doc/content/source/meshgenerators/PatternedHexMeshGenerator.md
+2 −0 modules/reactor/include/meshgenerators/PatternedCartesianMeshGenerator.h
+3 −0 modules/reactor/include/meshgenerators/PatternedHexMeshGenerator.h
+11 −0 modules/reactor/include/meshgenerators/PolygonMeshGeneratorBase.h
+18 −2 modules/reactor/src/meshgenerators/PatternedCartesianMeshGenerator.C
+17 −2 modules/reactor/src/meshgenerators/PatternedHexMeshGenerator.C
+68 −12 modules/reactor/src/meshgenerators/PolygonMeshGeneratorBase.C
+ − modules/reactor/test/tests/meshgenerators/patterned_cartesian_mesh_generator/gold/patterned_sq_quad8.e
+ − modules/reactor/test/tests/meshgenerators/patterned_cartesian_mesh_generator/gold/patterned_sq_quad9.e
+45 −1 modules/reactor/test/tests/meshgenerators/patterned_cartesian_mesh_generator/tests
+ − modules/reactor/test/tests/meshgenerators/patterned_hex_mesh_generator/gold/patterned_hex_quad8.e
+ − modules/reactor/test/tests/meshgenerators/patterned_hex_mesh_generator/gold/patterned_hex_quad9.e
+41 −1 modules/reactor/test/tests/meshgenerators/patterned_hex_mesh_generator/tests
+6 −0 scripts/tests/versioner_hashes.yaml
+45 −0 test/tests/geomsearch/3d_penetration_locator/3d_rings.i
+605 −0 test/tests/geomsearch/3d_penetration_locator/gold/3d_rings_out_values_0001.csv
+ − test/tests/geomsearch/3d_penetration_locator/rings_facing.e
+20 −6 test/tests/geomsearch/3d_penetration_locator/tests

0 comments on commit 0be3728

Please sign in to comment.