ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/trunk/src/applications/dynamicProps/DynamicProps.cpp
(Generate patch)

Comparing trunk/src/applications/dynamicProps/DynamicProps.cpp (file contents):
Revision 507 by gezelter, Fri Apr 15 22:04:00 2005 UTC vs.
Revision 1112 by chuckv, Wed Jan 3 20:47:00 2007 UTC

# Line 52 | Line 52
52   #include "applications/dynamicProps/DipoleCorrFunc.hpp"
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 + #include "applications/dynamicProps/ThetaCorrFunc.hpp"
58  
59 +
60   using namespace oopse;
61  
62   int main(int argc, char* argv[]){
# Line 70 | Line 74 | int main(int argc, char* argv[]){
74  
75    //get the dumpfile name and meta-data file name
76    std::string dumpFileName = args_info.input_arg;
73 –
74 –  std::string mdFileName = dumpFileName.substr(0, dumpFileName.rfind(".")) + ".md";
75 –
77      
78    std::string sele1;
79    std::string sele2;
# Line 105 | Line 106 | int main(int argc, char* argv[]){
106  
107    //parse md file and set up the system
108    SimCreator creator;
109 <  SimInfo* info = creator.createSim(mdFileName, false);
109 >  SimInfo* info = creator.createSim(dumpFileName, false);
110  
111  
112    TimeCorrFunc* corrFunc;
# Line 113 | Line 114 | int main(int argc, char* argv[]){
114      corrFunc = new DipoleCorrFunc(info, dumpFileName, sele1, sele2);
115    } else if (args_info.rcorr_given) {
116      corrFunc = new RCorrFunc(info, dumpFileName, sele1, sele2);
117 +  } else if (args_info.r_rcorr_given) {
118 +    corrFunc = new RadialRCorrFunc(info, dumpFileName, sele1, sele2);
119 +  } else if (args_info.thetacorr_given) {
120 +    corrFunc = new ThetaCorrFunc(info, dumpFileName, sele1, sele2);
121    }
122    else if (args_info.vcorr_given) {
123      corrFunc = new VCorrFunc(info, dumpFileName, sele1, sele2);
124 +  } else if (args_info.lcorr_given) {
125 +    int order;
126 +    if (args_info.order_given)
127 +        order = args_info.order_arg;
128 +    else {
129 +      sprintf( painCave.errMsg,
130 +               "--order must be set if --lcoor is set\n");
131 +      painCave.severity = OOPSE_ERROR;
132 +      painCave.isFatal = 1;
133 +      simError();
134 +    }
135 +        
136 +    corrFunc = new LegendreCorrFunc(info, dumpFileName, sele1, sele2, order);
137    }
138  
139    if (args_info.output_given) {

Diff Legend

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