CDPP / CNES

Commit e3cb6152f642a59eb1bf559861b8466d9f1b01b3

Authored by Elena.Budnik
1 parent 51ec14e1
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

work

Showing 5 changed files with 45 additions and 44 deletions   Show diff stats
Inline Side-by-side
NumericalData/AMDA/Ephemerides/earth-orb-all.xml
  Diff comments   View file @e3cb615
... ... @@ -46,17 +46,17 @@
46 46 <Structure>
47 47 <Size>3</Size>
48 48 <Element>
49   - <Name>x_hci</Name>
  49 + <Name>x</Name>
50 50 <Index>0</Index>
51 51 <ParameterKey>xyz_earth_hci(0)</ParameterKey>
52 52 </Element>
53 53 <Element>
54   - <Name>y_hci</Name>
  54 + <Name>y</Name>
55 55 <Index>1</Index>
56 56 <ParameterKey>xyz_earth_hci(1)</ParameterKey>
57 57 </Element>
58 58 <Element>
59   - <Name>z_hci</Name>
  59 + <Name>z</Name>
60 60 <Index>2</Index>
61 61 <ParameterKey>xyz_earth_hci(2)</ParameterKey>
62 62 </Element>
... ... @@ -72,13 +72,13 @@
72 72 <Units>AU</Units>
73 73 </Parameter>
74 74 <Parameter>
75   - <Name>solar_longitude (IAU_SUN)</Name>
  75 + <Name>longitude IAU_sun</Name>
76 76 <ParameterKey>earth_sol_lon</ParameterKey>
77 77 <Ucd/>
78 78 <Units>rad</Units>
79 79 </Parameter>
80 80 <Parameter>
81   - <Name>solar_latitude (IAU_SUN)</Name>
  81 + <Name>latitude IAU_sun</Name>
82 82 <ParameterKey>earth_sol_lat</ParameterKey>
83 83 <Ucd/>
84 84 <Units>rad</Units>
... ...
NumericalData/AMDA/Ephemerides/jupiter-orb-all.xml
  Diff comments   View file @e3cb615
... ... @@ -46,17 +46,17 @@
46 46 <Structure>
47 47 <Size>3</Size>
48 48 <Element>
49   - <Name>x_hee</Name>
  49 + <Name>x</Name>
50 50 <Index>0</Index>
51 51 <ParameterKey>xyz_jupiter_hee(0)</ParameterKey>
52 52 </Element>
53 53 <Element>
54   - <Name>y_hee</Name>
  54 + <Name>y</Name>
55 55 <Index>1</Index>
56 56 <ParameterKey>xyz_jupiter_hee(1)</ParameterKey>
57 57 </Element>
58 58 <Element>
59   - <Name>z_hee</Name>
  59 + <Name>z</Name>
60 60 <Index>2</Index>
61 61 <ParameterKey>xyz_jupiter_hee(2)</ParameterKey>
62 62 </Element>
... ... @@ -80,17 +80,17 @@
80 80 <Structure>
81 81 <Size>3</Size>
82 82 <Element>
83   - <Name>x_hci</Name>
  83 + <Name>x</Name>
84 84 <Index>0</Index>
85 85 <ParameterKey>xyz_jupiter_hci(0)</ParameterKey>
86 86 </Element>
87 87 <Element>
88   - <Name>y_hci</Name>
  88 + <Name>y</Name>
89 89 <Index>1</Index>
90 90 <ParameterKey>xyz_jupiter_hci(1)</ParameterKey>
91 91 </Element>
92 92 <Element>
93   - <Name>z_hci</Name>
  93 + <Name>z</Name>
94 94 <Index>2</Index>
95 95 <ParameterKey>xyz_jupiter_hci(2)</ParameterKey>
96 96 </Element>
... ... @@ -106,13 +106,13 @@
106 106 <Units>AU</Units>
107 107 </Parameter>
108 108 <Parameter>
109   - <Name>solar_longitude (IAU_SUN)</Name>
  109 + <Name>longitude IAU_sun</Name>
