Skip to content

update mdump format #1156

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
ldeniau merged 2 commits into from
Jan 18, 2023
Merged

update mdump format #1156

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
926fd69
change single tpsa front markers to avoid confusion with full damap
ldeniau Jan 18, 2023
603c8da
Merge branch 'master' of github.com:ldeniau/MAD-X
ldeniau Jan 18, 2023
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
10 changes: 5 additions & 5 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 @@ -26,12 +26,12 @@ SUBROUTINE PRTR(S, X)

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

! @@ + elem + func + 6 columns
WRITE(*, '(a,a15,a,a15,6ES25.16)') '@@ ', ELEM_NAME, ' ', S &
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

Expand All @@ -48,7 +48,7 @@ SUBROUTINE PRTP1(S, X)
if (X%KIND /= 1) then
if (MAPDUMP .ge. 2) then
! @@ + elem + func + 7 columns
WRITE(*, '(a,a15,a,a15,7ES25.16)') '@@ ', ELEM_NAME, ' ', S, X.sub.'000000'&
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
Expand All @@ -59,7 +59,7 @@ SUBROUTINE PRTP1(S, X)
endif
else
! @@ + elem + func + 1 columns
WRITE(*, '(a,a15,a,a15,1ES25.16)') '@@ ', ELEM_NAME, ' ', S, X%R
WRITE(*, '(a,a15,a,a15,1ES25.16)') '@: ', ELEM_NAME, ' ', S, X%R
endif
END SUBROUTINE PRTP1

Expand All @@ -75,7 +75,7 @@ SUBROUTINE PRTP(S, X)

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

Expand Down