From 1f40e75f4d58068f0110a58d2903409000b477e8 Mon Sep 17 00:00:00 2001
From: Benjamin Renard <benjamin.renard@irap.omp.eu>
Date: Thu, 22 Feb 2024 09:30:50 +0000
Subject: [PATCH] Merge MSHELL datasets from amdadev

---
 NumericalData/CDPP-AMDA/Galileo/Models/gll-jrm33-model.xml    |   6 ------
 NumericalData/CDPP-AMDA/Galileo/Models/gll-mod-mshell.xml     |  93 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 NumericalData/CDPP-AMDA/Juice/Models/juice30-jrm09-model.xml  |  54 +++++++++++++++++++++++++++---------------------------
 NumericalData/CDPP-AMDA/Juice/Models/juice30-jrm33-model.xml  |  66 ++++++++++++++++++++++++++++++------------------------------------
 NumericalData/CDPP-AMDA/Juice/Models/juice32-jrm09-model.xml  |  55 ++++++++++++++++++++++++++++---------------------------
 NumericalData/CDPP-AMDA/Juice/Models/juice32-jrm33-model.xml  |  66 ++++++++++++++++++++++++++++++------------------------------------
 NumericalData/CDPP-AMDA/Juice/Models/juice41-jrm09-model.xml  |  54 +++++++++++++++++++++++++++---------------------------
 NumericalData/CDPP-AMDA/Juice/Models/juice41-jrm33-model.xml  |  66 ++++++++++++++++++++++++++++++------------------------------------
 NumericalData/CDPP-AMDA/Juice/Models/juice51-jrm09-model.xml  |   2 +-
 NumericalData/CDPP-AMDA/Juice/Models/juice51-jrm33-model.xml  |   8 +-------
 NumericalData/CDPP-AMDA/Juice/Models/juice51-jrm33-mshell.xml |  98 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 NumericalData/CDPP-AMDA/Juno/Models/jun-jrm09-model.xml       |  58 +++++++++++++++++++++++++++++-----------------------------
 NumericalData/CDPP-AMDA/Juno/Models/jun-jrm33-model.xml       |  64 +++++++++++++++++++++++++++++-----------------------------------
 NumericalData/CDPP-AMDA/Juno/Models/jun-jrm33-mshell.xml      | 101 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 14 files changed, 524 insertions(+), 267 deletions(-)
 create mode 100644 NumericalData/CDPP-AMDA/Galileo/Models/gll-mod-mshell.xml
 create mode 100644 NumericalData/CDPP-AMDA/Juice/Models/juice51-jrm33-mshell.xml
 create mode 100644 NumericalData/CDPP-AMDA/Juno/Models/jun-jrm33-mshell.xml

diff --git a/NumericalData/CDPP-AMDA/Galileo/Models/gll-jrm33-model.xml b/NumericalData/CDPP-AMDA/Galileo/Models/gll-jrm33-model.xml
index 73c1320..faa8f9b 100644
--- a/NumericalData/CDPP-AMDA/Galileo/Models/gll-jrm33-model.xml
+++ b/NumericalData/CDPP-AMDA/Galileo/Models/gll-jrm33-model.xml
@@ -78,14 +78,10 @@
       <Cadence>PT1M</Cadence>
     </TemporalDescription>
     <ObservedRegion>Jupiter</ObservedRegion>
-    <Caveats/>
     <Parameter>
       <Name>b_iau_jup</Name>
       <ParameterKey>b_jrm33_con_60_1_gll_xyz_iau</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>nT</Units>
-      <UnitsConversion/>
       <Structure>
         <Size>3</Size>
         <Element>
@@ -114,8 +110,6 @@
     <Parameter>
       <Name>|b|</Name>
       <ParameterKey>b_jrm33_con_tot_60_1_gll_xyz_iau</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>nT</Units>
       <Field>
         <FieldQuantity>Magnetic</FieldQuantity>
diff --git a/NumericalData/CDPP-AMDA/Galileo/Models/gll-mod-mshell.xml b/NumericalData/CDPP-AMDA/Galileo/Models/gll-mod-mshell.xml
new file mode 100644
index 0000000..4d41aac
--- /dev/null
+++ b/NumericalData/CDPP-AMDA/Galileo/Models/gll-mod-mshell.xml
@@ -0,0 +1,93 @@
+<?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://www.spase-group.org/data/schema/spase-2.4.1.xsd">
+  <Version>2.4.1</Version>
+  <NumericalData>
+    <ResourceID>spase://CNES/NumericalData/CDPP-AMDA/Galileo/Models/gll-mod-mshell</ResourceID>
+    <ResourceHeader>
+      <ResourceName>JRM33 + Con2020 M-Shell</ResourceName>
+      <AlternateName>JRM33 + Con2020 M-Shell</AlternateName>
+      <ReleaseDate>2024-02-15T01:01:36Z</ReleaseDate>
+      <Description>Galileo M-Shell calculated with JRM33+CON2020 between 1995-12-01 and 2003-09-21.
+                Spatial resolution is 1/250Rj ~ 300 km. Outer boundary is set to R = 40 Rj.
+      </Description>
+      <Contact>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Jonas.Rabia</PersonID>
+        <Role>DataProducer</Role>
+      </Contact>
+    </ResourceHeader>
+    <AccessInformation>
+         <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
+         <Availability>Online</Availability>
+         <AccessRights>Open</AccessRights>
+         <AccessURL>
+            <Name>CDPP/AMDA HAPI Server</Name>
+            <URL>http://amda.irap.omp.eu/service/hapi</URL>
+            <Style>HAPI</Style>
+            <Description>Web Service to this product using the HAPI interface.</Description>
+         </AccessURL>
+         <Format>CSV</Format>
+         <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Données de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Université Paul Sabatier, Toulouse".. See the Rules of the road at http://amda.cdpp.eu/help/policy.html. Please acknowledge the Data Providers.</Acknowledgement>
+      </AccessInformation>
+    <AccessInformation>
+         <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
+         <Availability>Online</Availability>
+         <AccessRights>Open</AccessRights>
+         <AccessURL>
+            <Name>CDPP/AMDA Web application</Name>
+            <URL>http://amda.cdpp.eu</URL>
+            <Description>Access to Data via CDPP/AMDA Web application.</Description>
+         </AccessURL>
+         <Format>CSV</Format>
+         <Format>VOTable</Format>
+         <Format>CDF</Format>
+         <Format>PNG</Format>
+         <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Données de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Université Paul Sabatier, Toulouse".. See the Rules of the road at http://amda.cdpp.eu/help/policy.html. Please acknowledge the Data Providers.</Acknowledgement>
+      </AccessInformation>
+    <ProviderName>IRAP</ProviderName>
+    <InstrumentID>spase://CNES/Instrument/CDPP-AMDA/Galileo/Models</InstrumentID>
+    <MeasurementType>MagneticField</MeasurementType>
+    <TemporalDescription>
+      <TimeSpan>
+        <StartDate>1995-12-01T00:00:00Z</StartDate>
+        <StopDate>2003-09-21T00:00:00Z</StopDate>
+      </TimeSpan>
+      <Cadence>PT15M</Cadence>
+    </TemporalDescription>
+    <ObservedRegion>Jupiter</ObservedRegion>
+    <Parameter>
+      <Name>M-Shell</Name>
+      <ParameterKey>mshell_gll_m</ParameterKey>
+      <Description>M-Shell - Radial distance intersection field line/magnetic equator</Description>
+      <Support>
+        <SupportQuantity>Other</SupportQuantity>
+      </Support>
+    </Parameter>
+    <Parameter>
+      <Name>colatitude</Name>
+      <ParameterKey>mshell_gll_t</ParameterKey>
+      <Description>Colatitude intersection field line/magnetic equator</Description>
+      <Units>deg</Units>
+      <Support>
+        <SupportQuantity>Positional</SupportQuantity>
+      </Support>
+    </Parameter>
+    <Parameter>
+      <Name>longitude</Name>
+      <ParameterKey>mshell_gll_p</ParameterKey>
+      <Description>Colatitude intersection field line/magnetic equator</Description>
+      <Units>deg</Units>
+      <Support>
+        <SupportQuantity>Positional</SupportQuantity>
+      </Support>
+    </Parameter>
+    <Parameter>
+      <Name>distance</Name>
+      <ParameterKey>mshell_gll_s</ParameterKey>
+      <Description>Distance along the field line between SC/magnetic equator</Description>
+      <Units>Rj</Units>
+      <Support>
+        <SupportQuantity>Positional</SupportQuantity>
+      </Support>
+    </Parameter>
+  </NumericalData>
+</Spase>
diff --git a/NumericalData/CDPP-AMDA/Juice/Models/juice30-jrm09-model.xml b/NumericalData/CDPP-AMDA/Juice/Models/juice30-jrm09-model.xml
index dc3c0c1..b0e028f 100644
--- a/NumericalData/CDPP-AMDA/Juice/Models/juice30-jrm09-model.xml
+++ b/NumericalData/CDPP-AMDA/Juice/Models/juice30-jrm09-model.xml
@@ -24,38 +24,38 @@
       <Association>
         <AssociationID>juice-jrm09-model</AssociationID>
         <AssociationType>PartOf</AssociationType>
