Commit 347bbf2e authored by Bruno Revelin's avatar Bruno Revelin Committed by Luc Maisonobe

Added support for Marshall Solar Activity Future Estimation files.

parent 592723d0
......@@ -81,6 +81,14 @@
<role>developer</role>
</roles>
</developer>
<developer>
<name>Bruno Revelin</name>
<id>bruno</id>
<email>Bruno.Revelin at c-s dot fr</email>
<roles>
<role>developer</role>
</roles>
</developer>
</developers>
<contributors>
......
......@@ -18,6 +18,7 @@ package org.orekit.forces.drag;
import java.io.Serializable;
import org.orekit.errors.OrekitException;
import org.orekit.time.AbsoluteDate;
......@@ -25,7 +26,7 @@ import org.orekit.time.AbsoluteDate;
*
* This model needs mean and instantaneous solar flux and geomagnetic incides to
* compute the local density. Mean solar flux is (for the moment) represented by
* the F10.7 indices. Instantaneous flux can be setted to the mean value if the
* the F10.7 indices. Instantaneous flux can be set to the mean value if the
* data is not available. Geomagnetic acivity is represented by the Kp indice,
* which goes from 1 (very low activity) to 9 (high activity).
* <p>
......@@ -53,27 +54,31 @@ public interface DTM2000InputParameters extends Serializable {
/** Get the value of the instantaneous solar flux.
* @param date the current date
* @return the instantaneous solar flux
* @exception OrekitException if the date is out of range of available data
*/
double getInstantFlux(AbsoluteDate date);
double getInstantFlux(AbsoluteDate date) throws OrekitException;
/** Get the value of the mean solar flux.
* @param date the current date
* @return the mean solar flux
* @exception OrekitException if the date is out of range of available data
*/
double getMeanFlux(AbsoluteDate date);
double getMeanFlux(AbsoluteDate date) throws OrekitException;
/** Get the value of the 3H geomagnetic index.
* With a delay of 3 hr at pole to 6 hr at equator using:
/** Get the value of the 3 hours geomagnetic index.
* With a delay of 3 hours at pole to 6 hours at equator using:
* delay=6-abs(lat)*0.033 (lat in deg.)
* @param date the current date
* @return the 3H geomagnetic index
* @exception OrekitException if the date is out of range of available data
*/
double getThreeHourlyKP(AbsoluteDate date);
double getThreeHourlyKP(AbsoluteDate date) throws OrekitException;
/** Get the last 24H mean geomagnetic index.
* @param date the current date
* @return the 24H geomagnetic index
* @exception OrekitException if the date is out of range of available data
*/
double get24HoursKp(AbsoluteDate date);
double get24HoursKp(AbsoluteDate date) throws OrekitException;
}
......@@ -18,6 +18,7 @@ package org.orekit.forces.drag;
import java.io.Serializable;
import org.orekit.errors.OrekitException;
import org.orekit.time.AbsoluteDate;
......@@ -42,47 +43,54 @@ public interface JB2006InputParameters extends Serializable {
* Tabular time 1.0 day earlier.
* @param date the current date
* @return the instantaneous F10.7 index
* @exception OrekitException if the date is out of range of available data
*/
double getF10(AbsoluteDate date);
double getF10(AbsoluteDate date) throws OrekitException;
/** Get the value of the mean solar flux.
* Averaged 81-day centered F10.7 B index on the input time.
* @param date the current date
* @return the mean solar flux F10.7B index
* @exception OrekitException if the date is out of range of available data
*/
double getF10B(AbsoluteDate date);
double getF10B(AbsoluteDate date) throws OrekitException;
/** Get the EUV index (26-34 nm) scaled to F10.
* Tabular time 1 day earlier.
* @param date the current date
* @return the the EUV S10 index
* @exception OrekitException if the date is out of range of available data
*/
double getS10(AbsoluteDate date);
double getS10(AbsoluteDate date) throws OrekitException;
/** Get the EUV 81-day averaged centered index.
* @param date the current date
* @return the the mean EUV S10B index
* @exception OrekitException if the date is out of range of available data
*/
double getS10B(AbsoluteDate date);
double getS10B(AbsoluteDate date) throws OrekitException;
/** Get the MG2 index scaled to F10.
* @param date the current date
* @return the the EUV S10 index
* @exception OrekitException if the date is out of range of available data
*/
double getXM10(AbsoluteDate date);
double getXM10(AbsoluteDate date) throws OrekitException;
/** Get the MG2 81-day average centered index.
* Tabular time 5.0 days earlier.
* @param date the current date
* @return the the mean EUV S10B index
* @exception OrekitException if the date is out of range of available data
*/
double getXM10B(AbsoluteDate date);
double getXM10B(AbsoluteDate date) throws OrekitException;
/** Get the Geomagnetic planetary 3-hour index A<sub>p</sub>.
* Tabular time 6.7 hours earlier.
* @param date the current date
* @return the A<sub>p</sub> index
* @exception OrekitException if the date is out of range of available data
*/
double getAp(AbsoluteDate date);
double getAp(AbsoluteDate date) throws OrekitException;
}
......@@ -22,6 +22,9 @@
<body>
<release version="5.1" date="TBD"
description="TBD.">
<action dev="luc" type="add" due-to="Bruno Revelin">
Added support for the Marshall Solar Activity Future Estimation files
</action>
<action dev="luc" type="fix">
TLEPropagator now implements the Propagator interface, and hence can benefit from all
events detection and mode handling features (fixes features request #4)
......
This diff is collapsed.
TABLE 3 ESTIMATES OF 13-MONTH SMOOTH SOLAR ACTIVITY FOR
BALANCE OF CYCLE 24 CYCLE 25 AND BEGINNING OF CYCLE 26
TIME 10.7 CM SOLAR FLUX (F10.7) GEOMAGNETIC INDEX (Ap)
PERCENTILE PERCENTILE
95.0% 50% 5.0% 95.0% 50% 5.0%
2010.5003 JUL 83.4 81.3 78.7 6.4 5.9 5.2
2010.5837 AUG 87.3 83.4 78.5 7.0 6.1 4.9
2010.6670 SEP 90.8 85.5 79.4 7.8 6.2 4.7
2010.7503 OCT 94.2 87.6 80.4 9.1 6.4 4.9
2010.8337 NOV 99.0 89.8 80.8 9.7 6.6 5.2
2010.9170 DEC 104.9 92.1 81.4 10.1 6.9 5.0
2011.0003 JAN 110.3 94.4 81.8 10.5 7.1 5.2
2011.0837 FEB 116.0 96.8 81.3 11.3 7.7 5.9
2011.1670 MAR 122.5 99.2 80.7 12.5 8.5 6.2
2011.2503 APR 129.3 101.7 79.5 13.5 9.1 6.5
2011.3337 MAY 135.3 104.3 79.8 14.4 9.6 6.9
--- this is an extra non-empty line, it should trigger an exception at load time ---
\ No newline at end of file
TABLE 3 ESTIMATES OF 13-MONTH SMOOTH SOLAR ACTIVITY FOR
BALANCE OF CYCLE 24 CYCLE 25 AND BEGINNING OF CYCLE 26
TIME 10.7 CM SOLAR FLUX (F10.7) GEOMAGNETIC INDEX (Ap)
PERCENTILE PERCENTILE
95.0% 50% 5.0% 95.0% 50% 5.0%
This diff is collapsed.
This diff is collapsed.
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