From c9c327cc7ed2ce8f7438d64961696ca631979987 Mon Sep 17 00:00:00 2001
From: Eugeniy Mikhailov <evgmik@gmail.com>
Date: Tue, 27 Nov 2012 22:26:36 -0500
Subject: changed argument and variables name to a shorter version

thanks to my bugreport and patch xmds can now handle multiple similar
sounding arguments
---
 .../realistic_Rb_and_fields.xmds                   | 38 ++++++++++------------
 1 file changed, 17 insertions(+), 21 deletions(-)

diff --git a/xmds2/realistic_Rb_and_fields/realistic_Rb_and_fields.xmds b/xmds2/realistic_Rb_and_fields/realistic_Rb_and_fields.xmds
index ea6252a..7e310ae 100644
--- a/xmds2/realistic_Rb_and_fields/realistic_Rb_and_fields.xmds
+++ b/xmds2/realistic_Rb_and_fields/realistic_Rb_and_fields.xmds
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <simulation xmds-version="2">
 	<testing>
-		<arguments> --Ndens=1e15 --Lcell=10.0e-2  --Temperature=1e-3  --Pwidth=0.4e-6  --delta1=0 --delta2=0 --delta3=0  --E1o=0 --E2o=1e2 --E3o=0 --E4o=0</arguments>
+		<arguments> --Ndens=1e15 --Lcell=10.0e-2  --Temperature=1e-3  --Pwidth=0.4e-6  --delta1=0 --delta2=0 --delta3=0  --Ep1o=1e4 --Ep2o=1e2 --Ep3o=1e1 --Ep4o=1e1 --Em1o=1e4 --Em2o=1e2 --Em3o=1e1 --Em4o=1e1 --WLx=0 --WLy=0 --WLz=0</arguments>
 		<xsil_file name="realistic_Rb_and_fields.xsil" expected="realistic_Rb_and_fields_expected.xsil" absolute_tolerance="1e-7" relative_tolerance="1e-5">
 			<moment_group number="0" absolute_tolerance="1e-7" relative_tolerance="1e-6" />
 		</xsil_file>
@@ -102,18 +102,14 @@ const double rt2 = 1.4142135623730951;
 		<benchmark />
     <arguments>
 			<!-- Rabi frequency divided by 2 in [1/s] -->
-			<!--
-				Had to be very verbal with fields names, since otherwise short options name
-				algorithm runs out of choices
-			-->
-      <argument name="Ep1o_field" type="real" default_value="2*1.5*(2*M_PI*1e6)" />
-      <argument name="Em1o_field" type="real" default_value="2*1.5*(2*M_PI*1e6)" />
-      <argument name="Ep2o_field" type="real" default_value="0.05*(2*M_PI*1e6)" />
-      <argument name="Em2o_field" type="real" default_value="0.05*(2*M_PI*1e6)" />
-      <argument name="Ep3o_field" type="real" default_value="2*3.0*(2*M_PI*1e6)" />
-      <argument name="Em3o_field" type="real" default_value="2*3.0*(2*M_PI*1e6)" />
-      <argument name="Ep4o_field" type="real" default_value=".01*(2*M_PI*1e6)" />
-      <argument name="Em4o_field" type="real" default_value=".01*(2*M_PI*1e6)" />
+      <argument name="Ep1o" type="real" default_value="2*1.5*(2*M_PI*1e6)" />
+      <argument name="Em1o" type="real" default_value="2*1.5*(2*M_PI*1e6)" />
+      <argument name="Ep2o" type="real" default_value="0.05*(2*M_PI*1e6)" />
+      <argument name="Em2o" type="real" default_value="0.05*(2*M_PI*1e6)" />
+      <argument name="Ep3o" type="real" default_value="2*3.0*(2*M_PI*1e6)" />
+      <argument name="Em3o" type="real" default_value="2*3.0*(2*M_PI*1e6)" />
+      <argument name="Ep4o" type="real" default_value=".01*(2*M_PI*1e6)" />
+      <argument name="Em4o" type="real" default_value=".01*(2*M_PI*1e6)" />
 			<!-- Fields detuning in [1/s] -->
       <argument name="delta1"  type="real" default_value="0.0" />
       <argument name="delta2"  type="real" default_value="0.0" />
@@ -185,14 +181,14 @@ const double rt2 = 1.4142135623730951;
 			<![CDATA[
 			// Initial (at starting 'z' position) electromagnetic field does not depend on detuning
 			// as well as time
-			Ep1=Ep1o_field;
-			Em1=Em1o_field;
-			Ep2=Ep2o_field*exp(-pow( ((t-0.0)/Pwidth),2) );
-			Em2=Em2o_field*exp(-pow( ((t-0.0)/Pwidth),2) );
-			Ep3=Ep3o_field;
-			Em3=Em3o_field;
-			Ep4=Ep4o_field;
-			Em4=Em4o_field;
+			Ep1=Ep1o;
+			Em1=Em1o;
+			Ep2=Ep2o*exp(-pow( ((t-0.0)/Pwidth),2) );
+			Em2=Em2o*exp(-pow( ((t-0.0)/Pwidth),2) );
+			Ep3=Ep3o;
+			Em3=Em3o;
+			Ep4=Ep4o;
+			Em4=Em4o;
 			]]>
 		</initialisation>
 	</vector>
-- 
cgit v1.2.3