format for help; mars bowshock hall

Elena.Budnik
1 parent c9343cf5
Showing 3 changed files with 31 additions and 25 deletions Show diff stats
generic_data/Functions/plotCurves.xml
help/standardTimeFormat
help/userTimeFormat
@@ -2,7 +2,7 @@
 <curves>
 	<!-- internal = true => constants, are not modified in interface-->
 	<!-- bowshock 
-		r = x0 + L/(1+eps*cos(theta))
+		 r = x0 + L/(1+eps*cos(theta))
 	       L = param2
 	       eps = param3
 	       x0 = param4
@@ -24,6 +24,14 @@
 			<param name="param4" internal="true" defaultValue="0.55"/>
 		</params>
 	</curve>
+	<curve id="mars_bowshock_hall" name="Mars Bowshock (Hall; JGR; 2016)" functionName="bowshock">
+		<params>
+			<param name="param1" internal="true" defaultValue="135"/>
+			<param name="param2" internal="true" defaultValue="1.82"/>
+			<param name="param3" internal="true" defaultValue="1.01"/>
+			<param name="param4" internal="true" defaultValue="0.74"/>
+		</params>
+	</curve>
 	<!--Mercury's magnetopause and bow shock from MESSENGER Magnetometer observations
 	    Reka Winslow; JGR; May 2013
 	--> 
@@ -60,14 +68,21 @@
 			<param name="ramPressure" internal="false" defaultValue="0.05"/>
 		</params>
 	</curve>
-	<curve id="jupiter_bowshock_high" name="Jupiter Bowshock : High Pressure (0.2 nPa) (Huddlestone; JGR; 1998)" functionName="bowshock1">
+	<!-- bowshock1 
+		 r = L/(1+eps*cos(theta))
+	       L = param2
+	       eps = param3
+	      
+	       param1 => theta Max (deg)
+	-->
+	<curve id="jupiter_bowshock_high" name="Jupiter Bowshock : High Pressure (0.2 nPa) (Huddleston; JGR; 1998)" functionName="bowshock1">
 		<params>
 			<param name="param1" internal="true" defaultValue="145"/>
 			<param name="param2" internal="true" defaultValue="134"/>
 			<param name="param3" internal="true" defaultValue="0.85"/>
 		</params>
 	</curve>
-	<curve id="jupiter_bowshock_low" name="Jupiter Bowshock : Low Pressure (0.05 nPa) (Huddlestone; JGR; 1998)" functionName="bowshock1">
+	<curve id="jupiter_bowshock_low" name="Jupiter Bowshock : Low Pressure (0.05 nPa) (Huddleston; JGR; 1998)" functionName="bowshock1">
 		<params>
 			<param name="param1" internal="true" defaultValue="145"/>
 			<param name="param2" internal="true" defaultValue="116"/>
@@ -110,14 +125,14 @@
 			<param name="ramPressure" internal="false" defaultValue="0.05"/>			  
 		</params>
 	</curve>
-	<curve id="jupiter_magnetopause_high" name="Jupiter Magnetopause : High Pressure (0.2 nPa)(Huddlestone; JGR; 1998)" functionName="bowshock1">
+	<curve id="jupiter_magnetopause_high" name="Jupiter Magnetopause : High Pressure (0.2 nPa)(Huddleston; JGR; 1998)" functionName="bowshock1">
 		<params>
 			<param name="param1" internal="true" defaultValue="145"/>
 			<param name="param2" internal="true" defaultValue="92"/>
 			<param name="param3" internal="true" defaultValue="0.70"/>
 		</params>
 	</curve>
-	<curve id="jupiter_magnetopause_low" name="Jupiter Magnetopause : Low Pressure (0.05 nPa)(Huddlestone; JGR; 1998)" functionName="bowshock1">
+	<curve id="jupiter_magnetopause_low" name="Jupiter Magnetopause : Low Pressure (0.05 nPa)(Huddleston; JGR; 1998)" functionName="bowshock1">
 		<params> 
 			<param name="param1" internal="true" defaultValue="145"/>
 			<param name="param2" internal="true" defaultValue="116"/>
-
-<h2>Standard Time Format</h2><br/>
-
- Two possible ASCII file formats:
- 
+<h3>Standard Time Format</h3>
+Two possible ASCII file formats:
    <ul>1. "Running" Time:  
    <li> line 1: Time Parameter1 Parameter2_Component1 Parameter2_Component2 Parameter2_Component3 Parameter3 .....
    <li> line 2: Time Parameter1 Parameter2_Component1 Parameter2_Component2 Parameter2_Component3 Parameter3 .....
    <li>  ..................... 
    </ul>
- <br/>
    <ul>2. StartTime and DeltaT
    <li> line 1: StartTime (<b>standard format only!</b>) DeltaT_in_Secs
    <li> line 2: Parameter1 Parameter2_Component1 Parameter2_Component2 Parameter2_Component3 Parameter3 .....
    <li> .....................
   </ul>    
- <br/> 
-By default AMDA assumes that Time is "standard" formatted:
  
+By default AMDA assumes that Time is "standard" formatted:
   <ul><b>DATE:</b> 
     <li> YYYYMMDD   (20011128)
     <li> YYYY/MM/DD (2001/11/28)
     <li> YYYY-MM-DD (2001-11-28)
-  </ul> 
- 
+  </ul>  
   <ul><b>TIME:</b> 
     <li> THH:MM:SS[.MSEC] (T10:25:15[.003])
     <li> THHMMSS (T102515)
   </ul> 
-<br/>
- An example of standard formatted Date+Time: <b>2001-11-28T10:25:15</b> <br/><br/>
+
+ An example of standard formatted Date+Time: <b>2001-11-28T10:25:15</b> <br/>
  <b>Valid time range: 1970-01-01 - 2038-01-19</b>
  
  
-
-<h2>NonStandard Time Format</h2>
-
+<h3>NonStandard Time Format</h3>
 Year Month Day Hour Minute Second  => in any combination and with different separators
 should be described in the special input area. This input area is displayed after selection of  Nonstandard
-Time Format.<br/> <br/>You have to put:
-
+Time Format.<br/>You have to put:
   <ul>
     <li> <b>Y</b> - for full numeric representation of a year, 4 digits
     <li> <b>y</b> - for two digit representation of a year
@@ -19,12 +16,12 @@ Time Format.&lt;br/&gt; &lt;br/&gt;You have to put:
     <li> <b>.u</b> - for milliseconds, <b>3 digits after decimal point</b>
     <li> <b>.k</b> - for milliseconds, <b>1 digit after decimal point</b>
     <li> separators: " ", ":", "-"; "/" 
-  </ul><br/>
+  </ul>
    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
-  <br/><br/>
+  <br/>
       d-m-Y H:i:s.u => '30-06-2001 10:40:20.003' <br/>
       d m Y H i s.u => '30 6 2001 1 02 20.003'; timeLength => 21<br/>
       Y/d/m H-i-s => '2001/30/06 10-40-20' <br/>
    etc...
-<br/><br/>
+<br/>
 <b>Valid time range: 1970-01-01 - 2038-01-19</b>