From 7dfe5752964e7421de67025152e11facc09339e3 Mon Sep 17 00:00:00 2001
From: Elena.Budnik <ebudnik@irap.omp.eu>
Date: Tue, 22 Jan 2019 12:24:15 +0100
Subject: [PATCH] Jovian models for Galileo

---
 Instrument/AMDA/Galileo/Models.xml                    |  11 +++++------
 NumericalData/AMDA/Galileo/Models/gll-mod-khurana.xml |  37 +++++++++++++++----------------------
 NumericalData/AMDA/Galileo/Models/gll-mod-onera.xml   | 113 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------
 Person/A.Sicard.xml                                   |   9 +++++++++
 Person/Krishan.Khurana.xml                            |  10 ++++++++++
 5 files changed, 130 insertions(+), 50 deletions(-)
 create mode 100644 Person/A.Sicard.xml
 create mode 100644 Person/Krishan.Khurana.xml

diff --git a/Instrument/AMDA/Galileo/Models.xml b/Instrument/AMDA/Galileo/Models.xml
index 90260f5..67ead37 100644
--- a/Instrument/AMDA/Galileo/Models.xml
+++ b/Instrument/AMDA/Galileo/Models.xml
@@ -7,21 +7,20 @@
       <ResourceName>Jovian Magnetic Field Models</ResourceName>
       <AlternateName></AlternateName>
       <ReleaseDate>2009-05-20T21:10:13Z</ReleaseDate>
-      <Description> 
-        </Description>
+      <Description>Different magnetic parameters calculated basing on Khurana's model</Description>
       <Acknowledgement/>
       <Contact>
-        <PersonID></PersonID>
+        <PersonID>spase://CDPP/Person/Krishan.Khurana</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <InformationURL>
-        <Name></Name>
-        <URL></URL>
+        <Name>Access to Khurana model</Name>
+        <URL>http://lasp.colorado.edu/home/mop/resources/graphics/code/</URL>
       </InformationURL>
       <PriorID></PriorID>
     </ResourceHeader>
     <InstrumentType>Platform</InstrumentType>
-    <InvestigationName></InvestigationName>
+    <InvestigationName/>
     <ObservatoryID>spase://CDPP/Observatory/AMDA/Galileo</ObservatoryID>
     <Caveats/>
   </Instrument>
diff --git a/NumericalData/AMDA/Galileo/Models/gll-mod-khurana.xml b/NumericalData/AMDA/Galileo/Models/gll-mod-khurana.xml
index 3f2faa4..5bdf941 100644
--- a/NumericalData/AMDA/Galileo/Models/gll-mod-khurana.xml
+++ b/NumericalData/AMDA/Galileo/Models/gll-mod-khurana.xml
@@ -5,34 +5,29 @@
       <ResourceID>spase://CDPP/NumericalData/AMDA/Galileo/Models/gll-mod-khurana</ResourceID>
       <ResourceHeader>
          <ResourceName>Khurana Model</ResourceName>
-         <ReleaseDate>2015-10-12T10:48:29Z</ReleaseDate>
-         <Description>                        
-         </Description>
-         <Acknowledgement>            
-         </Acknowledgement>
+         <ReleaseDate>2018-10-12T10:48:29Z</ReleaseDate>
+         <Description>The Khurana magnetic field model is an empirical model based on data from the Galileo spacecraft. The code was originally written in Fortran 77/90 but has since been converted into IDL. 
+            Calculated with IDL code for Galileo mission.</Description>
+         <Acknowledgement/>                    
          <Contact>        
-            <PersonID/>
-            <Role/>
+            <PersonID>spase://CDPP/Person/Krishan.Khurana</PersonID>
+            <Role>PrincipalInvestigator</Role>
          </Contact>
          <InformationURL>
-           <Name/>
-           <URL>              
-           </URL>
-           <Description>             
-           </Description>
+           <Name>Access to Khurana model</Name>
+           <URL>http://lasp.colorado.edu/home/mop/resources/graphics/code/</URL>                        
+           <Description/>                        
          </InformationURL>       
       </ResourceHeader>
       <AccessInformation>
          <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
          <Availability>Online</Availability>
-         <AccessRights>Restricted</AccessRights>
+         <AccessRights>Open</AccessRights>
          <AccessURL>
             <Name>AMDA at CDPP</Name>
-            <URL>
-                http://amda.cdpp.eu
-            </URL>
+            <URL>http://amda.cdpp.eu</URL>
          </AccessURL>
-         <Format/>
+         <Format>NetCDF</Format>
          <Acknowledgement>           
          </Acknowledgement>
       </AccessInformation>
@@ -44,8 +39,9 @@
              <StartDate>1996-05-29T00:00:00Z</StartDate>
              <StopDate>2003-09-30T11:55:00Z</StopDate>
          </TimeSpan>
