| 1 |
commit: 3a32915aa5012cc6b76a4073de1e6719de910ef5 |
| 2 |
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jul 9 16:46:52 2016 +0000 |
| 4 |
Commit: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de> |
| 5 |
CommitDate: Sat Jul 9 16:46:52 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=3a32915a |
| 7 |
|
| 8 |
sci-libs/dealii: drop old |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.28 |
| 11 |
|
| 12 |
sci-libs/dealii/dealii-8.1.0-r2.ebuild | 121 --------- |
| 13 |
.../files/dealii-8.1.0-p4est1.0-support.patch | 271 --------------------- |
| 14 |
2 files changed, 392 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sci-libs/dealii/dealii-8.1.0-r2.ebuild b/sci-libs/dealii/dealii-8.1.0-r2.ebuild |
| 17 |
deleted file mode 100644 |
| 18 |
index 4beb1fe..0000000 |
| 19 |
--- a/sci-libs/dealii/dealii-8.1.0-r2.ebuild |
| 20 |
+++ /dev/null |
| 21 |
@@ -1,121 +0,0 @@ |
| 22 |
-# Copyright 1999-2016 Gentoo Foundation |
| 23 |
-# Distributed under the terms of the GNU General Public License v2 |
| 24 |
-# $Id$ |
| 25 |
- |
| 26 |
-EAPI=5 |
| 27 |
- |
| 28 |
-inherit cmake-utils eutils multilib |
| 29 |
- |
| 30 |
-# deal.II uses its own FindLAPACK.cmake file that calls into the system |
| 31 |
-# FindLAPACK.cmake module and does additional internal setup. Do not remove |
| 32 |
-# any of these modules: |
| 33 |
-CMAKE_REMOVE_MODULES_LIST="" |
| 34 |
- |
| 35 |
-DESCRIPTION="Solving partial differential equations with the finite element method" |
| 36 |
-HOMEPAGE="http://www.dealii.org/" |
| 37 |
- |
| 38 |
-if [[ ${PV} = *9999* ]]; then |
| 39 |
- inherit git-r3 |
| 40 |
- EGIT_REPO_URI="git://github.com/dealii/dealii.git" |
| 41 |
- SRC_URI="" |
| 42 |
- KEYWORDS="" |
| 43 |
-else |
| 44 |
- SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz |
| 45 |
- doc? ( https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}-offline_documentation.tar.gz )" |
| 46 |
- KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
| 47 |
- S="${WORKDIR}/deal.II" |
| 48 |
-fi |
| 49 |
- |
| 50 |
-LICENSE="LGPL-2.1+" |
| 51 |
-SLOT="0" |
| 52 |
-IUSE=" |
| 53 |
- arpack cpu_flags_x86_avx cpu_flags_x86_sse2 +debug doc +examples hdf5 |
| 54 |
- +lapack mesh_converter metis mpi mumps netcdf p4est parameter_gui petsc |
| 55 |
- +sparse static-libs +tbb trilinos |
| 56 |
-" |
| 57 |
- |
| 58 |
-# TODO: add slepc use flag once slepc is packaged for gentoo-science |
| 59 |
-REQUIRED_USE=" |
| 60 |
- mumps? ( mpi lapack ) |
| 61 |
- p4est? ( mpi ) |
| 62 |
- trilinos? ( mpi )" |
| 63 |
- |
| 64 |
-RDEPEND="dev-libs/boost |
| 65 |
- app-arch/bzip2 |
| 66 |
- sys-libs/zlib |
| 67 |
- arpack? ( sci-libs/arpack[mpi=] ) |
| 68 |
- hdf5? ( sci-libs/hdf5[mpi=] ) |
| 69 |
- lapack? ( virtual/lapack ) |
| 70 |
- metis? ( >=sci-libs/parmetis-4 ) |
| 71 |
- mpi? ( virtual/mpi ) |
| 72 |
- mumps? ( sci-libs/mumps[mpi] ) |
| 73 |
- netcdf? ( sci-libs/netcdf-cxx:0 ) |
| 74 |
- p4est? ( sci-libs/p4est[mpi] ) |
| 75 |
- parameter_gui? ( dev-qt/qtgui:4 ) |
| 76 |
- petsc? ( sci-mathematics/petsc[mpi=] ) |
| 77 |
- sparse? ( sci-libs/umfpack ) |
| 78 |
- tbb? ( dev-cpp/tbb ) |
| 79 |
- trilinos? ( sci-libs/trilinos )" |
| 80 |
- |
| 81 |
-DEPEND="${RDEPEND} |
| 82 |
- virtual/pkgconfig |
| 83 |
- doc? ( app-doc/doxygen[dot] dev-lang/perl )" |
| 84 |
- |
| 85 |
-src_configure() { |
| 86 |
- # deal.II needs a custom build type: |
| 87 |
- local CMAKE_BUILD_TYPE=$(usex debug DebugRelease Release) |
| 88 |
- |
| 89 |
- local mycmakeargs=( |
| 90 |
- -DDEAL_II_ALLOW_AUTODETECTION=OFF |
| 91 |
- -DDEAL_II_ALLOW_BUNDLED=OFF |
| 92 |
- -DDEAL_II_ALLOW_PLATFORM_INTROSPECTION=OFF |
| 93 |
- -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF |
| 94 |
- -DDEAL_II_COMPONENT_COMPAT_FILES=OFF |
| 95 |
- -DDEAL_II_CMAKE_MACROS_RELDIR=share/${PN}/cmake/macros |
| 96 |
- -DDEAL_II_DOCHTML_RELDIR=share/doc/${PF}/html |
| 97 |
- -DDEAL_II_DOCREADME_RELDIR=share/doc/${PF}/ |
| 98 |
- -DDEAL_II_EXAMPLES_RELDIR=share/doc/${PF}/examples |
| 99 |
- -DDEAL_II_LIBRARY_RELDIR=$(get_libdir) |
| 100 |
- -DDEAL_II_WITH_BZIP2=ON |
| 101 |
- -DDEAL_II_WITH_ZLIB=ON |
| 102 |
- $(cmake-utils_use arpack DEAL_II_WITH_ARPACK) |
| 103 |
- $(cmake-utils_use cpu_flags_x86_avx DEAL_II_HAVE_AVX) |
| 104 |
- $(cmake-utils_use cpu_flags_x86_sse2 DEAL_II_HAVE_SSE2) |
| 105 |
- $(cmake-utils_use doc DEAL_II_COMPONENT_DOCUMENTATION) |
| 106 |
- $(cmake-utils_use examples DEAL_II_COMPONENT_EXAMPLES) |
| 107 |
- $(cmake-utils_use hdf5 DEAL_II_WITH_HDF5) |
| 108 |
- $(cmake-utils_use lapack DEAL_II_WITH_LAPACK) |
| 109 |
- $(cmake-utils_use mesh_converter DEAL_II_COMPONENT_MESH_CONVERTER) |
| 110 |
- $(cmake-utils_use metis DEAL_II_WITH_METIS) |
| 111 |
- $(cmake-utils_use mpi DEAL_II_WITH_MPI) |
| 112 |
- $(cmake-utils_use mumps DEAL_II_WITH_MUMPS) |
| 113 |
- $(cmake-utils_use netcdf DEAL_II_WITH_NETCDF) |
| 114 |
- $(cmake-utils_use p4est DEAL_II_WITH_P4EST) |
| 115 |
- $(cmake-utils_use parameter_gui DEAL_II_COMPONENT_PARAMETER_GUI) |
| 116 |
- $(cmake-utils_use petsc DEAL_II_WITH_PETSC) |
| 117 |
- $(cmake-utils_use sparse DEAL_II_WITH_UMFPACK) |
| 118 |
- $(cmake-utils_use !static-libs BUILD_SHARED_LIBS) |
| 119 |
- $(cmake-utils_use static-libs DEAL_II_PREFER_STATIC_LIBS) |
| 120 |
- $(cmake-utils_use tbb DEAL_II_WITH_THREADS) |
| 121 |
- $(cmake-utils_use trilinos DEAL_II_WITH_TRILINOS) |
| 122 |
- ) |
| 123 |
- cmake-utils_src_configure |
| 124 |
-} |
| 125 |
- |
| 126 |
-src_install() { |
| 127 |
- DOCS=( README ) |
| 128 |
- |
| 129 |
- if use doc && [[ ${PV} != *9999* ]]; then |
| 130 |
- # copy missing images to the build directory: |
| 131 |
- cp -r "${WORKDIR}"/doc/doxygen/deal.II/images \ |
| 132 |
- "${BUILD_DIR}"/doc/doxygen/deal.II || die |
| 133 |
- # replace links: |
| 134 |
- sed -i \ |
| 135 |
- 's#"http://www.dealii.org/images/steps/developer/\(step-.*\)"#"images/\1"#g' \ |
| 136 |
- "${BUILD_DIR}"/doc/doxygen/deal.II/step_*.html || die "sed failed" |
| 137 |
- fi |
| 138 |
- cmake-utils_src_install |
| 139 |
- |
| 140 |
- # decompress the installed example sources: |
| 141 |
- use examples && docompress -x /usr/share/doc/${PF}/examples |
| 142 |
-} |
| 143 |
|
| 144 |
diff --git a/sci-libs/dealii/files/dealii-8.1.0-p4est1.0-support.patch b/sci-libs/dealii/files/dealii-8.1.0-p4est1.0-support.patch |
| 145 |
deleted file mode 100644 |
| 146 |
index 3ef8d99..0000000 |
| 147 |
--- a/sci-libs/dealii/files/dealii-8.1.0-p4est1.0-support.patch |
| 148 |
+++ /dev/null |
| 149 |
@@ -1,271 +0,0 @@ |
| 150 |
-Upstream commits: |
| 151 |
- 4b6a6a9aae750941723890c44f0cb3326e5ba87b |
| 152 |
- 67d70862aa2b2c2e925a2b1262c9934ea0f9a873 |
| 153 |
- dc0308a408360bfa5e21a58d10c2c2a7dca3a8ad |
| 154 |
- |
| 155 |
-diff --git a/source/distributed/tria.cc b/source/distributed/tria.cc |
| 156 |
-index 5687fae..a6e5e85 100644 |
| 157 |
---- a/source/distributed/tria.cc |
| 158 |
-+++ b/source/distributed/tria.cc |
| 159 |
-@@ -155,10 +155,17 @@ namespace internal |
| 160 |
- types<2>::balance_type btype, |
| 161 |
- p4est_init_t init_fn); |
| 162 |
- |
| 163 |
-+#if DEAL_II_P4EST_VERSION_GTE(0,3,4,3) |
| 164 |
-+ static |
| 165 |
-+ p4est_gloidx_t (&partition) (types<2>::forest *p4est, |
| 166 |
-+ int partition_for_coarsening, |
| 167 |
-+ p4est_weight_t weight_fn); |
| 168 |
-+#else |
| 169 |
- static |
| 170 |
- void (&partition) (types<2>::forest *p4est, |
| 171 |
- int partition_for_coarsening, |
| 172 |
- p4est_weight_t weight_fn); |
| 173 |
-+#endif |
| 174 |
- |
| 175 |
- static |
| 176 |
- void (&save) (const char *filename, |
| 177 |
-@@ -173,16 +180,28 @@ namespace internal |
| 178 |
- void *user_pointer, |
| 179 |
- types<2>::connectivity **p4est); |
| 180 |
- |
| 181 |
-+#if DEAL_II_P4EST_VERSION_GTE(0,3,4,3) |
| 182 |
-+ static |
| 183 |
-+ int (&connectivity_save) (const char *filename, |
| 184 |
-+ types<2>::connectivity *connectivity); |
| 185 |
-+#else |
| 186 |
- static |
| 187 |
- void (&connectivity_save) (const char *filename, |
| 188 |
- types<2>::connectivity *connectivity); |
| 189 |
-+#endif |
| 190 |
- |
| 191 |
- static |
| 192 |
- int (&connectivity_is_valid) (types<2>::connectivity *connectivity); |
| 193 |
- |
| 194 |
-+#if DEAL_II_P4EST_VERSION_GTE(0,3,4,3) |
| 195 |
-+ static |
| 196 |
-+ types<2>::connectivity *(&connectivity_load) (const char *filename, |
| 197 |
-+ long unsigned *length); |
| 198 |
-+#else |
| 199 |
- static |
| 200 |
- types<2>::connectivity *(&connectivity_load) (const char *filename, |
| 201 |
- long *length); |
| 202 |
-+#endif |
| 203 |
- |
| 204 |
- static |
| 205 |
- unsigned int (&checksum) (types<2>::forest *p4est); |
| 206 |
-@@ -301,10 +320,17 @@ namespace internal |
| 207 |
- p4est_init_t init_fn) |
| 208 |
- = p4est_balance; |
| 209 |
- |
| 210 |
-+#if DEAL_II_P4EST_VERSION_GTE(0,3,4,3) |
| 211 |
-+ p4est_gloidx_t (&functions<2>::partition) (types<2>::forest *p4est, |
| 212 |
-+ int partition_for_coarsening, |
| 213 |
-+ p4est_weight_t weight_fn) |
| 214 |
-+ = p4est_partition_ext; |
| 215 |
-+#else |
| 216 |
- void (&functions<2>::partition) (types<2>::forest *p4est, |
| 217 |
- int partition_for_coarsening, |
| 218 |
- p4est_weight_t weight_fn) |
| 219 |
- = p4est_partition_ext; |
| 220 |
-+#endif |
| 221 |
- |
| 222 |
- void (&functions<2>::save) (const char *filename, |
| 223 |
- types<2>::forest *p4est, |
| 224 |
-@@ -320,18 +346,31 @@ namespace internal |
| 225 |
- types<2>::connectivity **p4est) |
| 226 |
- = p4est_load; |
| 227 |
- |
| 228 |
-+#if DEAL_II_P4EST_VERSION_GTE(0,3,4,3) |
| 229 |
-+ int (&functions<2>::connectivity_save) (const char *filename, |
| 230 |
-+ types<2>::connectivity *connectivity) |
| 231 |
-+ = p4est_connectivity_save; |
| 232 |
-+#else |
| 233 |
- void (&functions<2>::connectivity_save) (const char *filename, |
| 234 |
- types<2>::connectivity *connectivity) |
| 235 |
- = p4est_connectivity_save; |
| 236 |
-+#endif |
| 237 |
- |
| 238 |
- int (&functions<2>::connectivity_is_valid) (types<2>::connectivity |
| 239 |
- *connectivity) |
| 240 |
- = p4est_connectivity_is_valid; |
| 241 |
- |
| 242 |
-+#if DEAL_II_P4EST_VERSION_GTE(0,3,4,3) |
| 243 |
-+ types<2>::connectivity * |
| 244 |
-+ (&functions<2>::connectivity_load) (const char *filename, |
| 245 |
-+ long unsigned *length) |
| 246 |
-+ = p4est_connectivity_load; |
| 247 |
-+#else |
| 248 |
- types<2>::connectivity * |
| 249 |
- (&functions<2>::connectivity_load) (const char *filename, |
| 250 |
- long *length) |
| 251 |
- = p4est_connectivity_load; |
| 252 |
-+#endif |
| 253 |
- |
| 254 |
- unsigned int (&functions<2>::checksum) (types<2>::forest *p4est) |
| 255 |
- = p4est_checksum; |
| 256 |
-@@ -451,10 +490,17 @@ namespace internal |
| 257 |
- types<3>::balance_type btype, |
| 258 |
- p8est_init_t init_fn); |
| 259 |
- |
| 260 |
-+#if DEAL_II_P4EST_VERSION_GTE(0,3,4,3) |
| 261 |
-+ static |
| 262 |
-+ p4est_gloidx_t (&partition) (types<3>::forest *p8est, |
| 263 |
-+ int partition_for_coarsening, |
| 264 |
-+ p8est_weight_t weight_fn); |
| 265 |
-+#else |
| 266 |
- static |
| 267 |
- void (&partition) (types<3>::forest *p8est, |
| 268 |
- int partition_for_coarsening, |
| 269 |
- p8est_weight_t weight_fn); |
| 270 |
-+#endif |
| 271 |
- |
| 272 |
- static |
| 273 |
- void (&save) (const char *filename, |
| 274 |
-@@ -469,16 +515,28 @@ namespace internal |
| 275 |
- void *user_pointer, |
| 276 |
- types<3>::connectivity **p4est); |
| 277 |
- |
| 278 |
-+#if DEAL_II_P4EST_VERSION_GTE(0,3,4,3) |
| 279 |
-+ static |
| 280 |
-+ int (&connectivity_save) (const char *filename, |
| 281 |
-+ types<3>::connectivity *connectivity); |
| 282 |
-+#else |
| 283 |
- static |
| 284 |
- void (&connectivity_save) (const char *filename, |
| 285 |
- types<3>::connectivity *connectivity); |
| 286 |
-+#endif |
| 287 |
- |
| 288 |
- static |
| 289 |
- int (&connectivity_is_valid) (types<3>::connectivity *connectivity); |
| 290 |
- |
| 291 |
-+#if DEAL_II_P4EST_VERSION_GTE(0,3,4,3) |
| 292 |
-+ static |
| 293 |
-+ types<3>::connectivity *(&connectivity_load) (const char *filename, |
| 294 |
-+ long unsigned *length); |
| 295 |
-+#else |
| 296 |
- static |
| 297 |
- types<3>::connectivity *(&connectivity_load) (const char *filename, |
| 298 |
- long *length); |
| 299 |
-+#endif |
| 300 |
- |
| 301 |
- static |
| 302 |
- unsigned int (&checksum) (types<3>::forest *p8est); |
| 303 |
-@@ -600,10 +658,17 @@ namespace internal |
| 304 |
- p8est_init_t init_fn) |
| 305 |
- = p8est_balance; |
| 306 |
- |
| 307 |
-+#if DEAL_II_P4EST_VERSION_GTE(0,3,4,3) |
| 308 |
-+ p4est_gloidx_t (&functions<3>::partition) (types<3>::forest *p8est, |
| 309 |
-+ int partition_for_coarsening, |
| 310 |
-+ p8est_weight_t weight_fn) |
| 311 |
-+ = p8est_partition_ext; |
| 312 |
-+#else |
| 313 |
- void (&functions<3>::partition) (types<3>::forest *p8est, |
| 314 |
- int partition_for_coarsening, |
| 315 |
- p8est_weight_t weight_fn) |
| 316 |
- = p8est_partition_ext; |
| 317 |
-+#endif |
| 318 |
- |
| 319 |
- void (&functions<3>::save) (const char *filename, |
| 320 |
- types<3>::forest *p4est, |
| 321 |
-@@ -619,18 +684,31 @@ namespace internal |
| 322 |
- types<3>::connectivity **p4est) |
| 323 |
- = p8est_load; |
| 324 |
- |
| 325 |
-+#if DEAL_II_P4EST_VERSION_GTE(0,3,4,3) |
| 326 |
-+ int (&functions<3>::connectivity_save) (const char *filename, |
| 327 |
-+ types<3>::connectivity *connectivity) |
| 328 |
-+ = p8est_connectivity_save; |
| 329 |
-+#else |
| 330 |
- void (&functions<3>::connectivity_save) (const char *filename, |
| 331 |
- types<3>::connectivity *connectivity) |
| 332 |
- = p8est_connectivity_save; |
| 333 |
-+#endif |
| 334 |
- |
| 335 |
- int (&functions<3>::connectivity_is_valid) (types<3>::connectivity |
| 336 |
- *connectivity) |
| 337 |
- = p8est_connectivity_is_valid; |
| 338 |
- |
| 339 |
-+#if DEAL_II_P4EST_VERSION_GTE(0,3,4,3) |
| 340 |
-+ types<3>::connectivity * |
| 341 |
-+ (&functions<3>::connectivity_load) (const char *filename, |
| 342 |
-+ long unsigned *length) |
| 343 |
-+ = p8est_connectivity_load; |
| 344 |
-+#else |
| 345 |
- types<3>::connectivity * |
| 346 |
- (&functions<3>::connectivity_load) (const char *filename, |
| 347 |
- long *length) |
| 348 |
- = p8est_connectivity_load; |
| 349 |
-+#endif |
| 350 |
- |
| 351 |
- unsigned int (&functions<3>::checksum) (types<3>::forest *p8est) |
| 352 |
- = p8est_checksum; |
| 353 |
-diff --git a/cmake/modules/FindP4EST.cmake b/cmake/modules/FindP4EST.cmake |
| 354 |
-index f2bf417..44846c7 100644 |
| 355 |
---- a/cmake/modules/FindP4EST.cmake |
| 356 |
-+++ b/cmake/modules/FindP4EST.cmake |
| 357 |
-@@ -179,17 +179,28 @@ |
| 358 |
- STRING(REGEX REPLACE |
| 359 |
- "^[0-9]+\\.[0-9]+\\.([0-9]+).*$" "\\1" |
| 360 |
- P4EST_VERSION_SUBMINOR "${P4EST_VERSION}") |
| 361 |
-- |
| 362 |
-- # Now for the patch number such as in 0.3.4.1. If there |
| 363 |
-- # is no patch number, then the REGEX REPLACE will fail, |
| 364 |
-- # setting P4EST_VERSION_PATCH to P4EST_VERSION. If that |
| 365 |
-- # is the case, then set the patch number to zero |
| 366 |
- STRING(REGEX REPLACE |
| 367 |
-- "^[0-9]+\\.[0-9]+\\.[0-9]+\\.([0-9]+)?.*$" "\\1" |
| 368 |
-+ "^[0-9]+\\.[0-9]+\\.[0-9]+\\.([0-9]+).*$" "\\1" |
| 369 |
- P4EST_VERSION_PATCH "${P4EST_VERSION}") |
| 370 |
-- IF(${P4EST_VERSION_PATCH} STREQUAL "${P4EST_VERSION}") |
| 371 |
-+ |
| 372 |
-+ # |
| 373 |
-+ # We cannot rely on the fact that SUBMINOR or PATCH are defined. |
| 374 |
-+ # Nevertheless, we need a full version number for our preprocessor macros |
| 375 |
-+ # to work. If the p4est version number is only of the form x.y instead of |
| 376 |
-+ # a.b.c.d, then the last two REGEX_REPLACE calls above will have failed |
| 377 |
-+ # because the regular expression didn't match the version string, |
| 378 |
-+ # and P4EST_VERSION_SUBMINOR and P4EST_VERSION_PATCH will either be |
| 379 |
-+ # empty or be the full version string. In those cases, set those numbers |
| 380 |
-+ # to 0 if necessary. |
| 381 |
-+ # |
| 382 |
-+ IF("${P4EST_VERSION_SUBMINOR}" MATCHES "^(|${P4EST_VERSION})$") |
| 383 |
-+ SET(P4EST_VERSION_SUBMINOR "0") |
| 384 |
-+ ENDIF() |
| 385 |
-+ |
| 386 |
-+ IF("${P4EST_VERSION_PATCH}" MATCHES "^(|${P4EST_VERSION})$") |
| 387 |
- SET(P4EST_VERSION_PATCH "0") |
| 388 |
- ENDIF() |
| 389 |
-+ |
| 390 |
- |
| 391 |
- |
| 392 |
- MARK_AS_ADVANCED(P4EST_DIR) |
| 393 |
-diff --git a/include/deal.II/distributed/tria.h b/include/deal.II/distributed/tria.h |
| 394 |
-index ea3e88b..8daa70d 100644 |
| 395 |
---- a/include/deal.II/distributed/tria.h |
| 396 |
-+++ b/include/deal.II/distributed/tria.h |
| 397 |
-@@ -88,7 +88,11 @@ namespace internal |
| 398 |
- typedef p4est_quadrant_t quadrant; |
| 399 |
- typedef p4est_topidx_t topidx; |
| 400 |
- typedef p4est_locidx_t locidx; |
| 401 |
-+#if DEAL_II_P4EST_VERSION_GTE(0,3,4,3) |
| 402 |
-+ typedef p4est_connect_type_t balance_type; |
| 403 |
-+#else |
| 404 |
- typedef p4est_balance_type_t balance_type; |
| 405 |
-+#endif |
| 406 |
- typedef p4est_ghost_t ghost; |
| 407 |
- }; |
| 408 |
- |
| 409 |
-@@ -101,7 +105,11 @@ namespace internal |
| 410 |
- typedef p8est_quadrant_t quadrant; |
| 411 |
- typedef p4est_topidx_t topidx; |
| 412 |
- typedef p4est_locidx_t locidx; |
| 413 |
-+#if DEAL_II_P4EST_VERSION_GTE(0,3,4,3) |
| 414 |
-+ typedef p8est_connect_type_t balance_type; |
| 415 |
-+#else |
| 416 |
- typedef p8est_balance_type_t balance_type; |
| 417 |
-+#endif |
| 418 |
- typedef p8est_ghost_t ghost; |
| 419 |
- }; |
| 420 |
- |
Archives