[ViewVC] Diff of: group/trunk/OOPSE-4/src/applications/dynamicProps/DynamicProps.cpp

Comparing trunk/OOPSE-4/src/applications/dynamicProps/DynamicProps.cpp (file contents):
Revision 2576 by tim, Mon Jan 30 22:25:27 2006 UTC vs.
Revision 3084 by chuckv, Thu Dec 14 19:38:56 2006 UTC

#	Line 53 \| Line 53
53		#include "applications/dynamicProps/RCorrFunc.hpp"
54		#include "applications/dynamicProps/VCorrFunc.hpp"
55		#include "applications/dynamicProps/LegendreCorrFunc.hpp"
56	+	#include "applications/dynamicProps/RadialRCorrFunc.hpp"
57
58
59		using namespace oopse;
#	Line 72 \| Line 73 \| *int main(int argc, char argv[]){**
73
74		//get the dumpfile name and meta-data file name
75		std::string dumpFileName = args_info.input_arg;
75	–
76	–	std::string mdFileName = dumpFileName.substr(0, dumpFileName.rfind(".")) + ".md";
77	–
76
77		std::string sele1;
78		std::string sele2;
#	Line 107 \| Line 105 \| *int main(int argc, char argv[]){**
105
106		//parse md file and set up the system
107		SimCreator creator;
108	<	SimInfo* info = creator.createSim(mdFileName, false);
108	>	SimInfo* info = creator.createSim(dumpFileName, false);
109
110
111		TimeCorrFunc* corrFunc;
#	Line 115 \| Line 113 \| *int main(int argc, char argv[]){**
113		corrFunc = new DipoleCorrFunc(info, dumpFileName, sele1, sele2);
114		} else if (args_info.rcorr_given) {
115		corrFunc = new RCorrFunc(info, dumpFileName, sele1, sele2);
116	+	} else if (args_info.r_rcorr_given) {
117	+	corrFunc = new RadialRCorrFunc(info, dumpFileName, sele1, sele2);
118		}
119		else if (args_info.vcorr_given) {
120		corrFunc = new VCorrFunc(info, dumpFileName, sele1, sele2);

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