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 2257 by tim, Mon Jun 13 18:25:30 2005 UTC vs.
Revision 2753 by gezelter, Tue May 16 20:38:23 2006 UTC

# Line 58 | Line 58
58   #include "applications/staticProps/P2OrderParameter.hpp"
59   #include "applications/staticProps/SCDOrderParameter.hpp"
60   #include "applications/staticProps/DensityPlot.hpp"
61 + #include "applications/staticProps/RhoZ.hpp"
62 + #if defined(HAVE_FFTW_H) || defined(HAVE_DFFTW_H) || defined(HAVE_FFTW3_H)
63 + #include "applications/staticProps/Hxy.hpp"
64 + #endif
65  
66   using namespace oopse;
67  
# Line 106 | Line 110 | int main(int argc, char* argv[]){
110        sele2 = sele2Env;            
111      } else if (args_info.density_given) {
112        sele2 = "select all";
113 <    } else if(!args_info.scd_given && !args_info.density_given)  {
113 >    } else if(!args_info.scd_given && !args_info.density_given && !args_info.slab_density_given)  {
114        sprintf( painCave.errMsg,
115                 "neither --sele2 option nor $OOPSE_SELE2 is set");
116        painCave.severity = OOPSE_ERROR;
# Line 183 | Line 187 | int main(int argc, char* argv[]){
187        }
188    }else if (args_info.density_given) {
189        analyser= new DensityPlot(info, dumpFileName, sele1, sele2, maxLen, args_info.nrbins_arg);  
190 +  } else if (args_info.slab_density_given) {
191 +      Mat3x3d hmat = info->getSnapshotManager()->getCurrentSnapshot()->getHmat();
192 +      analyser = new RhoZ(info, dumpFileName, sele1, hmat(2, 2), args_info.nrbins_arg);
193 + #if defined(HAVE_FFTW_H) || defined(HAVE_DFFTW_H) || defined(HAVE_FFTW3_H)
194 +  }else if (args_info.hxy_given) {
195 +    analyser = new Hxy(info, dumpFileName, sele1, args_info.nbins_x_arg, args_info.nbins_y_arg, args_info.nrbins_arg);
196 + #endif
197    }
198      
199    if (args_info.output_given) {

Diff Legend

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