Commit 7a743e20c157d7d838c088898812289707b7e8da
1 parent
65d25d59
Exists in
master
and in
6 other branches
Fix WIND ORB parameters (#10104)
Showing
6 changed files
with
11 additions
and
13 deletions
Show diff stats
PARAM_DEF/wnd_lat_hee.xml
@@ -2,9 +2,8 @@ | @@ -2,9 +2,8 @@ | ||
2 | <param xml:id="wnd_lat_hee"> | 2 | <param xml:id="wnd_lat_hee"> |
3 | <!--<TemporaryFillValue>-1.e+31</TemporaryFillValue>--> | 3 | <!--<TemporaryFillValue>-1.e+31</TemporaryFillValue>--> |
4 | <get> | 4 | <get> |
5 | - <vi name="wnd:orb:all"> | ||
6 | - <baseParam name="LAT_HEE"/></vi> | 5 | + <amdaParam name="wnd_xyz_hee"/> |
7 | </get> | 6 | </get> |
8 | - <process>$wnd_orb_all_LAT_HEE*RAD2DEG</process> | 7 | + <process description="LAT HEE">atan($wnd_xyz_hee[2]/sqrt(pow($wnd_xyz_hee[1],2)+pow($wnd_xyz_hee[0],2)))*RAD2DEG</process> |
9 | <output/> | 8 | <output/> |
10 | </param> | 9 | </param> |
PARAM_DEF/wnd_lon_hee.xml
@@ -2,9 +2,8 @@ | @@ -2,9 +2,8 @@ | ||
2 | <param xml:id="wnd_lon_hee"> | 2 | <param xml:id="wnd_lon_hee"> |
3 | <!--<TemporaryFillValue>-1.e+31</TemporaryFillValue>--> | 3 | <!--<TemporaryFillValue>-1.e+31</TemporaryFillValue>--> |
4 | <get> | 4 | <get> |
5 | - <vi name="wnd:orb:all"> | ||
6 | - <baseParam name="LON_HEE"/></vi> | 5 | + <amdaParam name="wnd_xyz_hee"/> |
7 | </get> | 6 | </get> |
8 | - <process>$wnd_orb_all_LON_HEE*RAD2DEG</process> | 7 | + <process description="LON HEE">atan2($wnd_xyz_hee[1],$wnd_xyz_hee[0])*RAD2DEG</process> |
9 | <output/> | 8 | <output/> |
10 | </param> | 9 | </param> |
PARAM_DEF/wnd_r.xml
@@ -3,7 +3,7 @@ | @@ -3,7 +3,7 @@ | ||
3 | <!--<TemporaryFillValue>-1.e+31</TemporaryFillValue>--> | 3 | <!--<TemporaryFillValue>-1.e+31</TemporaryFillValue>--> |
4 | <get> | 4 | <get> |
5 | <vi name="wnd:orb:all"> | 5 | <vi name="wnd:orb:all"> |
6 | - <baseParam name="R_GSE"/></vi> | 6 | + <baseParam name="R"/></vi> |
7 | </get> | 7 | </get> |
8 | <process description="RE=6400">$wnd_orb_all_R_GSE/RADIUS_EARTH</process> | 8 | <process description="RE=6400">$wnd_orb_all_R_GSE/RADIUS_EARTH</process> |
9 | <output/> | 9 | <output/> |
PARAM_DEF/wnd_xyz_gse.xml
@@ -2,9 +2,9 @@ | @@ -2,9 +2,9 @@ | ||
2 | <param xml:id="wnd_xyz_gse"> | 2 | <param xml:id="wnd_xyz_gse"> |
3 | <get> | 3 | <get> |
4 | <vi name="wnd:orb:all"> | 4 | <vi name="wnd:orb:all"> |
5 | - <baseParam name="GSE"/> | 5 | + <baseParam name="Pos_GSE"/> |
6 | </vi> | 6 | </vi> |
7 | </get> | 7 | </get> |
8 | - <process>$wnd_orb_all_GSE/RADIUS_EARTH</process> | 8 | + <process>$wnd_orb_all_Pos_GSE/RADIUS_EARTH</process> |
9 | <output><!--<plot>ORBIT</plot>--></output> | 9 | <output><!--<plot>ORBIT</plot>--></output> |
10 | </param> | 10 | </param> |
PARAM_DEF/wnd_xyz_gsm.xml
@@ -2,9 +2,9 @@ | @@ -2,9 +2,9 @@ | ||
2 | <param xml:id="wnd_xyz_gsm"> | 2 | <param xml:id="wnd_xyz_gsm"> |
3 | <get> | 3 | <get> |
4 | <vi name="wnd:orb:all"> | 4 | <vi name="wnd:orb:all"> |
5 | - <baseParam name="GSM"/> | 5 | + <baseParam name="Pos_GSE"/> |
6 | </vi> | 6 | </vi> |
7 | </get> | 7 | </get> |
8 | - <process>$wnd_orb_all_GSM/RADIUS_EARTH</process> | 8 | + <process>#framesTransformation($wnd_orb_all_Pos_GSE;GSE;GSM;false)/RADIUS_EARTH</process> |
9 | <output><!--<plot>ORBIT</plot>--></output> | 9 | <output><!--<plot>ORBIT</plot>--></output> |
10 | </param> | 10 | </param> |
PARAM_DEF/wnd_xyz_hee.xml
@@ -2,9 +2,9 @@ | @@ -2,9 +2,9 @@ | ||
2 | <param xml:id="wnd_xyz_hee"> | 2 | <param xml:id="wnd_xyz_hee"> |
3 | <get> | 3 | <get> |
4 | <vi name="wnd:orb:all"> | 4 | <vi name="wnd:orb:all"> |
5 | - <baseParam name="HEE"/> | 5 | + <baseParam name="Pos_GSE"/> |
6 | </vi> | 6 | </vi> |
7 | </get> | 7 | </get> |
8 | - <process>$wnd_orb_all_HEE/ASTRONOMICAL_UNIT</process> | 8 | + <process>#framesTransformation($wnd_orb_all_Pos_GSE;GSE;HEE;false)/ASTRONOMICAL_UNIT</process> |
9 | <output><!--<plot>ORBIT</plot>--></output> | 9 | <output><!--<plot>ORBIT</plot>--></output> |
10 | </param> | 10 | </param> |