110 110 <ParameterKey>jupiter_sol_lon</ParameterKey>
111 111 <Ucd/>
112 112 <Units>rad</Units>
113 113 </Parameter>
114 114 <Parameter>
115   - <Name>solar_latitude (IAU_SUN)</Name>
  115 + <Name>latitude IAU_sun</Name>
116 116 <ParameterKey>jupiter_sol_lat</ParameterKey>
117 117 <Ucd/>
118 118 <Units>rad</Units>
... ...
NumericalData/AMDA/Ephemerides/mars-orb-all.xml
  Diff comments   View file @e3cb615
... ... @@ -46,17 +46,17 @@
46 46 <Structure>
47 47 <Size>3</Size>
48 48 <Element>
49   - <Name>x_hee</Name>
  49 + <Name>x</Name>
50 50 <Index>0</Index>
51 51 <ParameterKey>xyz_mars_hee(0)</ParameterKey>
52 52 </Element>
53 53 <Element>
54   - <Name>y_hee</Name>
  54 + <Name>y</Name>
55 55 <Index>1</Index>
56 56 <ParameterKey>xyz_mars_hee(1)</ParameterKey>
57 57 </Element>
58 58 <Element>
59   - <Name>z_hee</Name>
  59 + <Name>z</Name>
60 60 <Index>2</Index>
61 61 <ParameterKey>xyz_mars_hee(2)</ParameterKey>
62 62 </Element>
... ... @@ -80,17 +80,17 @@
80 80 <Structure>
81 81 <Size>3</Size>
82 82 <Element>
83   - <Name>x_hci</Name>
  83 + <Name>x</Name>
84 84 <Index>0</Index>
85 85 <ParameterKey>xyz_mars_hci(0)</ParameterKey>
86 86 </Element>
87 87 <Element>
88   - <Name>y_hci</Name>
  88 + <Name>y</Name>
89 89 <Index>1</Index>
90 90 <ParameterKey>xyz_mars_hci(1)</ParameterKey>
91 91 </Element>
92 92 <Element>
93   - <Name>z_hci</Name>
  93 + <Name>z</Name>
94 94 <Index>2</Index>
95 95 <ParameterKey>xyz_mars_hci(2)</ParameterKey>
96 96 </Element>
... ... @@ -106,13 +106,13 @@
106 106 <Units>AU</Units>
107 107 </Parameter>
108 108 <Parameter>
109   - <Name>solar_longitude (IAU_SUN)</Name>
  109 + <Name>longitude IAU_sun</Name>
110 110 <ParameterKey>mars_sol_lon</ParameterKey>
111 111 <Ucd/>
112 112 <Units>rad</Units>
113 113 </Parameter>
114 114 <Parameter>
115   - <Name>solar_latitude (IAU_SUN)</Name>
  115 + <Name>latitude IAU_sun</Name>
116 116 <ParameterKey>mars_sol_lat</ParameterKey>
117 117 <Ucd/>
118 118 <Units>rad</Units>
... ...
NumericalData/AMDA/Ephemerides/mercury-orb-all.xml
  Diff comments   View file @e3cb615
... ... @@ -106,13 +106,13 @@
106 106 <Units>AU</Units>
107 107 </Parameter>
108 108 <Parameter>
109   - <Name>solar_longitude (IAU_SUN)</Name>
  109 + <Name>longitude IAU_sun</Name>
110 110 <ParameterKey>mercury_sol_lon</ParameterKey>
111 111 <Ucd/>
112 112 <Units>rad</Units>
113 113 </Parameter>
114 114 <Parameter>
115   - <Name>solar_latitude (IAU_SUN)</Name>
  115 + <Name>latitude IAU_sun</Name>
116 116 <ParameterKey>mercury_sol_lat</ParameterKey>
117 117 <Ucd/>
118 118 <Units>rad</Units>
... ...
NumericalData/AMDA/Ephemerides/p67-orb-all.xml
  Diff comments   View file @e3cb615
