Changeset dc759c


Ignore:
Timestamp:
Jul 2, 2012, 8:32:02 AM (13 years ago)
Author:
Frederik Heber <heber@…>
Branches:
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, 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
Children:
5ac92e
Parents:
92b1d3
git-author:
Frederik Heber <heber@…> (04/25/12 10:04:21)
git-committer:
Frederik Heber <heber@…> (07/02/12 08:32:02)
Message:

FIX: All checks on command line arguments are now done in phase one, exit on fail.

  • otherwise we lost e.g. results when receivempqc had received them but noticed afterwards that the required path is missing.
File:
1 edited

Legend:

Unmodified
Added
Removed

  • src/Fragmentation/Automation/controller.cpp

    r92b1d3 rdc759c  
    348348        if (argc < 6) {
    349349          ELOG(1, "'addjobs' requires at least two options: [mpqc] [list of input files ...].");
     350          return 255;
    350351        } else {
    351352          // get an id for every filename
    … …  
    358359        std::vector<FragmentJob::ptr> jobs;
    359360        if (argc < 6) {
     361          return 255;
    360362          ELOG(1, "'createjobs' requires two options: [command] [argument].");
    361363        } else {
    … …  
    369371        break;
    370372      case ReceiveMPQCIndex:
     373        if (argc < 5) {
     374          ELOG(1, "'receivempqc' require one option: [path to fragment files].");
     375          return 255;
     376        }
    371377        break;
    372378      case RemoveAllIndex:
    … …  
    377383      default:
    378384        ELOG(1, "Unrecognized command '"+toString(argv[3])+"'.");
     385        return 255;
    379386        break;
    380387    }
    … …  
    392399      {
    393400        std::vector<FragmentJob::ptr> jobs;
    394         if (argc < 6) {
    395           ELOG(1, "Please add a filename for the MPQCCommandJob.");
    396         } else {
    397           const std::string command(argv[4]);
    398           for (int argcount = 5; argcount < argc; ++argcount) {
    399             const JobId_t next_id = controller.getAvailableId();
    400             const std::string filename(argv[argcount]);
    401             LOG(1, "INFO: Creating MPQCCommandJob with filename'"
    402                 +filename+"', and id "+toString(next_id)+".");
    403             parsejob(jobs, command, filename, next_id);
    404           }
    405           controller.addJobs(jobs);
    406           controller.sendJobs(argv[1], argv[2]);
     401        const std::string command(argv[4]);
     402        for (int argcount = 5; argcount < argc; ++argcount) {
     403          const JobId_t next_id = controller.getAvailableId();
     404          const std::string filename(argv[argcount]);
     405          LOG(1, "INFO: Creating MPQCCommandJob with filename'"
     406              +filename+"', and id "+toString(next_id)+".");
     407          parsejob(jobs, command, filename, next_id);
    407408        }
     409        controller.addJobs(jobs);
     410        controller.sendJobs(argv[1], argv[2]);
    408411        break;
    409412      }
    410413      case CreateJobsIndex:
    411414      {
     415        const JobId_t next_id = controller.getAvailableId();
    412416        std::vector<FragmentJob::ptr> jobs;
    413         if (argc < 6) {
    414           ELOG(1, "'createjobs' requires two options: [command] [argument].");
    415         } else {
    416           const JobId_t next_id = controller.getAvailableId();
    417           createjobs(jobs, argv[4], argv[5], next_id);
    418           controller.addJobs(jobs);
    419           controller.sendJobs(argv[1], argv[2]);
    420         }
     417        createjobs(jobs, argv[4], argv[5], next_id);
     418        controller.addJobs(jobs);
     419        controller.sendJobs(argv[1], argv[2]);
    421420        break;
    422421      }
    … …  
    449448      default:
    450449        ELOG(0, "Unrecognized command '"+toString(argv[3])+"'.");
     450        return 255;
    451451        break;
    452452    }
    … …  
    477477      case ReceiveMPQCIndex:
    478478      {
    479         if (argc < 5) {
    480           ELOG(1, "'receivempqc' require one option: [path to fragment files].");
    481         } else {
    482           const std::string path = argv[4];
    483           LOG(1, "INFO: Parsing fragment files from " << path << ".");
    484           std::vector<FragmentResult::ptr> results = controller.getReceivedResults();
    485           printReceivedMPQCResults(
    486               results,
    487               path,
    488               getNoAtomsFromAdjacencyFile(path));
    489         }
     479        const std::string path = argv[4];
     480        LOG(1, "INFO: Parsing fragment files from " << path << ".");
     481        std::vector<FragmentResult::ptr> results = controller.getReceivedResults();
     482        printReceivedMPQCResults(
     483            results,
     484            path,
     485            getNoAtomsFromAdjacencyFile(path));
    490486        break;
    491487      }
    … …  
    497493      default:
    498494        ELOG(0, "Unrecognized command '"+toString(argv[3])+"'.");
     495        return 255;
    499496        break;
    500497    }
Note: See TracChangeset for help on using the changeset viewer.