CDPP / AMDA_INTERNAL_METADATA

Commit ff24fd72b0818b79d4c7ab974b90057716d9456a

Authored by Benjamin Renard
1 parent 41a4a121
Exists in juice_jdc and in 1 other branch amdadev

Fix KT17 parameters definition

Showing 11 changed files with 21 additions and 53 deletions   Show diff stats
Inline Side-by-side
PARAM_DEF/b_kt17_model.xml
  Diff comments   View file @ff24fd7
1 1 <?xml version="1.0"?>
2   -<param xml:id="b_kt17_model_##orbit##_##sampling##_##ref##_##rsun##_##dist##">
  2 +<param xml:id="b_kt17_model_##sampling##_##rsun##_##dist##_##orbit##">
3 3 <get>
4 4 <amdaParam name="##orbit##"/>
5 5 </get>
6   - <process description="KT17_bcart(##orbit##,##sampling##,##ref##,##rsun##,##dist##)">#KT17_cart((#sampling_classic($##orbit##;##sampling##;5));##ref##;##rsun##;##dist##)</process>
  6 + <process description="KT17_bcart(##orbit##,##sampling##,MSO,##rsun##,##dist##)">#KT17_cart((#sampling_classic($##orbit##;##sampling##;5));MSO;##rsun##;##dist##)</process>
7 7 <output/>
8 8 </param>
... ...
PARAM_DEF/b_kt17_model_tot.xml
  Diff comments   View file @ff24fd7
1 1 <?xml version="1.0"?>
2   -<param xml:id="b_kt17_model_tot_##orbit##_##sampling##_##ref##_##rsun##_##dist##">
  2 +<param xml:id="b_kt17_model_tot_##sampling##_##rsun##_##dist##_##orbit##">
3 3 <get>
4 4 <amdaParam name="##orbit##"/>
5 5 </get>
6   - <process description="KT17_bmag(##orbit##,##sampling##,##ref##,##rsun##,##dist##)">#KT17_mag((#sampling_classic($##orbit##;##sampling##;5));##ref##;##rsun##;##dist##)</process>
  6 + <process description="KT17_bmag(##orbit##,##sampling##,MSO,##rsun##,##dist##)">#KT17_mag((#sampling_classic($##orbit##;##sampling##;5));MSO;##rsun##;##dist##)</process>
7 7 <output/>
8 8 </param>
... ...
PARAM_INFO_PREDEFINED/info_b_kt17_actIdx.xml deleted
View file @41a4a12
... ... @@ -1,2 +0,0 @@
1   -<?xml version="1.0" encoding="UTF-8"?>
2   -<paraminfo id="mes_model_kt17_actIdx"><dimensions dim_1="1" dim_2="1"/><tables/></paraminfo>
PARAM_INFO_PREDEFINED/info_b_kt17_all.xml deleted
View file @41a4a12
... ... @@ -1,10 +0,0 @@
1   -<?xml version="1.0" encoding="UTF-8"?>
2   -<paraminfo id="b_kt17_all">
3   - <dimensions dim_1="3" dim_2="1"/>
4   - <components>
5   - <component index_1="0" name="b_kt17_all[0]"/>
6   - <component index_1="1" name="b_kt17_all[1]"/>
7   - <component index_1="2" name="b_kt17_all[2]"/>
8   - </components>
9   - <tables/>
10   -</paraminfo>
PARAM_INFO_PREDEFINED/info_b_kt17_all_tot.xml deleted
View file @41a4a12
... ... @@ -1,2 +0,0 @@
1   -<?xml version="1.0" encoding="UTF-8"?>
2   -<paraminfo id="b_kt17_all_tot"><dimensions dim_1="1" dim_2="1"/><tables/></paraminfo>
PARAM_INFO_PREDEFINED/info_b_kt17_external.xml deleted
View file @41a4a12
... ... @@ -1,2 +0,0 @@
1   -<?xml version="1.0" encoding="UTF-8"?>
2   -<paraminfo id="mes_model_kt17_bme_xyz"><dimensions dim_1="3" dim_2="1"/><components><component index_1="0" name="b_kt17_external[0]"/><component index_1="1" name="b_kt17_external[1]"/><component index_1="2" name="b_kt17_external[2]"/></components><tables/></paraminfo>
PARAM_INFO_PREDEFINED/info_b_kt17_external_tot.xml deleted
View file @41a4a12
... ... @@ -1,2 +0,0 @@
1   -<?xml version="1.0" encoding="UTF-8"?>
2   -<paraminfo id="b_kt17_external_tot"><dimensions dim_1="1" dim_2="1"/><tables/></paraminfo>
PARAM_INFO_PREDEFINED/info_b_kt17_internal.xml deleted
View file @41a4a12
... ... @@ -1,2 +0,0 @@
1   -<?xml version="1.0" encoding="UTF-8"?>
2   -<paraminfo id="mes_model_kt17_bmi_xyz"><dimensions dim_1="3" dim_2="1"/><components><component index_1="0" name="b_kt17_internal[0]"/><component index_1="1" name="b_kt17_internal[1]"/><component index_1="2" name="b_kt17_internal[2]"/></components><tables/></paraminfo>
PARAM_INFO_PREDEFINED/info_b_kt17_internal_tot.xml deleted
View file @41a4a12
... ... @@ -1,2 +0,0 @@
1   -<?xml version="1.0" encoding="UTF-8"?>
2   -<paraminfo id="b_kt17_internal_tot"><dimensions dim_1="1" dim_2="1"/><tables/></paraminfo>
PARAM_INFO_PREDEFINED/info_b_kt17_rhel.xml deleted
View file @41a4a12
... ... @@ -1,2 +0,0 @@
1   -<?xml version="1.0" encoding="UTF-8"?>
2   -<paraminfo id="mes_model_kt17_rhel_au"><dimensions dim_1="1" dim_2="1"/><tables/></paraminfo>
ParamTemplateList.xml
  Diff comments   View file @ff24fd7
