CDPP / CNES

Commit cd3a5540771afdaca2c6bfd4c94bef59eb4db578

Authored by Alexandre Schulz
1 parent 7ed1ebd0
Exists in juice_jdc and in 5 other branches amdadev, aschulz, autocommit, cleanup_registry_master, cleanup_registry_merged

Redmine #8961 : mise en cohérence des noms de champs magnétiques, modifications … 

…approtées a omni-1min-all, omni-5min-all, omni-hour-all
Showing 3 changed files with 18 additions and 21 deletions   Show diff stats
Inline Side-by-side
NumericalData/CDPP-AMDA/OMNI/omni-1min-all.xml
  Diff comments   View file @cd3a554
1 -<?xml version="1.0" encoding="UTF-8"?>  
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://amda.irap.omp.eu/public/schemas/spase-2_3_1.xsd"> 1 <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://amda.irap.omp.eu/public/schemas/spase-2_3_1.xsd">
3 <Version>2.3.1</Version> 2 <Version>2.3.1</Version>
4 <NumericalData> 3 <NumericalData>
@@ -10,7 +9,7 @@ @@ -10,7 +9,7 @@
10 <Description>1 min averaged, multi-source, near-Earth solar wind magnetic 9 <Description>1 min averaged, multi-source, near-Earth solar wind magnetic
11 field, plasma and energetic proton flux data, plus AE, AU, AL, Kp, ap, and Dst 10 field, plasma and energetic proton flux data, plus AE, AU, AL, Kp, ap, and Dst
12 geomagnetic indices, Polar Cap (Thule) index, F10.7 index, and Rz (sunspot number). 11 geomagnetic indices, Polar Cap (Thule) index, F10.7 index, and Rz (sunspot number).
13 - The ram pressure is calculated using P=rho*Np*Vp², where rho=1.672622*(1+4*(1/(1-He++_ratio)-1)). 12 + The ram pressure is calculated using P=rho*Np*Vp&#178;, where rho=1.672622*(1+4*(1/(1-He++_ratio)-1)).
14 We use rho=2 here, which corresponds to a ratio of He++ between 4% and 5%. 13 We use rho=2 here, which corresponds to a ratio of He++ between 4% and 5%.
15 </Description> 14 </Description>
16 <Acknowledgement>We acknowledge the experiment teams that acquired, processed 15 <Acknowledgement>We acknowledge the experiment teams that acquired, processed
@@ -56,9 +55,9 @@ for creating the OMNI data set.&lt;/Acknowledgement&gt; @@ -56,9 +55,9 @@ for creating the OMNI data set.&lt;/Acknowledgement&gt;
56 </TemporalDescription> 55 </TemporalDescription>
57 <ObservedRegion>Heliosphere.NearEarth</ObservedRegion> 56 <ObservedRegion>Heliosphere.NearEarth</ObservedRegion>
58 <Parameter> 57 <Parameter>
59 - <Name>sw |b|</Name> 58 + <Name>|b|</Name>
60 <ParameterKey>omni1_imf_mag</ParameterKey> 59 <ParameterKey>omni1_imf_mag</ParameterKey>
61 - <Description/> 60 + <Description />
62 <Ucd>phys.magField</Ucd> 61 <Ucd>phys.magField</Ucd>
63 <Units>nT</Units> 62 <Units>nT</Units>
64 <RenderingHints> 63 <RenderingHints>
@@ -71,7 +70,7 @@ for creating the OMNI data set.&lt;/Acknowledgement&gt; @@ -71,7 +70,7 @@ for creating the OMNI data set.&lt;/Acknowledgement&gt;
71 </Field> 70 </Field>
72 </Parameter> 71 </Parameter>
73 <Parameter> 72 <Parameter>
74 - <Name>sw b_gse</Name> 73 + <Name>b_gse</Name>
75 <ParameterKey>omni1_imf</ParameterKey> 74 <ParameterKey>omni1_imf</ParameterKey>
76 <Ucd>phys.magField</Ucd> 75 <Ucd>phys.magField</Ucd>
77 <Units>nT</Units> 76 <Units>nT</Units>
@@ -209,4 +208,4 @@ for creating the OMNI data set.&lt;/Acknowledgement&gt; @@ -209,4 +208,4 @@ for creating the OMNI data set.&lt;/Acknowledgement&gt;
209 </Particle> 208 </Particle>
210 </Parameter> 209 </Parameter>
211 </NumericalData> 210 </NumericalData>
212 -</Spase> 211 -</Spase>
  212 +</Spase>
