56 |
|
#include "applications/staticProps/GofAngle2.hpp" |
57 |
|
#include "applications/staticProps/GofXyz.hpp" |
58 |
|
#include "applications/staticProps/P2OrderParameter.hpp" |
59 |
+ |
#include "applications/staticProps/SCDOrderParameter.hpp" |
60 |
+ |
#include "applications/staticProps/DensityPlot.hpp" |
61 |
|
|
60 |
– |
|
62 |
|
using namespace oopse; |
63 |
|
|
64 |
|
int main(int argc, char* argv[]){ |
89 |
|
char* sele1Env= getenv("OOPSE_SELE1"); |
90 |
|
if (sele1Env) { |
91 |
|
sele1 = sele1Env; |
92 |
< |
}else { |
92 |
> |
}else if (!args_info.scd_given) { |
93 |
|
sprintf( painCave.errMsg, |
94 |
|
"neither --sele1 option nor $OOPSE_SELE1 is set"); |
95 |
|
painCave.severity = OOPSE_ERROR; |
104 |
|
char* sele2Env = getenv("OOPSE_SELE2"); |
105 |
|
if (sele2Env) { |
106 |
|
sele2 = sele2Env; |
107 |
< |
} else { |
107 |
> |
} else if (args_info.density_given) { |
108 |
> |
sele2 = "select all"; |
109 |
> |
} else if(!args_info.scd_given && !args_info.density_given) { |
110 |
|
sprintf( painCave.errMsg, |
111 |
|
"neither --sele2 option nor $OOPSE_SELE2 is set"); |
112 |
|
painCave.severity = OOPSE_ERROR; |
115 |
|
} |
116 |
|
} |
117 |
|
|
118 |
+ |
bool batchMode; |
119 |
+ |
if (args_info.scd_given){ |
120 |
+ |
if (args_info.sele1_given && args_info.sele2_given && args_info.sele3_given) { |
121 |
+ |
batchMode = false; |
122 |
+ |
} else if (args_info.molname_given && args_info.begin_given && args_info.end_given) { |
123 |
+ |
if (args_info.begin_arg < 0 || args_info.end_arg < 0 || args_info.begin_arg > args_info.end_arg-2) { |
124 |
+ |
sprintf( painCave.errMsg, |
125 |
+ |
"below conditions are not satisfied:\n" |
126 |
+ |
"0 <= begin && 0<= end && begin <= end-2\n"); |
127 |
+ |
painCave.severity = OOPSE_ERROR; |
128 |
+ |
painCave.isFatal = 1; |
129 |
+ |
simError(); |
130 |
+ |
} |
131 |
+ |
batchMode = true; |
132 |
+ |
} else{ |
133 |
+ |
sprintf( painCave.errMsg, |
134 |
+ |
"either --sele1, --sele2, --sele3 are specified," |
135 |
+ |
" or --molname, --begin, --end are specified\n"); |
136 |
+ |
painCave.severity = OOPSE_ERROR; |
137 |
+ |
painCave.isFatal = 1; |
138 |
+ |
simError(); |
139 |
+ |
|
140 |
+ |
} |
141 |
+ |
} |
142 |
+ |
|
143 |
|
//parse md file and set up the system |
144 |
|
SimCreator creator; |
145 |
|
SimInfo* info = creator.createSim(mdFileName); |
173 |
|
} |
174 |
|
} else if (args_info.p2_given) { |
175 |
|
analyser = new P2OrderParameter(info, dumpFileName, sele1, sele2); |
176 |
+ |
} else if (args_info.scd_given) { |
177 |
+ |
if (batchMode) { |
178 |
+ |
analyser = new SCDOrderParameter(info, dumpFileName, args_info.molname_arg, |
179 |
+ |
args_info.begin_arg, args_info.end_arg); |
180 |
+ |
} else{ |
181 |
+ |
std::string sele3 = args_info.sele3_arg; |
182 |
+ |
analyser = new SCDOrderParameter(info, dumpFileName, sele1, sele2, sele3); |
183 |
+ |
} |
184 |
+ |
}else if (args_info.density_given) { |
185 |
+ |
analyser= new DensityPlot(info, dumpFileName, sele1, sele2, maxLen, args_info.nrbins_arg); |
186 |
|
} |
187 |
|
|
188 |
|
if (args_info.output_given) { |