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

Uninitialised and unused variables #136

Merged
merged 6 commits into from
Mar 24, 2017
Merged

Uninitialised and unused variables #136

merged 6 commits into from
Mar 24, 2017

Conversation

dhubber
Copy link
Contributor

@dhubber dhubber commented Mar 24, 2017

Newer version of previous uninitialised variables pull request. Cherry-picked from old branch onto newer up-to-date branch from master. In summary includes :

  • Removal of unused variables
  • Initialise any uninitialised variables to a sensible default value
  • Casting some unsigned ints to ints in conditional statments (N.B. used C-style casts)
  • Some code cleaning up, removal of old unused/out-of-date code
  • A few small optimisations (by way of using some intermediate const variables)

Also given the code another sweep for newly introduced unused/uninitialised variables. The only exceptions are the MultipleSourceIonisation.cpp and TreeRay.cpp files, which will be dealt with in a future pull request. Hopefully this can be merged quickly before it goes out-of-date (again) with the master branch.

@giovanni-rosotti
Copy link
Contributor

For me it's fine. The previous pull request has introduced a conflict which I am going to take care of (and I will also get rid of some commented code).

…it's properly been calculated in ExactReimannSolver
…some ionisation routines that will be addressed in a future commit). Also cleaned up some code, indents, removing tabs, etc..
@giovanni-rosotti
Copy link
Contributor

Rebase done - wait for my commit now

@rbooth200
Copy link
Collaborator

Assuming this passes travis, I'm happy for it to go.

@giovanni-rosotti
Copy link
Contributor

Done. Richard, you should have the honour of merging the pull request as both David and I have been involved in the pull request.

@rbooth200 rbooth200 closed this Mar 24, 2017
@rbooth200 rbooth200 deleted the init_variables5 branch March 24, 2017 20:04
@dhubber
Copy link
Contributor Author

dhubber commented Mar 24, 2017 via email

@rbooth200 rbooth200 restored the init_variables5 branch March 24, 2017 20:09
@rbooth200 rbooth200 reopened this Mar 24, 2017
@rbooth200 rbooth200 merged commit b664422 into master Mar 24, 2017
@rbooth200
Copy link
Collaborator

rbooth200 commented Mar 24, 2017 via email

@rbooth200 rbooth200 deleted the init_variables5 branch March 24, 2017 20:10
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.

None yet

3 participants