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

Comparing trunk/src/applications/dynamicProps/DynamicProps.cpp (file contents):
Revision 1937 by gezelter, Tue Oct 29 16:02:58 2013 UTC vs.
Revision 2024 by gezelter, Thu Oct 16 19:13:51 2014 UTC

#	Line 64 \| Line 64
64		#include "applications/dynamicProps/SystemDipoleCorrFunc.hpp"
65		#include "applications/dynamicProps/MomentumCorrFunc.hpp"
66		#include "applications/dynamicProps/cOHz.hpp"
67	+	#include "applications/dynamicProps/BondCorrFunc.hpp"
68	+	#include "applications/dynamicProps/FreqFlucCorrFunc.hpp"
69
70		using namespace OpenMD;
71
#	Line 142 \| Line 144 \| *int main(int argc, char argv[]){**
144		corrFunc = new DirectionalRCorrFunc(info, dumpFileName, sele1, sele2, memSize);
145		} else if (args_info.vcorr_given) {
146		corrFunc = new VCorrFunc(info, dumpFileName, sele1, sele2, memSize);
147	+	} else if (args_info.vcorrZ_given) {
148	+	corrFunc = new VCorrFuncZ(info, dumpFileName, sele1, sele2, memSize);
149	+	} else if (args_info.vcorrR_given) {
150	+	corrFunc = new VCorrFuncR(info, dumpFileName, sele1, sele2, memSize);
151	+	} else if (args_info.bondcorr_given) {
152	+	corrFunc = new BondCorrFunc(info, dumpFileName, sele1, memSize);
153		} else if (args_info.helfandEcorr_given){
154		corrFunc = new EnergyCorrFunc(info, dumpFileName, sele1, sele2, memSize);
155		} else if (args_info.stresscorr_given){
156		corrFunc = new StressCorrFunc(info, dumpFileName, sele1, sele2, memSize);
157		} else if (args_info.momentum_given){
158		corrFunc = new MomentumCorrFunc(info, dumpFileName, sele1, sele2, memSize);
159	+	} else if (args_info.freqfluccorr_given){
160	+	corrFunc = new FreqFlucCorrFunc(info, dumpFileName, sele1, sele2, memSize);
161		} else if (args_info.lcorr_given) {
162		int order;
163		if (args_info.order_given)

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