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

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
Co-authored-by: Daniel Doehring <[email protected]>
@DanielDoehring
Copy link
Contributor

Are we good to go here?

sloede
sloede previously approved these changes May 15, 2024
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

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.

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.

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.

@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
@warisa-r warisa-r deleted the PERK_p2_Single_ext branch May 25, 2024 13:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants