Fix variables for the generated Shahriar c code.

2 files changed, 38 insertions, 37 deletions

diff --git a/xmds2/Shahriar_system/GenerateShahriarSystem.nb b/xmds2/Shahriar_system/GenerateShahriarSystem.nb
index 1c4367c..f5dcb38 100644
--- a/xmds2/Shahriar_system/GenerateShahriarSystem.nb
+++ b/xmds2/Shahriar_system/GenerateShahriarSystem.nb
@@ -10,10 +10,10 @@
 NotebookFileLineBreakTest

 NotebookFileLineBreakTest

 NotebookDataPosition[       145,          7]

-NotebookDataLength[     63341,       1878]

-NotebookOptionsPosition[     61116,       1798]

-NotebookOutlinePosition[     61481,       1814]

-CellTagsIndexPosition[     61438,       1811]

+NotebookDataLength[     63326,       1879]

+NotebookOptionsPosition[     61101,       1799]

+NotebookOutlinePosition[     61466,       1815]

+CellTagsIndexPosition[     61423,       1812]

 WindowFrame->Normal*)

 

 (* Beginning of Notebook Content *)

@@ -1291,7 +1291,9 @@ Cell[BoxData[{
         RowBox[{"\[Gamma]p", "\[Rule]", 

          RowBox[{"2", "gp"}]}], ",", 

         RowBox[{"\[Gamma]t", "\[Rule]", 

-         RowBox[{"2", "gt"}]}]}], "}"}]}], ",", 

+         RowBox[{"2", "gt"}]}], ",", 

+        RowBox[{"\[Delta]1", "\[Rule]", "d1"}], ",", 

