# | Line 1 | Line 1 | |
---|---|---|
1 | < | /* |
1 | > | /* |
2 | * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved. | |
3 | * | |
4 | * The University of Notre Dame grants you ("Licensee") a | |
# | Line 57 | Line 57 | int main(int argc, char* argv[]){ | |
57 | ||
58 | int main(int argc, char* argv[]){ | |
59 | ||
60 | < | //register force fields |
61 | < | registerForceFields(); |
60 | > | //register force fields |
61 | > | registerForceFields(); |
62 | ||
63 | < | gengetopt_args_info args_info; |
63 | > | gengetopt_args_info args_info; |
64 | ||
65 | < | //parse the command line option |
66 | < | if (cmdline_parser (argc, argv, &args_info) != 0) { |
67 | < | exit(1) ; |
68 | < | } |
65 | > | //parse the command line option |
66 | > | if (cmdline_parser (argc, argv, &args_info) != 0) { |
67 | > | exit(1) ; |
68 | > | } |
69 | ||
70 | ||
71 | < | //get the dumpfile name and meta-data file name |
72 | < | std::string dumpFileName = args_info.input_arg; |
71 | > | //get the dumpfile name and meta-data file name |
72 | > | std::string dumpFileName = args_info.input_arg; |
73 | ||
74 | < | std::string mdFileName = dumpFileName.substr(0, dumpFileName.rfind(".")) + ".md"; |
74 | > | std::string mdFileName = dumpFileName.substr(0, dumpFileName.rfind(".")) + ".md"; |
75 | ||
76 | ||
77 | < | std::string sele1; |
78 | < | std::string sele2; |
77 | > | std::string sele1; |
78 | > | std::string sele2; |
79 | ||
80 | < | if (args_info.sele1_given) { |
81 | < | sele1 = args_info.sele1_arg; |
80 | > | if (args_info.sele1_given) { |
81 | > | sele1 = args_info.sele1_arg; |
82 | > | }else { |
83 | > | char* sele1Env= getenv("OOPSE_SELE1"); |
84 | > | if (sele1Env) { |
85 | > | sele1 = sele1Env; |
86 | }else { | |
87 | < | char* sele1Env= getenv("OOPSE_SELE1"); |
84 | < | if (sele1Env) { |
85 | < | sele1 = sele1Env; |
86 | < | }else { |
87 | < | sprintf( painCave.errMsg, |
87 | > | sprintf( painCave.errMsg, |
88 | "neither --sele1 option nor $OOPSE_SELE1 is set"); | |
89 | < | painCave.severity = OOPSE_ERROR; |
90 | < | painCave.isFatal = 1; |
91 | < | simError(); |
92 | < | } |
89 | > | painCave.severity = OOPSE_ERROR; |
90 | > | painCave.isFatal = 1; |
91 | > | simError(); |
92 | } | |
93 | + | } |
94 | ||
95 | < | if (args_info.sele2_given) { |
96 | < | sele2 = args_info.sele2_arg; |
97 | < | }else { |
98 | < | char* sele2Env = getenv("OOPSE_SELE2"); |
99 | < | if (sele2Env) { |
100 | < | sele2 = sele2Env; |
101 | < | } else { |
102 | < | sele2 = sele1; |
103 | < | } |
95 | > | if (args_info.sele2_given) { |
96 | > | sele2 = args_info.sele2_arg; |
97 | > | }else { |
98 | > | char* sele2Env = getenv("OOPSE_SELE2"); |
99 | > | if (sele2Env) { |
100 | > | sele2 = sele2Env; |
101 | > | } else { |
102 | > | sele2 = sele1; |
103 | } | |
104 | + | } |
105 | ||
106 | < | //parse md file and set up the system |
107 | < | SimCreator creator; |
108 | < | SimInfo* info = creator.createSim(mdFileName, false); |
106 | > | //parse md file and set up the system |
107 | > | SimCreator creator; |
108 | > | SimInfo* info = creator.createSim(mdFileName, false); |
109 | ||
110 | ||
111 | < | TimeCorrFunc* corrFunc; |
112 | < | if (args_info.dcorr_given){ |
113 | < | corrFunc = new DipoleCorrFunc(info, dumpFileName, sele1, sele2); |
114 | < | } else if (args_info.rcorr_given) { |
115 | < | corrFunc = new RCorrFunc(info, dumpFileName, sele1, sele2); |
116 | < | } |
117 | < | else if (args_info.vcorr_given) { |
118 | < | corrFunc = new VCorrFunc(info, dumpFileName, sele1, sele2); |
119 | < | } |
111 | > | TimeCorrFunc* corrFunc; |
112 | > | if (args_info.dcorr_given){ |
113 | > | corrFunc = new DipoleCorrFunc(info, dumpFileName, sele1, sele2); |
114 | > | } else if (args_info.rcorr_given) { |
115 | > | corrFunc = new RCorrFunc(info, dumpFileName, sele1, sele2); |
116 | > | } |
117 | > | else if (args_info.vcorr_given) { |
118 | > | corrFunc = new VCorrFunc(info, dumpFileName, sele1, sele2); |
119 | > | } |
120 | ||
121 | < | if (args_info.output_given) { |
122 | < | corrFunc->setOutputName(args_info.output_arg); |
123 | < | } |
121 | > | if (args_info.output_given) { |
122 | > | corrFunc->setOutputName(args_info.output_arg); |
123 | > | } |
124 | ||
125 | ||
126 | < | corrFunc->doCorrelate(); |
126 | > | corrFunc->doCorrelate(); |
127 | ||
128 | < | delete corrFunc; |
129 | < | delete info; |
128 | > | delete corrFunc; |
129 | > | delete info; |
130 | ||
131 | < | return 0; |
131 | > | return 0; |
132 | } | |
133 | ||
134 |
– | Removed lines |
+ | Added lines |
< | Changed lines |
> | Changed lines |