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 1879 by gezelter, Sun Jun 16 15:15:42 2013 UTC vs.
Revision 1934 by gezelter, Mon Aug 26 14:15:09 2013 UTC

# Line 55 | Line 55
55   #include "applications/dynamicProps/RCorrFunc.hpp"
56   #include "applications/dynamicProps/VCorrFunc.hpp"
57   #include "applications/dynamicProps/LegendreCorrFunc.hpp"
58 + #include "applications/dynamicProps/LegendreCorrFuncZ.hpp"
59   #include "applications/dynamicProps/RadialRCorrFunc.hpp"
60   #include "applications/dynamicProps/ThetaCorrFunc.hpp"
61   #include "applications/dynamicProps/DirectionalRCorrFunc.hpp"
# Line 62 | Line 63
63   #include "applications/dynamicProps/StressCorrFunc.hpp"
64   #include "applications/dynamicProps/SystemDipoleCorrFunc.hpp"
65   #include "applications/dynamicProps/MomentumCorrFunc.hpp"
66 + #include "applications/dynamicProps/cOHz.hpp"
67  
68   using namespace OpenMD;
69  
# Line 149 | Line 151 | int main(int argc, char* argv[]){
151          order = args_info.order_arg;
152      else {
153        sprintf( painCave.errMsg,
154 <               "--order must be set if --lcoor is set\n");
154 >               "--order must be set if --lcorr is set\n");
155        painCave.severity = OPENMD_ERROR;
156        painCave.isFatal = 1;
157        simError();
158      }
159          
160      corrFunc = new LegendreCorrFunc(info, dumpFileName, sele1, sele2, order, memSize);
161 +  } else if (args_info.lcorrZ_given) {
162 +    int order;
163 +    if (args_info.order_given)
164 +        order = args_info.order_arg;
165 +    else {
166 +      sprintf( painCave.errMsg,
167 +               "--order must be set if --lcorrZ is set\n");
168 +      painCave.severity = OPENMD_ERROR;
169 +      painCave.isFatal = 1;
170 +      simError();
171 +    }
172 +        
173 +    corrFunc = new LegendreCorrFuncZ(info, dumpFileName, sele1, sele2, order, args_info.nzbins_arg, memSize);
174 +
175 +  } else if (args_info.cohZ_given) {
176 +    int order;
177 +    if (args_info.order_given)
178 +        order = args_info.order_arg;
179 +    else {
180 +      sprintf( painCave.errMsg,
181 +               "--order must be set if --cohZ is set\n");
182 +      painCave.severity = OPENMD_ERROR;
183 +      painCave.isFatal = 1;
184 +      simError();
185 +    }
186 +        
187 +    corrFunc = new COHZ(info, dumpFileName, sele1, sele2, order, args_info.nzbins_arg, memSize);
188 +
189    }
190  
191 +
192 +
193    if (args_info.output_given) {
194      corrFunc->setOutputName(args_info.output_arg);
195    }

Diff Legend

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