Corrections to tag v2.5
Small set of corrections to the tag v2.5. Includes changes to python scripts to plot data. Includes new 'fast' setup conditions that allow to output cases in an hour or so with still a good CFL condition and grid resolution.
This commit is contained in:
parent
deebbae229
commit
052a4dc05e
20 changed files with 790 additions and 107 deletions
|
|
@ -163,8 +163,8 @@ module output
|
|||
do i = 1, nr
|
||||
write(dataPhi_id, '('//formatFloat//',3('//formatSep //','//formatFloat//'))') &
|
||||
r(i)*L_ref, &
|
||||
n_i(j,i)*n_ref, &
|
||||
u_i(j,i)*u_ref, &
|
||||
n_i(j,i)*n_ref, &
|
||||
u_i(j,i)*u_ref, &
|
||||
T_i(j,i)*Temp_ref/ev_to_K
|
||||
|
||||
end do
|
||||
|
|
@ -173,13 +173,13 @@ module output
|
|||
end do
|
||||
end subroutine writeOutputMom
|
||||
|
||||
subroutine writeOutputBoundary(t, dt, n, u, Temp, TtoZ, Zinj)
|
||||
subroutine writeOutputBoundary(t, dt, n, u, Temp, Zinj)
|
||||
use constantParameters, only: eV_to_K
|
||||
use referenceValues, only: t_ref, n_ref, u_ref, Temp_ref
|
||||
|
||||
integer, intent(in):: t
|
||||
real(dp), intent(in):: dt
|
||||
real(dp), intent(in):: n, u, Temp, TtoZ, Zinj
|
||||
real(dp), intent(in):: n, u, Temp, Zinj
|
||||
character(len=6), parameter:: filename = 'bc.csv'
|
||||
logical:: res
|
||||
|
||||
|
|
@ -187,42 +187,43 @@ module output
|
|||
if (.not. res) then
|
||||
write (*, '(A, A)') 'Writing: ', filename
|
||||
open(unit=dataBC_id, file=pathOutput // filename, action='write', position='append')
|
||||
write(dataBC_id, '(A,5(' // formatSep // ',A))') 't (s)', 'n (m^-3)', 'u (m s^-1)', 'T (eV)', 'TtoZ','Zinj'
|
||||
write(dataBC_id, '(A,4(' // formatSep // ',A))') 't (s)', 'n (m^-3)', 'u (m s^-1)', 'T (eV)','Zinj'
|
||||
close(dataBC_id)
|
||||
|
||||
end if
|
||||
|
||||
open(unit=dataBC_id, file=pathOutput // filename, action='write', position='append')
|
||||
write(dataBC_id, '(' // formatFloat // ',5('// formatSep // ',' // formatFloat // '))') &
|
||||
t*dt*t_ref, n*n_ref, u*u_ref, Temp*Temp_ref/eV_to_K, TtoZ, Zinj
|
||||
write(dataBC_id, '(' // formatFloat // ',4('// formatSep // ',' // formatFloat // '))') &
|
||||
t*dt*t_ref, n*n_ref, u*u_ref, Temp*Temp_ref/eV_to_K, Zinj
|
||||
|
||||
close(dataBC_id)
|
||||
|
||||
end subroutine writeOutputBoundary
|
||||
|
||||
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=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=dataTime_id, file=pathOutput // filename, action='write', position='append')
|
||||
write(dataTime_id, '(' // formatInt // ',2('// formatSep // ',' // formatFloat // '))') &
|
||||
t, time, bins
|
||||
|
||||
close(dataTime_id)
|
||||
|
||||
end subroutine writeOutputTime
|
||||
! JG: What is this procedure?
|
||||
! 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=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=dataTime_id, file=pathOutput // filename, action='write', position='append')
|
||||
! write(dataTime_id, '(' // formatInt // ',2('// formatSep // ',' // formatFloat // '))') &
|
||||
! t, time, bins
|
||||
!
|
||||
! close(dataTime_id)
|
||||
!
|
||||
! end subroutine writeOutputTime
|
||||
|
||||
subroutine writeOutputZList(nz, Z_list)
|
||||
integer, intent(in):: nz
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue