Merge branch 'master' into reconnection
This commit is contained in:
commit
1cd09d7c27
@ -995,7 +995,12 @@ module forcing
|
||||
|
||||
!-------------------------------------------------------------------------------
|
||||
!
|
||||
if (t < tinj_start .or. t > tinj_stop) return
|
||||
if (t < tinj_start .or. t > tinj_stop) then
|
||||
arms = 0.0d+00
|
||||
dinj = 0.0d+00
|
||||
rinj = 0.0d+00
|
||||
return
|
||||
end if
|
||||
|
||||
! calculate the number of eddies to be injected during this interval
|
||||
!
|
||||
@ -1079,7 +1084,12 @@ module forcing
|
||||
|
||||
!-------------------------------------------------------------------------------
|
||||
!
|
||||
if (t < tinj_start .or. t > tinj_stop) return
|
||||
if (t < tinj_start .or. t > tinj_stop) then
|
||||
arms = 0.0d+00
|
||||
dinj = 0.0d+00
|
||||
rinj = 0.0d+00
|
||||
return
|
||||
end if
|
||||
|
||||
! calculate drift and diffusion coefficients
|
||||
!
|
||||
@ -1166,7 +1176,12 @@ module forcing
|
||||
|
||||
!-------------------------------------------------------------------------------
|
||||
!
|
||||
if (t < tinj_start .or. t > tinj_stop) return
|
||||
if (t < tinj_start .or. t > tinj_stop) then
|
||||
arms = 0.0d+00
|
||||
dinj = 0.0d+00
|
||||
rinj = 0.0d+00
|
||||
return
|
||||
end if
|
||||
|
||||
! determine velocify coefficients in Fourier space
|
||||
!
|
||||
|
Loading…
x
Reference in New Issue
Block a user