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

Addressing a number of miscellaneous changes from #660 #680

Merged
merged 26 commits into from
Jun 29, 2020

Conversation

gonuke
Copy link
Member

@gonuke gonuke commented Jun 11, 2020

Description

Implement code updates from #660 in

  • uwuw
  • tally
  • overlap_check
  • build_obb
  • misc/tests

Motivation and Context

These changes were proposed by the professional PullRequest review

Changes

These are largely syntax changes that don't impact the logic of the code.

Behavior

There is no change in behavior.

Other Information

Other relevant information to this pull request.

@gonuke gonuke changed the title Addressing changes from #660 in uwuw and tally Addressing changes from #660 in uwuw, tally, and overlap_check Jun 11, 2020
@bam241
Copy link
Member

bam241 commented Jun 11, 2020

(I disabled notification on this.) Please ping me when this needs review :)

@gonuke gonuke changed the title Addressing changes from #660 in uwuw, tally, and overlap_check Addressing a number of miscellaneous changes from #660 Jun 11, 2020
@gonuke gonuke requested review from pshriwise and bam241 June 11, 2020 15:59
@gonuke
Copy link
Member Author

gonuke commented Jun 11, 2020

This should be ready for review @bam241 - not sure why tests aren't running?

@bam241
Copy link
Member

bam241 commented Jun 11, 2020

this happends some times...
this is actually running, but don't show up....
https://travis-ci.org/github/svalinn/DAGMC/builds/697285107

@bam241
Copy link
Member

bam241 commented Jun 11, 2020

I manually restarted the failed build, this allowed GitHub to pick it up

Copy link
Member

@bam241 bam241 left a comment

Choose a reason for hiding this comment

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

Just one question, but LGTM !
thank you @gonuke

~ProgressBar();
~ProgressBar() {
if (need_final_newline) {
std::cout << "\n";
Copy link
Member

Choose a reason for hiding this comment

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

maybe there we would want a endl to flush the buffer ?

Copy link
Member Author

Choose a reason for hiding this comment

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

👍
\n should be the same as std::endl, but endl may be safer across platforms.

Copy link
Member

Choose a reason for hiding this comment

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

I thought endl would force the flush, where \n would not ?

Copy link
Member

@bam241 bam241 left a comment

Choose a reason for hiding this comment

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

LGTM!

@gonuke
Copy link
Member Author

gonuke commented Jun 11, 2020

astyle is failing, but not on my machine. I'm using v3.0.1... what to do??? :(

@bam241
Copy link
Member

bam241 commented Jun 11, 2020

we could move to clang-format :p

I'll take a look and PR against your branch

@gonuke
Copy link
Member Author

gonuke commented Jun 11, 2020

It's just one file....

@bam241
Copy link
Member

bam241 commented Jun 11, 2020

astyle is failing, but not on my machine. I'm using v3.0.1... what to do??? :(

I have 3.1

Copy link
Member

@pshriwise pshriwise left a comment

Choose a reason for hiding this comment

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

Just a few comments/questions. Looks really good overall to me.

src/build_obb/build_obb.cpp Outdated Show resolved Hide resolved
src/overlap_check/ProgressBar.cpp Outdated Show resolved Hide resolved
src/tally/KDEMeshTally.cpp Show resolved Hide resolved
src/tally/TrackLengthMeshTally.hpp Show resolved Hide resolved
src/tally/tests/test_KDEKernel.cpp Show resolved Hide resolved
src/uwuw/name_concatenator.hpp Outdated Show resolved Hide resolved
src/uwuw/name_concatenator.hpp Outdated Show resolved Hide resolved
src/uwuw/uwuw_preprocessor.cpp Outdated Show resolved Hide resolved
@pshriwise
Copy link
Member

Will merge at the end of the day if there are no further comments.

@pshriwise pshriwise merged commit bbc7785 into svalinn:develop Jun 29, 2020
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.

3 participants