source: src/Filling/Preparators/BaseFillerPreparator.cpp@ 4464ef

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_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_levmar Subpackage_vmg ThirdParty_MPQC_rebuilt_buildsystem TremoloParser_IncreasedPrecision TremoloParser_MultipleTimesteps Ubuntu_1604_changes stable
Last change on this file since 4464ef was df0c80, checked in by Frederik Heber <heber@…>, 9 years ago

FIX: Filling actions did not use minimum distance for tesselated surface.

  • added IsCloseEnoughSurface_FillPredicate which requires a minimum distance to the tesselated surface (but does not care about the sign) and combines it with an additonal IsInsideSurface_FillPredicate.
  • this is now used in regular-grid, surface, and volume fill actions when a non-zero minimum distance is given.
  • TESTFIX: Test is now working.
  • Property mode set to 100644
File size: 4.0 KB
RevLine 
[cae614]1/*
2 * Project: MoleCuilder
3 * Description: creates and alters molecular systems
4 * Copyright (C) 2014 Frederik Heber. All rights reserved.
5 *
6 *
7 * This file is part of MoleCuilder.
8 *
9 * MoleCuilder is free software: you can redistribute it and/or modify
10 * it under the terms of the GNU General Public License as published by
11 * the Free Software Foundation, either version 2 of the License, or
12 * (at your option) any later version.
13 *
14 * MoleCuilder is distributed in the hope that it will be useful,
15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17 * GNU General Public License for more details.
18 *
19 * You should have received a copy of the GNU General Public License
20 * along with MoleCuilder. If not, see <http://www.gnu.org/licenses/>.
21 */
22
23/*
24 * BaseFillerPreparator.cpp
25 *
26 * Created on: Sep 2, 2014
27 * Author: heber
28 */
29
30// include config.h
31#ifdef HAVE_CONFIG_H
32#include <config.h>
33#endif
34
35#include "CodePatterns/MemDebug.hpp"
36
37#include "BaseFillerPreparator.hpp"
38
39#include "CodePatterns/Log.hpp"
40
41#include "Atom/atom.hpp"
42#include "Filling/Cluster.hpp"
43#include "Filling/Filler.hpp"
44#include "Filling/Inserter/Inserter.hpp"
45#include "Filling/Inserter/RandomInserter.hpp"
46#include "Filling/Mesh/CubeMesh.hpp"
47#include "Filling/Mesh/MeshAdaptor.hpp"
[df0c80]48#include "Filling/Predicates/IsCloseEnoughToSurface_FillPredicate.hpp"
[cae614]49#include "Filling/Predicates/IsInsideSurface_FillPredicate.hpp"
50#include "Filling/Predicates/IsVoidNode_FillPredicate.hpp"
51#include "Filling/Predicates/Ops_FillPredicate.hpp"
52#include "LinkedCell/linkedcell.hpp"
53#include "LinkedCell/PointCloudAdaptor.hpp"
54#include "molecule.hpp"
55#include "Shapes/BaseShapes.hpp"
56#include "Tesselation/tesselation.hpp"
57
58
59BaseFillerPreparator::BaseFillerPreparator(molecule *_filler) :
60 filler(_filler),
61 surface_predicate(NULL),
62 LC(NULL),
63 TesselStruct(NULL),
64 voidnode_predicate(NULL),
65 Andpredicate(NULL),
66 mesh(NULL),
67 inserter(NULL),
68 fillerFunction(NULL)
69{}
70
71BaseFillerPreparator::~BaseFillerPreparator()
72{
73 // free all structures if allocated
74 delete fillerFunction;
75 delete inserter;
76 delete mesh;
77 delete Andpredicate;
78 delete voidnode_predicate;
79 delete TesselStruct;
80 delete LC;
81 delete surface_predicate;
82 // given filler molecule is from someplace else
83 filler = NULL;
84}
85
86void BaseFillerPreparator::addSurfacePredicate(
87 const double _radius,
[df0c80]88 std::vector<atom *> &_atoms,
89 const double minimum_distance)
[cae614]90{
91 // create adaptor for the selected atoms
92 PointCloudAdaptor< std::vector<atom *> > cloud(&_atoms, std::string("Selected atoms"));
93
94 // create tesselation
95 LC = new LinkedCell_deprecated(cloud, 2.*_radius);
96 TesselStruct = new Tesselation;
97 (*TesselStruct)(cloud, _radius);
98
99 // and create predicate
[df0c80]100 if (minimum_distance == 0.)
101 surface_predicate =
102 new FillPredicate( IsInsideSurface_FillPredicate(
103 *TesselStruct, *LC ) );
104 else
105 surface_predicate =
106 new FillPredicate( IsCloseEnoughToSurface_FillPredicate(
107 *TesselStruct, *LC, minimum_distance ) );
[cae614]108}
109
110void BaseFillerPreparator::addRandomInserter(
111 const double _RandAtomDisplacement,
112 const double _RandMoleculeDisplacement,
113 const bool _DoRotate)
114{
115 inserter = new Inserter(
116 Inserter::impl_ptr(
117 new RandomInserter(
118 _RandAtomDisplacement,
119 _RandMoleculeDisplacement,
120 _DoRotate)
121 )
122 );
123}
124
125void BaseFillerPreparator::addVoidPredicate(
126 const double _mindistance)
127{
128 voidnode_predicate = new FillPredicate(
129 IsVoidNode_FillPredicate(
130 Sphere(zeroVec, _mindistance)
131 )
132 );
133}
134
135bool BaseFillerPreparator::operator()()
136{
137 if ((mesh != NULL)
138 && (inserter != NULL)
139 && (voidnode_predicate != NULL)) {
140
141 FillPredicate Andpredicate = *voidnode_predicate;
142 if (surface_predicate != NULL)
143 Andpredicate = (Andpredicate) && !(*surface_predicate);
144 fillerFunction = new Filler(*mesh, Andpredicate, *inserter);
145 return true;
146 } else {
147 return false;
148 }
149}
Note: See TracBrowser for help on using the repository browser.