Skip to content

Commit 58c04dd

Browse files
authored
refact: replace numeric mixingrule with enum type (#1248)
* feat: introduce MixingRulesInterface* refact: get eosmixingruletype * refact: use eosmixingruletype * fix: add CLASSIC_HV * doc: remove wrong doc * doc: fix variable name , getName()
1 parent b89ffb9 commit 58c04dd

33 files changed

+364
-195
lines changed

src/main/java/neqsim/process/equipment/stream/StreamInterface.java

-2
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,6 @@ public default double getFlowRate(String unit) {
154154
*/
155155
public double getRVP(double referenceTemperature, String unit, String returnUnit);
156156

157-
158157
/**
159158
* Calculates the Reid Vapor Pressure (RVP) of the stream.
160159
*
@@ -321,7 +320,6 @@ public double getRVP(double referenceTemperature, String unit, String returnUnit
321320
@Override
322321
public int hashCode();
323322

324-
325323
/**
326324
* Calculates the hydrocarbon dew point of the stream.
327325
*

src/main/java/neqsim/thermo/characterization/LumpingModel.java

+13
Original file line numberDiff line numberDiff line change
@@ -50,41 +50,49 @@ public class StandardLumpingModel
5050

5151
public StandardLumpingModel() {}
5252

53+
/** {@inheritDoc} */
5354
@Override
5455
public void setNumberOfLumpedComponents(int lumpedNumb) {
5556
numberOfLumpedComponents = lumpedNumb;
5657
}
5758

59+
/** {@inheritDoc} */
5860
@Override
5961
public int getNumberOfLumpedComponents() {
6062
return numberOfLumpedComponents;
6163
}
6264

65+
/** {@inheritDoc} */
6366
@Override
6467
public void setNumberOfPseudoComponents(int lumpedNumb) {
6568
numberOfPseudocomponents = lumpedNumb;
6669
}
6770

71+
/** {@inheritDoc} */
6872
@Override
6973
public int getNumberOfPseudoComponents() {
7074
return numberOfPseudocomponents;
7175
}
7276

77+
/** {@inheritDoc} */
7378
@Override
7479
public String getName() {
7580
return name;
7681
}
7782

83+
/** {@inheritDoc} */
7884
@Override
7985
public String getLumpedComponentName(int i) {
8086
return lumpedComponentNames[i];
8187
}
8288

89+
/** {@inheritDoc} */
8390
@Override
8491
public String[] getLumpedComponentNames() {
8592
return lumpedComponentNames;
8693
}
8794

95+
/** {@inheritDoc} */
8896
@Override
8997
public void generateLumpedComposition(Characterise charac) {
9098
numberOfLumpedComponents = numberOfPseudocomponents;
@@ -196,6 +204,7 @@ public void generateLumpedComposition(Characterise charac) {
196204
}
197205
}
198206

207+
/** {@inheritDoc} */
199208
@Override
200209
public double getFractionOfHeavyEnd(int i) {
201210
if (fractionOfHeavyEnd == null) {
@@ -220,6 +229,7 @@ public class PVTLumpingModel extends StandardLumpingModel {
220229

221230
public PVTLumpingModel() {}
222231

232+
/** {@inheritDoc} */
223233
@Override
224234
public void generateLumpedComposition(Characterise charac) {
225235
double weightFrac = 0.0;
@@ -311,6 +321,7 @@ public void generateLumpedComposition(Characterise charac) {
311321
system.init(0);
312322
}
313323

324+
/** {@inheritDoc} */
314325
@Override
315326
public double getFractionOfHeavyEnd(int i) {
316327
if (fractionOfHeavyEnd == null) {
@@ -334,6 +345,7 @@ public class NoLumpingModel extends StandardLumpingModel {
334345

335346
public NoLumpingModel() {}
336347

348+
/** {@inheritDoc} */
337349
@Override
338350
public void generateLumpedComposition(Characterise charac) {
339351
numberOfPseudocomponents = charac.getPlusFractionModel().getLastPlusFractionNumber();
@@ -414,6 +426,7 @@ public void generateLumpedComposition(Characterise charac) {
414426
system.init(0);
415427
}
416428

429+
/** {@inheritDoc} */
417430
@Override
418431
public double getFractionOfHeavyEnd(int i) {
419432
if (fractionOfHeavyEnd == null) {

src/main/java/neqsim/thermo/characterization/PlusFractionModel.java

+22
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,13 @@ public String getName() {
101101
return name;
102102
}
103103

104+
/** {@inheritDoc} */
104105
@Override
105106
public double getMPlus() {
106107
return MPlus;
107108
}
108109

110+
/** {@inheritDoc} */
109111
@Override
110112
public double getZPlus() {
111113
return zPlus;
@@ -119,36 +121,43 @@ public double getMaxPlusMolarMass() {
119121
return maxPlusMolarMass;
120122
}
121123

124+
/** {@inheritDoc} */
122125
@Override
123126
public double getNumberOfPlusPseudocomponents() {
124127
return numberOfPlusPseudocomponents;
125128
}
126129

130+
/** {@inheritDoc} */
127131
@Override
128132
public double[] getZ() {
129133
return z;
130134
}
131135

136+
/** {@inheritDoc} */
132137
@Override
133138
public double[] getM() {
134139
return M;
135140
}
136141

142+
/** {@inheritDoc} */
137143
@Override
138144
public double[] getDens() {
139145
return dens;
140146
}
141147

148+
/** {@inheritDoc} */
142149
@Override
143150
public double getDensPlus() {
144151
return densPlus;
145152
}
146153

154+
/** {@inheritDoc} */
147155
@Override
148156
public int getFirstPlusFractionNumber() {
149157
return firstPlusFractionNumber;
150158
}
151159

160+
/** {@inheritDoc} */
152161
@Override
153162
public int getFirstTBPFractionNumber() {
154163
int firstTBPNumber = 0;
@@ -174,16 +183,19 @@ public int getFirstTBPFractionNumber() {
174183
return firstTBPNumber;
175184
}
176185

186+
/** {@inheritDoc} */
177187
@Override
178188
public int getPlusComponentNumber() {
179189
return plusComponentNumber;
180190
}
181191

192+
/** {@inheritDoc} */
182193
@Override
183194
public int getLastPlusFractionNumber() {
184195
return lastPlusFractionNumber;
185196
}
186197

198+
/** {@inheritDoc} */
187199
@Override
188200
public boolean hasPlusFraction() {
189201
for (int i = 0; i < system.getPhase(0).getNumberOfComponents(); i++) {
@@ -198,6 +210,7 @@ public boolean hasPlusFraction() {
198210
return false;
199211
}
200212

213+
/** {@inheritDoc} */
201214
@Override
202215
public boolean characterizePlusFraction(TBPModelInterface TBPModel) {
203216
system.init(0);
@@ -242,11 +255,13 @@ public boolean characterizePlusFraction(TBPModelInterface TBPModel) {
242255
return true;
243256
}
244257

258+
/** {@inheritDoc} */
245259
@Override
246260
public double[] getCoefs() {
247261
return this.coefs;
248262
}
249263

264+
/** {@inheritDoc} */
250265
@Override
251266
public double getCoef(int i) {
252267
return this.coefs[i];
@@ -298,6 +313,7 @@ public void setCoefs(double coef, int i) {
298313
this.coefs[i] = coef;
299314
}
300315

316+
/** {@inheritDoc} */
301317
@Override
302318
public void setLastPlusFractionNumber(int fract) {
303319
lastPlusFractionNumber = fract + 1;
@@ -392,6 +408,7 @@ public void densityUOP() {
392408
}
393409
}
394410

411+
/** {@inheritDoc} */
395412
@Override
396413
public boolean characterizePlusFraction(TBPModelInterface TBPModel) {
397414
system.init(0);
@@ -451,11 +468,13 @@ public double[] getGammaParameters() {
451468
return new double[] {this.alfa, this.eta};
452469
}
453470

471+
/** {@inheritDoc} */
454472
@Override
455473
public double[] getCoefs() {
456474
return new double[] {alfa, eta};
457475
}
458476

477+
/** {@inheritDoc} */
459478
@Override
460479
public double getCoef(int i) {
461480
if (i == 0)
@@ -465,16 +484,19 @@ public double getCoef(int i) {
465484
return 0;
466485
}
467486

487+
/** {@inheritDoc} */
468488
@Override
469489
public double[] getZ() {
470490
return zValues;
471491
}
472492

493+
/** {@inheritDoc} */
473494
@Override
474495
public double[] getM() {
475496
return molarMasses;
476497
}
477498

499+
/** {@inheritDoc} */
478500
@Override
479501
public double[] getDens() {
480502
return densities;

0 commit comments

Comments
 (0)