-        <Note>JRM09 + CAN</Note>
+        <Note>JRM09 + CAN field model</Note>
       </Association>
       <PriorID>juice-jup-cr30</PriorID>
     </ResourceHeader>
     <AccessInformation>
-      <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
-      <Availability>Online</Availability>
-      <AccessRights>Open</AccessRights>
-      <AccessURL>
-        <Name>CDPP/AMDA HAPI Server</Name>
-        <URL>http://amda.irap.omp.eu/service/hapi</URL>
-        <Style>HAPI</Style>
-        <Description>Web Service to this product using the HAPI interface.</Description>
-      </AccessURL>
-      <Format>CSV</Format>
-      <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Données de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Université Paul Sabatier, Toulouse".. See the Rules of the road at http://amda.cdpp.eu/help/policy.html. Please acknowledge the Data Providers.</Acknowledgement>
-    </AccessInformation>
+         <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
+         <Availability>Online</Availability>
+         <AccessRights>Open</AccessRights>
+         <AccessURL>
+            <Name>CDPP/AMDA HAPI Server</Name>
+            <URL>http://amda.irap.omp.eu/service/hapi</URL>
+            <Style>HAPI</Style>
+            <Description>Web Service to this product using the HAPI interface.</Description>
+         </AccessURL>
+         <Format>CSV</Format>
+         <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Données de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Université Paul Sabatier, Toulouse".. See the Rules of the road at http://amda.cdpp.eu/help/policy.html. Please acknowledge the Data Providers.</Acknowledgement>
+      </AccessInformation>
     <AccessInformation>
-      <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
-      <Availability>Online</Availability>
-      <AccessRights>Open</AccessRights>
-      <AccessURL>
-        <Name>CDPP/AMDA Web application</Name>
-        <URL>http://amda.cdpp.eu</URL>
-        <Description>Access to Data via CDPP/AMDA Web application.</Description>
-      </AccessURL>
-      <Format>CSV</Format>
-      <Format>VOTable</Format>
-      <Format>CDF</Format>
-      <Format>PNG</Format>
-      <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Données de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Université Paul Sabatier, Toulouse".. See the Rules of the road at http://amda.cdpp.eu/help/policy.html. Please acknowledge the Data Providers.</Acknowledgement>
-    </AccessInformation>
+         <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
+         <Availability>Online</Availability>
+         <AccessRights>Open</AccessRights>
+         <AccessURL>
+            <Name>CDPP/AMDA Web application</Name>
+            <URL>http://amda.cdpp.eu</URL>
+            <Description>Access to Data via CDPP/AMDA Web application.</Description>
+         </AccessURL>
+         <Format>CSV</Format>
+         <Format>VOTable</Format>
+         <Format>CDF</Format>
+         <Format>PNG</Format>
+         <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Données de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Université Paul Sabatier, Toulouse".. See the Rules of the road at http://amda.cdpp.eu/help/policy.html. Please acknowledge the Data Providers.</Acknowledgement>
+      </AccessInformation>
     <ProviderName>IRAP</ProviderName>
     <InstrumentID>spase://CNES/Instrument/CDPP-AMDA/Juice/Models</InstrumentID>
     <MeasurementType>MagneticField</MeasurementType>
diff --git a/NumericalData/CDPP-AMDA/Juice/Models/juice30-jrm33-model.xml b/NumericalData/CDPP-AMDA/Juice/Models/juice30-jrm33-model.xml
index 2830084..2a9ba48 100644
--- a/NumericalData/CDPP-AMDA/Juice/Models/juice30-jrm33-model.xml
+++ b/NumericalData/CDPP-AMDA/Juice/Models/juice30-jrm33-model.xml
@@ -6,7 +6,7 @@
     <ResourceHeader>
       <ResourceName>CReMA 3.0</ResourceName>
       <AlternateName>JRM33 + Con2020 jovian magnetic field model</AlternateName>
-      <ReleaseDate>2020-06-29T13:30:35Z</ReleaseDate>
+      <ReleaseDate>2020-03-18T01:01:36Z</ReleaseDate>
       <Description>Magnetic field along s/c orbit is being real-time calculated. 
          S/C and sampling time should be defined by user. 
          
@@ -40,57 +40,53 @@
       <Association>
         <AssociationID>juice-jrm33-model</AssociationID>
         <AssociationType>PartOf</AssociationType>
-        <Note>JRM33 + Con2020</Note>
+        <Note>JRM33 + Con2020 field model</Note>
       </Association>
       <PriorID>juice-jup-cr30</PriorID>
     </ResourceHeader>
     <AccessInformation>
-      <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
-      <Availability>Online</Availability>
-      <AccessRights>Open</AccessRights>
-      <AccessURL>
-        <Name>CDPP/AMDA HAPI Server</Name>
-        <URL>http://amda.irap.omp.eu/service/hapi</URL>
-        <Style>HAPI</Style>
-        <Description>Web Service to this product using the HAPI interface.</Description>
-      </AccessURL>
-      <Format>CSV</Format>
-      <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Données de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Université Paul Sabatier, Toulouse".. See the Rules of the road at http://amda.cdpp.eu/help/policy.html. Please acknowledge the Data Providers.</Acknowledgement>
-    </AccessInformation>
+         <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
+         <Availability>Online</Availability>
+         <AccessRights>Open</AccessRights>
+         <AccessURL>
+            <Name>CDPP/AMDA HAPI Server</Name>
+            <URL>http://amda.irap.omp.eu/service/hapi</URL>
+            <Style>HAPI</Style>
+            <Description>Web Service to this product using the HAPI interface.</Description>
+         </AccessURL>
+         <Format>CSV</Format>
+         <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Données de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Université Paul Sabatier, Toulouse".. See the Rules of the road at http://amda.cdpp.eu/help/policy.html. Please acknowledge the Data Providers.</Acknowledgement>
+      </AccessInformation>
     <AccessInformation>
