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

Merge branch 'master' into reconnection

Browse Source
This commit is contained in:
Grzegorz Kowal 2014-08-20 18:11:32 -03:00
commit 64b386cb9d
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/evolution.F90
View File

@ -387,14 +387,14 @@ module evolution
dx_min = min(adx(lev), ady(lev), adz(lev))
#endif /* NDIMS == 3 */
! calcilate the new time step
!
dtn = dx_min / max(cmax &
+ 2.0d+00 * max(viscosity, resistivity) / dx_min, eps)
! calculate the new time step
!
dt = cfl * dtn
dtn = cfl * dx_min / max(cmax &
+ 2.0d+00 * max(viscosity, resistivity) / dx_min, eps)
! substitute the new time step
!
dt = dtn
! round the time
!

4
src/integrals.F90
View File

@ -271,7 +271,7 @@ module integrals
use equations , only : idn, ipr, ivx, ivy, ivz, ibx, iby, ibz, ibp
use equations , only : ien, imx, imy, imz
use equations , only : gamma, csnd
use evolution , only : step, time, dt
use evolution , only : step, time, dtn
use mpitools , only : master
#ifdef MPI
use mpitools , only : reduce_sum_real_array
@ -473,7 +473,7 @@ module integrals
! write down the integrals and statistics to appropriate files
!
if (master) then
write(funit,"(i9,10(1x,1e18.8))") step, time, dt, inarr(1:8)
write(funit,"(i9,10(1x,1e18.8))") step, time, dtn, inarr(1:8)
write(sunit,"(i9,23(1x,1e18.8))") step, time &
, avarr(1), mnarr(1), mxarr(1) &
, avarr(2), mnarr(2), mxarr(2) &