Update Trixi.jl, including t8code v4 July release

.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
@@ -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 \
@@ -112,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: |

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"

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"

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) {

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);

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)