-      <Cadence>300s</Cadence></TemporalDescription>
-      <ObservedRegion/>
+      <Cadence>PT300S</Cadence>
+      </TemporalDescription>
+      <ObservedRegion>Jupiter</ObservedRegion>
       <Caveats>
       </Caveats>    
 <Parameter>
@@ -59,7 +55,6 @@
       <Size>3</Size>
       <Element>
          <Name>br_sys3</Name>
-         <Qualifier/>
          <Index>1</Index>
          <ParameterKey>gll_khurana_bsys3(0)</ParameterKey>
          <ValidMin/>
@@ -68,7 +63,6 @@
       </Element>
       <Element>
          <Name>bt_sys3</Name>
-         <Qualifier/>
          <Index>2</Index>
          <ParameterKey>gll_khurana_bsys3(1)</ParameterKey>
          <ValidMin/>
@@ -77,7 +71,6 @@
       </Element>
       <Element>
          <Name>bp_sys3</Name>
-         <Qualifier/>
          <Index>3</Index>
          <ParameterKey>gll_khurana_bsys3(2)</ParameterKey>
          <ValidMin/>
diff --git a/NumericalData/AMDA/Galileo/Models/gll-mod-onera.xml b/NumericalData/AMDA/Galileo/Models/gll-mod-onera.xml
index 2876648..f073d33 100644
--- a/NumericalData/AMDA/Galileo/Models/gll-mod-onera.xml
+++ b/NumericalData/AMDA/Galileo/Models/gll-mod-onera.xml
@@ -5,21 +5,19 @@
       <ResourceID>spase://CDPP/NumericalData/AMDA/Galileo/Models/gll-mod-onera</ResourceID>
       <ResourceHeader>
          <ResourceName>ONERA Model</ResourceName>
-         <ReleaseDate>2015-10-12T10:48:29Z</ReleaseDate>
-         <Description>                        
-         </Description>
-         <Acknowledgement>            
-         </Acknowledgement>
+         <ReleaseDate>2018-10-12T10:48:29Z</ReleaseDate>
+         <Description>Data provided to CDPP from ONERA. 
+         Magnetic  parameters  linked  to  the  position  of  the  spaceraft  (L,  B,  Beq,...)  have  been  calculated  with  a  
+         library developed at ONERA and using Khurana magnetic field model.</Description>                                
+         <Acknowledgement/>                     
          <Contact>        
-            <PersonID/>
-            <Role/>
+            <PersonID>spase://CDPP/Person/A.Sicard</PersonID>
+            <Role>DataProducer</Role>
          </Contact>
          <InformationURL>
-           <Name/>
-           <URL>              
-           </URL>
-           <Description>             
-           </Description>
+           <Name>ONERA report : Jupiter data base for AMDA</Name>
+           <URL>http://amda.irap.omp.eu/help/parameters/doc/ONERA_Jupiter_plasma_db_for_AMDA.pdf</URL>
+           <Description/>                       
          </InformationURL>       
       </ResourceHeader>
       <AccessInformation>
@@ -28,25 +26,96 @@
          <AccessRights>Restricted</AccessRights>
          <AccessURL>
             <Name>AMDA at CDPP</Name>
-            <URL>
-                http://amda.cdpp.eu
-            </URL>
+            <URL>http://amda.cdpp.eu</URL>
          </AccessURL>
-         <Format/>
+         <Format>NetCDF</Format>
          <Acknowledgement>           
          </Acknowledgement>
       </AccessInformation>
       <ProviderName/> 
       <InstrumentID>spase://CDPP/Instrument/AMDA/Galileo/Models</InstrumentID>
-      <MeasurementType/>
+      <MeasurementType>Model</MeasurementType>
       <TemporalDescription>
          <TimeSpan>
              <StartDate>1996-05-27T00:25:50Z</StartDate>
              <StopDate>2003-09-21T18:15:57Z</StopDate>
          </TimeSpan>
