From 85bccd9a84d431824e0b038a66a580c274c5b8dd Mon Sep 17 00:00:00 2001 From: Benedict Geihe Date: Mon, 22 Jun 2026 15:52:19 +0200 Subject: [PATCH 1/5] adapt to t8code v4 API --- examples/trixi_controller_baroclinic.c | 4 ++-- examples/trixi_controller_t8code.c | 4 ++-- examples/trixi_controller_t8code.f90 | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/trixi_controller_baroclinic.c b/examples/trixi_controller_baroclinic.c index 22cdefe3..1e12fe5b 100644 --- a/examples/trixi_controller_baroclinic.c +++ b/examples/trixi_controller_baroclinic.c @@ -26,11 +26,11 @@ void source_terms_baroclinic(int nnodes, double * nodes, t8_forest_t forest, // Iterates through all local trees for (t8_locidx_t itree = 0, index = 0; itree < num_local_trees; ++itree) { // Get number of elements of this tree - t8_locidx_t num_elements_in_tree = t8_forest_get_tree_num_elements (forest, itree); + t8_locidx_t num_elements_in_tree = t8_forest_get_tree_num_leaf_elements (forest, itree); // Iterate through all the local elements for (t8_locidx_t ielement = 0; ielement < num_elements_in_tree; ++ielement) { // Get a pointer to the current element - const t8_element_t *element = t8_forest_get_element_in_tree (forest, itree, ielement); + const t8_element_t *element = t8_forest_get_leaf_element_in_tree (forest, itree, ielement); for (int k = 0; k < nnodes; ++k) { for (int j = 0; j < nnodes; ++j) { for (int i = 0; i < nnodes; ++i, ++index) { diff --git a/examples/trixi_controller_t8code.c b/examples/trixi_controller_t8code.c index cebaaf30..84d0c5d8 100644 --- a/examples/trixi_controller_t8code.c +++ b/examples/trixi_controller_t8code.c @@ -16,10 +16,10 @@ void t8_print_forest_information (t8_forest_t forest) T8_ASSERT (t8_forest_is_committed (forest)); // Get the local number of elements. - local_num_elements = t8_forest_get_local_num_elements (forest); + local_num_elements = t8_forest_get_local_num_leaf_elements (forest); // Get the global number of elements. - global_num_elements = t8_forest_get_global_num_elements (forest); + global_num_elements = t8_forest_get_global_num_leaf_elements (forest); printf ("\n*** T8code *** Local number of elements:\t%i\n", local_num_elements); printf ("*** T8code *** Global number of elements:\t%li\n", global_num_elements); diff --git a/examples/trixi_controller_t8code.f90 b/examples/trixi_controller_t8code.f90 index ed769030..54858244 100644 --- a/examples/trixi_controller_t8code.f90 +++ b/examples/trixi_controller_t8code.f90 @@ -12,7 +12,7 @@ subroutine t8_print_forest_information(forest) ! T8_ASSERT (t8_forest_is_committed (forest)); ! Get the local number of elements. - local_num_elements = t8_forest_get_local_num_elements (forest) + local_num_elements = t8_forest_get_local_num_leaf_elements (forest) ! Get the global number of elements. global_num_elements = t8_forest_get_global_num_elements (forest) From 51e4555b19fbd66b6558452b488fc618e111ac03 Mon Sep 17 00:00:00 2001 From: Benedict Geihe Date: Thu, 6 Aug 2026 11:52:30 +0200 Subject: [PATCH 2/5] update to Trixi.jl 0.17 --- LibTrixi.jl/Project.toml | 2 +- LibTrixi.jl/test/Project.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/LibTrixi.jl/Project.toml b/LibTrixi.jl/Project.toml index af16b336..23ef6d1f 100644 --- a/LibTrixi.jl/Project.toml +++ b/LibTrixi.jl/Project.toml @@ -13,5 +13,5 @@ Trixi = "a7f1ee26-1774-49b1-8366-f1abc58fbfcb" MPI = "0.20.13" Pkg = "1.8" SciMLBase = "2.33.0, 3" -Trixi = "0.16.10" +Trixi = "0.17" julia = "1.8" diff --git a/LibTrixi.jl/test/Project.toml b/LibTrixi.jl/test/Project.toml index b6fae1cb..77147b9a 100644 --- a/LibTrixi.jl/test/Project.toml +++ b/LibTrixi.jl/test/Project.toml @@ -5,4 +5,4 @@ Trixi = "a7f1ee26-1774-49b1-8366-f1abc58fbfcb" [compat] OrdinaryDiffEqLowStorageRK = "1.2, 2, 3" -Trixi = "0.16.10" +Trixi = "0.17" From 2f0496bdf78fe5b0c5ac019944c5dbb6fe32bae5 Mon Sep 17 00:00:00 2001 From: Benedict Geihe Date: Thu, 6 Aug 2026 11:53:22 +0200 Subject: [PATCH 3/5] use t8code July release --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 26fe920c..bd89d4af 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,13 +38,13 @@ jobs: - '1.10' - '1.11' t8code_version: - - '3.0.1' + - '4.0.0' include: - os: ubuntu-latest test_type: coverage arch: x64 julia_version: '1.11' - t8code_version: '3.0.1' + t8code_version: '4.0.0' env: # Necessary for HDF5 to play nice with Julia LD_PRELOAD: /lib/x86_64-linux-gnu/libcurl.so.4 @@ -93,7 +93,7 @@ jobs: T8CODE_RELEASE=${{ matrix.t8code_version }} mkdir t8code-local cd t8code-local - wget https://github.com/DLR-AMR/t8code/releases/download/v${T8CODE_RELEASE}/T8CODE-${T8CODE_RELEASE}-Source.tar.gz + wget https://github.com/DLR-AMR/t8code/releases/download/v${T8CODE_RELEASE}-26.07/T8CODE-${T8CODE_RELEASE}-Source.tar.gz tar xf T8CODE-${T8CODE_RELEASE}-Source.tar.gz mkdir build cd build From 0d02674e921cc3cd1b5758854027f96bc24ddb48 Mon Sep 17 00:00:00 2001 From: Benedict Geihe Date: Thu, 6 Aug 2026 12:20:07 +0200 Subject: [PATCH 4/5] t8code should not install gtest --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bd89d4af..4a7b2743 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -103,6 +103,8 @@ jobs: -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX="$PWD/../prefix" \ -DT8CODE_BUILD_TESTS=OFF \ + -DBUILD_GMOCK=OFF \ + -DINSTALL_GTEST=OFF \ -DT8CODE_BUILD_TUTORIALS=OFF \ -DT8CODE_BUILD_EXAMPLES=OFF \ -DT8CODE_BUILD_BENCHMARKS=OFF \ From f07c8675159be2fa6e024291370d056572129528 Mon Sep 17 00:00:00 2001 From: Benedict Geihe Date: Thu, 6 Aug 2026 17:35:44 +0200 Subject: [PATCH 5/5] PRIVATE_HEADER issue in July release --- .github/workflows/ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4a7b2743..1caa57a0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -114,6 +114,9 @@ jobs: make -j 2 make install + # temporary workaround + mv ../prefix/PRIVATE_HEADER/* ../prefix/include/ + - name: Configure (test_type == 'regular') if: ${{ matrix.test_type == 'regular' }} run: |