diff --git a/moduleOutput.f90 b/moduleOutput.f90 index a463d77..7383d7b 100644 --- a/moduleOutput.f90 +++ b/moduleOutput.f90 @@ -13,6 +13,7 @@ module output integer, parameter:: dataF_id = 30 integer, parameter:: dataPhi_id = 40 integer, parameter:: dataCum_id = 50 + integer, parameter:: dataTime_id = 60 character(len=*), parameter :: formatInt = 'I10' character(len=7), parameter:: formatFloat = 'ES0.6e3' character(len=3), parameter:: formatSep = '","' @@ -71,8 +72,8 @@ module output open(unit=dataF_id, file=pathOutput // filename) write(dataF_id, '(A)') "t (s)" write(dataF_id, '('//formatFloat//')') t*dt*t_ref - write(dataPhi_id, '(A)') "Z" - write(dataPhi_id, '('//formatFloat//')') Z_list(j) + write(dataF_id, '(A)') "Z" + write(dataF_id, '('//formatFloat//')') Z_list(j) write(myfmt, "(I0)") nr myfmt = '(A,' // trim(myfmt) // '(' // formatSep // ',' // formatFloat // '))' write(dataF_id, myfmt) "v (m/s) / r (m)", r*L_ref @@ -199,26 +200,27 @@ module output end subroutine writeOutputBoundary - subroutine writeOutputTime(t, time) + subroutine writeOutputTime(t, time, bins) integer, intent(in):: t real(dp), intent(in):: time + real(dp), intent(in):: bins character(len=8), parameter:: filename = 'time.csv' logical:: res inquire(file=pathOutput // filename, exist=res) if (.not. res) then write (*, '(A, A)') 'Writing: ', filename - open(unit=dataBC_id, file=pathOutput // filename, action='write', position='append') - write(dataBC_id, '(A,1(' // formatSep // ',A))') 'timestep', 'duration (s)' - close(dataBC_id) + open(unit=dataTime_id, file=pathOutput // filename, action='write', position='append') + write(dataTime_id, '(A,2(' // formatSep // ',A))') 'timestep', 'duration (s)', '#bins' + close(dataTime_id) end if - open(unit=dataBC_id, file=pathOutput // filename, action='write', position='append') - write(dataBC_id, '(' // formatInt // ',' // formatSep // ',' // formatFloat // ')') & - t, time + open(unit=dataTime_id, file=pathOutput // filename, action='write', position='append') + write(dataTime_id, '(' // formatInt // ',2('// formatSep // ',' // formatFloat // '))') & + t, time, bins - close(dataBC_id) + close(dataTime_id) end subroutine writeOutputTime @@ -288,8 +290,8 @@ module output open(unit=dataCum_id, file=pathOutput // filename) write(dataCum_id, '(A)') "t (s)" write(dataCum_id, '('//formatFloat//')') t*dt*t_ref - write(dataPhi_id, '(A)') "Z" - write(dataPhi_id, '('//formatFloat//')') Z_list(j) + write(dataCum_id, '(A)') "Z" + write(dataCum_id, '('//formatFloat//')') Z_list(j) write(myfmt, "(I0)") 1 myfmt = '(A,' // trim(myfmt) // '(' // formatSep // ',' // formatFloat // '))' write(dataCum_id, myfmt) "v (m/s) / r (m)", r*L_ref