-      <Cadence_Min>114s</Cadence_Min><Cadence_Max>685s</Cadence_Max></TemporalDescription>
-      <ObservedRegion/>
-      <Caveats>
-      </Caveats>    
-<Parameter><Name>b_calc</Name><ParameterKey>gll_onera_bcalc</ParameterKey><Description/><Ucd/><Units>nT</Units><UnitsConversion/></Parameter><Parameter><Name>b_eq</Name><ParameterKey>gll_onera_beq</ParameterKey><Description/><Ucd/><Units>nT</Units><UnitsConversion/></Parameter><Parameter><Name>L</Name><ParameterKey>gll_onera_l</ParameterKey><Description/><Ucd/><Units>Rj</Units><UnitsConversion/></Parameter><Parameter><Name>L*</Name><ParameterKey>gll_onera_lstar</ParameterKey><Description/><Ucd/><Units>Rj</Units><UnitsConversion/></Parameter><Parameter><Name>I</Name><ParameterKey>gll_onera_i</ParameterKey><Description/><Ucd/><Units/><UnitsConversion/></Parameter><Parameter><Name>MLT</Name><ParameterKey>gll_onera_mlt</ParameterKey><Description/><Ucd/><Units>h</Units><UnitsConversion/></Parameter><Parameter><Name>Alpha</Name><ParameterKey>gll_onera_alpha</ParameterKey><Description/><Ucd/><Units>deg</Units><UnitsConversion/></Parameter><Parameter><Name>Alpha_Eq</Name><ParameterKey>gll_onera_alphaeq</ParameterKey><Description/><Ucd/><Units>deg</Units><UnitsConversion/></Parameter></NumericalData>
+      <Cadence_Min>PT114S</Cadence_Min>
+         <Cadence_Max>PT685S</Cadence_Max>
+      </TemporalDescription>
+      <ObservedRegion>Jupiter</ObservedRegion>
+      <Caveats> Magnetic parameters: 
+         * B_Calc (magnitude of B local) 
+         * B_Eq (magnitude of B equatorial) 
+         * L (McIlwain parameter) 
+         * L*  (another way to compute L)
+         * I 
+         * MLT (Magnetic Local Time) 
+         * Alpha (local pitch angle) 
+         * Alpha_Eq (equatorial pitch angle) 
+      </Caveats>          
+<Parameter>
+   <Name>b_calc</Name>
+   <ParameterKey>gll_onera_bcalc</ParameterKey>
+   <Description/>
+   <Ucd/>
+   <Units>nT</Units>
+   <UnitsConversion/>
+</Parameter>
+      <Parameter>
+         <Name>b_eq</Name>
+         <ParameterKey>gll_onera_beq</ParameterKey>
+         <Description/>
+         <Ucd/>
+         <Units>nT</Units>
+         <UnitsConversion/>
+      </Parameter>
+      <Parameter>
+         <Name>L</Name>
+         <ParameterKey>gll_onera_l</ParameterKey>
+         <Description/>
+         <Ucd/>
+         <Units>Rj</Units>
+         <UnitsConversion/>
+      </Parameter>
+      <Parameter>
+         <Name>L*</Name>
+         <ParameterKey>gll_onera_lstar</ParameterKey>
+         <Description/>
+         <Ucd/>
+         <Units>Rj</Units>
+         <UnitsConversion/>
+      </Parameter>
+      <Parameter>
+         <Name>I</Name>
+         <ParameterKey>gll_onera_i</ParameterKey>
+         <Description/>
+         <Ucd/>
+         <Units/>
+         <UnitsConversion/>
+      </Parameter>
+      <Parameter>
+         <Name>MLT</Name>
+         <ParameterKey>gll_onera_mlt</ParameterKey>
+         <Description/>
+         <Ucd/>
+         <Units>h</Units>
+         <UnitsConversion/>
+      </Parameter>
+      <Parameter>
+         <Name>alpha</Name>
+         <ParameterKey>gll_onera_alpha</ParameterKey>
+         <Description/>
+         <Ucd/>
+         <Units>deg</Units>
+         <UnitsConversion/>
+      </Parameter>
+      <Parameter><Name>alpha_eq</Name>
+         <ParameterKey>gll_onera_alphaeq</ParameterKey>
+         <Description/>
+         <Ucd/>
+         <Units>deg</Units>
+         <UnitsConversion/>
+      </Parameter>
+   </NumericalData>
 </Spase>
diff --git a/Person/A.Sicard.xml b/Person/A.Sicard.xml
new file mode 100644
index 0000000..fc47f0e
--- /dev/null
+++ b/Person/A.Sicard.xml
@@ -0,0 +1,9 @@
+<?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_0.xsd">
+  <Version>2.2.0</Version>
+  <Person>
+    <ResourceID>spase://CDPP/Person/A.Sicard</ResourceID>
+    <PersonName>A. Sicard-Piet</PersonName>
+    <OrganizationName>ONERA, Toulouse, France</OrganizationName>
+  </Person>
+</Spase>
diff --git a/Person/Krishan.Khurana.xml b/Person/Krishan.Khurana.xml
new file mode 100644
index 0000000..594636c
--- /dev/null
+++ b/Person/Krishan.Khurana.xml
@@ -0,0 +1,10 @@
+<?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_0.xsd">
+  <Version>2.2.0</Version>
+  <Person>
+    <ResourceID>spase://CDPP/Person/Krishan.Khurana</ResourceID>
+    <PersonName>Dr. Krishan Khurana</PersonName>
+    <OrganizationName>UGPP, UCLA, US</OrganizationName>
+    <Email>kkhurana@igpp.ucla.edu</Email>
+  </Person>
+</Spase>
--
libgit2 0.21.2