refact: filters are twoports

src/main/java/neqsim/processSimulation/processEquipment/filter/Filter.java

@@ -1,8 +1,7 @@
 package neqsim.processSimulation.processEquipment.filter;
 
-import neqsim.processSimulation.processEquipment.ProcessEquipmentBaseClass;
 import neqsim.processSimulation.processEquipment.ProcessEquipmentInterface;
-import neqsim.processSimulation.processEquipment.stream.Stream;
+import neqsim.processSimulation.processEquipment.TwoPortEquipment;
 import neqsim.processSimulation.processEquipment.stream.StreamInterface;
 import neqsim.thermo.system.SystemInterface;
 import neqsim.thermodynamicOperations.ThermodynamicOperations;
@@ -15,129 +14,114 @@
  * @author asmund
  * @version $Id: $Id
  */
-public class Filter extends ProcessEquipmentBaseClass {
-    private static final long serialVersionUID = 1000;
+public class Filter extends TwoPortEquipment {
+  private static final long serialVersionUID = 1000;
 
-    private double deltaP = 0.01;
-    protected StreamInterface outStream;
-    protected StreamInterface inStream;
-    private double Cv = 0.0;
+  private double deltaP = 0.01;
+  private double Cv = 0.0;
 
-    /**
-     * <p>
-     * Constructor for Filter.
-     * </p>
-     *
-     * @param inStream a {@link neqsim.processSimulation.processEquipment.stream.StreamInterface}
-     *        object
-     */
-    @Deprecated
-    public Filter(StreamInterface inStream) {
-        this("Filter", inStream);
-    }
+  /**
+   * <p>
+   * Constructor for Filter.
+   * </p>
+   *
+   * @param inStream a {@link neqsim.processSimulation.processEquipment.stream.StreamInterface}
+   *        object
+   */
+  @Deprecated
+  public Filter(StreamInterface inStream) {
+    this("Filter", inStream);
+  }
 
-    /**
-     * <p>
-     * Constructor for Filter.
-     * </p>
-     *
-     * @param name
-     * @param inStream a {@link neqsim.processSimulation.processEquipment.stream.StreamInterface}
-     *        object
-     */
-    public Filter(String name, StreamInterface inStream) {
-        super(name);
-        this.inStream = inStream;
-        outStream = (Stream) inStream.clone();
-    }
+  /**
+   * <p>
+   * Constructor for Filter.
+   * </p>
+   *
+   * @param name
+   * @param inStream a {@link neqsim.processSimulation.processEquipment.stream.StreamInterface}
+   *        object
+   */
+  public Filter(String name, StreamInterface inStream) {
+    super(name, inStream);
+  }
 
-    /** {@inheritDoc} */
-    @Override
-    public void run() {
-        SystemInterface system = inStream.getThermoSystem().clone();
-        if (Math.abs(getDeltaP()) > 1e-10) {
-            system.setPressure(inStream.getPressure() - getDeltaP());
-            ThermodynamicOperations testOps = new ThermodynamicOperations(system);
-            testOps.TPflash();
-        }
-        system.initProperties();
-        outStream.setThermoSystem(system);
-        Cv = Math.sqrt(deltaP) / inStream.getFlowRate("kg/hr");
+  /** {@inheritDoc} */
+  @Override
+  public void run() {
+    SystemInterface system = inStream.getThermoSystem().clone();
+    if (Math.abs(getDeltaP()) > 1e-10) {
+      system.setPressure(inStream.getPressure() - getDeltaP());
+      ThermodynamicOperations testOps = new ThermodynamicOperations(system);
+      testOps.TPflash();
     }
+    system.initProperties();
+    outStream.setThermoSystem(system);
+    Cv = Math.sqrt(deltaP) / inStream.getFlowRate("kg/hr");
+  }
 
-    /**
-     * <p>
-     * Getter for the field <code>deltaP</code>.
-     * </p>
-     *
-     * @return a double
-     */
-    public double getDeltaP() {
-        return deltaP;
-    }
-
-    /**
-     * <p>
-     * Setter for the field <code>deltaP</code>.
-     * </p>
-     *
-     * @param deltaP a double
-     */
-    public void setDeltaP(double deltaP) {
-        this.deltaP = deltaP;
-        this.outStream.setPressure(this.inStream.getPressure() - deltaP);
-    }
+  /**
+   * <p>
+   * Getter for the field <code>deltaP</code>.
+   * </p>
+   *
+   * @return a double
+   */
+  public double getDeltaP() {
+    return deltaP;
+  }
 
-    /**
-     * <p>
-     * Setter for the field <code>deltaP</code>.
-     * </p>
-     *
-     * @param deltaP a double
-     * @param unit a {@link java.lang.String} object
-     */
-    public void setDeltaP(double deltaP, String unit) {
-        this.deltaP = deltaP;
-        this.outStream.setPressure(this.inStream.getPressure(unit) - deltaP, unit);
-    }
+  /**
+   * <p>
+   * Setter for the field <code>deltaP</code>.
+   * </p>
+   *
+   * @param deltaP a double
+   */
+  public void setDeltaP(double deltaP) {
+    this.deltaP = deltaP;
+    this.outStream.setPressure(this.inStream.getPressure() - deltaP);
+  }
 
-    /**
-     * <p>
-     * Getter for the field <code>outStream</code>.
-     * </p>
-     *
-     * @return a {@link neqsim.processSimulation.processEquipment.stream.StreamInterface} object
-     */
-    public StreamInterface getOutStream() {
-        return outStream;
-    }
+  /**
+   * <p>
+   * Setter for the field <code>deltaP</code>.
+   * </p>
+   *
+   * @param deltaP a double
+   * @param unit a {@link java.lang.String} object
+   */
+  public void setDeltaP(double deltaP, String unit) {
+    this.deltaP = deltaP;
+    this.outStream.setPressure(this.inStream.getPressure(unit) - deltaP, unit);
+  }
 
-    /** {@inheritDoc} */
-    @Override
-    public void runConditionAnalysis(ProcessEquipmentInterface refTEGabsorberloc) {
-        double deltaP = inStream.getPressure("bara") - outStream.getPressure("bara");
-        Cv = Math.sqrt(deltaP) / inStream.getFlowRate("kg/hr");
-    }
+  /** {@inheritDoc} */
+  @Override
+  public void runConditionAnalysis(ProcessEquipmentInterface refTEGabsorberloc) {
+    double deltaP = inStream.getPressure("bara") - outStream.getPressure("bara");
+    Cv = Math.sqrt(deltaP) / inStream.getFlowRate("kg/hr");
+  }
 
-    /**
-     * <p>
-     * getCvFactor.
-     * </p>
-     *
-     * @return a double
-     */
-    public double getCvFactor() {
-        return Cv;
-    }
+  /**
+   * <p>
+   * getCvFactor.
+   * </p>
+   *
+   * @return a double
+   */
+  public double getCvFactor() {
+    return Cv;
+  }
 
-    /**
-     * <p>
-     * setCvFactor.
-     * </p>
-     *
-     * @param pressureCoef a double
-     */
-    public void setCvFactor(double pressureCoef) {
-        this.Cv = pressureCoef;
-    }
+  /**
+   * <p>
+   * setCvFactor.
+   * </p>
+   *
+   * @param pressureCoef a double
+   */
+  public void setCvFactor(double pressureCoef) {
+    this.Cv = pressureCoef;
+  }
 }

src/test/java/neqsim/processSimulation/util/example/TEGdehydrationProcessDistillationAaHa.java

@@ -127,11 +127,11 @@ public static neqsim.processSimulation.processSystem.ProcessSystem getProcess()
         Filter fineFilter = new Filter("TEG fine filter", flashLiquid);
         fineFilter.setDeltaP(0.05, "bara");
 
-        Filter carbonFilter = new Filter("activated carbon filter", fineFilter.getOutStream());
+        Filter carbonFilter = new Filter("activated carbon filter", fineFilter.getOutletStream());
         carbonFilter.setDeltaP(0.01, "bara");
 
         HeatExchanger heatEx =
-                new HeatExchanger("rich TEG heat exchanger 2", carbonFilter.getOutStream());
+            new HeatExchanger("rich TEG heat exchanger 2", carbonFilter.getOutletStream());
         heatEx.setGuessOutTemperature(273.15 + 130.0);
         heatEx.setUAvalue(390.0);
 

src/test/java/neqsim/processSimulation/util/example/TEGdehydrationProcessDistillationGFA.java

@@ -254,7 +254,7 @@ public neqsim.processSimulation.processSystem.ProcessSystem getProcess() {
         Filter filter = new Filter("filters", flashLiquid);
 
         HeatExchanger heatEx =
-                new HeatExchanger("rich TEG heat exchanger 2", filter.getOutStream());
+            new HeatExchanger("rich TEG heat exchanger 2", filter.getOutletStream());
         heatEx.setGuessOutTemperature(273.15 + 130.0);
         heatEx.setUAvalue(UAvalueRichTEGHeatExchanger_2);
 

src/test/java/neqsim/processSimulation/util/example/TEGdehydrationProcessDistillationJS.java

@@ -255,11 +255,11 @@ public neqsim.processSimulation.processSystem.ProcessSystem getProcess() {
         Filter fineFilter = new Filter("TEG fine filter", flashLiquid);
         fineFilter.setDeltaP(0.05, "bara");
 
-        Filter carbonFilter = new Filter("activated carbon filter", fineFilter.getOutStream());
+        Filter carbonFilter = new Filter("activated carbon filter", fineFilter.getOutletStream());
         carbonFilter.setDeltaP(0.01, "bara");
 
         HeatExchanger heatEx =
-                new HeatExchanger("rich TEG heat exchanger 2", carbonFilter.getOutStream());
+            new HeatExchanger("rich TEG heat exchanger 2", carbonFilter.getOutletStream());
         heatEx.setGuessOutTemperature(273.15 + 130.0);
         heatEx.setUAvalue(UAvalueRichTEGHeatExchanger_2);