+        RowBox[{"\[Delta]a", "\[Rule]", "da"}]}], "}"}]}], ",", 

      RowBox[{"DMElementPattern", "[", "]"}], ",", "FullSimplify"}], "]"}], "/.", 

    RowBox[{

     RowBox[{

@@ -1379,8 +1381,8 @@ Cell[BoxData[
        RowBox[{

         RowBox[{"-", "gp"}], "-", 

         RowBox[{"2", " ", "gt"}], "-", 

-        RowBox[{"i", " ", "\[Delta]1"}], "+", 

-        RowBox[{"i", " ", "\[Delta]a"}]}], ")"}], " ", 

+        RowBox[{"d1", " ", "i"}], "+", 

+        RowBox[{"da", " ", "i"}]}], ")"}], " ", 

       SubscriptBox["r", 

        RowBox[{"1", ",", "2"}]]}], "-", 

      RowBox[{"i", " ", 

@@ -1417,7 +1419,7 @@ Cell[BoxData[
        RowBox[{

         RowBox[{"-", "G"}], "-", "gp", "-", 

         RowBox[{"2", " ", "gt"}], "-", 

-        RowBox[{"i", " ", "\[Delta]1"}]}], ")"}], " ", 

+        RowBox[{"d1", " ", "i"}]}], ")"}], " ", 

       SubscriptBox["r", 

        RowBox[{"1", ",", "3"}]]}], "+", 

      RowBox[{"E1c", " ", "i", " ", 

@@ -1427,14 +1429,13 @@ Cell[BoxData[
     SubscriptBox["dr", 

      RowBox[{"2", ",", "1"}]], "\[Equal]", 

     RowBox[{

-     RowBox[{

+     RowBox[{"i", " ", 

       RowBox[{"(", 

-       RowBox[{

-        RowBox[{"-", "gp"}], "-", 

-        RowBox[{"2", " ", "gt"}], "+", 

-        RowBox[{"i", " ", 

+       RowBox[{"d1", "-", "da", "+", 

+        RowBox[{

          RowBox[{"(", 

-          RowBox[{"\[Delta]1", "-", "\[Delta]a"}], ")"}]}]}], ")"}], " ", 

+          RowBox[{"gp", "+", 

+           RowBox[{"2", " ", "gt"}]}], ")"}], " ", "i"}]}], ")"}], " ", 

       SubscriptBox["r", 

        RowBox[{"2", ",", "1"}]]}], "-", 

      RowBox[{"E1", " ", "i", " ", 

@@ -1499,7 +1500,7 @@ Cell[BoxData[
        RowBox[{

         RowBox[{"-", "G"}], "-", 

         RowBox[{"2", " ", "gt"}], "-", 

-        RowBox[{"i", " ", "\[Delta]a"}]}], ")"}], " ", 

+        RowBox[{"da", " ", "i"}]}], ")"}], " ", 

       SubscriptBox["r", 

        RowBox[{"2", ",", "3"}]]}], "+", 

      RowBox[{"i", " ", 

@@ -1532,7 +1533,7 @@ Cell[BoxData[
        RowBox[{

         RowBox[{"-", "G"}], "-", "gp", "-", 

         RowBox[{"2", " ", "gt"}], "+", 

-        RowBox[{"i", " ", "\[Delta]1"}]}], ")"}], " ", 

+        RowBox[{"d1", " ", "i"}]}], ")"}], " ", 

       SubscriptBox["r", 

        RowBox[{"3", ",", "1"}]]}], "-", 

      RowBox[{"E1", " ", "i", " ", 

@@ -1559,7 +1560,7 @@ Cell[BoxData[
        RowBox[{

         RowBox[{"-", "G"}], "-", 

         RowBox[{"2", " ", "gt"}], "+", 

-        RowBox[{"i", " ", "\[Delta]a"}]}], ")"}], " ", 

+        RowBox[{"da", " ", "i"}]}], ")"}], " ", 

       SubscriptBox["r", 

        RowBox[{"3", ",", "2"}]]}], "-", 

      RowBox[{"i", " ", 

@@ -1638,8 +1639,8 @@ Cell[BoxData[
        RowBox[{

         RowBox[{"-", "gp"}], "-", 

         RowBox[{"2", " ", "gt"}], "-", 

-        RowBox[{"i", " ", "\[Delta]1"}], "+", 

-        RowBox[{"i", " ", "\[Delta]a"}]}], ")"}], " ", 

+        RowBox[{"d1", " ", "i"}], "+", 

+        RowBox[{"da", " ", "i"}]}], ")"}], " ", 

       SubscriptBox["r", 

        RowBox[{"1", ",", "2"}]]}], "-", 

      RowBox[{"i", " ", 

@@ -1676,7 +1677,7 @@ Cell[BoxData[
        RowBox[{

         RowBox[{"-", "G"}], "-", "gp", "-", 

         RowBox[{"2", " ", "gt"}], "-", 

-        RowBox[{"i", " ", "\[Delta]1"}]}], ")"}], " ", 

+        RowBox[{"d1", " ", "i"}]}], ")"}], " ", 

       SubscriptBox["r", 

        RowBox[{"1", ",", "3"}]]}], "+", 

      RowBox[{"E1c", " ", "i", " ", 

@@ -1732,7 +1733,7 @@ Cell[BoxData[
        RowBox[{

         RowBox[{"-", "G"}], "-", 

         RowBox[{"2", " ", "gt"}], "-", 

-        RowBox[{"i", " ", "\[Delta]a"}]}], ")"}], " ", 

+        RowBox[{"da", " ", "i"}]}], ")"}], " ", 

       SubscriptBox["r", 

        RowBox[{"2", ",", "3"}]]}], "+", 

      RowBox[{"i", " ", 

@@ -1782,14 +1783,14 @@ Cell[BoxData[
        RowBox[{"3", ",", "3"}]]}]}]}]}], "}"}]], "Output"],

 

 Cell[BoxData["\<\"dr11_dt = gt - 2*(gp + gt)*r11 - E1*i*r13 + E1c*i*r31 + \

-G*r33;\\ndr12_dt = (-gp - 2*gt - i*\[Delta]1 + i*\[Delta]a)*r12 - i*(E2*d(t) \

-+ E3*dc(t))*r13 + E1c*i*r32;\\ndr13_dt = -(E1c*i*r11) - i*(E3c*d(t) + \

-E2c*dc(t))*r12 + (-G - gp - 2*gt - i*\[Delta]1)*r13 + E1c*i*r33;\\ndr22_dt = \

-gt - 2*gt*r22 - i*(E2*d(t) + E3*dc(t))*r23 + i*(E3c*d(t) + E2c*dc(t))*r32 + \

-G*r33;\\ndr23_dt = -(E1c*i*r21) - i*(E3c*d(t) + E2c*dc(t))*r22 + (-G - 2*gt - \

-i*\[Delta]a)*r23 + i*(E3c*d(t) + E2c*dc(t))*r33;\\ndr33_dt = 2*gp*r11 + \

-E1*i*r13 + i*(E2*d(t) + E3*dc(t))*r23 - E1c*i*r31 - i*(E3c*d(t) + \

-E2c*dc(t))*r32 - 2*(G + gt)*r33;\\n\"\>"], "Output"],

