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

Fix calls to pro_input from trupdate, adding null termination #1159

Merged
merged 1 commit into from
Mar 1, 2023
Merged

Fix calls to pro_input from trupdate, adding null termination #1159

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 12 additions & 4 deletions src/trrun.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3767,6 +3767,7 @@ subroutine tttrak(ek,re,track,ktrack)
end subroutine tttrak

subroutine trupdate(turn)
use, intrinsic :: iso_c_binding
implicit none
!----------------------------------------------------------------------*
! Purpose: *
Expand All @@ -3775,14 +3776,21 @@ subroutine trupdate(turn)
! Input/output: *
! turn (integer) Current turn number. *
!----------------------------------------------------------------------*
interface
subroutine pro_input(statement) bind(c,name='pro_input_')
use, intrinsic :: iso_c_binding
character(kind=c_char) :: statement
end subroutine pro_input
end interface
integer :: turn
character(len=25) :: cmd1
character(len=30) :: cmd2
character(len=25,kind=c_char) :: cmd1
character(len=30,kind=c_char) :: cmd2

!---- call pro_input('TR$TURN := turn;')
write(cmd1, '(''tr$turni := '',i8,'' ; '')') turn
write(cmd1,'(i8)') turn
cmd1 = c_char_'tr$turni := '//trim(cmd1)//c_char_' ; '//c_null_char
call pro_input(cmd1)
write(cmd2, '(''exec, tr$macro($tr$turni) ; '')')
cmd2 = c_char_'exec, tr$macro($tr$turni) ; '//c_null_char
call pro_input(cmd2)
call init_elements() ! added since now temporary variables are used and need to update
end subroutine trupdate
Expand Down