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

Comparing trunk/OOPSE-4/src/applications/staticProps/StaticProps.cpp (file contents):
Revision 2539 by tim, Mon Jan 9 22:14:32 2006 UTC vs.
Revision 2759 by tim, Wed May 17 21:51:42 2006 UTC

#	Line 59 \| Line 59
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 145 \| Line 148 \| *int main(int argc, char argv[]){**
148		SimCreator creator;
149		SimInfo* info = creator.createSim(mdFileName);
150
151	<	double maxLen;
151	>	RealType maxLen;
152		if (args_info.length_given) {
153		maxLen = args_info.length_arg;
154		} else {
#	Line 187 \| Line 190 \| *int main(int argc, char argv[]){**
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) {

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