Changeset c8165c for tests/Python

Timestamp:

May 8, 2017, 2:01:48 PM (8 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

ForceAnnealing_goodresults, ForceAnnealing_tocheck

Children:

db0833

Parents:

73faf4 (diff), c1446cd (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'Docu_Python_wait' into Candidate_v1.6.1

Conflicts:

tests/Python/AllActions/options.dat

• two options introduced at same place, both get in.

File:

• tests/Python/AllActions/options.dat (modified) (3 diffs)

tests/Python/AllActions/options.dat ¶

@@ -33 +33 @@
 bond-degree     "1"
 bond-file       "bond.dat"
+bondside        "1"
 bond-table      "table.dat"
 calculate-bounding-box  ""
@@ -166 +167 @@
 reset   1
 reverse "0"
+rotate-around-bond      "90."
 rotate-around-origin    "180."
 rotate-around-origin    "20."
@@ -233 +235 @@
 skiplines       "2"
 start-step      "0"
-steps-forward   "1"
-steps-backward  "0"
 steps   "5"
+step-world-time "1"
 store-grids     "0"
 store-saturated-fragment        "BondFragment"