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

Comparing trunk/src/applications/staticProps/StaticProps.cpp (file contents):
Revision 544 by tim, Fri May 27 04:41:34 2005 UTC vs.
Revision 545 by tim, Fri May 27 21:11:24 2005 UTC

#	Line 57 \| Line 57
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
62		using namespace oopse;
63
#	Line 88 \| Line 89 \| *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;
#	Line 103 \| Line 104 \| *int main(int argc, char argv[]){**
104		char* sele2Env = getenv("OOPSE_SELE2");
105		if (sele2Env) {
106		sele2 = sele2Env;
107	<	} else {
107	>	} else if(!args_info.scd_given && !args_info.density_given) {
108		sprintf( painCave.errMsg,
109		"neither --sele2 option nor $OOPSE_SELE2 is set");
110		painCave.severity = OOPSE_ERROR;
#	Line 178 \| Line 179 \| *int main(int argc, char argv[]){**
179		std::string sele3 = args_info.sele3_arg;
180		analyser = new SCDOrderParameter(info, dumpFileName, sele1, sele2, sele3);
181		}
182	+	}else if (args_info.density_given) {
183	+	analyser= new DensityPlot(info, dumpFileName, sele1, maxLen, args_info.nrbins_arg);
184		}
185
186		if (args_info.output_given) {

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