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

Cgal triangulation #13661

Merged
merged 3 commits into from May 8, 2022
Merged

Cgal triangulation #13661

merged 3 commits into from May 8, 2022

Conversation

luca-heltai
Copy link
Member

@luca-heltai luca-heltai commented May 1, 2022 •
edited

Insertion of deal.II points into CGAL triangulation types, and convertion between CGAL Triangulation types to deal.II Triangulation types.

Depends on #13644. Relevant changes to this PR can be seen here:

https://github.com/luca-heltai/dealii/compare/7cb4ee71..b1a8136e2

@luca-heltai
Copy link
Member Author

image

This is the output of cgal_triangulation_05.cc

@luca-heltai luca-heltai force-pushed the cgal-triangulation branch 2 times, most recently from a49144b to ac5d552 Compare May 2, 2022 16:28
@fdrmrc fdrmrc mentioned this pull request May 3, 2022
Merged
@luca-heltai luca-heltai force-pushed the cgal-triangulation branch 3 times, most recently from b701275 to 11d6d8f Compare May 5, 2022 15:37
@luca-heltai
Copy link
Member Author

/rebuild

@luca-heltai
Copy link
Member Author

Now that #13644 has been merged, this can be reviewed. This PR is holding back #13664 and luca-heltai#111 (which will be opened right after #13664 is merged).

@peterrum peterrum self-requested a review May 7, 2022 18:38
peterrum
peterrum reviewed May 8, 2022
View reviewed changes
Copy link
Member

@peterrum peterrum left a comment

Choose a reason for hiding this comment

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

Overall looks good 👍

doc/news/changes/major/20220426FederHeltai Outdated Show resolved Hide resolved
include/deal.II/cgal/triangulation.h Outdated Show resolved Hide resolved
include/deal.II/cgal/triangulation.h Outdated Show resolved Hide resolved
include/deal.II/cgal/triangulation.h Outdated Show resolved Hide resolved
include/deal.II/cgal/triangulation.h Outdated Show resolved Hide resolved
include/deal.II/cgal/triangulation.h Outdated Show resolved Hide resolved
include/deal.II/cgal/triangulation.h Outdated Show resolved Hide resolved
include/deal.II/cgal/triangulation.h Outdated Show resolved Hide resolved
include/deal.II/cgal/triangulation.h Outdated Show resolved Hide resolved
include/deal.II/cgal/triangulation.h
for (const auto edge : cgal_triangulation.finite_edges())
{
// An edge is idenfied by a cell and its two vertices
const auto &[c, i, j] = edge;
Copy link
Member

Choose a reason for hiding this comment

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

This is also a C++17 feature, isn't it?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes. The wrappers are only enabled if c++17 is enabled.

@luca-heltai
Copy link
Member Author

@peterrum, I've addressed all your comments.

@luca-heltai
Copy link
Member Author

Failing is due to artifacts upload:

Unable to copy file to server StatusCode=BadRequest: Bad Request. Source file path: c:\project\dealii-windows.zip. Target server path: dealii-windows.zip/dealii-windows.zip
Cannot continue uploading files, so draining upload queue of 0 items.
Fail to upload 'c:\project\dealii-windows.zip' due to 'Critical failure uploading 'c:\project\dealii-windows.zip''.
GitHub.Runner.Plugins.Artifact.UploadFailedException: Critical failure uploading 'c:\project\dealii-windows.zip'
   at GitHub.Runner.Plugins.Artifact.FileContainerServer.UploadAsync(RunnerActionPluginExecutionContext context, Int32 uploaderId, CancellationToken token)
File error 'Critical failure uploading 'c:\project\dealii-windows.zip'' when uploading file 'c:\project\dealii-windows.zip'.
Associated artifact dealii-windows.zip (32189590) with run #66933
Error: Critical failure uploading 'c:\project\dealii-windows.zip'
Error: Exit code 1 returned from process: file name 'c:\runners\2.291.1\bin\Runner.PluginHost.exe', arguments 'action "GitHub.Runner.Plugins.Artifact.PublishArtifact, Runner.Plugins"'.

@peterrum peterrum merged commit 66c8c2d into dealii:master May 8, 2022
@luca-heltai luca-heltai added this to Done in CGAL Support May 12, 2022
@fdrmrc fdrmrc mentioned this pull request May 27, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@peterrum peterrum peterrum approved these changes

Assignees
No one assigned
Labels
ready for review ready to test Reviewed and ready to merge
Projects
CGAL Support
Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@luca-heltai @peterrum