Octree with time-dependent size for the eccentric shearing sheet#860
Octree with time-dependent size for the eccentric shearing sheet#860CsPeti05 wants to merge 60 commits into
Conversation
…e dependent only if eccentric boundary conditions are set.
hannorein
left a comment
hannorein
left a comment
There was a problem hiding this comment.
This looks quite clean! But there are several white space change (spaces, tabs, etc). Try removing them. This way, the important changes are easier to see and the history is cleaner.
|
|
||
| static struct reb_treecell *reb_tree_add_particle_to_cell(struct reb_simulation* const r, struct reb_treecell *node, int pt, struct reb_treecell *parent, int o){ | ||
| struct reb_particle* const particles = r->particles; | ||
|
|
There was a problem hiding this comment.
A lot of whitespace changes in this file.
| reb_simulation_add(r, reinsertme); | ||
| } | ||
| } | ||
| int oldpos = node->pt; |
|
You also need to bring the branch up to date with the the main branch since there have been changes there during the same time. |
|
The tabs were added because VS Code used four spaces instead of one tab, and GitHub shifted the lines when I uploaded the code. Because of this, I set the indentation to be in terms of tabs. I tried to separate these changes into different commits so they do not make the actual changes less readable, but unfortunately, GitHub shows all changes at the same time here. I think if I change tabs back to spaces, the lines will be randomly shifted compared to each other, which would make it much harder to read the code. Do you have any suggestions? |
I am not exactly sure how to do that since I want to update the code without changing the files I edited. Do you have any tips? |
|
Regarding the whitespaces, you just need to go through line by line, undoing all the changes. The tab/spaces in REBOUND are by no means consistent, but it doesn't make sense to change them in the same pull request as adding a new feature. Regarding the upstream merge, you need to google the precise git commands, but the basic idea is:
|
I merged the rebound/main branch into my branch after resolving the conflicts; however, many of the checks failed. I presume these checks should be successful. Did I do something wrong, maybe? The eccentric shearing sheet example runs smoothly. |
|
Yes, the unit tests should pass. |
Do you have anything in mind that I should look at? I read the error messages and reviewed the code, but I am still stuck. Also, what is the best way to rerun the unit tests? |
…o-nick into CsPeti05-nick-edits
|
@CsPeti05 These REBOUNDx error are not coming from your changes, so you can ignore those! |
3 participants
No description provided.