Skip to content

Commit

Permalink
Removed lat_sanity_check error for h_misalign with Laue. (#1041)
Browse files Browse the repository at this point in the history
  • Loading branch information
DavidSagan authored Jul 5, 2024
1 parent f87cd9f commit 15c4afc
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 9 deletions.
7 changes: 0 additions & 7 deletions bmad/code/lat_sanity_check.f90
Original file line number Diff line number Diff line change
Expand Up @@ -887,13 +887,6 @@ subroutine lat_sanity_check (lat, err_flag)
err_flag = .true.
endif

if (ph%grid%type == h_misalign$ .and. ele%value(b_param$) > 0) then
call out_io (s_fatal$, r_name, &
'ELEMENT: ' // ele_full_name(ele, '@N (&#)'), &
'HAS GRID TYPE H_MISALIGN BUT THIS IS NOT IMPLEMENTED FOR LAUE DIFFRACTION!')
err_flag = .true.
endif

g = ph%curvature%spherical + ph%curvature%elliptical
if ((g(1) /= 0 .or. g(2) /= 0) .and. g(3) == 0) then
call out_io (s_warn$, r_name, &
Expand Down
2 changes: 1 addition & 1 deletion tao/code/tao_interface.f90
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ function tao_beam_track_endpoint (ele_id, lat, branch_str, where, u) result (ele
type (ele_struct), pointer :: ele
type (lat_struct), target :: lat
character(*) ele_id, where, branch_str
type (tao_universe_struct) u
type (tao_universe_struct), target :: u
end function

function tao_branch_index (ix_branch) result (ix_this)
Expand Down
2 changes: 1 addition & 1 deletion tao/version/tao_version_mod.f90
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
!-

module tao_version_mod
character(*), parameter :: tao_version_date = "2024/06/28 17:45:55"
character(*), parameter :: tao_version_date = "2024/07/01 08:58:45"
end module

0 comments on commit 15c4afc

Please sign in to comment.