Ignore:
Timestamp:
Jun 21, 2018, 8:31:25 AM (7 years ago)
Author:
Frederik Heber <frederik.heber@…>
Branches:
Candidate_v1.6.1, Candidate_v1.7.0, ChemicalSpaceEvaluator, stable
Children:
d83d64, f5ea10
Parents:
3e334e (diff), 4fc0ea (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 'TremoloParser_IncreasedPrecision' into Candidate_v1.6.1

Conflicts:

tests/Python/ForceAnnealing/post/five_carbon_test_bondgraph.data
tests/Python/ForceAnnealing/post/five_carbon_test_no-bondgraph.data

Location:
tests/regression/Options/Session/post
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • tests/regression/Options/Session/post/complextest.py

    r3e334e r8d56a6  
    11import pyMoleCuilder
    22# ========================== Stored Session BEGIN ==========================
    3 pyMoleCuilder.CommandVerbose("2")
    4 pyMoleCuilder.ParserSetOutputFormats("mpqc tremolo")
    5 pyMoleCuilder.CommandSetRandomNumbersDistribution("uniform_int", "p=1;")
    6 pyMoleCuilder.WorldChangeBox("20,0,0,20,0,20")
    7 pyMoleCuilder.AtomAdd("1", "1,1,1")
    8 pyMoleCuilder.SelectionAtomById("0 0")
     3pyMoleCuilder.CommandVerbose(verbose="2")
     4pyMoleCuilder.ParserSetOutputFormats(set_output="mpqc tremolo")
     5pyMoleCuilder.CommandSetRandomNumbersDistribution(set_random_number_distribution="uniform_int", random_number_distribution_parameters="p=1;")
     6pyMoleCuilder.WorldChangeBox(change_box="20,0,0,20,0,20")
     7pyMoleCuilder.AtomAdd(add_atom="1", domain_position="1,1,1")
     8pyMoleCuilder.SelectionAtomById(select_atom_by_id="0 0")
    99pyMoleCuilder.GraphSubgraphDissection()
    1010pyMoleCuilder.SelectionMoleculeOfAtom()
    11 pyMoleCuilder.FillRegularGrid("3 3 3", ".5,.5,.5", "1", "0", "0", "0", "0")
     11pyMoleCuilder.FillRegularGrid(mesh_size="3 3 3", mesh_offset=".5,.5,.5", min_distance="1", tesselation_radius="0", random_atom_displacement="0", random_molecule_displacement="0", DoRotate="0")
    1212pyMoleCuilder.CommandVersion()
    1313# =========================== Stored Session END ===========================
  • tests/regression/Options/Session/post/test.py

    r3e334e r8d56a6  
    11import pyMoleCuilder
    22# ========================== Stored Session BEGIN ==========================
    3 pyMoleCuilder.CommandVerbose("2")
     3pyMoleCuilder.CommandVerbose(verbose="2")
    44pyMoleCuilder.CommandVersion()
    55# =========================== Stored Session END ===========================
Note: See TracChangeset for help on using the changeset viewer.