- * Constructor for EnhancementFactorAlg. - *
- */ - public EnhancementFactorAlg() { - super(); - } /** *diff --git a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/nonEquilibriumFluidBoundary/filmModelBoundary/reactiveFilmModel/enhancementFactor/EnhancementFactorNumeric.java b/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/nonEquilibriumFluidBoundary/filmModelBoundary/reactiveFilmModel/enhancementFactor/EnhancementFactorNumeric.java index f954b752a4..93d20ad11a 100644 --- a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/nonEquilibriumFluidBoundary/filmModelBoundary/reactiveFilmModel/enhancementFactor/EnhancementFactorNumeric.java +++ b/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/nonEquilibriumFluidBoundary/filmModelBoundary/reactiveFilmModel/enhancementFactor/EnhancementFactorNumeric.java @@ -13,14 +13,6 @@ * @version $Id: $Id */ public class EnhancementFactorNumeric extends EnhancementFactor { - /** - *
- * Constructor for EnhancementFactorNumeric. - *
- */ - public EnhancementFactorNumeric() { - super(); - } /** *diff --git a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/commonPhasePhysicalProperties/CommonPhysicalPropertyMethod.java b/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/commonPhasePhysicalProperties/CommonPhysicalPropertyMethod.java index d0967a330a..5d4be982ab 100644 --- a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/commonPhasePhysicalProperties/CommonPhysicalPropertyMethod.java +++ b/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/commonPhasePhysicalProperties/CommonPhysicalPropertyMethod.java @@ -14,15 +14,6 @@ public class CommonPhysicalPropertyMethod protected neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface phase; - /** - *
- * Constructor for CommonPhysicalPropertyMethod. - *
- */ - public CommonPhysicalPropertyMethod() { - super(); - } - /** ** Constructor for CommonPhysicalPropertyMethod. @@ -34,7 +25,6 @@ public CommonPhysicalPropertyMethod() { */ public CommonPhysicalPropertyMethod( neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface phase) { - super(); this.phase = phase; } diff --git a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/gasPhysicalProperties/GasPhysicalPropertyMethod.java b/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/gasPhysicalProperties/GasPhysicalPropertyMethod.java index 679e4b21c5..89edc1b436 100644 --- a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/gasPhysicalProperties/GasPhysicalPropertyMethod.java +++ b/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/gasPhysicalProperties/GasPhysicalPropertyMethod.java @@ -23,7 +23,6 @@ public class GasPhysicalPropertyMethod *
*/ public GasPhysicalPropertyMethod() { - super(); } /** @@ -37,7 +36,6 @@ public GasPhysicalPropertyMethod() { */ public GasPhysicalPropertyMethod( neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface gasPhase) { - super(); this.gasPhase = gasPhase; binaryMolecularDiameter = new double[gasPhase.getPhase().getNumberOfComponents()][gasPhase .getPhase().getNumberOfComponents()]; diff --git a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/liquidPhysicalProperties/LiquidPhysicalPropertyMethod.java b/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/liquidPhysicalProperties/LiquidPhysicalPropertyMethod.java index c33d9f2871..5c95c15795 100644 --- a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/liquidPhysicalProperties/LiquidPhysicalPropertyMethod.java +++ b/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/liquidPhysicalProperties/LiquidPhysicalPropertyMethod.java @@ -20,7 +20,6 @@ public class LiquidPhysicalPropertyMethod * */ public LiquidPhysicalPropertyMethod() { - super(); } /** @@ -34,7 +33,6 @@ public LiquidPhysicalPropertyMethod() { */ public LiquidPhysicalPropertyMethod( neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface liquidPhase) { - super(); this.liquidPhase = liquidPhase; } diff --git a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/solidPhysicalProperties/SolidPhysicalPropertyMethod.java b/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/solidPhysicalProperties/SolidPhysicalPropertyMethod.java index 336d7dd311..3fb9822fc2 100644 --- a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/solidPhysicalProperties/SolidPhysicalPropertyMethod.java +++ b/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/solidPhysicalProperties/SolidPhysicalPropertyMethod.java @@ -20,7 +20,6 @@ public class SolidPhysicalPropertyMethod * */ public SolidPhysicalPropertyMethod() { - super(); } /** @@ -34,7 +33,6 @@ public SolidPhysicalPropertyMethod() { */ public SolidPhysicalPropertyMethod( neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface solidPhase) { - super(); this.solidPhase = solidPhase; } diff --git a/src/main/java/neqsim/processSimulation/SimulationInterface.java b/src/main/java/neqsim/processSimulation/SimulationInterface.java index bc7a608b97..826896d47b 100644 --- a/src/main/java/neqsim/processSimulation/SimulationInterface.java +++ b/src/main/java/neqsim/processSimulation/SimulationInterface.java @@ -92,6 +92,7 @@ public interface SimulationInterface extends NamedInterface, Runnable, Serializa * run. * */ + @Override public default void run() { if (isRunInSteps()) { run_step(UUID.randomUUID()); diff --git a/src/main/java/neqsim/processSimulation/measurementDevice/MultiPhaseMeter.java b/src/main/java/neqsim/processSimulation/measurementDevice/MultiPhaseMeter.java index fa33ec465e..d3ef9db123 100644 --- a/src/main/java/neqsim/processSimulation/measurementDevice/MultiPhaseMeter.java +++ b/src/main/java/neqsim/processSimulation/measurementDevice/MultiPhaseMeter.java @@ -223,7 +223,6 @@ public double getMeasuredValue(String measurement, String unit) { } if (measurement.equals("waterDensity")) { if (!tempFluid.hasPhaseType("aqueous")) { - return 0.0; } else { return tempFluid.getPhase("aqueous").getDensity("kg/m3"); } diff --git a/src/main/java/neqsim/processSimulation/measurementDevice/simpleFlowRegime/Pipe.java b/src/main/java/neqsim/processSimulation/measurementDevice/simpleFlowRegime/Pipe.java index f6e2abdcd0..92b70d5006 100644 --- a/src/main/java/neqsim/processSimulation/measurementDevice/simpleFlowRegime/Pipe.java +++ b/src/main/java/neqsim/processSimulation/measurementDevice/simpleFlowRegime/Pipe.java @@ -158,7 +158,6 @@ public void setAngle(double angle) { */ public double getAngle(String unit) { if (unit.equals("Degree")) { - return this.angle; } else if (unit.equals("Radian")) { return this.angle * pi / 180; } diff --git a/src/main/java/neqsim/processSimulation/processEquipment/ProcessEquipmentBaseClass.java b/src/main/java/neqsim/processSimulation/processEquipment/ProcessEquipmentBaseClass.java index 2799a1a065..a5788c0733 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/ProcessEquipmentBaseClass.java +++ b/src/main/java/neqsim/processSimulation/processEquipment/ProcessEquipmentBaseClass.java @@ -294,6 +294,7 @@ public String toJson() { * * @return a String */ + @Override public String getReport_json() { return new Report(this).generateJsonReport(); } diff --git a/src/main/java/neqsim/processSimulation/processEquipment/ProcessEquipmentInterface.java b/src/main/java/neqsim/processSimulation/processEquipment/ProcessEquipmentInterface.java index 4fea2f15a6..62f3819b9f 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/ProcessEquipmentInterface.java +++ b/src/main/java/neqsim/processSimulation/processEquipment/ProcessEquipmentInterface.java @@ -231,5 +231,6 @@ public default SystemInterface getFluid() { * * @return a String */ + @Override public String getReport_json(); } diff --git a/src/main/java/neqsim/processSimulation/processEquipment/distillation/DistillationColumn.java b/src/main/java/neqsim/processSimulation/processEquipment/distillation/DistillationColumn.java index 898d5dc698..f2305d2f7b 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/distillation/DistillationColumn.java +++ b/src/main/java/neqsim/processSimulation/processEquipment/distillation/DistillationColumn.java @@ -7,8 +7,6 @@ import org.apache.logging.log4j.Logger; import neqsim.processSimulation.processEquipment.ProcessEquipmentBaseClass; import neqsim.processSimulation.processEquipment.heatExchanger.Heater; -import neqsim.processSimulation.processEquipment.mixer.Mixer; -import neqsim.processSimulation.processEquipment.mixer.MixerInterface; import neqsim.processSimulation.processEquipment.separator.Separator; import neqsim.processSimulation.processEquipment.stream.Stream; import neqsim.processSimulation.processEquipment.stream.StreamInterface; @@ -113,7 +111,7 @@ public void init() { return; } setDoInitializion(false); - ((Runnable) trays.get(feedTrayNumber)).run(); + trays.get(feedTrayNumber).run(); if (getTray(feedTrayNumber).getFluid().getNumberOfPhases() == 1) { for (int i = 0; i < numberOfTrays; i++) { if (getTray(i).getNumberOfInputStreams() > 0 && i != feedTrayNumber) { @@ -126,7 +124,7 @@ public void init() { } } else if (i == feedTrayNumber && getTray(i).getNumberOfInputStreams() > 1) { getTray(feedTrayNumber).addStream(trays.get(i).getStream(1)); - ((Runnable) trays.get(feedTrayNumber)).run(); + trays.get(feedTrayNumber).run(); getTray(feedTrayNumber) .removeInputStream(getTray(feedTrayNumber).getNumberOfInputStreams() - 1); if (getTray(feedTrayNumber).getThermoSystem().getNumberOfPhases() > 1) { @@ -145,7 +143,7 @@ public void init() { // .setTotalNumberOfMoles(((Mixer) trays.get(numberOfTrays - // 1)).getStream(0).getThermoSystem() // .getTotalNumberOfMoles() * (1.0)); - ((MixerInterface) trays.get(0)) + trays.get(0) .addStream(trays.get(feedTrayNumber).getLiquidOutStream().clone()); // ((Mixer) // trays.get(0)).getStream(streamNumbReboil).getThermoSystem().setTotalNumberOfMoles( @@ -154,18 +152,18 @@ public void init() { // * (1.0)); // ((Runnable) trays.get(numberOfTrays - 1)).run(); - ((Runnable) trays.get(0)).run(); + trays.get(0).run(); double feedTrayTemperature = getTray(getFeedTrayNumber()).getTemperature(); if (trays.get(numberOfTrays - 1).getNumberOfInputStreams() > 0) { condenserTemperature = - ((MixerInterface) trays.get(numberOfTrays - 1)).getThermoSystem().getTemperature(); + trays.get(numberOfTrays - 1).getThermoSystem().getTemperature(); } else { condenserTemperature = feedTrayTemperature - 1.0; } - reboilerTemperature = ((MixerInterface) trays.get(0)).getThermoSystem().getTemperature(); + reboilerTemperature = trays.get(0).getThermoSystem().getTemperature(); double deltaTempCondenser = (feedTrayTemperature - condenserTemperature) / (numberOfTrays * 1.0 - feedTrayNumber - 1); @@ -174,31 +172,31 @@ public void init() { double delta = 0; for (int i = feedTrayNumber + 1; i < numberOfTrays; i++) { delta += deltaTempCondenser; - ((Mixer) trays.get(i)) + trays.get(i) .setTemperature(getTray(getFeedTrayNumber()).getThermoSystem().getTemperature() - delta); } delta = 0; for (int i = feedTrayNumber - 1; i >= 0; i--) { delta += deltaTempReboiler; - ((Mixer) trays.get(i)) + trays.get(i) .setTemperature(getTray(getFeedTrayNumber()).getThermoSystem().getTemperature() + delta); } for (int i = 1; i < numberOfTrays; i++) { - ((MixerInterface) trays.get(i)).addStream(trays.get(i - 1).getGasOutStream()); + trays.get(i).addStream(trays.get(i - 1).getGasOutStream()); trays.get(i).init(); - ((Runnable) trays.get(i)).run(); + trays.get(i).run(); } for (int i = numberOfTrays - 2; i >= 1; i--) { - ((MixerInterface) trays.get(i)).addStream(trays.get(i + 1).getLiquidOutStream()); + trays.get(i).addStream(trays.get(i + 1).getLiquidOutStream()); trays.get(i).init(); - ((Runnable) trays.get(i)).run(); + trays.get(i).run(); } int streamNumb = (trays.get(0)).getNumberOfInputStreams() - 1; - ((MixerInterface) trays.get(0)).replaceStream(streamNumb, trays.get(1).getLiquidOutStream()); + trays.get(0).replaceStream(streamNumb, trays.get(1).getLiquidOutStream()); trays.get(0).init(); - ((Runnable) trays.get(0)).run(); + trays.get(0).run(); // massBalanceCheck(); } @@ -340,19 +338,19 @@ public void run(UUID id) { errOld = err; err = 0.0; for (int i = 0; i < numberOfTrays; i++) { - oldtemps[i] = ((MixerInterface) trays.get(i)).getThermoSystem().getTemperature(); + oldtemps[i] = trays.get(i).getThermoSystem().getTemperature(); } for (int i = feedTrayNumber; i > 1; i--) { int replaceStream1 = trays.get(i - 1).getNumberOfInputStreams() - 1; - ((Mixer) trays.get(i - 1)).replaceStream(replaceStream1, + trays.get(i - 1).replaceStream(replaceStream1, trays.get(i).getLiquidOutStream()); trays.get(i - 1).setPressure(bottomTrayPressure - (i - 1) * dp); trays.get(i - 1).run(id); } int streamNumb = trays.get(0).getNumberOfInputStreams() - 1; trays.get(0).setPressure(bottomTrayPressure); - ((Mixer) trays.get(0)).replaceStream(streamNumb, trays.get(1).getLiquidOutStream()); + trays.get(0).replaceStream(streamNumb, trays.get(1).getLiquidOutStream()); trays.get(0).run(id); for (int i = 1; i <= numberOfTrays - 1; i++) { @@ -360,19 +358,19 @@ public void run(UUID id) { if (i == (numberOfTrays - 1)) { replaceStream = trays.get(i).getNumberOfInputStreams() - 1; } - ((Mixer) trays.get(i)).replaceStream(replaceStream, trays.get(i - 1).getGasOutStream()); + trays.get(i).replaceStream(replaceStream, trays.get(i - 1).getGasOutStream()); trays.get(i).run(id); } for (int i = numberOfTrays - 2; i >= feedTrayNumber; i--) { int replaceStream = trays.get(i).getNumberOfInputStreams() - 1; - ((Mixer) trays.get(i)).replaceStream(replaceStream, + trays.get(i).replaceStream(replaceStream, trays.get(i + 1).getLiquidOutStream()); trays.get(i).run(id); } for (int i = 0; i < numberOfTrays; i++) { err += Math.abs( - oldtemps[i] - ((MixerInterface) trays.get(i)).getThermoSystem().getTemperature()); + oldtemps[i] - trays.get(i).getThermoSystem().getTemperature()); } logger.info("error iter " + err + " iteration " + iter); // System.out.println("error iter " + err + " iteration " + iter); diff --git a/src/main/java/neqsim/processSimulation/processEquipment/pump/Pump.java b/src/main/java/neqsim/processSimulation/processEquipment/pump/Pump.java index 2c62a55b78..c6e05c4f2c 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/pump/Pump.java +++ b/src/main/java/neqsim/processSimulation/processEquipment/pump/Pump.java @@ -92,7 +92,6 @@ public double getPower() { */ public double getPower(String unit) { if (unit.equals("W")) { - return dH; } else if (unit.equals("kW")) { return dH / 1000.0; } else if (unit.equals("MW")) { diff --git a/src/main/java/neqsim/processSimulation/processEquipment/reservoir/ReservoirTPsim.java b/src/main/java/neqsim/processSimulation/processEquipment/reservoir/ReservoirTPsim.java index 4829206a64..731072dfcd 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/reservoir/ReservoirTPsim.java +++ b/src/main/java/neqsim/processSimulation/processEquipment/reservoir/ReservoirTPsim.java @@ -58,7 +58,7 @@ public ReservoirTPsim(String name, SystemInterface reservoirFluid) { /** {@inheritDoc} */ @Override public void run(UUID id) { - SystemInterface fluid1 = ((SystemInterface) reservoirFluid).clone(); + SystemInterface fluid1 = reservoirFluid.clone(); fluid1.setTemperature(temperature, tUnit); fluid1.setPressure(pressure, pUnit); fluid1.setTotalFlowRate(flowRate, flowUnit); diff --git a/src/main/java/neqsim/processSimulation/processSystem/ProcessModule.java b/src/main/java/neqsim/processSimulation/processSystem/ProcessModule.java index f9c39d4341..a55f361fe5 100644 --- a/src/main/java/neqsim/processSimulation/processSystem/ProcessModule.java +++ b/src/main/java/neqsim/processSimulation/processSystem/ProcessModule.java @@ -254,6 +254,7 @@ public ArrayList* Getter for property NormalBoilingPoint. *
- * + * * @param unit Unit of return pressure - * + * * @return The normal boiling point of the component */ public double getNormalBoilingPoint(String unit); diff --git a/src/main/java/neqsim/thermo/component/ComponentModifiedFurstElectrolyteEosMod2004.java b/src/main/java/neqsim/thermo/component/ComponentModifiedFurstElectrolyteEosMod2004.java index 077727cad0..819edde5a3 100644 --- a/src/main/java/neqsim/thermo/component/ComponentModifiedFurstElectrolyteEosMod2004.java +++ b/src/main/java/neqsim/thermo/component/ComponentModifiedFurstElectrolyteEosMod2004.java @@ -416,7 +416,6 @@ public double FLRN() { public double calcSolventdiElectricdn(PhaseInterface phase, int numberOfComponents, double temperature, double pressure) { if (getIonicCharge() != 0) { - return 0.0; } /* * double ans2 = 0.0; for (int i = 0; i < numberOfComponents; i++) { if @@ -446,7 +445,6 @@ public double calcSolventdiElectricdndn(int j, PhaseInterface phase, int numberO if (getIonicCharge() != 0 || ((PhaseModifiedFurstElectrolyteEosMod2004) phase).getComponents()[j] .getIonicCharge() != 0) { - return 0.0; } /* * double ans2 = 0.0; for (int i = 0; i < numberOfComponents; i++) { if @@ -475,7 +473,6 @@ public double calcSolventdiElectricdndn(int j, PhaseInterface phase, int numberO public double calcSolventdiElectricdndT(PhaseInterface phase, int numberOfComponents, double temperature, double pressure) { if (getIonicCharge() != 0) { - return 0.0; } /* * double ans2 = 0.0; for (int i = 0; i < numberOfComponents; i++) { if diff --git a/src/main/java/neqsim/thermo/mixingRule/EosMixingRules.java b/src/main/java/neqsim/thermo/mixingRule/EosMixingRules.java index 7cd7faa3bf..8528afaa15 100644 --- a/src/main/java/neqsim/thermo/mixingRule/EosMixingRules.java +++ b/src/main/java/neqsim/thermo/mixingRule/EosMixingRules.java @@ -1246,7 +1246,6 @@ public class SRKHuronVidal2 extends ClassicSRK implements HVmixingRuleInterface public SRKHuronVidal2(PhaseInterface phase, double[][] HValpha, double[][] HVDij, String[][] mixRule) { - super(); this.orgPhase = phase; if (mixingRuleGEModel.equals("NRTL")) { @@ -1271,7 +1270,6 @@ public SRKHuronVidal2(PhaseInterface phase, double[][] HValpha, double[][] HVDij public SRKHuronVidal2(PhaseInterface phase, double[][] HValpha, double[][] HVDij, double[][] HVDijT, String[][] mixRule) { - super(); this.orgPhase = phase; if (mixingRuleGEModel.equals("NRTL")) { diff --git a/src/main/java/neqsim/thermo/phase/PhaseBWRSEos.java b/src/main/java/neqsim/thermo/phase/PhaseBWRSEos.java index 8d9c89ed7c..ddf4db88ec 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseBWRSEos.java +++ b/src/main/java/neqsim/thermo/phase/PhaseBWRSEos.java @@ -25,7 +25,6 @@ public class PhaseBWRSEos extends PhaseSrkEos { * */ public PhaseBWRSEos() { - super(); } /** {@inheritDoc} */ diff --git a/src/main/java/neqsim/thermo/phase/PhaseCSPsrkEos.java b/src/main/java/neqsim/thermo/phase/PhaseCSPsrkEos.java index 79d1d28e25..4375a6aebc 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseCSPsrkEos.java +++ b/src/main/java/neqsim/thermo/phase/PhaseCSPsrkEos.java @@ -27,7 +27,6 @@ public class PhaseCSPsrkEos extends PhaseSrkEos { * */ public PhaseCSPsrkEos() { - super(); refBWRSPhase = new PhaseBWRSEos(); // refBWRSPhase = new PhaseSrkEos(); refBWRSPhase.addComponent("methane", 1.0, 1.0, 0); diff --git a/src/main/java/neqsim/thermo/phase/PhaseDefault.java b/src/main/java/neqsim/thermo/phase/PhaseDefault.java index cd93312e95..12765a68df 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseDefault.java +++ b/src/main/java/neqsim/thermo/phase/PhaseDefault.java @@ -30,7 +30,6 @@ public PhaseDefault() {} * @param comp a {@link neqsim.thermo.component.ComponentInterface} object */ public PhaseDefault(ComponentInterface comp) { - super(); defComponent = comp; } diff --git a/src/main/java/neqsim/thermo/phase/PhaseDesmukhMather.java b/src/main/java/neqsim/thermo/phase/PhaseDesmukhMather.java index b40d6006e4..040b066716 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseDesmukhMather.java +++ b/src/main/java/neqsim/thermo/phase/PhaseDesmukhMather.java @@ -29,7 +29,6 @@ public class PhaseDesmukhMather extends PhaseGE { * */ public PhaseDesmukhMather() { - super(); } /** {@inheritDoc} */ diff --git a/src/main/java/neqsim/thermo/phase/PhaseDuanSun.java b/src/main/java/neqsim/thermo/phase/PhaseDuanSun.java index 0af4f441e5..6d2383f632 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseDuanSun.java +++ b/src/main/java/neqsim/thermo/phase/PhaseDuanSun.java @@ -27,7 +27,6 @@ public class PhaseDuanSun extends PhaseGE { * */ public PhaseDuanSun() { - super(); } /** {@inheritDoc} */ diff --git a/src/main/java/neqsim/thermo/phase/PhaseElectrolyteCPA.java b/src/main/java/neqsim/thermo/phase/PhaseElectrolyteCPA.java index a1e4f3a556..6bbea6d60b 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseElectrolyteCPA.java +++ b/src/main/java/neqsim/thermo/phase/PhaseElectrolyteCPA.java @@ -77,7 +77,6 @@ public class PhaseElectrolyteCPA extends PhaseModifiedFurstElectrolyteEos * */ public PhaseElectrolyteCPA() { - super(); } /** {@inheritDoc} */ diff --git a/src/main/java/neqsim/thermo/phase/PhaseElectrolyteCPAOld.java b/src/main/java/neqsim/thermo/phase/PhaseElectrolyteCPAOld.java index 1658ef37ee..ac113412b9 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseElectrolyteCPAOld.java +++ b/src/main/java/neqsim/thermo/phase/PhaseElectrolyteCPAOld.java @@ -48,7 +48,6 @@ public class PhaseElectrolyteCPAOld extends PhaseModifiedFurstElectrolyteEos * */ public PhaseElectrolyteCPAOld() { - super(); } /** {@inheritDoc} */ diff --git a/src/main/java/neqsim/thermo/phase/PhaseElectrolyteCPAstatoil.java b/src/main/java/neqsim/thermo/phase/PhaseElectrolyteCPAstatoil.java index 778de98fe3..2f764a5072 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseElectrolyteCPAstatoil.java +++ b/src/main/java/neqsim/thermo/phase/PhaseElectrolyteCPAstatoil.java @@ -25,7 +25,6 @@ public class PhaseElectrolyteCPAstatoil extends PhaseElectrolyteCPA { * */ public PhaseElectrolyteCPAstatoil() { - super(); } /** {@inheritDoc} */ diff --git a/src/main/java/neqsim/thermo/phase/PhaseEos.java b/src/main/java/neqsim/thermo/phase/PhaseEos.java index 94cb29f774..043eac316b 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseEos.java +++ b/src/main/java/neqsim/thermo/phase/PhaseEos.java @@ -57,7 +57,6 @@ public PhaseEos clone() { * */ public PhaseEos() { - super(); mixSelect = new EosMixingRules(); componentArray = new ComponentEosInterface[ThermodynamicModelSettings.MAX_NUMBER_OF_COMPONENTS]; mixRule = mixSelect.getMixingRule(1); @@ -121,7 +120,7 @@ public void init(double totalNumberOfMoles, int numberOfComponents, int initType Z = pressure * getMolarVolume() / (R * temperature); for (int i = 0; i < numberOfComponents; i++) { componentArray[i].Finit(this, temperature, pressure, totalNumberOfMoles, beta, - numberOfComponents, initType); + numberOfComponents, initType); } f_loc = calcf(); diff --git a/src/main/java/neqsim/thermo/phase/PhaseGE.java b/src/main/java/neqsim/thermo/phase/PhaseGE.java index 974adffbe6..bbcd0701c1 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseGE.java +++ b/src/main/java/neqsim/thermo/phase/PhaseGE.java @@ -35,7 +35,6 @@ public abstract class PhaseGE extends Phase implements PhaseGEInterface { * */ public PhaseGE() { - super(); setType(PhaseType.LIQUID); componentArray = new ComponentGEInterface[ThermodynamicModelSettings.MAX_NUMBER_OF_COMPONENTS]; useVolumeCorrection = false; diff --git a/src/main/java/neqsim/thermo/phase/PhaseGENRTL.java b/src/main/java/neqsim/thermo/phase/PhaseGENRTL.java index 8bd014d5f7..4c6e8c01c2 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseGENRTL.java +++ b/src/main/java/neqsim/thermo/phase/PhaseGENRTL.java @@ -34,7 +34,6 @@ public class PhaseGENRTL extends PhaseGE { * */ public PhaseGENRTL() { - super(); } /** @@ -50,7 +49,6 @@ public PhaseGENRTL() { */ public PhaseGENRTL(PhaseInterface phase, double[][] alpha, double[][] Dij, String[][] mixRule, double[][] intparam) { - super(); componentArray = new ComponentGeNRTL[alpha[0].length]; this.mixRule = mixRule; this.alpha = alpha; diff --git a/src/main/java/neqsim/thermo/phase/PhaseGENRTLmodifiedHV.java b/src/main/java/neqsim/thermo/phase/PhaseGENRTLmodifiedHV.java index 6ddb386f36..49c5c995a7 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseGENRTLmodifiedHV.java +++ b/src/main/java/neqsim/thermo/phase/PhaseGENRTLmodifiedHV.java @@ -29,7 +29,6 @@ public class PhaseGENRTLmodifiedHV extends PhaseGENRTL { * */ public PhaseGENRTLmodifiedHV() { - super(); mixRuleEos = mixSelect.getMixingRule(1); } diff --git a/src/main/java/neqsim/thermo/phase/PhaseGENRTLmodifiedWS.java b/src/main/java/neqsim/thermo/phase/PhaseGENRTLmodifiedWS.java index 5d0704d8bb..39124b4c9d 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseGENRTLmodifiedWS.java +++ b/src/main/java/neqsim/thermo/phase/PhaseGENRTLmodifiedWS.java @@ -20,7 +20,6 @@ public class PhaseGENRTLmodifiedWS extends PhaseGENRTLmodifiedHV { * */ public PhaseGENRTLmodifiedWS() { - super(); } /** diff --git a/src/main/java/neqsim/thermo/phase/PhaseGERG2004Eos.java b/src/main/java/neqsim/thermo/phase/PhaseGERG2004Eos.java index 40a998a4e8..a56aad720f 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseGERG2004Eos.java +++ b/src/main/java/neqsim/thermo/phase/PhaseGERG2004Eos.java @@ -40,7 +40,6 @@ public class PhaseGERG2004Eos extends PhaseEos { * */ public PhaseGERG2004Eos() { - super(); thermoPropertyModelName = "GERG-EoS 2008"; } diff --git a/src/main/java/neqsim/thermo/phase/PhaseGEUnifac.java b/src/main/java/neqsim/thermo/phase/PhaseGEUnifac.java index 8275d73433..4a421729b0 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseGEUnifac.java +++ b/src/main/java/neqsim/thermo/phase/PhaseGEUnifac.java @@ -32,7 +32,6 @@ public class PhaseGEUnifac extends PhaseGEUniquac { * */ public PhaseGEUnifac() { - super(); componentArray = new ComponentGEUnifac[ThermodynamicModelSettings.MAX_NUMBER_OF_COMPONENTS]; } diff --git a/src/main/java/neqsim/thermo/phase/PhaseGEUnifacPSRK.java b/src/main/java/neqsim/thermo/phase/PhaseGEUnifacPSRK.java index 9629aa678e..34ffe07736 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseGEUnifacPSRK.java +++ b/src/main/java/neqsim/thermo/phase/PhaseGEUnifacPSRK.java @@ -25,7 +25,6 @@ public class PhaseGEUnifacPSRK extends PhaseGEUnifac { * */ public PhaseGEUnifacPSRK() { - super(); componentArray = new ComponentGEUnifacPSRK[ThermodynamicModelSettings.MAX_NUMBER_OF_COMPONENTS]; } diff --git a/src/main/java/neqsim/thermo/phase/PhaseGEUnifacUMRPRU.java b/src/main/java/neqsim/thermo/phase/PhaseGEUnifacUMRPRU.java index 1c99290b90..48ff6398e3 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseGEUnifacUMRPRU.java +++ b/src/main/java/neqsim/thermo/phase/PhaseGEUnifacUMRPRU.java @@ -31,7 +31,6 @@ public class PhaseGEUnifacUMRPRU extends PhaseGEUnifac { * */ public PhaseGEUnifacUMRPRU() { - super(); componentArray = new ComponentGEUnifacUMRPRU[ThermodynamicModelSettings.MAX_NUMBER_OF_COMPONENTS]; } diff --git a/src/main/java/neqsim/thermo/phase/PhaseGEUniquac.java b/src/main/java/neqsim/thermo/phase/PhaseGEUniquac.java index ce2b236542..4180b1b6c3 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseGEUniquac.java +++ b/src/main/java/neqsim/thermo/phase/PhaseGEUniquac.java @@ -35,7 +35,6 @@ public class PhaseGEUniquac extends PhaseGE { * */ public PhaseGEUniquac() { - super(); componentArray = new ComponentGEInterface[ThermodynamicModelSettings.MAX_NUMBER_OF_COMPONENTS]; } @@ -52,7 +51,6 @@ public PhaseGEUniquac() { */ public PhaseGEUniquac(PhaseInterface phase, double[][] alpha, double[][] Dij, String[][] mixRule, double[][] intparam) { - super(); componentArray = new ComponentGEUniquac[alpha[0].length]; this.mixRule = mixRule; this.alpha = alpha; diff --git a/src/main/java/neqsim/thermo/phase/PhaseGEUniquacmodifiedHV.java b/src/main/java/neqsim/thermo/phase/PhaseGEUniquacmodifiedHV.java index 7a9b713151..a678bf8e58 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseGEUniquacmodifiedHV.java +++ b/src/main/java/neqsim/thermo/phase/PhaseGEUniquacmodifiedHV.java @@ -23,7 +23,6 @@ public class PhaseGEUniquacmodifiedHV extends PhaseGEUniquac { * */ public PhaseGEUniquacmodifiedHV() { - super(); } /** {@inheritDoc} */ diff --git a/src/main/java/neqsim/thermo/phase/PhaseGEWilson.java b/src/main/java/neqsim/thermo/phase/PhaseGEWilson.java index d79b79a1ea..7689a045fe 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseGEWilson.java +++ b/src/main/java/neqsim/thermo/phase/PhaseGEWilson.java @@ -24,7 +24,6 @@ public class PhaseGEWilson extends PhaseGE { * */ public PhaseGEWilson() { - super(); componentArray = new ComponentGEWilson[ThermodynamicModelSettings.MAX_NUMBER_OF_COMPONENTS]; } @@ -41,7 +40,6 @@ public PhaseGEWilson() { */ public PhaseGEWilson(PhaseInterface phase, double[][] alpha, double[][] Dij, String[][] mixRule, double[][] intparam) { - super(); componentArray = new ComponentGEWilson[alpha[0].length]; for (int i = 0; i < alpha[0].length; i++) { numberOfComponents++; diff --git a/src/main/java/neqsim/thermo/phase/PhaseKentEisenberg.java b/src/main/java/neqsim/thermo/phase/PhaseKentEisenberg.java index dce22ef66f..04c115d3c4 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseKentEisenberg.java +++ b/src/main/java/neqsim/thermo/phase/PhaseKentEisenberg.java @@ -19,7 +19,6 @@ public class PhaseKentEisenberg extends PhaseGENRTL { * */ public PhaseKentEisenberg() { - super(); } /** {@inheritDoc} */ diff --git a/src/main/java/neqsim/thermo/phase/PhaseModifiedFurstElectrolyteEos.java b/src/main/java/neqsim/thermo/phase/PhaseModifiedFurstElectrolyteEos.java index 6a5c9f3752..84c8d26932 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseModifiedFurstElectrolyteEos.java +++ b/src/main/java/neqsim/thermo/phase/PhaseModifiedFurstElectrolyteEos.java @@ -63,7 +63,6 @@ public class PhaseModifiedFurstElectrolyteEos extends PhaseSrkEos { * */ public PhaseModifiedFurstElectrolyteEos() { - super(); electrolyteMixingRule = mixSelect.getElectrolyteMixingRule(this); } diff --git a/src/main/java/neqsim/thermo/phase/PhaseModifiedFurstElectrolyteEosMod2004.java b/src/main/java/neqsim/thermo/phase/PhaseModifiedFurstElectrolyteEosMod2004.java index de1b666e99..7a732a51a4 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseModifiedFurstElectrolyteEosMod2004.java +++ b/src/main/java/neqsim/thermo/phase/PhaseModifiedFurstElectrolyteEosMod2004.java @@ -63,7 +63,6 @@ public class PhaseModifiedFurstElectrolyteEosMod2004 extends PhaseSrkEos { * */ public PhaseModifiedFurstElectrolyteEosMod2004() { - super(); electrolyteMixingRule = mixSelect.getElectrolyteMixingRule(this); } diff --git a/src/main/java/neqsim/thermo/phase/PhasePCSAFT.java b/src/main/java/neqsim/thermo/phase/PhasePCSAFT.java index 6952f1c3a1..f9d1ccb249 100644 --- a/src/main/java/neqsim/thermo/phase/PhasePCSAFT.java +++ b/src/main/java/neqsim/thermo/phase/PhasePCSAFT.java @@ -84,7 +84,6 @@ public class PhasePCSAFT extends PhaseSrkEos { * */ public PhasePCSAFT() { - super(); } /** {@inheritDoc} */ diff --git a/src/main/java/neqsim/thermo/phase/PhasePCSAFTRahmat.java b/src/main/java/neqsim/thermo/phase/PhasePCSAFTRahmat.java index 505e7005ec..87e7b49c50 100644 --- a/src/main/java/neqsim/thermo/phase/PhasePCSAFTRahmat.java +++ b/src/main/java/neqsim/thermo/phase/PhasePCSAFTRahmat.java @@ -47,7 +47,6 @@ public class PhasePCSAFTRahmat extends PhasePCSAFT { * */ public PhasePCSAFTRahmat() { - super(); } /** {@inheritDoc} */ diff --git a/src/main/java/neqsim/thermo/phase/PhasePCSAFTa.java b/src/main/java/neqsim/thermo/phase/PhasePCSAFTa.java index c9e56ab833..c148a7a20e 100644 --- a/src/main/java/neqsim/thermo/phase/PhasePCSAFTa.java +++ b/src/main/java/neqsim/thermo/phase/PhasePCSAFTa.java @@ -41,7 +41,6 @@ public class PhasePCSAFTa extends PhasePCSAFT implements PhaseCPAInterface { * */ public PhasePCSAFTa() { - super(); } /** {@inheritDoc} */ diff --git a/src/main/java/neqsim/thermo/phase/PhasePrCPA.java b/src/main/java/neqsim/thermo/phase/PhasePrCPA.java index 8a1bd7e72a..b68e572362 100644 --- a/src/main/java/neqsim/thermo/phase/PhasePrCPA.java +++ b/src/main/java/neqsim/thermo/phase/PhasePrCPA.java @@ -39,7 +39,6 @@ public class PhasePrCPA extends PhasePrEos implements PhaseCPAInterface { * */ public PhasePrCPA() { - super(); cpamix = cpaSelect.getMixingRule(1); } diff --git a/src/main/java/neqsim/thermo/phase/PhasePrEos.java b/src/main/java/neqsim/thermo/phase/PhasePrEos.java index 714f24e7fd..c65ed33dce 100644 --- a/src/main/java/neqsim/thermo/phase/PhasePrEos.java +++ b/src/main/java/neqsim/thermo/phase/PhasePrEos.java @@ -19,7 +19,6 @@ public class PhasePrEos extends PhaseEos { * */ public PhasePrEos() { - super(); thermoPropertyModelName = "PR-EoS"; uEOS = 2; wEOS = -1; diff --git a/src/main/java/neqsim/thermo/phase/PhasePrEosvolcor.java b/src/main/java/neqsim/thermo/phase/PhasePrEosvolcor.java index 02641bde54..9eb91abc6f 100644 --- a/src/main/java/neqsim/thermo/phase/PhasePrEosvolcor.java +++ b/src/main/java/neqsim/thermo/phase/PhasePrEosvolcor.java @@ -28,7 +28,6 @@ public class PhasePrEosvolcor extends PhasePrEos { * Creates new PhaseSrkEos. */ public PhasePrEosvolcor() { - super(); thermoPropertyModelName = "PR-EoS-volcorr"; } diff --git a/src/main/java/neqsim/thermo/phase/PhasePureComponentSolid.java b/src/main/java/neqsim/thermo/phase/PhasePureComponentSolid.java index 16ca81896e..2f565a87fd 100644 --- a/src/main/java/neqsim/thermo/phase/PhasePureComponentSolid.java +++ b/src/main/java/neqsim/thermo/phase/PhasePureComponentSolid.java @@ -23,7 +23,6 @@ public class PhasePureComponentSolid extends PhaseSolid { * */ public PhasePureComponentSolid() { - super(); } /** {@inheritDoc} */ diff --git a/src/main/java/neqsim/thermo/phase/PhaseRK.java b/src/main/java/neqsim/thermo/phase/PhaseRK.java index 76d8d82af9..179bd6fe45 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseRK.java +++ b/src/main/java/neqsim/thermo/phase/PhaseRK.java @@ -19,7 +19,6 @@ public class PhaseRK extends PhaseEos { * */ public PhaseRK() { - super(); // mixRule = mixSelect.getMixingRule(2); uEOS = 1; wEOS = 0; diff --git a/src/main/java/neqsim/thermo/phase/PhaseSolid.java b/src/main/java/neqsim/thermo/phase/PhaseSolid.java index a82c2299ba..aed714f06e 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseSolid.java +++ b/src/main/java/neqsim/thermo/phase/PhaseSolid.java @@ -25,7 +25,6 @@ public abstract class PhaseSolid extends PhaseSrkEos { * */ public PhaseSolid() { - super(); setType(PhaseType.SOLID); calcMolarVolume = false; } diff --git a/src/main/java/neqsim/thermo/phase/PhaseSolidComplex.java b/src/main/java/neqsim/thermo/phase/PhaseSolidComplex.java index 855527c27f..de6d26cd67 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseSolidComplex.java +++ b/src/main/java/neqsim/thermo/phase/PhaseSolidComplex.java @@ -17,7 +17,6 @@ public class PhaseSolidComplex extends PhaseSolid { * */ public PhaseSolidComplex() { - super(); setType(PhaseType.SOLIDCOMPLEX); } diff --git a/src/main/java/neqsim/thermo/phase/PhaseSrkCPA.java b/src/main/java/neqsim/thermo/phase/PhaseSrkCPA.java index be634f68a9..01d23a7041 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseSrkCPA.java +++ b/src/main/java/neqsim/thermo/phase/PhaseSrkCPA.java @@ -80,7 +80,6 @@ public class PhaseSrkCPA extends PhaseSrkEos implements PhaseCPAInterface { * */ public PhaseSrkCPA() { - super(); thermoPropertyModelName = "SRK-CPA-EoS"; } diff --git a/src/main/java/neqsim/thermo/phase/PhaseSrkCPA_proceduralMatrices.java b/src/main/java/neqsim/thermo/phase/PhaseSrkCPA_proceduralMatrices.java index 2fe73105d0..38cff3648a 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseSrkCPA_proceduralMatrices.java +++ b/src/main/java/neqsim/thermo/phase/PhaseSrkCPA_proceduralMatrices.java @@ -75,7 +75,6 @@ public class PhaseSrkCPA_proceduralMatrices extends PhaseSrkEos implements Phase * */ public PhaseSrkCPA_proceduralMatrices() { - super(); } /** {@inheritDoc} */ diff --git a/src/main/java/neqsim/thermo/phase/PhaseSrkCPAs.java b/src/main/java/neqsim/thermo/phase/PhaseSrkCPAs.java index ad925d9155..1a777f8f57 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseSrkCPAs.java +++ b/src/main/java/neqsim/thermo/phase/PhaseSrkCPAs.java @@ -21,7 +21,6 @@ public class PhaseSrkCPAs extends PhaseSrkCPA { * */ public PhaseSrkCPAs() { - super(); } /** {@inheritDoc} */ diff --git a/src/main/java/neqsim/thermo/phase/PhaseSrkCPAsOld.java b/src/main/java/neqsim/thermo/phase/PhaseSrkCPAsOld.java index dfe7a9fdd4..1d85a522a7 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseSrkCPAsOld.java +++ b/src/main/java/neqsim/thermo/phase/PhaseSrkCPAsOld.java @@ -19,7 +19,6 @@ public class PhaseSrkCPAsOld extends PhaseSrkCPAs { * */ public PhaseSrkCPAsOld() { - super(); } /** {@inheritDoc} */ diff --git a/src/main/java/neqsim/thermo/phase/PhaseSrkEos.java b/src/main/java/neqsim/thermo/phase/PhaseSrkEos.java index a6aa1e5b8a..cfabc3c268 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseSrkEos.java +++ b/src/main/java/neqsim/thermo/phase/PhaseSrkEos.java @@ -25,7 +25,6 @@ public class PhaseSrkEos extends PhaseEos { * */ public PhaseSrkEos() { - super(); // mixRule = mixSelect.getMixingRule(2); thermoPropertyModelName = "SRK-EoS"; uEOS = 1; diff --git a/src/main/java/neqsim/thermo/phase/PhaseSrkPenelouxEos.java b/src/main/java/neqsim/thermo/phase/PhaseSrkPenelouxEos.java index 5221925e54..19b311db70 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseSrkPenelouxEos.java +++ b/src/main/java/neqsim/thermo/phase/PhaseSrkPenelouxEos.java @@ -19,7 +19,6 @@ public class PhaseSrkPenelouxEos extends PhaseSrkEos { * */ public PhaseSrkPenelouxEos() { - super(); } /** {@inheritDoc} */ diff --git a/src/main/java/neqsim/thermo/phase/PhaseTSTEos.java b/src/main/java/neqsim/thermo/phase/PhaseTSTEos.java index 16b0fd8a7c..17b543b78b 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseTSTEos.java +++ b/src/main/java/neqsim/thermo/phase/PhaseTSTEos.java @@ -19,7 +19,6 @@ public class PhaseTSTEos extends PhaseEos { * */ public PhaseTSTEos() { - super(); uEOS = 2.5; wEOS = -1.5; delta1 = 1.0 + Math.sqrt(2.0); diff --git a/src/main/java/neqsim/thermo/phase/PhaseUMRCPA.java b/src/main/java/neqsim/thermo/phase/PhaseUMRCPA.java index f96a292ea4..d843cfc7d8 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseUMRCPA.java +++ b/src/main/java/neqsim/thermo/phase/PhaseUMRCPA.java @@ -92,7 +92,6 @@ public double[] getdFdNtemp() { * */ public PhaseUMRCPA() { - super(); thermoPropertyModelName = "UMR-CPA-EoS"; } diff --git a/src/main/java/neqsim/thermo/phase/PhaseWax.java b/src/main/java/neqsim/thermo/phase/PhaseWax.java index 1b900a059c..5b7235663d 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseWax.java +++ b/src/main/java/neqsim/thermo/phase/PhaseWax.java @@ -19,7 +19,6 @@ public class PhaseWax extends PhaseSolid { * */ public PhaseWax() { - super(); setType(PhaseType.WAX); } diff --git a/src/main/java/neqsim/thermo/system/SystemThermo.java b/src/main/java/neqsim/thermo/system/SystemThermo.java index a348ba5b00..63dc4cf106 100644 --- a/src/main/java/neqsim/thermo/system/SystemThermo.java +++ b/src/main/java/neqsim/thermo/system/SystemThermo.java @@ -3444,7 +3444,7 @@ public void initNumeric(int type) { public void initNumeric(int type, int phasen) { if (type < 2) { initAnalytic(type); - } else if (type >= 2) { + } else { double[][] gasfug = new double[2][getPhases()[0].getNumberOfComponents()]; double[][] liqfug = new double[2][getPhases()[0].getNumberOfComponents()]; diff --git a/src/main/java/neqsim/thermo/util/GERG/GERG2008.java b/src/main/java/neqsim/thermo/util/GERG/GERG2008.java index 2422c71b86..9263c712d7 100644 --- a/src/main/java/neqsim/thermo/util/GERG/GERG2008.java +++ b/src/main/java/neqsim/thermo/util/GERG/GERG2008.java @@ -313,7 +313,6 @@ public void DensityGERG(int iFlag, double T, double P, double[] x, doubleW D, in "Calculation failed to converge in GERG method, ideal gas density returned."; D.val = P / RGERG / T; } - return; } return; // Iteration converged } diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/SaturateWithWater.java b/src/main/java/neqsim/thermodynamicOperations/flashOps/SaturateWithWater.java index 0a785033b9..e42ea36522 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/SaturateWithWater.java +++ b/src/main/java/neqsim/thermodynamicOperations/flashOps/SaturateWithWater.java @@ -42,7 +42,7 @@ public void run() { } boolean changedMultiPhase = false; - if (system.doMultiPhaseCheck() == false) { + if (!system.doMultiPhaseCheck()) { system.setMultiPhaseCheck(true); changedMultiPhase = true; } diff --git a/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/pTphaseEnvelope.java b/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/pTphaseEnvelope.java index 8d24a775a6..135cbef097 100644 --- a/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/pTphaseEnvelope.java +++ b/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/pTphaseEnvelope.java @@ -793,7 +793,7 @@ public double tempKWilson(double beta, double P) { initTc = system.getPhase(0).getComponents()[lc].getTC(); initPc = system.getPhase(0).getComponents()[lc].getPC(); initAc = system.getPhase(0).getComponents()[lc].getAcentricFactor(); - } else if (beta > 0.5) { + } else { // closer to dew point get the heaviest component initTc = system.getPhase(0).getComponents()[hc].getTC(); initPc = system.getPhase(0).getComponents()[hc].getPC(); diff --git a/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/pTphaseEnvelopeMay.java b/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/pTphaseEnvelopeMay.java index cf3b526e2a..b5fd289d82 100644 --- a/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/pTphaseEnvelopeMay.java +++ b/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/pTphaseEnvelopeMay.java @@ -705,7 +705,7 @@ public double tempKWilson(double beta, double P) { // closer to bubble point get the lightest component initPc = system.getPhase(0).getComponents()[lc].getPC(); initAc = system.getPhase(0).getComponents()[lc].getAcentricFactor(); - } else if (beta > 0.5) { + } else { initTc = system.getPhase(0).getComponents()[hc].getTC(); // closer to dew point get the heaviest component initPc = system.getPhase(0).getComponents()[hc].getPC(); diff --git a/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/pTphaseEnvelopeNew2.java b/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/pTphaseEnvelopeNew2.java index a28b8e31bc..7151848f3f 100644 --- a/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/pTphaseEnvelopeNew2.java +++ b/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/pTphaseEnvelopeNew2.java @@ -535,7 +535,7 @@ public double tempKWilson(double beta, double P) { initTc = system.getPhase(0).getComponents()[lc].getTC(); initPc = system.getPhase(0).getComponents()[lc].getPC(); initAc = system.getPhase(0).getComponents()[lc].getAcentricFactor(); - } else if (beta > 0.5) { + } else { // closer to dew point get the heaviest component initTc = system.getPhase(0).getComponents()[hc].getTC(); initPc = system.getPhase(0).getComponents()[hc].getPC();