Skip to content
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

Clean tspa io and some fixes #1095

Merged
merged 6 commits into from
May 19, 2022
Merged

Clean tspa io and some fixes #1095

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
87a55da
add extended maps dump
ldeniau Mar 29, 2022
3b93386
sync with recent changes
ldeniau Mar 29, 2022
b5a193a
extend relative precision for particle type detection to 1e-4
ldeniau Mar 29, 2022
0db98b2
extend relative precision for particle type detection to 1e-4
ldeniau Mar 29, 2022
49b435a
restore MAD-X original
ldeniau Mar 29, 2022
9400deb
forgot madxprint format in dapri77 and darea77
ldeniau Mar 31, 2022
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
75 changes: 59 additions & 16 deletions libs/ptc/src/Sa_extend_poly.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

module S_extend_poly
USE tree_element_MODULE
USE polymorphic_taylor
IMPLICIT NONE
public
logical(lp), target :: ALWAYS_knobs=.false.
Expand All @@ -14,23 +15,51 @@ module S_extend_poly

CONTAINS

! LD: 03.02.2021
SUBROUTINE PRTR(S, X)
IMPLICIT NONE
CHARACTER(*), INTENT(IN):: S
REAL(DP), OPTIONAL, INTENT(IN):: X(6)

! cancel all PRTR
if (MAPDUMP .eq. 0) return

! special case: display only string without X
if (.not. PRESENT(X)) then
WRITE(*, '(a,a)') '@@ ', S
return
endif

! @@ + elem + func + 6 columns
WRITE(*, '(a,a15,a,a15,6ES25.16)') '@@ ', ELEM_NAME, ' ', S &
, X(1), X(2), X(3), X(4), -X(6), X(5)
END SUBROUTINE PRTR

! LD: 03.04.2019
SUBROUTINE PRTP1(S, X)
IMPLICIT NONE
CHARACTER(*), INTENT(IN):: S
TYPE(REAL_8), INTENT(IN):: X
TYPE(REAL_8) T

! cancel all PRTP
if (MAPDUMP .eq. 0) return

if (X%KIND /= 1) then
! @@ + elem + func + 7 columns
WRITE(*, '(a,a15,a,a15,7E25.16)') '@@ ', ELEM_NAME, ' ', S, X.sub.'000000'&
, X.sub.'100000', X.sub.'010000', X.sub.'001000'&
, X.sub.'000100',-X.sub.'000001', X.sub.'000010'
if (MAPDUMP .ge. 2) then
! @@ + elem + func + 7 columns
WRITE(*, '(a,a15,a,a15,7ES25.16)') '@@ ', ELEM_NAME, ' ', S, X.sub.'000000'&
, X.sub.'100000', X.sub.'010000', X.sub.'001000'&
, X.sub.'000100',-X.sub.'000001', X.sub.'000010'
endif
if (MAPDUMP .ge. 3) then
call alloc(T)
T = X ; call daprint(T)
call kill(T)
endif
else
! @@ + elem + func + 1 columns
WRITE(*, '(a,a15,a,a15,1E25.16)') '@@ ', ELEM_NAME, ' ', S, X%R
WRITE(*, '(a,a15,a,a15,1ES25.16)') '@@ ', ELEM_NAME, ' ', S, X%R
endif
END SUBROUTINE PRTP1

Expand All @@ -39,6 +68,7 @@ SUBROUTINE PRTP(S, X)
IMPLICIT NONE
CHARACTER(*), INTENT(IN):: S
TYPE(REAL_8), OPTIONAL, INTENT(IN):: X(6)
TYPE(REAL_8) T

! cancel all PRTP
if (MAPDUMP .eq. 0) return
Expand All @@ -51,20 +81,33 @@ SUBROUTINE PRTP(S, X)

! @@ + elem + func + 6 columns
if (MAPDUMP .eq. 1) then
WRITE(*, '(a,a15,a,a15,6E25.16)') '@@ ', ELEM_NAME, ' ', S &
WRITE(*, '(a,a15,a,a15,6ES25.16)') '@@ ', ELEM_NAME, ' ', S &
, X(1).sub.'000000', X(2).sub.'000000', X(3).sub.'000000', X(4).sub.'000000',-X(6).sub.'000000', X(5).sub.'000000'
return
endif

! @@ + elem + func + 42 columns
WRITE(*, '(a,a15,a,a15,42E25.16)') '@@ ', ELEM_NAME, ' ', S &
, X(1).sub.'000000', X(2).sub.'000000', X(3).sub.'000000', X(4).sub.'000000',-X(6).sub.'000000', X(5).sub.'000000'&
, X(1).sub.'100000', X(1).sub.'010000', X(1).sub.'001000', X(1).sub.'000100',-X(1).sub.'000001', X(1).sub.'000010'&
, X(2).sub.'100000', X(2).sub.'010000', X(2).sub.'001000', X(2).sub.'000100',-X(2).sub.'000001', X(2).sub.'000010'&
, X(3).sub.'100000', X(3).sub.'010000', X(3).sub.'001000', X(3).sub.'000100',-X(3).sub.'000001', X(3).sub.'000010'&
, X(4).sub.'100000', X(4).sub.'010000', X(4).sub.'001000', X(4).sub.'000100',-X(4).sub.'000001', X(4).sub.'000010'&
,-X(6).sub.'100000',-X(6).sub.'010000',-X(6).sub.'001000',-X(6).sub.'000100', X(6).sub.'000001',-X(6).sub.'000010'&
, X(5).sub.'100000', X(5).sub.'010000', X(5).sub.'001000', X(5).sub.'000100',-X(5).sub.'000001', X(5).sub.'000010'
if (MAPDUMP .ge. 2) then
! @@ + elem + func + 42 columns
WRITE(*, '(a,a15,a,a15,42ES25.16)') '@@ ', ELEM_NAME, ' ', S &
, X(1).sub.'000000', X(2).sub.'000000', X(3).sub.'000000', X(4).sub.'000000',-X(6).sub.'000000', X(5).sub.'000000'&
, X(1).sub.'100000', X(1).sub.'010000', X(1).sub.'001000', X(1).sub.'000100',-X(1).sub.'000001', X(1).sub.'000010'&
, X(2).sub.'100000', X(2).sub.'010000', X(2).sub.'001000', X(2).sub.'000100',-X(2).sub.'000001', X(2).sub.'000010'&
, X(3).sub.'100000', X(3).sub.'010000', X(3).sub.'001000', X(3).sub.'000100',-X(3).sub.'000001', X(3).sub.'000010'&
, X(4).sub.'100000', X(4).sub.'010000', X(4).sub.'001000', X(4).sub.'000100',-X(4).sub.'000001', X(4).sub.'000010'&
,-X(6).sub.'100000',-X(6).sub.'010000',-X(6).sub.'001000',-X(6).sub.'000100', X(6).sub.'000001',-X(6).sub.'000010'&
, X(5).sub.'100000', X(5).sub.'010000', X(5).sub.'001000', X(5).sub.'000100',-X(5).sub.'000001', X(5).sub.'000010'
endif

if (MAPDUMP .ge. 3 .and. index(S, ':1') .ne. 0) then
! @@ + elem + func + full DAMAP
call alloc(T)
T = X(1) ; call daprint(T)
T = X(2) ; call daprint(T)
T = X(3) ; call daprint(T)
T = X(4) ; call daprint(T)
T = X(5) ; call daprint(T)
T = X(6) ; call daprint(T)
call kill(T)
endif
END SUBROUTINE PRTP

SUBROUTINE ANALYSE_APERTURE_FLAG(I,R)
Expand Down
Loading