Skip to content

Commit fb6e08a

Browse files
asmfstatoilasmfstatoil
committed
refact: use getPhase(PhaseType.SOLID) and getPhase(PhaseType.SOLIDCOMPLEX)
1 parent d5130d4 commit fb6e08a

File tree

13 files changed

+91
-75
lines changed

13 files changed

+91
-75
lines changed

‎src/main/java/neqsim/thermo/system/SystemThermo.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4813,7 +4813,7 @@ public void setSolidPhaseCheck(boolean solidPhaseCheck) {
48134813
for (int phaseNum = 0; phaseNum < numberOfPhases; phaseNum++) {
48144814
for (int k = 0; k < getPhases()[0].getNumberOfComponents(); k++) {
48154815
getPhase(phaseNum).getComponent(k).setSolidCheck(solidPhaseCheck);
4816-
getPhase(3).getComponent(k).setSolidCheck(solidPhaseCheck);
4816+
getPhase(PhaseType.SOLID).getComponent(k).setSolidCheck(solidPhaseCheck);
48174817
}
48184818
}
48194819
setNumberOfPhases(oldphase);
@@ -4833,7 +4833,7 @@ public void setSolidPhaseCheck(String solidComponent) {
48334833
for (int phaseNum = 0; phaseNum < getMaxNumberOfPhases(); phaseNum++) {
48344834
try {
48354835
getPhase(phaseNum).getComponent(solidComponent).setSolidCheck(true);
4836-
getPhase(3).getComponent(solidComponent).setSolidCheck(true);
4836+
getPhase(PhaseType.SOLID).getComponent(solidComponent).setSolidCheck(true);
48374837
} catch (Exception ex) {
48384838
logger.error(ex.getMessage(), ex);
48394839
}

‎src/main/java/neqsim/thermodynamicoperations/flashops/Flash.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -396,19 +396,19 @@ public void solidPhaseFlash() {
396396
if (system.getPhase(0).getComponent(k).doSolidCheck()) {
397397
tempVar[k] = system.getPhase(0).getComponent(k).getz();
398398
for (int i = 0; i < system.getNumberOfPhases() - 1; i++) {
399-
tempVar[k] -=
400-
system.getBeta(i) * system.getPhases()[3].getComponent(k).getFugacityCoefficient()
401-
/ system.getPhase(i).getComponent(k).getFugacityCoefficient();
399+
tempVar[k] -= system.getBeta(i)
400+
* system.getPhase(PhaseType.SOLID).getComponent(k).getFugacityCoefficient()
401+
/ system.getPhase(i).getComponent(k).getFugacityCoefficient();
402402
}
403403

404404
if (tempVar[k] > 0.0 && tempVar[k] > frac) {
405405
solidPhase = true;
406406
solid = k;
407407
frac = tempVar[k];
408408
for (int p = 0; p < system.getPhases()[0].getNumberOfComponents(); p++) {
409-
system.getPhases()[3].getComponent(p).setx(1.0e-20);
409+
system.getPhase(PhaseType.SOLID).getComponent(p).setx(1.0e-20);
410410
}
411-
system.getPhases()[3].getComponents()[solid].setx(1.0);
411+
system.getPhase(PhaseType.SOLID).getComponents()[solid].setx(1.0);
412412
}
413413
// logger.info("tempVar: " + tempVar[k]);
414414
}
@@ -425,7 +425,7 @@ public void solidPhaseFlash() {
425425
system.setBeta(system.getNumberOfPhases() - 1, frac);
426426
system.initBeta();
427427
system.setBeta(system.getNumberOfPhases() - 1,
428-
system.getPhases()[3].getComponent(solid).getNumberOfmoles()
428+
system.getPhase(PhaseType.SOLID).getComponent(solid).getNumberOfmoles()
429429
/ system.getNumberOfMoles());
430430
// double phasetot=0.0;
431431
// for(int ph=0;ph<system.getNumberOfPhases();ph++){

‎src/main/java/neqsim/thermodynamicoperations/flashops/PHflashSingleComp.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ public void run() {
6868
* double solidEnthalpy = 0.0;
6969
*
7070
* if (system.doSolidPhaseCheck()) { system.init(3, 3); solidEnthalpy =
71-
* system.getPhases()[3].getEnthalpy() / system.getPhases()[3].getNumberOfMolesInPhase()
72-
* system.getTotalNumberOfMoles();
71+
* system.getPhase(PhaseType.SOLID).getEnthalpy() /
72+
* system.getPhase(PhaseType.SOLID).getNumberOfMolesInPhase() system.getTotalNumberOfMoles();
7373
*
7474
* if (Hspec < liqEnthalpy && Hspec > solidEnthalpy) { double solidbeta = (Hspec - liqEnthalpy)
7575
* / (gasEnthalpy - liqEnthalpy); } }

‎src/main/java/neqsim/thermodynamicoperations/flashops/SolidFlash.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -135,12 +135,12 @@ public void calcE() {
135135
}
136136
// E[solidComponent] +=
137137
// system.getBeta(system.getNumberOfPhases()-1) /
138-
// system.getPhase(3).getComponent(solidComponent).getFugacityCoefficient();
138+
// system.getPhase(PhaseType.SOLID).getComponent(solidComponent).getFugacityCoefficient();
139139
E[solidComponent] = system.getPhase(0).getComponent(solidComponent).getz()
140-
/ system.getPhases()[3].getComponents()[solidComponent].getFugacityCoefficient();
140+
/ system.getPhase(PhaseType.SOLID).getComponents()[solidComponent].getFugacityCoefficient();
141141
// logger.info("Ei " +E[solidComponent]);
142142
// logger.info("fug "
143-
// +system.getPhase(3).getComponent(solidComponent).getFugacityCoefficient());
143+
// +system.getPhase(PhaseType.SOLID).getComponent(solidComponent).getFugacityCoefficient());
144144
// logger.info("zi " +system.getPhase(0).getComponent(solidComponent).getz());
145145
}
146146

@@ -167,9 +167,9 @@ public double calcQ() {
167167
}
168168

169169
for (int k = 0; k < system.getNumberOfPhases() - 1; k++) {
170-
dQdbeta[k] =
171-
1.0 - system.getPhases()[3].getComponents()[solidComponent].getFugacityCoefficient()
172-
/ system.getPhase(k).getComponent(solidComponent).getFugacityCoefficient();
170+
dQdbeta[k] = 1.0 - system.getPhase(PhaseType.SOLID).getComponents()[solidComponent]
171+
.getFugacityCoefficient()
172+
/ system.getPhase(k).getComponent(solidComponent).getFugacityCoefficient();
173173
for (int i = 0; i < system.getPhases()[0].getNumberOfComponents(); i++) {
174174
if (i != solidComponent) {
175175
dQdbeta[k] -= system.getPhase(0).getComponent(i).getz() * 1.0 / E[i]
@@ -317,7 +317,7 @@ public void calcSolidBeta() {
317317
// double beta = 1.0;
318318
for (int i = 0; i < system.getNumberOfPhases() - 1; i++) {
319319
tempVar -= system.getBeta(i)
320-
* system.getPhase(3).getComponent(solidComponent).getFugacityCoefficient()
320+
* system.getPhase(PhaseType.SOLID).getComponent(solidComponent).getFugacityCoefficient()
321321
/ system.getPhase(i).getComponent(solidComponent).getFugacityCoefficient();
322322
// beta -= system.getBeta(i);
323323
}

‎src/main/java/neqsim/thermodynamicoperations/flashops/SolidFlash1.java‎

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public void setXY() {
6161
/ system.getPhase(k).getComponent(i).getFugacityCoefficient());
6262
} else {
6363
system.getPhase(k).getComponent(i)
64-
.setx(system.getPhases()[3].getComponent(i).getFugacityCoefficient()
64+
.setx(system.getPhase(PhaseType.SOLID).getComponent(i).getFugacityCoefficient()
6565
/ system.getPhase(k).getComponent(i).getFugacityCoefficient());
6666
}
6767
}
@@ -137,11 +137,11 @@ public double calcQ() {
137137
}
138138
for (int i = 0; i < solidsNumber; i++) {
139139
Q += system.getPhase(0).getComponent(solidIndex).getz()
140-
* (1 - Math.log(system.getPhase(0).getComponent(solidIndex).getz()
141-
/ system.getPhases()[3].getComponent(solidIndex).getFugacityCoefficient()));
140+
* (1 - Math.log(system.getPhase(0).getComponent(solidIndex).getz() / system
141+
.getPhase(PhaseType.SOLID).getComponent(solidIndex).getFugacityCoefficient()));
142142
for (int j = 0; j < system.getNumberOfPhases() - solidsNumber; j++) {
143143
Q -= system.getBeta(j)
144-
* system.getPhases()[3].getComponent(solidIndex).getFugacityCoefficient()
144+
* system.getPhase(PhaseType.SOLID).getComponent(solidIndex).getFugacityCoefficient()
145145
/ system.getPhase(j).getComponent(solidIndex).getFugacityCoefficient();
146146
}
147147
}
@@ -158,8 +158,9 @@ public void calcQbeta() {
158158
dQdbeta[k] = 1.0;
159159
for (int i = 0; i < system.getPhases()[0].getNumberOfComponents(); i++) {
160160
if (i == solidIndex) {
161-
dQdbeta[k] -= system.getPhases()[3].getComponents()[solidIndex].getFugacityCoefficient()
162-
/ system.getPhase(k).getComponent(solidIndex).getFugacityCoefficient();
161+
dQdbeta[k] -=
162+
system.getPhase(PhaseType.SOLID).getComponents()[solidIndex].getFugacityCoefficient()
163+
/ system.getPhase(k).getComponent(solidIndex).getFugacityCoefficient();
163164
} else {
164165
dQdbeta[k] -= system.getPhase(0).getComponent(i).getz() / E[i]
165166
/ system.getPhase(k).getComponent(i).getFugacityCoefficient();
@@ -182,8 +183,9 @@ public void calcGradientAndHesian() {
182183
dQdbeta[k] = 1.0;
183184
for (int i = 0; i < system.getPhases()[0].getNumberOfComponents(); i++) {
184185
if (i == solidIndex) {
185-
dQdbeta[k] -= system.getPhases()[3].getComponent(solidIndex).getFugacityCoefficient()
186-
/ system.getPhase(k).getComponent(solidIndex).getFugacityCoefficient();
186+
dQdbeta[k] -=
187+
system.getPhase(PhaseType.SOLID).getComponent(solidIndex).getFugacityCoefficient()
188+
/ system.getPhase(k).getComponent(solidIndex).getFugacityCoefficient();
187189
} else {
188190
dQdbeta[k] -= system.getPhase(0).getComponent(i).getz() / E[i]
189191
/ system.getPhase(k).getComponent(i).getFugacityCoefficient();
@@ -365,7 +367,7 @@ public double calcSolidBeta() {
365367
for (int i = 0; i < system.getNumberOfPhases() - solidsNumber; i++) {
366368
if (FluidPhaseActiveDescriptors[i] == 1) {
367369
tempVar -= system.getBeta(i)
368-
* system.getPhases()[3].getComponent(solidIndex).getFugacityCoefficient()
370+
* system.getPhase(PhaseType.SOLID).getComponent(solidIndex).getFugacityCoefficient()
369371
/ system.getPhase(i).getComponent(solidIndex).getFugacityCoefficient();
370372
// beta -= system.getBeta(i);
371373
}
@@ -398,7 +400,7 @@ public void run() {
398400
}
399401
if (system.getPhase(0).getNumberOfComponents() == 1) {
400402
system.init(1);
401-
if (system.getPhase(0).getFugacity(0) > system.getPhases()[3].getFugacity(0)) {
403+
if (system.getPhase(0).getFugacity(0) > system.getPhase(PhaseType.SOLID).getFugacity(0)) {
402404
system.setPhaseIndex(0, 3);
403405
} else {
404406
}
@@ -453,12 +455,13 @@ public int checkAndAddSolidPhase() {
453455
solidCandidate[k] = 0;
454456
} else {
455457
solidCandidate[k] = system.getPhase(0).getComponent(k).getz();
456-
system.getPhases()[3].getComponent(k).setx(1.0);
458+
system.getPhase(PhaseType.SOLID).getComponent(k).setx(1.0);
457459
for (int i = 0; i < system.getNumberOfPhases(); i++) {
458460
// double e = system.getBeta(i)*
459-
// system.getPhases()[3].getComponent(k).fugcoef(system.getPhases()[3]);
461+
// system.getPhase(PhaseType.SOLID).getComponent(k).fugcoef(system.getPhase(PhaseType.SOLID));
460462
solidCandidate[k] -= system.getBeta(i)
461-
* system.getPhases()[3].getComponent(k).fugcoef(system.getPhases()[3])
463+
* system.getPhase(PhaseType.SOLID).getComponent(k)
464+
.fugcoef(system.getPhase(PhaseType.SOLID))
462465
/ system.getPhase(i).getComponent(k).getFugacityCoefficient();
463466
}
464467
}
@@ -468,12 +471,12 @@ public int checkAndAddSolidPhase() {
468471
totalSolidFrac = 0;
469472
for (int i = 0; i < solidCandidate.length; i++) {
470473
if (solidCandidate[i] > 1e-20) {
471-
system.getPhases()[3].getComponent(i).setx(1.0);
474+
system.getPhase(PhaseType.SOLID).getComponent(i).setx(1.0);
472475
solidIndex = i;
473476
solidsNumber++;
474477
totalSolidFrac += solidCandidate[i];
475478
} else {
476-
system.getPhases()[3].getComponent(i).setx(0.0);
479+
system.getPhase(PhaseType.SOLID).getComponent(i).setx(0.0);
477480
}
478481
}
479482
for (int i = oldSolidsNumber; i < solidsNumber; i++) {
@@ -513,9 +516,9 @@ public double solvebeta1() {
513516
iter++;
514517
solidCandidate = system.getPhase(0).getComponents()[solidIndex].getz();
515518
for (int i = 0; i < system.getNumberOfPhases(); i++) {
516-
solidCandidate -=
517-
system.getPhases()[3].getComponent(solidIndex).fugcoef(system.getPhases()[3])
518-
/ system.getPhase(i).getComponent(solidIndex).getFugacityCoefficient();
519+
solidCandidate -= system.getPhase(PhaseType.SOLID).getComponent(solidIndex)
520+
.fugcoef(system.getPhase(PhaseType.SOLID))
521+
/ system.getPhase(i).getComponent(solidIndex).getFugacityCoefficient();
519522
}
520523
double dsoliddn = (solidCandidate - solidCandidateOld) / dn;
521524
dn = -0.5 * solidCandidate / dsoliddn;

‎src/main/java/neqsim/thermodynamicoperations/flashops/SolidFlash12.java‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public void setXY() {
6565
/ system.getPhase(k).getComponent(i).getFugacityCoefficient());
6666
} else {
6767
system.getPhase(k).getComponent(i)
68-
.setx(system.getPhases()[3].getComponent(i).getFugacityCoefficient()
68+
.setx(system.getPhase(PhaseType.SOLID).getComponent(i).getFugacityCoefficient()
6969
/ system.getPhase(k).getComponent(i).getFugacityCoefficient());
7070
}
7171
}
@@ -142,11 +142,11 @@ public double calcQ() {
142142

143143
for (int i = 0; i < solidsNumber; i++) {
144144
Q += system.getPhase(0).getComponent(solidIndex).getz()
145-
* (1 - Math.log(system.getPhase(0).getComponent(solidIndex).getz()
146-
/ system.getPhases()[3].getComponent(solidIndex).getFugacityCoefficient()));
145+
* (1 - Math.log(system.getPhase(0).getComponent(solidIndex).getz() / system
146+
.getPhase(PhaseType.SOLID).getComponent(solidIndex).getFugacityCoefficient()));
147147
for (int j = 0; j < system.getNumberOfPhases() - solidsNumber; j++) {
148148
Q -= system.getBeta(j)
149-
* system.getPhases()[3].getComponent(solidIndex).getFugacityCoefficient()
149+
* system.getPhase(PhaseType.SOLID).getComponent(solidIndex).getFugacityCoefficient()
150150
/ system.getPhase(j).getComponent(solidIndex).getFugacityCoefficient();
151151
}
152152
}
@@ -155,8 +155,9 @@ public double calcQ() {
155155
dQdbeta[k] = 1.0;
156156
for (int i = 0; i < system.getPhases()[0].getNumberOfComponents(); i++) {
157157
if (i == solidIndex) {
158-
dQdbeta[k] -= system.getPhases()[3].getComponents()[solidIndex].getFugacityCoefficient()
159-
/ system.getPhase(k).getComponent(solidIndex).getFugacityCoefficient();
158+
dQdbeta[k] -=
159+
system.getPhase(PhaseType.SOLID).getComponents()[solidIndex].getFugacityCoefficient()
160+
/ system.getPhase(k).getComponent(solidIndex).getFugacityCoefficient();
160161
} else {
161162
dQdbeta[k] -= system.getPhase(0).getComponent(i).getz() / E[i]
162163
/ system.getPhase(k).getComponent(i).getFugacityCoefficient();
@@ -288,9 +289,9 @@ public void calcSolidBeta() {
288289
double tempVar = system.getPhase(0).getComponents()[solidIndex].getz();
289290
// double beta = 1.0;
290291
for (int i = 0; i < system.getNumberOfPhases() - 1; i++) {
291-
tempVar -=
292-
system.getBeta(i) * system.getPhase(3).getComponent(solidIndex).getFugacityCoefficient()
293-
/ system.getPhase(i).getComponent(solidIndex).getFugacityCoefficient();
292+
tempVar -= system.getBeta(i)
293+
* system.getPhase(PhaseType.SOLID).getComponent(solidIndex).getFugacityCoefficient()
294+
/ system.getPhase(i).getComponent(solidIndex).getFugacityCoefficient();
294295
// beta -= system.getBeta(i);
295296
}
296297
if (tempVar > 0 && tempVar < 1.0) {
@@ -337,22 +338,23 @@ public int checkAndAddSolidPhase() {
337338
solidCandidate[k] = -10;
338339
} else {
339340
solidCandidate[k] = system.getPhase(0).getComponent(k).getz();
340-
system.getPhases()[3].getComponent(k).setx(1.0);
341+
system.getPhase(PhaseType.SOLID).getComponent(k).setx(1.0);
341342

342343
for (int i = 0; i < system.getNumberOfPhases(); i++) {
343-
solidCandidate[k] -= system.getPhases()[3].getComponent(k).fugcoef(system.getPhases()[3])
344+
solidCandidate[k] -= system.getPhase(PhaseType.SOLID).getComponent(k)
345+
.fugcoef(system.getPhase(PhaseType.SOLID))
344346
/ system.getPhase(i).getComponent(k).getFugacityCoefficient();
345347
}
346348
}
347349
}
348350

349351
for (int i = 0; i < solidCandidate.length; i++) {
350352
if (solidCandidate[i] > 0.0) {
351-
system.getPhases()[3].getComponent(i).setx(1.0);
353+
system.getPhase(PhaseType.SOLID).getComponent(i).setx(1.0);
352354
solidIndex = i;
353355
solidsNumber++;
354356
} else {
355-
system.getPhases()[3].getComponent(i).setx(0.0);
357+
system.getPhase(PhaseType.SOLID).getComponent(i).setx(0.0);
356358
}
357359
}
358360

@@ -392,9 +394,9 @@ public double solvebeta1() {
392394
iter++;
393395
solidCandidate = system.getPhase(0).getComponents()[solidIndex].getz();
394396
for (int i = 0; i < system.getNumberOfPhases(); i++) {
395-
solidCandidate -=
396-
system.getPhases()[3].getComponent(solidIndex).fugcoef(system.getPhases()[3])
397-
/ system.getPhase(i).getComponent(solidIndex).getFugacityCoefficient();
397+
solidCandidate -= system.getPhase(PhaseType.SOLID).getComponent(solidIndex)
398+
.fugcoef(system.getPhase(PhaseType.SOLID))
399+
/ system.getPhase(i).getComponent(solidIndex).getFugacityCoefficient();
398400
}
399401
double dsoliddn = (solidCandidate - solidCandidateOld) / dn;
400402
dn = -0.5 * solidCandidate / dsoliddn;

‎src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/FreezingPointTemperatureFlash.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import org.apache.logging.log4j.LogManager;
77
import org.apache.logging.log4j.Logger;
88
import neqsim.thermo.ThermodynamicConstantsInterface;
9+
import neqsim.thermo.phase.PhaseType;
910
import neqsim.thermo.system.SystemInterface;
1011
import neqsim.thermodynamicoperations.ThermodynamicOperations;
1112

@@ -69,7 +70,8 @@ public double calcFunc() {
6970
// logger.info("Checking all the components " + k);
7071
if (system.getPhase(0).getComponent(k).doSolidCheck()) {
7172
ops.TPflash(false);
72-
SolidFugCoeff = system.getPhases()[3].getComponent(k).fugcoef(system.getPhases()[3]);
73+
SolidFugCoeff = system.getPhase(PhaseType.SOLID).getComponent(k)
74+
.fugcoef(system.getPhase(PhaseType.SOLID));
7375
funk = system.getPhase(0).getComponent(k).getz();
7476
for (int i = 0; i < system.getNumberOfPhases(); i++) {
7577
funk -= system.getPhase(i).getBeta() * SolidFugCoeff
@@ -120,7 +122,8 @@ public void run() {
120122
iterations++;
121123
// oldPhaseType = system.getPhase(0).getType();
122124
ops.TPflash(false);
123-
SolidFugCoeff = system.getPhases()[3].getComponent(k).fugcoef(system.getPhases()[3]);
125+
SolidFugCoeff = system.getPhase(PhaseType.SOLID).getComponent(k)
126+
.fugcoef(system.getPhase(PhaseType.SOLID));
124127
funk = system.getPhase(0).getComponent(k).getz();
125128
for (int i = 0; i < system.getNumberOfPhases(); i++) {
126129
funk -= system.getPhase(i).getBeta() * SolidFugCoeff

0 commit comments

Comments
 (0)