Skip to content

Commit f2f309a

Browse files
asmfstatoilasmfstatoil
authored
refact: remove redundant variable definitions (#943)
1 parent d71c203 commit f2f309a

File tree

2 files changed

+35
-132
lines changed

2 files changed

+35
-132
lines changed

‎src/main/java/neqsim/thermo/phase/PhasePCSAFT.java

+25-25
Original file line numberDiff line numberDiff line change
@@ -40,43 +40,43 @@ public class PhasePCSAFT extends PhaseSrkEos {
4040
int useDISP1 = 1;
4141
int useDISP2 = 1;
4242

43-
private double[][] aConstSAFT = {
43+
protected double[][] aConstSAFT = {
4444
{0.9105631445, 0.6361281449, 2.6861347891, -26.547362491, 97.759208784, -159.59154087,
4545
91.297774084},
4646
{-0.3084016918, 0.1860531159, -2.5030047259, 21.419793629, -65.255885330, 83.318680481,
4747
-33.746922930},
4848
{-0.0906148351, 0.4527842806, 0.5962700728, -1.7241829131, -4.1302112531, 13.776631870,
4949
-8.6728470368}};
50-
private double[][] bConstSAFT = {
50+
protected double[][] bConstSAFT = {
5151
{0.7240946941, 2.2382791861, -4.0025849485, -21.003576815, 26.855641363, 206.55133841,
5252
-355.60235612},
5353
{-0.5755498075, 0.6995095521, 3.8925673390, -17.215471648, 192.67226447, -161.82646165,
5454
-165.20769346},
5555
{0.0976883116, -0.2557574982, -9.1558561530, 20.642075974, -38.804430052, 93.626774077,
5656
-29.666905585}};
57-
private double F1dispVolTerm = 1.0;
58-
private double F1dispSumTerm = 1.0;
59-
private double F1dispI1 = 1.0;
60-
private double F2dispI2 = 1.0;
61-
private double F2dispZHC = 1.0;
62-
private double F2dispZHCdN = 1.0;
63-
private double F2dispZHCdm = 1.0;
64-
private double F2dispZHCdV = 1.0;
65-
private double F2dispI2dVdV = 0.0;
66-
private double F2dispZHCdVdV = 0.0;
67-
private double F1dispI1dNdN = 1.0;
68-
private double F1dispVolTermdV = 1.0;
69-
private double F1dispVolTermdVdV = 1.0;
70-
private double F1dispI1dN = 1.0;
71-
private double F1dispI1dm = 1.0;
72-
private double F1dispI1dV = 1.0;
73-
private double F2dispI2dV = 1.0;
74-
private double F2dispI2dN = 1.0;
75-
private double F2dispI2dm = 1.0;
76-
private double F2dispSumTerm = 0.0;
77-
private double F2dispZHCdNdN = 1.0;
78-
private double F2dispI2dNdN = 1.0;
79-
private double F1dispI1dVdV = 0.0;
57+
protected double F1dispVolTerm = 1.0;
58+
protected double F1dispSumTerm = 1.0;
59+
protected double F1dispI1 = 1.0;
60+
protected double F2dispI2 = 1.0;
61+
protected double F2dispZHC = 1.0;
62+
protected double F2dispZHCdN = 1.0;
63+
protected double F2dispZHCdm = 1.0;
64+
protected double F2dispZHCdV = 1.0;
65+
protected double F2dispI2dVdV = 0.0;
66+
protected double F2dispZHCdVdV = 0.0;
67+
protected double F1dispI1dNdN = 1.0;
68+
protected double F1dispVolTermdV = 1.0;
69+
protected double F1dispVolTermdVdV = 1.0;
70+
protected double F1dispI1dN = 1.0;
71+
protected double F1dispI1dm = 1.0;
72+
protected double F1dispI1dV = 1.0;
73+
protected double F2dispI2dV = 1.0;
74+
protected double F2dispI2dN = 1.0;
75+
protected double F2dispI2dm = 1.0;
76+
protected double F2dispSumTerm = 0.0;
77+
protected double F2dispZHCdNdN = 1.0;
78+
protected double F2dispI2dNdN = 1.0;
79+
protected double F1dispI1dVdV = 0.0;
8080

8181
/**
8282
* <p>

‎src/main/java/neqsim/thermo/phase/PhasePCSAFTRahmat.java

+10-107
Original file line numberDiff line numberDiff line change
@@ -17,25 +17,8 @@ public class PhasePCSAFTRahmat extends PhasePCSAFT {
1717
private static final long serialVersionUID = 1000;
1818
static Logger logger = LogManager.getLogger(PhasePCSAFTRahmat.class);
1919

20-
double nSAFT = 1.0;
21-
double dnSAFTdV = 1.0;
22-
double dnSAFTdVdV = 1.0;
2320
double dnSAFTdVdVdV = 1.0;
2421

25-
double dmeanSAFT = 0.0;
26-
double dSAFT = 1.0;
27-
double mSAFT = 1.0;
28-
double mdSAFT = 1.0;
29-
double nmSAFT = 1.0;
30-
double mmin1SAFT = 1.0;
31-
double ghsSAFT = 1.0;
32-
double aHSSAFT = 1.0;
33-
double volumeSAFT = 1.0;
34-
double daHCSAFTdN = 1.0;
35-
double daHSSAFTdN = 1.0;
36-
double dgHSSAFTdN = 1.0;
37-
double daHSSAFTdNdN = 1.0;
38-
double dgHSSAFTdNdN = 1.0;
3922
double daHSSAFTdNdNdN = 1.0;
4023
double dgHSSAFTdNdNdN = 1.0;
4124

@@ -47,54 +30,16 @@ public class PhasePCSAFTRahmat extends PhasePCSAFT {
4730
double dF2dispZHCdT = 1.0;
4831
double dF1dispSumTermdT = 1.0;
4932
double dF2dispSumTermdT = 1.0;
50-
int useHS = 1;
51-
int useDISP1 = 1;
52-
int useDISP2 = 1;
53-
54-
private double[][] aConstSAFT = {
55-
{0.9105631445, 0.6361281449, 2.6861347891, -26.547362491, 97.759208784, -159.59154087,
56-
91.297774084},
57-
{-0.3084016918, 0.1860531159, -2.5030047259, 21.419793629, -65.255885330, 83.318680481,
58-
-33.746922930},
59-
{-0.0906148351, 0.4527842806, 0.5962700728, -1.7241829131, -4.1302112531, 13.776631870,
60-
-8.6728470368}};
61-
private double[][] bConstSAFT = {
62-
{0.7240946941, 2.2382791861, -4.0025849485, -21.003576815, 26.855641363, 206.55133841,
63-
-355.60235612},
64-
{-0.5755498075, 0.6995095521, 3.8925673390, -17.215471648, 192.67226447, -161.82646165,
65-
-165.20769346},
66-
{0.0976883116, -0.2557574982, -9.1558561530, 20.642075974, -38.804430052, 93.626774077,
67-
-29.666905585}};
68-
private double F1dispVolTerm = 1.0;
69-
private double F1dispSumTerm = 1.0;
70-
private double F1dispI1 = 1.0;
71-
private double F2dispI2 = 1.0;
72-
private double F2dispZHC = 1.0;
73-
private double F2dispZHCdN = 1.0;
74-
private double F2dispZHCdm = 1.0;
75-
private double F2dispZHCdV = 1.0;
76-
private double F2dispI2dVdV;
77-
private double F2dispI2dVdVdV = 0.0;
78-
private double F2dispZHCdVdV = 1.0;
79-
private double F2dispZHCdVdVdV = 1.0;
80-
private double F1dispI1dNdN = 1.0;
81-
private double F1dispI1dNdNdN = 1.0;
82-
private double F1dispVolTermdV = 1.0;
83-
private double F1dispVolTermdVdV = 1.0;
84-
private double F1dispI1dN = 1.0;
85-
private double F1dispI1dm = 1.0;
86-
private double F1dispI1dV = 1.0;
87-
private double F2dispI2dV = 1.0;
88-
private double F2dispI2dN = 1.0;
89-
private double F2dispI2dm = 1.0;
90-
private double F2dispSumTerm = 0.0;
91-
private double F2dispZHCdNdN = 1.0;
92-
private double F2dispZHCdNdNdN = 1.0;
93-
private double F2dispI2dNdN = 1.0;
94-
private double F2dispI2dNdNdN = 1.0;
95-
private double F1dispI1dVdV = 1.0;
96-
private double F1dispI1dVdVdV = 1.0;
97-
private double F1dispVolTermdVdVdV = 1.0;
33+
protected double F2dispI2dVdV;
34+
protected double F2dispI2dVdVdV = 0.0;
35+
protected double F2dispZHCdVdV = 1.0;
36+
protected double F2dispZHCdVdVdV = 1.0;
37+
protected double F1dispI1dNdNdN = 1.0;
38+
protected double F2dispZHCdNdNdN = 1.0;
39+
protected double F2dispI2dNdNdN = 1.0;
40+
protected double F1dispI1dVdV = 1.0;
41+
protected double F1dispI1dVdVdV = 1.0;
42+
protected double F1dispVolTermdVdVdV = 1.0;
9843

9944
/**
10045
* <p>
@@ -1437,46 +1382,4 @@ public double molarVolume(double pressure, double temperature, double A, double
14371382
*/
14381383
return getMolarVolume();
14391384
}
1440-
1441-
/** {@inheritDoc} */
1442-
@Override
1443-
public double getDmeanSAFT() {
1444-
return dmeanSAFT;
1445-
}
1446-
1447-
/** {@inheritDoc} */
1448-
@Override
1449-
public void setDmeanSAFT(double dmeanSAFT) {
1450-
this.dmeanSAFT = dmeanSAFT;
1451-
}
1452-
1453-
/** {@inheritDoc} */
1454-
@Override
1455-
public double getNmSAFT() {
1456-
return nmSAFT;
1457-
}
1458-
1459-
/** {@inheritDoc} */
1460-
@Override
1461-
public void setNmSAFT(double nmSAFT) {
1462-
this.nmSAFT = nmSAFT;
1463-
}
1464-
1465-
/** {@inheritDoc} */
1466-
@Override
1467-
public double getF2dispSumTerm() {
1468-
return F2dispSumTerm;
1469-
}
1470-
1471-
/** {@inheritDoc} */
1472-
@Override
1473-
public void setF2dispSumTerm(double F2dispSumTerm) {
1474-
this.F2dispSumTerm = F2dispSumTerm;
1475-
}
1476-
1477-
/** {@inheritDoc} */
1478-
@Override
1479-
public void setF2dispZHCdm(double F2dispZHCdm) {
1480-
this.F2dispZHCdm = F2dispZHCdm;
1481-
}
14821385
}

0 commit comments

Comments
 (0)