diff --git a/Doc/newdoc/_build/doctrees/environment.pickle b/Doc/newdoc/_build/doctrees/environment.pickle index 10f4c7b..6ac20ba 100644 Binary files a/Doc/newdoc/_build/doctrees/environment.pickle and b/Doc/newdoc/_build/doctrees/environment.pickle differ diff --git a/Doc/newdoc/_build/doctrees/index.doctree b/Doc/newdoc/_build/doctrees/index.doctree index 8d2ffd9..c4096d7 100644 Binary files a/Doc/newdoc/_build/doctrees/index.doctree and b/Doc/newdoc/_build/doctrees/index.doctree differ diff --git a/Doc/newdoc/_build/doctrees/rst/C_PyGadget.doctree b/Doc/newdoc/_build/doctrees/rst/C_PyGadget.doctree index 7cb3940..2a8cd79 100644 Binary files a/Doc/newdoc/_build/doctrees/rst/C_PyGadget.doctree and b/Doc/newdoc/_build/doctrees/rst/C_PyGadget.doctree differ diff --git a/Doc/newdoc/_build/doctrees/rst/C_asciilib.doctree b/Doc/newdoc/_build/doctrees/rst/C_asciilib.doctree index 740c0b9..168f509 100644 Binary files a/Doc/newdoc/_build/doctrees/rst/C_asciilib.doctree and b/Doc/newdoc/_build/doctrees/rst/C_asciilib.doctree differ diff --git a/Doc/newdoc/_build/doctrees/rst/C_cooling_with_metals.doctree b/Doc/newdoc/_build/doctrees/rst/C_cooling_with_metals.doctree index d26e9bf..233abd1 100644 Binary files a/Doc/newdoc/_build/doctrees/rst/C_cooling_with_metals.doctree and b/Doc/newdoc/_build/doctrees/rst/C_cooling_with_metals.doctree differ diff --git a/Doc/newdoc/_build/doctrees/rst/C_coolinglib.doctree b/Doc/newdoc/_build/doctrees/rst/C_coolinglib.doctree index cdfded0..e818473 100644 Binary files a/Doc/newdoc/_build/doctrees/rst/C_coolinglib.doctree and b/Doc/newdoc/_build/doctrees/rst/C_coolinglib.doctree differ diff --git a/Doc/newdoc/_build/doctrees/rst/C_cosmolib.doctree b/Doc/newdoc/_build/doctrees/rst/C_cosmolib.doctree index bb22980..c25324e 100644 Binary files a/Doc/newdoc/_build/doctrees/rst/C_cosmolib.doctree and b/Doc/newdoc/_build/doctrees/rst/C_cosmolib.doctree differ diff --git a/Doc/newdoc/_build/doctrees/rst/C_iclib.doctree b/Doc/newdoc/_build/doctrees/rst/C_iclib.doctree index ef6a580..8473726 100644 Binary files a/Doc/newdoc/_build/doctrees/rst/C_iclib.doctree and b/Doc/newdoc/_build/doctrees/rst/C_iclib.doctree differ diff --git a/Doc/newdoc/_build/doctrees/rst/C_mapping-omp.doctree b/Doc/newdoc/_build/doctrees/rst/C_mapping-omp.doctree index 4ca6686..4e10767 100644 Binary files a/Doc/newdoc/_build/doctrees/rst/C_mapping-omp.doctree and b/Doc/newdoc/_build/doctrees/rst/C_mapping-omp.doctree differ diff --git a/Doc/newdoc/_build/doctrees/rst/C_mapping.doctree b/Doc/newdoc/_build/doctrees/rst/C_mapping.doctree index bcfb4fd..372cac1 100644 Binary files a/Doc/newdoc/_build/doctrees/rst/C_mapping.doctree and b/Doc/newdoc/_build/doctrees/rst/C_mapping.doctree differ diff --git a/Doc/newdoc/_build/doctrees/rst/C_montecarlolib.doctree b/Doc/newdoc/_build/doctrees/rst/C_montecarlolib.doctree index f1650c1..dae0795 100644 Binary files a/Doc/newdoc/_build/doctrees/rst/C_montecarlolib.doctree and b/Doc/newdoc/_build/doctrees/rst/C_montecarlolib.doctree differ diff --git a/Doc/newdoc/_build/doctrees/rst/C_myNumeric.doctree b/Doc/newdoc/_build/doctrees/rst/C_myNumeric.doctree index f24590a..b48dd78 100644 Binary files a/Doc/newdoc/_build/doctrees/rst/C_myNumeric.doctree and b/Doc/newdoc/_build/doctrees/rst/C_myNumeric.doctree differ diff --git a/Doc/newdoc/_build/doctrees/rst/C_nbdrklib.doctree b/Doc/newdoc/_build/doctrees/rst/C_nbdrklib.doctree index 58b99d1..18183a4 100644 Binary files a/Doc/newdoc/_build/doctrees/rst/C_nbdrklib.doctree and b/Doc/newdoc/_build/doctrees/rst/C_nbdrklib.doctree differ diff --git a/Doc/newdoc/_build/doctrees/rst/C_nbodymodule.doctree b/Doc/newdoc/_build/doctrees/rst/C_nbodymodule.doctree index 96934df..6f7e2b0 100644 Binary files a/Doc/newdoc/_build/doctrees/rst/C_nbodymodule.doctree and b/Doc/newdoc/_build/doctrees/rst/C_nbodymodule.doctree differ diff --git a/Doc/newdoc/_build/doctrees/rst/C_peanolib.doctree b/Doc/newdoc/_build/doctrees/rst/C_peanolib.doctree index 0a193cb..e291676 100644 Binary files a/Doc/newdoc/_build/doctrees/rst/C_peanolib.doctree and b/Doc/newdoc/_build/doctrees/rst/C_peanolib.doctree differ diff --git a/Doc/newdoc/_build/doctrees/rst/C_pmlib.doctree b/Doc/newdoc/_build/doctrees/rst/C_pmlib.doctree index 1852d20..74d354b 100644 Binary files a/Doc/newdoc/_build/doctrees/rst/C_pmlib.doctree and b/Doc/newdoc/_build/doctrees/rst/C_pmlib.doctree differ diff --git a/Doc/newdoc/_build/doctrees/rst/C_ptreelib.doctree b/Doc/newdoc/_build/doctrees/rst/C_ptreelib.doctree index 99a81e4..f6143de 100644 Binary files a/Doc/newdoc/_build/doctrees/rst/C_ptreelib.doctree and b/Doc/newdoc/_build/doctrees/rst/C_ptreelib.doctree differ diff --git a/Doc/newdoc/_build/doctrees/rst/C_pygsl.doctree b/Doc/newdoc/_build/doctrees/rst/C_pygsl.doctree index f50102b..663e2b9 100644 Binary files a/Doc/newdoc/_build/doctrees/rst/C_pygsl.doctree and b/Doc/newdoc/_build/doctrees/rst/C_pygsl.doctree differ diff --git a/Doc/newdoc/_build/doctrees/rst/C_streelib.doctree b/Doc/newdoc/_build/doctrees/rst/C_streelib.doctree index cd86e2c..c700475 100644 Binary files a/Doc/newdoc/_build/doctrees/rst/C_streelib.doctree and b/Doc/newdoc/_build/doctrees/rst/C_streelib.doctree differ diff --git a/Doc/newdoc/_build/doctrees/rst/C_tessel.doctree b/Doc/newdoc/_build/doctrees/rst/C_tessel.doctree index 511106d..24dd605 100644 Binary files a/Doc/newdoc/_build/doctrees/rst/C_tessel.doctree and b/Doc/newdoc/_build/doctrees/rst/C_tessel.doctree differ diff --git a/Doc/newdoc/_build/doctrees/rst/C_treelib.doctree b/Doc/newdoc/_build/doctrees/rst/C_treelib.doctree index 5352be8..3c6685b 100644 Binary files a/Doc/newdoc/_build/doctrees/rst/C_treelib.doctree and b/Doc/newdoc/_build/doctrees/rst/C_treelib.doctree differ diff --git a/Doc/newdoc/_build/doctrees/rst/CoolingModule.doctree b/Doc/newdoc/_build/doctrees/rst/CoolingModule.doctree index 096d819..e570600 100644 Binary files a/Doc/newdoc/_build/doctrees/rst/CoolingModule.doctree and b/Doc/newdoc/_build/doctrees/rst/CoolingModule.doctree differ diff --git a/Doc/newdoc/_build/doctrees/rst/CosmoModule.doctree b/Doc/newdoc/_build/doctrees/rst/CosmoModule.doctree index a7b6abd..f18cd9d 100644 Binary files a/Doc/newdoc/_build/doctrees/rst/CosmoModule.doctree and b/Doc/newdoc/_build/doctrees/rst/CosmoModule.doctree differ diff --git a/Doc/newdoc/_build/doctrees/rst/CtesModule.doctree b/Doc/newdoc/_build/doctrees/rst/CtesModule.doctree index cab2584..df33bc0 100644 Binary files a/Doc/newdoc/_build/doctrees/rst/CtesModule.doctree and b/Doc/newdoc/_build/doctrees/rst/CtesModule.doctree differ diff --git a/Doc/newdoc/_build/doctrees/rst/Default_configurations.doctree b/Doc/newdoc/_build/doctrees/rst/Default_configurations.doctree index 07e412d..7a23e60 100644 Binary files a/Doc/newdoc/_build/doctrees/rst/Default_configurations.doctree and b/Doc/newdoc/_build/doctrees/rst/Default_configurations.doctree differ diff --git a/Doc/newdoc/_build/doctrees/rst/Default_parameters.doctree b/Doc/newdoc/_build/doctrees/rst/Default_parameters.doctree index 315ed41..0484f2f 100644 Binary files a/Doc/newdoc/_build/doctrees/rst/Default_parameters.doctree and b/Doc/newdoc/_build/doctrees/rst/Default_parameters.doctree differ diff --git a/Doc/newdoc/_build/doctrees/rst/Display.doctree b/Doc/newdoc/_build/doctrees/rst/Display.doctree index ced5751..50e985a 100644 Binary files a/Doc/newdoc/_build/doctrees/rst/Display.doctree and b/Doc/newdoc/_build/doctrees/rst/Display.doctree differ diff --git a/Doc/newdoc/_build/doctrees/rst/Examples.doctree b/Doc/newdoc/_build/doctrees/rst/Examples.doctree index d525143..bd94ddd 100644 Binary files a/Doc/newdoc/_build/doctrees/rst/Examples.doctree and b/Doc/newdoc/_build/doctrees/rst/Examples.doctree differ diff --git a/Doc/newdoc/_build/doctrees/rst/Formats.doctree b/Doc/newdoc/_build/doctrees/rst/Formats.doctree index 5c19b51..6b9c8bc 100644 Binary files a/Doc/newdoc/_build/doctrees/rst/Formats.doctree and b/Doc/newdoc/_build/doctrees/rst/Formats.doctree differ diff --git a/Doc/newdoc/_build/doctrees/rst/FortranfileModule.doctree b/Doc/newdoc/_build/doctrees/rst/FortranfileModule.doctree index e773faa..b8a2f2d 100644 Binary files a/Doc/newdoc/_build/doctrees/rst/FortranfileModule.doctree and b/Doc/newdoc/_build/doctrees/rst/FortranfileModule.doctree differ diff --git a/Doc/newdoc/_build/doctrees/rst/FourierModule.doctree b/Doc/newdoc/_build/doctrees/rst/FourierModule.doctree index 2c21b13..bd39dae 100644 Binary files a/Doc/newdoc/_build/doctrees/rst/FourierModule.doctree and b/Doc/newdoc/_build/doctrees/rst/FourierModule.doctree differ diff --git a/Doc/newdoc/_build/doctrees/rst/GeometryModule.doctree b/Doc/newdoc/_build/doctrees/rst/GeometryModule.doctree index 0aeb31a..2fd83f2 100644 Binary files a/Doc/newdoc/_build/doctrees/rst/GeometryModule.doctree and b/Doc/newdoc/_build/doctrees/rst/GeometryModule.doctree differ diff --git a/Doc/newdoc/_build/doctrees/rst/Grids.doctree b/Doc/newdoc/_build/doctrees/rst/Grids.doctree index d2ffe52..fb44ef0 100644 Binary files a/Doc/newdoc/_build/doctrees/rst/Grids.doctree and b/Doc/newdoc/_build/doctrees/rst/Grids.doctree differ diff --git a/Doc/newdoc/_build/doctrees/rst/IcModule.doctree b/Doc/newdoc/_build/doctrees/rst/IcModule.doctree index 0276a78..74a7efc 100644 Binary files a/Doc/newdoc/_build/doctrees/rst/IcModule.doctree and b/Doc/newdoc/_build/doctrees/rst/IcModule.doctree differ diff --git a/Doc/newdoc/_build/doctrees/rst/InitialConditions.doctree b/Doc/newdoc/_build/doctrees/rst/InitialConditions.doctree index 241a38e..ae6d16a 100644 Binary files a/Doc/newdoc/_build/doctrees/rst/InitialConditions.doctree and b/Doc/newdoc/_build/doctrees/rst/InitialConditions.doctree differ diff --git a/Doc/newdoc/_build/doctrees/rst/Installation.doctree b/Doc/newdoc/_build/doctrees/rst/Installation.doctree index 1bc144b..fccf431 100644 Binary files a/Doc/newdoc/_build/doctrees/rst/Installation.doctree and b/Doc/newdoc/_build/doctrees/rst/Installation.doctree differ diff --git a/Doc/newdoc/_build/doctrees/rst/Installing_from_tarball.doctree b/Doc/newdoc/_build/doctrees/rst/Installing_from_tarball.doctree index 63e8914..2979c15 100644 Binary files a/Doc/newdoc/_build/doctrees/rst/Installing_from_tarball.doctree and b/Doc/newdoc/_build/doctrees/rst/Installing_from_tarball.doctree differ diff --git a/Doc/newdoc/_build/doctrees/rst/IoModule.doctree b/Doc/newdoc/_build/doctrees/rst/IoModule.doctree index 7a62fd0..551101b 100644 Binary files a/Doc/newdoc/_build/doctrees/rst/IoModule.doctree and b/Doc/newdoc/_build/doctrees/rst/IoModule.doctree differ diff --git a/Doc/newdoc/_build/doctrees/rst/LibdiskModule.doctree b/Doc/newdoc/_build/doctrees/rst/LibdiskModule.doctree index e42a35a..23d9a5f 100644 Binary files a/Doc/newdoc/_build/doctrees/rst/LibdiskModule.doctree and b/Doc/newdoc/_build/doctrees/rst/LibdiskModule.doctree differ diff --git a/Doc/newdoc/_build/doctrees/rst/LibgridModule.doctree b/Doc/newdoc/_build/doctrees/rst/LibgridModule.doctree index 79e6527..06496d3 100644 Binary files a/Doc/newdoc/_build/doctrees/rst/LibgridModule.doctree and b/Doc/newdoc/_build/doctrees/rst/LibgridModule.doctree differ diff --git a/Doc/newdoc/_build/doctrees/rst/LiblogModule.doctree b/Doc/newdoc/_build/doctrees/rst/LiblogModule.doctree index c3467d0..499da19 100644 Binary files a/Doc/newdoc/_build/doctrees/rst/LiblogModule.doctree and b/Doc/newdoc/_build/doctrees/rst/LiblogModule.doctree differ diff --git a/Doc/newdoc/_build/doctrees/rst/LibmiyamotoModule.doctree b/Doc/newdoc/_build/doctrees/rst/LibmiyamotoModule.doctree index 58f6c6a..f9e57e4 100644 Binary files a/Doc/newdoc/_build/doctrees/rst/LibmiyamotoModule.doctree and b/Doc/newdoc/_build/doctrees/rst/LibmiyamotoModule.doctree differ diff --git a/Doc/newdoc/_build/doctrees/rst/LibqtModule.doctree b/Doc/newdoc/_build/doctrees/rst/LibqtModule.doctree index 909a491..d53d358 100644 Binary files a/Doc/newdoc/_build/doctrees/rst/LibqtModule.doctree and b/Doc/newdoc/_build/doctrees/rst/LibqtModule.doctree differ diff --git a/Doc/newdoc/_build/doctrees/rst/LibutilModule.doctree b/Doc/newdoc/_build/doctrees/rst/LibutilModule.doctree index 2bc6258..7ccae21 100644 Binary files a/Doc/newdoc/_build/doctrees/rst/LibutilModule.doctree and b/Doc/newdoc/_build/doctrees/rst/LibutilModule.doctree differ diff --git a/Doc/newdoc/_build/doctrees/rst/MainModule.doctree b/Doc/newdoc/_build/doctrees/rst/MainModule.doctree index 21283b0..eae52f5 100644 Binary files a/Doc/newdoc/_build/doctrees/rst/MainModule.doctree and b/Doc/newdoc/_build/doctrees/rst/MainModule.doctree differ diff --git a/Doc/newdoc/_build/doctrees/rst/MovieModule.doctree b/Doc/newdoc/_build/doctrees/rst/MovieModule.doctree index 7fc6280..43d4391 100644 Binary files a/Doc/newdoc/_build/doctrees/rst/MovieModule.doctree and b/Doc/newdoc/_build/doctrees/rst/MovieModule.doctree differ diff --git a/Doc/newdoc/_build/doctrees/rst/MpiModule.doctree b/Doc/newdoc/_build/doctrees/rst/MpiModule.doctree index eacc6d9..8592a37 100644 Binary files a/Doc/newdoc/_build/doctrees/rst/MpiModule.doctree and b/Doc/newdoc/_build/doctrees/rst/MpiModule.doctree differ diff --git a/Doc/newdoc/_build/doctrees/rst/Overview.doctree b/Doc/newdoc/_build/doctrees/rst/Overview.doctree index 411ad4c..694e1ee 100644 Binary files a/Doc/newdoc/_build/doctrees/rst/Overview.doctree and b/Doc/newdoc/_build/doctrees/rst/Overview.doctree differ diff --git a/Doc/newdoc/_build/doctrees/rst/PaletteModule.doctree b/Doc/newdoc/_build/doctrees/rst/PaletteModule.doctree index 70abe61..c747925 100644 Binary files a/Doc/newdoc/_build/doctrees/rst/PaletteModule.doctree and b/Doc/newdoc/_build/doctrees/rst/PaletteModule.doctree differ diff --git a/Doc/newdoc/_build/doctrees/rst/ParamModule.doctree b/Doc/newdoc/_build/doctrees/rst/ParamModule.doctree index 21231ab..122bba7 100644 Binary files a/Doc/newdoc/_build/doctrees/rst/ParamModule.doctree and b/Doc/newdoc/_build/doctrees/rst/ParamModule.doctree differ diff --git a/Doc/newdoc/_build/doctrees/rst/ParameterModule.doctree b/Doc/newdoc/_build/doctrees/rst/ParameterModule.doctree index 10fb19a..abbc5bf 100644 Binary files a/Doc/newdoc/_build/doctrees/rst/ParameterModule.doctree and b/Doc/newdoc/_build/doctrees/rst/ParameterModule.doctree differ diff --git a/Doc/newdoc/_build/doctrees/rst/PhotModule.doctree b/Doc/newdoc/_build/doctrees/rst/PhotModule.doctree index 4314d2e..b43eb71 100644 Binary files a/Doc/newdoc/_build/doctrees/rst/PhotModule.doctree and b/Doc/newdoc/_build/doctrees/rst/PhotModule.doctree differ diff --git a/Doc/newdoc/_build/doctrees/rst/PlummerModule.doctree b/Doc/newdoc/_build/doctrees/rst/PlummerModule.doctree index d122fb2..5515ba5 100644 Binary files a/Doc/newdoc/_build/doctrees/rst/PlummerModule.doctree and b/Doc/newdoc/_build/doctrees/rst/PlummerModule.doctree differ diff --git a/Doc/newdoc/_build/doctrees/rst/Prerequiste.doctree b/Doc/newdoc/_build/doctrees/rst/Prerequiste.doctree index 45471e2..63b8c28 100644 Binary files a/Doc/newdoc/_build/doctrees/rst/Prerequiste.doctree and b/Doc/newdoc/_build/doctrees/rst/Prerequiste.doctree differ diff --git a/Doc/newdoc/_build/doctrees/rst/ProfilesModule.doctree b/Doc/newdoc/_build/doctrees/rst/ProfilesModule.doctree index d358eb2..f36f726 100644 Binary files a/Doc/newdoc/_build/doctrees/rst/ProfilesModule.doctree and b/Doc/newdoc/_build/doctrees/rst/ProfilesModule.doctree differ diff --git a/Doc/newdoc/_build/doctrees/rst/PyfitsModule.doctree b/Doc/newdoc/_build/doctrees/rst/PyfitsModule.doctree index 23254b1..88125d0 100644 Binary files a/Doc/newdoc/_build/doctrees/rst/PyfitsModule.doctree and b/Doc/newdoc/_build/doctrees/rst/PyfitsModule.doctree differ diff --git a/Doc/newdoc/_build/doctrees/rst/RecModule.doctree b/Doc/newdoc/_build/doctrees/rst/RecModule.doctree index f2e64b1..1980d73 100644 Binary files a/Doc/newdoc/_build/doctrees/rst/RecModule.doctree and b/Doc/newdoc/_build/doctrees/rst/RecModule.doctree differ diff --git a/Doc/newdoc/_build/doctrees/rst/Reference.doctree b/Doc/newdoc/_build/doctrees/rst/Reference.doctree index 4dd4f55..1098ed0 100644 Binary files a/Doc/newdoc/_build/doctrees/rst/Reference.doctree and b/Doc/newdoc/_build/doctrees/rst/Reference.doctree differ diff --git a/Doc/newdoc/_build/doctrees/rst/TalkgdispModule.doctree b/Doc/newdoc/_build/doctrees/rst/TalkgdispModule.doctree index 6a576e1..14ee478 100644 Binary files a/Doc/newdoc/_build/doctrees/rst/TalkgdispModule.doctree and b/Doc/newdoc/_build/doctrees/rst/TalkgdispModule.doctree differ diff --git a/Doc/newdoc/_build/doctrees/rst/Test_the_installation.doctree b/Doc/newdoc/_build/doctrees/rst/Test_the_installation.doctree index bad6a58..dd231c6 100644 Binary files a/Doc/newdoc/_build/doctrees/rst/Test_the_installation.doctree and b/Doc/newdoc/_build/doctrees/rst/Test_the_installation.doctree differ diff --git a/Doc/newdoc/_build/doctrees/rst/ThermodynModule.doctree b/Doc/newdoc/_build/doctrees/rst/ThermodynModule.doctree index 91e141b..9c2c25c 100644 Binary files a/Doc/newdoc/_build/doctrees/rst/ThermodynModule.doctree and b/Doc/newdoc/_build/doctrees/rst/ThermodynModule.doctree differ diff --git a/Doc/newdoc/_build/doctrees/rst/Tutorial.doctree b/Doc/newdoc/_build/doctrees/rst/Tutorial.doctree index a5a2239..9916e40 100644 Binary files a/Doc/newdoc/_build/doctrees/rst/Tutorial.doctree and b/Doc/newdoc/_build/doctrees/rst/Tutorial.doctree differ diff --git a/Doc/newdoc/_build/doctrees/rst/Tutorial_interpreter.doctree b/Doc/newdoc/_build/doctrees/rst/Tutorial_interpreter.doctree index 4e57db0..0deca06 100644 Binary files a/Doc/newdoc/_build/doctrees/rst/Tutorial_interpreter.doctree and b/Doc/newdoc/_build/doctrees/rst/Tutorial_interpreter.doctree differ diff --git a/Doc/newdoc/_build/doctrees/rst/Tutorial_parallel.doctree b/Doc/newdoc/_build/doctrees/rst/Tutorial_parallel.doctree index fc4a705..69934a1 100644 Binary files a/Doc/newdoc/_build/doctrees/rst/Tutorial_parallel.doctree and b/Doc/newdoc/_build/doctrees/rst/Tutorial_parallel.doctree differ diff --git a/Doc/newdoc/_build/doctrees/rst/Tutorial_scripts.doctree b/Doc/newdoc/_build/doctrees/rst/Tutorial_scripts.doctree index c3fde1b..4db7102 100644 Binary files a/Doc/newdoc/_build/doctrees/rst/Tutorial_scripts.doctree and b/Doc/newdoc/_build/doctrees/rst/Tutorial_scripts.doctree differ diff --git a/Doc/newdoc/_build/doctrees/rst/Units.doctree b/Doc/newdoc/_build/doctrees/rst/Units.doctree index 3c53bc2..fa02a69 100644 Binary files a/Doc/newdoc/_build/doctrees/rst/Units.doctree and b/Doc/newdoc/_build/doctrees/rst/Units.doctree differ diff --git a/Doc/newdoc/_build/doctrees/rst/UnitsModule.doctree b/Doc/newdoc/_build/doctrees/rst/UnitsModule.doctree index bcc2b31..42c86aa 100644 Binary files a/Doc/newdoc/_build/doctrees/rst/UnitsModule.doctree and b/Doc/newdoc/_build/doctrees/rst/UnitsModule.doctree differ diff --git a/Doc/newdoc/_build/html/_images/cosmo1.png b/Doc/newdoc/_build/html/_images/cosmo1.png deleted file mode 100644 index 9717228..0000000 Binary files a/Doc/newdoc/_build/html/_images/cosmo1.png and /dev/null differ diff --git a/Doc/newdoc/_build/html/_images/edge-on-disk1.png b/Doc/newdoc/_build/html/_images/edge-on-disk1.png deleted file mode 100644 index 7fd5fe5..0000000 Binary files a/Doc/newdoc/_build/html/_images/edge-on-disk1.png and /dev/null differ diff --git a/Doc/newdoc/_build/html/_images/edge-on-disk2.png b/Doc/newdoc/_build/html/_images/edge-on-disk2.png deleted file mode 100644 index 7fd5fe5..0000000 Binary files a/Doc/newdoc/_build/html/_images/edge-on-disk2.png and /dev/null differ diff --git a/Doc/newdoc/_build/html/_images/edge-on-disk3.png b/Doc/newdoc/_build/html/_images/edge-on-disk3.png deleted file mode 100644 index 7fd5fe5..0000000 Binary files a/Doc/newdoc/_build/html/_images/edge-on-disk3.png and /dev/null differ diff --git a/Doc/newdoc/_build/html/_images/edge-on-disk4.png b/Doc/newdoc/_build/html/_images/edge-on-disk4.png deleted file mode 100644 index 7fd5fe5..0000000 Binary files a/Doc/newdoc/_build/html/_images/edge-on-disk4.png and /dev/null differ diff --git a/Doc/newdoc/_build/html/_images/math/c154565d113d42c101983e52d19bf2ade8c95424.png b/Doc/newdoc/_build/html/_images/math/c154565d113d42c101983e52d19bf2ade8c95424.png index 40cdc6d..4687a70 100644 Binary files a/Doc/newdoc/_build/html/_images/math/c154565d113d42c101983e52d19bf2ade8c95424.png and b/Doc/newdoc/_build/html/_images/math/c154565d113d42c101983e52d19bf2ade8c95424.png differ diff --git a/Doc/newdoc/_build/html/_sources/index.txt b/Doc/newdoc/_build/html/_sources/index.txt index 6e9ef7b..44d9131 100644 --- a/Doc/newdoc/_build/html/_sources/index.txt +++ b/Doc/newdoc/_build/html/_sources/index.txt @@ -1,30 +1,33 @@ .. pNbody documentation master file, created by sphinx-quickstart on Wed Aug 24 16:29:02 2011. You can adapt this file completely to your liking, but it should at least contain the root `toctree` directive. Welcome to pNbody's documentation! ================================== Contents: .. toctree:: :maxdepth: 5 rst/Overview + rst/Download rst/Installation rst/Tutorial rst/Formats rst/Display rst/InitialConditions + rst/Selection rst/Units + rst/PhysicalQuantities rst/Grids rst/Reference Indices and tables ================== * :ref:`genindex` * :ref:`modindex` * :ref:`search` diff --git a/Doc/newdoc/_build/html/_sources/rst/Documentation_and_examples.txt b/Doc/newdoc/_build/html/_sources/rst/Documentation_and_examples.txt deleted file mode 100644 index 8d0f809..0000000 --- a/Doc/newdoc/_build/html/_sources/rst/Documentation_and_examples.txt +++ /dev/null @@ -1,2 +0,0 @@ -Examples -********************** diff --git a/Doc/newdoc/_build/html/_sources/rst/Initialconditions.txt b/Doc/newdoc/_build/html/_sources/rst/Initialconditions.txt deleted file mode 100644 index 002549a..0000000 --- a/Doc/newdoc/_build/html/_sources/rst/Initialconditions.txt +++ /dev/null @@ -1,3 +0,0 @@ -Generating initial conditions -********************** - diff --git a/Doc/newdoc/_build/html/_sources/rst/Io.txt b/Doc/newdoc/_build/html/_sources/rst/Io.txt deleted file mode 100644 index a23cd16..0000000 --- a/Doc/newdoc/_build/html/_sources/rst/Io.txt +++ /dev/null @@ -1,14 +0,0 @@ -the Io module -********************** - -.. currentmodule:: pNbody.io - -.. autofunction:: checkfile -.. autofunction:: end_of_file -.. autofunction:: write_array -.. autofunction:: read_ascii -.. autofunction:: write_dump -.. autofunction:: read_dump - - - diff --git a/Doc/newdoc/_build/html/_sources/rst/Main.txt b/Doc/newdoc/_build/html/_sources/rst/Main.txt deleted file mode 100644 index 69b7d8d..0000000 --- a/Doc/newdoc/_build/html/_sources/rst/Main.txt +++ /dev/null @@ -1,7 +0,0 @@ -the main module -********************** - -.. currentmodule:: pNbody - -.. automodule:: pNbody - :members: diff --git a/Doc/newdoc/_build/html/_sources/rst/MontecarloModule.txt b/Doc/newdoc/_build/html/_sources/rst/MontecarloModule.txt deleted file mode 100644 index 6ef45f7..0000000 --- a/Doc/newdoc/_build/html/_sources/rst/MontecarloModule.txt +++ /dev/null @@ -1,7 +0,0 @@ -the montecarlo module -********************** - -.. currentmodule:: pNbody.montecarlo - -.. automodule:: pNbody.montecarlo - :members: diff --git a/Doc/newdoc/_build/html/_sources/rst/nbodymodule.txt b/Doc/newdoc/_build/html/_sources/rst/nbodymodule.txt deleted file mode 100644 index 7b4eaeb..0000000 --- a/Doc/newdoc/_build/html/_sources/rst/nbodymodule.txt +++ /dev/null @@ -1,7 +0,0 @@ -the C nbody module -********************** - -.. currentmodule:: pNbody.nbodymodule - -.. automodule:: pNbody.nbodymodule - :members: diff --git a/Doc/newdoc/_build/html/_static/basic.css b/Doc/newdoc/_build/html/_static/basic.css index 32630d5..69f30d4 100644 --- a/Doc/newdoc/_build/html/_static/basic.css +++ b/Doc/newdoc/_build/html/_static/basic.css @@ -1,528 +1,509 @@ /* * basic.css * ~~~~~~~~~ * * Sphinx stylesheet -- basic theme. * - * :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS. + * :copyright: Copyright 2007-2010 by the Sphinx team, see AUTHORS. * :license: BSD, see LICENSE for details. * */ /* -- main layout ----------------------------------------------------------- */ div.clearer { clear: both; } /* -- relbar ---------------------------------------------------------------- */ div.related { width: 100%; font-size: 90%; } div.related h3 { display: none; } div.related ul { margin: 0; padding: 0 0 0 10px; list-style: none; } div.related li { display: inline; } div.related li.right { float: right; margin-right: 5px; } /* -- sidebar --------------------------------------------------------------- */ div.sphinxsidebarwrapper { padding: 10px 5px 0 10px; } div.sphinxsidebar { float: left; width: 230px; margin-left: -100%; font-size: 90%; } div.sphinxsidebar ul { list-style: none; } div.sphinxsidebar ul ul, div.sphinxsidebar ul.want-points { margin-left: 20px; list-style: square; } div.sphinxsidebar ul ul { margin-top: 0; margin-bottom: 0; } div.sphinxsidebar form { margin-top: 10px; } div.sphinxsidebar input { border: 1px solid #98dbcc; font-family: sans-serif; font-size: 1em; } img { border: 0; } /* -- search page ----------------------------------------------------------- */ ul.search { margin: 10px 0 0 20px; padding: 0; } ul.search li { padding: 5px 0 5px 20px; background-image: url(file.png); background-repeat: no-repeat; background-position: 0 7px; } ul.search li a { font-weight: bold; } ul.search li div.context { color: #888; margin: 2px 0 0 30px; text-align: left; } ul.keywordmatches li.goodmatch a { font-weight: bold; } /* -- index page ------------------------------------------------------------ */ table.contentstable { width: 90%; } table.contentstable p.biglink { line-height: 150%; } a.biglink { font-size: 1.3em; } span.linkdescr { font-style: italic; padding-top: 5px; font-size: 90%; } /* -- general index --------------------------------------------------------- */ table.indextable { width: 100%; } table.indextable td { text-align: left; vertical-align: top; } table.indextable dl, table.indextable dd { margin-top: 0; margin-bottom: 0; } table.indextable tr.pcap { height: 10px; } table.indextable tr.cap { margin-top: 10px; background-color: #f2f2f2; } img.toggler { margin-right: 3px; margin-top: 3px; cursor: pointer; } div.modindex-jumpbox { border-top: 1px solid #ddd; border-bottom: 1px solid #ddd; margin: 1em 0 1em 0; padding: 0.4em; } div.genindex-jumpbox { border-top: 1px solid #ddd; border-bottom: 1px solid #ddd; margin: 1em 0 1em 0; padding: 0.4em; } /* -- general body styles --------------------------------------------------- */ a.headerlink { visibility: hidden; } h1:hover > a.headerlink, h2:hover > a.headerlink, h3:hover > a.headerlink, h4:hover > a.headerlink, h5:hover > a.headerlink, h6:hover > a.headerlink, dt:hover > a.headerlink { visibility: visible; } div.body p.caption { text-align: inherit; } div.body td { text-align: left; } .field-list ul { padding-left: 1em; } .first { margin-top: 0 !important; } p.rubric { margin-top: 30px; font-weight: bold; } -img.align-left, .figure.align-left, object.align-left { - clear: left; - float: left; - margin-right: 1em; -} - -img.align-right, .figure.align-right, object.align-right { - clear: right; - float: right; - margin-left: 1em; -} - -img.align-center, .figure.align-center, object.align-center { - display: block; - margin-left: auto; - margin-right: auto; -} - .align-left { text-align: left; } .align-center { clear: both; text-align: center; } .align-right { text-align: right; } /* -- sidebars -------------------------------------------------------------- */ div.sidebar { margin: 0 0 0.5em 1em; border: 1px solid #ddb; padding: 7px 7px 0 7px; background-color: #ffe; width: 40%; float: right; } p.sidebar-title { font-weight: bold; } /* -- topics ---------------------------------------------------------------- */ div.topic { border: 1px solid #ccc; padding: 7px 7px 0 7px; margin: 10px 0 10px 0; } p.topic-title { font-size: 1.1em; font-weight: bold; margin-top: 10px; } /* -- admonitions ----------------------------------------------------------- */ div.admonition { margin-top: 10px; margin-bottom: 10px; padding: 7px; } div.admonition dt { font-weight: bold; } div.admonition dl { margin-bottom: 0; } p.admonition-title { margin: 0px 10px 5px 0px; font-weight: bold; } div.body p.centered { text-align: center; margin-top: 25px; } /* -- tables ---------------------------------------------------------------- */ table.docutils { border: 0; border-collapse: collapse; } table.docutils td, table.docutils th { padding: 1px 8px 1px 5px; border-top: 0; border-left: 0; border-right: 0; border-bottom: 1px solid #aaa; } table.field-list td, table.field-list th { border: 0 !important; } table.footnote td, table.footnote th { border: 0 !important; } th { text-align: left; padding-right: 5px; } table.citation { border-left: solid 1px gray; margin-left: 1px; } table.citation td { border-bottom: none; } /* -- other body styles ----------------------------------------------------- */ ol.arabic { list-style: decimal; } ol.loweralpha { list-style: lower-alpha; } ol.upperalpha { list-style: upper-alpha; } ol.lowerroman { list-style: lower-roman; } ol.upperroman { list-style: upper-roman; } dl { margin-bottom: 15px; } dd p { margin-top: 0px; } dd ul, dd table { margin-bottom: 10px; } dd { margin-top: 3px; margin-bottom: 10px; margin-left: 30px; } dt:target, .highlighted { background-color: #fbe54e; } dl.glossary dt { font-weight: bold; font-size: 1.1em; } .field-list ul { margin: 0; padding-left: 1em; } .field-list p { margin: 0; } .refcount { color: #060; } .optional { font-size: 1.3em; } .versionmodified { font-style: italic; } .system-message { background-color: #fda; padding: 5px; border: 3px solid red; } .footnote:target { - background-color: #ffa; + background-color: #ffa } .line-block { display: block; margin-top: 1em; margin-bottom: 1em; } .line-block .line-block { margin-top: 0; margin-bottom: 0; margin-left: 1.5em; } .guilabel, .menuselection { font-family: sans-serif; } .accelerator { text-decoration: underline; } .classifier { font-style: oblique; } /* -- code displays --------------------------------------------------------- */ pre { overflow: auto; - overflow-y: hidden; /* fixes display issues on Chrome browsers */ } td.linenos pre { padding: 5px 0px; border: 0; background-color: transparent; color: #aaa; } table.highlighttable { margin-left: 0.5em; } table.highlighttable td { padding: 0 0.5em 0 0.5em; } tt.descname { background-color: transparent; font-weight: bold; font-size: 1.2em; } tt.descclassname { background-color: transparent; } tt.xref, a tt { background-color: transparent; font-weight: bold; } h1 tt, h2 tt, h3 tt, h4 tt, h5 tt, h6 tt { background-color: transparent; } .viewcode-link { float: right; } .viewcode-back { float: right; font-family: sans-serif; } div.viewcode-block:target { margin: -1px -10px; padding: 0 10px; } /* -- math display ---------------------------------------------------------- */ img.math { vertical-align: middle; } div.body div.math p { text-align: center; } span.eqno { float: right; } /* -- printout stylesheet --------------------------------------------------- */ @media print { div.document, div.documentwrapper, div.bodywrapper { margin: 0 !important; width: 100%; } div.sphinxsidebar, div.related, div.footer, #top-link { display: none; } } diff --git a/Doc/newdoc/_build/html/_static/default.css b/Doc/newdoc/_build/html/_static/default.css index 21f3f50..2a3ac13 100644 --- a/Doc/newdoc/_build/html/_static/default.css +++ b/Doc/newdoc/_build/html/_static/default.css @@ -1,256 +1,256 @@ /* * default.css_t * ~~~~~~~~~~~~~ * * Sphinx stylesheet -- default theme. * - * :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS. + * :copyright: Copyright 2007-2010 by the Sphinx team, see AUTHORS. * :license: BSD, see LICENSE for details. * */ @import url("basic.css"); /* -- page layout ----------------------------------------------------------- */ body { font-family: sans-serif; font-size: 100%; background-color: #11303d; color: #000; margin: 0; padding: 0; } div.document { background-color: #1c4e63; } div.documentwrapper { float: left; width: 100%; } div.bodywrapper { margin: 0 0 0 230px; } div.body { background-color: #ffffff; color: #000000; padding: 0 20px 30px 20px; } div.footer { color: #ffffff; width: 100%; padding: 9px 0 9px 0; text-align: center; font-size: 75%; } div.footer a { color: #ffffff; text-decoration: underline; } div.related { background-color: #133f52; line-height: 30px; color: #ffffff; } div.related a { color: #ffffff; } div.sphinxsidebar { } div.sphinxsidebar h3 { font-family: 'Trebuchet MS', sans-serif; color: #ffffff; font-size: 1.4em; font-weight: normal; margin: 0; padding: 0; } div.sphinxsidebar h3 a { color: #ffffff; } div.sphinxsidebar h4 { font-family: 'Trebuchet MS', sans-serif; color: #ffffff; font-size: 1.3em; font-weight: normal; margin: 5px 0 0 0; padding: 0; } div.sphinxsidebar p { color: #ffffff; } div.sphinxsidebar p.topless { margin: 5px 10px 10px 10px; } div.sphinxsidebar ul { margin: 10px; padding: 0; color: #ffffff; } div.sphinxsidebar a { color: #98dbcc; } div.sphinxsidebar input { border: 1px solid #98dbcc; font-family: sans-serif; font-size: 1em; } /* -- hyperlink styles ------------------------------------------------------ */ a { color: #355f7c; text-decoration: none; } a:visited { color: #355f7c; text-decoration: none; } a:hover { text-decoration: underline; } /* -- body styles ----------------------------------------------------------- */ div.body h1, div.body h2, div.body h3, div.body h4, div.body h5, div.body h6 { font-family: 'Trebuchet MS', sans-serif; background-color: #f2f2f2; font-weight: normal; color: #20435c; border-bottom: 1px solid #ccc; margin: 20px -20px 10px -20px; padding: 3px 0 3px 10px; } div.body h1 { margin-top: 0; font-size: 200%; } div.body h2 { font-size: 160%; } div.body h3 { font-size: 140%; } div.body h4 { font-size: 120%; } div.body h5 { font-size: 110%; } div.body h6 { font-size: 100%; } a.headerlink { color: #c60f0f; font-size: 0.8em; padding: 0 4px 0 4px; text-decoration: none; } a.headerlink:hover { background-color: #c60f0f; color: white; } div.body p, div.body dd, div.body li { text-align: justify; line-height: 130%; } div.admonition p.admonition-title + p { display: inline; } div.admonition p { margin-bottom: 5px; } div.admonition pre { margin-bottom: 5px; } div.admonition ul, div.admonition ol { margin-bottom: 5px; } div.note { background-color: #eee; border: 1px solid #ccc; } div.seealso { background-color: #ffc; border: 1px solid #ff6; } div.topic { background-color: #eee; } div.warning { background-color: #ffe4e4; border: 1px solid #f66; } p.admonition-title { display: inline; } p.admonition-title:after { content: ":"; } pre { padding: 5px; background-color: #eeffcc; color: #333333; line-height: 120%; border: 1px solid #ac9; border-left: none; border-right: none; } tt { background-color: #ecf0f3; padding: 0 1px 0 1px; font-size: 0.95em; } th { background-color: #ede; } .warning tt { background: #efc2c2; } .note tt { background: #d6d6d6; } .viewcode-back { font-family: sans-serif; } div.viewcode-block:target { background-color: #f4debf; border-top: 1px solid #ac9; border-bottom: 1px solid #ac9; } \ No newline at end of file diff --git a/Doc/newdoc/_build/html/_static/doctools.js b/Doc/newdoc/_build/html/_static/doctools.js index 8b9bd2c..eeea95e 100644 --- a/Doc/newdoc/_build/html/_static/doctools.js +++ b/Doc/newdoc/_build/html/_static/doctools.js @@ -1,247 +1,247 @@ /* * doctools.js * ~~~~~~~~~~~ * * Sphinx JavaScript utilties for all documentation. * - * :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS. + * :copyright: Copyright 2007-2010 by the Sphinx team, see AUTHORS. * :license: BSD, see LICENSE for details. * */ /** * select a different prefix for underscore */ $u = _.noConflict(); /** * make the code below compatible with browsers without * an installed firebug like debugger if (!window.console || !console.firebug) { var names = ["log", "debug", "info", "warn", "error", "assert", "dir", "dirxml", "group", "groupEnd", "time", "timeEnd", "count", "trace", "profile", "profileEnd"]; window.console = {}; for (var i = 0; i < names.length; ++i) window.console[names[i]] = function() {}; } */ /** * small helper function to urldecode strings */ jQuery.urldecode = function(x) { return decodeURIComponent(x).replace(/\+/g, ' '); } /** * small helper function to urlencode strings */ jQuery.urlencode = encodeURIComponent; /** * This function returns the parsed url parameters of the * current request. Multiple values per key are supported, * it will always return arrays of strings for the value parts. */ jQuery.getQueryParameters = function(s) { if (typeof s == 'undefined') s = document.location.search; var parts = s.substr(s.indexOf('?') + 1).split('&'); var result = {}; for (var i = 0; i < parts.length; i++) { var tmp = parts[i].split('=', 2); var key = jQuery.urldecode(tmp[0]); var value = jQuery.urldecode(tmp[1]); if (key in result) result[key].push(value); else result[key] = [value]; } return result; }; /** * small function to check if an array contains * a given item. */ jQuery.contains = function(arr, item) { for (var i = 0; i < arr.length; i++) { if (arr[i] == item) return true; } return false; }; /** * highlight a given string on a jquery object by wrapping it in * span elements with the given class name. */ jQuery.fn.highlightText = function(text, className) { function highlight(node) { if (node.nodeType == 3) { var val = node.nodeValue; var pos = val.toLowerCase().indexOf(text); if (pos >= 0 && !jQuery(node.parentNode).hasClass(className)) { var span = document.createElement("span"); span.className = className; span.appendChild(document.createTextNode(val.substr(pos, text.length))); node.parentNode.insertBefore(span, node.parentNode.insertBefore( document.createTextNode(val.substr(pos + text.length)), node.nextSibling)); node.nodeValue = val.substr(0, pos); } } else if (!jQuery(node).is("button, select, textarea")) { jQuery.each(node.childNodes, function() { highlight(this); }); } } return this.each(function() { highlight(this); }); }; /** * Small JavaScript module for the documentation. */ var Documentation = { init : function() { this.fixFirefoxAnchorBug(); this.highlightSearchWords(); this.initIndexTable(); }, /** * i18n support */ TRANSLATIONS : {}, PLURAL_EXPR : function(n) { return n == 1 ? 0 : 1; }, LOCALE : 'unknown', // gettext and ngettext don't access this so that the functions // can safely bound to a different name (_ = Documentation.gettext) gettext : function(string) { var translated = Documentation.TRANSLATIONS[string]; if (typeof translated == 'undefined') return string; return (typeof translated == 'string') ? translated : translated[0]; }, ngettext : function(singular, plural, n) { var translated = Documentation.TRANSLATIONS[singular]; if (typeof translated == 'undefined') return (n == 1) ? singular : plural; return translated[Documentation.PLURALEXPR(n)]; }, addTranslations : function(catalog) { for (var key in catalog.messages) this.TRANSLATIONS[key] = catalog.messages[key]; this.PLURAL_EXPR = new Function('n', 'return +(' + catalog.plural_expr + ')'); this.LOCALE = catalog.locale; }, /** * add context elements like header anchor links */ addContextElements : function() { $('div[id] > :header:first').each(function() { $('\u00B6'). attr('href', '#' + this.id). attr('title', _('Permalink to this headline')). appendTo(this); }); $('dt[id]').each(function() { $('\u00B6'). attr('href', '#' + this.id). attr('title', _('Permalink to this definition')). appendTo(this); }); }, /** * workaround a firefox stupidity */ fixFirefoxAnchorBug : function() { if (document.location.hash && $.browser.mozilla) window.setTimeout(function() { document.location.href += ''; }, 10); }, /** * highlight the search words provided in the url in the text */ highlightSearchWords : function() { var params = $.getQueryParameters(); var terms = (params.highlight) ? params.highlight[0].split(/\s+/) : []; if (terms.length) { var body = $('div.body'); window.setTimeout(function() { $.each(terms, function() { body.highlightText(this.toLowerCase(), 'highlighted'); }); }, 10); $('') .appendTo($('.sidebar .this-page-menu')); } }, /** * init the domain index toggle buttons */ initIndexTable : function() { var togglers = $('img.toggler').click(function() { var src = $(this).attr('src'); var idnum = $(this).attr('id').substr(7); $('tr.cg-' + idnum).toggle(); if (src.substr(-9) == 'minus.png') $(this).attr('src', src.substr(0, src.length-9) + 'plus.png'); else $(this).attr('src', src.substr(0, src.length-8) + 'minus.png'); }).css('display', ''); if (DOCUMENTATION_OPTIONS.COLLAPSE_INDEX) { togglers.click(); } }, /** * helper function to hide the search marks again */ hideSearchWords : function() { $('.sidebar .this-page-menu li.highlight-link').fadeOut(300); $('span.highlighted').removeClass('highlighted'); }, /** * make the url absolute */ makeURL : function(relativeURL) { return DOCUMENTATION_OPTIONS.URL_ROOT + '/' + relativeURL; }, /** * get the current relative url */ getCurrentURL : function() { var path = document.location.pathname; var parts = path.split(/\//); $.each(DOCUMENTATION_OPTIONS.URL_ROOT.split(/\//), function() { if (this == '..') parts.pop(); }); var url = parts.join('/'); return path.substring(url.lastIndexOf('/') + 1, path.length - 1); } }; // quick alias for translations _ = Documentation.gettext; $(document).ready(function() { Documentation.init(); }); diff --git a/Doc/newdoc/_build/html/_static/searchtools.js b/Doc/newdoc/_build/html/_static/searchtools.js index dae92b5..5cbfe00 100644 --- a/Doc/newdoc/_build/html/_static/searchtools.js +++ b/Doc/newdoc/_build/html/_static/searchtools.js @@ -1,518 +1,518 @@ /* * searchtools.js * ~~~~~~~~~~~~~~ * * Sphinx JavaScript utilties for the full-text search. * - * :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS. + * :copyright: Copyright 2007-2010 by the Sphinx team, see AUTHORS. * :license: BSD, see LICENSE for details. * */ /** * helper function to return a node containing the * search summary for a given text. keywords is a list * of stemmed words, hlwords is the list of normal, unstemmed * words. the first one is used to find the occurance, the * latter for highlighting it. */ jQuery.makeSearchSummary = function(text, keywords, hlwords) { var textLower = text.toLowerCase(); var start = 0; $.each(keywords, function() { var i = textLower.indexOf(this.toLowerCase()); if (i > -1) start = i; }); start = Math.max(start - 120, 0); var excerpt = ((start > 0) ? '...' : '') + $.trim(text.substr(start, 240)) + ((start + 240 - text.length) ? '...' : ''); var rv = $('
').text(excerpt); $.each(hlwords, function() { rv = rv.highlightText(this, 'highlighted'); }); return rv; } /** * Porter Stemmer */ var PorterStemmer = function() { var step2list = { ational: 'ate', tional: 'tion', enci: 'ence', anci: 'ance', izer: 'ize', bli: 'ble', alli: 'al', entli: 'ent', eli: 'e', ousli: 'ous', ization: 'ize', ation: 'ate', ator: 'ate', alism: 'al', iveness: 'ive', fulness: 'ful', ousness: 'ous', aliti: 'al', iviti: 'ive', biliti: 'ble', logi: 'log' }; var step3list = { icate: 'ic', ative: '', alize: 'al', iciti: 'ic', ical: 'ic', ful: '', ness: '' }; var c = "[^aeiou]"; // consonant var v = "[aeiouy]"; // vowel var C = c + "[^aeiouy]*"; // consonant sequence var V = v + "[aeiou]*"; // vowel sequence var mgr0 = "^(" + C + ")?" + V + C; // [C]VC... is m>0 var meq1 = "^(" + C + ")?" + V + C + "(" + V + ")?$"; // [C]VC[V] is m=1 var mgr1 = "^(" + C + ")?" + V + C + V + C; // [C]VCVC... is m>1 var s_v = "^(" + C + ")?" + v; // vowel in stem this.stemWord = function (w) { var stem; var suffix; var firstch; var origword = w; if (w.length < 3) return w; var re; var re2; var re3; var re4; firstch = w.substr(0,1); if (firstch == "y") w = firstch.toUpperCase() + w.substr(1); // Step 1a re = /^(.+?)(ss|i)es$/; re2 = /^(.+?)([^s])s$/; if (re.test(w)) w = w.replace(re,"$1$2"); else if (re2.test(w)) w = w.replace(re2,"$1$2"); // Step 1b re = /^(.+?)eed$/; re2 = /^(.+?)(ed|ing)$/; if (re.test(w)) { var fp = re.exec(w); re = new RegExp(mgr0); if (re.test(fp[1])) { re = /.$/; w = w.replace(re,""); } } else if (re2.test(w)) { var fp = re2.exec(w); stem = fp[1]; re2 = new RegExp(s_v); if (re2.test(stem)) { w = stem; re2 = /(at|bl|iz)$/; re3 = new RegExp("([^aeiouylsz])\\1$"); re4 = new RegExp("^" + C + v + "[^aeiouwxy]$"); if (re2.test(w)) w = w + "e"; else if (re3.test(w)) { re = /.$/; w = w.replace(re,""); } else if (re4.test(w)) w = w + "e"; } } // Step 1c re = /^(.+?)y$/; if (re.test(w)) { var fp = re.exec(w); stem = fp[1]; re = new RegExp(s_v); if (re.test(stem)) w = stem + "i"; } // Step 2 re = /^(.+?)(ational|tional|enci|anci|izer|bli|alli|entli|eli|ousli|ization|ation|ator|alism|iveness|fulness|ousness|aliti|iviti|biliti|logi)$/; if (re.test(w)) { var fp = re.exec(w); stem = fp[1]; suffix = fp[2]; re = new RegExp(mgr0); if (re.test(stem)) w = stem + step2list[suffix]; } // Step 3 re = /^(.+?)(icate|ative|alize|iciti|ical|ful|ness)$/; if (re.test(w)) { var fp = re.exec(w); stem = fp[1]; suffix = fp[2]; re = new RegExp(mgr0); if (re.test(stem)) w = stem + step3list[suffix]; } // Step 4 re = /^(.+?)(al|ance|ence|er|ic|able|ible|ant|ement|ment|ent|ou|ism|ate|iti|ous|ive|ize)$/; re2 = /^(.+?)(s|t)(ion)$/; if (re.test(w)) { var fp = re.exec(w); stem = fp[1]; re = new RegExp(mgr1); if (re.test(stem)) w = stem; } else if (re2.test(w)) { var fp = re2.exec(w); stem = fp[1] + fp[2]; re2 = new RegExp(mgr1); if (re2.test(stem)) w = stem; } // Step 5 re = /^(.+?)e$/; if (re.test(w)) { var fp = re.exec(w); stem = fp[1]; re = new RegExp(mgr1); re2 = new RegExp(meq1); re3 = new RegExp("^" + C + v + "[^aeiouwxy]$"); if (re.test(stem) || (re2.test(stem) && !(re3.test(stem)))) w = stem; } re = /ll$/; re2 = new RegExp(mgr1); if (re.test(w) && re2.test(w)) { re = /.$/; w = w.replace(re,""); } // and turn initial Y back to y if (firstch == "y") w = firstch.toLowerCase() + w.substr(1); return w; } } /** * Search Module */ var Search = { _index : null, _queued_query : null, _pulse_status : -1, init : function() { var params = $.getQueryParameters(); if (params.q) { var query = params.q[0]; $('input[name="q"]')[0].value = query; this.performSearch(query); } }, loadIndex : function(url) { $.ajax({type: "GET", url: url, data: null, success: null, dataType: "script", cache: true}); }, setIndex : function(index) { var q; this._index = index; if ((q = this._queued_query) !== null) { this._queued_query = null; Search.query(q); } }, hasIndex : function() { return this._index !== null; }, deferQuery : function(query) { this._queued_query = query; }, stopPulse : function() { this._pulse_status = 0; }, startPulse : function() { if (this._pulse_status >= 0) return; function pulse() { Search._pulse_status = (Search._pulse_status + 1) % 4; var dotString = ''; for (var i = 0; i < Search._pulse_status; i++) dotString += '.'; Search.dots.text(dotString); if (Search._pulse_status > -1) window.setTimeout(pulse, 500); }; pulse(); }, /** * perform a search for something */ performSearch : function(query) { // create the required interface elements this.out = $('#search-results'); this.title = $('

' + _('Searching') + '

').appendTo(this.out); this.dots = $('').appendTo(this.title); this.status = $('

').appendTo(this.out); this.output = $('