+G*r33;\\ndr12_dt = (-gp - 2*gt - d1*i + da*i)*r12 - i*(E2*d(t) + \

+E3*dc(t))*r13 + E1c*i*r32;\\ndr13_dt = -(E1c*i*r11) - i*(E3c*d(t) + \

+E2c*dc(t))*r12 + (-G - gp - 2*gt - d1*i)*r13 + E1c*i*r33;\\ndr22_dt = gt - \

+2*gt*r22 - i*(E2*d(t) + E3*dc(t))*r23 + i*(E3c*d(t) + E2c*dc(t))*r32 + G*r33;\

+\\ndr23_dt = -(E1c*i*r21) - i*(E3c*d(t) + E2c*dc(t))*r22 + (-G - 2*gt - \

+da*i)*r23 + i*(E3c*d(t) + E2c*dc(t))*r33;\\ndr33_dt = 2*gp*r11 + E1*i*r13 + \

+i*(E2*d(t) + E3*dc(t))*r23 - E1c*i*r31 - i*(E3c*d(t) + E2c*dc(t))*r32 - 2*(G \

++ gt)*r33;\\n\"\>"], "Output"],

 

 Cell[BoxData["\<\"C:\\\\cygwin\\\\home\\\\Simon\\\\Nresonances\\\\xmds2\\\\\

 Shahriar_system\\\\\\\\code.txt\"\>"], "Output"]

@@ -1873,11 +1874,11 @@ Cell[18678, 596, 23733, 623, 315, "Output"]
 }, Open  ]],

 Cell[42426, 1222, 34, 0, 29, "Text"],

 Cell[CellGroupData[{

-Cell[42485, 1226, 4538, 123, 228, "Input"],

-Cell[47026, 1351, 7965, 257, 164, "Output"],

-Cell[54994, 1610, 5305, 171, 107, "Output"],

-Cell[60302, 1783, 658, 8, 145, "Output"],

-Cell[60963, 1793, 125, 1, 30, "Output"]

+Cell[42485, 1226, 4646, 125, 233, "Input"],

+Cell[47134, 1353, 7898, 256, 164, "Output"],

+Cell[55035, 1611, 5277, 171, 107, "Output"],

+Cell[60315, 1784, 630, 8, 145, "Output"],

+Cell[60948, 1794, 125, 1, 30, "Output"]

 }, Open  ]]

 }, Open  ]]

 }

diff --git a/xmds2/Shahriar_system/code.txt b/xmds2/Shahriar_system/code.txt
index 8c80657..ca9c197 100644
--- a/xmds2/Shahriar_system/code.txt
+++ b/xmds2/Shahriar_system/code.txt
@@ -1,6 +1,6 @@
 dr11_dt = gt - 2*(gp + gt)*r11 - E1*i*r13 + E1c*i*r31 + G*r33;

-dr12_dt = (-gp - 2*gt - i*δ1 + i*δa)*r12 - i*(E2*d(t) + E3*dc(t))*r13 + E1c*i*r32;

-dr13_dt = -(E1c*i*r11) - i*(E3c*d(t) + E2c*dc(t))*r12 + (-G - gp - 2*gt - i*δ1)*r13 + E1c*i*r33;

+dr12_dt = (-gp - 2*gt - d1*i + da*i)*r12 - i*(E2*d(t) + E3*dc(t))*r13 + E1c*i*r32;

+dr13_dt = -(E1c*i*r11) - i*(E3c*d(t) + E2c*dc(t))*r12 + (-G - gp - 2*gt - d1*i)*r13 + E1c*i*r33;

 dr22_dt = gt - 2*gt*r22 - i*(E2*d(t) + E3*dc(t))*r23 + i*(E3c*d(t) + E2c*dc(t))*r32 + G*r33;

-dr23_dt = -(E1c*i*r21) - i*(E3c*d(t) + E2c*dc(t))*r22 + (-G - 2*gt - i*δa)*r23 + i*(E3c*d(t) + E2c*dc(t))*r33;

+dr23_dt = -(E1c*i*r21) - i*(E3c*d(t) + E2c*dc(t))*r22 + (-G - 2*gt - da*i)*r23 + i*(E3c*d(t) + E2c*dc(t))*r33;

 dr33_dt = 2*gp*r11 + E1*i*r13 + i*(E2*d(t) + E3*dc(t))*r23 - E1c*i*r31 - i*(E3c*d(t) + E2c*dc(t))*r32 - 2*(G + gt)*r33;