Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix integration reset #45

Merged
merged 2 commits into from
Apr 25, 2024
+17 −18
Merged

Fix integration reset #45

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf48b7d
explicit initialization of request time variable
oscarrdfz Apr 9, 2024
8a7178e
handle reset status in integrator even if intermediate outputs are no…
oscarrdfz Apr 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 17 additions & 18 deletions src/neptune.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -597,6 +597,7 @@ subroutine propagate_set( &
propCounterAtReset = 0.0d0
lastPropCounterSuccess = 0.0d0
diff = 0.d0
request_time=0.d0

if(isControlled()) then
if(hasToReturn()) return
Expand Down Expand Up @@ -970,25 +971,23 @@ subroutine propagate_set( &
return
end if

if(neptune%output%get_output_switch() .or. neptune%getStoreDataFlag()) then ! this has only to be done in a mode, where output is requested...
if((.not. flag_backward .and. (lastPropCounterSuccess < lastPropCounter)) .or. &
( flag_backward .and. (lastPropCounterSuccess > lastPropCounter))) then
! This is the usual case when the intergator cannot go on and needs a valid state to restart from.
state_out = last_state_out
prop_counter = lastPropCounter
else if ((.not. flag_backward .and. (prop_counter > request_time)) .or. &
( flag_backward .and. (prop_counter < request_time))) then
! This case may happen when the integrator oversteps the requested time
! and usually would start interpolation. Though, due to integration issues
! he never gets to the point of interpolation but sets the prop_counter anyway.
! This leads to an invalid state, which is also written to output at a time,
! which was not even requested.
state_out = last_state_out
prop_counter = lastPropCounter
end if
call message(' Resetting to: '//toString(epochs(1)%mjd + prop_counter/86400.d0)//'('//toString(prop_counter), LOGFILE)
call message(' ... restoring state vector: '//toString(state_out%r(1))//', '//toString(state_out%r(2))//', '//toString(state_out%r(3))//', '//toString(state_out%v(1))//', '//toString(state_out%v(2))//', '//toString(state_out%v(3)), LOGFILE)
if((.not. flag_backward .and. (lastPropCounterSuccess < lastPropCounter)) .or. &
( flag_backward .and. (lastPropCounterSuccess > lastPropCounter))) then
! This is the usual case when the intergator cannot go on and needs a valid state to restart from.
state_out = last_state_out
prop_counter = lastPropCounter
else if ((.not. flag_backward .and. (prop_counter > request_time)) .or. &
( flag_backward .and. (prop_counter < request_time))) then
! This case may happen when the integrator oversteps the requested time
! and usually would start interpolation. Though, due to integration issues
! he never gets to the point of interpolation but sets the prop_counter anyway.
! This leads to an invalid state, which is also written to output at a time,
! which was not even requested.
state_out = last_state_out
prop_counter = lastPropCounter
end if
call message(' Resetting to: '//toString(epochs(1)%mjd + prop_counter/86400.d0)//'('//toString(prop_counter), LOGFILE)
call message(' ... restoring state vector: '//toString(state_out%r(1))//', '//toString(state_out%r(2))//', '//toString(state_out%r(3))//', '//toString(state_out%v(1))//', '//toString(state_out%v(2))//', '//toString(state_out%v(3)), LOGFILE)
else if((.not. flag_backward .and. (prop_counter > propCounterAtReset)) .or. &
( flag_backward .and. (prop_counter < propCounterAtReset))) then ! reset 'nresets' flag
nresets = 0
Expand Down
Loading