-      <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
-      <Availability>Online</Availability>
-      <AccessRights>Open</AccessRights>
-      <AccessURL>
-        <Name>CDPP/AMDA Web application</Name>
-        <URL>http://amda.cdpp.eu</URL>
-        <Description>Access to Data via CDPP/AMDA Web application.</Description>
-      </AccessURL>
-      <Format>CSV</Format>
-      <Format>VOTable</Format>
-      <Format>CDF</Format>
-      <Format>PNG</Format>
-      <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Données de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Université Paul Sabatier, Toulouse".. See the Rules of the road at http://amda.cdpp.eu/help/policy.html. Please acknowledge the Data Providers.</Acknowledgement>
-    </AccessInformation>
+         <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
+         <Availability>Online</Availability>
+         <AccessRights>Open</AccessRights>
+         <AccessURL>
+            <Name>CDPP/AMDA Web application</Name>
+            <URL>http://amda.cdpp.eu</URL>
+            <Description>Access to Data via CDPP/AMDA Web application.</Description>
+         </AccessURL>
+         <Format>CSV</Format>
+         <Format>VOTable</Format>
+         <Format>CDF</Format>
+         <Format>PNG</Format>
+         <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Données de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Université Paul Sabatier, Toulouse".. See the Rules of the road at http://amda.cdpp.eu/help/policy.html. Please acknowledge the Data Providers.</Acknowledgement>
+      </AccessInformation>
     <ProviderName>IRAP</ProviderName>
     <InstrumentID>spase://CNES/Instrument/CDPP-AMDA/Juice/Models</InstrumentID>
     <MeasurementType>MagneticField</MeasurementType>
     <TemporalDescription>
       <TimeSpan>
-        <StartDate>2029-01-01T07:00:00Z</StartDate>
-        <StopDate>2033-06-04T00:00:00Z</StopDate>
+        <StartDate>2016-06-01T00:00:00Z</StartDate>
+        <StopDate>2021-05-05T23:49:59Z</StopDate>
       </TimeSpan>
       <Cadence>PT1M</Cadence>
     </TemporalDescription>
     <ObservedRegion>Jupiter</ObservedRegion>
-    <Caveats/>
     <Parameter>
       <Name>b_iau_jup</Name>
       <ParameterKey>b_jrm33_con_60_1_juice_jucr30_xyz</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>nT</Units>
-      <UnitsConversion/>
       <Structure>
         <Size>3</Size>
         <Element>
@@ -119,8 +115,6 @@
     <Parameter>
       <Name>|b|</Name>
       <ParameterKey>b_jrm33_con_tot_60_1_juice_jucr30_xyz</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>nT</Units>
       <Field>
         <FieldQuantity>Magnetic</FieldQuantity>
diff --git a/NumericalData/CDPP-AMDA/Juice/Models/juice32-jrm09-model.xml b/NumericalData/CDPP-AMDA/Juice/Models/juice32-jrm09-model.xml
index d5cff77..61d372e 100644
--- a/NumericalData/CDPP-AMDA/Juice/Models/juice32-jrm09-model.xml
+++ b/NumericalData/CDPP-AMDA/Juice/Models/juice32-jrm09-model.xml
@@ -24,38 +24,38 @@
       <Association>
         <AssociationID>juice-jrm09-model</AssociationID>
         <AssociationType>PartOf</AssociationType>
-        <Note>JRM09 + CAN</Note>
+        <Note>JRM09 + CAN field model</Note>
       </Association>
       <PriorID>juice-jup-cr32</PriorID>
     </ResourceHeader>
     <AccessInformation>
-      <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
-      <Availability>Online</Availability>
-      <AccessRights>Open</AccessRights>
-      <AccessURL>
-        <Name>CDPP/AMDA HAPI Server</Name>
-        <URL>http://amda.irap.omp.eu/service/hapi</URL>
-        <Style>HAPI</Style>
-        <Description>Web Service to this product using the HAPI interface.</Description>
-      </AccessURL>
-      <Format>CSV</Format>
-      <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Données de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Université Paul Sabatier, Toulouse".. See the Rules of the road at http://amda.cdpp.eu/help/policy.html. Please acknowledge the Data Providers.</Acknowledgement>
-    </AccessInformation>
+         <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
+         <Availability>Online</Availability>
+         <AccessRights>Open</AccessRights>
+         <AccessURL>
+            <Name>CDPP/AMDA HAPI Server</Name>
+            <URL>http://amda.irap.omp.eu/service/hapi</URL>
+            <Style>HAPI</Style>
+            <Description>Web Service to this product using the HAPI interface.</Description>
+         </AccessURL>
+         <Format>CSV</Format>
+         <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Données de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Université Paul Sabatier, Toulouse".. See the Rules of the road at http://amda.cdpp.eu/help/policy.html. Please acknowledge the Data Providers.</Acknowledgement>
+      </AccessInformation>
     <AccessInformation>
-      <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
-      <Availability>Online</Availability>
-      <AccessRights>Open</AccessRights>
-      <AccessURL>
-        <Name>CDPP/AMDA Web application</Name>
-        <URL>http://amda.cdpp.eu</URL>
-        <Description>Access to Data via CDPP/AMDA Web application.</Description>
-      </AccessURL>
-      <Format>CSV</Format>
-      <Format>VOTable</Format>
-      <Format>CDF</Format>
-      <Format>PNG</Format>
-      <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Données de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Université Paul Sabatier, Toulouse".. See the Rules of the road at http://amda.cdpp.eu/help/policy.html. Please acknowledge the Data Providers.</Acknowledgement>
-    </AccessInformation>
+         <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
+         <Availability>Online</Availability>
+         <AccessRights>Open</AccessRights>
+         <AccessURL>
+            <Name>CDPP/AMDA Web application</Name>
+            <URL>http://amda.cdpp.eu</URL>
+            <Description>Access to Data via CDPP/AMDA Web application.</Description>
+         </AccessURL>
+         <Format>CSV</Format>
+         <Format>VOTable</Format>
+         <Format>CDF</Format>
+         <Format>PNG</Format>
+         <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Données de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Université Paul Sabatier, Toulouse".. See the Rules of the road at http://amda.cdpp.eu/help/policy.html. Please acknowledge the Data Providers.</Acknowledgement>
+      </AccessInformation>
     <ProviderName>IRAP</ProviderName>
     <InstrumentID>spase://CNES/Instrument/CDPP-AMDA/Juice/Models</InstrumentID>
     <MeasurementType>MagneticField</MeasurementType>
@@ -67,6 +67,7 @@
       <Cadence>PT1M</Cadence>
     </TemporalDescription>
     <ObservedRegion>Jupiter</ObservedRegion>
+
     <Parameter>
       <Name>b_iau_jup</Name>
       <ParameterKey>b_jrm09_can_60_1_juice_jucr32_xyz</ParameterKey>
