diff --git a/Instrument/AMDA/Parker_Solar_Probe/Ephemeris.xml b/Instrument/AMDA/Parker_Solar_Probe/Ephemeris.xml
new file mode 100644
index 0000000..f4a2704
--- /dev/null
+++ b/Instrument/AMDA/Parker_Solar_Probe/Ephemeris.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Spase xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.spase-group.org/data/schema" xsi:schemaLocation="http://www.spase-group.org/data/schema http://www.spase-group.org/data/schema/spase-2_2_6.xsd">
+ <Version>2.2.6</Version>
+ <Instrument>
+ <ResourceID>spase://CDPP/Instrument/AMDA/Parker_Solar_Probe/Ephemeris</ResourceID>
+ <ResourceHeader>
+ <ResourceName>Ephemeris</ResourceName>
+ <AlternateName> </AlternateName>
+ <ReleaseDate>2009-05-20T21:10:13Z</ReleaseDate>
+ <Description>A </Description>
+ <Contact>
+ <PersonID></PersonID>
+ <Role>MetadataContact</Role>
+ </Contact>
+ </ResourceHeader>
+ <InstrumentType>Platform</InstrumentType>
+ <InvestigationName>Spacecraft position</InvestigationName>
+ <ObservatoryID>spase://CDPP/Observatory/AMDA/Parker_Solar_Probe</ObservatoryID>
+ </Instrument>
+</Spase>
diff --git a/Instrument/AMDA/Solar_Probe_Plus/Ephemeris.xml b/Instrument/AMDA/Solar_Probe_Plus/Ephemeris.xml
deleted file mode 100644
index 4865399..0000000
--- a/Instrument/AMDA/Solar_Probe_Plus/Ephemeris.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Spase xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.spase-group.org/data/schema" xsi:schemaLocation="http://www.spase-group.org/data/schema http://www.spase-group.org/data/schema/spase-2_2_6.xsd">
- <Version>2.2.6</Version>
- <Instrument>
- <ResourceID>spase://CDPP/Instrument/AMDA/Solar_Probe_Plus/Ephemeris</ResourceID>
- <ResourceHeader>
- <ResourceName>Ephemeris</ResourceName>
- <AlternateName> </AlternateName>
- <ReleaseDate>2009-05-20T21:10:13Z</ReleaseDate>
- <Description>A </Description>
- <Contact>
- <PersonID></PersonID>
- <Role>MetadataContact</Role>
- </Contact>
- </ResourceHeader>
- <InstrumentType>Platform</InstrumentType>
- <InvestigationName>Spacecraft position</InvestigationName>
- <ObservatoryID>spase://CDPP/Observatory/AMDA/Solar_Probe_Plus</ObservatoryID>
- </Instrument>
-</Spase>
diff --git a/NumericalData/AMDA/Parker_Solar_Probe/Ephemeris/spp-orb-all.xml b/NumericalData/AMDA/Parker_Solar_Probe/Ephemeris/spp-orb-all.xml
new file mode 100644
index 0000000..3464212
--- /dev/null
+++ b/NumericalData/AMDA/Parker_Solar_Probe/Ephemeris/spp-orb-all.xml
@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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://cdpp.irap.omp.eu/AMDA-NG/public/schemas/spase-amda-1_2_0.xsd">
+ <Version>2.2.6</Version>
+ <NumericalData>
+ <ResourceID>spase://CDPP/NumericalData/AMDA/Parker_Solar_Probe/ephemeris/spp-orb-all</ResourceID>
+ <ResourceHeader>
+ <ResourceName>orbit</ResourceName>
+ <ReleaseDate>2015-10-12T10:48:29Z</ReleaseDate>
+ <Description>
+ </Description>
+ <Acknowledgement>
+ </Acknowledgement>
+ <Contact>
+ <PersonID/>
+ <Role/>
+ </Contact>
+ <InformationURL>
+ <Name/>
+ <URL>
+ </URL>
+ <Description>
+ </Description>
+ </InformationURL>
+ </ResourceHeader>
+ <AccessInformation>
+ <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
+ <Availability>Online</Availability>
+ <AccessRights>Open</AccessRights>
+ <AccessURL>
+ <Name>AMDA at CDPP</Name>
+ <URL>
+ http://amda.cdpp.eu
+ </URL>
+ </AccessURL>
+ <Format>Text</Format>
+ <Acknowledgement>
+ </Acknowledgement>
+ </AccessInformation>
+ <ProviderName/>
+ <InstrumentID>spase://CDPP/Instrument/AMDA/Parker_Solar_Probe/Ephemeris</InstrumentID>
+ <MeasurementType>Ephemeris</MeasurementType>
+ <TemporalDescription>
+ <TimeSpan>
+ <StartDate>2018-07-31T09:01:07Z</StartDate>
+ <StopDate>2025-08-31T13:01:07Z</StopDate>
+ </TimeSpan>
+ <Cadence>PT1H</Cadence></TemporalDescription>
+ <ObservedRegion>Heliosphere</ObservedRegion>
+ <Caveats>
+ </Caveats>
+<Parameter>
+ <Name>xyz_iau_sun</Name>
+ <ParameterKey>spp_all_xyz</ParameterKey>
+ <Description/>
+ <Ucd/>
+ <Units>AU</Units>
+ <UnitsConversion/>
+ <Structure>
+ <Size>3</Size>
+ <Element>
+ <Name>x</Name>
+ <Qualifier/>
+ <Index/>
+ <ParameterKey>spp_all_xyz(0)</ParameterKey>
+ <ValidMin/>
+ <ValidMax/>
+ <FillValue/>
+ </Element>
+ <Element>
+ <Name>y</Name>
+ <Qualifier/>
+ <Index/>
+ <ParameterKey>spp_all_xyz(1)</ParameterKey>
+ <ValidMin/>
+ <ValidMax/>
+ <FillValue/>
+ </Element>
+ <Element>
+ <Name>z</Name>
+ <Qualifier/>
+ <Index/>
+ <ParameterKey>spp_all_xyz(2)</ParameterKey>
+ <ValidMin/>
+ <ValidMax/>
+ <FillValue/>
+ </Element>
+ </Structure>
+</Parameter>
+ <Parameter>
+ <Name>distance spp-sun</Name>
+ <ParameterKey>spp_all_r</ParameterKey>
+ <Description/>
+ <Ucd/>
+ <Units>AU</Units>
+ <UnitsConversion/>
+ </Parameter>
+ <Parameter>
+ <Name>lon iau_sun</Name>
+ <ParameterKey>spp_all_lon</ParameterKey>
+ <Description/>
+ <Ucd/>
+ <Units>deg</Units>
+ <UnitsConversion/>
+ </Parameter>
+ <Parameter>
+ <Name>lat iau_sun</Name>
+ <ParameterKey>spp_all_lat</ParameterKey>
+ <Description/>
+ <Ucd/>
+ <Units>deg</Units>
+ <UnitsConversion/>
+ </Parameter>
+ <Parameter>
+ <Name>xyz_hee</Name>
+ <ParameterKey>spp_all_hee</ParameterKey>
+ <Description/>
+ <Ucd/>
+ <Units>AU</Units>
+ <UnitsConversion/>
+ <Structure>
+ <Size>3</Size>
+ <Element>
+ <Name>x</Name>
+ <Qualifier/>
+ <Index/>
+ <ParameterKey>spp_all_hee(0)</ParameterKey>
+ <ValidMin/>
+ <ValidMax/>
+ <FillValue/>
+ </Element>
+ <Element>
+ <Name>y</Name>
+ <Qualifier/>
+ <Index/>
+ <ParameterKey>spp_all_hee(1)</ParameterKey>
+ <ValidMin/>
+ <ValidMax/>
+ <FillValue/>
+ </Element>
+ <Element>
+ <Name>z</Name>
+ <Qualifier/>
+ <Index/>
+ <ParameterKey>spp_all_hee(2)</ParameterKey>
+ <ValidMin/>
+ <ValidMax/>
+ <FillValue/>
+ </Element>
+ </Structure>
+ </Parameter>
+ <Parameter>
+ <Name>xyz_heeq</Name>
+ <ParameterKey>spp_all_heeq</ParameterKey>
+ <Description/>
+ <Ucd/>
+ <Units>AU</Units>
+ <UnitsConversion/>
+ <Structure>
+ <Size>3</Size>
+ <Element>
+ <Name>x</Name>
+ <Qualifier/>
+ <Index/>
+ <ParameterKey>spp_all_heeq(0)</ParameterKey>
+ <ValidMin/>
+ <ValidMax/>
+ <FillValue/>
+ </Element>
+ <Element>
+ <Name>y</Name>
+ <Qualifier/>
+ <Index/>
+ <ParameterKey>spp_all_heeq(1)</ParameterKey>
+ <ValidMin/>
+ <ValidMax/>
+ <FillValue/>
+ </Element>
+ <Element>
+ <Name>z</Name>
+ <Qualifier/>
+ <Index/>
+ <ParameterKey>spp_all_heeq(2)</ParameterKey>
+ <ValidMin/>
+ <ValidMax/>
+ <FillValue/>
+ </Element>
+ </Structure>
+ </Parameter>
+ </NumericalData>
+</Spase>
diff --git a/NumericalData/AMDA/Solar_Probe_Plus/Ephemeris/spp-orb-all.xml b/NumericalData/AMDA/Solar_Probe_Plus/Ephemeris/spp-orb-all.xml
deleted file mode 100644
index 9fd80dd..0000000
--- a/NumericalData/AMDA/Solar_Probe_Plus/Ephemeris/spp-orb-all.xml
+++ /dev/null
@@ -1,190 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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://cdpp.irap.omp.eu/AMDA-NG/public/schemas/spase-amda-1_2_0.xsd">
- <Version>2.2.6</Version>
- <NumericalData>
- <ResourceID>spase://CDPP/NumericalData/AMDA/Solar_Probe_Plus/ephemeris/spp-orb-all</ResourceID>
- <ResourceHeader>
- <ResourceName>orbit</ResourceName>
- <ReleaseDate>2015-10-12T10:48:29Z</ReleaseDate>
- <Description>
- </Description>
- <Acknowledgement>
- </Acknowledgement>
- <Contact>
- <PersonID/>
- <Role/>
- </Contact>
- <InformationURL>
- <Name/>
- <URL>
- </URL>
- <Description>
- </Description>
- </InformationURL>
- </ResourceHeader>
- <AccessInformation>
- <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
- <Availability>Online</Availability>
- <AccessRights>Open</AccessRights>
- <AccessURL>
- <Name>AMDA at CDPP</Name>
- <URL>
- http://amda.cdpp.eu
- </URL>
- </AccessURL>
- <Format>Text</Format>
- <Acknowledgement>
- </Acknowledgement>
- </AccessInformation>
- <ProviderName/>
- <InstrumentID>spase://CDPP/Instrument/AMDA/Solar_Probe_Plus/Ephemeris</InstrumentID>
- <MeasurementType>Ephemeris</MeasurementType>
- <TemporalDescription>
- <TimeSpan>
- <StartDate>2018-07-31T09:01:07Z</StartDate>
- <StopDate>2025-08-31T13:01:07Z</StopDate>
- </TimeSpan>
- <Cadence>PT1H</Cadence></TemporalDescription>
- <ObservedRegion>Heliosphere</ObservedRegion>
- <Caveats>
- </Caveats>
-<Parameter>
- <Name>xyz_iau_sun</Name>
- <ParameterKey>spp_all_xyz</ParameterKey>
- <Description/>
- <Ucd/>
- <Units>AU</Units>
- <UnitsConversion/>
- <Structure>
- <Size>3</Size>
- <Element>
- <Name>x</Name>
- <Qualifier/>
- <Index/>
- <ParameterKey>spp_all_xyz(0)</ParameterKey>
- <ValidMin/>
- <ValidMax/>
- <FillValue/>
- </Element>
- <Element>
- <Name>y</Name>
- <Qualifier/>
- <Index/>
- <ParameterKey>spp_all_xyz(1)</ParameterKey>
- <ValidMin/>
- <ValidMax/>
- <FillValue/>
- </Element>
- <Element>
- <Name>z</Name>
- <Qualifier/>
- <Index/>
- <ParameterKey>spp_all_xyz(2)</ParameterKey>
- <ValidMin/>
- <ValidMax/>
- <FillValue/>
- </Element>
- </Structure>
-</Parameter>
- <Parameter>
- <Name>distance spp-sun</Name>
- <ParameterKey>spp_all_r</ParameterKey>
- <Description/>
- <Ucd/>
- <Units>AU</Units>
- <UnitsConversion/>
- </Parameter>
- <Parameter>
- <Name>lon iau_sun</Name>
- <ParameterKey>spp_all_lon</ParameterKey>
- <Description/>
- <Ucd/>
- <Units>deg</Units>
- <UnitsConversion/>
- </Parameter>
- <Parameter>
- <Name>lat iau_sun</Name>
- <ParameterKey>spp_all_lat</ParameterKey>
- <Description/>
- <Ucd/>
- <Units>deg</Units>
- <UnitsConversion/>
- </Parameter>
- <Parameter>
- <Name>xyz_hee</Name>
- <ParameterKey>spp_all_hee</ParameterKey>
- <Description/>
- <Ucd/>
- <Units>AU</Units>
- <UnitsConversion/>
- <Structure>
- <Size>3</Size>
- <Element>
- <Name>x</Name>
- <Qualifier/>
- <Index/>
- <ParameterKey>spp_all_hee(0)</ParameterKey>
- <ValidMin/>
- <ValidMax/>
- <FillValue/>
- </Element>
- <Element>
- <Name>y</Name>
- <Qualifier/>
- <Index/>
- <ParameterKey>spp_all_hee(1)</ParameterKey>
- <ValidMin/>
- <ValidMax/>
- <FillValue/>
- </Element>
- <Element>
- <Name>z</Name>
- <Qualifier/>
- <Index/>
- <ParameterKey>spp_all_hee(2)</ParameterKey>
- <ValidMin/>
- <ValidMax/>
- <FillValue/>
- </Element>
- </Structure>
- </Parameter>
- <Parameter>
- <Name>xyz_heeq</Name>
- <ParameterKey>spp_all_heeq</ParameterKey>
- <Description/>
- <Ucd/>
- <Units>AU</Units>
- <UnitsConversion/>
- <Structure>
- <Size>3</Size>
- <Element>
- <Name>x</Name>
- <Qualifier/>
- <Index/>
- <ParameterKey>spp_all_heeq(0)</ParameterKey>
- <ValidMin/>
- <ValidMax/>
- <FillValue/>
- </Element>
- <Element>
- <Name>y</Name>
- <Qualifier/>
- <Index/>
- <ParameterKey>spp_all_heeq(1)</ParameterKey>
- <ValidMin/>
- <ValidMax/>
- <FillValue/>
- </Element>
- <Element>
- <Name>z</Name>
- <Qualifier/>
- <Index/>
- <ParameterKey>spp_all_heeq(2)</ParameterKey>
- <ValidMin/>
- <ValidMax/>
- <FillValue/>
- </Element>
- </Structure>
- </Parameter>
- </NumericalData>
-</Spase>
diff --git a/Observatory/AMDA/Parker_Solar_Probe.xml b/Observatory/AMDA/Parker_Solar_Probe.xml
new file mode 100644
index 0000000..1f52803
--- /dev/null
+++ b/Observatory/AMDA/Parker_Solar_Probe.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Spase xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.spase-group.org/data/schema" xsi:schemaLocation="http://www.spase-group.org/data/schema http://www.spase-group.org/data/schema/spase-2_2_6.xsd">
+ <Version>2.2.6</Version>
+ <Observatory>
+ <ResourceID>spase://CDPP/Observatory/AMDA/Parker_Solar_Probe</ResourceID>
+ <ResourceHeader>
+ <ResourceName>PSP</ResourceName>
+ <AlternateName>Parker Solar Probe</AlternateName>
+ <ReleaseDate>2010-09-27T18:45:12Z</ReleaseDate>
+ <Description></Description>
+ <Contact>
+ <PersonID> </PersonID>
+ <Role>ProjectScientist</Role>
+ </Contact>
+ </ResourceHeader>
+ <Location>
+ <ObservatoryRegion>Heliosphere.Inner</ObservatoryRegion>
+ </Location>
+ </Observatory>
+</Spase>
diff --git a/Observatory/AMDA/Solar_Probe_Plus.xml b/Observatory/AMDA/Solar_Probe_Plus.xml
deleted file mode 100644
index a1d19c5..0000000
--- a/Observatory/AMDA/Solar_Probe_Plus.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Spase xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.spase-group.org/data/schema" xsi:schemaLocation="http://www.spase-group.org/data/schema http://www.spase-group.org/data/schema/spase-2_2_6.xsd">
- <Version>2.2.6</Version>
- <Observatory>
- <ResourceID>spase://CDPP/Observatory/AMDA/Solar_Probe_Plus</ResourceID>
- <ResourceHeader>
- <ResourceName>Solar Probe Plus</ResourceName>
- <AlternateName></AlternateName>
- <ReleaseDate>2010-09-27T18:45:12Z</ReleaseDate>
- <Description></Description>
- <Contact>
- <PersonID> </PersonID>
- <Role>ProjectScientist</Role>
- </Contact>
- </ResourceHeader>
- <Location>
- <ObservatoryRegion>Heliosphere.Inner</ObservatoryRegion>
- </Location>
- </Observatory>
-</Spase>
diff --git a/SimulationRun/AMDA/TSYG96/Tsyg96Run.xml b/SimulationRun/AMDA/TSYG96/Tsyg96Run.xml
index ee2d867..56d041b 100644
--- a/SimulationRun/AMDA/TSYG96/Tsyg96Run.xml
+++ b/SimulationRun/AMDA/TSYG96/Tsyg96Run.xml
@@ -4,17 +4,15 @@
<SimulationRun>
<ResourceID>spase://CDPP/SimulationRun/AMDA/TSYG96/Tsyg96Run</ResourceID>
<ResourceHeader>
- <ResourceName>T96 Model</ResourceName>
- <AlternateName> </AlternateName>
+ <ResourceName>T96 Model</ResourceName>
<ReleaseDate>2016-08-22T00:00:00Z</ReleaseDate>
- <Description>
-</Description>
+ <Description>A data-based Tsyganenko96 model computes the geomagnetospheric magnetic field with an explicitly defined realistic magnetopause, large-scale Region 1 and 2 Birkeland current systems, and the IMF penetration across the boundary.</Description>
<Contact>
<PersonID>spase://CDPP/Person/Nikolai.Tsyganenko</PersonID>
<Role>PrincipalInvestigator</Role>
</Contact>
<Contact>
- <PersonID>spase://SMWG/Person/Elena.Budnik</PersonID>
+ <PersonID>spase://CDPP/Person/Elena.Budnik</PersonID>
<Role>TechnicalContact</Role>
</Contact>
</ResourceHeader>
--
libgit2 0.21.2