213 \ No newline at end of file 213 \ No newline at end of file
NumericalData/CDPP-AMDA/OMNI/omni-5min-all.xml
  Diff comments   View file @cd3a554
1 -<?xml version="1.0" encoding="UTF-8"?>  
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://amda.irap.omp.eu/public/schemas/spase-2_3_1.xsd"> 1 <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://amda.irap.omp.eu/public/schemas/spase-2_3_1.xsd">
3 <Version>2.3.1</Version> 2 <Version>2.3.1</Version>
4 <NumericalData> 3 <NumericalData>
@@ -54,9 +53,9 @@ for creating the OMNI data set.&lt;/Acknowledgement&gt; @@ -54,9 +53,9 @@ for creating the OMNI data set.&lt;/Acknowledgement&gt;
54 </TemporalDescription> 53 </TemporalDescription>
55 <ObservedRegion>Heliosphere.NearEarth</ObservedRegion> 54 <ObservedRegion>Heliosphere.NearEarth</ObservedRegion>
56 <Parameter> 55 <Parameter>
57 - <Name>sw |b|</Name> 56 + <Name>|b|</Name>
58 <ParameterKey>omni5_imf_mag</ParameterKey> 57 <ParameterKey>omni5_imf_mag</ParameterKey>
59 - <Description/> 58 + <Description />
60 <Ucd>phys.magField</Ucd> 59 <Ucd>phys.magField</Ucd>
61 <Units>nT</Units> 60 <Units>nT</Units>
62 <RenderingHints> 61 <RenderingHints>
@@ -68,7 +67,7 @@ for creating the OMNI data set.&lt;/Acknowledgement&gt; @@ -68,7 +67,7 @@ for creating the OMNI data set.&lt;/Acknowledgement&gt;
68 </Field> 67 </Field>
69 </Parameter> 68 </Parameter>
70 <Parameter> 69 <Parameter>
71 - <Name>sw b_gse</Name> 70 + <Name>b_gse</Name>
72 <ParameterKey>omni5_imf</ParameterKey> 71 <ParameterKey>omni5_imf</ParameterKey>
73 <Ucd>phys.magField</Ucd> 72 <Ucd>phys.magField</Ucd>
74 <Units>nT</Units> 73 <Units>nT</Units>
@@ -231,7 +230,7 @@ for creating the OMNI data set.&lt;/Acknowledgement&gt; @@ -231,7 +230,7 @@ for creating the OMNI data set.&lt;/Acknowledgement&gt;
231 <Parameter> 230 <Parameter>
232 <Name>sw integral proton fluxes</Name> 231 <Name>sw integral proton fluxes</Name>
233 <ParameterKey>omni_5min_pflux</ParameterKey> 232 <ParameterKey>omni_5min_pflux</ParameterKey>
234 - <Ucd/> 233 + <Ucd />
235 <RenderingHints> 234 <RenderingHints>
236 <DisplayType>StackPlot</DisplayType> 235 <DisplayType>StackPlot</DisplayType>
237 </RenderingHints> 236 </RenderingHints>
@@ -255,4 +254,4 @@ for creating the OMNI data set.&lt;/Acknowledgement&gt; @@ -255,4 +254,4 @@ for creating the OMNI data set.&lt;/Acknowledgement&gt;
255 </Structure> 254 </Structure>
256 </Parameter> 255 </Parameter>
257 </NumericalData> 256 </NumericalData>
258 -</Spase> 257 -</Spase>
  258 +</Spase>
259 \ No newline at end of file 259 \ No newline at end of file
NumericalData/CDPP-AMDA/OMNI/omni-hour-all.xml
  Diff comments   View file @cd3a554
