Changeset 180b5f for src/Actions

Timestamp:

Oct 20, 2016, 8:54:23 PM (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_ForceAnnealing, Fix_ParseParticles, 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:

064b34

Parents:

097535

git-author:

Frederik Heber <heber@…> (09/27/16 09:57:45)

git-committer:

Frederik Heber <heber@…> (10/20/16 20:54:23)

Message:

FragmentationAction does not give error on adjacencyfile when not parsing state files.

File:

• src/Actions/FragmentationAction/FragmentationAction.cpp (modified) (1 diff)

src/Actions/FragmentationAction/FragmentationAction.cpp

@@ -118 +118 @@
   boost::shared_ptr<AdjacencyList> FileChecker;
   boost::filesystem::path filename(params.prefix.get() + std::string(ADJACENCYFILE));
-  if ((params.ParseStateFiles.get())
-    && boost::filesystem::exists(filename)
+  if (params.ParseStateFiles.get()) {
+    if (boost::filesystem::exists(filename)
     && boost::filesystem::is_regular_file(filename)) {
-    std::ifstream File;
-    File.open(filename.string().c_str(), ios::out);
-    FileChecker.reset(new AdjacencyList(File));
-    File.close();
-  } else {
-    LOG(1, "INFO: Could not open default adjacency file " << filename.string() << ".");
+      std::ifstream File;
+      File.open(filename.string().c_str(), ios::out);
+      FileChecker.reset(new AdjacencyList(File));
+      File.close();
+    } else {
+      LOG(1, "INFO: Could not open default adjacency file " << filename.string() << ".");
+      FileChecker.reset(new AdjacencyList);
+    }
+  } else
     FileChecker.reset(new AdjacencyList);
-  }
 
   // make sure bond degree is correct