[ViewVC] Diff of: OpenMD/trunk/src/applications/staticProps/StaticProps.cpp

Comparing trunk/src/applications/staticProps/StaticProps.cpp (file contents):
Revision 1541 by kstocke1, Fri Nov 19 20:26:36 2010 UTC vs.
Revision 1542 by gezelter, Thu Mar 3 20:32:49 2011 UTC

#	Line 233 \| Line 233 \| *int main(int argc, char argv[]){**
233		simError();
234		}
235		} else if (args_info.p2_given) {
236	<	analyser = new P2OrderParameter(info, dumpFileName, sele1, sele2);
236	>	if (args_info.sele1_given) {
237	>	if (args_info.sele2_given)
238	>	analyser = new P2OrderParameter(info, dumpFileName, sele1, sele2);
239	>	else
240	>	analyser = new P2OrderParameter(info, dumpFileName, sele1);
241	>	} else {
242	>	sprintf( painCave.errMsg,
243	>	"At least one selection script (--sele1) must be specified when calculating P2 order parameters");
244	>	painCave.severity = OPENMD_ERROR;
245	>	painCave.isFatal = 1;
246	>	simError();
247	>	}
248		} else if (args_info.rp2_given){
249		analyser = new RippleOP(info, dumpFileName, sele1, sele2);
250		} else if (args_info.bo_given){

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines