From 5c1302a3bac72e70a3ae6839df6a33f75e9759e6 Mon Sep 17 00:00:00 2001 From: bennibolm Date: Fri, 13 Dec 2024 17:07:00 +0100 Subject: [PATCH] Add serial macOS and windows tests --- .github/workflows/ci.yml | 8 ++++++++ src/callbacks_step/alive.jl | 3 --- src/callbacks_step/save_solution.jl | 2 ++ src/solvers/fv_t8code/fv.jl | 19 +++++++++---------- 4 files changed, 19 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c0e71034167..003afe5ce7c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -82,6 +82,14 @@ jobs: - mpi # - threaded include: + - version: '1.10' + os: macos-13 + arch: x64 + trixi_test: t8code_fv + - version: '1.10' + os: windows-latest + arch: x64 + trixi_test: t8code_fv # - version: '1.8' # os: ubuntu-latest # arch: x64 diff --git a/src/callbacks_step/alive.jl b/src/callbacks_step/alive.jl index 43838fe3265..edac17f84d5 100644 --- a/src/callbacks_step/alive.jl +++ b/src/callbacks_step/alive.jl @@ -75,8 +75,6 @@ end # this method is called when the callback is activated function (alive_callback::AliveCallback)(integrator) - - println("Start of alive callback") # Checking for floating point equality is OK here as `DifferentialEquations.jl` # sets the time exactly to the final time in the last iteration if isfinished(integrator) && mpi_isroot() @@ -101,7 +99,6 @@ function (alive_callback::AliveCallback)(integrator) # avoid re-evaluating possible FSAL stages u_modified!(integrator, false) - println("End of alive callback") return nothing end end # @muladd diff --git a/src/callbacks_step/save_solution.jl b/src/callbacks_step/save_solution.jl index 58fedbb2d1d..7afb6f0bd1f 100644 --- a/src/callbacks_step/save_solution.jl +++ b/src/callbacks_step/save_solution.jl @@ -257,6 +257,7 @@ function save_solution_file(u, time, dt, timestep, system = "") @unpack output_directory, solution_variables = solution_callback + println("Start of save_solution_file") # Filename based on current time step if isempty(system) filename = joinpath(output_directory, @sprintf("solution_%09d.h5", timestep)) @@ -269,6 +270,7 @@ function save_solution_file(u, time, dt, timestep, Trixi.output_data_to_vtu(mesh, equations, solver, cache.communication_data.solution_data, filename, solution_variables) + println("End of save_solution_file") return filename end diff --git a/src/solvers/fv_t8code/fv.jl b/src/solvers/fv_t8code/fv.jl index d6bd6e17782..e531c6ee8a5 100644 --- a/src/solvers/fv_t8code/fv.jl +++ b/src/solvers/fv_t8code/fv.jl @@ -162,44 +162,43 @@ end function rhs!(du, u, t, mesh::T8codeMesh, equations, boundary_conditions, source_terms::Source, solver::FV, cache) where {Source} - println("1. Start of actual rhs!") # Reset du @trixi_timeit timer() "reset ∂u/∂t" du.=zero(eltype(du)) - println("2. actual rhs!") + # Exchange solution between MPI ranks @trixi_timeit timer() "exchange_solution_data!" exchange_solution_data!(u, mesh, equations, solver, cache) - println("3. of actual rhs!") + @trixi_timeit timer() "gradient reconstruction" calc_gradient_reconstruction!(u, mesh, equations, solver, cache) - println("4. of actual rhs!") + # Prolong solution to interfaces @trixi_timeit timer() "prolong2interfaces" begin prolong2interfaces!(cache, mesh, equations, solver) end - println("5. of actual rhs!") + # Calculate interface fluxes @trixi_timeit timer() "interface flux" begin calc_interface_flux!(du, mesh, have_nonconservative_terms(equations), equations, solver, cache) end - println("6. of actual rhs!") + # Prolong solution to boundaries @trixi_timeit timer() "prolong2boundaries!" begin prolong2boundaries!(cache, mesh, equations, solver) end - println("7. of actual rhs!") + # Calculate boundary fluxes @trixi_timeit timer() "calc boundary flux" begin calc_boundary_flux!(du, cache, t, boundary_conditions, mesh, equations, solver) end - println("8. of actual rhs!") + @trixi_timeit timer() "volume" begin for element in eachelement(mesh, solver, cache) volume = cache.elements.volume[element] @@ -208,12 +207,12 @@ function rhs!(du, u, t, mesh::T8codeMesh, equations, end end end - println("9. of actual rhs!") + # Calculate source terms @trixi_timeit timer() "source terms" begin calc_sources!(du, u, t, source_terms, mesh, equations, solver, cache) end - println("10. End of actual rhs!") + return nothing end