gkowal/amun-code
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DRIVER: change a bit the progress info.

Browse Source
This commit is contained in:
Grzegorz Kowal 2011-02-28 16:04:38 -03:00
parent 2682d37d20
commit 272a8b2d50
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/driver.F90
View File

@ -28,6 +28,7 @@ program godunov
! modules
!
use blocks , only : nleafs
use config , only : read_config, nmax, tmax, dtini, dtout, ftype, cfl
#ifdef FORCE
use config , only : fdt
@ -131,10 +132,10 @@ program godunov
if (is_master()) then
write(*,*)
write(*,"(1x,a)" ) "Evolving system:"
write(*,'(4x,a4,3(3x,a9,3x),4x,a12)') 'iter', 'time ', 'dt ', 'dtnew ' &
, 'remain. time'
write(*,'(i8,3(1x,1pe14.6),2x,1i4.1,"d",1i2.2,"h",1i2.2,"m",1i2.2,"s"' // &
',a1,$)') n, t, dt, dtn, ed, eh, em, es, char(13)
write(*,'(4x,a4,5x,a4,11x,a2,12x,a6,7x,a3)') 'step', 'time', 'dt' &
, 'blocks', 'ETA'
write(*,'(i8,2(1x,1pe14.6),2x,i8,2x,1i4.1,"d",1i2.2,"h",1i2.2,"m"' // &
',1i2.2,"s",a1,$)') n, t, dt, nleafs, ed, eh, em, es, char(13)
end if
! main loop
@ -185,9 +186,8 @@ program godunov
! print progress information
!
if (is_master()) &
write(*,'(i8,3(1x,1pe14.6),2x,1i4.1,"d",1i2.2,"h",1i2.2,"m",1i2.2' // &
',"s",a1,$)') n, t, dt, dtn, ed, eh, em, es, char(13)
write(*,'(i8,2(1x,1pe14.6),2x,i8,2x,1i4.1,"d",1i2.2,"h",1i2.2,"m"' // &
',1i2.2,"s",a1,$)') n, t, dt, nleafs, ed, eh, em, es, char(13)
end do
! add one empty line

4
src/makefile
View File

@ -170,8 +170,8 @@ boundaries.o : boundaries.F90 blocks.o config.o error.o interpolation.o \
mpitools.o variables.o
config.o : config.F90 error.o
constants.o : constants.F90
driver.o : driver.F90 config.o evolution.o forcing.o io.o mesh.o \
mpitools.o random.o timer.o
driver.o : driver.F90 blocks.o config.o evolution.o forcing.o io.o \
mesh.o mpitools.o random.o timer.o
error.o : error.F90
evolution.o : evolution.F90 blocks.o boundaries.o config.o forcing.o \
interpolation.o mesh.o mpitools.o problem.o scheme.o timer.o \