ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-4/src/applications/staticProps/StaticProps.cpp
(Generate patch)

Comparing trunk/OOPSE-4/src/applications/staticProps/StaticProps.cpp (file contents):
Revision 1994 by tim, Thu Feb 10 18:14:03 2005 UTC vs.
Revision 1995 by tim, Thu Feb 10 22:37:21 2005 UTC

# Line 43 | Line 43
43   #include <fstream>
44   #include <string>
45  
46 #include "applications/staticProps/StaticPropsCmd.h"
46   #include "brains/Register.hpp"
47   #include "brains/SimCreator.hpp"
48   #include "brains/SimInfo.hpp"
49   #include "io/DumpReader.hpp"
50   #include "utils/simError.h"
51  
52 + #include "applications/staticProps/StaticPropsCmd.h"
53 + #include "applications/staticProps/GofR.hpp"
54 + #include "applications/staticProps/GofRAngle.hpp"
55 + #include "applications/staticProps/GofAngle2.hpp"
56 + #include "applications/staticProps/GofXyz.hpp"
57 +
58   using namespace oopse;
59  
60   int main(int argc, char* argv[]){
# Line 71 | Line 76 | int main(int argc, char* argv[]){
76      std::string mdFileName = dumpFileName.substr(0, dumpFileName.rfind(".")) + ".md";
77  
78      
74    //parse md file and set up the system
75    SimCreator creator;
76    SimInfo* info = creator.createSim(mdFileName, false);
77
78
79      std::string sele1;
80      std::string sele2;
81  
82      if (args_info.sele1_given) {
83          sele1 = args_info.sele1_arg;
84      }else {
85 <
85 >        char*  sele1Env= getenv("OOPSE_SELE1");
86 >        if (sele1Env) {
87 >            sele1 = sele1Env;
88 >        }else {
89 >            sprintf( painCave.errMsg,
90 >               "neither --sele1 option nor $OOPSE_SELE1 is set");
91 >            painCave.severity = OOPSE_ERROR;
92 >            painCave.isFatal = 1;
93 >            simError();
94 >        }
95      }
96 <    if (args_info.sele1_given) {
97 <        sele1 = args_info.sele1_arg;
96 >    
97 >    if (args_info.sele2_given) {
98 >        sele2 = args_info.sele2_arg;
99      }else {
100 +        char* sele2Env = getenv("OOPSE_SELE2");
101 +        if (sele2Env) {
102 +            sele2 = sele2Env;            
103 +        } else {
104 +            sprintf( painCave.errMsg,
105 +               "neither --sele2 option nor $OOPSE_SELE2 is set");
106 +            painCave.severity = OOPSE_ERROR;
107 +            painCave.isFatal = 1;
108 +            simError();        
109 +        }
110 +    }
111  
112 +    //parse md file and set up the system
113 +    SimCreator creator;
114 +    SimInfo* info = creator.createSim(mdFileName);
115 +
116 +    double maxLen;
117 +    if (args_info.length_given) {
118 +        maxLen = args_info.length_arg;
119 +    } else {
120 +        Mat3x3d hmat = info->getSnapshotManager()->getCurrentSnapshot()->getHmat();
121 +        maxLen = std::min(std::min(hmat(0, 0), hmat(1, 1)), hmat(2, 2)) /2 ;
122      }
123      
93    GofR rdf(info, dumpFileName, sele1, sele2, args_info.length_arg);
124  
125 <    if (args_info.nbins_given) {
126 <        rdf.setNBins(args_info.nbins_arg);
125 >    RadialDistrFunc* rdf;
126 >    if (args_info.gofr_given){
127 >        GofR* r = new GofR(info, dumpFileName, sele1, sele2);
128 >        
129 >        r->setNRBins(args_info.nrbins_arg);            
130 >        r->setLength(maxLen);
131 >        
132 >        rdf = r;
133 >    } else if (args_info.r_theta_given) {
134 >        GofRTheta* rTheta = new GofRTheta(info, dumpFileName, sele1, sele2);
135 >          
136 >        rTheta->setNRBins(args_info.nrbins_arg);            
137 >        rTheta->setLength(maxLen);      
138 >        rTheta->setNAngleBins(args_info.nanglebins_arg);
139 >
140 >        
141 >        rdf = rTheta;
142      }
143 +    else if (args_info.r_omega_given) {
144 +        GofROmega* rOmega = new GofROmega(info, dumpFileName, sele1, sele2);
145  
146 <    rdf.process();
146 >      
147 >        rOmega->setNRBins(args_info.nrbins_arg);            
148 >        rOmega->setLength(maxLen);
149 >        rOmega->setNAngleBins(args_info.nanglebins_arg);
150 >
151 >        rdf = rOmega;    
152 >    } else if (args_info.theta_omega_given) {
153 >        GofAngle2* rAngle2 = new GofAngle2(info, dumpFileName, sele1, sele2);
154 >        rAngle2->setNAngleBins(args_info.nanglebins_arg);
155 >
156 >        rdf = rAngle2;  
157 >    } else if (args_info.xyz_given) {
158 >
159 >        GofXyz* xyz = new GofXyz(info, dumpFileName, sele1, sele2);
160 >          
161 >        xyz->setNRBins(args_info.nrbins_arg);            
162 >        xyz->setLength(maxLen);
163 >
164 >        
165 >        rdf = xyz;
166 >    }
167      
168 +
169 +    if (args_info.output_given) {
170 +        rdf->setOutputName(args_info.output_arg);
171 +    }
172 +
173 +    if (args_info.step_given) {
174 +        rdf->setStep(args_info.step_arg);
175 +    }
176 +
177 +    rdf->process();
178 +
179 +    delete rdf;    
180      delete info;
181  
182      return 0;  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines