diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b7289cd7e1469c469ece39955d49085ffa199670..8951ed363a9f33fd167d5e9a9ee384b2d4a96216 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,7 +14,6 @@ unittests: - julia --project=test/coverage -e "import Pkg; Pkg.instantiate()" - julia --project=test/coverage test/coverage/coverage-summary.jl only: - - main - merge_requests # from https://docs.gitlab.com/ee/ci/yaml/index.html#coverage coverage: '/Code coverage: \d+(?:\.\d+)?/' @@ -25,7 +24,6 @@ integrationtests: # using !runtest() because Int(false) = 0 and 0 exit code indicates success in shells - julia --project=test/IntegrationTests -e "using IntegrationTests; exit(!IntegrationTests.runtests())" only: - - main - merge_requests artifacts: when: always @@ -40,7 +38,6 @@ integrationtests-threads: # 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())" only: - - main - merge_requests artifacts: when: always diff --git a/src/ScalarEq/rhs.jl b/src/ScalarEq/rhs.jl index 0e07391b1c0d6ae0c0cbcf749180cbdf308a16d6..75100c42b3a8369bd1470fe804dc7319af3a2d23 100644 --- a/src/ScalarEq/rhs.jl +++ b/src/ScalarEq/rhs.jl @@ -267,18 +267,7 @@ end ####################################################################### -function rhs!(env, mesh::Mesh1d{DGElement}, 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) +function rhs!(env, mesh::Mesh1d, P::Project, hrsc::Nothing) @unpack cache, mesh = env @unpack equation = P @@ -299,34 +288,6 @@ function nodal_lagrange_rhs!(env, mesh::Mesh1d, P::Project, hrsc::Nothing) 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) @unpack cache = env diff --git a/src/ScalarEq/setup.jl b/src/ScalarEq/setup.jl index f8bc0adf34fd46b19f0921e6345198704acb2ffc..690f9b41c51a3d5d41f12405602125516820e6f9 100644 --- a/src/ScalarEq/setup.jl +++ b/src/ScalarEq/setup.jl @@ -125,10 +125,6 @@ function register_equation!(mesh::Mesh1d, P::Project) else TODO(P.prms.hrsc) end - elseif mesh.element isa DGElement - if mesh.element.kind === :modal_bernstein - register_variables!(mesh.cache, static_variablenames=(:u_modal,)) - end end end function register_equation!(mesh::Mesh2d, P::Project)