diff --git a/NumericalData/CDPP-AMDA/Juice/Models/juice32-jrm33-model.xml b/NumericalData/CDPP-AMDA/Juice/Models/juice32-jrm33-model.xml
index ac4fa73..e6dbfea 100644
--- a/NumericalData/CDPP-AMDA/Juice/Models/juice32-jrm33-model.xml
+++ b/NumericalData/CDPP-AMDA/Juice/Models/juice32-jrm33-model.xml
@@ -6,7 +6,7 @@
     <ResourceHeader>
       <ResourceName>CReMA 3.2</ResourceName>
       <AlternateName>JRM33 + Con2020 jovian magnetic field model</AlternateName>
-      <ReleaseDate>2020-06-29T13:32:20Z</ReleaseDate>
+      <ReleaseDate>2020-03-18T01:01:36Z</ReleaseDate>
       <Description>Magnetic field along s/c orbit is being real-time calculated. 
          S/C and sampling time should be defined by user. 
          
@@ -40,57 +40,53 @@
       <Association>
         <AssociationID>juice-jrm33-model</AssociationID>
         <AssociationType>PartOf</AssociationType>
-        <Note>JRM33 + Con2020</Note>
+        <Note>JRM33 + Con2020 field model</Note>
       </Association>
       <PriorID>juice-jup-cr32</PriorID>
     </ResourceHeader>
     <AccessInformation>
-      <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
-      <Availability>Online</Availability>
-      <AccessRights>Open</AccessRights>
-      <AccessURL>
-        <Name>CDPP/AMDA HAPI Server</Name>
-        <URL>http://amda.irap.omp.eu/service/hapi</URL>
-        <Style>HAPI</Style>
-        <Description>Web Service to this product using the HAPI interface.</Description>
-      </AccessURL>
-      <Format>CSV</Format>
-      <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Données de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Université Paul Sabatier, Toulouse".. See the Rules of the road at http://amda.cdpp.eu/help/policy.html. Please acknowledge the Data Providers.</Acknowledgement>
-    </AccessInformation>
+         <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
+         <Availability>Online</Availability>
+         <AccessRights>Open</AccessRights>
+         <AccessURL>
+            <Name>CDPP/AMDA HAPI Server</Name>
+            <URL>http://amda.irap.omp.eu/service/hapi</URL>
+            <Style>HAPI</Style>
+            <Description>Web Service to this product using the HAPI interface.</Description>
+         </AccessURL>
+         <Format>CSV</Format>
+         <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Données de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Université Paul Sabatier, Toulouse".. See the Rules of the road at http://amda.cdpp.eu/help/policy.html. Please acknowledge the Data Providers.</Acknowledgement>
+      </AccessInformation>
     <AccessInformation>
-      <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
-      <Availability>Online</Availability>
-      <AccessRights>Open</AccessRights>
-      <AccessURL>
-        <Name>CDPP/AMDA Web application</Name>
-        <URL>http://amda.cdpp.eu</URL>
-        <Description>Access to Data via CDPP/AMDA Web application.</Description>
-      </AccessURL>
-      <Format>CSV</Format>
-      <Format>VOTable</Format>
-      <Format>CDF</Format>
-      <Format>PNG</Format>
-      <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Données de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Université Paul Sabatier, Toulouse".. See the Rules of the road at http://amda.cdpp.eu/help/policy.html. Please acknowledge the Data Providers.</Acknowledgement>
-    </AccessInformation>
+         <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
+         <Availability>Online</Availability>
+         <AccessRights>Open</AccessRights>
+         <AccessURL>
+            <Name>CDPP/AMDA Web application</Name>
+            <URL>http://amda.cdpp.eu</URL>
+            <Description>Access to Data via CDPP/AMDA Web application.</Description>
+         </AccessURL>
+         <Format>CSV</Format>
+         <Format>VOTable</Format>
+         <Format>CDF</Format>
+         <Format>PNG</Format>
+         <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Données de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Université Paul Sabatier, Toulouse".. See the Rules of the road at http://amda.cdpp.eu/help/policy.html. Please acknowledge the Data Providers.</Acknowledgement>
+      </AccessInformation>
     <ProviderName>IRAP</ProviderName>
     <InstrumentID>spase://CNES/Instrument/CDPP-AMDA/Juice/Models</InstrumentID>
     <MeasurementType>MagneticField</MeasurementType>
     <TemporalDescription>
       <TimeSpan>
-        <StartDate>2028-01-01T07:00:00Z</StartDate>
-        <StopDate>2033-06-24T00:00:00Z</StopDate>
+        <StartDate>2016-06-01T00:00:00Z</StartDate>
+        <StopDate>2021-05-05T23:49:59Z</StopDate>
       </TimeSpan>
       <Cadence>PT1M</Cadence>
     </TemporalDescription>
     <ObservedRegion>Jupiter</ObservedRegion>
-    <Caveats/>
     <Parameter>
       <Name>b_iau_jup</Name>
       <ParameterKey>b_jrm33_con_60_1_juice_jucr32_xyz</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>nT</Units>
-      <UnitsConversion/>
       <Structure>
         <Size>3</Size>
         <Element>
@@ -119,8 +115,6 @@
     <Parameter>
       <Name>|b|</Name>
       <ParameterKey>b_jrm33_con_tot_60_1_juice_jucr32_xyz</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>nT</Units>
       <Field>
         <FieldQuantity>Magnetic</FieldQuantity>
diff --git a/NumericalData/CDPP-AMDA/Juice/Models/juice41-jrm09-model.xml b/NumericalData/CDPP-AMDA/Juice/Models/juice41-jrm09-model.xml
index 4beb554..d8d188e 100644
--- a/NumericalData/CDPP-AMDA/Juice/Models/juice41-jrm09-model.xml
+++ b/NumericalData/CDPP-AMDA/Juice/Models/juice41-jrm09-model.xml
@@ -24,38 +24,38 @@
       <Association>
         <AssociationID>juice-jrm09-model</AssociationID>
         <AssociationType>PartOf</AssociationType>
-        <Note>JRM09 + CAN</Note>
+        <Note>JRM09 + CAN field model</Note>
       </Association>
       <PriorID>juice-jup-cr41</PriorID>
     </ResourceHeader>
     <AccessInformation>
-      <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
-      <Availability>Online</Availability>
-      <AccessRights>Open</AccessRights>
-      <AccessURL>
-        <Name>CDPP/AMDA HAPI Server</Name>
-        <URL>http://amda.irap.omp.eu/service/hapi</URL>
-        <Style>HAPI</Style>
-        <Description>Web Service to this product using the HAPI interface.</Description>
-      </AccessURL>
-      <Format>CSV</Format>
-      <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Données de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Université Paul Sabatier, Toulouse".. See the Rules of the road at http://amda.cdpp.eu/help/policy.html. Please acknowledge the Data Providers.</Acknowledgement>
-    </AccessInformation>
+         <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
+         <Availability>Online</Availability>
+         <AccessRights>Open</AccessRights>
+         <AccessURL>
+            <Name>CDPP/AMDA HAPI Server</Name>
+            <URL>http://amda.irap.omp.eu/service/hapi</URL>
+            <Style>HAPI</Style>
+            <Description>Web Service to this product using the HAPI interface.</Description>
+         </AccessURL>
+         <Format>CSV</Format>
+         <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Données de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Université Paul Sabatier, Toulouse".. See the Rules of the road at http://amda.cdpp.eu/help/policy.html. Please acknowledge the Data Providers.</Acknowledgement>
+      </AccessInformation>
     <AccessInformation>
