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

LIE intersect (continued). #2293

Merged
merged 13 commits into from Dec 11, 2018

Conversation

Projects
None yet
2 participants
@endJunction
Copy link
Member

endJunction commented Dec 10, 2018

#2235 continued, especially addressing issues pointed out by @wenqing.

  • Several renames
  • Move some (generalized) algorithms to BaseLib (and fix msvc warnings)
  • Use values where it is not necessary to pointers
  • clang-format
  • add braces around statements

endJunction added some commits Dec 9, 2018

@wenqing
Copy link
Member

wenqing left a comment

Looks good.

@wenqing

This comment has been minimized.

Copy link
Member

wenqing commented Dec 11, 2018

Docker-Conan error.

@endJunction endJunction merged commit d093e32 into ufz:master Dec 11, 2018

2 of 3 checks passed

continuous-integration/jenkins/pr-merge This commit cannot be built
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
deploy/netlify Deploy preview ready!
Details

@endJunction endJunction deleted the endJunction:lie-intersects-pr branch Dec 11, 2018

_process_data._vec_junction_property.emplace_back(junction);
auto const& material_ids = vec_junction_nodeID_matIDs[i].second;
assert(material_ids.size() == 2);
std::array<int, 2> fracture_ids{

This comment has been minimized.

@wenqing

wenqing Dec 11, 2018

Member

warning: suggest braces around initialization of subobject.
The use of double braces should fix the warning.

This comment has been minimized.

@endJunction

endJunction Dec 11, 2018

Author Member

Thanks, added in master.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.