[ViewVC] Diff of: OpenMD/trunk/src/applications/dynamicProps/DynamicProps.cpp

Comparing trunk/src/applications/dynamicProps/DynamicProps.cpp (file contents):
Revision 1442 by gezelter, Mon May 10 17:28:26 2010 UTC vs.
Revision 1566 by chuckv, Thu May 19 18:12:09 2011 UTC

#	Line 57 \| Line 57
57		#include "applications/dynamicProps/ThetaCorrFunc.hpp"
58		#include "applications/dynamicProps/DirectionalRCorrFunc.hpp"
59		#include "applications/dynamicProps/EnergyCorrFunc.hpp"
60	+	#include "applications/dynamicProps/StressCorrFunc.hpp"
61
62
63		using namespace OpenMD;
#	Line 125 \| Line 126 \| *int main(int argc, char argv[]){**
126		} else if (args_info.vcorr_given) {
127		corrFunc = new VCorrFunc(info, dumpFileName, sele1, sele2);
128		} else if (args_info.helfandEcorr_given){
129	<	corrFunc = new EnergyCorrFunc(info, dumpFileName, sele1, sele2);
129	>	corrFunc = new EnergyCorrFunc(info, dumpFileName, sele1, sele2);
130	>	} else if (args_info.stresscorr_given){
131	>	corrFunc = new StressCorrFunc(info, dumpFileName, sele1, sele2);
132		} else if (args_info.lcorr_given) {
133		int order;
134		if (args_info.order_given)

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