-      <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
-      <Availability>Online</Availability>
-      <AccessRights>Open</AccessRights>
-      <AccessURL>
-        <Name>CDPP/AMDA Web application</Name>
-        <URL>http://amda.cdpp.eu</URL>
-        <Description>Access to Data via CDPP/AMDA Web application.</Description>
-      </AccessURL>
-      <Format>CSV</Format>
-      <Format>VOTable</Format>
-      <Format>CDF</Format>
-      <Format>PNG</Format>
-      <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Données de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Université Paul Sabatier, Toulouse".. See the Rules of the road at http://amda.cdpp.eu/help/policy.html. Please acknowledge the Data Providers.</Acknowledgement>
-    </AccessInformation>
+         <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
+         <Availability>Online</Availability>
+         <AccessRights>Open</AccessRights>
+         <AccessURL>
+            <Name>CDPP/AMDA Web application</Name>
+            <URL>http://amda.cdpp.eu</URL>
+            <Description>Access to Data via CDPP/AMDA Web application.</Description>
+         </AccessURL>
+         <Format>CSV</Format>
+         <Format>VOTable</Format>
+         <Format>CDF</Format>
+         <Format>PNG</Format>
+         <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Données de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Université Paul Sabatier, Toulouse".. See the Rules of the road at http://amda.cdpp.eu/help/policy.html. Please acknowledge the Data Providers.</Acknowledgement>
+      </AccessInformation>
     <ProviderName>IRAP</ProviderName>
     <InstrumentID>spase://CNES/Instrument/CDPP-AMDA/Juice/Models</InstrumentID>
     <MeasurementType>MagneticField</MeasurementType>
diff --git a/NumericalData/CDPP-AMDA/Juice/Models/juice41-jrm33-model.xml b/NumericalData/CDPP-AMDA/Juice/Models/juice41-jrm33-model.xml
index 404b037..54550b0 100644
--- a/NumericalData/CDPP-AMDA/Juice/Models/juice41-jrm33-model.xml
+++ b/NumericalData/CDPP-AMDA/Juice/Models/juice41-jrm33-model.xml
@@ -6,7 +6,7 @@
     <ResourceHeader>
       <ResourceName>CReMa 4.1</ResourceName>
       <AlternateName>JRM33 + Con2020 jovian magnetic field model</AlternateName>
-      <ReleaseDate>2020-06-29T13:34:03Z</ReleaseDate>
+      <ReleaseDate>2020-03-18T01:01:36Z</ReleaseDate>
       <Description>Magnetic field along s/c orbit is being real-time calculated. 
          S/C and sampling time should be defined by user. 
          
@@ -40,57 +40,53 @@
       <Association>
         <AssociationID>juice-jrm33-model</AssociationID>
         <AssociationType>PartOf</AssociationType>
-        <Note>JRM33 + Con2020</Note>
+        <Note>JRM33 + Con2020 field model</Note>
       </Association>
       <PriorID>juice-jup-cr41</PriorID>
     </ResourceHeader>
     <AccessInformation>
-      <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
-      <Availability>Online</Availability>
-      <AccessRights>Open</AccessRights>
-      <AccessURL>
-        <Name>CDPP/AMDA HAPI Server</Name>
-        <URL>http://amda.irap.omp.eu/service/hapi</URL>
-        <Style>HAPI</Style>
-        <Description>Web Service to this product using the HAPI interface.</Description>
-      </AccessURL>
-      <Format>CSV</Format>
-      <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Données de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Université Paul Sabatier, Toulouse".. See the Rules of the road at http://amda.cdpp.eu/help/policy.html. Please acknowledge the Data Providers.</Acknowledgement>
-    </AccessInformation>
+         <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
+         <Availability>Online</Availability>
+         <AccessRights>Open</AccessRights>
+         <AccessURL>
+            <Name>CDPP/AMDA HAPI Server</Name>
+            <URL>http://amda.irap.omp.eu/service/hapi</URL>
+            <Style>HAPI</Style>
+            <Description>Web Service to this product using the HAPI interface.</Description>
+         </AccessURL>
+         <Format>CSV</Format>
+         <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Données de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Université Paul Sabatier, Toulouse".. See the Rules of the road at http://amda.cdpp.eu/help/policy.html. Please acknowledge the Data Providers.</Acknowledgement>
+      </AccessInformation>
     <AccessInformation>
-      <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
-      <Availability>Online</Availability>
-      <AccessRights>Open</AccessRights>
-      <AccessURL>
-        <Name>CDPP/AMDA Web application</Name>
-        <URL>http://amda.cdpp.eu</URL>
-        <Description>Access to Data via CDPP/AMDA Web application.</Description>
-      </AccessURL>
-      <Format>CSV</Format>
-      <Format>VOTable</Format>
-      <Format>CDF</Format>
-      <Format>PNG</Format>
-      <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Données de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Université Paul Sabatier, Toulouse".. See the Rules of the road at http://amda.cdpp.eu/help/policy.html. Please acknowledge the Data Providers.</Acknowledgement>
-    </AccessInformation>
+         <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
+         <Availability>Online</Availability>
+         <AccessRights>Open</AccessRights>
+         <AccessURL>
+            <Name>CDPP/AMDA Web application</Name>
+            <URL>http://amda.cdpp.eu</URL>
+            <Description>Access to Data via CDPP/AMDA Web application.</Description>
+         </AccessURL>
+         <Format>CSV</Format>
+         <Format>VOTable</Format>
+         <Format>CDF</Format>
+         <Format>PNG</Format>
+         <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Données de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Université Paul Sabatier, Toulouse".. See the Rules of the road at http://amda.cdpp.eu/help/policy.html. Please acknowledge the Data Providers.</Acknowledgement>
+      </AccessInformation>
     <ProviderName>IRAP</ProviderName>
     <InstrumentID>spase://CNES/Instrument/CDPP-AMDA/Juice/Models</InstrumentID>
     <MeasurementType>MagneticField</MeasurementType>
     <TemporalDescription>
       <TimeSpan>
-        <StartDate>2030-06-01T07:00:00Z</StartDate>
-        <StopDate>2036-08-20T00:00:00Z</StopDate>
+        <StartDate>2016-06-01T00:00:00Z</StartDate>
+        <StopDate>2021-05-05T23:49:59Z</StopDate>
       </TimeSpan>
       <Cadence>PT1M</Cadence>
     </TemporalDescription>
     <ObservedRegion>Jupiter</ObservedRegion>
-    <Caveats/>
     <Parameter>
       <Name>b_iau_jup</Name>
       <ParameterKey>b_jrm33_con_60_1_juice_jucr41_xyz</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>nT</Units>
-      <UnitsConversion/>
       <Structure>
         <Size>3</Size>
         <Element>
@@ -119,8 +115,6 @@
     <Parameter>
       <Name>|b|</Name>
       <ParameterKey>b_jrm33_con_tot_60_1_juice_jucr41_xyz</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>nT</Units>
       <Field>
         <FieldQuantity>Magnetic</FieldQuantity>
