CDPP / CNES

Commit 18f499d20590aaec49545528e467500fa90b1ca1

Authored by Elena.Budnik
1 parent 5675f4d5
Exists in master and in 12 other branches amdadev, aschulz, autocommit, bepi_master, bepi_update, branch_q, cleanup_registry, cleanup_registry_master, cleanup_registry_merged, juice_jdc, juno_jade, soar

ballistic params modifs

Showing 5 changed files with 32 additions and 16 deletions   Show diff stats
Inline Side-by-side
NumericalData/AMDA/Ephemerides/earth-orb-all.xml
  Diff comments   View file @18f499d
@@ -84,5 +84,14 @@ @@ -84,5 +84,14 @@
84 <Ucd/> 84 <Ucd/>
85 <Units>rad</Units> 85 <Units>rad</Units>
86 </Parameter> 86 </Parameter>
  87 + <Parameter>
  88 + <Name>solar longitude (Ls)</Name>
  89 + <ParameterKey>earth_sol_ls</ParameterKey>
  90 + <Ucd/>
  91 + <Units>rad</Units>
  92 + <Support>
  93 + <SupportQuantity>Positional</SupportQuantity>
  94 + </Support>
  95 + </Parameter>
87 </NumericalData> 96 </NumericalData>
88 </Spase> 97 </Spase>
NumericalOutput/AMDA/BALLISTIC/bls-jupiter-omni.xml
  Diff comments   View file @18f499d
@@ -5,12 +5,15 @@ @@ -5,12 +5,15 @@
5 <ResourceID>spase://CDPP/NumericalOutput/AMDA/BALLISTIC/bls-jupiter-omni</ResourceID> 5 <ResourceID>spase://CDPP/NumericalOutput/AMDA/BALLISTIC/bls-jupiter-omni</ResourceID>
6 <ResourceHeader> 6 <ResourceHeader>
7 <ResourceName>input OMNI</ResourceName> 7 <ResourceName>input OMNI</ResourceName>
8 - <AlternateName></AlternateName> 8 + <AlternateName>Ballistic delay from the Earth to Jupiter</AlternateName>
9 <ReleaseDate>2018-07-08T16:49:29Z</ReleaseDate> 9 <ReleaseDate>2018-07-08T16:49:29Z</ReleaseDate>
10 - <Description>OMNI solar wind 1-hour data is used as model input. Calculation : IRAP.  
11 - <!-- delay (days) = ( R_Jupiter-R_Earth )/OMNI_V_sw + angle_difference(Jupiter_HCI,Earth_HCI)/Sun_Angular_Velocity  
12 - 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)))  
13 - *(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)--> 10 + <Description>OMNI solar wind 1-hour velocity data is used as model input. Calculation : IRAP.
  11 +
  12 + delay(days)=(r_jupiter-r_earth)/omni_sw_v*1736.11 + angle_jupiter_earth/14.177
  13 +
  14 + angle_jupiter_earth(deg)=acos(xyz_jupiter_hee(0)/sqrt(xyz_jupiter_hee(0)*xyz_jupiter_hee(0)
  15 +
  16 + +xyz_jupiter_hee(1)*xyz_jupiter_hee(1)))*sign(xyz_jupiter_hee(1))
14 </Description> 17 </Description>
15 <Acknowledgement/> 18 <Acknowledgement/>
16 <Contact> 19 <Contact>
NumericalOutput/AMDA/BALLISTIC/bls-mars-omni.xml
  Diff comments   View file @18f499d
