Ignore:
Timestamp:
Aug 9, 2010, 6:34:36 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:
0d02fb, 4e6d74, e41c48
Parents:
b5c53d (diff), 1cc87e (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 'AddMoreActions' into stable

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/Actions/Makefile.am

    rb5c53d r353e82  
    5050  AtomAction/AddAction.cpp \
    5151  AtomAction/ChangeElementAction.cpp \
    52   AtomAction/RemoveAction.cpp
     52  AtomAction/RemoveAction.cpp \
     53  AtomAction/RotateAroundOriginByAngleAction.cpp \
     54  AtomAction/TranslateAction.cpp
    5355ATOMACTIONHEADER = \
    5456  AtomAction/AddAction.hpp \
    5557  AtomAction/ChangeElementAction.hpp \
    56   AtomAction/RemoveAction.cpp
     58  AtomAction/RemoveAction.cpp \
     59  AtomAction/RotateAroundOriginByAngleAction.hpp \
     60  AtomAction/TranslateAction.hpp
    5761
    5862CMDACTIONSOURCE = \
     
    8589  MoleculeAction/FillWithMoleculeAction.cpp \
    8690  MoleculeAction/LinearInterpolationofTrajectoriesAction.cpp \
    87   MoleculeAction/RotateAroundOriginByAngleAction.cpp \
    8891  MoleculeAction/RotateAroundSelfByAngleAction.cpp \
    8992  MoleculeAction/RotateToPrincipalAxisSystemAction.cpp \
     
    9295  MoleculeAction/SaveTemperatureAction.cpp \
    9396  MoleculeAction/SuspendInWaterAction.cpp \
    94   MoleculeAction/TranslateAction.cpp \
    9597  MoleculeAction/VerletIntegrationAction.cpp
    9698MOLECULEACTIONHEADER = \
     
    99101  MoleculeAction/FillWithMoleculeAction.hpp \
    100102  MoleculeAction/LinearInterpolationofTrajectoriesAction.hpp \
    101   MoleculeAction/RotateAroundOriginByAngleAction.hpp \
    102103  MoleculeAction/RotateAroundSelfByAngleAction.hpp \
    103104  MoleculeAction/RotateToPrincipalAxisSystemAction.hpp \
     
    106107  MoleculeAction/SaveTemperatureAction.hpp \
    107108  MoleculeAction/SuspendInWaterAction.hpp \
    108   MoleculeAction/TranslateAction.hpp \
    109109  MoleculeAction/VerletIntegrationAction.hpp
    110110                 
     
    118118SELECTIONACTIONSOURCE = \
    119119        SelectionAction/AllAtomsAction.cpp \
     120        SelectionAction/AllAtomsInsideCuboidAction.cpp \
     121        SelectionAction/AllAtomsInsideSphereAction.cpp \
     122        SelectionAction/AllAtomsOfMoleculeAction.cpp \
    120123        SelectionAction/AllMoleculesAction.cpp \
    121124        SelectionAction/AtomByIdAction.cpp \
     125        SelectionAction/ClearAllAtomsAction.cpp \
     126        SelectionAction/ClearAllMoleculesAction.cpp \
    122127        SelectionAction/MoleculeByIdAction.cpp \
     128        SelectionAction/MoleculeOfAtomAction.cpp \
    123129        SelectionAction/NotAllAtomsAction.cpp \
     130        SelectionAction/NotAllAtomsInsideCuboidAction.cpp \
     131        SelectionAction/NotAllAtomsInsideSphereAction.cpp \
     132        SelectionAction/NotAllAtomsOfMoleculeAction.cpp \
    124133        SelectionAction/NotAllMoleculesAction.cpp \
    125134        SelectionAction/NotAtomByIdAction.cpp \
    126         SelectionAction/NotMoleculeByIdAction.cpp
     135        SelectionAction/NotMoleculeByIdAction.cpp \
     136        SelectionAction/NotMoleculeOfAtomAction.cpp
    127137SELECTIONACTIONHEADER = \
    128138        SelectionAction/AllAtomsAction.hpp \
     139        SelectionAction/AllAtomsInsideCuboidAction.hpp \
     140        SelectionAction/AllAtomsInsideSphereAction.hpp \
     141        SelectionAction/AllAtomsOfMoleculeAction.hpp \
    129142        SelectionAction/AllMoleculesAction.hpp \
    130143        SelectionAction/AtomByIdAction.hpp \
     144        SelectionAction/ClearAllAtomsAction.hpp \
     145        SelectionAction/ClearAllMoleculesAction.hpp \
    131146        SelectionAction/MoleculeByIdAction.hpp \
     147        SelectionAction/MoleculeOfAtomAction.hpp \
    132148        SelectionAction/NotAllAtomsAction.hpp \
     149        SelectionAction/NotAllAtomsInsideCuboidAction.hpp \
     150        SelectionAction/NotAllAtomsInsideSphereAction.hpp \
     151        SelectionAction/NotAllAtomsOfMoleculeAction.hpp \
    133152        SelectionAction/NotAllMoleculesAction.hpp \
    134153        SelectionAction/NotAtomByIdAction.hpp \
    135         SelectionAction/NotMoleculeByIdAction.hpp
     154        SelectionAction/NotMoleculeByIdAction.hpp \
     155        SelectionAction/NotMoleculeOfAtomAction.cpp
    136156
    137157TESSELATIONACTIONSOURCE = \
     
    150170  WorldAction/InputAction.cpp \
    151171  WorldAction/OutputAction.cpp \
    152   WorldAction/RemoveSphereOfAtomsAction.cpp \
    153172  WorldAction/RepeatBoxAction.cpp \
    154173  WorldAction/ScaleBoxAction.cpp \
     
    164183  WorldAction/InputAction.hpp \
    165184  WorldAction/OutputAction.hpp \
    166   WorldAction/RemoveSphereOfAtomsAction.hpp \
    167185  WorldAction/RepeatBoxAction.hpp \
    168186  WorldAction/ScaleBoxAction.hpp \
Note: See TracChangeset for help on using the changeset viewer.