diff --git a/src/main/java/neqsim/processsimulation/processequipment/absorber/SimpleAbsorber.java b/src/main/java/neqsim/processsimulation/processequipment/absorber/SimpleAbsorber.java index 3a26f044e..59eb766b7 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/absorber/SimpleAbsorber.java +++ b/src/main/java/neqsim/processsimulation/processequipment/absorber/SimpleAbsorber.java @@ -76,12 +76,6 @@ public SimpleAbsorber(String name, StreamInterface inStream1) { outStream[1].run(); } - /** {@inheritDoc} */ - @Override - public AbsorberMechanicalDesign getMechanicalDesign() { - return new AbsorberMechanicalDesign(this); - } - /** {@inheritDoc} */ @Override public void setName(String name) { @@ -160,24 +154,26 @@ public void setOutTemperature(double temperature) { /** *
- * getOutTemperature. + * Get temperature of outstream i. *
* * @param i a int + * @return a double */ - public void getOutTemperature(int i) { - outStream[i].getThermoSystem().getTemperature(); + public double getOutTemperature(int i) { + return outStream[i].getThermoSystem().getTemperature(); } /** *- * getInTemperature. + * * Get temperature of instream i. *
* * @param i a int + * @return a double */ - public void getInTemperature(int i) { - inStream[i].getThermoSystem().getTemperature(); + public double getInTemperature(int i) { + return inStream[i].getThermoSystem().getTemperature(); } /** {@inheritDoc} */ @@ -371,4 +367,10 @@ public double getWettingRate() { double intArea = 3.14 * getInternalDiameter() * getInternalDiameter() / 4.0; return getLiquidOutStream().getThermoSystem().getFlowRate("m3/hr") / intArea; } + + /** {@inheritDoc} */ + @Override + public AbsorberMechanicalDesign getMechanicalDesign() { + return new AbsorberMechanicalDesign(this); + } } diff --git a/src/main/java/neqsim/processsimulation/processequipment/adsorber/SimpleAdsorber.java b/src/main/java/neqsim/processsimulation/processequipment/adsorber/SimpleAdsorber.java index 7ff47ef22..6312399c7 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/adsorber/SimpleAdsorber.java +++ b/src/main/java/neqsim/processsimulation/processequipment/adsorber/SimpleAdsorber.java @@ -75,12 +75,6 @@ public SimpleAdsorber(String name, StreamInterface inStream1) { outStream[1].run(); } - /** {@inheritDoc} */ - @Override - public AdsorberMechanicalDesign getMechanicalDesign() { - return new AdsorberMechanicalDesign(this); - } - /** {@inheritDoc} */ @Override public void setName(String name) { @@ -125,24 +119,24 @@ public void setOutTemperature(double temperature) { /** *- * getOutTemperature. + * Get temperature of outstream i. *
* * @param i a int */ - public void getOutTemperature(int i) { - outStream[i].getThermoSystem().getTemperature(); + public double getOutTemperature(int i) { + return outStream[i].getThermoSystem().getTemperature(); } /** *- * getInTemperature. + * Get temperature of instream i. *
* * @param i a int */ - public void getInTemperature(int i) { - inStream[i].getThermoSystem().getTemperature(); + public double getInTemperature(int i) { + return inStream[i].getThermoSystem().getTemperature(); } /** {@inheritDoc} */ @@ -316,4 +310,10 @@ public double getNTU() { public void setNTU(double NTU) { this.NTU = NTU; } + + /** {@inheritDoc} */ + @Override + public AdsorberMechanicalDesign getMechanicalDesign() { + return new AdsorberMechanicalDesign(this); + } } diff --git a/src/main/java/neqsim/processsimulation/processequipment/heatexchanger/HeatExchanger.java b/src/main/java/neqsim/processsimulation/processequipment/heatexchanger/HeatExchanger.java index ff75159b1..337fb4ec7 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/heatexchanger/HeatExchanger.java +++ b/src/main/java/neqsim/processsimulation/processequipment/heatexchanger/HeatExchanger.java @@ -47,6 +47,7 @@ public class HeatExchanger extends Heater implements HeatExchangerInterface { public double thermalEffectiveness = 0.0; private String flowArrangement = "concentric tube counterflow"; private boolean useDeltaT = false; + private double deltaT = 1.0; /** * Constructor for HeatExchanger. @@ -64,11 +65,7 @@ public HeatExchanger(String name) { * @param inStream1 input stream */ public HeatExchanger(String name, StreamInterface inStream1) { - this(name); - this.inStream[0] = inStream1; - this.inStream[1] = inStream1; - outStream[0] = inStream1.clone(); - outStream[1] = inStream1.clone(); + this(name, inStream1, inStream1); } /** @@ -84,23 +81,26 @@ public HeatExchanger(String name, StreamInterface inStream1, StreamInterface inS this.inStream[1] = inStream2; outStream[0] = inStream1.clone(); outStream[1] = inStream2.clone(); + setName(name); } /** *- * addInStream. + * Add inlet stream. *
* * @param inStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} * object */ public void addInStream(StreamInterface inStream) { + // todo: this is probably intended to specifically set the second stream. should be deprecated + // and replaced by setFeedStream? this.inStream[1] = inStream; } /** *- * setFeedStream. + * setFeedStream. Will also set name of outstreams. *
* * @param number a int @@ -110,6 +110,7 @@ public void addInStream(StreamInterface inStream) { public void setFeedStream(int number, StreamInterface inStream) { this.inStream[number] = inStream; outStream[number] = inStream.clone(); + setName(getName()); } /** {@inheritDoc} */ @@ -152,24 +153,26 @@ public void setOutTemperature(double temperature) { /** *- * getOutTemperature. + * Get temperature of outstream i. *
* * @param i a int + * @return a double */ - public void getOutTemperature(int i) { - outStream[i].getThermoSystem().getTemperature(); + public double getOutTemperature(int i) { + return outStream[i].getThermoSystem().getTemperature(); } /** *- * getInTemperature. + * Get temperature of instream i. *
* * @param i a int + * @return a double */ - public void getInTemperature(int i) { - inStream[i].getThermoSystem().getTemperature(); + public double getInTemperature(int i) { + return inStream[i].getThermoSystem().getTemperature(); } /** @@ -225,13 +228,12 @@ public void runSpecifiedStream(UUID id) { /** *- * runSpecifiedStream. + * runDeltaT. *
* * @param id UUID of run */ public void runDeltaT(UUID id) { - if (getSpecification().equals("out stream")) { runSpecifiedStream(id); } else if (firstTime) { @@ -704,7 +706,9 @@ public String toJson() { } /** - *Setter for the field useDeltaT
.
+ * Setter for the field useDeltaT
.
+ *
Getter for the field deltaT
.
+ * Getter for the field deltaT
.
+ *
Setter for the field deltaT
.
+ * Setter for the field deltaT
.
+ *