Skip to content

bug fix with only reading first batch of .trajectory files when plotting multiple dumps #125

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
danieljprice merged 2 commits into from
Jun 17, 2026
Merged

bug fix with only reading first batch of .trajectory files when plotting multiple dumps #125

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
83d1395
bug fix with only reading first batch of .trajectory files when plott…
danieljprice Jun 17, 2026
c1c6488
(exact) implement review suggestions
danieljprice Jun 17, 2026
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
43 changes: 35 additions & 8 deletions src/exact.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,12 +362,14 @@ subroutine submenu_exact(iexact)
over_files: do i=1,nfiles
iexist = .false.
do while(.not.iexist)
if (i==1) print "(/,a)",'Use %f to represent current dump file, e.g. %f.exact looks for dump_000.exact'
if (i==1) print "(/,a,/,a)", &
'Use %f for current filename, e.g. %f.exact looks for dump_000.exact', &
'Use %p for file prefix, e.g. %p.exact looks for dump.exact'
write(str,"(i4)") i
call prompt('enter filename #'//trim(adjustl(str)),filename_exact(i))
!--substitute %f for filename
!--substitute %f/%p for filename
filename_tmp = filename_exact(i)
call string_replace(filename_tmp,'%f',trim(rootname(ifileopen)))
call resolve_exact_filename(filename_tmp,trim(rootname(ifileopen)))
!--check the first file for errors
inquire(file=filename_tmp,exist=iexist)
if (iexist) then
Expand Down Expand Up @@ -716,14 +718,36 @@ subroutine options_exact(iexact)

end subroutine options_exact

!-----------------------------------------------------------------------
! substitute %f and %p placeholders in exact solution filenames
! %f = full dump filename, %p = dump prefix before last underscore
! (e.g. hh48_00010 -> hh48 for .trajectory files)
!-----------------------------------------------------------------------
subroutine resolve_exact_filename(filename,rootname)
use asciiutils, only:string_replace
character(len=*), intent(inout) :: filename
character(len=*), intent(in) :: rootname
integer :: idash

idash = index(rootname,'_',back=.true.)
if (idash==0) idash = len_trim(rootname)+1
if (idash > 1) then
call string_replace(filename,'%p',trim(rootname(1:idash-1)))
else
call string_replace(filename,'%p','')
endif
call string_replace(filename,'%f',trim(rootname))
Comment thread
danieljprice marked this conversation as resolved.

end subroutine resolve_exact_filename

!-----------------------------------------------------------------------
! read exact solution parameters from files
! (in ndspmhd these files are used in the input to the code)
!
! called after main data read and if exact solution chosen from menu
!-----------------------------------------------------------------------
subroutine read_exactparams(iexact,rootname,ierr)
use settings_data, only:ndim,iverbose
use settings_data, only:ndim,iverbose,idefaults_file_read
use prompting, only:prompt
use exactfunction, only:check_function
use filenames, only:fileprefix,ifileopen
Expand Down Expand Up @@ -799,7 +823,8 @@ subroutine read_exactparams(iexact,rootname,ierr)
filename = trim(rootname(1:idash-1))//'.profile'
inquire(file=filename,exist=iexist)
if (iexist) then
filename_exact(1) = filename
! store with %p so trajectory/profile paths update for each dump
filename_exact(1) = '%p.profile'
nfiles = 1
ierr = 0
else
Expand All @@ -812,9 +837,11 @@ subroutine read_exactparams(iexact,rootname,ierr)
inquire(file=filename,exist=iexist)
if (iexist) then
nfiles = nfiles + 1
filename_exact(nfiles) = filename
write(filename_exact(nfiles),"(a,i1)") '%p.trajectory',i
iExactLineStyle = 1
ExactAlpha = 0.5
! orbit trajectories are for overlay only, not quantitative comparison
if (.not.idefaults_file_read) iCalculateExactErrors = .false.
Comment thread
danieljprice marked this conversation as resolved.
ierr = 0
endif
enddo
Expand Down Expand Up @@ -1252,9 +1279,9 @@ subroutine exact_solution(iexact,iplotx,iploty,itransx,itransy,igeom, &
enddo
case(2) ! exact solution read from file
do i=1,nfiles
!--substitute %f for filename
!--substitute %f/%p for filename
filename_tmp = filename_exact(i)
call string_replace(filename_tmp,'%f',trim(rootname(ifileopen)))
call resolve_exact_filename(filename_tmp,trim(rootname(ifileopen)))
!--auto-magically map columns onto splash columns (if not mapped manually)
if (iauto_map_columns) then
call map_columns_in_file(filename_tmp,ncols,nrows,imapexact,&
Expand Down
Loading