Ignore:
Timestamp:
Jul 20, 2010, 1:01:11 PM (15 years ago)
Author:
Frederik Heber <heber@…>
Branches:
Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, AddingActions_SaveParseParticleParameters, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_ParticleName_to_Atom, Adding_StructOpt_integration_tests, AtomFragments, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, CombiningParticlePotentialParsing, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_BoundInBox_CenterInBox_MoleculeActions, Fix_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, Fix_PopActions, Fix_QtFragmentList_sorted_selection, Fix_Restrictedkeyset_FragmentMolecule, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, Fix_fitting_potentials, Fixes, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, FragmentAction_writes_AtomFragments, FragmentMolecule_checks_bonddegrees, GeometryObjects, Gui_Fixes, Gui_displays_atomic_force_velocity, ImplicitCharges, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, MoreRobust_FragmentAutomation, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PdbParser_setsAtomName, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, Rewrite_FitPartialCharges, RotateToPrincipalAxisSystem_UndoRedo, SaturateAtoms_findBestMatching, SaturateAtoms_singleDegree, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, Switchable_LogView, ThirdParty_MPQC_rebuilt_buildsystem, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, TremoloParser_setsAtomName, Ubuntu_1604_changes, stable
Children:
3d078d, 4b6777, c644a5
Parents:
ba9f5b (diff), 818eda (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 'StructureRefactoring' into stable

Conflicts:

test_all.sh

  • test_all.sh was modified by Till in StructureRefactoring (these changes taken over).
  • World::setDomain() was missing OBSERVE macro.
  • MapOfActions: "molecule-by-name" needs String not Molecule.
  • TESTFIX: Tesselations/defs.in - paths changed such that @srcdir@ may be absolute.
  • TESTFIX: Tesselations/heptan/1.5/NonConvexEnvelope.dat - exchanged due to same surface but different polygon triangulation.
  • TESTFIX: Domain/4 molecule-by-id changed from 208 to 207 due to different handling of molecule ids.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • tests/Tesselations/heptan/1.5/NonConvexEnvelope-heptan.dat

    rba9f5b rbe97a8  
    11TITLE = "3D CONVEX SHELL"
    22VARIABLES = "X" "Y" "Z" "U"
    3 ZONE T="heptan", N=23, E=64, DATAPACKING=POINT, ZONETYPE=FETRIANGLE
     3ZONE T="none", N=23, E=64, DATAPACKING=POINT, ZONETYPE=FETRIANGLE
    44-7.27e-07 -1.22006 0.930455 18.7229
    55-7.27e-07 -1.22006 -0.849545 18.7229
     
    77-1.2492 0.921941 -0.849545 18.7227
    881.2492 0.921941 -0.849545 18.7222
    9 1.2492 0.921941 0.930455 27.0641
    10 -2.4985 -1.22006 -0.849545 19.9769
    11 -2.4985 -1.22006 0.930455 27.4727
    12 2.4985 -1.22006 0.930455 19.9769
    13 2.4985 -1.22006 -0.849545 27.4727
     91.2492 0.921941 0.930455 18.7222
     10-2.4985 -1.22006 -0.849545 27.4727
     11-2.4985 -1.22006 0.930455 19.9769
     122.4985 -1.22006 0.930455 27.4727
     132.4985 -1.22006 -0.849545 19.9769
    1414-4.6377 -0.336759 0.0404545 21.541
    1515-3.7477 0.921941 0.930455 18.8853
     
    17174.6377 -0.336759 0.0404545 10.6618
    18183.7477 0.921941 -0.849545 18.5406
    19 3.7477 0.921941 0.930455 12.1988
     193.7477 0.921941 0.930455 18.5406
    2020-7.27e-07 -0.590759 0.0404545 23.0174
    2121-1.2492 0.292641 0.0404545 23.0167
    22 1.2492 0.292641 0.0404545 20.1632
     221.2492 0.292641 0.0404545 23.0172
    2323-2.4985 -0.590759 0.0404545 18.9798
    24242.4985 -0.590759 0.0404545 18.9798
    2525-3.7477 0.292641 0.0404545 39.5267
    26 3.7477 0.292641 0.0404545 23.2512
     263.7477 0.292641 0.0404545 20.5497
    2727
    282814 15 23
     
    343415 19 23
    35355 15 19
     3616 19 23
     376 16 19
    36385 6 19
    37395 6 19
     
    42443 4 18
    43453 4 18
     463 18 22
     473 12 22
    44484 18 22
    45494 13 22
    46 3 18 22
    47 3 12 22
    485012 13 22
    495112 13 22
    50 6 19 23
    51 6 16 23
     5211 12 22
     5311 12 22
     548 11 22
     558 12 22
    525611 13 22
    535711 13 22
    54587 11 22
    55597 13 22
    56 11 12 22
    57 11 12 22
    58 8 11 22
    59 8 12 22
    606014 16 23
    616114 16 23
     
    76769 10 21
    77779 14 21
    78 10 17 21
    79 2 10 17
     789 17 21
     791 9 17
    80801 2 17
    81811 2 17
    82 1 17 21
    83 1 9 21
    84 2 17 20
    85 2 7 20
     822 17 21
     832 10 21
     841 17 20
     851 8 20
    86867 8 20
    87877 8 20
     888 11 20
    88897 11 20
    89 8 11 20
    90 8 17 20
    91 1 8 17
     907 17 20
     912 7 17
Note: See TracChangeset for help on using the changeset viewer.