@@ -5,12 +5,16 @@ @@ -5,12 +5,16 @@
5 <ResourceID>spase://CDPP/NumericalOutput/AMDA/BALLISTIC/bls-mars-omni</ResourceID> 5 <ResourceID>spase://CDPP/NumericalOutput/AMDA/BALLISTIC/bls-mars-omni</ResourceID>
6 <ResourceHeader> 6 <ResourceHeader>
7 <ResourceName>input OMNI</ResourceName> 7 <ResourceName>input OMNI</ResourceName>
8 - <AlternateName></AlternateName> 8 + <AlternateName>Ballistic delay from the Earth to Mars</AlternateName>
9 <ReleaseDate>2018-07-08T16:49:29Z</ReleaseDate> 9 <ReleaseDate>2018-07-08T16:49:29Z</ReleaseDate>
10 <Description>OMNI solar wind 1-hour data is used as model input. Calculation : IRAP. 10 <Description>OMNI solar wind 1-hour data is used as model input. Calculation : IRAP.
11 - <!--delay (days) = ( R_Mars-R_Earth )/OMNI_V_sw + angle_difference(Mars_HCI,Earth_HCI)/Sun_Angular_Velocity  
12 - 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)))  
13 - *(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)--> 11 +
  12 + delay(days)=(r_mars-r_earth)/omni_sw_v*1736.11 + angle_mars_earth/14.177
  13 +
  14 + angle_mars_earth(deg)=acos(xyz_mars_hee(0)/sqrt(xyz_mars_hee(0)*xyz_mars_hee(0)
  15 +
  16 + +xyz_mars_hee(1)*xyz_mars_hee(1)))*sign(xyz_mars_hee(1))
  17 +
14 </Description> 18 </Description>
15 <Acknowledgement/> 19 <Acknowledgement/>
16 <Contact> 20 <Contact>
NumericalOutput/AMDA/BALLISTIC/bls-saturn-omni.xml
  Diff comments   View file @18f499d
@@ -5,15 +5,15 @@ @@ -5,15 +5,15 @@
5 <ResourceID>spase://CDPP/NumericalOutput/AMDA/BALLISTIC/bls-saturn-omni</ResourceID> 5 <ResourceID>spase://CDPP/NumericalOutput/AMDA/BALLISTIC/bls-saturn-omni</ResourceID>
6 <ResourceHeader> 6 <ResourceHeader>
7 <ResourceName>input OMNI</ResourceName> 7 <ResourceName>input OMNI</ResourceName>
8 - <AlternateName></AlternateName> 8 + <AlternateName>Ballistic delay from the Earth to Saturn</AlternateName>
9 <ReleaseDate>2018-07-08T16:49:29Z</ReleaseDate> 9 <ReleaseDate>2018-07-08T16:49:29Z</ReleaseDate>
10 <Description>OMNI solar wind 1-hour data is used as model input. Calculation : IRAP. 10 <Description>OMNI solar wind 1-hour data is used as model input. Calculation : IRAP.
11 -  
12 - <!--delay(days)=(R_Saturn-R_Earth)/OMNI_V_sw+angle_difference(Saturn_HCI,Earth_HCI)/Sun_Angular_Velocity 11 +
  12 + delay(days)=(r_saturn-r_earth)/omni_sw_v*1736.11 + angle_saturn_earth/14.177
13 13
14 - 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)  
15 - --> 14 + angle_saturn_earth(deg)=acos(xyz_saturn_hee(0)/sqrt(xyz_saturn_hee(0)*xyz_saturn_hee(0)
16 15
  16 + +xyz_saturn_hee(1)*xyz_saturn_hee(1)))*sign(xyz_saturn_hee(1))
17 </Description> 17 </Description>
18 <Acknowledgement/> 18 <Acknowledgement/>
19 <Contact> 19 <Contact>
SimulationModel/AMDA/Ballistic.xml
  Diff comments   View file @18f499d
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 <ResourceHeader> 6 <ResourceHeader>
7 <ResourceName>Ballistic SW propagation Model</ResourceName> 7 <ResourceName>Ballistic SW propagation Model</ResourceName>
8 <ReleaseDate>2014-07-08T14:48:29Z</ReleaseDate> 8 <ReleaseDate>2014-07-08T14:48:29Z</ReleaseDate>
9 - <Description></Description> 9 + <Description/>
10 <Contact> 10 <Contact>
11 <PersonID>spase://CDPP/Person/Vincent.Genot</PersonID> 11 <PersonID>spase://CDPP/Person/Vincent.Genot</PersonID>
12 <Role>PrincipalInvestigator</Role> 12 <Role>PrincipalInvestigator</Role>
@@ -17,6 +17,6 @@ @@ -17,6 +17,6 @@
17 <Note>Solar Wind Propagation Models</Note> 17 <Note>Solar Wind Propagation Models</Note>
18 </Association> 18 </Association>
19 </ResourceHeader> 19 </ResourceHeader>
20 - <SimulationType>MHD</SimulationType> 20 + <SimulationType>Ballistic</SimulationType>
21 </SimulationModel> 21 </SimulationModel>
22 </Spase> 22 </Spase>