/* This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */


package etomica.models.water;

import etomica.space.Space;
import etomica.units.Electron;
import etomica.units.Kelvin;

/** 
 * SPC potential for water.  All the real work is done in P2Water3P.
 */
public class P2WaterSPC extends P2Water3P {

    public P2WaterSPC(Space space) {
        super(space, 3.1670, Kelvin.UNIT.toSim(78.23), 
                Electron.UNIT.toSim(-0.82), Electron.UNIT.toSim(0.41));
    }

    private static final long serialVersionUID = 1L;
}

@@ -323,17 +323,16 @@
 in;%0A%0A/**
- 
 %0A * SPC 
@@ -457,62 +457,88 @@
 lic 
-P2WaterSPC(Space space) %7B%0A        super(space, 3.1670,
+static final double sigmaOO = 3.1670;%0A    public static final double epsilonOO =
  Kel
@@ -562,54 +562,119 @@
 .23)
-, 
+;
 %0A    
-            Electron.UNIT.toSim(-0.82),
+public static final double chargeO = Electron.UNIT.toSim(-0.82);%0A    public static final double chargeH =
  Ele
@@ -699,69 +699,112 @@
 .41)
-)
 ;%0A
-    %7D%0A%0A    private static final long serialVer
+%0A    public P2WaterSPC(Space space) %7B%0A        super(space, sigmaOO, ep
 si
+l
 on
-UID = 1L;
+OO, chargeO, chargeH);%0A    %7D
 %0A%7D%0A

make parameters into static fields