diff --git a/NumericalData/AMDA/Ephemerides/earth-orb-all.xml b/NumericalData/AMDA/Ephemerides/earth-orb-all.xml index 815696f..be02048 100644 --- a/NumericalData/AMDA/Ephemerides/earth-orb-all.xml +++ b/NumericalData/AMDA/Ephemerides/earth-orb-all.xml @@ -46,17 +46,17 @@ <Structure> <Size>3</Size> <Element> - <Name>x_hci</Name> + <Name>x</Name> <Index>0</Index> <ParameterKey>xyz_earth_hci(0)</ParameterKey> </Element> <Element> - <Name>y_hci</Name> + <Name>y</Name> <Index>1</Index> <ParameterKey>xyz_earth_hci(1)</ParameterKey> </Element> <Element> - <Name>z_hci</Name> + <Name>z</Name> <Index>2</Index> <ParameterKey>xyz_earth_hci(2)</ParameterKey> </Element> @@ -72,13 +72,13 @@ <Units>AU</Units> </Parameter> <Parameter> - <Name>solar_longitude (IAU_SUN)</Name> + <Name>longitude IAU_sun</Name> <ParameterKey>earth_sol_lon</ParameterKey> <Ucd/> <Units>rad</Units> </Parameter> <Parameter> - <Name>solar_latitude (IAU_SUN)</Name> + <Name>latitude IAU_sun</Name> <ParameterKey>earth_sol_lat</ParameterKey> <Ucd/> <Units>rad</Units> diff --git a/NumericalData/AMDA/Ephemerides/jupiter-orb-all.xml b/NumericalData/AMDA/Ephemerides/jupiter-orb-all.xml index 4bfbe4e..adf51db 100644 --- a/NumericalData/AMDA/Ephemerides/jupiter-orb-all.xml +++ b/NumericalData/AMDA/Ephemerides/jupiter-orb-all.xml @@ -46,17 +46,17 @@ <Structure> <Size>3</Size> <Element> - <Name>x_hee</Name> + <Name>x</Name> <Index>0</Index> <ParameterKey>xyz_jupiter_hee(0)</ParameterKey> </Element> <Element> - <Name>y_hee</Name> + <Name>y</Name> <Index>1</Index> <ParameterKey>xyz_jupiter_hee(1)</ParameterKey> </Element> <Element> - <Name>z_hee</Name> + <Name>z</Name> <Index>2</Index> <ParameterKey>xyz_jupiter_hee(2)</ParameterKey> </Element> @@ -80,17 +80,17 @@ <Structure> <Size>3</Size> <Element> - <Name>x_hci</Name> + <Name>x</Name> <Index>0</Index> <ParameterKey>xyz_jupiter_hci(0)</ParameterKey> </Element> <Element> - <Name>y_hci</Name> + <Name>y</Name> <Index>1</Index> <ParameterKey>xyz_jupiter_hci(1)</ParameterKey> </Element> <Element> - <Name>z_hci</Name> + <Name>z</Name> <Index>2</Index> <ParameterKey>xyz_jupiter_hci(2)</ParameterKey> </Element> @@ -106,13 +106,13 @@ <Units>AU</Units> </Parameter> <Parameter> - <Name>solar_longitude (IAU_SUN)</Name> + <Name>longitude IAU_sun</Name> <ParameterKey>jupiter_sol_lon</ParameterKey> <Ucd/> <Units>rad</Units> </Parameter> <Parameter> - <Name>solar_latitude (IAU_SUN)</Name> + <Name>latitude IAU_sun</Name> <ParameterKey>jupiter_sol_lat</ParameterKey> <Ucd/> <Units>rad</Units> diff --git a/NumericalData/AMDA/Ephemerides/mars-orb-all.xml b/NumericalData/AMDA/Ephemerides/mars-orb-all.xml index aeeba8e..c669db6 100644 --- a/NumericalData/AMDA/Ephemerides/mars-orb-all.xml +++ b/NumericalData/AMDA/Ephemerides/mars-orb-all.xml @@ -46,17 +46,17 @@ <Structure> <Size>3</Size> <Element> - <Name>x_hee</Name> + <Name>x</Name> <Index>0</Index> <ParameterKey>xyz_mars_hee(0)</ParameterKey> </Element> <Element> - <Name>y_hee</Name> + <Name>y</Name> <Index>1</Index> <ParameterKey>xyz_mars_hee(1)</ParameterKey> </Element> <Element> - <Name>z_hee</Name> + <Name>z</Name> <Index>2</Index> <ParameterKey>xyz_mars_hee(2)</ParameterKey> </Element> @@ -80,17 +80,17 @@ <Structure> <Size>3</Size> <Element> - <Name>x_hci</Name> + <Name>x</Name> <Index>0</Index> <ParameterKey>xyz_mars_hci(0)</ParameterKey> </Element> <Element> - <Name>y_hci</Name> + <Name>y</Name> <Index>1</Index> <ParameterKey>xyz_mars_hci(1)</ParameterKey> </Element> <Element> - <Name>z_hci</Name> + <Name>z</Name> <Index>2</Index> <ParameterKey>xyz_mars_hci(2)</ParameterKey> </Element> @@ -106,13 +106,13 @@ <Units>AU</Units> </Parameter> <Parameter> - <Name>solar_longitude (IAU_SUN)</Name> + <Name>longitude IAU_sun</Name> <ParameterKey>mars_sol_lon</ParameterKey> <Ucd/> <Units>rad</Units> </Parameter> <Parameter> - <Name>solar_latitude (IAU_SUN)</Name> + <Name>latitude IAU_sun</Name> <ParameterKey>mars_sol_lat</ParameterKey> <Ucd/> <Units>rad</Units> diff --git a/NumericalData/AMDA/Ephemerides/mercury-orb-all.xml b/NumericalData/AMDA/Ephemerides/mercury-orb-all.xml index de36ae5..ef644bf 100644 --- a/NumericalData/AMDA/Ephemerides/mercury-orb-all.xml +++ b/NumericalData/AMDA/Ephemerides/mercury-orb-all.xml @@ -106,13 +106,13 @@ <Units>AU</Units> </Parameter> <Parameter> - <Name>solar_longitude (IAU_SUN)</Name> + <Name>longitude IAU_sun</Name> <ParameterKey>mercury_sol_lon</ParameterKey> <Ucd/> <Units>rad</Units> </Parameter> <Parameter> - <Name>solar_latitude (IAU_SUN)</Name> + <Name>latitude IAU_sun</Name> <ParameterKey>mercury_sol_lat</ParameterKey> <Ucd/> <Units>rad</Units> diff --git a/NumericalData/AMDA/Ephemerides/p67-orb-all.xml b/NumericalData/AMDA/Ephemerides/p67-orb-all.xml index db9209e..121dd27 100644 --- a/NumericalData/AMDA/Ephemerides/p67-orb-all.xml +++ b/NumericalData/AMDA/Ephemerides/p67-orb-all.xml @@ -2,7 +2,7 @@ <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"> <Version>2.2.6</Version> <NumericalData> - <ResourceID>spase://CDPP/NumericalData/AMDA/Comets/p67-orb-all</ResourceID> + <ResourceID>spase://CDPP/NumericalData/AMDA/Ephemerides/p67-orb-all</ResourceID> <ResourceHeader> <ResourceName>Comet Churyumov-Gerasimenko (C-G; P67)</ResourceName> <ReleaseDate>2015-10-12T10:48:29Z</ReleaseDate> @@ -62,31 +62,31 @@ <Qualifier>Component.I</Qualifier> <Index>1</Index> <ParameterKey>xyz_p67_hee(0)</ParameterKey> - <ValidMin></ValidMin> - <ValidMax></ValidMax> - <FillValue></FillValue> + <ValidMin/> + <ValidMax/> + <FillValue/> </Element> <Element> <Name>y</Name> <Qualifier>Component.J</Qualifier> <Index>2</Index> <ParameterKey>xyz_p67_hee(1)</ParameterKey> - <ValidMin></ValidMin> - <ValidMax></ValidMax> - <FillValue></FillValue> + <ValidMin/> + <ValidMax/> + <FillValue/> </Element> <Element> <Name>z</Name> <Qualifier>Component.K</Qualifier> <Index>3</Index> <ParameterKey>xyz_p67_hee(2)</ParameterKey> - <ValidMin></ValidMin> - <ValidMax></ValidMax> - <FillValue></FillValue> + <ValidMin/> + <ValidMax/> + <FillValue/> </Element> </Structure> </Parameter> - <Parameter>< + <Parameter> <Name>xyz_hci</Name> <ParameterKey>xyz_p67_hci</ParameterKey> <Description/> @@ -100,27 +100,27 @@ <Qualifier>Component.I</Qualifier> <Index>1</Index> <ParameterKey>xyz_p67_hci(0)</ParameterKey> - <ValidMin></ValidMin> - <ValidMax></ValidMax> - <FillValue></FillValue> + <ValidMin/> + <ValidMax/> + <FillValue/> </Element> <Element> <Name>y</Name> <Qualifier>Component.J</Qualifier> <Index>2</Index> <ParameterKey>xyz_p67_hci(1)</ParameterKey> - <ValidMin></ValidMin> - <ValidMax></ValidMax> - <FillValue></FillValue> + <ValidMin/> + <ValidMax/> + <FillValue/> </Element> <Element> <Name>z</Name> <Qualifier>Component.K</Qualifier> <Index>3</Index> <ParameterKey>xyz_p67_hci(2)</ParameterKey> - <ValidMin></ValidMin> - <ValidMax></ValidMax> - <FillValue></FillValue> + <ValidMin/> + <ValidMax/> + <FillValue/> </Element> </Structure> </Parameter> @@ -132,7 +132,8 @@ <Units>AU</Units> <UnitsConversion/> </Parameter> - <Parameter><Name>longitude IAU_sun</Name> + <Parameter> + <Name>longitude IAU_sun</Name> <ParameterKey>p67_sol_lon</ParameterKey> <Description/> <Ucd/> -- libgit2 0.21.2