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-21 15:10:55 -03:00
commit ac5d10f6ae
1 changed files with 11 additions and 11 deletions

22
src/evolution.F90

@ -127,22 +127,22 @@ module evolution
case ("euler", "EULER")
name_int = "1st order Euler method"
name_int = "1st order Euler"
evolve => evolve_euler
case ("rk2", "RK2")
name_int = "2nd order Runge-Kutta method"
name_int = "2nd order Runge-Kutta"
evolve => evolve_rk2
case ("rk3", "RK3")
name_int = "3rd order Runge-Kutta method"
name_int = "3rd order Runge-Kutta"
evolve => evolve_rk3
case ("rk3.4", "RK3.4")
name_int = "3rd order 4-stage Runge-Kutta method"
name_int = "3rd order 4-stage Runge-Kutta"
evolve => evolve_rk34
cfl = 2.0d+00 * cfl
@ -868,8 +868,8 @@ module evolution
! local integration parameters
!
real(kind=8), parameter :: fh = 1.0d+00 / 2.0d+00, fo = 1.0d+00 / 3.0d+00
real(kind=8), parameter :: ft = 2.0d+00 / 3.0d+00, fs = 1.0d+00 / 6.0d+00
real(kind=8), parameter :: b1 = 1.0d+00 / 2.0d+00, b3 = 1.0d+00 / 6.0d+00
real(kind=8), parameter :: a31 = 2.0d+00 / 3.0d+00, a33 = 1.0d+00 / 3.0d+00
!
!-------------------------------------------------------------------------------
!
@ -877,7 +877,7 @@ module evolution
!
! calculate fractional time step
!
ds = fh * dt
ds = b1 * dt
! update fluxes for the first step of the RK2 integration
!
@ -961,7 +961,7 @@ module evolution
!
! calculate fractional time step
!
ds = fs * dt
ds = b3 * dt
! update fluxes for the first step of the RK2 integration
!
@ -982,8 +982,8 @@ module evolution
! update the solution for the fluid variables
!
pblock%u1(1:nv,:,:,:) = ft * pblock%u0(1:nv,:,:,:) &
+ fo * pblock%u1(1:nv,:,:,:) + ds * du(1:nv,:,:,:)
pblock%u1(1:nv,:,:,:) = a31 * pblock%u0(1:nv,:,:,:) &
+ a33 * pblock%u1(1:nv,:,:,:) + ds * du(1:nv,:,:,:)
! assign pointer to the next block
!
@ -1003,7 +1003,7 @@ module evolution
!
! calculate fractional time step
!
ds = fh * dt
ds = b1 * dt
! update fluxes for the second step of the RK2 integration
!