diff --git a/NumericalData/CDPP-AMDA/Juice/Models/juice51-jrm09-model.xml b/NumericalData/CDPP-AMDA/Juice/Models/juice51-jrm09-model.xml
index be0914e..90ffa18 100644
--- a/NumericalData/CDPP-AMDA/Juice/Models/juice51-jrm09-model.xml
+++ b/NumericalData/CDPP-AMDA/Juice/Models/juice51-jrm09-model.xml
@@ -24,7 +24,7 @@
       <Association>
         <AssociationID>juice-jrm09-model</AssociationID>
         <AssociationType>PartOf</AssociationType>
-        <Note>JRM09 + CAN</Note>
+        <Note>JRM09 + CAN field model</Note>
       </Association>
       <PriorID>juice-jup-cr51</PriorID>
     </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/Juice/Models/juice51-jrm33-model.xml b/NumericalData/CDPP-AMDA/Juice/Models/juice51-jrm33-model.xml
index a5b8b09..e39b55a 100644
--- a/NumericalData/CDPP-AMDA/Juice/Models/juice51-jrm33-model.xml
+++ b/NumericalData/CDPP-AMDA/Juice/Models/juice51-jrm33-model.xml
@@ -40,7 +40,7 @@
       <Association>
         <AssociationID>juice-jrm33-model</AssociationID>
         <AssociationType>PartOf</AssociationType>
-        <Note>JRM33 + Con2020</Note>
+        <Note>JRM33 + Con2020 field model</Note>
       </Association>
       <PriorID>juice-jup-cr51</PriorID>
     </ResourceHeader>
@@ -83,14 +83,10 @@
       <Cadence>PT1M</Cadence>
     </TemporalDescription>
     <ObservedRegion>Jupiter</ObservedRegion>
-    <Caveats/>
     <Parameter>
       <Name>b_iau_jup</Name>
       <ParameterKey>b_jrm33_con_60_1_juice_jucr51_xyz</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>nT</Units>
-      <UnitsConversion/>
       <Structure>
         <Size>3</Size>
         <Element>
@@ -119,8 +115,6 @@
     <Parameter>
       <Name>|b|</Name>
       <ParameterKey>b_jrm33_con_tot_60_1_juice_jucr51_xyz</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>nT</Units>
       <Field>
         <FieldQuantity>Magnetic</FieldQuantity>
diff --git a/NumericalData/CDPP-AMDA/Juice/Models/juice51-jrm33-mshell.xml b/NumericalData/CDPP-AMDA/Juice/Models/juice51-jrm33-mshell.xml
new file mode 100644
index 0000000..f4a89d8
--- /dev/null
+++ b/NumericalData/CDPP-AMDA/Juice/Models/juice51-jrm33-mshell.xml
@@ -0,0 +1,98 @@
+<?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://www.spase-group.org/data/schema/spase-2.4.1.xsd">
+  <Version>2.4.1</Version>
+  <NumericalData>
+    <ResourceID>spase://CNES/NumericalData/CDPP-AMDA/Juice/Models/juice51-jrm33-mshell</ResourceID>
+    <ResourceHeader>
+      <ResourceName>CReMa 5.1</ResourceName>
+      <AlternateName>JRM33 + Con2020 M-Shell</AlternateName>
+      <ReleaseDate>2024-02-15T01:01:36Z</ReleaseDate>
+      <Description>JUICE M-Shell calculated with JRM33+CON2020 between 2031-07-01 and 2034-12-31 using Crema 5.1 positions.
+                Spatial resolution is 1/250Rj ~ 300 km. Outer boundary is set to R = 40 Rj.
+      </Description>
+      <Contact>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Jonas.Rabia</PersonID>
+        <Role>DataProducer</Role>
+      </Contact>
+      <Association>
+        <AssociationID>juice-jrm33-mshell</AssociationID>
+        <AssociationType>PartOf</AssociationType>
+        <Note>JRM33 + Con2020 M-Shell</Note>
+      </Association>
+    </ResourceHeader>
+    <AccessInformation>
+         <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
+         <Availability>Online</Availability>
+         <AccessRights>Open</AccessRights>
+         <AccessURL>
+            <Name>CDPP/AMDA HAPI Server</Name>
+            <URL>http://amda.irap.omp.eu/service/hapi</URL>
+            <Style>HAPI</Style>
+            <Description>Web Service to this product using the HAPI interface.</Description>
+         </AccessURL>
+         <Format>CSV</Format>
+         <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Données de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Université Paul Sabatier, Toulouse".. See the Rules of the road at http://amda.cdpp.eu/help/policy.html. Please acknowledge the Data Providers.</Acknowledgement>
+      </AccessInformation>
+    <AccessInformation>
+         <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
+         <Availability>Online</Availability>
+         <AccessRights>Open</AccessRights>
+         <AccessURL>
+            <Name>CDPP/AMDA Web application</Name>
+            <URL>http://amda.cdpp.eu</URL>
+            <Description>Access to Data via CDPP/AMDA Web application.</Description>
+         </AccessURL>
+         <Format>CSV</Format>
+         <Format>VOTable</Format>
+         <Format>CDF</Format>
+         <Format>PNG</Format>
+         <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Données de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Université Paul Sabatier, Toulouse".. See the Rules of the road at http://amda.cdpp.eu/help/policy.html. Please acknowledge the Data Providers.</Acknowledgement>
+      </AccessInformation>
+    <ProviderName>IRAP</ProviderName>
+    <InstrumentID>spase://CNES/Instrument/CDPP-AMDA/Juice/Models</InstrumentID>
+    <MeasurementType>MagneticField</MeasurementType>
+    <TemporalDescription>
+      <TimeSpan>
+        <StartDate>2031-07-01T00:00:00Z</StartDate>
+        <StopDate>2034-12-31T00:00:00Z</StopDate>
+      </TimeSpan>
+      <Cadence>PT5M</Cadence>
+    </TemporalDescription>
+    <ObservedRegion>Jupiter</ObservedRegion>
+    <Parameter>
+      <Name>M-Shell</Name>
+      <ParameterKey>mshell_juice51_m</ParameterKey>
+      <Description>M-Shell - Radial distance intersection field line/magnetic equator</Description>
+      <Support>
+        <SupportQuantity>Other</SupportQuantity>
+      </Support>
+    </Parameter>
+    <Parameter>
+      <Name>colatitude</Name>
+      <ParameterKey>mshell_juice51_t</ParameterKey>
+      <Description>Colatitude intersection field line/magnetic equator</Description>
+      <Units>deg</Units>
+      <Support>
+        <SupportQuantity>Positional</SupportQuantity>
+      </Support>
+    </Parameter>
+    <Parameter>
+      <Name>longitude</Name>
+      <ParameterKey>mshell_juice51_p</ParameterKey>
+      <Description>Colatitude intersection field line/magnetic equator</Description>
+      <Units>deg</Units>
+      <Support>
+        <SupportQuantity>Positional</SupportQuantity>
+      </Support>
+    </Parameter>
+    <Parameter>
+      <Name>distance</Name>
+      <ParameterKey>mshell_juice51_s</ParameterKey>
+      <Description>Distance along the field line between SC/magnetic equator</Description>
+      <Units>Rj</Units>
+      <Support>
+        <SupportQuantity>Positional</SupportQuantity>
+      </Support>
+    </Parameter>
+  </NumericalData>
+</Spase>
diff --git a/NumericalData/CDPP-AMDA/Juno/Models/jun-jrm09-model.xml b/NumericalData/CDPP-AMDA/Juno/Models/jun-jrm09-model.xml
index 1d8f1f3..00ee6b9 100644
--- a/NumericalData/CDPP-AMDA/Juno/Models/jun-jrm09-model.xml
+++ b/NumericalData/CDPP-AMDA/Juno/Models/jun-jrm09-model.xml
@@ -6,7 +6,7 @@
     <ResourceHeader>
       <ResourceName>JRM09 + CAN field model</ResourceName>
       <AlternateName>JRM09 + CAN jovian magnetic field model</AlternateName>
