Commit 7124fe8b authored by Luc Maisonobe's avatar Luc Maisonobe

Merge branch 'master' of ssh://git@www.orekit.org/orekit-main.git

Conflicts:
	src/site/xdoc/changes.xml
parents d887dfd3 1d1c03ef
......@@ -144,6 +144,19 @@ public class ConstantThrustManeuver extends AbstractForceModel {
}
@Override
public void init(final SpacecraftState s0, final AbsoluteDate t) {
// set the initial value of firing
final AbsoluteDate sDate = s0.getDate();
final boolean isForward = sDate.compareTo(t) < 0;
final boolean isBetween =
startDate.compareTo(sDate) < 0 && endDate.compareTo(sDate) > 0;
final boolean isOnStart = startDate.compareTo(sDate) == 0;
final boolean isOnEnd = endDate.compareTo(sDate) == 0;
firing = isBetween || (isForward && isOnStart) || (!isForward && isOnEnd);
}
/** Get the thrust.
* @return thrust force (N).
*/
......
......@@ -25,6 +25,10 @@
<action dev="luc" type="update">
Deprecated PropagationException, replaced by OrekitException.
</action>
<action dev="evan" type="fix" due-to="Greg Carbott">
Fix bug in restarting propagation with a ConstantThrustManeuver with an
updated initial condition.
</action>
<action dev="luc" type="fix">
Fixed a display error for dates less than 0.5ms before a leap second.
</action>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment