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

Skip to content

Linopt module #936

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 7 commits into from
Aug 14, 2019
Merged

Linopt module #936

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
277be48
Moved linear optics routines to a separate file, and merged the three…
vkbo Aug 8, 2019
27febbc
Created the mod_linopt module
vkbo Aug 8, 2019
826a884
Moved input parsing of LINE block to mod_linopt
vkbo Aug 8, 2019
8d74b1b
Renamed fort.11 to linopt_dump.dat
vkbo Aug 8, 2019
efc6555
Merge branch 'master' into linopt_module
vkbo Aug 14, 2019
8d527e4
Fixed some broken indent, updated printout, and renamed fort.34
vkbo Aug 14, 2019
9f6ad1a
Updated manual entry on files fort.11 and fort.34
vkbo Aug 14, 2019
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
Created the mod_linopt module
  • Loading branch information
@vkbo
vkbo committed Aug 8, 2019
commit 27febbc07f91a28f68b1b3fb93a17ada87b0c514
13 changes: 13 additions & 0 deletions source/linear_optics.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
! ================================================================================================ !
! Linear Optics Calculations Module
! ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
! Updated: 2019-08-08
! ================================================================================================ !
module mod_linopt

implicit none

contains

!-----------------------------------------------------------------------
! LINEAR PARAMETERS AT THE POSITION OF EVERY ELEMENT OR BLOCK
!-----------------------------------------------------------------------
Expand Down Expand Up @@ -1171,3 +1182,5 @@ subroutine cpltwis(typ,t,etl,phi)
end if

end subroutine cpltwis

end module mod_linopt
4 changes: 3 additions & 1 deletion source/main_cr.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ program maincr

use floatPrecision
use mod_units
use mod_linopt
use string_tools
use sixtrack_input
use mathlib_bouncer
Expand Down Expand Up @@ -83,7 +84,8 @@ program maincr
real(kind=fPrec) alf0s1,alf0s2,alf0s3,alf0x2,alf0x3,alf0z2,alf0z3,amp00,bet0s1,bet0s2,bet0s3, &
bet0x2,bet0x3,bet0z2,bet0z3,chi,coc,dam1,dchi,dp0,dp00,dp10,dpsic,dps0,dsign,gam0s1,gam0s2, &
gam0s3,gam0x1,gam0x2,gam0x3,gam0z1,gam0z2,gam0z3,phag,r0,r0a,rat0,sic,tasia56,tasiar16,tasiar26,&
tasiar36,tasiar46,tasiar56,tasiar61,tasiar62,tasiar63,tasiar64,tasiar65,taus,x11,x13,damp,eps(2),epsa(2)
tasiar36,tasiar46,tasiar56,tasiar61,tasiar62,tasiar63,tasiar64,tasiar65,taus,x11,x13,damp, &
eps(2),epsa(2)
integer idummy(6)
character(len=4) cpto
character(len=1024) arecord
Expand Down
1 change: 1 addition & 0 deletions source/main_da.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ program mainda
use mathlib_bouncer
use crcoall
use parpro
use mod_linopt
use mod_common
use mod_commons
use mod_common_track
Expand Down
44 changes: 24 additions & 20 deletions source/sixtrack.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4053,31 +4053,35 @@ subroutine matrix(dpp,am)
return
end subroutine matrix

subroutine corrorb
!-----------------------------------------------------------------------
! CORRECTION OF CLOSED ORBIT FIRST (MOST EFFECTIV CORRECTOR STRATEGY
! USING MICADO), THEN
! SCALING OF DIPOLE-ERRORS FOR RMS-VALUES OF THE CLOSED ORBIT
!-----------------------------------------------------------------------
use floatPrecision
use numerical_constants
use mathlib_bouncer
use crcoall
use parpro
use mod_units
use mod_common
use mod_commons
use mod_common_track
implicit none
integer i,icflag,ihflag,ii,ij,im,iprinto,ivflag,j,k,kpz,kzz,l,nlino,ntcoo,nto,nx
real(kind=fPrec) ar(nmon1,ncor1)
real(kind=fPrec) b(nmon1),orbr(nmon1),xinc(ncor1)
real(kind=fPrec) rmsx,ptpx,rmsz,ptpz,rzero,rzero1
real(kind=fPrec) clo0,clop0,hfac,qwc1,vfac
character(len=mNameLen) bezlo(nele)
dimension clo0(2),clop0(2)
dimension qwc1(3),nx(ncor1)
save
subroutine corrorb

use floatPrecision
use numerical_constants
use mathlib_bouncer
use crcoall
use parpro
use mod_units
use mod_linopt
use mod_common
use mod_commons
use mod_common_track

implicit none

integer i,icflag,ihflag,ii,ij,im,iprinto,ivflag,j,k,kpz,kzz,l,nlino,ntcoo,nto,nx
real(kind=fPrec) ar(nmon1,ncor1)
real(kind=fPrec) b(nmon1),orbr(nmon1),xinc(ncor1)
real(kind=fPrec) rmsx,ptpx,rmsz,ptpz,rzero,rzero1
real(kind=fPrec) clo0,clop0,hfac,qwc1,vfac
character(len=mNameLen) bezlo(nele)
dimension clo0(2),clop0(2)
dimension qwc1(3),nx(ncor1)
save
!-----------------------------------------------------------------------
rzero=zero
rzero1=zero
Expand Down