diff --git a/NumericalData/AMDA/ACE/ephemeris/ace-orb-all.xml b/NumericalData/AMDA/ACE/ephemeris/ace-orb-all.xml
index 2ae1c86..78f1907 100644
--- a/NumericalData/AMDA/ACE/ephemeris/ace-orb-all.xml
+++ b/NumericalData/AMDA/ACE/ephemeris/ace-orb-all.xml
@@ -132,5 +132,60 @@
                 <SupportQuantity>Positional</SupportQuantity>
             </Support>
         </Parameter>
+       <Parameter>
+            <Name>xyz_hci</Name>
+            <ParameterKey>ace_xyz_hci</ParameterKey>
+            <Description>Spacecraft position in HCI</Description>
+            <Ucd></Ucd>
+            <Units>AU</Units>
+            <CoordinateSystem>
+                <CoordinateRepresentation>Cartesian</CoordinateRepresentation>
+                <CoordinateSystemName>HCI</CoordinateSystemName>
+            </CoordinateSystem>
+            <RenderingHints>
+                <DisplayType>TimeSeries</DisplayType>
+            </RenderingHints>
+            <Structure>
+                <Size>3</Size>
+                <Element>
+                    <Name>x</Name>
+                    <Qualifier>Component.I</Qualifier>
+                    <Index>1</Index>
+                    <ParameterKey>ace_xyz_hci(0)</ParameterKey>
+                    <ValidMin/>
+                    <ValidMax/>
+                    <FillValue/>
+                 </Element>   
+                <Element>
+                    <Name>y</Name>
+                    <Qualifier>Component.J</Qualifier>
+                    <Index>2</Index>
+                    <ParameterKey>ace_xyz_hci(1)</ParameterKey>
+                    <ValidMin/>
+                    <ValidMax/>
+                    <FillValue/>
+                </Element>
+                <Element>
+                    <Name>z</Name>
+                    <Qualifier>Component.K</Qualifier>
+                    <Index>3</Index>
+                    <ParameterKey>ace_xyz_hci(2)</ParameterKey>
+                    <ValidMin/>
+                    <ValidMax/>
+                    <FillValue/>
+                </Element>
+            </Structure>
+            <Support>
+                <SupportQuantity>Positional</SupportQuantity>
+            </Support>
+        </Parameter>
+        <Parameter>
+            <Name>distance ace-earth</Name>
+            <ParameterKey>ace_r</ParameterKey>
+            <Units>Re</Units>
+            <Support>
+                <SupportQuantity>Positional</SupportQuantity>
+            </Support>
+        </Parameter> 
     </NumericalData>
 </Spase>
diff --git a/NumericalOutput/AMDA/TAO/Mars/tao-mars-swrt.xml b/NumericalOutput/AMDA/TAO/Mars/tao-mars-swrt.xml
index 435c083..acc59cb 100644
--- a/NumericalOutput/AMDA/TAO/Mars/tao-mars-swrt.xml
+++ b/NumericalOutput/AMDA/TAO/Mars/tao-mars-swrt.xml
@@ -5,9 +5,9 @@
       <ResourceID>spase://CDPP/NumericalOutput/AMDA/TAO/Mars/tao-mars-swrt</ResourceID>
       <ResourceHeader>
          <ResourceName>SW / Input ACE Real Time</ResourceName>
-         <AlternateName>Tao SW Mars / Input OMNI</AlternateName>
+         <AlternateName>Tao SW Mars / Input ACE Real Time</AlternateName>
          <ReleaseDate>2017-07-08T16:49:29Z</ReleaseDate>
-         <Description>CE RealTime solar wind 1-min data from NOAA (ftp.swpc.noaa.gov) is used as model input. Calculation : IRAP.</Description>
+         <Description>ACE RealTime solar wind 1-min data from NOAA (ftp.swpc.noaa.gov) is used as model input. Calculation : IRAP.</Description>
          <Acknowledgement>TBD</Acknowledgement>
          <Contact>
             <PersonID>spase://CDPP/Person/Chihiro.Tao</PersonID>
