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

Skip to content

more elens changes #841

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

Merged
merged 41 commits into from
Feb 20, 2020
Merged

more elens changes #841

Changes from 1 commit
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
917a987
converting e22.15 formats into 1pe22.15
amereghe Apr 18, 2019
eead4d3
removing any sign of chebyshev maps from elens module
amereghe Apr 18, 2019
c602e03
adding gamma_el to kick of eLens
amereghe Apr 18, 2019
38de3c3
propagating insertion of gamma_el also to physics manual
amereghe Apr 18, 2019
6c05247
fixing plotting script and plots of radial profiles
amereghe Apr 18, 2019
7c91220
Merge branch 'eLenses' into eLenses_step2
amereghe Sep 9, 2019
a28c98e
Merge branch 'eLenses' into eLenses_step2
amereghe Jan 21, 2020
ebc6b7e
Merge branch 'master' into eLenses_step2
amereghe Jan 24, 2020
94effc4
Merge branch 'eLenses' into eLenses_step2
amereghe Jan 24, 2020
85ea9e1
removing leftovers of elensidealthin6d_DYNK_ZIPF test (???)
amereghe Jan 24, 2020
7215e85
removing traces of CHEBYSHEV type of elens from module
amereghe Jan 24, 2020
cf0e5e2
elenses in RAM are dynamically allocatable
amereghe Jan 24, 2020
d8ee7d2
making storage of radial profiles fully dynamic allocatable
amereghe Jan 24, 2020
565c6c4
adding possibility to express R1 and R2 in normalised units
amereghe Jan 27, 2020
311a3a1
sigma of electron beam can be expressed in normalised units
amereghe Jan 27, 2020
9c79aea
Merge branch 'master' into eLenses_step2
amereghe Jan 28, 2020
f41bae9
test-driven changes
amereghe Jan 28, 2020
1a6c5e8
updating manual accordingly
amereghe Jan 29, 2020
e2acaea
changes manual-driven
amereghe Jan 29, 2020
fc4bd2a
applying to FOX and INTER keyword the same interface as in EMIN and S…
amereghe Jan 29, 2020
536117f
updating manual, following previous commit
amereghe Jan 29, 2020
fd362a2
from elens_normalise_geo to elens_post_linopt
amereghe Jan 29, 2020
d921b6c
adding the check that R1 and R2 actually fall in the range of the map…
amereghe Jan 29, 2020
8277784
updating user manual following last commit
amereghe Jan 29, 2020
96b26ec
fixing printing format in dynk_fileUnit
amereghe Feb 10, 2020
0d03c05
elenses have e-beams by default
amereghe Feb 10, 2020
aa74a73
a bit of house-keeping work
amereghe Feb 11, 2020
13837f6
adding user interface for specifying particle species of lenses
amereghe Feb 11, 2020
395cb41
documenti SPEC keyword in user manual
amereghe Feb 11, 2020
10573f5
adding new tests, for checking normalised settings and species specif…
amereghe Feb 11, 2020
f99f3bf
fixing some printout issues on fort.6
amereghe Feb 11, 2020
50521dd
updating physics manual accordingly
amereghe Feb 11, 2020
0978b50
updating tests of elenses
amereghe Feb 11, 2020
b9e8076
updating DYNK tests, following change in format of dynkset.dat file
amereghe Feb 11, 2020
56a0a8a
updating CHANGELOG.md
amereghe Feb 11, 2020
b30078d
Forgetting README file in an e-lens test
amereghe Feb 12, 2020
8b55e49
Merge branch 'master' into eLenses_step2
amereghe Feb 12, 2020
8c646af
applying changes requested by @vkbo
amereghe Feb 18, 2020
1cfd247
Merge branch 'eLenses' into eLenses_step2
amereghe Feb 18, 2020
c6c051a
updated changelog file
amereghe Feb 18, 2020
0a88e62
Merge branch 'master' into eLenses_step2
amereghe Feb 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'eLenses' into eLenses_step2
  • Loading branch information
@amereghe
amereghe committed Jan 21, 2020
commit a28c98e840580c9ad44b4d2c294a23eb513818ed
17 changes: 6 additions & 11 deletions source/elens.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -609,17 +609,12 @@ subroutine parseRadialProfile(ifile)
end if
call chr_cast(lnSplit(1),tmpR,spErr)
call chr_cast(lnSplit(2),tmpJ,spErr)
if(tmpJ>=0.0) then
ii=ii+1
if(ii>elens_radial_dim) then
iErr = 2
write(lerr,"(2(a,i0))") "ELENS> ERROR too many points in radial profile: ",ii, &
". Max is ",elens_radial_dim
goto 30
end if
elens_radial_profile_nPoints(ifile) = ii
elens_radial_profile_R(ii,ifile) = tmpR
elens_radial_profile_J(ii,ifile) = tmpJ/c1e2
ii=ii+1
if(ii>elens_radial_dim) then
iErr = 2
write(lerr,"(a,i0,a,i0)") "ELENS> ERROR too many points in radial profile: ",ii, &
". Max is ",elens_radial_dim
goto 30
end if
elens_radial_profile_nPoints(ifile) = ii
elens_radial_profile_R(ii,ifile) = tmpR
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.