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
        Candidate_v1.7.0
        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
      
      
        
          | Last change
 on this file since 375b458 was             6ac7ee, checked in by Frederik Heber <heber@…>, 17 years ago | 
        
          | 
Merge branch 'ConcaveHull' of ../espack2 into ConcaveHull
 
Conflicts:
 
molecuilder/src/boundary.cppmolecuilder/src/boundary.hpp
 molecuilder/src/builder.cpp
 molecuilder/src/linkedcell.cpp
 molecuilder/src/linkedcell.hpp
 molecuilder/src/vector.cpp
 molecuilder/src/vector.hpp
 util/src/NanoCreator.c
 
 
Basically, this resulted from a lot of conversions two from spaces to one tab, which is my standard indentation. The mess was caused by eclipse auto-indenting. And in espack2:ConcaveHull was the new stuff, so all from ConcaveHull was replaced in case of doubt.Additionally, vector had ofstream << operator instead ostream << ...
 
 | 
        
          | 
              
Property                 mode
 set to                 100644 | 
        
          | File size:
            925 bytes | 
      
      
| Line |  | 
|---|
| 1 | #ifndef LINKEDCELL_HPP_ | 
|---|
| 2 | #define LINKEDCELL_HPP_ | 
|---|
| 3 |  | 
|---|
| 4 | // include config.h | 
|---|
| 5 | #ifdef HAVE_CONFIG_H | 
|---|
| 6 | #include <config.h> | 
|---|
| 7 | #endif | 
|---|
| 8 |  | 
|---|
| 9 | #include "molecules.hpp" | 
|---|
| 10 |  | 
|---|
| 11 | #define LinkedAtoms list <atom *> | 
|---|
| 12 |  | 
|---|
| 13 | class LinkedCell{ | 
|---|
| 14 | public: | 
|---|
| 15 | Vector max;                      // upper boundary | 
|---|
| 16 | Vector min;                      // lower boundary | 
|---|
| 17 | LinkedAtoms *LC;        // linked cell list | 
|---|
| 18 | double RADIUS;          // cell edge length | 
|---|
| 19 | int N[NDIM];                    // number of cells per axis | 
|---|
| 20 | int n[NDIM];                    // temporary variable for current cell per axis | 
|---|
| 21 | int index;                              // temporary index variable , access by index = n[0] * N[1] * N[2] + n[1] * N[2] + n[2]; | 
|---|
| 22 |  | 
|---|
| 23 | LinkedCell(); | 
|---|
| 24 | LinkedCell(molecule *mol, double RADIUS); | 
|---|
| 25 | ~LinkedCell(); | 
|---|
| 26 | LinkedAtoms* GetCurrentCell(); | 
|---|
| 27 | bool SetIndexToAtom(atom *Walker); | 
|---|
| 28 | bool SetIndexToVector(Vector *x); | 
|---|
| 29 | bool CheckBounds(); | 
|---|
| 30 |  | 
|---|
| 31 | // not implemented yet | 
|---|
| 32 | bool AddAtom(atom *Walker); | 
|---|
| 33 | bool DeleteAtom(atom *Walker); | 
|---|
| 34 | bool MoveAtom(atom *Walker); | 
|---|
| 35 | }; | 
|---|
| 36 |  | 
|---|
| 37 | #endif /*LINKEDCELL_HPP_*/ | 
|---|
       
      
  Note:
 See   
TracBrowser
 for help on using the repository browser.