Thanks to visit codestin.com
Credit goes to github.com

Skip to content

New DIST Block (Part 1) #905

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 44 commits into from
Jul 31, 2019
Merged

New DIST Block (Part 1) #905

merged 44 commits into from
Jul 31, 2019

Conversation

vkbo
Copy link
Member

@vkbo vkbo commented Jul 5, 2019 •
edited
Loading

Adding the FORMAT keyword to the DIST block with support for various column types and units. This is the first step of the DIST block upgrades preparing for linking with the dist generator library.

The format is backwards compatible with the old 14 column DIST files. If no FORMAT is specified, this file is assumed. Alternatively, the old format can be selected with the FORMAT specifier OLD_DIST.

vkbo added 21 commits July 5, 2019 11:01
@vkbo
Some header cleanup in mod_partciles
d212447
@vkbo
Merge branch 'master' into dist_updates
452029f
@vkbo
Added parsing of the DIST FORMAT keyword
2e3030e
@vkbo
Rewritten DIST parser to support current functionality with new format
9980a28
@vkbo
Some minor fixes before I forget ...
d65a43b
@vkbo
The unit parsing bits of the new DIST format
482a66d
@vkbo
DIST block can now add particles directly in fort.3 as well.
c433bd0
@vkbo
Added a flag for reading DIST file with dist library instead of internal
520dd3f
@vkbo
I no code good
67a2f40
@vkbo
Fix error message
4004b37
@vkbo
Fixed merge conflicts, but needs logic change
692b917
@vkbo
Fixed some issues after merging master, and added some checks
48b2e7a
@vkbo
Cleaned up the interface a little. Too many options.
9003e38
@vkbo
Removed updateAngle as an optional parameter in part_updatePartEnergy
f0a8c32
@vkbo
DIST block now supports Px/P0 and Py/P0 columns
399488b
@vkbo
Added normalise logical flags for 4D and 6D
5ee2f51
@vkbo
Enforce FORMAT/file column number match, and number of particles read…
551f9e9 
… to be equal to napx
@vkbo
Some shuffling of the logic of how particles are counted in DIST
c314006
@vkbo
Updates some comments and such
bec68a6
@vkbo
Merge branch 'master' into dist_updates
40a38f0
@vkbo
Fix a few minor things after discussions
3a9e8a0
@vkbo vkbo marked this pull request as ready for review July 9, 2019 16:25
@vkbo vkbo requested review from amereghe, rdemaria and tpersson July 9, 2019 16:25
@vkbo vkbo changed the title Dist Updates New DIST Block (Part 1) Jul 9, 2019
rdemaria
rdemaria reviewed Jul 10, 2019
View reviewed changes
rdemaria
rdemaria reviewed Jul 10, 2019
View reviewed changes
rdemaria
rdemaria reviewed Jul 10, 2019
View reviewed changes
rdemaria
rdemaria reviewed Jul 10, 2019
View reviewed changes
@vkbo vkbo changed the title New DIST Block (Part 1) [WIP] New DIST Block (Part 1) Jul 11, 2019
amereghe
amereghe reviewed Jul 11, 2019
View reviewed changes
Copy link
Contributor

@amereghe amereghe left a comment

Choose a reason for hiding this comment

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

For the moment just some minor changes. On the other hand, it is not clear to me if FORMAT with a keyword different from IONS properly sets the pdgid...
Flexible implementation, thanks a lot!

I haven't gone through the C part, though

@vkbo
Copy link
Member Author

vkbo commented Jul 11, 2019 •
edited
Loading

For the moment just some minor changes. On the other hand, it is not clear to me if FORMAT with a keyword different from IONS properly sets the pdgid...

Not sure what you mean. PDGID is available as a column format and also automatically included with IONS.

Flexible implementation, thanks a lot!

I haven't gone through the C part, though

Thanks. Went through and fixed the issues pointed out.
There is no C part to this module.

@amereghe
Copy link
Contributor

Not sure what you mean. PDGID is available as a column format and also automatically included with IONS.

Yes, imagine that the user requests the FORMAT for 6D-normalised coordinates. I don't think we have the place in the DIST block where pdgid is set to that of proton

@vkbo vkbo mentioned this pull request Jul 11, 2019
Closed
@vkbo
Copy link
Member Author

vkbo commented Jul 11, 2019 •
edited
Loading

Not sure what you mean. PDGID is available as a column format and also automatically included with IONS.

Yes, imagine that the user requests the FORMAT for 6D-normalised coordinates. I don't think we have the place in the DIST block where pdgid is set to that of proton

That is set in the SIMU block, or if the old blocks are used, it belongs in the HION block.

The default value is 2212 anyway. Everything defaults to proton.

@vkbo
Copy link
Member Author

vkbo commented Jul 11, 2019

To clarify: The pdgid array defaults to pdgid0, which again defaults to 2212. All of this is set in common_modules.f90.

vkbo added 13 commits July 13, 2019 14:45
@vkbo
The array DIST particle array conversion should now be correct (I hope)
556f299
@vkbo
Merge branch 'master' into dist_updates
d51306c
@vkbo
Added the spin columns to DIST
33b9f94
@vkbo
Updated the interface to DISTlib. Now supports normalised and action …
93ad2f0 
…dist from file.
@vkbo
Added psigma as input column for DIST and made beta0 and gamma0 globa…
a6a28fe 
…l variables, replacing old betrel
@vkbo
Merge branch 'master' into dist_updates
8cb5c04
@vkbo
Some bug fixes, added tests, and started adding normalised coordinate…
f30710b 
…s conversion
@vkbo
Reshuffled parsing of column formats so the FILL keyword can use the …
dc1f131 
…same routine
@vkbo
Finished parsing code for FILL keyword
0219ee7
@vkbo
Code builds, but needs testing
d8d2e95
@vkbo
Let ranecu take sigma cut as a real instead of an integer
08c1a2f
@vkbo
DISTlib interface with normalisation now works
11c6604
@vkbo
Renamed the distlib test to a more accurate name
4e75471
tpersson
tpersson approved these changes Jul 31, 2019
View reviewed changes
source/mod_particles.f90
xv1(1:napx) = xv1(1:napx) + clo(1)*real(idz(1),fPrec)
yv1(1:napx) = yv1(1:napx) + clop(1)*real(idz(1),fPrec)
xv2(1:napx) = xv2(1:napx) + clo(2)*real(idz(2),fPrec)
yv2(1:napx) = yv2(1:napx) + clop(2)*real(idz(2),fPrec)
Copy link
Contributor

Choose a reason for hiding this comment

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

Not sure about the units of the clo(2) is it x'?

Copy link
Member Author

Choose a reason for hiding this comment

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

I think it is. The code here was moved from main_cr some time last year.

@vkbo vkbo changed the title [WIP] New DIST Block (Part 1) New DIST Block (Part 1) Jul 31, 2019
@vkbo
Copy link
Member Author

vkbo commented Jul 31, 2019

We will merge the changes made at this point even if the module needs more development. merging now makes it easier for @tpersson to work on DISTlib and use the new input parsing.

The block is backwards compatible with the old DIST block, so while we develop, we will keep the new features undocumented until it's stable.

@vkbo vkbo merged commit ec70047 into SixTrack:master Jul 31, 2019
@vkbo vkbo deleted the dist_updates branch August 1, 2019 08:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rdemaria rdemaria rdemaria left review comments

@amereghe amereghe amereghe left review comments

@tpersson tpersson tpersson approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@vkbo @amereghe @rdemaria @tpersson