Ignore:
Timestamp:
Nov 4, 2016, 9:37:49 AM (8 years ago)
Author:
Frederik Heber <heber@…>
Branches:
Action_Thermostats, Add_AtomRandomPerturbation, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_StructOpt_integration_tests, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, 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_ChronosMutex, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, GeometryObjects, Gui_displays_atomic_force_velocity, IndependentFragmentGrids_IntegrationTest, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, RotateToPrincipalAxisSystem_UndoRedo, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, ThirdParty_MPQC_rebuilt_buildsystem, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, Ubuntu_1604_changes, stable
Children:
16c6f7
Parents:
95304c
git-author:
Frederik Heber <heber@…> (10/02/16 13:24:41)
git-committer:
Frederik Heber <heber@…> (11/04/16 09:37:49)
Message:

MPQCData additionally stores the atomic number per nuclei.

  • in case of DoSampleValenceOnly the charge does not represent the atomic number and moreover it is no longer unique. However, we need this unique association for fitting potentials to the fragment results.
  • TESTFIX: set all tests to XFAIL that parse either fragmentation results or homologies.
  • TESTFIX: needed to adapt HomologyContainerUnitTest which uses FragmentStub.
  • TESTFIX: needed to adapt FragmentUnitTest.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/Fragmentation/Homology/unittests/HomologyContainerUnitTest.cpp

    r95304c r6829d2  
    9393  Fragment::position_t pos(3, 0.);
    9494  Fragment::positions_t positions(1, pos);
     95  Fragment::atomicnumbers_t atomicnumbers(1,1.);
    9596  Fragment::charges_t charges(1,1.);
    96   Fragment dummy(positions, charges);
     97  Fragment dummy(positions, atomicnumbers, charges);
    9798  charges[0] = 6.;
    9899  positions[0][0] = 1.;
    99   Fragment dummy1(positions, charges);
     100  Fragment dummy1(positions, atomicnumbers, charges);
    100101  positions[0][0] = 2.;
    101   Fragment dummy2(positions, charges);
     102  Fragment dummy2(positions, atomicnumbers, charges);
    102103  HomologyContainer::value_t value1;
    103104  value1.fragment = dummy1;
     
    133134  Fragment::position_t pos(3, 0.);
    134135  Fragment::positions_t positions(1, pos);
     136  Fragment::atomicnumbers_t atomicnumbers(1,1.);
    135137  Fragment::charges_t charges(1,1.);
    136   Fragment dummy(positions, charges);
     138  Fragment dummy(positions, atomicnumbers, charges);
    137139  HomologyContainer::value_t value;
    138140  value.fragment = dummy;
     
    158160  Fragment::position_t pos(3, 0.);
    159161  Fragment::positions_t positions(1, pos);
     162  Fragment::atomicnumbers_t atomicnumbers(1,1.);
    160163  Fragment::charges_t charges(1,1.);
    161   Fragment dummy(positions, charges);
     164  Fragment dummy(positions, atomicnumbers, charges);
    162165  HomologyContainer::value_t value;
    163166  value.fragment = dummy;
Note: See TracChangeset for help on using the changeset viewer.