- Timestamp:
- Jun 21, 2018, 7:45:21 AM (7 years ago)
- Branches:
- Candidate_v1.6.1, ChemicalSpaceEvaluator
- Children:
- 8d56a6
- Parents:
- 2ee2cc (diff), a6c11a (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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/Actions/FragmentationAction/FragmentationAutomationAction.cpp
r2ee2cc r3e334e 242 242 // Phase One: obtain ids 243 243 mpqccontroller.requestIds(NumberJobs); 244 if (mpqccontroller.getExitflag() != 0) 245 return Action::failure; 244 if (mpqccontroller.getExitflag() != 0) { 245 ELOG(1, "Could not request all ids from Server."); 246 return Action::failure; 247 } 246 248 247 249 // Phase Two: add MPQCJobs and send … … 269 271 wait_thread.join(); 270 272 stop(); 271 if (mpqccontroller.getExitflag() != 0) 272 return Action::failure; 273 if (mpqccontroller.getExitflag() != 0) { 274 ELOG(1, "Could not obtain all results from Server."); 275 return Action::failure; 276 } 273 277 274 278 mpqccontroller.getResults(shortrangedata); … … 439 443 // Phase Six b: calculate result 440 444 vmgcontroller.waitforResults(NoJobs); 441 if (vmgcontroller.getExitflag() != 0) 445 if (vmgcontroller.getExitflag() != 0) { 446 ELOG(1, "VMGFragmentController returned non-zero exit flag before getting results."); 442 447 return Action::failure; 448 } 443 449 vmgcontroller.getResults(longrangedata_both); 444 450 ASSERT( NoJobs == longrangedata_both.size(),
Note:
See TracChangeset
for help on using the changeset viewer.