Changes in XMDS code generation.

1 files changed, 16 insertions, 38 deletions

diff --git a/mathemathica_fwm/RbXMDSSetup.nb b/mathemathica_fwm/RbXMDSSetup.nb
index 4d47e7e..9bf3c34 100755
--- a/mathemathica_fwm/RbXMDSSetup.nb
+++ b/mathemathica_fwm/RbXMDSSetup.nb
@@ -727,7 +727,6 @@ Cell[BoxData[
           "\"\<\!\(\*SuperscriptBox[\(\[VeryThinSpace]\), \
 \(2\)]\)\!\(\*SubscriptBox[\(S\), \(1/2\)]\)\>\"", ",", 
            RowBox[{"SingleLetterItalics", "\[Rule]", "False"}]}], "]"}], ",", 
-         
          RowBox[{"{", 
           RowBox[{
            RowBox[{"-", "2.9"}], ",", "0"}], "}"}]}], "]"}], ",", 
@@ -738,7 +737,6 @@ Cell[BoxData[
           "\"\<\!\(\*SuperscriptBox[\(\[VeryThinSpace]\), \
 \(2\)]\)\!\(\*SubscriptBox[\(P\), \(1/2\)]\)\>\"", ",", 
            RowBox[{"SingleLetterItalics", "\[Rule]", "False"}]}], "]"}], ",", 
-         
          RowBox[{"{", 
           RowBox[{
            RowBox[{"-", "2.9"}], ",", "1.6"}], "}"}]}], "]"}], ",", 
@@ -749,7 +747,6 @@ Cell[BoxData[
           "\"\<\!\(\*SuperscriptBox[\(\[VeryThinSpace]\), \
 \(2\)]\)\!\(\*SubscriptBox[\(P\), \(3/2\)]\)\>\"", ",", 
            RowBox[{"SingleLetterItalics", "\[Rule]", "False"}]}], "]"}], ",", 
-         
          RowBox[{"{", 
           RowBox[{
            RowBox[{"-", "2.9"}], ",", "2.7"}], "}"}]}], "]"}]}], "}"}]}], ",", 
@@ -1377,7 +1374,6 @@ Cell[BoxData[{
         RowBox[{"{", 
          RowBox[{
           RowBox[{"-", "2.9"}], ",", "2.7"}], "}"}]}], "]"}]}], "}"}]}], ",", 
