From 31101622e0947f0d6a0b40a76ccfc1b0c0bc395d Mon Sep 17 00:00:00 2001 From: Randy LeVeque Date: Sun, 16 Feb 2025 14:05:36 -0800 Subject: [PATCH] moved setting gauges(i)%last_time into an exisiting loop on gauges, and updated 3d version too --- src/2d/gauges_module.f90 | 12 ++++++------ src/3d/gauges_module.f90 | 7 ++++++- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/2d/gauges_module.f90 b/src/2d/gauges_module.f90 index d9910860..6dd3f714 100644 --- a/src/2d/gauges_module.f90 +++ b/src/2d/gauges_module.f90 @@ -145,17 +145,17 @@ subroutine set_gauges(restart, num_eqn, num_aux, fname) read(UNIT, *) read(UNIT, *) (gauges(i)%gtype, i=1, num_gauges) - do i=1,num_gauges - ! initialize last_time so that first gauge output will be - ! at time gauges(i)%t_start regardless of min_time_increment: - gauges(i)%last_time = gauges(i)%t_start - 1.d0 & - - gauges(i)%min_time_increment - enddo ! Read in q fields read(UNIT, *) read(UNIT, *) do i = 1, num_gauges + + ! initialize last_time so that first gauge output will be + ! at time gauges(i)%t_start regardless of min_time_increment: + gauges(i)%last_time = gauges(i)%t_start - 1.d0 & + - gauges(i)%min_time_increment + if (gauges(i)%gtype .ne. 1) then write(6,*) '*** Lagrangian gauges not yet supported' write(6,*) '*** All gauges must have gtype==1' diff --git a/src/3d/gauges_module.f90 b/src/3d/gauges_module.f90 index 4be6db68..42ff9980 100644 --- a/src/3d/gauges_module.f90 +++ b/src/3d/gauges_module.f90 @@ -123,7 +123,6 @@ subroutine set_gauges(restart, num_eqn, num_aux, fname) read(UNIT, *) gauges(i)%gauge_num, gauges(i)%x, gauges(i)%y, & gauges(i)%z, gauges(i)%t_start, gauges(i)%t_end gauges(i)%buffer_index = 1 - gauges(i)%last_time = gauges(i)%t_start enddo ! Read in output formats @@ -144,6 +143,12 @@ subroutine set_gauges(restart, num_eqn, num_aux, fname) read(UNIT, *) read(UNIT, *) do i = 1, num_gauges + + ! initialize last_time so that first gauge output will be + ! at time gauges(i)%t_start regardless of min_time_increment: + gauges(i)%last_time = gauges(i)%t_start - 1.d0 & + - gauges(i)%min_time_increment + if (gauges(i)%gtype .ne. 1) then write(6,*) '*** Lagrangian gauges not yet supported' write(6,*) '*** All gauges must have gtype==1'