... ... @@ -2,7 +2,7 @@
2 2 <Spase xmlns="http://www.spase-group.org/data/schema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.spase-group.org/data/schema http://cdpp1.cesr.fr/AMDA-NG/public/schemas/spase-amda-1_2_0.xsd">
3 3 <Version>2.2.6</Version>
4 4 <NumericalData>
5   - <ResourceID>spase://CDPP/NumericalData/AMDA/Comets/p67-orb-all</ResourceID>
  5 + <ResourceID>spase://CDPP/NumericalData/AMDA/Ephemerides/p67-orb-all</ResourceID>
6 6 <ResourceHeader>
7 7 <ResourceName>Comet Churyumov-Gerasimenko (C-G; P67)</ResourceName>
8 8 <ReleaseDate>2015-10-12T10:48:29Z</ReleaseDate>
... ... @@ -62,31 +62,31 @@
62 62 <Qualifier>Component.I</Qualifier>
63 63 <Index>1</Index>
64 64 <ParameterKey>xyz_p67_hee(0)</ParameterKey>
65   - <ValidMin></ValidMin>
66   - <ValidMax></ValidMax>
67   - <FillValue></FillValue>
  65 + <ValidMin/>
  66 + <ValidMax/>
  67 + <FillValue/>
68 68 </Element>
69 69 <Element>
70 70 <Name>y</Name>
71 71 <Qualifier>Component.J</Qualifier>
72 72 <Index>2</Index>
73 73 <ParameterKey>xyz_p67_hee(1)</ParameterKey>
74   - <ValidMin></ValidMin>
75   - <ValidMax></ValidMax>
76   - <FillValue></FillValue>
  74 + <ValidMin/>
  75 + <ValidMax/>
  76 + <FillValue/>
77 77 </Element>
78 78 <Element>
79 79 <Name>z</Name>
80 80 <Qualifier>Component.K</Qualifier>
81 81 <Index>3</Index>
82 82 <ParameterKey>xyz_p67_hee(2)</ParameterKey>
83   - <ValidMin></ValidMin>
84   - <ValidMax></ValidMax>
85   - <FillValue></FillValue>
  83 + <ValidMin/>
  84 + <ValidMax/>
  85 + <FillValue/>
86 86 </Element>
87 87 </Structure>
88 88 </Parameter>
89   - <Parameter><
  89 + <Parameter>
90 90 <Name>xyz_hci</Name>
91 91 <ParameterKey>xyz_p67_hci</ParameterKey>
92 92 <Description/>
... ... @@ -100,27 +100,27 @@
100 100 <Qualifier>Component.I</Qualifier>
101 101 <Index>1</Index>
102 102 <ParameterKey>xyz_p67_hci(0)</ParameterKey>
103   - <ValidMin></ValidMin>
104   - <ValidMax></ValidMax>
105   - <FillValue></FillValue>
  103 + <ValidMin/>
  104 + <ValidMax/>
  105 + <FillValue/>
106 106 </Element>
107 107 <Element>
108 108 <Name>y</Name>
109 109 <Qualifier>Component.J</Qualifier>
110 110 <Index>2</Index>
111 111 <ParameterKey>xyz_p67_hci(1)</ParameterKey>
112   - <ValidMin></ValidMin>
113   - <ValidMax></ValidMax>
114   - <FillValue></FillValue>
  112 + <ValidMin/>
  113 + <ValidMax/>
  114 + <FillValue/>
115 115 </Element>
116 116 <Element>
117 117 <Name>z</Name>
118 118 <Qualifier>Component.K</Qualifier>
119 119 <Index>3</Index>
120 120 <ParameterKey>xyz_p67_hci(2)</ParameterKey>
121   - <ValidMin></ValidMin>
122   - <ValidMax></ValidMax>
123   - <FillValue></FillValue>
  121 + <ValidMin/>
  122 + <ValidMax/>
  123 + <FillValue/>
124 124 </Element>
125 125 </Structure>
126 126 </Parameter>
... ... @@ -132,7 +132,8 @@
132 132 <Units>AU</Units>
133 133 <UnitsConversion/>
134 134 </Parameter>
135   - <Parameter><Name>longitude IAU_sun</Name>
  135 + <Parameter>
  136 + <Name>longitude IAU_sun</Name>
136 137 <ParameterKey>p67_sol_lon</ParameterKey>
137 138 <Description/>
138 139 <Ucd/>
... ...