[ViewVC] Diff of: OpenMD/branches/devel_omp/src/io/ForceFieldOptions.hpp

Comparing branches/development/src/io/ForceFieldOptions.hpp (file contents):
Revision 1479 by gezelter, Mon Jul 26 19:00:48 2010 UTC vs.
Revision 1530 by gezelter, Tue Dec 28 21:47:55 2010 UTC

#	Line 42 \| Line 42
42		#ifndef IO_FORCEFIELDOPTIONS_HPP
43		#define IO_FORCEFIELDOPTIONS_HPP
44		#include "utils/simError.h"
45	+	#include "types/DataHolder.hpp"
46		#include "utils/ParameterManager.hpp"
47		#include "utils/StringUtils.hpp"
48		#include "io/ParamConstraint.hpp"
48	–	#define __OPENMD_C
49	–	#include "UseTheForce/fForceOptions.h"
49
50		namespace OpenMD {
51
52	<	class ForceFieldOptions {
52	>	class ForceFieldOptions : public DataHolder {
53		DeclareParameter(Name, std::string);
54		DeclareParameter(vdWtype, std::string);
55		DeclareParameter(DistanceMixingRule, std::string);
#	Line 110 \| Line 109 \| namespace OpenMD {
109		return result;
110		}
111
113	–	void makeFortranOptions(ForceOptions & fortranForceOptions);
112		private:
113		typedef std::map<std::string, ParameterBase*> ParamMap;
114		ParamMap parameters_;

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