Skip to content
Snippets Groups Projects
Commit 0693a6de authored by Florian Atteneder's avatar Florian Atteneder
Browse files

Run tests only on PRs (!209)

We require that all PRs are rebased before merging, so running them twice does not help anything.
This should free up the CI queue.
parent 822fbd46
No related branches found
No related tags found
1 merge request!209Run tests only on PRs
Pipeline #7183 passed
...@@ -14,7 +14,6 @@ unittests: ...@@ -14,7 +14,6 @@ unittests:
- julia --project=test/coverage -e "import Pkg; Pkg.instantiate()" - julia --project=test/coverage -e "import Pkg; Pkg.instantiate()"
- julia --project=test/coverage test/coverage/coverage-summary.jl - julia --project=test/coverage test/coverage/coverage-summary.jl
only: only:
- main
- merge_requests - merge_requests
# from https://docs.gitlab.com/ee/ci/yaml/index.html#coverage # from https://docs.gitlab.com/ee/ci/yaml/index.html#coverage
coverage: '/Code coverage: \d+(?:\.\d+)?/' coverage: '/Code coverage: \d+(?:\.\d+)?/'
...@@ -25,7 +24,6 @@ integrationtests: ...@@ -25,7 +24,6 @@ integrationtests:
# using !runtest() because Int(false) = 0 and 0 exit code indicates success in shells # using !runtest() because Int(false) = 0 and 0 exit code indicates success in shells
- julia --project=test/IntegrationTests -e "using IntegrationTests; exit(!IntegrationTests.runtests())" - julia --project=test/IntegrationTests -e "using IntegrationTests; exit(!IntegrationTests.runtests())"
only: only:
- main
- merge_requests - merge_requests
artifacts: artifacts:
when: always when: always
...@@ -40,7 +38,6 @@ integrationtests-threads: ...@@ -40,7 +38,6 @@ integrationtests-threads:
# using !runtest() because Int(false) = 0 and 0 exit code indicates success in shells # using !runtest() because Int(false) = 0 and 0 exit code indicates success in shells
- julia --project=test/IntegrationTests --threads 8 -e "using IntegrationTests; exit(!IntegrationTests.runtests())" - julia --project=test/IntegrationTests --threads 8 -e "using IntegrationTests; exit(!IntegrationTests.runtests())"
only: only:
- main
- merge_requests - merge_requests
artifacts: artifacts:
when: always when: always
......
...@@ -267,18 +267,7 @@ end ...@@ -267,18 +267,7 @@ end
####################################################################### #######################################################################
function rhs!(env, mesh::Mesh1d{DGElement}, P::Project, hrsc::Nothing) function rhs!(env, mesh::Mesh1d, P::Project, hrsc::Nothing)
if mesh.element.kind === :nodal_lagrange
nodal_lagrange_rhs!(env, mesh, P, hrsc)
elseif mesh.element.kind === :modal_bernstein
modal_bernstein_rhs!(env, mesh, P, hrsc)
else
TODO(mesh.element.kind)
end
end
function nodal_lagrange_rhs!(env, mesh::Mesh1d, P::Project, hrsc::Nothing)
@unpack cache, mesh = env @unpack cache, mesh = env
@unpack equation = P @unpack equation = P
...@@ -299,34 +288,6 @@ function nodal_lagrange_rhs!(env, mesh::Mesh1d, P::Project, hrsc::Nothing) ...@@ -299,34 +288,6 @@ function nodal_lagrange_rhs!(env, mesh::Mesh1d, P::Project, hrsc::Nothing)
end end
function modal_bernstein_rhs!(env, mesh::Mesh1d, P::Project, hrsc::Nothing)
@unpack cache, mesh = env
@unpack equation = P
@unpack u_modal, flx_u, src_u = get_static_variables(cache)
@unpack u = get_dynamic_variables(cache)
@unpack rhs_u = get_rhs_variables(cache)
@unpack nflx_u, bdry_u = get_bdry_variables(cache)
u_modal .= u
for (v_u, v_u_modal) in zip(eachcell(mesh,u),eachcell(mesh,u_modal))
mul!(v_u, P.prms.V_bernstein, v_u_modal)
end
dg1d.interpolate_face_data!(mesh, u, bdry_u)
broadcast_volume!(flux_source, equation, mesh)
broadcast_faces!(llf_1d, equation, mesh)
# broadcast_bdry!(bdryllf_1d, equation, P.bdrycond, mesh)
compute_rhs_weak_form!(rhs_u, flx_u, src_u, nflx_u, mesh)
u .= u_modal
return
end
function rhs!(env, mesh::Mesh2d, P::Project, hrsc::Nothing) function rhs!(env, mesh::Mesh2d, P::Project, hrsc::Nothing)
@unpack cache = env @unpack cache = env
......
...@@ -125,10 +125,6 @@ function register_equation!(mesh::Mesh1d, P::Project) ...@@ -125,10 +125,6 @@ function register_equation!(mesh::Mesh1d, P::Project)
else else
TODO(P.prms.hrsc) TODO(P.prms.hrsc)
end end
elseif mesh.element isa DGElement
if mesh.element.kind === :modal_bernstein
register_variables!(mesh.cache, static_variablenames=(:u_modal,))
end
end end
end end
function register_equation!(mesh::Mesh2d, P::Project) function register_equation!(mesh::Mesh2d, P::Project)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment