[ViewVC] Diff of: group/branches/new_design/OOPSE-2.0/src/UseTheForce/ForceFields.hpp

Comparing trunk/OOPSE-2.0/src/UseTheForce/ForceFields.hpp (file contents):
Revision 1656 by gezelter, Wed Oct 27 03:00:51 2004 UTC vs.
Revision 1670 by gezelter, Thu Oct 28 16:56:20 2004 UTC

#	Line 62 \| Line 62 \| class ForceFields{ (public)
62
63		public:
64		ForceFields(){
65	+
66	+	char* force_param_path;
67		frcFile = NULL;
68		entry_plug = NULL;
69		has_variant=0;
70	<	ffPath = getenv("FORCE_PARAM_PATH");
70	>
71	>	force_param_path = getenv("FORCE_PARAM_PATH");
72	>	if (force_param_path != NULL) {
73	>	ffPath = force_param_path;
74	>	} else {
75	>	ffPath = "";
76	>	}
77	>
78		if( ffPath.empty() ) {
79		STR_DEFINE(ffPath, FRC_PATH );
80		}
81		}
82	<	ForceFields(string theVariant){
82	>	ForceFields(const string &theVariant){
83	>	char* force_param_path;
84		frcFile = NULL;
85		entry_plug = NULL;
86		has_variant=1;
87		variant = theVariant;
88	<	ffPath = getenv("FORCE_PARAM_PATH");
88	>
89	>	force_param_path = getenv("FORCE_PARAM_PATH");
90	>	if (force_param_path != NULL) {
91	>	ffPath = force_param_path;
92	>	} else {
93	>	ffPath = "";
94	>	}
95	>
96		if( ffPath.empty() ) {
97		STR_DEFINE(ffPath, FRC_PATH );
98		}
#	Line 185 \| Line 202 \| class EAM_FF : public ForceFields{ (public)
202		public:
203
204		EAM_FF();
205	<	EAM_FF(string theVariant);
205	>	EAM_FF(const string &theVariant);
206
207		virtual ~EAM_FF();
208
#	Line 240 \| Line 257 \| class Shapes_FF : public ForceFields{ (public)
257
258		public:
259		Shapes_FF() : ForceFields() {};
260	<	Shapes_FF(char* the_variant) : ForceFields(the_variant) {};
260	>	Shapes_FF(const string &the_variant) : ForceFields(the_variant) {};
261		virtual ~Shapes_FF();
262
263		void readParams();

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