Changeset b85145

Timestamp:

Sep 20, 2016, 9:02:32 AM (8 years ago)

Author:

Frederik Heber <heber@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_StructOpt_integration_tests, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, 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_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, 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, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, Ubuntu_1604_changes, stable

Children:

4b5bd2

Parents:

67645e

git-author:

Frederik Heber <heber@…> (09/20/16 09:01:56)

git-committer:

Frederik Heber <heber@…> (09/20/16 09:02:32)

Message:

FIX: Tesselation::GetCircleOfSetOfPoints() did not check for exception from Plane's cstor.

File:

• src/Tesselation/tesselation.cpp (modified) (1 diff)

src/Tesselation/tesselation.cpp

@@ -3015 +3015 @@
   }
   LOG(4, "DEBUG: Reference vector on this plane representing angle 0 is " << AngleZero << ".");
-  if (AngleZero.NormSquared() > MYEPSILON)
-    OrthogonalVector = Plane(PlaneNormal, AngleZero, 0).getNormal();
-  else
+  if (AngleZero.NormSquared() > MYEPSILON) {
+    try {
+      OrthogonalVector = Plane(PlaneNormal, AngleZero, 0).getNormal();
+    } catch (ZeroVectorException &e) {
+      LOG(4, "DEBUG: Constructing plane failed due to linear dependency.");
+      OrthogonalVector.MakeNormalTo(PlaneNormal);
+    }
+  } else
     OrthogonalVector.MakeNormalTo(PlaneNormal);
   LOG(4, "DEBUG: OrthogonalVector on plane is " << OrthogonalVector << ".");