1 -<?xml version="1.0" encoding="UTF-8"?>  
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://amda.irap.omp.eu/public/schemas/spase-2_3_1.xsd"> 1 <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://amda.irap.omp.eu/public/schemas/spase-2_3_1.xsd">
3 <Version>2.3.1</Version> 2 <Version>2.3.1</Version>
4 <NumericalData> 3 <NumericalData>
@@ -54,9 +53,9 @@ for creating the OMNI data set.&lt;/Acknowledgement&gt; @@ -54,9 +53,9 @@ for creating the OMNI data set.&lt;/Acknowledgement&gt;
54 </TemporalDescription> 53 </TemporalDescription>
55 <ObservedRegion>Heliosphere.NearEarth</ObservedRegion> 54 <ObservedRegion>Heliosphere.NearEarth</ObservedRegion>
56 <Parameter> 55 <Parameter>
57 - <Name>sw average b magn</Name> 56 + <Name>|b|</Name>
58 <ParameterKey>omni_imf_mag</ParameterKey> 57 <ParameterKey>omni_imf_mag</ParameterKey>
59 - <Description/> 58 + <Description />
60 <Ucd>phys.magField</Ucd> 59 <Ucd>phys.magField</Ucd>
61 <Units>nT</Units> 60 <Units>nT</Units>
62 <RenderingHints> 61 <RenderingHints>
@@ -70,7 +69,7 @@ for creating the OMNI data set.&lt;/Acknowledgement&gt; @@ -70,7 +69,7 @@ for creating the OMNI data set.&lt;/Acknowledgement&gt;
70 <Parameter> 69 <Parameter>
71 <Name>sw average b magn (vec)</Name> 70 <Name>sw average b magn (vec)</Name>
72 <ParameterKey>omni_imf_mag_vec</ParameterKey> 71 <ParameterKey>omni_imf_mag_vec</ParameterKey>
73 - <Description/> 72 + <Description />
74 <Ucd>phys.magField</Ucd> 73 <Ucd>phys.magField</Ucd>
75 <Units>nT</Units> 74 <Units>nT</Units>
76 <RenderingHints> 75 <RenderingHints>
@@ -82,7 +81,7 @@ for creating the OMNI data set.&lt;/Acknowledgement&gt; @@ -82,7 +81,7 @@ for creating the OMNI data set.&lt;/Acknowledgement&gt;
82 </Field> 81 </Field>
83 </Parameter> 82 </Parameter>
84 <Parameter> 83 <Parameter>
85 - <Name>sw b_gse</Name> 84 + <Name>b_gse</Name>
86 <ParameterKey>omni_imf</ParameterKey> 85 <ParameterKey>omni_imf</ParameterKey>
87 <Ucd>phys.magField</Ucd> 86 <Ucd>phys.magField</Ucd>
88 <Units>nT</Units> 87 <Units>nT</Units>
@@ -268,8 +267,8 @@ for creating the OMNI data set.&lt;/Acknowledgement&gt; @@ -268,8 +267,8 @@ for creating the OMNI data set.&lt;/Acknowledgement&gt;
268 <Parameter> 267 <Parameter>
269 <Name>F10.7 solar index</Name> 268 <Name>F10.7 solar index</Name>
270 <ParameterKey>omni_f107</ParameterKey> 269 <ParameterKey>omni_f107</ParameterKey>
271 - <Description/>  
272 - <Ucd/> 270 + <Description />
  271 + <Ucd />
273 <Units>10e-22 W/m^2/Hz</Units> 272 <Units>10e-22 W/m^2/Hz</Units>
274 <RenderingHints> 273 <RenderingHints>
275 <DisplayType>TimeSeries</DisplayType> 274 <DisplayType>TimeSeries</DisplayType>
@@ -281,7 +280,7 @@ for creating the OMNI data set.&lt;/Acknowledgement&gt; @@ -281,7 +280,7 @@ for creating the OMNI data set.&lt;/Acknowledgement&gt;
281 <Parameter> 280 <Parameter>
282 <Name>sw integral proton fluxes</Name> 281 <Name>sw integral proton fluxes</Name>
283 <ParameterKey>omni_hour_pflux</ParameterKey> 282 <ParameterKey>omni_hour_pflux</ParameterKey>
284 - <Description/> 283 + <Description />
285 <Ucd>phys.count</Ucd> 284 <Ucd>phys.count</Ucd>
286 <RenderingHints> 285 <RenderingHints>
287 <DisplayType>StackPlot</DisplayType> 286 <DisplayType>StackPlot</DisplayType>
@@ -324,4 +323,4 @@ for creating the OMNI data set.&lt;/Acknowledgement&gt; @@ -324,4 +323,4 @@ for creating the OMNI data set.&lt;/Acknowledgement&gt;
324 </Support> 323 </Support>
325 </Parameter> 324 </Parameter>
326 </NumericalData> 325 </NumericalData>
327 -</Spase> 326 -</Spase>
  327 +</Spase>
328 \ No newline at end of file 328 \ No newline at end of file