Commit 5f04363f8f100da5da514fb37355d8f670f2a00e
1 parent
c9343cf5
Exists in
master
and in
111 other branches
format for help; mars bowshock hall
Showing
3 changed files
with
31 additions
and
25 deletions
Show diff stats
generic_data/Functions/plotCurves.xml
@@ -2,7 +2,7 @@ | @@ -2,7 +2,7 @@ | ||
2 | <curves> | 2 | <curves> |
3 | <!-- internal = true => constants, are not modified in interface--> | 3 | <!-- internal = true => constants, are not modified in interface--> |
4 | <!-- bowshock | 4 | <!-- bowshock |
5 | - r = x0 + L/(1+eps*cos(theta)) | 5 | + r = x0 + L/(1+eps*cos(theta)) |
6 | L = param2 | 6 | L = param2 |
7 | eps = param3 | 7 | eps = param3 |
8 | x0 = param4 | 8 | x0 = param4 |
@@ -24,6 +24,14 @@ | @@ -24,6 +24,14 @@ | ||
24 | <param name="param4" internal="true" defaultValue="0.55"/> | 24 | <param name="param4" internal="true" defaultValue="0.55"/> |
25 | </params> | 25 | </params> |
26 | </curve> | 26 | </curve> |
27 | + <curve id="mars_bowshock_hall" name="Mars Bowshock (Hall; JGR; 2016)" functionName="bowshock"> | ||
28 | + <params> | ||
29 | + <param name="param1" internal="true" defaultValue="135"/> | ||
30 | + <param name="param2" internal="true" defaultValue="1.82"/> | ||
31 | + <param name="param3" internal="true" defaultValue="1.01"/> | ||
32 | + <param name="param4" internal="true" defaultValue="0.74"/> | ||
33 | + </params> | ||
34 | + </curve> | ||
27 | <!--Mercury's magnetopause and bow shock from MESSENGER Magnetometer observations | 35 | <!--Mercury's magnetopause and bow shock from MESSENGER Magnetometer observations |
28 | Reka Winslow; JGR; May 2013 | 36 | Reka Winslow; JGR; May 2013 |
29 | --> | 37 | --> |
@@ -60,14 +68,21 @@ | @@ -60,14 +68,21 @@ | ||
60 | <param name="ramPressure" internal="false" defaultValue="0.05"/> | 68 | <param name="ramPressure" internal="false" defaultValue="0.05"/> |
61 | </params> | 69 | </params> |
62 | </curve> | 70 | </curve> |
63 | - <curve id="jupiter_bowshock_high" name="Jupiter Bowshock : High Pressure (0.2 nPa) (Huddlestone; JGR; 1998)" functionName="bowshock1"> | 71 | + <!-- bowshock1 |
72 | + r = L/(1+eps*cos(theta)) | ||
73 | + L = param2 | ||
74 | + eps = param3 | ||
75 | + | ||
76 | + param1 => theta Max (deg) | ||
77 | + --> | ||
78 | + <curve id="jupiter_bowshock_high" name="Jupiter Bowshock : High Pressure (0.2 nPa) (Huddleston; JGR; 1998)" functionName="bowshock1"> | ||
64 | <params> | 79 | <params> |
65 | <param name="param1" internal="true" defaultValue="145"/> | 80 | <param name="param1" internal="true" defaultValue="145"/> |
66 | <param name="param2" internal="true" defaultValue="134"/> | 81 | <param name="param2" internal="true" defaultValue="134"/> |
67 | <param name="param3" internal="true" defaultValue="0.85"/> | 82 | <param name="param3" internal="true" defaultValue="0.85"/> |
68 | </params> | 83 | </params> |
69 | </curve> | 84 | </curve> |
70 | - <curve id="jupiter_bowshock_low" name="Jupiter Bowshock : Low Pressure (0.05 nPa) (Huddlestone; JGR; 1998)" functionName="bowshock1"> | 85 | + <curve id="jupiter_bowshock_low" name="Jupiter Bowshock : Low Pressure (0.05 nPa) (Huddleston; JGR; 1998)" functionName="bowshock1"> |
71 | <params> | 86 | <params> |
72 | <param name="param1" internal="true" defaultValue="145"/> | 87 | <param name="param1" internal="true" defaultValue="145"/> |
73 | <param name="param2" internal="true" defaultValue="116"/> | 88 | <param name="param2" internal="true" defaultValue="116"/> |
@@ -110,14 +125,14 @@ | @@ -110,14 +125,14 @@ | ||
110 | <param name="ramPressure" internal="false" defaultValue="0.05"/> | 125 | <param name="ramPressure" internal="false" defaultValue="0.05"/> |
111 | </params> | 126 | </params> |
112 | </curve> | 127 | </curve> |
113 | - <curve id="jupiter_magnetopause_high" name="Jupiter Magnetopause : High Pressure (0.2 nPa)(Huddlestone; JGR; 1998)" functionName="bowshock1"> | 128 | + <curve id="jupiter_magnetopause_high" name="Jupiter Magnetopause : High Pressure (0.2 nPa)(Huddleston; JGR; 1998)" functionName="bowshock1"> |
114 | <params> | 129 | <params> |
115 | <param name="param1" internal="true" defaultValue="145"/> | 130 | <param name="param1" internal="true" defaultValue="145"/> |
116 | <param name="param2" internal="true" defaultValue="92"/> | 131 | <param name="param2" internal="true" defaultValue="92"/> |
117 | <param name="param3" internal="true" defaultValue="0.70"/> | 132 | <param name="param3" internal="true" defaultValue="0.70"/> |
118 | </params> | 133 | </params> |
119 | </curve> | 134 | </curve> |
120 | - <curve id="jupiter_magnetopause_low" name="Jupiter Magnetopause : Low Pressure (0.05 nPa)(Huddlestone; JGR; 1998)" functionName="bowshock1"> | 135 | + <curve id="jupiter_magnetopause_low" name="Jupiter Magnetopause : Low Pressure (0.05 nPa)(Huddleston; JGR; 1998)" functionName="bowshock1"> |
121 | <params> | 136 | <params> |
122 | <param name="param1" internal="true" defaultValue="145"/> | 137 | <param name="param1" internal="true" defaultValue="145"/> |
123 | <param name="param2" internal="true" defaultValue="116"/> | 138 | <param name="param2" internal="true" defaultValue="116"/> |
help/standardTimeFormat
1 | - | ||
2 | -<h2>Standard Time Format</h2><br/> | ||
3 | - | ||
4 | - Two possible ASCII file formats: | ||
5 | - | 1 | +<h3>Standard Time Format</h3> |
2 | +Two possible ASCII file formats: | ||
6 | <ul>1. "Running" Time: | 3 | <ul>1. "Running" Time: |
7 | <li> line 1: Time Parameter1 Parameter2_Component1 Parameter2_Component2 Parameter2_Component3 Parameter3 ..... | 4 | <li> line 1: Time Parameter1 Parameter2_Component1 Parameter2_Component2 Parameter2_Component3 Parameter3 ..... |
8 | <li> line 2: Time Parameter1 Parameter2_Component1 Parameter2_Component2 Parameter2_Component3 Parameter3 ..... | 5 | <li> line 2: Time Parameter1 Parameter2_Component1 Parameter2_Component2 Parameter2_Component3 Parameter3 ..... |
9 | <li> ..................... | 6 | <li> ..................... |
10 | </ul> | 7 | </ul> |
11 | - <br/> | ||
12 | <ul>2. StartTime and DeltaT | 8 | <ul>2. StartTime and DeltaT |
13 | <li> line 1: StartTime (<b>standard format only!</b>) DeltaT_in_Secs | 9 | <li> line 1: StartTime (<b>standard format only!</b>) DeltaT_in_Secs |
14 | <li> line 2: Parameter1 Parameter2_Component1 Parameter2_Component2 Parameter2_Component3 Parameter3 ..... | 10 | <li> line 2: Parameter1 Parameter2_Component1 Parameter2_Component2 Parameter2_Component3 Parameter3 ..... |
15 | <li> ..................... | 11 | <li> ..................... |
16 | </ul> | 12 | </ul> |
17 | - <br/> | ||
18 | -By default AMDA assumes that Time is "standard" formatted: | ||
19 | 13 | ||
14 | +By default AMDA assumes that Time is "standard" formatted: | ||
20 | <ul><b>DATE:</b> | 15 | <ul><b>DATE:</b> |
21 | <li> YYYYMMDD (20011128) | 16 | <li> YYYYMMDD (20011128) |
22 | <li> YYYY/MM/DD (2001/11/28) | 17 | <li> YYYY/MM/DD (2001/11/28) |
23 | <li> YYYY-MM-DD (2001-11-28) | 18 | <li> YYYY-MM-DD (2001-11-28) |
24 | - </ul> | ||
25 | - | 19 | + </ul> |
26 | <ul><b>TIME:</b> | 20 | <ul><b>TIME:</b> |
27 | <li> THH:MM:SS[.MSEC] (T10:25:15[.003]) | 21 | <li> THH:MM:SS[.MSEC] (T10:25:15[.003]) |
28 | <li> THHMMSS (T102515) | 22 | <li> THHMMSS (T102515) |
29 | </ul> | 23 | </ul> |
30 | -<br/> | ||
31 | - An example of standard formatted Date+Time: <b>2001-11-28T10:25:15</b> <br/><br/> | 24 | + |
25 | + An example of standard formatted Date+Time: <b>2001-11-28T10:25:15</b> <br/> | ||
32 | <b>Valid time range: 1970-01-01 - 2038-01-19</b> | 26 | <b>Valid time range: 1970-01-01 - 2038-01-19</b> |
33 | 27 | ||
34 | 28 |
help/userTimeFormat
1 | - | ||
2 | -<h2>NonStandard Time Format</h2> | ||
3 | - | 1 | +<h3>NonStandard Time Format</h3> |
4 | Year Month Day Hour Minute Second => in any combination and with different separators | 2 | Year Month Day Hour Minute Second => in any combination and with different separators |
5 | should be described in the special input area. This input area is displayed after selection of Nonstandard | 3 | should be described in the special input area. This input area is displayed after selection of Nonstandard |
6 | -Time Format.<br/> <br/>You have to put: | ||
7 | - | 4 | +Time Format.<br/>You have to put: |
8 | <ul> | 5 | <ul> |
9 | <li> <b>Y</b> - for full numeric representation of a year, 4 digits | 6 | <li> <b>Y</b> - for full numeric representation of a year, 4 digits |
10 | <li> <b>y</b> - for two digit representation of a year | 7 | <li> <b>y</b> - for two digit representation of a year |
@@ -19,12 +16,12 @@ Time Format.<br/> <br/>You have to put: | @@ -19,12 +16,12 @@ Time Format.<br/> <br/>You have to put: | ||
19 | <li> <b>.u</b> - for milliseconds, <b>3 digits after decimal point</b> | 16 | <li> <b>.u</b> - for milliseconds, <b>3 digits after decimal point</b> |
20 | <li> <b>.k</b> - for milliseconds, <b>1 digit after decimal point</b> | 17 | <li> <b>.k</b> - for milliseconds, <b>1 digit after decimal point</b> |
21 | <li> separators: " ", ":", "-"; "/" | 18 | <li> separators: " ", ":", "-"; "/" |
22 | - </ul><br/> | 19 | + </ul> |
23 | In case of time formats with spaces and <b>without leading zeros</b> or full (<b>F</b>) month representation you should fill <b>time length</b> input field | 20 | In case of time formats with spaces and <b>without leading zeros</b> or full (<b>F</b>) month representation you should fill <b>time length</b> input field |
24 | - <br/><br/> | 21 | + <br/> |
25 | d-m-Y H:i:s.u => '30-06-2001 10:40:20.003' <br/> | 22 | d-m-Y H:i:s.u => '30-06-2001 10:40:20.003' <br/> |
26 | d m Y H i s.u => '30 6 2001 1 02 20.003'; timeLength => 21<br/> | 23 | d m Y H i s.u => '30 6 2001 1 02 20.003'; timeLength => 21<br/> |
27 | Y/d/m H-i-s => '2001/30/06 10-40-20' <br/> | 24 | Y/d/m H-i-s => '2001/30/06 10-40-20' <br/> |
28 | etc... | 25 | etc... |
29 | -<br/><br/> | 26 | +<br/> |
30 | <b>Valid time range: 1970-01-01 - 2038-01-19</b> | 27 | <b>Valid time range: 1970-01-01 - 2038-01-19</b> |