Merge branch 'master' of github.com:pfloos/EPAWTFT

Conflicts:
	Manuscript/EPAWTFT.blg
This commit is contained in:
Hugh Burton 2020-11-18 12:43:42 +00:00
commit 6651262e1f

View File

@ -10,10 +10,10 @@
NotebookFileLineBreakTest NotebookFileLineBreakTest
NotebookFileLineBreakTest NotebookFileLineBreakTest
NotebookDataPosition[ 158, 7] NotebookDataPosition[ 158, 7]
NotebookDataLength[ 3756452, 64945] NotebookDataLength[ 3756398, 64944]
NotebookOptionsPosition[ 3744844, 64750] NotebookOptionsPosition[ 3744844, 64750]
NotebookOutlinePosition[ 3745237, 64766] NotebookOutlinePosition[ 3745183, 64765]
CellTagsIndexPosition[ 3745194, 64763] CellTagsIndexPosition[ 3745140, 64762]
WindowFrame->Normal*) WindowFrame->Normal*)
(* Beginning of Notebook Content *) (* Beginning of Notebook Content *)
@ -64749,10 +64749,9 @@ expansions.",
}, Closed]] }, Closed]]
}, },
WindowSize->{1440, 851}, WindowSize->{1440, 851},
WindowMargins->{{0, Automatic}, {Automatic, 0}}, WindowMargins->{{0, Automatic}, {-536, Automatic}},
FrontEndVersion->"12.1 for Mac OS X x86 (64-bit) (March 13, 2020)", FrontEndVersion->"12.0 for Mac OS X x86 (64-bit) (April 8, 2019)",
StyleDefinitions->"Default.nb", StyleDefinitions->"Default.nb"
ExpressionUUID->"b81d6f16-9553-4f31-9102-5e09e8e4f569"
] ]
(* End of Notebook Content *) (* End of Notebook Content *)
@ -64772,9 +64771,9 @@ Cell[1117, 40, 577, 9, 127, "Text",ExpressionUUID->"1cb3e5d4-fca0-4c88-8866-d4ac
}, Open ]], }, Open ]],
Cell[CellGroupData[{ Cell[CellGroupData[{
Cell[1731, 54, 161, 3, 67, "Section",ExpressionUUID->"af21c9b2-b958-4962-a1f3-b38f4ea6912a"], Cell[1731, 54, 161, 3, 67, "Section",ExpressionUUID->"af21c9b2-b958-4962-a1f3-b38f4ea6912a"],
Cell[1895, 59, 532, 12, 89, "Input",ExpressionUUID->"cdc91ebe-c467-43bc-a4ad-6f77ca683c02", Cell[1895, 59, 532, 12, 68, "Input",ExpressionUUID->"cdc91ebe-c467-43bc-a4ad-6f77ca683c02",
InitializationCell->True], InitializationCell->True],
Cell[2430, 73, 24359, 599, 1120, "Input",ExpressionUUID->"1b78d52d-adad-46f9-a75a-0295b83375c5", Cell[2430, 73, 24359, 599, 1101, "Input",ExpressionUUID->"1b78d52d-adad-46f9-a75a-0295b83375c5",
InitializationCell->True] InitializationCell->True]
}, Open ]], }, Open ]],
Cell[CellGroupData[{ Cell[CellGroupData[{
@ -64813,9 +64812,9 @@ Cell[355966, 6391, 156, 3, 53, "Section",ExpressionUUID->"a32972a3-bbc9-4359-adb
Cell[356125, 6396, 511, 8, 58, "Text",ExpressionUUID->"8e1f4761-cad6-43e3-97d4-648b272ed106"], Cell[356125, 6396, 511, 8, 58, "Text",ExpressionUUID->"8e1f4761-cad6-43e3-97d4-648b272ed106"],
Cell[CellGroupData[{ Cell[CellGroupData[{
Cell[356661, 6408, 2243, 62, 69, "Input",ExpressionUUID->"4dd16f37-8c37-45ed-80ba-dd65ec31d7a8"], Cell[356661, 6408, 2243, 62, 69, "Input",ExpressionUUID->"4dd16f37-8c37-45ed-80ba-dd65ec31d7a8"],
Cell[358907, 6472, 5174, 163, 136, "Output",ExpressionUUID->"164a2310-937d-4cdb-bbc1-e23e4e3f710e"] Cell[358907, 6472, 5174, 163, 147, "Output",ExpressionUUID->"164a2310-937d-4cdb-bbc1-e23e4e3f710e"]
}, Open ]], }, Open ]],
Cell[364096, 6638, 5783, 173, 189, "Input",ExpressionUUID->"72223883-4ec4-4ef3-a96f-05390dbf9247"], Cell[364096, 6638, 5783, 173, 201, "Input",ExpressionUUID->"72223883-4ec4-4ef3-a96f-05390dbf9247"],
Cell[CellGroupData[{ Cell[CellGroupData[{
Cell[369904, 6815, 976, 27, 47, "Input",ExpressionUUID->"45b3bf2c-8df5-4cd8-a499-f7021cdb25bd"], Cell[369904, 6815, 976, 27, 47, "Input",ExpressionUUID->"45b3bf2c-8df5-4cd8-a499-f7021cdb25bd"],
Cell[370883, 6844, 1111, 35, 54, "Output",ExpressionUUID->"e36f5c94-0f6c-4457-a724-bc5332d9ae0d"] Cell[370883, 6844, 1111, 35, 54, "Output",ExpressionUUID->"e36f5c94-0f6c-4457-a724-bc5332d9ae0d"]
@ -64874,17 +64873,17 @@ Cell[1277803, 22430, 199, 4, 53, "Section",ExpressionUUID->"3854b603-a008-4f0e-b
Cell[1278005, 22436, 361, 6, 58, "Text",ExpressionUUID->"32b5cf5e-aab9-4bf0-abae-2b6923b2e903"], Cell[1278005, 22436, 361, 6, 58, "Text",ExpressionUUID->"32b5cf5e-aab9-4bf0-abae-2b6923b2e903"],
Cell[CellGroupData[{ Cell[CellGroupData[{
Cell[1278391, 22446, 181, 3, 30, "Input",ExpressionUUID->"2e011f46-99c5-4217-9435-469a096a3541"], Cell[1278391, 22446, 181, 3, 30, "Input",ExpressionUUID->"2e011f46-99c5-4217-9435-469a096a3541"],
Cell[1278575, 22451, 1045, 34, 56, "Output",ExpressionUUID->"a537d7f5-aeb6-4c60-bc00-6fefc3c86d43"] Cell[1278575, 22451, 1045, 34, 60, "Output",ExpressionUUID->"a537d7f5-aeb6-4c60-bc00-6fefc3c86d43"]
}, Open ]], }, Open ]],
Cell[1279635, 22488, 351, 6, 35, "Text",ExpressionUUID->"ee57a3c2-1718-4ad7-9bba-a3b0b944b469"], Cell[1279635, 22488, 351, 6, 35, "Text",ExpressionUUID->"ee57a3c2-1718-4ad7-9bba-a3b0b944b469"],
Cell[CellGroupData[{ Cell[CellGroupData[{
Cell[1280011, 22498, 1671, 47, 78, "Input",ExpressionUUID->"69c5aaef-072f-4d84-bdc3-8a653dd87893"], Cell[1280011, 22498, 1671, 47, 82, "Input",ExpressionUUID->"69c5aaef-072f-4d84-bdc3-8a653dd87893"],
Cell[1281685, 22547, 2985, 91, 148, "Output",ExpressionUUID->"46edaaf4-6210-4097-95e3-9431990ac15a"] Cell[1281685, 22547, 2985, 91, 156, "Output",ExpressionUUID->"46edaaf4-6210-4097-95e3-9431990ac15a"]
}, Open ]], }, Open ]],
Cell[1284685, 22641, 520, 8, 58, "Text",ExpressionUUID->"a5ef3f43-7b1a-40f7-bc5e-3884a79db05d"], Cell[1284685, 22641, 520, 8, 58, "Text",ExpressionUUID->"a5ef3f43-7b1a-40f7-bc5e-3884a79db05d"],
Cell[CellGroupData[{ Cell[CellGroupData[{
Cell[1285230, 22653, 3464, 95, 137, "Input",ExpressionUUID->"af7c449f-e708-4dec-9a95-e2a226c7965a"], Cell[1285230, 22653, 3464, 95, 145, "Input",ExpressionUUID->"af7c449f-e708-4dec-9a95-e2a226c7965a"],
Cell[1288697, 22750, 19689, 536, 576, "Output",ExpressionUUID->"b0e836df-80be-4362-8e71-80b19b38dba8"] Cell[1288697, 22750, 19689, 536, 533, "Output",ExpressionUUID->"b0e836df-80be-4362-8e71-80b19b38dba8"]
}, Open ]], }, Open ]],
Cell[1308401, 23289, 20541, 535, 455, "Input",ExpressionUUID->"2fb4d73f-58eb-41c5-8b49-bf0fd006c5c0"], Cell[1308401, 23289, 20541, 535, 455, "Input",ExpressionUUID->"2fb4d73f-58eb-41c5-8b49-bf0fd006c5c0"],
Cell[1328945, 23826, 547, 8, 81, "Text",ExpressionUUID->"5398c3b2-d083-4063-bf47-7124d8ed3084"], Cell[1328945, 23826, 547, 8, 81, "Text",ExpressionUUID->"5398c3b2-d083-4063-bf47-7124d8ed3084"],