Merge branch 'devel' into topic/coal

.clang-format

+BasedOnStyle: Google
+SortIncludes: false

.github/workflows/conda/environment_macos_linux.yml

@@ -14,6 +14,7 @@ dependencies:
   - lxml
   - pylatexenc
   - qhull
+  - qhull-static
   - cmake
   - ccache
   - cxx-compiler

.pre-commit-config.yaml

 ci:
   autoupdate_branch: devel
+  autofix_prs: false
+  autoupdate_schedule: quarterly
 repos:
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.4.10
+  rev: v0.5.1
   hooks:
   - id: ruff
     args:
@@ -10,7 +12,7 @@ repos:
     - --exit-non-zero-on-fix
   - id: ruff-format
 - repo: https://github.com/pre-commit/mirrors-clang-format
-  rev: v18.1.7
+  rev: v18.1.8
   hooks:
   - id: clang-format
     args:

src/contact_patch_func_matrix.cpp

@@ -382,6 +382,8 @@ ContactPatchFunctionMatrix::ContactPatchFunctionMatrix() {
   contact_patch_matrix[GEOM_OCTREE][BV_KDOP16] = &contact_patch_function_not_implemented;
   contact_patch_matrix[GEOM_OCTREE][BV_KDOP18] = &contact_patch_function_not_implemented;
   contact_patch_matrix[GEOM_OCTREE][BV_KDOP24] = &contact_patch_function_not_implemented;
+  contact_patch_matrix[GEOM_OCTREE][HF_AABB] = &contact_patch_function_not_implemented;
+  contact_patch_matrix[GEOM_OCTREE][HF_OBBRSS] = &contact_patch_function_not_implemented;
 
   contact_patch_matrix[GEOM_BOX][GEOM_OCTREE]  = &contact_patch_function_not_implemented;
   contact_patch_matrix[GEOM_SPHERE][GEOM_OCTREE]  = &contact_patch_function_not_implemented;
@@ -401,6 +403,8 @@ ContactPatchFunctionMatrix::ContactPatchFunctionMatrix() {
   contact_patch_matrix[BV_KDOP16][GEOM_OCTREE]  = &contact_patch_function_not_implemented;
   contact_patch_matrix[BV_KDOP18][GEOM_OCTREE]  = &contact_patch_function_not_implemented;
   contact_patch_matrix[BV_KDOP24][GEOM_OCTREE]  = &contact_patch_function_not_implemented;
+  contact_patch_matrix[HF_AABB][GEOM_OCTREE] = &contact_patch_function_not_implemented;
+  contact_patch_matrix[HF_OBBRSS][GEOM_OCTREE] = &contact_patch_function_not_implemented;
 #endif
   // clang-format on
 }