-      <ReleaseDate>2023-06-21T00:02:18Z</ReleaseDate>
+      <ReleaseDate>2020-03-18T01:01:36Z</ReleaseDate>
       <Description>Magnetic field along Juno orbit is being real-time calculated.          
             
             Jovian magnetic field of JRM09 (Connerney et al., 2018) and
@@ -24,40 +24,40 @@
       <PriorID>juno-jupiter-all</PriorID>
     </ResourceHeader>
     <AccessInformation>
-      <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
-      <Availability>Online</Availability>
-      <AccessRights>Open</AccessRights>
-      <AccessURL>
-        <Name>CDPP/AMDA HAPI Server</Name>
-        <URL>http://amda.irap.omp.eu/service/hapi</URL>
-        <Style>HAPI</Style>
-        <Description>Web Service to this product using the HAPI interface.</Description>
-      </AccessURL>
-      <Format>CSV</Format>
-      <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Données de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Université Paul Sabatier, Toulouse".. See the Rules of the road at http://amda.cdpp.eu/help/policy.html. Please acknowledge the Data Providers.</Acknowledgement>
-    </AccessInformation>
+         <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
+         <Availability>Online</Availability>
+         <AccessRights>Open</AccessRights>
+         <AccessURL>
+            <Name>CDPP/AMDA HAPI Server</Name>
+            <URL>http://amda.irap.omp.eu/service/hapi</URL>
+            <Style>HAPI</Style>
+            <Description>Web Service to this product using the HAPI interface.</Description>
+         </AccessURL>
+         <Format>CSV</Format>
+         <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Données de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Université Paul Sabatier, Toulouse".. See the Rules of the road at http://amda.cdpp.eu/help/policy.html. Please acknowledge the Data Providers.</Acknowledgement>
+      </AccessInformation>
     <AccessInformation>
-      <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
-      <Availability>Online</Availability>
-      <AccessRights>Open</AccessRights>
-      <AccessURL>
-        <Name>CDPP/AMDA Web application</Name>
-        <URL>http://amda.cdpp.eu</URL>
-        <Description>Access to Data via CDPP/AMDA Web application.</Description>
-      </AccessURL>
-      <Format>CSV</Format>
-      <Format>VOTable</Format>
-      <Format>CDF</Format>
-      <Format>PNG</Format>
-      <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Données de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Université Paul Sabatier, Toulouse".. See the Rules of the road at http://amda.cdpp.eu/help/policy.html. Please acknowledge the Data Providers.</Acknowledgement>
-    </AccessInformation>
+         <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
+         <Availability>Online</Availability>
+         <AccessRights>Open</AccessRights>
+         <AccessURL>
+            <Name>CDPP/AMDA Web application</Name>
+            <URL>http://amda.cdpp.eu</URL>
+            <Description>Access to Data via CDPP/AMDA Web application.</Description>
+         </AccessURL>
+         <Format>CSV</Format>
+         <Format>VOTable</Format>
+         <Format>CDF</Format>
+         <Format>PNG</Format>
+         <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Données de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Université Paul Sabatier, Toulouse".. See the Rules of the road at http://amda.cdpp.eu/help/policy.html. Please acknowledge the Data Providers.</Acknowledgement>
+      </AccessInformation>
     <ProviderName>IRAP</ProviderName>
     <InstrumentID>spase://CNES/Instrument/CDPP-AMDA/Juno/Models</InstrumentID>
     <MeasurementType>MagneticField</MeasurementType>
     <TemporalDescription>
       <TimeSpan>
-        <StartDate>2016-08-30T00:00:00Z</StartDate>
-        <StopDate>2025-10-19T23:55:00Z</StopDate>
+        <StartDate>2016-06-01T00:00:00Z</StartDate>
+        <StopDate>2021-05-05T23:49:59Z</StopDate>
       </TimeSpan>
       <Cadence>PT1M</Cadence>
     </TemporalDescription>
diff --git a/NumericalData/CDPP-AMDA/Juno/Models/jun-jrm33-model.xml b/NumericalData/CDPP-AMDA/Juno/Models/jun-jrm33-model.xml
index 44333f3..31d848d 100644
--- a/NumericalData/CDPP-AMDA/Juno/Models/jun-jrm33-model.xml
+++ b/NumericalData/CDPP-AMDA/Juno/Models/jun-jrm33-model.xml
@@ -6,7 +6,7 @@
     <ResourceHeader>
       <ResourceName>JRM33 + Con2020 field model</ResourceName>
       <AlternateName>JRM33 + Con2020 jovian magnetic field model</AlternateName>
-      <ReleaseDate>2023-06-21T00:02:18Z</ReleaseDate>
+      <ReleaseDate>2020-03-18T01:01:36Z</ReleaseDate>
       <Description>Magnetic field along s/c orbit is being real-time calculated. 
          S/C and sampling time should be defined by user. 
          
@@ -40,52 +40,48 @@
       <PriorID>juno-jupiter-all</PriorID>
     </ResourceHeader>
     <AccessInformation>
-      <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
-      <Availability>Online</Availability>
-      <AccessRights>Open</AccessRights>
-      <AccessURL>
-        <Name>CDPP/AMDA HAPI Server</Name>
-        <URL>http://amda.irap.omp.eu/service/hapi</URL>
-        <Style>HAPI</Style>
-        <Description>Web Service to this product using the HAPI interface.</Description>
-      </AccessURL>
-      <Format>CSV</Format>
-      <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Données de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Université Paul Sabatier, Toulouse".. See the Rules of the road at http://amda.cdpp.eu/help/policy.html. Please acknowledge the Data Providers.</Acknowledgement>
-    </AccessInformation>
+         <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
+         <Availability>Online</Availability>
+         <AccessRights>Open</AccessRights>
+         <AccessURL>
+            <Name>CDPP/AMDA HAPI Server</Name>
+            <URL>http://amda.irap.omp.eu/service/hapi</URL>
+            <Style>HAPI</Style>
+            <Description>Web Service to this product using the HAPI interface.</Description>
+         </AccessURL>
+         <Format>CSV</Format>
+         <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Données de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Université Paul Sabatier, Toulouse".. See the Rules of the road at http://amda.cdpp.eu/help/policy.html. Please acknowledge the Data Providers.</Acknowledgement>
+      </AccessInformation>
     <AccessInformation>
