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 2022-06-09 18:06:18 -03:00
commit 676f7002c9
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sources/evolution.F90
View File

@ -2940,7 +2940,7 @@ module evolution
fc = product(errs(:)**betas(:))
fc = 1.0d+00 + chi * atan((fc - 1.0d+00) / chi)
dte = dt * fc
cond = fc > fac .or. nrej >= mrej
cond = errtol <= 1.0d+00 .or. fc > fac .or. nrej >= mrej
100 continue
cond = cond .and. status == 0
@ -2956,7 +2956,7 @@ module evolution
dt = dte
nrej = nrej + 1 ! rejection count in the current step
else
dt = 2.5d-01 * dt
dt = 2.5d-01 * dt
end if
nrejections = nrejections + 1
@ -3195,7 +3195,7 @@ module evolution
fc = product(errs(:)**betas(:))
fc = 1.0d+00 + chi * atan((fc - 1.0d+00) / chi)
dte = dt * fc
cond = fc > fac .or. nrej >= mrej
cond = errtol <= 1.0d+00 .or. fc > fac .or. nrej >= mrej
100 continue
cond = cond .and. status == 0
@ -3211,7 +3211,7 @@ module evolution
dt = dte
nrej = nrej + 1 ! rejection count in the current step
else
dt = 2.5d-01 * dt
dt = 2.5d-01 * dt
end if
nrejections = nrejections + 1
@ -3519,7 +3519,7 @@ module evolution
fc = product(errs(:)**betas(:))
fc = 1.0d+00 + chi * atan((fc - 1.0d+00) / chi)
dte = dt * fc
cond = fc > fac .or. nrej >= mrej
cond = errtol <= 1.0d+00 .or. fc > fac .or. nrej >= mrej
100 continue
cond = cond .and. status == 0
@ -3534,7 +3534,7 @@ module evolution
dt = dte
nrej = nrej + 1 ! rejection count in the current step
else
dt = 2.5d-01 * dt
dt = 2.5d-01 * dt
end if
nrejections = nrejections + 1
@ -3778,7 +3778,7 @@ module evolution
fc = product(errs(:)**betas(:))
fc = 1.0d+00 + chi * atan((fc - 1.0d+00) / chi)
dte = dt * fc
cond = fc > fac .or. nrej >= mrej
cond = errtol <= 1.0d+00 .or. fc > fac .or. nrej >= mrej
100 continue
cond = cond .and. status == 0
@ -3795,7 +3795,7 @@ module evolution
dt = dte
nrej = nrej + 1 ! rejection count in the current step
else
dt = 2.5d-01 * dt
dt = 2.5d-01 * dt
end if
nrejections = nrejections + 1