Skip to content

Commit 0ced3fc

Browse files
authored
Correct last checkin. (bmad-sim#1687)
1 parent 5da4056 commit 0ced3fc

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

bmad/output/type_taylors.f90

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ subroutine type_taylors (bmad_taylor, max_order, lines, n_lines, file_id, out_st
111111
nl=nl+1; write (li(nl), '(5a)') 'v_', trim(suffix), ' = zeros(TPS64{d_', trim(suffix), '}, 6)'
112112
else
113113
nl=nl+1; li(nl) = 'using ReferenceFrameRotations'
114-
nl=nl+1; write(li(nl), '(3a)') 'q_', trim(suffix), ' = Quaternion{TPS64{d_', trim(suffix), '}}(0,0,0,0)'
114+
nl=nl+1; write(li(nl), '(5a)') 'q_', trim(suffix), ' = Quaternion{TPS64{d_', trim(suffix), '}}(0,0,0,0)'
115115
endif
116116

117117
do i = 1, nt
@@ -130,7 +130,7 @@ subroutine type_taylors (bmad_taylor, max_order, lines, n_lines, file_id, out_st
130130
endif
131131

132132
if (nt == 4) then
133-
nl=nl+1; write (li(nl), '(5a, 7(i0, a), es24.16)') 'q_', trim(suffix), '.', q_out(i), '[', i, '][[', (tt%expn(k), ',', k = 1, 5), tt%expn(6), ']] =', tt%coef
133+
nl=nl+1; write (li(nl), '(5a, 6(i0, a), es24.16)') 'q_', trim(suffix), '.', q_out(i), '[[', (tt%expn(k), ',', k = 1, 5), tt%expn(6), ']] =', tt%coef
134134
else
135135
nl=nl+1; write (li(nl), '(3a, 7(i0, a), es24.16)') 'v_', trim(suffix), '[', i, '][[', (tt%expn(k), ',', k = 1, 5), tt%expn(6), ']] =', tt%coef
136136
endif

tao/code/tao_show_this.f90

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5359,8 +5359,9 @@ subroutine tao_show_this (what, result_id, lines, nl)
53595359
call transfer_map_calc (lat, taylor, err, i0, ele%ix_ele, u%model%tao_branch(ix_branch)%orbit(i0), ele%ix_branch, spin_map = spin_taylor)
53605360
call type_taylors (taylor, n_order, lines, n_lines = nl, out_style = style, clean = clean, out_var_suffix = var_name, append = .true.)
53615361
if (bmad_com%spin_tracking_on) then
5362+
call re_allocate(lines, 2*nl)
53625363
nl=nl+1; lines(nl) = ''
5363-
call type_taylors (spin_taylor, n_order, lines, n_lines = nl, clean = clean, append = .true.)
5364+
call type_taylors (spin_taylor, n_order, lines, n_lines = nl, out_style = style, clean = clean, append = .true.)
53645365
endif
53655366
endif
53665367
enddo
@@ -5370,8 +5371,9 @@ subroutine tao_show_this (what, result_id, lines, nl)
53705371
if (angle_units) call map_to_angle_coords (taylor, taylor)
53715372
call type_taylors (taylor, n_order, lines, n_lines = nl, out_style = style, clean = clean, out_var_suffix = var_name)
53725373
if (bmad_com%spin_tracking_on) then
5374+
call re_allocate(lines, 2*nl)
53735375
nl=nl+1; lines(nl) = ''
5374-
call type_taylors (spin_taylor, n_order, lines, n_lines = nl, clean = clean, append = .true.)
5376+
call type_taylors (spin_taylor, n_order, lines, n_lines = nl, out_style = style, clean = clean, append = .true.)
53755377
endif
53765378
if (print_eigen) call taylor_to_mat6 (taylor, taylor%ref, vec0, mat6)
53775379

0 commit comments

Comments
 (0)