diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 26fe920c..df6d3876 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-26.07' include: - os: ubuntu-latest test_type: coverage arch: x64 julia_version: '1.11' - t8code_version: '3.0.1' + t8code_version: '4.0.0-26.07' env: # Necessary for HDF5 to play nice with Julia LD_PRELOAD: /lib/x86_64-linux-gnu/libcurl.so.4 @@ -90,11 +90,12 @@ jobs: - name: Install t8code if: steps.cache-t8code.outputs.cache-hit != 'true' run: | - T8CODE_RELEASE=${{ matrix.t8code_version }} + T8CODE_FULL_VERSION=${{ matrix.t8code_version }} + T8CODE_VERSION=${T8CODE_FULL_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 - tar xf T8CODE-${T8CODE_RELEASE}-Source.tar.gz + wget https://github.com/DLR-AMR/t8code/releases/download/v${T8CODE_FULL_VERSION}/T8CODE-${T8CODE_VERSION}-Source.tar.gz + tar xf T8CODE-${T8CODE_VERSION}-Source.tar.gz mkdir build cd build cmake \ @@ -103,15 +104,21 @@ 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 \ -DT8CODE_ENABLE_MPI=ON \ -DT8CODE_BUILD_FORTRAN_INTERFACE=ON \ - ../T8CODE-${T8CODE_RELEASE}-Source + ../T8CODE-${T8CODE_VERSION}-Source make -j 2 make install + # temporary workaround, remove with next release + # https://github.com/DLR-AMR/t8code/pull/2355 + mv ../prefix/PRIVATE_HEADER/* ../prefix/include/ + - name: Configure (test_type == 'regular') if: ${{ matrix.test_type == 'regular' }} run: | 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/examples/libelixir_tree1d_advection_basic.jl b/LibTrixi.jl/examples/libelixir_tree1d_advection_basic.jl index d34bc223..17b020f3 100644 --- a/LibTrixi.jl/examples/libelixir_tree1d_advection_basic.jl +++ b/LibTrixi.jl/examples/libelixir_tree1d_advection_basic.jl @@ -20,7 +20,7 @@ function init_simstate() # Create a uniformly refined mesh with periodic boundaries mesh = TreeMesh(coordinates_min, coordinates_max, initial_refinement_level = 4, - n_cells_max = 30_000, periodicity = true) + periodicity = true) # A semidiscretization collects data structures and functions for the spatial discretization semi = SemidiscretizationHyperbolic(mesh, equations, diff --git a/LibTrixi.jl/lib/Project.toml b/LibTrixi.jl/lib/Project.toml index 60481033..2019109f 100644 --- a/LibTrixi.jl/lib/Project.toml +++ b/LibTrixi.jl/lib/Project.toml @@ -3,5 +3,5 @@ PackageCompiler = "9b87118b-4619-50d2-8e1e-99f35a4d4d9d" TOML = "fa267f1f-6049-4f14-aa54-33bafae1ed76" [compat] -PackageCompiler = "2.1.9" +PackageCompiler = "2.1.9 - 2.4.1" TOML = "1" 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" 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)