-      <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
-      <Availability>Online</Availability>
-      <AccessRights>Open</AccessRights>
-      <AccessURL>
-        <Name>CDPP/AMDA Web application</Name>
-        <URL>http://amda.cdpp.eu</URL>
-        <Description>Access to Data via CDPP/AMDA Web application.</Description>
-      </AccessURL>
-      <Format>CSV</Format>
-      <Format>VOTable</Format>
-      <Format>CDF</Format>
-      <Format>PNG</Format>
-      <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Données de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Université Paul Sabatier, Toulouse".. See the Rules of the road at http://amda.cdpp.eu/help/policy.html. Please acknowledge the Data Providers.</Acknowledgement>
-    </AccessInformation>
+         <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
+         <Availability>Online</Availability>
+         <AccessRights>Open</AccessRights>
+         <AccessURL>
+            <Name>CDPP/AMDA Web application</Name>
+            <URL>http://amda.cdpp.eu</URL>
+            <Description>Access to Data via CDPP/AMDA Web application.</Description>
+         </AccessURL>
+         <Format>CSV</Format>
+         <Format>VOTable</Format>
+         <Format>CDF</Format>
+         <Format>PNG</Format>
+         <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Données de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Université Paul Sabatier, Toulouse".. See the Rules of the road at http://amda.cdpp.eu/help/policy.html. Please acknowledge the Data Providers.</Acknowledgement>
+      </AccessInformation>
     <ProviderName>IRAP</ProviderName>
     <InstrumentID>spase://CNES/Instrument/CDPP-AMDA/Juno/Models</InstrumentID>
     <MeasurementType>MagneticField</MeasurementType>
     <TemporalDescription>
       <TimeSpan>
-        <StartDate>2016-08-30T00:00:00Z</StartDate>
-        <StopDate>2025-10-19T23:55:00Z</StopDate>
+        <StartDate>2016-06-01T00:00:00Z</StartDate>
+        <StopDate>2021-05-05T23:49:59Z</StopDate>
       </TimeSpan>
       <Cadence>PT1M</Cadence>
     </TemporalDescription>
     <ObservedRegion>Jupiter</ObservedRegion>
-    <Caveats/>
     <Parameter>
       <Name>b_iau_jup</Name>
       <ParameterKey>b_jrm33_con_60_1_juno_jup_xyz</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>nT</Units>
-      <UnitsConversion/>
       <Structure>
         <Size>3</Size>
         <Element>
@@ -114,8 +110,6 @@
     <Parameter>
       <Name>|b|</Name>
       <ParameterKey>b_jrm33_con_tot_60_1_juno_jup_xyz</ParameterKey>
-      <Description/>
-      <UCD/>
       <Units>nT</Units>
       <Field>
         <FieldQuantity>Magnetic</FieldQuantity>
diff --git a/NumericalData/CDPP-AMDA/Juno/Models/jun-jrm33-mshell.xml b/NumericalData/CDPP-AMDA/Juno/Models/jun-jrm33-mshell.xml
new file mode 100644
index 0000000..8a7c395
--- /dev/null
+++ b/NumericalData/CDPP-AMDA/Juno/Models/jun-jrm33-mshell.xml
@@ -0,0 +1,101 @@
+<?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://www.spase-group.org/data/schema/spase-2.4.1.xsd">
+  <Version>2.4.1</Version>
+  <NumericalData>
+    <ResourceID>spase://CNES/NumericalData/CDPP-AMDA/Juno/Models/jun-jrm33-mshell</ResourceID>
+    <ResourceHeader>
+      <ResourceName>JRM33 + Con2020 M-Shell</ResourceName>
+      <AlternateName>JRM33 + Con2020 M-Shell</AlternateName>
+      <ReleaseDate>2024-02-15T01:01:36Z</ReleaseDate>
+      <Description>Juno M-Shell calculated with JRM33+CON2020 between PJ1 (2016-08-27) and PJ56 (2023-11-22) with 1s-resolution.
+                Spatial resolution is 1/250 Rj ~ 300 km. Outer boundary is set to R=30 Rj.
+      </Description>
+      <Contact>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Jonas.Rabia</PersonID>
+        <Role>DataProducer</Role>
+      </Contact>
+    </ResourceHeader>
+    <AccessInformation>
+         <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
+         <Availability>Online</Availability>
+         <AccessRights>Open</AccessRights>
+         <AccessURL>
+            <Name>CDPP/AMDA HAPI Server</Name>
+            <URL>http://amda.irap.omp.eu/service/hapi</URL>
+            <Style>HAPI</Style>
+            <Description>Web Service to this product using the HAPI interface.</Description>
+         </AccessURL>
+         <Format>CSV</Format>
+         <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Données de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Université Paul Sabatier, Toulouse".. See the Rules of the road at http://amda.cdpp.eu/help/policy.html. Please acknowledge the Data Providers.</Acknowledgement>
+      </AccessInformation>
+    <AccessInformation>
+         <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
+         <Availability>Online</Availability>
+         <AccessRights>Open</AccessRights>
+         <AccessURL>
+            <Name>CDPP/AMDA Web application</Name>
+            <URL>http://amda.cdpp.eu</URL>
+            <Description>Access to Data via CDPP/AMDA Web application.</Description>
+         </AccessURL>
+         <Format>CSV</Format>
+         <Format>VOTable</Format>
+         <Format>CDF</Format>
+         <Format>PNG</Format>
+         <Acknowledgement>Thank you for acknowledging the use of AMDA in publications with wording like "Data analysis was performed with the AMDA science analysis system provided by the Centre de Données de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Université Paul Sabatier, Toulouse".. See the Rules of the road at http://amda.cdpp.eu/help/policy.html. Please acknowledge the Data Providers.</Acknowledgement>
+      </AccessInformation>
+    <ProviderName>IRAP</ProviderName>
+    <InstrumentID>spase://CNES/Instrument/CDPP-AMDA/Juno/Models</InstrumentID>
+    <MeasurementType>MagneticField</MeasurementType>
+    <TemporalDescription>
+      <TimeSpan>
+        <StartDate>2016-08-27T00:00:00Z</StartDate>
+        <StopDate>2023-11-22T00:00:00Z</StopDate>
+      </TimeSpan>
+      <Cadence>PT1S</Cadence>
+    </TemporalDescription>
+    <ObservedRegion>Jupiter</ObservedRegion>
+    <Parameter>
+      <Name>orbit number</Name>
+      <ParameterKey>mshell_juno_orb</ParameterKey>
+      <Description>Orbit number</Description>
+      <Support>
+        <SupportQuantity>Other</SupportQuantity>
+      </Support>
+    </Parameter>
+    <Parameter>
+      <Name>M-Shell</Name>
+      <ParameterKey>mshell_juno_m</ParameterKey>
+      <Description>M-Shell - Radial distance intersection field line/magnetic equator</Description>
+      <Support>
+        <SupportQuantity>Other</SupportQuantity>
+      </Support>
+    </Parameter>
+    <Parameter>
+      <Name>colatitude</Name>
+      <ParameterKey>mshell_juno_t</ParameterKey>
+      <Description>Colatitude intersection field line/magnetic equator</Description>
+      <Units>deg</Units>
+      <Support>
+        <SupportQuantity>Positional</SupportQuantity>
+      </Support>
+    </Parameter>
+    <Parameter>
+      <Name>longitude</Name>
+      <ParameterKey>mshell_juno_p</ParameterKey>
+      <Description>Colatitude intersection field line/magnetic equator</Description>
+      <Units>deg</Units>
+      <Support>
+        <SupportQuantity>Positional</SupportQuantity>
+      </Support>
+    </Parameter>
+    <Parameter>
+      <Name>distance</Name>
+      <ParameterKey>mshell_juno_s</ParameterKey>
+      <Description>Distance along the field line between SC/magnetic equator</Description>
+      <Units>Rj</Units>
+      <Support>
+        <SupportQuantity>Positional</SupportQuantity>
+      </Support>
+    </Parameter>
+  </NumericalData>
+</Spase>
--
libgit2 0.21.2