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.

Sign up for GitHub

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

Jump to bottom

Perk p2 single ext #1908

Merged
merged 170 commits into from May 23, 2024
Merged

Perk p2 single ext #1908

merged 170 commits into from May 23, 2024

Conversation

warisa-r
Copy link
Contributor

Hello,

in this PR which is a continuation of the previous PR of PERK2_single, I tried to make Convex and ECOS weak dependencies of Trixi by adding a file called TrixiConvexECOSExt.

Please let me know if something goes wrong and needs improving!

DanielDoehring and others added 30 commits January 29, 2024 10:06
@DanielDoehring
Templates for PERK p2, p3
befd590
@DanielDoehring
example
0b378f7
@warisa-r
constructor changed
42c74d1
@warisa-r
Modified so that both of the constructor stay
04784df
@DanielDoehring
Merge pull request DanielDoehring#20 from warisa-r/PERK_p2p3_Single
3fcad2a 
Constructor modified
@DanielDoehring
bring back eps
55f4165
@DanielDoehring
correct val
6a31a0b
@warisa-r
add constructor of PERK3
87399dc
@warisa-r
minor fixes
e518386
@warisa-r
function and variable name adjustments
a1222d7
@warisa-r
spelling fix
483015b
@DanielDoehring
Merge branch 'PERK_p2p3_Single' into PERK_p2p3_Single
de86860
@DanielDoehring
Merge pull request DanielDoehring#21 from warisa-r/PERK_p2p3_Single
6436708 
Add constructor of PERK3
@warisa-r
Change names and spacing according to style guide
03f0af1
@warisa-r
Merge branch 'PERK_p2p3_Single' of github.com:warisa-r/Trixi.jl into …
5a13446 
…PERK_p2p3_Single
@warisa-r
spelling correction
e182a89
@warisa-r @DanielDoehring
Apply suggestions from code review
08b70d6 
Co-authored-by: Daniel Doehring <doehringd2@gmail.com>
@DanielDoehring
Merge pull request DanielDoehring#24 from warisa-r/PERK_p2p3_Single
9881351 
Perk p2p3 single
@DanielDoehring
snake case
bdb2db5
@DanielDoehring
Merge branch 'PERK_p2p3_Single' of github.com:DanielDoehring/Trixi.jl…
19a1653 
… into PERK_p2p3_Single
@DanielDoehring
revisit perk single p2 p3
df4733d
@DanielDoehring
fmt
ee9e569
@DanielDoehring
fmt
32cbb1e
@DanielDoehring
Merge branch 'main' into PERK_p2p3_Single
be8ea21
@DanielDoehring
semantic ordering
e3ec50c
@DanielDoehring
add literature
fbcd6e3
@warisa-r
Strip code of p = 3
b1b6d7c
@warisa-r
Add the line to show the error of the elixir
33bb8da
@warisa-r
Make adjustments to a test file and delete example of PERK3
5f763bb
@warisa-r @DanielDoehring
Update Project.toml
9149b7b 
Co-authored-by: Daniel Doehring <doehringd2@gmail.com>
@DanielDoehring
Copy link
Contributor

Are we good to go here?

sloede
sloede previously approved these changes May 15, 2024
View reviewed changes
Copy link
Member

@sloede sloede left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks! Once @ranocha gives the green light, this can be merged

ranocha
ranocha reviewed May 15, 2024
View reviewed changes
Copy link
Member

@ranocha ranocha left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fine with me when the comment of @JoshuaLampert is resolved.

JoshuaLampert
JoshuaLampert reviewed May 16, 2024
View reviewed changes
Copy link
Member

@JoshuaLampert JoshuaLampert left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @warisa-r! Please find two suggestions below.

src/time_integration/paired_explicit_runge_kutta/methods_PERK2.jl Outdated Show resolved Hide resolved
src/time_integration/paired_explicit_runge_kutta/methods_PERK2.jl Outdated Show resolved Hide resolved
JoshuaLampert
JoshuaLampert reviewed May 17, 2024
View reviewed changes
Copy link
Member

@JoshuaLampert JoshuaLampert left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM once the two typos are fixed.

src/time_integration/paired_explicit_runge_kutta/methods_PERK2.jl Outdated Show resolved Hide resolved
src/time_integration/paired_explicit_runge_kutta/methods_PERK2.jl Outdated Show resolved Hide resolved
warisa-r and others added 3 commits May 17, 2024 13:04
@warisa-r @JoshuaLampert
Update src/time_integration/paired_explicit_runge_kutta/methods_PERK2.jl
248129f 
Co-authored-by: Joshua Lampert <51029046+JoshuaLampert@users.noreply.github.com>
@warisa-r @JoshuaLampert
Update src/time_integration/paired_explicit_runge_kutta/methods_PERK2.jl
6891aaa 
Co-authored-by: Joshua Lampert <51029046+JoshuaLampert@users.noreply.github.com>
@warisa-r @JoshuaLampert
Update src/time_integration/paired_explicit_runge_kutta/methods_PERK2.jl
339e355 
Co-authored-by: Joshua Lampert <51029046+JoshuaLampert@users.noreply.github.com>
@ranocha ranocha enabled auto-merge (squash) May 17, 2024 11:23
@ranocha ranocha disabled auto-merge May 23, 2024 06:42
@ranocha ranocha merged commit c2513e2 into trixi-framework:main May 23, 2024
33 of 36 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DanielDoehring DanielDoehring DanielDoehring left review comments

@ranocha ranocha ranocha approved these changes

@JoshuaLampert JoshuaLampert JoshuaLampert approved these changes

@sloede sloede sloede left review comments

Assignees
No one assigned
Labels
enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@warisa-r @ranocha @sloede @DanielDoehring @JoshuaLampert