[ViewVC] Diff of: group/branches/new_design/OOPSE-4/src/UseTheForce/WATER.cpp

Comparing trunk/OOPSE-4/src/UseTheForce/WATER.cpp (file contents):
Revision 1654 by gezelter, Wed Oct 27 02:16:34 2004 UTC vs.
Revision 1670 by gezelter, Thu Oct 28 16:56:20 2004 UTC

#	Line 12 \| Line 12 \| using namespace std;
12		#include "UseTheForce/ForceFields.hpp"
13		#include "primitives/SRI.hpp"
14		#include "utils/simError.h"
15	+	#include "types/AtomType.hpp"
16		#include "types/DirectionalAtomType.hpp"
17		#include "UseTheForce/DarkSide/lj_interface.h"
18		#include "UseTheForce/DarkSide/charge_interface.h"
#	Line 395 \| Line 396 \| void WATER::readParams( void ){
396		atomStruct atomInfo;
397		directionalStruct directionalInfo;
398		fpos_t *atomPos;
398	–
399		AtomType* at;
400
401		atomInfo.last = 1; // initialize last to have the last set.
#	Line 544 \| Line 544 \| void WATER::readParams( void ){
544		while( currentAtomType != NULL ){
545		if( currentAtomType->name[0] != '\0' ){
546		if (currentAtomType->isDirectional)
547	<	DirectionalAtomType* at = new DirectionalAtomType();
547	>	at = new DirectionalAtomType();
548		else
549	<	AtomType* at = new AtomType();
550	<
549	>	at = new AtomType();
550	>
551		if (currentAtomType->isLJ) {
552		at->setLennardJones();
553		}

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