Skip to content

Commit a623937

Browse files
EvenSolEvenSol
committed
updated method
1 parent 5ba9bd9 commit a623937

File tree

5 files changed

+93
-110
lines changed

5 files changed

+93
-110
lines changed

‎src/main/java/neqsim/processSimulation/processEquipment/ProcessEquipmentBaseClass.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -285,4 +285,15 @@ public boolean equals(Object obj) {
285285
&& Arrays.deepEquals(report, other.report)
286286
&& Objects.equals(specification, other.specification);
287287
}
288+
289+
/** {@inheritDoc} */
290+
public String[][] createTable(String name) {
291+
292+
String[][] table = new String[50][3];
293+
String[] names = {"Property", "Value", "Unit"};
294+
table[0][0] = "";
295+
table[0][1] = "";
296+
table[0][2] = "";
297+
return table;
298+
}
288299
}

‎src/main/java/neqsim/processSimulation/processEquipment/ProcessEquipmentInterface.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,4 +216,14 @@ public default SystemInterface getFluid() {
216216
/** {@inheritDoc} */
217217
@Override
218218
public int hashCode();
219+
220+
/**
221+
* Prints the fluid in a visually appealing way.
222+
*
223+
*/
224+
public default void prettyPrint() {
225+
neqsim.thermo.util.readwrite.TablePrinter.printTable(createTable(getName()));
226+
}
227+
228+
public String[][] createTable(String name);
219229
}

‎src/main/java/neqsim/processSimulation/processEquipment/pump/Pump.java

