Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Subcell limiting: Revise order of bounds using a Dict #1649

Merged

Conversation

bennibolm
Copy link
Contributor

@bennibolm bennibolm commented Sep 27, 2023

In later PRs, the order of bounds in variable_bounds can be very confusing.
For instance, in the branch with all subcell limiting features, there is this code to get the right position in variable_bounds (see here):

@unpack variable_bounds = limiter.cache.subcell_limiter_coefficients

counter = 2 * length(limiter.local_minmax_variables_cons) + spec_entropy +
              math_entropy
if local_minmax
    if variable in limiter.local_minmax_variables_cons
        for (index_, variable_) in enumerate(limiter.local_minmax_variables_cons)
            if variable == variable_
                var_min = variable_bounds[2 * (index_ - 1) + 1]
                break
            end
        end
    else
        for variable_ in limiter.positivity_variables_cons[1:index]
            if !(variable_ in limiter.local_minmax_variables_cons)
                counter += 1
            end
        end
        var_min = variable_bounds[counter]
    end
else
    var_min = variable_bounds[counter + index]
end

This PR now revises the implementation using a Dict, reducing the linked code to 2 only lines:

@unpack variable_bounds = limiter.cache.subcell_limiter_coefficients
var_min = variable_bounds["$(variable)_min"]

The reason why it was so complicated earlier was, that I only allocate the bound arrays for variables which are actually limited. Moreover, if a variable is limited with both the positivity limiter and the local limiter, only the more restrictive bound should be saved, but both limiter should be able to access the saved bound. Therefore, I had to check for every positivity variable, whether the same variable is limited locally. In both cases, the location of the bound in variable_bounds is different.

@github-actions
Copy link
Contributor

Review checklist

This checklist is meant to assist creators of PRs (to let them know what reviewers will typically look for) and reviewers (to guide them in a structured review process). Items do not need to be checked explicitly for a PR to be eligible for merging.

Purpose and scope

  • The PR has a single goal that is clear from the PR title and/or description.
  • All code changes represent a single set of modifications that logically belong together.
  • No more than 500 lines of code are changed or there is no obvious way to split the PR into multiple PRs.

Code quality

  • The code can be understood easily.
  • Newly introduced names for variables etc. are self-descriptive and consistent with existing naming conventions.
  • There are no redundancies that can be removed by simple modularization/refactoring.
  • There are no leftover debug statements or commented code sections.
  • The code adheres to our conventions and style guide, and to the Julia guidelines.

Documentation

  • New functions and types are documented with a docstring or top-level comment.
  • Relevant publications are referenced in docstrings (see example for formatting).
  • Inline comments are used to document longer or unusual code sections.
  • Comments describe intent ("why?") and not just functionality ("what?").
  • If the PR introduces a significant change or new feature, it is documented in NEWS.md.

Testing

  • The PR passes all tests.
  • New or modified lines of code are covered by tests.
  • New or modified tests run in less then 10 seconds.

Performance

  • There are no type instabilities or memory allocations in performance-critical parts.
  • If the PR intent is to improve performance, before/after time measurements are posted in the PR.

Verification

  • The correctness of the code was verified using appropriate tests.
  • If new equations/methods are added, a convergence test has been run and the results
    are posted in the PR.

Created with ❤️ by the Trixi.jl community.

src/solvers/dgsem_tree/subcell_limiters.jl Outdated Show resolved Hide resolved
src/solvers/dgsem_tree/subcell_limiters_2d.jl Outdated Show resolved Hide resolved
@codecov
Copy link

codecov bot commented Sep 27, 2023

Codecov Report

All modified lines are covered by tests ✅

Comparison is base (1727b07) 79.30% compared to head (a45389e) 93.23%.

Additional details and impacted files
@@             Coverage Diff             @@
##             main    #1649       +/-   ##
===========================================
+ Coverage   79.30%   93.23%   +13.93%     
===========================================
  Files         419      419               
  Lines       34165    34143       -22     
===========================================
+ Hits        27093    31833     +4740     
+ Misses       7072     2310     -4762     
Flag Coverage Δ
unittests 93.23% <100.00%> (+13.93%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Coverage Δ
src/solvers/dgsem_tree/containers_2d.jl 96.63% <100.00%> (ø)
src/solvers/dgsem_tree/subcell_limiters.jl 83.87% <100.00%> (ø)
src/solvers/dgsem_tree/subcell_limiters_2d.jl 94.34% <100.00%> (-0.10%) ⬇️

... and 148 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@bennibolm
Copy link
Contributor Author

After @efaulhaber 's suggestion from above, I directly implemented the variable variable_bounds as Dict. It actually wasn't necessary to use an additional bounds ordering variable. Your suggestions/questions seem to treat an old version. @sloede

I will push the change to use Symbols instead of Strings and request a review from you.

@bennibolm bennibolm requested a review from sloede October 2, 2023 08:39
@sloede sloede enabled auto-merge (squash) October 2, 2023 11:24
@sloede sloede merged commit 7fd4503 into trixi-framework:main Oct 12, 2023
32 checks passed
@bennibolm bennibolm deleted the subcell-limiting-bounds-order-dict branch October 13, 2023 08:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants