some mathematica generated files are now inserted via c++ #include

3 files changed, 163 insertions, 155 deletions

diff --git a/xmds2/realistic_Rb_and_fields/RbAtomConstants.h b/xmds2/realistic_Rb_and_fields/RbAtomConstants.h
new file mode 100644
index 0000000..5be3a6e
--- /dev/null
+++ b/xmds2/realistic_Rb_and_fields/RbAtomConstants.h
@@ -0,0 +1,15 @@
+//---------------- Constants.txt 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;
+//---------------- Constants.txt ends   ------------------
diff --git a/xmds2/realistic_Rb_and_fields/RbInits.h b/xmds2/realistic_Rb_and_fields/RbInits.h
new file mode 100644
index 0000000..e4926b2
--- /dev/null
+++ b/xmds2/realistic_Rb_and_fields/RbInits.h
@@ -0,0 +1,138 @@
+//---------------- RbInits.txt starts ------------------
+r0101 = 0.125;
+r0109 = 0;
+r0110 = 0;
+r0111 = 0;
+r0112 = 0;
+r0113 = 0;
+r0114 = 0;
+r0115 = 0;
+r0116 = 0;
+r0201 = 0;
+r0202 = 0.125;
+r0209 = 0;
+r0210 = 0;
+r0211 = 0;
+r0212 = 0;
+r0213 = 0;
+r0214 = 0;
+r0215 = 0;
+r0216 = 0;
+r0301 = 0;
+r0302 = 0;
+r0303 = 0.125;
+r0309 = 0;
+r0310 = 0;
+r0311 = 0;
+r0312 = 0;
+r0313 = 0;
+r0314 = 0;
+r0315 = 0;
+r0316 = 0;
+r0401 = 0;
+r0402 = 0;
+r0403 = 0;
+r0404 = 0.125;
+r0409 = 0;
+r0410 = 0;
+r0411 = 0;
+r0412 = 0;
+r0413 = 0;
+r0414 = 0;
+r0415 = 0;
+r0416 = 0;
+r0501 = 0;
+r0502 = 0;
+r0503 = 0;
+r0504 = 0;
+r0505 = 0.125;
+r0509 = 0;
+r0510 = 0;
+r0511 = 0;
+r0512 = 0;
+r0513 = 0;
+r0514 = 0;
+r0515 = 0;
+r0516 = 0;
+r0601 = 0;
+r0602 = 0;
+r0603 = 0;
+r0604 = 0;
+r0605 = 0;
+r0606 = 0.125;
+r0609 = 0;
+r0610 = 0;
+r0611 = 0;
+r0612 = 0;
+r0613 = 0;
+r0614 = 0;
+r0615 = 0;
+r0616 = 0;
+r0701 = 0;
+r0702 = 0;
+r0703 = 0;
+r0704 = 0;
+r0705 = 0;
+r0706 = 0;
+r0707 = 0.125;
+r0709 = 0;
+r0710 = 0;
+r0711 = 0;
+r0712 = 0;
+r0713 = 0;
+r0714 = 0;
+r0715 = 0;
+r0716 = 0;
+r0801 = 0;
+r0802 = 0;
+r0803 = 0;
+r0804 = 0;
+r0805 = 0;
+r0806 = 0;
+r0807 = 0;
+r0808 = 0.125;
+r0809 = 0;
+r0810 = 0;
+r0811 = 0;
+r0812 = 0;
+r0813 = 0;
+r0814 = 0;
+r0815 = 0;
+r0816 = 0;
+r0909 = 0;
+r0912 = 0;
+r0913 = 0;
+r0914 = 0;
+r0915 = 0;
+r0916 = 0;
+r1009 = 0;
+r1010 = 0;
+r1012 = 0;
+r1013 = 0;
+r1014 = 0;
+r1015 = 0;
+r1016 = 0;
+r1109 = 0;
+r1110 = 0;
+r1111 = 0;
+r1112 = 0;
+r1113 = 0;
+r1114 = 0;
+r1115 = 0;
+r1116 = 0;
+r1212 = 0;
+r1312 = 0;
+r1313 = 0;
+r1412 = 0;
+r1413 = 0;
+r1414 = 0;
+r1512 = 0;
+r1513 = 0;
+r1514 = 0;
+r1515 = 0;
+r1612 = 0;
+r1613 = 0;
+r1614 = 0;
+r1615 = 0;
+r1616 = 0;
+//---------------- RbInits.txt ends  ------------------
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 5b00664..d10dbad 100644
--- a/xmds2/realistic_Rb_and_fields/realistic_Rb_and_fields.xmds
+++ b/xmds2/realistic_Rb_and_fields/realistic_Rb_and_fields.xmds
@@ -1,4 +1,9 @@
 <?xml version="1.0"?>
+<!--Below text defines necessary included files and references to them-->
+<!DOCTYPE simulation [
+<!ENTITY RbChosenRhoFile SYSTEM "RbChosenRho.txt" >
+<!ENTITY RbEquationsFile SYSTEM "RbEquations.txt" >
+]>
 <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  --Ep1o=1e4 --Ep2o=1e2 --Ep3o=1e1 --Ep4o=1e1 --Em1o=1e4 --Em2o=1e2 --Em3o=1e1 --Em4o=1e1 --WLx=0 --WLy=0 --WLz=0</arguments>
@@ -54,22 +59,8 @@
 				const double pi = M_PI; 
 
 				// atom related constants
-				//read from Mathematica generated Constants.txt
-//---------------- Constants.txt 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;
-//---------------- Constants.txt ends   ------------------
+				//read from Mathematica generated RbAtomConstants.h
+				#include "RbAtomConstants.h"
 
 				const double c=3.e8;
 				const double k_boltzmann= 1.3806505e-23; // Boltzmann knostant in [J/K]
@@ -258,145 +249,8 @@ r0101 r0109 r0110 r0111 r0112 r0113 r0114 r0115 r0116 r0201 r0202 r0209 r0210 r0
 			//       and express other level, let's say r44
 			//       through population normalization
 
-			//read from Mathematica generated RbInits.txt
-//---------------- RbInits.txt starts ------------------
-r0101 = 0.125;
-r0109 = 0;
-r0110 = 0;
-r0111 = 0;
-r0112 = 0;
-r0113 = 0;
-r0114 = 0;
-r0115 = 0;
-r0116 = 0;
-r0201 = 0;
-r0202 = 0.125;
-r0209 = 0;
-r0210 = 0;
-r0211 = 0;
-r0212 = 0;
-r0213 = 0;
-r0214 = 0;
-r0215 = 0;
-r0216 = 0;
-r0301 = 0;
-r0302 = 0;
-r0303 = 0.125;
-r0309 = 0;
-r0310 = 0;
-r0311 = 0;
-r0312 = 0;
-r0313 = 0;
-r0314 = 0;
-r0315 = 0;
-r0316 = 0;
-r0401 = 0;
-r0402 = 0;
-r0403 = 0;
-r0404 = 0.125;
-r0409 = 0;
-r0410 = 0;
-r0411 = 0;
-r0412 = 0;
-r0413 = 0;
-r0414 = 0;
-r0415 = 0;
-r0416 = 0;
-r0501 = 0;
-r0502 = 0;
-r0503 = 0;
-r0504 = 0;
-r0505 = 0.125;
-r0509 = 0;
-r0510 = 0;
-r0511 = 0;
-r0512 = 0;
-r0513 = 0;
-r0514 = 0;
-r0515 = 0;
-r0516 = 0;
-r0601 = 0;
-r0602 = 0;
-r0603 = 0;
-r0604 = 0;
-r0605 = 0;
-r0606 = 0.125;
-r0609 = 0;
-r0610 = 0;
-r0611 = 0;
-r0612 = 0;
-r0613 = 0;
-r0614 = 0;
-r0615 = 0;
-r0616 = 0;
-r0701 = 0;
-r0702 = 0;
-r0703 = 0;
-r0704 = 0;
-r0705 = 0;
-r0706 = 0;
-r0707 = 0.125;
-r0709 = 0;
-r0710 = 0;
-r0711 = 0;
-r0712 = 0;
-r0713 = 0;
-r0714 = 0;
-r0715 = 0;
-r0716 = 0;
-r0801 = 0;
-r0802 = 0;
-r0803 = 0;
-r0804 = 0;
-r0805 = 0;
-r0806 = 0;
-r0807 = 0;
-r0808 = 0.125;
-r0809 = 0;
-r0810 = 0;
-r0811 = 0;
-r0812 = 0;
-r0813 = 0;
-r0814 = 0;
-r0815 = 0;
-r0816 = 0;
-r0909 = 0;
-r0912 = 0;
-r0913 = 0;
-r0914 = 0;
-r0915 = 0;
-r0916 = 0;
-r1009 = 0;
-r1010 = 0;
-r1012 = 0;
-r1013 = 0;
-r1014 = 0;
-r1015 = 0;
-r1016 = 0;
-r1109 = 0;
-r1110 = 0;
-r1111 = 0;
-r1112 = 0;
-r1113 = 0;
-r1114 = 0;
-r1115 = 0;
-r1116 = 0;
-r1212 = 0;
-r1312 = 0;
-r1313 = 0;
-r1412 = 0;
-r1413 = 0;
-r1414 = 0;
-r1512 = 0;
-r1513 = 0;
-r1514 = 0;
-r1515 = 0;
-r1612 = 0;
-r1613 = 0;
-r1614 = 0;
-r1615 = 0;
-r1616 = 0;
-//---------------- RbInits.txt ends  ------------------
+			//read from Mathematica generated RbInits.h
+			#include "RbInits.h"
 			]]>
 		</initialisation>
 	</vector>
@@ -576,6 +430,7 @@ dr1615_dt = -((gt + g2)*r1615) - i*((conj(Em4a)*conj(r0316))/8. - (conj(Ep4a)*co
 dr1616_dt = -((gt + g2)*r1616) - i*((conj(Em4a)*conj(r0416))/(4.*rt6) - (conj(Em3a)*conj(r0816))/(4.*rt2) - (Em4a*r0416)/(4.*rt6) + (Em3a*r0816)/(4.*rt2) - r1615*((2*WLx)/3. - (2*i*WLy)/3.) + conj(r1615)*((2*WLx)/3. + (2*i*WLy)/3.));
 //---------------- RbEquations.txt ends  ------------------
 					]]>
+
         </operator>
 				<!--
 							 According to xmds2 docs operator kind="ip" should be faster