Lines changed: 59 additions & 110 deletions
Original file line numberDiff line numberDiff line change
@@ -54,25 +54,26 @@ public Pump() {
5454
* <p>
5555
* Return head
5656
* </p>
57-
* @param unit unit can be or kJ/kg
57+
*
58+
* @param unit unit can be or kJ/kg
5859
*/
59-
public double getHead(String unit){
60-
if(unit.equals("meter")){
61-
return (getOutletStream().getPressure("bara")-getInletStream().getPressure("bara"))/(1000.0 * ThermodynamicConstantsInterface.gravity / 1.0E5)
62-
}
63-
else if(unit.equals("kJ/kg")){
64-
return getPower("kW")/getInletStream().getFlowRate("kg/sec");
65-
}
60+
public double getHead(String unit) {
61+
if (unit.equals("meter")) {
62+
return (getOutletStream().getPressure("bara") - getInletStream().getPressure("bara"))
63+
/ (1000.0 * ThermodynamicConstantsInterface.gravity / 1.0E5);
64+
} else if (unit.equals("kJ/kg")) {
65+
return getPower("kW") / getInletStream().getFlowRate("kg/sec");
66+
} else
67+
return getPower("kW") / getInletStream().getFlowRate("kg/sec");
6668
}
6769

6870
/**
6971
* <p>
7072
* Constructor for Pump.
7173
* </p>
7274
*
73-
* @param inletStream a
74-
* {@link neqsim.processSimulation.processEquipment.stream.StreamInterface}
75-
* object
75+
* @param inletStream a {@link neqsim.processSimulation.processEquipment.stream.StreamInterface}
76+
* object
7677
*/
7778
@Deprecated
7879
public Pump(StreamInterface inletStream) {
@@ -94,10 +95,9 @@ public Pump(String name) {
9495
* Constructor for Pump.
9596
* </p>
9697
*
97-
* @param name name of pump
98-
* @param inletStream a
99-
* {@link neqsim.processSimulation.processEquipment.stream.StreamInterface}
100-
* object
98+
* @param name name of pump
99+
* @param inletStream a {@link neqsim.processSimulation.processEquipment.stream.StreamInterface}
100+
* object
101101
*/
102102
public Pump(String name, StreamInterface inletStream) {
103103
super(name, inletStream);
@@ -205,7 +205,8 @@ public void run(UUID id) {
205205
thermoSystem = inStream.getThermoSystem().clone();
206206
double pumpHead = 0.0;
207207
pumpHead = getPumpChart().getHead(thermoSystem.getFlowRate("m3/hr"), getSpeed());
208-
isentropicEfficiency = getPumpChart().getEfficiency(thermoSystem.getFlowRate("m3/hr"), getSpeed());
208+
isentropicEfficiency =
209+
getPumpChart().getEfficiency(thermoSystem.getFlowRate("m3/hr"), getSpeed());
209210
double deltaP = pumpHead * 1000.0 * ThermodynamicConstantsInterface.gravity / 1.0E5;
210211
thermoSystem = inStream.getThermoSystem().clone();
211212
thermoSystem.setPressure(inStream.getPressure() + deltaP);
@@ -244,84 +245,33 @@ public void run(UUID id) {
244245
/** {@inheritDoc} */
245246
@Override
246247
public String[][] createTable(String name) {
248+
DecimalFormat nf = new DecimalFormat();
249+
nf.setMaximumFractionDigits(5);
250+
nf.applyPattern("#.#####E0");
247251

248-
String[][] table = new String[50][5];
249-
String[] names = { "", "Phase 1", "Phase 2", "Phase 3", "Unit" };
252+
String[][] table = new String[4][3];
253+
String[] names = {"Property", "Value", "Unit"};
250254
table[0][0] = "";
251255
table[0][1] = "";
252256
table[0][2] = "";
253-
table[0][3] = "";
254257
StringBuffer buf = new StringBuffer();
255258
FieldPosition test = new FieldPosition(0);
256259

257-
for (int i = 0; i < thermoSystem.getNumberOfPhases(); i++) {
258-
for (int j = 0; j < thermoSystem.getPhases()[0].getNumberOfComponents(); j++) {
259-
table[j + 1][0] = thermoSystem.getPhases()[0].getComponents()[j].getName();
260-
buf = new StringBuffer();
261-
table[j + 1][i + 1] = nf.format(thermoSystem.getPhases()[i].getComponents()[j].getx(), buf, test).toString();
262-
table[j + 1][4] = "[-]";
263-
}
264-
buf = new StringBuffer();
265-
table[thermoSystem.getPhases()[0].getNumberOfComponents() + 2][0] = "Density";
266-
table[thermoSystem.getPhases()[0].getNumberOfComponents() + 2][i + 1] = nf
267-
.format(thermoSystem.getPhases()[i].getPhysicalProperties().getDensity(), buf, test)
268-
.toString();
269-
table[thermoSystem.getPhases()[0].getNumberOfComponents() + 2][4] = "[kg/m^3]";
270-
271-
// Double.longValue(thermoSystem.getPhases()[i].getBeta());
272-
buf = new StringBuffer();
273-
table[thermoSystem.getPhases()[0].getNumberOfComponents() + 3][0] = "PhaseFraction";
274-
table[thermoSystem.getPhases()[0].getNumberOfComponents() + 3][i + 1] = nf
275-
.format(thermoSystem.getPhases()[i].getBeta(), buf, test).toString();
276-
table[thermoSystem.getPhases()[0].getNumberOfComponents() + 3][4] = "[-]";
277-
278-
buf = new StringBuffer();
279-
table[thermoSystem.getPhases()[0].getNumberOfComponents() + 4][0] = "MolarMass";
280-
table[thermoSystem.getPhases()[0].getNumberOfComponents() + 4][i + 1] = nf
281-
.format(thermoSystem.getPhases()[i].getMolarMass() * 1000, buf, test).toString();
282-
table[thermoSystem.getPhases()[0].getNumberOfComponents() + 4][4] = "[kg/kmol]";
283-
284-
buf = new StringBuffer();
285-
table[thermoSystem.getPhases()[0].getNumberOfComponents() + 5][0] = "Cp";
286-
table[thermoSystem.getPhases()[0].getNumberOfComponents() + 5][i + 1] = nf
287-
.format((thermoSystem.getPhases()[i].getCp()
288-
/ thermoSystem.getPhases()[i].getNumberOfMolesInPhase() * 1.0
289-
/ thermoSystem.getPhases()[i].getMolarMass() * 1000), buf, test)
290-
.toString();
291-
table[thermoSystem.getPhases()[0].getNumberOfComponents() + 5][4] = "[kJ/kg*K]";
292-
293-
buf = new StringBuffer();
294-
table[thermoSystem.getPhases()[0].getNumberOfComponents() + 7][0] = "Viscosity";
295-
table[thermoSystem.getPhases()[0].getNumberOfComponents() + 7][i + 1] = nf
296-
.format((thermoSystem.getPhases()[i].getPhysicalProperties().getViscosity()), buf, test)
297-
.toString();
298-
table[thermoSystem.getPhases()[0].getNumberOfComponents() + 7][4] = "[kg/m*sec]";
299-
300-
buf = new StringBuffer();
301-
table[thermoSystem.getPhases()[0].getNumberOfComponents() + 8][0] = "Conductivity";
302-
table[thermoSystem.getPhases()[0].getNumberOfComponents() + 8][i + 1] = nf
303-
.format(thermoSystem.getPhases()[i].getPhysicalProperties().getConductivity(), buf, test)
304-
.toString();
305-
table[thermoSystem.getPhases()[0].getNumberOfComponents() + 8][4] = "[W/m*K]";
306-
307-
buf = new StringBuffer();
308-
table[thermoSystem.getPhases()[0].getNumberOfComponents() + 10][0] = "Pressure";
309-
table[thermoSystem.getPhases()[0].getNumberOfComponents() + 10][i + 1] = Double
310-
.toString(thermoSystem.getPhases()[i].getPressure());
311-
table[thermoSystem.getPhases()[0].getNumberOfComponents() + 10][4] = "[bar]";
312-
313-
buf = new StringBuffer();
314-
table[thermoSystem.getPhases()[0].getNumberOfComponents() + 11][0] = "Temperature";
315-
table[thermoSystem.getPhases()[0].getNumberOfComponents() + 11][i + 1] = Double
316-
.toString(thermoSystem.getPhases()[i].getTemperature());
317-
table[thermoSystem.getPhases()[0].getNumberOfComponents() + 11][4] = "[K]";
318-
Double.toString(thermoSystem.getPhases()[i].getTemperature());
319-
320-
buf = new StringBuffer();
321-
table[thermoSystem.getPhases()[0].getNumberOfComponents() + 13][0] = "Stream";
322-
table[thermoSystem.getPhases()[0].getNumberOfComponents() + 13][i + 1] = name;
323-
table[thermoSystem.getPhases()[0].getNumberOfComponents() + 13][4] = "-";
324-
}
260+
table[1][0] = "Inlet pressure";
261+
buf = new StringBuffer();
262+
table[1][1] = nf.format(inStream.getPressure("bara"), buf, test).toString();
263+
table[1][2] = "bara";
264+
265+
table[2][0] = "Outlet pressure";
266+
buf = new StringBuffer();
267+
table[2][1] = nf.format(outStream.getPressure("bara"), buf, test).toString();
268+
table[2][2] = "bara";
269+
270+
table[3][0] = "Head";
271+
buf = new StringBuffer();
272+
table[3][1] = nf.format(getHead("meter"), buf, test).toString();
273+
table[3][2] = "meter";
274+
return table;
325275
}
326276

327277
/** {@inheritDoc} */
@@ -337,7 +287,7 @@ public void displayResult() {
337287

338288
thermoSystem.initPhysicalProperties();
339289
String[][] table = new String[50][5];
340-
String[] names = { "", "Phase 1", "Phase 2", "Phase 3", "Unit" };
290+
String[] names = {"", "Phase 1", "Phase 2", "Phase 3", "Unit"};
341291
table[0][0] = "";
342292
table[0][1] = "";
343293
table[0][2] = "";
@@ -349,43 +299,43 @@ public void displayResult() {
349299
for (int j = 0; j < thermoSystem.getPhases()[0].getNumberOfComponents(); j++) {
350300
table[j + 1][0] = thermoSystem.getPhases()[0].getComponents()[j].getName();
351301
buf = new StringBuffer();
352-
table[j + 1][i + 1] = nf.format(thermoSystem.getPhases()[i].getComponents()[j].getx(), buf, test).toString();
302+
table[j + 1][i + 1] =
303+
nf.format(thermoSystem.getPhases()[i].getComponents()[j].getx(), buf, test).toString();
353304
table[j + 1][4] = "[-]";
354305
}
355306
buf = new StringBuffer();
356307
table[thermoSystem.getPhases()[0].getNumberOfComponents() + 2][0] = "Density";
357-
table[thermoSystem.getPhases()[0].getNumberOfComponents() + 2][i + 1] = nf
358-
.format(thermoSystem.getPhases()[i].getPhysicalProperties().getDensity(), buf, test)
359-
.toString();
308+
table[thermoSystem.getPhases()[0].getNumberOfComponents() + 2][i + 1] =
309+
nf.format(thermoSystem.getPhases()[i].getPhysicalProperties().getDensity(), buf, test)
310+
.toString();
360311
table[thermoSystem.getPhases()[0].getNumberOfComponents() + 2][4] = "[kg/m^3]";
361312

362313
// Double.longValue(thermoSystem.getPhases()[i].getBeta());
363314
buf = new StringBuffer();
364315
table[thermoSystem.getPhases()[0].getNumberOfComponents() + 3][0] = "PhaseFraction";
365-
table[thermoSystem.getPhases()[0].getNumberOfComponents() + 3][i + 1] = nf
366-
.format(thermoSystem.getPhases()[i].getBeta(), buf, test).toString();
316+
table[thermoSystem.getPhases()[0].getNumberOfComponents() + 3][i + 1] =
317+
nf.format(thermoSystem.getPhases()[i].getBeta(), buf, test).toString();
367318
table[thermoSystem.getPhases()[0].getNumberOfComponents() + 3][4] = "[-]";
368319

369320
buf = new StringBuffer();
370321
table[thermoSystem.getPhases()[0].getNumberOfComponents() + 4][0] = "MolarMass";
371-
table[thermoSystem.getPhases()[0].getNumberOfComponents() + 4][i + 1] = nf
372-
.format(thermoSystem.getPhases()[i].getMolarMass() * 1000, buf, test).toString();
322+
table[thermoSystem.getPhases()[0].getNumberOfComponents() + 4][i + 1] =
323+
nf.format(thermoSystem.getPhases()[i].getMolarMass() * 1000, buf, test).toString();
373324
table[thermoSystem.getPhases()[0].getNumberOfComponents() + 4][4] = "[kg/kmol]";
374325

375326
buf = new StringBuffer();
376327
table[thermoSystem.getPhases()[0].getNumberOfComponents() + 5][0] = "Cp";
377-
table[thermoSystem.getPhases()[0].getNumberOfComponents() + 5][i + 1] = nf
378-
.format((thermoSystem.getPhases()[i].getCp()
328+
table[thermoSystem.getPhases()[0].getNumberOfComponents() + 5][i + 1] =
329+
nf.format((thermoSystem.getPhases()[i].getCp()
379330
/ thermoSystem.getPhases()[i].getNumberOfMolesInPhase() * 1.0
380-
/ thermoSystem.getPhases()[i].getMolarMass() * 1000), buf, test)
381-
.toString();
331+
/ thermoSystem.getPhases()[i].getMolarMass() * 1000), buf, test).toString();
382332
table[thermoSystem.getPhases()[0].getNumberOfComponents() + 5][4] = "[kJ/kg*K]";
383333

384334
buf = new StringBuffer();
385335
table[thermoSystem.getPhases()[0].getNumberOfComponents() + 7][0] = "Viscosity";
386-
table[thermoSystem.getPhases()[0].getNumberOfComponents() + 7][i + 1] = nf
387-
.format((thermoSystem.getPhases()[i].getPhysicalProperties().getViscosity()), buf, test)
388-
.toString();
336+
table[thermoSystem.getPhases()[0].getNumberOfComponents() + 7][i + 1] =
337+
nf.format((thermoSystem.getPhases()[i].getPhysicalProperties().getViscosity()), buf, test)
338+
.toString();
389339
table[thermoSystem.getPhases()[0].getNumberOfComponents() + 7][4] = "[kg/m*sec]";
390340

391341
buf = new StringBuffer();
@@ -397,14 +347,14 @@ public void displayResult() {
397347

398348
buf = new StringBuffer();
399349
table[thermoSystem.getPhases()[0].getNumberOfComponents() + 10][0] = "Pressure";
400-
table[thermoSystem.getPhases()[0].getNumberOfComponents() + 10][i + 1] = Double
401-
.toString(thermoSystem.getPhases()[i].getPressure());
350+
table[thermoSystem.getPhases()[0].getNumberOfComponents() + 10][i + 1] =
351+
Double.toString(thermoSystem.getPhases()[i].getPressure());
402352
table[thermoSystem.getPhases()[0].getNumberOfComponents() + 10][4] = "[bar]";
403353

404354
buf = new StringBuffer();
405355
table[thermoSystem.getPhases()[0].getNumberOfComponents() + 11][0] = "Temperature";
406-
table[thermoSystem.getPhases()[0].getNumberOfComponents() + 11][i + 1] = Double
407-
.toString(thermoSystem.getPhases()[i].getTemperature());
356+
table[thermoSystem.getPhases()[0].getNumberOfComponents() + 11][i + 1] =
357+
Double.toString(thermoSystem.getPhases()[i].getTemperature());
408358
table[thermoSystem.getPhases()[0].getNumberOfComponents() + 11][4] = "[K]";
409359
Double.toString(thermoSystem.getPhases()[i].getTemperature());
410360

@@ -517,7 +467,7 @@ public void setPressure(double pressure) {
517467
* </p>
518468
*
519469
* @param pressure a double
520-
* @param unit a {@link java.lang.String} object
470+
* @param unit a {@link java.lang.String} object
521471
*/
522472
public void setPressure(double pressure, String unit) {
523473
setOutletPressure(pressure);
@@ -551,8 +501,7 @@ public double getSpeed() {
551501
* Getter for the field <code>pumpChart</code>.
552502
* </p>
553503
*
554-
* @return a {@link neqsim.processSimulation.processEquipment.pump.PumpChart}
555-
* object
504+
* @return a {@link neqsim.processSimulation.processEquipment.pump.PumpChart} object
556505
*/
557506
public PumpChart getPumpChart() {
558507
return pumpChart;

‎src/main/java/neqsim/processSimulation/processSystem/ProcessModuleBaseClass.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -241,4 +241,15 @@ public String[][] getResultTable() {
241241
public double getPressure(String unit) {
242242
return 1.0;
243243
}
244+
245+
/** {@inheritDoc} */
246+
public String[][] createTable(String name) {
247+
248+
String[][] table = new String[50][3];
249+
String[] names = {"Property", "Value", "Unit"};
250+
table[0][0] = "";
251+
table[0][1] = "";
252+
table[0][2] = "";
253+
return table;
254+
}
244255
}

‎src/test/java/neqsim/processSimulation/processEquipment/pump/PumpTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,8 @@ void testSimplePumpCurve() {
9898
pump1.setSpeed(500);
9999
pump1.run();
100100

101+
pump1.prettyPrint();
102+
101103
Assertions.assertEquals(7.274237081101, pump1.getOutletPressure(), 1e-5);
102104

103105
}

0 commit comments

Comments
 (0)