diff --git a/NumericalOutput/AMDA/TAO/Mercury/tao-mercury-swrt.xml b/NumericalOutput/AMDA/TAO/Mercury/tao-mercury-swrt.xml
new file mode 100644
index 0000000..71cbf27
--- /dev/null
+++ b/NumericalOutput/AMDA/TAO/Mercury/tao-mercury-swrt.xml
@@ -0,0 +1,140 @@
+<?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-sim-1_0_1.xsd">
+   <Version>2.2.6</Version>
+   <NumericalOutput>
+      <ResourceID>spase://CDPP/NumericalOutput/AMDA/TAO/Mercury/tao-mercury-swrt</ResourceID>
+      <ResourceHeader>
+         <ResourceName>SW /  Input ACE Real Time</ResourceName>
+         <AlternateName>Tao SW Mercury / Input ACE Real Time</AlternateName>
+         <ReleaseDate>2017-07-08T16:49:29Z</ReleaseDate>
+         <Description>ACE RealTime solar wind 1-min data from NOAA (ftp.swpc.noaa.gov) is used as model input. Calculation : IRAP.</Description>
+         <Acknowledgement>TBD</Acknowledgement>
+         <Contact>
+            <PersonID>spase://CDPP/Person/Chihiro.Tao</PersonID>
+            <Role>PrincipalInvestigator</Role>
+         </Contact>
+         <Contact>
+            <PersonID>spase://CDPP/Person/Elena.Budnik</PersonID>
+            <Role>TechnicalContact</Role>
+         </Contact>
+         <InformationURL>
+            <Name>Model Description</Name>
+            <URL>http://www.astro.phys.s.chiba-u.ac.jp/netlab/astro/index2-e.html</URL>
+            <Description/>
+         </InformationURL>
+         <InformationURL>
+            <Name>Model Article</Name>
+            <URL>http://onlinelibrary.wiley.com/doi/10.1029/2004JA010959/abstract</URL>
+          </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.ASCII</Format>
+         <Acknowledgement> AMDA is a science analysis system provided by the Centre de Donnees de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Universite Paul Sabatier, Toulouse</Acknowledgement>
+      </AccessInformation>
+      <SimulationRunID>spase://CDPP/SimulationRun/AMDA/TAO/TaoMercury</SimulationRunID>
+      <MeasurementType>ThermalPlasma</MeasurementType>
+      <TemporalDescription>
+         <TimeSpan>
+            <StartDate>1990-01-01T01:00:00Z</StartDate>
+            <StopDate>2017-09-10T00:00:00Z</StopDate>
+         </TimeSpan>
+         <Cadence>PT1H</Cadence>
+      </TemporalDescription>
+      <SimulatedRegion>Mercury</SimulatedRegion>
+      <Caveats>Note an important parameter - angle Mercury-Sun-Earth - which could be considered as quality flag.</Caveats>
+       <InputResourceID>spase://CDPP/NumericalData/AMDA/ACE/ace-mag-real</InputResourceID>
+      <InputResourceID>spase://CDPP/NumericalData/AMDA/ACE/ace-swepam-real</InputResourceID>
+      <Parameter>
+         <Name>density</Name>
+         <ParameterKey>mercury_swrt_n</ParameterKey>
+         <Description>Solar Wind Proton Number Density, scalar</Description>
+         <Units>cm^-3</Units>
+         <FillValue>NaN</FillValue>
+         <Particle>
+            <ParticleType>Proton</ParticleType>
+            <ParticleQuantity>NumberDensity</ParticleQuantity>
+         </Particle>
+      </Parameter>
+      <Parameter>
+         <Name>velocity</Name>
+         <ParameterKey>mercury_swrt_v</ParameterKey>
+         <Description>Solar Wind Bulk Speed</Description>
+         <Units>km/s</Units>
+         <Structure>
+            <Size>3</Size>
+            <Element>
+               <Name>V r</Name>
+               <Qualifier>Component.I</Qualifier>
+               <Index>1</Index>
+               <ParameterKey>mercury_swrt_v(0)</ParameterKey>
+               <ValidMin/>
+               <ValidMax/>
+               <FillValue/>
+            </Element>
+            <Element>
+               <Name>V t</Name>
+               <Qualifier>Component.J</Qualifier>
+               <Index>2</Index>
+               <ParameterKey>mercury_swrt_v(1)</ParameterKey>
+               <ValidMin/>
+               <ValidMax/>
+               <FillValue/>
+            </Element>
+         </Structure>
+         <FillValue>NaN</FillValue>
+         <Particle>
+            <ParticleType>Proton</ParticleType>
+            <ParticleQuantity>Velocity</ParticleQuantity>
+         </Particle>
+      </Parameter>
+      <Parameter>
+         <Name>temperature</Name>
+         <ParameterKey>mercury_swrt_t</ParameterKey>
+         <Description/>
+         <Units>eV</Units>
+         <FillValue>NaN</FillValue>
+         <Particle>
+            <ParticleType>Proton</ParticleType>
+            <ParticleQuantity>Temperature</ParticleQuantity>
+         </Particle>
+      </Parameter>
+      <Parameter>
+         <Name>dynamic pressure</Name>
+         <ParameterKey>mercury_swrt_pdyn</ParameterKey>
+         <Description/>
+         <Units>nPa</Units>
+         <FillValue>NaN</FillValue>
+         <Particle>
+            <ParticleType>Proton</ParticleType>
+            <ParticleQuantity>Pressure</ParticleQuantity>
+         </Particle>
+      </Parameter>
+      <Parameter>
+         <Name>b tangential</Name>
+         <ParameterKey>mercury_swrt_b</ParameterKey>
+         <Description/>
+         <Units>nT</Units>          
+         <FillValue>NaN</FillValue>
+         <Field>
+            <FieldQuantity>Magnetic</FieldQuantity>
+         </Field>
+      </Parameter>
+      <Parameter>
+         <Name>angle Mercury-Sun-Earth</Name>
+         <ParameterKey>mercury_swrt_da</ParameterKey>
+         <Description/>
+         <Units/>
+         <FillValue>NaN</FillValue>
+         <Support>
+            <SupportQuantity>Positional</SupportQuantity>
+         </Support>
+      </Parameter>
+   </NumericalOutput>
+</Spase>
diff --git a/NumericalOutput/AMDA/TAO/Saturn/tao-sat-swrt.xml b/NumericalOutput/AMDA/TAO/Saturn/tao-sat-swrt.xml
new file mode 100644
index 0000000..f26efa8
--- /dev/null
+++ b/NumericalOutput/AMDA/TAO/Saturn/tao-sat-swrt.xml
@@ -0,0 +1,140 @@
+<?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-sim-1_0_1.xsd">
+   <Version>2.2.6</Version>
+   <NumericalOutput>
+      <ResourceID>spase://CDPP/NumericalOutput/AMDA/TAO/Saturn/tao-sat-swrt</ResourceID>
+      <ResourceHeader>
+         <ResourceName>SW / Input ACE Real Time</ResourceName>
+         <AlternateName>Tao SW Saturn / Input ACE Real Time</AlternateName>
+         <ReleaseDate>2017-07-08T16:49:29Z</ReleaseDate>
+         <Description>ACE RealTime solar wind 1-min data from NOAA (ftp.swpc.noaa.gov) is used as model input. Calculation : IRAP.</Description>
+         <Acknowledgement>TBD</Acknowledgement>
+         <Contact>
+            <PersonID>spase://CDPP/Person/Chihiro.Tao</PersonID>
+            <Role>PrincipalInvestigator</Role>
+         </Contact>
+         <Contact>
+            <PersonID>spase://CDPP/Person/Elena.Budnik</PersonID>
+            <Role>TechnicalContact</Role>
+         </Contact>
+         <InformationURL>
+            <Name>Model Description</Name>
+            <URL>http://www.astro.phys.s.chiba-u.ac.jp/netlab/astro/index2-e.html</URL>
+            <Description/>
+         </InformationURL>
+         <InformationURL>
+            <Name>Model Article</Name>
+            <URL>http://onlinelibrary.wiley.com/doi/10.1029/2004JA010959/abstract</URL>
+          </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.ASCII</Format>
+         <Acknowledgement> AMDA is a science analysis system provided by the Centre de Donnees de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Universite Paul Sabatier, Toulouse</Acknowledgement>
+      </AccessInformation>
+      <SimulationRunID>spase://CDPP/SimulationRun/AMDA/TAO/TaoSaturn</SimulationRunID>
+      <MeasurementType>ThermalPlasma</MeasurementType>
+      <TemporalDescription>
+         <TimeSpan>
+            <StartDate>1990-01-01T01:30:00Z</StartDate>
+            <StopDate>2017-09-10T00:00:00Z</StopDate>
+         </TimeSpan>
+         <Cadence>PT1H</Cadence>
+      </TemporalDescription>
+      <SimulatedRegion>Saturn</SimulatedRegion>
+      <Caveats>Note an important parameter - angle Saturn-Sun-Earth - which could be considered as quality flag.</Caveats>
+       <InputResourceID>spase://CDPP/NumericalData/AMDA/ACE/ace-mag-real</InputResourceID>
+      <InputResourceID>spase://CDPP/NumericalData/AMDA/ACE/ace-swepam-real</InputResourceID>
+      <Parameter>
+         <Name>density</Name>
+         <ParameterKey>sat_swrt_n</ParameterKey>
+         <Description>Solar Wind Proton Number Density, scalar</Description>
+         <Units>cm^-3</Units>
+         <FillValue>NaN</FillValue>
+         <Particle>
+            <ParticleType>Proton</ParticleType>
+            <ParticleQuantity>NumberDensity</ParticleQuantity>
+         </Particle>
+      </Parameter>
+      <Parameter>
+         <Name>velocity</Name>
+         <ParameterKey>sat_swrt_v</ParameterKey>
+         <Description>Solar Wind Bulk Speed</Description>
+         <Units>km/s</Units>
+         <Structure>
+            <Size>3</Size>
+            <Element>
+               <Name>V r</Name>
+               <Qualifier>Component.I</Qualifier>
+               <Index>1</Index>
+               <ParameterKey>sat_swrt_v(0)</ParameterKey>
+               <ValidMin/>
+               <ValidMax/>
+               <FillValue/>
+            </Element>
+            <Element>
+               <Name>V t</Name>
+               <Qualifier>Component.J</Qualifier>
+               <Index>2</Index>
+               <ParameterKey>sat_swrt_v(1)</ParameterKey>
+               <ValidMin/>
+               <ValidMax/>
+               <FillValue/>
+            </Element>
+         </Structure>
+         <FillValue>NaN</FillValue>
+         <Particle>
+            <ParticleType>Proton</ParticleType>
+            <ParticleQuantity>Velocity</ParticleQuantity>
+         </Particle>
+      </Parameter>
+      <Parameter>
+         <Name>temperature</Name>
+         <ParameterKey>sat_swrt_t</ParameterKey>
+         <Description/>
+         <Units>eV</Units>
+         <FillValue>NaN</FillValue>
+         <Particle>
+            <ParticleType>Proton</ParticleType>
+            <ParticleQuantity>Temperature</ParticleQuantity>
+         </Particle>
+      </Parameter>
+      <Parameter>
+         <Name>dynamic pressure</Name>
+         <ParameterKey>sat_swrt_pdyn</ParameterKey>
+         <Description/>
+         <Units>nPa</Units>
+         <FillValue>NaN</FillValue>
+         <Particle>
+            <ParticleType>Proton</ParticleType>
+            <ParticleQuantity>Pressure</ParticleQuantity>
+         </Particle>
+      </Parameter>
+      <Parameter>
+         <Name>b tangential</Name>
+         <ParameterKey>sat_swrt_b</ParameterKey>
+         <Description/>
+         <Units>nT</Units>          
+         <FillValue>NaN</FillValue>
+         <Field>
+            <FieldQuantity>Magnetic</FieldQuantity>
+         </Field>
+      </Parameter>
+      <Parameter>
+         <Name>angle Sat-Sun-Earth</Name>
+         <ParameterKey>sat_swrt_da</ParameterKey>
+         <Description/>
+         <Units/>
+         <FillValue>NaN</FillValue>
+         <Support>
+            <SupportQuantity>Positional</SupportQuantity>
+         </Support>
+      </Parameter>
+   </NumericalOutput>
+</Spase>
diff --git a/NumericalOutput/AMDA/TAO/Venus/tao-venus-swrt.xml b/NumericalOutput/AMDA/TAO/Venus/tao-venus-swrt.xml
new file mode 100644
index 0000000..3bddd09
--- /dev/null
+++ b/NumericalOutput/AMDA/TAO/Venus/tao-venus-swrt.xml
@@ -0,0 +1,140 @@
+<?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-sim-1_0_1.xsd">
+   <Version>2.2.6</Version>
+   <NumericalOutput>
+      <ResourceID>spase://CDPP/NumericalOutput/AMDA/TAO/Venus/tao-venus-swrt</ResourceID>
+      <ResourceHeader>
+         <ResourceName>SW /  Input ACE Real Time</ResourceName>
+         <AlternateName>Tao SW Venus / / Input ACE Real Time</AlternateName>
+         <ReleaseDate>2017-07-08T16:49:29Z</ReleaseDate>
+         <Description>ACE RealTime solar wind 1-min data from NOAA (ftp.swpc.noaa.gov) is used as model input. Calculation : IRAP.</Description>
+         <Acknowledgement>TBD</Acknowledgement>
+         <Contact>
+            <PersonID>spase://CDPP/Person/Chihiro.Tao</PersonID>
+            <Role>PrincipalInvestigator</Role>
+         </Contact>
+         <Contact>
+            <PersonID>spase://CDPP/Person/Elena.Budnik</PersonID>
+            <Role>TechnicalContact</Role>
+         </Contact>
+         <InformationURL>
+            <Name>Model Description</Name>
+            <URL>http://www.astro.phys.s.chiba-u.ac.jp/netlab/astro/index2-e.html</URL>
+            <Description/>
+         </InformationURL>
+         <InformationURL>
+            <Name>Model Article</Name>
+            <URL>http://onlinelibrary.wiley.com/doi/10.1029/2004JA010959/abstract</URL>
+          </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.ASCII</Format>
+         <Acknowledgement> AMDA is a science analysis system provided by the Centre de Donnees de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Universite Paul Sabatier, Toulouse</Acknowledgement>
+      </AccessInformation>
+      <SimulationRunID>spase://CDPP/SimulationRun/AMDA/TAO/TaoVenus</SimulationRunID>
+      <MeasurementType>ThermalPlasma</MeasurementType>
+      <TemporalDescription>
+         <TimeSpan>
+            <StartDate>1990-01-01T01:00:00Z</StartDate>
+            <StopDate>2017-09-10T00:00:00Z</StopDate>
+         </TimeSpan>
+         <Cadence>PT1H</Cadence>
+      </TemporalDescription>
+      <SimulatedRegion>Venus</SimulatedRegion>
+      <Caveats>Note an important parameter - angle Venus-Sun-Earth - which could be considered as quality flag.</Caveats>
+      <InputResourceID>spase://CDPP/NumericalData/AMDA/ACE/ace-mag-real</InputResourceID>
+      <InputResourceID>spase://CDPP/NumericalData/AMDA/ACE/ace-swepam-real</InputResourceID>   
+      <Parameter>
+         <Name>density</Name>
+         <ParameterKey>venus_swrt_n</ParameterKey>
+         <Description>Solar Wind Proton Number Density, scalar</Description>
+         <Units>cm^-3</Units>
+         <FillValue>NaN</FillValue>
+         <Particle>
+            <ParticleType>Proton</ParticleType>
+            <ParticleQuantity>NumberDensity</ParticleQuantity>
+         </Particle>
+      </Parameter>
+      <Parameter>
+         <Name>velocity</Name>
+         <ParameterKey>venus_swrt_v</ParameterKey>
+         <Description>Solar Wind Bulk Speed</Description>
+         <Units>km/s</Units>
+         <Structure>
+            <Size>3</Size>
+            <Element>
+               <Name>V r</Name>
+               <Qualifier>Component.I</Qualifier>
+               <Index>1</Index>
+               <ParameterKey>venus_swrt_v(0)</ParameterKey>
+               <ValidMin/>
+               <ValidMax/>
+               <FillValue/>
+            </Element>
+            <Element>
+               <Name>V t</Name>
+               <Qualifier>Component.J</Qualifier>
+               <Index>2</Index>
+               <ParameterKey>venus_swrt_v(1)</ParameterKey>
+               <ValidMin/>
+               <ValidMax/>
+               <FillValue/>
+            </Element>
+         </Structure>
+         <FillValue>NaN</FillValue>
+         <Particle>
+            <ParticleType>Proton</ParticleType>
+            <ParticleQuantity>Velocity</ParticleQuantity>
+         </Particle>
+      </Parameter>
+      <Parameter>
+         <Name>temperature</Name>
+         <ParameterKey>venus_swrt_t</ParameterKey>
+         <Description/>
+         <Units>eV</Units>
+         <FillValue>NaN</FillValue>
+         <Particle>
+            <ParticleType>Proton</ParticleType>
+            <ParticleQuantity>Temperature</ParticleQuantity>
+         </Particle>
+      </Parameter>
+      <Parameter>
+         <Name>dynamic pressure</Name>
+         <ParameterKey>venus_swrt_pdyn</ParameterKey>
+         <Description/>
+         <Units>nPa</Units>
+         <FillValue>NaN</FillValue>
+         <Particle>
+            <ParticleType>Proton</ParticleType>
+            <ParticleQuantity>Pressure</ParticleQuantity>
+         </Particle>
+      </Parameter>
+      <Parameter>
+         <Name>b tangential</Name>
+         <ParameterKey>venus_swrt_b</ParameterKey>
+         <Description/>
+         <Units>nT</Units>          
+         <FillValue>NaN</FillValue>
+         <Field>
+            <FieldQuantity>Magnetic</FieldQuantity>
+         </Field>
+      </Parameter>
+      <Parameter>
+         <Name>angle Venus-Sun-Earth</Name>
+         <ParameterKey>venus_sw_da</ParameterKey>
+         <Description/>
+         <Units/>
+         <FillValue>NaN</FillValue>
+         <Support>
+            <SupportQuantity>Positional</SupportQuantity>
+         </Support>
+      </Parameter>
+   </NumericalOutput>
+</Spase>
--
libgit2 0.21.2