-   
    RowBox[{"ImageSize", "\[Rule]", 
     RowBox[{"3.5", " ", "72"}]}], ",", 
    RowBox[{"ImagePadding", "\[Rule]", 
@@ -1480,7 +1476,7 @@ Cell[BoxData[{
       RowBox[{"Mega", "\[Rule]", 
        SuperscriptBox["10", "6"]}]}], "/.", 
      RowBox[{"Hertz", "\[Rule]", "1"}]}], "/.", 
-    RowBox[{"Centimeter", "\[Rule]", "1"}]}], "/.", 
+    RowBox[{"Centimeter", "\[Rule]", ".01"}]}], "/.", 
    RowBox[{"Rule", "\[Rule]", "Equal"}]}], "/.", 
   RowBox[{"{", 
    RowBox[{
@@ -1494,7 +1490,7 @@ Cell[BoxData[{
    RowBox[{"StringJoin", "[", 
     RowBox[{
      RowBox[{
-      RowBox[{
+      RowBox[{"\"\<const double \>\"", "<>", 
        RowBox[{"ToString", "@", 
         RowBox[{"CForm", "[", "#", "]"}]}], "<>", "\"\<;\\n\>\""}], "&"}], "/@",
       "%"}], "]"}], ",", 
@@ -1517,18 +1513,18 @@ Cell[BoxData[{
      RowBox[{
       RowBox[{"\"\<ha(\>\"", "~~", "a_", "~~", "\"\<)\>\""}], 
       "\[RuleDelayed]", 
-      RowBox[{"\"\<const double ha\>\"", "<>", "a"}]}], ",", 
+      RowBox[{"\"\<ha\>\"", "<>", "a"}]}], ",", 
      RowBox[{
       RowBox[{"\"\<hb(\>\"", "~~", "a_", "~~", "\"\<)\>\""}], 
       "\[RuleDelayed]", 
-      RowBox[{"\"\<const double hb\>\"", "<>", "a"}]}], ",", 
+      RowBox[{"\"\<hb\>\"", "<>", "a"}]}], ",", 
      RowBox[{
       RowBox[{"\"\<lambda(\>\"", "~~", "a_", "~~", "\"\<)\>\""}], 
       "\[RuleDelayed]", 
-      RowBox[{"\"\<const double lambda\>\"", "<>", "a"}]}], ",", 
+      RowBox[{"\"\<lambda\>\"", "<>", "a"}]}], ",", 
      RowBox[{
       RowBox[{"\"\<g(\>\"", "~~", "a_", "~~", "\"\<)\>\""}], "\[RuleDelayed]", 
-      RowBox[{"\"\<const double g\>\"", "<>", "a"}]}], ",", 
+      RowBox[{"\"\<g\>\"", "<>", "a"}]}], ",", 
      RowBox[{
       RowBox[{"\"\<W(\>\"", "~~", "a_", "~~", "\"\<)\>\""}], "\[RuleDelayed]", 
       RowBox[{"\"\<E\>\"", "<>", "a"}]}], ",", 
@@ -1539,14 +1535,8 @@ Cell[BoxData[{
      RowBox[{
       RowBox[{"\"\<d(\>\"", "~~", "a_", "~~", "\"\<)\>\""}], "\[RuleDelayed]", 
       RowBox[{"\"\<d\>\"", "<>", "a"}]}], ",", " ", 
-     RowBox[{
-     "\"\<rt\>\"", "\[RuleDelayed]", " ", "\"\<const double rt\>\""}]}], 
-    "}"}]}], "]"}]}], "Input",
- CellChangeTimes->{{3.557577613086402*^9, 3.557577705341272*^9}, {
-  3.557577737830722*^9, 3.557577743453672*^9}, {3.557577791685976*^9, 
-  3.557577804713066*^9}, {3.55757785531134*^9, 3.557577869097969*^9}, {
-  3.557577909846743*^9, 3.557577914049493*^9}, {3.557577958346201*^9, 
-  3.557577990666655*^9}}],
+     RowBox[{"\"\<rt\>\"", "\[RuleDelayed]", " ", "\"\<rt\>\""}]}], "}"}]}], 
+  "]"}]}], "Input"],
 
 Cell[BoxData[
  RowBox[{"Export", "[", 
@@ -1593,20 +1583,7 @@ Cell[BoxData[{
     RowBox[{
      RowBox[{
       RowBox[{
-       RowBox[{
-        RowBox[{"Join", "[", 
-         RowBox[{
-          RowBox[{"{", 
-           RowBox[{
-            RowBox[{"rt6", "==", 
-             RowBox[{"N", "[", 
-              SqrtBox["6"], "]"}]}], ",", 
-            RowBox[{"rt3", "==", 
-             RowBox[{"N", "[", 
-              SqrtBox["3"], "]"}]}], ",", 
-            RowBox[{"rt2", "==", 
-             RowBox[{"N", "[", 
-              SqrtBox["2"], "]"}]}]}], "}"}], ",", "eqs1"}], "]"}], "/.", 
+       RowBox[{"eqs1", "/.", 
         RowBox[{"{", 
          RowBox[{
           RowBox[{
@@ -2104,7 +2081,6 @@ Cell[BoxData[
       RowBox[{
        RowBox[{
        "subsys", "\[LeftDoubleBracket]", "k", "\[RightDoubleBracket]"}], ",", 
-       
        RowBox[{
         RowBox[{
          RowBox[{"4", "\[Pi]", " ", "\[ImaginaryI]", " ", 
@@ -2234,7 +2210,10 @@ Cell[BoxData[{
       RowBox[{"propeqs", "/.", 
        RowBox[{"{", 
         RowBox[{
-         RowBox[{"\[Eta]", "\[Rule]", "eta"}], ",", 
+         RowBox[{
+          RowBox[{"\[Eta]", "[", "s_", "]"}], "\[Rule]", 
+          RowBox[{"Ndens", " ", 
+           RowBox[{"eta", "[", "s", "]"}]}]}], ",", 
          RowBox[{"NaturalWidth", "\[Rule]", "g"}], ",", 
          RowBox[{
           RowBox[{
@@ -2258,7 +2237,6 @@ Cell[BoxData[{
      RowBox[{"Power", "[", 
       RowBox[{
        RowBox[{"_", "?", "NumericQ"}], ",", "_"}], "]"}]}], "\[RuleDelayed]", 
-    
     RowBox[{"N", "[", "a", "]"}]}]}], "//", 
   "Simplify"}], "\[IndentingNewLine]", 
  RowBox[{"StringJoin", "[", 
@@ -2325,11 +2303,11 @@ Cell[BoxData[{
      "\"\<RbPropEquations.txt\>\""}], "]"}], ",", "%"}], "]"}]}], "Input"]
 }, Open  ]]
 },
-WindowSize->{956, 980},
-WindowMargins->{{Automatic, 0}, {26, Automatic}},
+WindowSize->{1043, 928},
+WindowMargins->{{-1, Automatic}, {Automatic, 2}},
 PrivateNotebookOptions->{"FileOutlineCache"->False},
 ShowSelection->True,
-FrontEndVersion->"8.0 for Linux x86 (32-bit) (February 23, 2011)",
+FrontEndVersion->"8.0 for Microsoft Windows (64-bit) (October 6, 2011)",
 StyleDefinitions->"Default.nb"
 ]