From aeeeb3a41ba3df163dede45c37efe74c6ce71ca3 Mon Sep 17 00:00:00 2001
From: Eugeniy Mikhailov <evgmik@gmail.com>
Date: Wed, 28 Nov 2012 23:36:08 -0500
Subject: completed move of mathematica generated files to includes

---
 xmds2/realistic_Rb/RbAtomConstans.cdata  | 18 ------------------
 xmds2/realistic_Rb/RbAtomConstants.cdata | 18 ++++++++++++++++++
 xmds2/realistic_Rb/RbPropEquations.cdata |  8 ++++++++
 xmds2/realistic_Rb/realistic_Rb.xmds     | 16 +++++-----------
 4 files changed, 31 insertions(+), 29 deletions(-)
 delete mode 100644 xmds2/realistic_Rb/RbAtomConstans.cdata
 create mode 100644 xmds2/realistic_Rb/RbAtomConstants.cdata
 create mode 100644 xmds2/realistic_Rb/RbPropEquations.cdata

(limited to 'xmds2/realistic_Rb')

diff --git a/xmds2/realistic_Rb/RbAtomConstans.cdata b/xmds2/realistic_Rb/RbAtomConstans.cdata
deleted file mode 100644
index 040d3c9..0000000
--- a/xmds2/realistic_Rb/RbAtomConstans.cdata
+++ /dev/null
@@ -1,18 +0,0 @@
-<![CDATA[
-//---------------- RbAtomConstans.cdata starts ------------------
-const double ha0 = 2.1471788680034824e10;
-const double ha1 = 2.558764384495815e9;
-const double g1 = 3.612847284945266e7;
-const double ha2 = 5.323020344462938e8;
-const double hb2 = 7.85178251911697e7;
-const double g2 = 3.8117309832741246e7;
-const double lambda1 = 7.949788511562656e-7;
-const double lambda2 = 7.802412096860509e-7;
-const double eta1 = 5.450949336831401e-6;
-const double eta2 = 5.5397657647874e-6;
-const double rt6 = 2.449489742783178;
-const double rt3 = 1.7320508075688772;
-const double rt2 = 1.4142135623730951;
-//---------------- RbAtomConstans.cdata ends   ------------------
-]]>
-
diff --git a/xmds2/realistic_Rb/RbAtomConstants.cdata b/xmds2/realistic_Rb/RbAtomConstants.cdata
new file mode 100644
index 0000000..040d3c9
--- /dev/null
+++ b/xmds2/realistic_Rb/RbAtomConstants.cdata
@@ -0,0 +1,18 @@
+<![CDATA[
+//---------------- RbAtomConstans.cdata starts ------------------
+const double ha0 = 2.1471788680034824e10;
+const double ha1 = 2.558764384495815e9;
+const double g1 = 3.612847284945266e7;
+const double ha2 = 5.323020344462938e8;
+const double hb2 = 7.85178251911697e7;
+const double g2 = 3.8117309832741246e7;
+const double lambda1 = 7.949788511562656e-7;
+const double lambda2 = 7.802412096860509e-7;
+const double eta1 = 5.450949336831401e-6;
+const double eta2 = 5.5397657647874e-6;
+const double rt6 = 2.449489742783178;
+const double rt3 = 1.7320508075688772;
+const double rt2 = 1.4142135623730951;
+//---------------- RbAtomConstans.cdata ends   ------------------
+]]>
+
diff --git a/xmds2/realistic_Rb/RbPropEquations.cdata b/xmds2/realistic_Rb/RbPropEquations.cdata
new file mode 100644
index 0000000..2a30be4
--- /dev/null
+++ b/xmds2/realistic_Rb/RbPropEquations.cdata
@@ -0,0 +1,8 @@
+<![CDATA[
+//---------------- RbPropEquations.cdata starts ------------------
+dE1_dz = 0.16666666666666666*i*Ndens*(2.449489742783178*conj(r0309) + 4.242640687119286*conj(r0410) + 6.*conj(r0511))*eta1 - Lt[E1];
+dE2_dz = -0.4082482904638631*i*Ndens*(conj(r0709) + conj(r0810))*eta1 - Lt[E2];
+dE3_dz = -0.3333333333333333*i*Ndens*(1.7320508075688772*conj(r0614) + 3.*conj(r0715) + 4.242640687119286*conj(r0816))*eta2 - Lt[E3];
+dE4_dz = (i*Ndens*(2.449489742783178*conj(r0113) + 3*conj(r0214) + 3*conj(r0315) + 2.449489742783178*conj(r0416))*eta2)/3. - Lt[E4];
+//---------------- RbPropEquations.cdata ends  ------------------
+]]>
diff --git a/xmds2/realistic_Rb/realistic_Rb.xmds b/xmds2/realistic_Rb/realistic_Rb.xmds
index 7744dd8..e3a5367 100644
--- a/xmds2/realistic_Rb/realistic_Rb.xmds
+++ b/xmds2/realistic_Rb/realistic_Rb.xmds
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <!--Below text defines necessary included files and references to them-->
 <!DOCTYPE simulation [
-<!ENTITY RbAtomConstansFile SYSTEM "RbAtomConstans.cdata" >
+<!ENTITY RbAtomConstantsFile SYSTEM "RbAtomConstants.cdata" >
 <!ENTITY RbChosenRhoFile SYSTEM "RbChosenRho.txt" >
 <!ENTITY RbInitsFile SYSTEM "RbInits.cdata" >
 <!ENTITY RbEquationsFile SYSTEM "RbEquations.cdata" >
+<!ENTITY RbPropEquationsFile SYSTEM "RbPropEquations.cdata" >
 ]>
 <simulation xmds-version="2">
 	<testing>
@@ -57,7 +58,7 @@
 	<features>
 		<globals>
 			<!-- read from Mathematica generated RbAtomConstans.cdata-->
-			&RbAtomConstansFile;
+			&RbAtomConstantsFile;
 			<![CDATA[
 				// Some numerical constants
 				const double pi = M_PI; 
@@ -291,15 +292,8 @@
 				</operator>
         <integration_vectors>E_field</integration_vectors>
 				<dependencies>density_matrix</dependencies>
-				<![CDATA[
-				//read from Mathematica generated RbPropEquations.txt
-//---------------- RbPropEquations.txt starts ------------------
-dE1_dz = 0.16666666666666666*i*Ndens*(2.449489742783178*conj(r0309) + 4.242640687119286*conj(r0410) + 6.*conj(r0511))*eta1 - Lt[E1];
-dE2_dz = -0.4082482904638631*i*Ndens*(conj(r0709) + conj(r0810))*eta1 - Lt[E2];
-dE3_dz = -0.3333333333333333*i*Ndens*(1.7320508075688772*conj(r0614) + 3.*conj(r0715) + 4.242640687119286*conj(r0816))*eta2 - Lt[E3];
-dE4_dz = (i*Ndens*(2.449489742783178*conj(r0113) + 3*conj(r0214) + 3*conj(r0315) + 2.449489742783178*conj(r0416))*eta2)/3. - Lt[E4];
-//---------------- RbPropEquations.txt ends  ------------------
-				]]>
+				<!-- read from Mathematica generated RbPropEquations.cdata-->
+				&RbPropEquationsFile;
 			</operators>
 		</integrate>
 	</sequence>
-- 
cgit v1.2.3