Skip to content

Commit

Permalink
This commit creates a merge conflict when merging into the stardisk b…
Browse files Browse the repository at this point in the history
…ranch. Note that this commit does not make any sense otherwise
  • Loading branch information
scaedufax committed Sep 5, 2023
1 parent de7b998 commit a65e991
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/Main/adjust.F
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ SUBROUTINE ADJUST
* Include non-zero virial energy for Plummer potential and/or 3D case.
VIR = POT - VIR
* Note angular momentum term is contained in virial energy (#14=1/2).
Q = ZKIN/VIR
Q = 2*ZKIN/VIR-POT
E(3) = ZKIN - POT + EPL

* Modify single particle energy by tidal energy (except pure 3D).
Expand Down

0 comments on commit a65e991

Please sign in to comment.