Feature/BEAMS3D coll operators #196
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…BEAMS3D_collOperators
…BEAMS3D_collOperators
…niversity/STELLOPT into feature/BEAMS3D_collOperators
…BEAMS3D_collOperators
…BEAMS3D_collOperators
…BEAMS3D_collOperators
lazersos
requested changes
Jan 26, 2024
BEAMS3D/Sources/beams3d_follow.f90
Outdated
| mybeam = Beam(i) | ||
| moment = mu_start(i) | ||
| fact_pa = plasma_mass/(mymass*plasma_Zmean) | ||
| fact_pa = 1/(mymass*plasma_Zmean/plasma_mass) |
There was a problem hiding this comment.
Extra un-necessary division.
BEAMS3D/Sources/beams3d_follow.f90
Outdated
| mybeam = Beam(i) | ||
| moment = mu_start(i) | ||
| my_end = t_end(i) | ||
| myline = i | ||
| mytdex = 1 | ||
| fact_pa = plasma_mass/(mymass*plasma_Zmean) | ||
| fact_pa = 1/(mymass*plasma_Zmean/plasma_mass) |
There was a problem hiding this comment.
extra unnecessary division.
| mybeam = Beam(l) | ||
| my_end = t_end(l) | ||
| ltherm = .false. | ||
| lneut = .false. | ||
| ! Collision parameters | ||
| fact_pa = plasma_mass/(mymass*plasma_Zmean) | ||
| fact_pa = 1/(mymass*plasma_Zmean/plasma_mass) |
| mybeam = Beam(l) | ||
| my_end = t_end(l) | ||
| ltherm = .false. | ||
| lneut = .false. | ||
| ! Collision parameters | ||
| fact_pa = plasma_mass/(mymass*plasma_Zmean) | ||
| fact_pa = 1/(mymass*plasma_Zmean/plasma_mass) |
| mybeam = Beam(l) | ||
| my_end = t_end(l) | ||
| myqm = mycharge/mymass | ||
| ltherm = .false. | ||
| lneut = .false. | ||
| ! Collision parameters | ||
| fact_pa = plasma_mass/(mymass*plasma_Zmean) | ||
| fact_pa = 1/(mymass*plasma_Zmean/plasma_mass) |
| mybeam = Beam(l) | ||
| my_end = t_end(l) | ||
| ltherm = .false. | ||
| lneut = .false. | ||
| lcollision = lbeam | ||
| ! Collision parameters | ||
| fact_kick = 2*E_kick*mycharge/(mymass*pi2*pi2*freq_kick*freq_kick*SQRT(pi*1E-7*plasma_mass)) | ||
| fact_pa = plasma_mass/(mymass*plasma_Zmean) | ||
| fact_pa = 1/(mymass*plasma_Zmean/plasma_mass) |
| @@ -191,8 +193,9 @@ SUBROUTINE beams3d_follow_gc | |||
| lcollision = lbeam | |||
| ! Collision parameters | |||
| fact_kick = 2*E_kick*mycharge/(mymass*pi2*pi2*freq_kick*freq_kick*SQRT(pi*1E-7*plasma_mass)) | |||
| fact_pa = plasma_mass/(mymass*plasma_Zmean) | |||
| fact_pa = 1/(mymass*plasma_Zmean/plasma_mass) | |||
| @@ -263,8 +266,9 @@ SUBROUTINE beams3d_follow_gc | |||
| lcollision = lbeam .or. lcollision | |||
| ! Collision parameters | |||
| fact_kick = 2*E_kick*mycharge/(mymass*pi2*pi2*freq_kick*freq_kick*SQRT(pi*1E-7*plasma_mass)) | |||
| fact_pa = plasma_mass/(mymass*plasma_Zmean) | |||
| fact_pa = 1/(mymass*plasma_Zmean/plasma_mass) | |||
lazersos
approved these changes
Jan 28, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This improves and unifies the collision operators. Each operator function now calculates the spitzer time, the critical velocity and a pitch angle scattering factor independently for the code to use later. The nubeam function is improved but disabled for now. It calculates the collisions locally taking into account all present ion densities. The Locust function is untested.