diff --git a/NumericalData/AMDA/Ephemerides/earth-orb-all.xml b/NumericalData/AMDA/Ephemerides/earth-orb-all.xml
index a0da7d2..82ec84e 100644
--- a/NumericalData/AMDA/Ephemerides/earth-orb-all.xml
+++ b/NumericalData/AMDA/Ephemerides/earth-orb-all.xml
@@ -84,5 +84,14 @@
<Ucd/>
<Units>rad</Units>
</Parameter>
+ <Parameter>
+ <Name>solar longitude (Ls)</Name>
+ <ParameterKey>earth_sol_ls</ParameterKey>
+ <Ucd/>
+ <Units>rad</Units>
+ <Support>
+ <SupportQuantity>Positional</SupportQuantity>
+ </Support>
+ </Parameter>
</NumericalData>
</Spase>
diff --git a/NumericalOutput/AMDA/BALLISTIC/bls-jupiter-omni.xml b/NumericalOutput/AMDA/BALLISTIC/bls-jupiter-omni.xml
index eb435c5..8d4d4e4 100644
--- a/NumericalOutput/AMDA/BALLISTIC/bls-jupiter-omni.xml
+++ b/NumericalOutput/AMDA/BALLISTIC/bls-jupiter-omni.xml
@@ -5,12 +5,15 @@
<ResourceID>spase://CDPP/NumericalOutput/AMDA/BALLISTIC/bls-jupiter-omni</ResourceID>
<ResourceHeader>
<ResourceName>input OMNI</ResourceName>
- <AlternateName></AlternateName>
+ <AlternateName>Ballistic delay from the Earth to Jupiter</AlternateName>
<ReleaseDate>2018-07-08T16:49:29Z</ReleaseDate>
- <Description>OMNI solar wind 1-hour data is used as model input. Calculation : IRAP.
- <!-- delay (days) = ( R_Jupiter-R_Earth )/OMNI_V_sw + angle_difference(Jupiter_HCI,Earth_HCI)/Sun_Angular_Velocity
- angle_difference (radian) = acos((Jupiter_HCI_x*Earth_HCI_x+Jupiter_HCI_y*Earth_HCI_y)/sqrt((Jupiter_HCI_x*Jupiter_HCI_x+Jupiter_HCI_x*Jupiter_HCI_x)/sqrt((Earth_HCI_x*Earth_HCI_x+Earth_HCI_y*Earth_HCI_y)))
- *(Earth_HCI_x*Jupiter_HCI_y-Earth_HCI_y*Jupiter_HCI_x)/abs(Earth_HCI_x*Jupiter_HCI_y-Earth_HCI_y*Jupiter_HCI_x)-->
+ <Description>OMNI solar wind 1-hour velocity data is used as model input. Calculation : IRAP.
+
+ delay(days)=(r_jupiter-r_earth)/omni_sw_v*1736.11 + angle_jupiter_earth/14.177
+
+ angle_jupiter_earth(deg)=acos(xyz_jupiter_hee(0)/sqrt(xyz_jupiter_hee(0)*xyz_jupiter_hee(0)
+
+ +xyz_jupiter_hee(1)*xyz_jupiter_hee(1)))*sign(xyz_jupiter_hee(1))
</Description>
<Acknowledgement/>
<Contact>
diff --git a/NumericalOutput/AMDA/BALLISTIC/bls-mars-omni.xml b/NumericalOutput/AMDA/BALLISTIC/bls-mars-omni.xml
index 99b4cd3..f0fc675 100644
--- a/NumericalOutput/AMDA/BALLISTIC/bls-mars-omni.xml
+++ b/NumericalOutput/AMDA/BALLISTIC/bls-mars-omni.xml
@@ -5,12 +5,16 @@
<ResourceID>spase://CDPP/NumericalOutput/AMDA/BALLISTIC/bls-mars-omni</ResourceID>
<ResourceHeader>
<ResourceName>input OMNI</ResourceName>
- <AlternateName></AlternateName>
+ <AlternateName>Ballistic delay from the Earth to Mars</AlternateName>
<ReleaseDate>2018-07-08T16:49:29Z</ReleaseDate>
<Description>OMNI solar wind 1-hour data is used as model input. Calculation : IRAP.
- <!--delay (days) = ( R_Mars-R_Earth )/OMNI_V_sw + angle_difference(Mars_HCI,Earth_HCI)/Sun_Angular_Velocity
- angle_difference (radian) = acos((Mars_HCI_x*Earth_HCI_x+Mars_HCI_y*Earth_HCI_y)/sqrt((Mars_HCI_x*Mars_HCI_x+Mars_HCI_x*Mars_HCI_x)/sqrt((Earth_HCI_x*Earth_HCI_x+Earth_HCI_y*Earth_HCI_y)))
- *(Earth_HCI_x*Mars_HCI_y-Earth_HCI_y*Mars_HCI_x)/abs(Earth_HCI_x*Mars_HCI_y-Earth_HCI_y*Mars_HCI_x)-->
+
+ delay(days)=(r_mars-r_earth)/omni_sw_v*1736.11 + angle_mars_earth/14.177
+
+ angle_mars_earth(deg)=acos(xyz_mars_hee(0)/sqrt(xyz_mars_hee(0)*xyz_mars_hee(0)
+
+ +xyz_mars_hee(1)*xyz_mars_hee(1)))*sign(xyz_mars_hee(1))
+
</Description>
<Acknowledgement/>
<Contact>
diff --git a/NumericalOutput/AMDA/BALLISTIC/bls-saturn-omni.xml b/NumericalOutput/AMDA/BALLISTIC/bls-saturn-omni.xml
index 9357beb..6ed6c66 100644
--- a/NumericalOutput/AMDA/BALLISTIC/bls-saturn-omni.xml
+++ b/NumericalOutput/AMDA/BALLISTIC/bls-saturn-omni.xml
@@ -5,15 +5,15 @@
<ResourceID>spase://CDPP/NumericalOutput/AMDA/BALLISTIC/bls-saturn-omni</ResourceID>
<ResourceHeader>
<ResourceName>input OMNI</ResourceName>
- <AlternateName></AlternateName>
+ <AlternateName>Ballistic delay from the Earth to Saturn</AlternateName>
<ReleaseDate>2018-07-08T16:49:29Z</ReleaseDate>
<Description>OMNI solar wind 1-hour data is used as model input. Calculation : IRAP.
-
- <!--delay(days)=(R_Saturn-R_Earth)/OMNI_V_sw+angle_difference(Saturn_HCI,Earth_HCI)/Sun_Angular_Velocity
+
+ delay(days)=(r_saturn-r_earth)/omni_sw_v*1736.11 + angle_saturn_earth/14.177
- angle_difference(radian)=acos((Saturn_HCI(x,y)*Earth_HCI(x,y))/sqrt(Saturn_HCI(x,y)^2)/sqrt(Earth_HCI(x,y)^2)*(Earth_HCI_x*Saturn_HCI_y-Earth_HCI_y*Saturn_HCI_x)/abs(Earth_HCI_x*Saturn_HCI_y-Earth_HCI_y*Saturn_HCI_x)
- -->
+ angle_saturn_earth(deg)=acos(xyz_saturn_hee(0)/sqrt(xyz_saturn_hee(0)*xyz_saturn_hee(0)
+ +xyz_saturn_hee(1)*xyz_saturn_hee(1)))*sign(xyz_saturn_hee(1))
</Description>
<Acknowledgement/>
<Contact>
diff --git a/SimulationModel/AMDA/Ballistic.xml b/SimulationModel/AMDA/Ballistic.xml
index c7da26f..6faf2aa 100644
--- a/SimulationModel/AMDA/Ballistic.xml
+++ b/SimulationModel/AMDA/Ballistic.xml
@@ -6,7 +6,7 @@
<ResourceHeader>
<ResourceName>Ballistic SW propagation Model</ResourceName>
<ReleaseDate>2014-07-08T14:48:29Z</ReleaseDate>
- <Description></Description>
+ <Description/>
<Contact>
<PersonID>spase://CDPP/Person/Vincent.Genot</PersonID>
<Role>PrincipalInvestigator</Role>
@@ -17,6 +17,6 @@
<Note>Solar Wind Propagation Models</Note>
</Association>
</ResourceHeader>
- <SimulationType>MHD</SimulationType>
+ <SimulationType>Ballistic</SimulationType>
</SimulationModel>
</Spase>
--
libgit2 0.21.2