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

Gauge filenames #293

Merged
merged 4 commits into from
May 31, 2024
Merged

Gauge filenames #293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
573f80d
create gauge filenames that allow more than 5 digits in gauge number
rjleveque May 30, 2024
545c052
create gauge filenames that allow more than 5 digits also in 3d
rjleveque May 30, 2024
447f6ad
check that abs(gaugeno) < 2**31 in data.py
rjleveque May 30, 2024
554eac4
create gauge filenames that allow more than 5 digits also in 1d
rjleveque May 30, 2024
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
30 changes: 15 additions & 15 deletions src/1d/gauges_module.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,8 @@ subroutine set_gauges(restart, nvar, fname)
! Locals
integer :: i, ipos, idigit
integer, parameter :: iunit = 7
character*14 :: fileName
character(len=24) :: fileName
character(len=15) :: numstr

if (.not. module_setup) then

Expand Down Expand Up @@ -101,13 +102,13 @@ subroutine set_gauges(restart, nvar, fname)
nextLoc = 1 ! next location to be filled with gauge info

do i = 1, num_gauges
fileName = 'gaugexxxxx.txt' ! NB different name convention too

inum = igauge(i)
do ipos = 10,6,-1 ! do this to replace the xxxxx in the name
idigit = mod(inum,10)
fileName(ipos:ipos) = char(ichar('0') + idigit)
inum = inum / 10
end do

! convert inum to string numstr with zero padding if <5 digits
! since we want format gauge00012.txt or gauge1234567.txt:
write (numstr,'(I0.5)') inum
fileName = 'gauge'//trim(numstr)//'.txt'

! status unknown since might be a restart run. might need to rewind
if (restart) then
Expand All @@ -118,7 +119,7 @@ subroutine set_gauges(restart, nvar, fname)
position='append', form='formatted')
rewind OUTGAUGEUNIT
write(OUTGAUGEUNIT,100) igauge(i), xgauge(i), nvar
100 format("# gauge_id= ",i5," location=( ",1e15.7," ) num_eqn= ",i2)
100 format("# gauge_id= ",i0," location=( ",1e15.7," ) num_eqn= ",i2)
write(OUTGAUGEUNIT,101)
101 format("# Columns: level time q(1 ... num_eqn)")
endif
Expand Down Expand Up @@ -348,7 +349,8 @@ subroutine print_gauges_and_reset_nextLoc(gaugeNum,nvar)
implicit none
integer :: gaugeNum,nvar,j,inum,k,idigit,ipos,myunit
integer :: omp_get_thread_num, mythread
character*14 :: fileName
character(len=24) :: fileName
character(len=15) :: numstr

! open file for gauge gaugeNum, figure out name
! not writing gauge number since it is in file name now
Expand All @@ -358,13 +360,11 @@ subroutine print_gauges_and_reset_nextLoc(gaugeNum,nvar)
! NB: output written in different order, losing backward compatibility


fileName = 'gaugexxxxx.txt' ! NB different name convention too
inum = igauge(gaugeNum)
do ipos = 10,6,-1 ! do this to replace the xxxxx in the name
idigit = mod(inum,10)
fileName(ipos:ipos) = char(ichar('0') + idigit)
inum = inum / 10
end do
! convert inum to string numstr with zero padding if <5 digits
! since we want format gauge00012.txt or gauge1234567.txt:
write (numstr,'(I0.5)') inum
fileName = 'gauge'//trim(numstr)//'.txt'


mythread = 0
Expand Down
16 changes: 8 additions & 8 deletions src/2d/gauges_module.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ module gauges_module
! Gauge number
integer :: gauge_num

character(len=14) :: file_name
character(len=24) :: file_name

! Location in time and space
real(kind=8) :: x, y, t_start, t_end
Expand Down Expand Up @@ -106,6 +106,7 @@ subroutine set_gauges(restart, num_eqn, num_aux, fname)
integer, parameter :: UNIT = 7
character(len=128) :: header_1
character(len=40) :: q_column, aux_column
character(len=15) :: numstr

if (.not. module_setup) then

Expand Down Expand Up @@ -194,13 +195,12 @@ subroutine set_gauges(restart, num_eqn, num_aux, fname)

! Create gauge output files
do i = 1, num_gauges
gauges(i)%file_name = 'gaugexxxxx.txt'
num = gauges(i)%gauge_num
do pos = 10, 6, -1
digit = mod(num,10)
gauges(i)%file_name(pos:pos) = char(ichar('0') + digit)
num = num / 10
end do

! convert num to string numstr with zero padding if <5 digits
! since we want format gauge00012.txt or gauge1234567.txt:
write (numstr,'(I0.5)') num
gauges(i)%file_name = 'gauge'//trim(numstr)//'.txt'

! Handle restart
if (restart) then
Expand All @@ -212,7 +212,7 @@ subroutine set_gauges(restart, num_eqn, num_aux, fname)
rewind OUTGAUGEUNIT

! Write header
header_1 = "('# gauge_id= ',i5,' " // &
header_1 = "('# gauge_id= ',i0,' " // &
"location=( ',1e17.10,' ',1e17.10,' ) " // &
"num_var= ',i2)"
write(OUTGAUGEUNIT, header_1) gauges(i)%gauge_num, &
Expand Down
16 changes: 8 additions & 8 deletions src/3d/gauges_module.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ module gauges_module
! Gauge number
integer :: gauge_num

character(len=14) :: file_name
character(len=24) :: file_name

! Location in time and space
real(kind=8) :: x, y, z, t_start, t_end
Expand Down Expand Up @@ -98,6 +98,7 @@ subroutine set_gauges(restart, num_eqn, num_aux, fname)
integer, parameter :: UNIT = 7
character(len=128) :: header_1
character(len=40) :: q_column, aux_column
character(len=15) :: numstr

if (.not. module_setup) then

Expand Down Expand Up @@ -188,13 +189,12 @@ subroutine set_gauges(restart, num_eqn, num_aux, fname)

! Create gauge output files
do i = 1, num_gauges
gauges(i)%file_name = 'gaugexxxxx.txt'
num = gauges(i)%gauge_num
do pos = 10, 6, -1
digit = mod(num,10)
gauges(i)%file_name(pos:pos) = char(ichar('0') + digit)
num = num / 10
end do

! convert num to string numstr with zero padding if <5 digits
! since we want format gauge00012.txt or gauge1234567.txt:
write (numstr,'(I0.5)') num
gauges(i)%file_name = 'gauge'//trim(numstr)//'.txt'

! Handle restart
if (restart) then
Expand All @@ -206,7 +206,7 @@ subroutine set_gauges(restart, num_eqn, num_aux, fname)
rewind OUTGAUGEUNIT

! Write header
header_1 = "('# gauge_id= ',i5,' " // &
header_1 = "('# gauge_id= ',i0,' " // &
"location=( ',1e17.10,' ',1e17.10,' ',1e17.10,' ) " // &
"num_var= ',i2)"
write(OUTGAUGEUNIT, header_1) gauges(i)%gauge_num, &
Expand Down
6 changes: 6 additions & 0 deletions src/python/amrclaw/data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,6 +418,12 @@ def write(self, num_eqn, num_aux, out_file='gauges.data',
if len(self.gauge_numbers) != len(set(self.gauge_numbers)):
raise Exception("Non unique gauge numbers specified.")

for gaugeno in self.gauge_numbers:
if abs(gaugeno) >= 2**31:
raise Exception("Gauge number %i is too large, must be < 2**31"\
% gaugeno)


# Write out gauge data file
self.open_data_file(out_file,data_source)
self.data_write(name='ngauges',value=len(self.gauges))
Expand Down