... ... @@ -1272,42 +1272,34 @@
1272 1272 <param>b_jrm33_con_tot_60_1_gll_xyz_iau</param>
1273 1273 </predefined>
1274 1274 </paramTemplate>
1275   - <paramTemplate paramId="b_kt17_model" fileName="b_kt17_model_##orbit##_##sampling##_##ref##_##rsun##_##dist##">
  1275 + <paramTemplate paramId="b_kt17_model" fileName="b_kt17_model_##sampling##_##rsun##_##dist##_##orbit##">
1276 1276 <arguments>
1277 1277 <argument key="sampling" name="Time Step (sec)" type="float" default="60"/>
1278   - <argument key="orbit" name="Spacecraft Orbit" type="list" default="mes_xyz_orbmso">
1279   - <item key="mes_xyz_orbmso" name="MESSENGER"/>
1280   - <item key="m10_m1_xyz_mso" name="Mariner10 flyby#1"/>
  1278 + <argument key="rsun" name="Distance Mercure-Sun" type="float" default="0.427"/>
  1279 + <argument key="dist" name="Disturbance Index" type="int" default="50"/>
  1280 + <argument key="orbit" name="Spacecraft Orbit" type="list" default="mes_xyz_orbmso">
  1281 + <item key="mes_xyz_orbmso" name="MESSENGER"/>
  1282 + <item key="m10_m1_xyz_mso" name="Mariner10 flyby#1"/>
1281 1283 </argument>
1282   - <argument key="ref" name="Reference" type="list" default="MSO">
1283   - <item key="MSO" name="MSO"/>
1284   - <item key="MSM" name="MSM"/>
1285   - </argument>
1286   - <argument key="rsun" name="Distance Mercure-Sun" type="float" default="0.427"/>
1287   - <argument key="dist" name="Disturbance Index" type="int" default="50" min="0" max="97"/>
1288 1284 </arguments>
1289 1285 <predefined>
1290   - <param>b_kt17_model_mes_xyz_orbmso_60_MSO_0.427_50</param>
1291   - <param>b_kt17_model_m10_m1_xyz_mso_60_MSO_0.427_50</param>
  1286 + <param>b_kt17_model_60_0.427_50_mes_xyz_orbmso</param>
  1287 + <param>b_kt17_model_60_0.427_50_m10_m1_xyz_mso</param>
1292 1288 </predefined>
1293 1289 </paramTemplate>
1294   - <paramTemplate paramId="b_kt17_model_tot" fileName="b_kt17_model_tot_##orbit##_##sampling##_##ref##_##rsun##_##dist##">
  1290 + <paramTemplate paramId="b_kt17_model_tot" fileName="b_kt17_model_tot_##sampling##_##rsun##_##dist##_##orbit##">
1295 1291 <arguments>
1296 1292 <argument key="sampling" name="Time Step (sec)" type="float" default="60"/>
1297   - <argument key="orbit" name="Spacecraft Orbit" type="list" default="mes_xyz_orbmso">
1298   - <item key="mes_xyz_orbmso" name="MESSENGER"/>
1299   - <item key="m10_m1_xyz_mso" name="Mariner10 flyby#1"/>
1300   - </argument>
1301   - <argument key="ref" name="Reference" type="list" default="MSO">
1302   - <item key="MSO" name="MSO"/>
1303   - <item key="MSM" name="MSM"/>
1304   - </argument>
1305   - <argument key="rsun" name="Distance Mercure-Sun" type="float" default="0.427"/>
1306   - <argument key="dist" name="Disturbance Index" type="int" default="50" min="0" max="97"/>
  1293 + <argument key="rsun" name="Distance Mercure-Sun" type="float" default="0.427"/>
  1294 + <argument key="dist" name="Disturbance Index" type="int" default="50"/>
  1295 + <argument key="orbit" name="Spacecraft Orbit" type="list" default="mes_xyz_orbmso">
  1296 + <item key="mes_xyz_orbmso" name="MESSENGER"/>
  1297 + <item key="m10_m1_xyz_mso" name="Mariner10 flyby#1"/>
  1298 + </argument>
1307 1299 </arguments>
1308 1300 <predefined>
1309   - <param>b_kt17_model_tot_mes_xyz_orbmso_60_MSO_0.427_50</param>
1310   - <param>b_kt17_model_tot_m10_m1_xyz_mso_60_MSO_0.427_50</param>
  1301 + <param>b_kt17_model_tot_60_0.427_50_mes_xyz_orbmso</param>
  1302 + <param>b_kt17_model_tot_60_0.427_50_m10_m1_xyz_mso</param>
1311 1303 </predefined>
1312 1304 </paramTemplate>
1313 1305 <paramTemplate paramId="bcain_mso" fileName="bcain_mso_##sampling##_##orbit##">
... ...