diff --git a/src/main/java/neqsim/fluidmechanics/flownode/FlowNode.java b/src/main/java/neqsim/fluidmechanics/flownode/FlowNode.java index 408fc67aba..887f1a6c42 100644 --- a/src/main/java/neqsim/fluidmechanics/flownode/FlowNode.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/FlowNode.java @@ -16,7 +16,6 @@ import neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.FluidBoundaryInterface; import neqsim.fluidmechanics.flownode.fluidboundary.interphasetransportcoefficient.InterphaseTransportCoefficientBaseClass; import neqsim.fluidmechanics.flownode.fluidboundary.interphasetransportcoefficient.InterphaseTransportCoefficientInterface; -import neqsim.fluidmechanics.flownode.twophasenode.TwoPhaseFlowNode; import neqsim.fluidmechanics.geometrydefinitions.GeometryDefinitionInterface; import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.system.SystemInterface; diff --git a/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/nonequilibriumfluidboundary/filmmodelboundary/reactivefilmmodel/enhancementfactor/EnhancementFactorAlg.java b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/nonequilibriumfluidboundary/filmmodelboundary/reactivefilmmodel/enhancementfactor/EnhancementFactorAlg.java index c4e537a642..e5deb6ac3c 100644 --- a/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/nonequilibriumfluidboundary/filmmodelboundary/reactivefilmmodel/enhancementfactor/EnhancementFactorAlg.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/nonequilibriumfluidboundary/filmmodelboundary/reactivefilmmodel/enhancementfactor/EnhancementFactorAlg.java @@ -11,7 +11,6 @@ * @version $Id: $Id */ public class EnhancementFactorAlg extends EnhancementFactor { - /** *

* Constructor for EnhancementFactorAlg. 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 5cb09b2b0d..ee4aa0886a 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,7 +13,6 @@ * @version $Id: $Id */ public class EnhancementFactorNumeric extends EnhancementFactor { - /** *

* Constructor for EnhancementFactorNumeric. diff --git a/src/main/java/neqsim/fluidmechanics/flowsolver/onephaseflowsolver/onephasepipeflowsolver/OnePhaseFixedStaggeredGrid.java b/src/main/java/neqsim/fluidmechanics/flowsolver/onephaseflowsolver/onephasepipeflowsolver/OnePhaseFixedStaggeredGrid.java index eec636dc03..45a6f2e14b 100644 --- a/src/main/java/neqsim/fluidmechanics/flowsolver/onephaseflowsolver/onephasepipeflowsolver/OnePhaseFixedStaggeredGrid.java +++ b/src/main/java/neqsim/fluidmechanics/flowsolver/onephaseflowsolver/onephasepipeflowsolver/OnePhaseFixedStaggeredGrid.java @@ -9,7 +9,6 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import Jama.Matrix; -import neqsim.fluidmechanics.flownode.FlowNode; import neqsim.mathlib.generalmath.TDMAsolve; /** diff --git a/src/main/java/neqsim/process/equipment/compressor/Compressor.java b/src/main/java/neqsim/process/equipment/compressor/Compressor.java index 7537fa1ce5..fa7936b407 100644 --- a/src/main/java/neqsim/process/equipment/compressor/Compressor.java +++ b/src/main/java/neqsim/process/equipment/compressor/Compressor.java @@ -357,7 +357,6 @@ public void run(UUID id) { / MW), n / (n - 1.0)); setOutletPressure(pressureRatio * getInletPressure()); - } if (useOutTemperature) diff --git a/src/main/java/neqsim/process/equipment/compressor/CompressorChartAlternativeMapLookupExtrapolate.java b/src/main/java/neqsim/process/equipment/compressor/CompressorChartAlternativeMapLookupExtrapolate.java index 58271bb7b4..8edefe0f2e 100644 --- a/src/main/java/neqsim/process/equipment/compressor/CompressorChartAlternativeMapLookupExtrapolate.java +++ b/src/main/java/neqsim/process/equipment/compressor/CompressorChartAlternativeMapLookupExtrapolate.java @@ -20,16 +20,17 @@ public class CompressorChartAlternativeMapLookupExtrapolate /** Logger object for class. */ static Logger logger = LogManager.getLogger(CompressorChartAlternativeMapLookupExtrapolate.class); - /** * {@inheritDoc} * + *

* Retrieves the closest reference speeds to the given speed from the compressor chart values. The * method returns a list containing one or two speeds: - If the given speed matches a reference * speed, the list contains only that speed. - If the given speed is between two reference speeds, * the list contains both speeds. - If the given speed is less than the lowest reference speed, * the list contains the lowest reference speed. - If the given speed is greater than the highest * reference speed, the list contains the highest reference speed. + *

*/ @Override public ArrayList getClosestRefSpeeds(double speed) { diff --git a/src/main/java/neqsim/process/equipment/heatexchanger/MultiStreamHeatExchanger.java b/src/main/java/neqsim/process/equipment/heatexchanger/MultiStreamHeatExchanger.java index 86925ba2c8..5edb27ca94 100644 --- a/src/main/java/neqsim/process/equipment/heatexchanger/MultiStreamHeatExchanger.java +++ b/src/main/java/neqsim/process/equipment/heatexchanger/MultiStreamHeatExchanger.java @@ -718,7 +718,6 @@ public void run(UUID id) { firstTime = true; } - /** * Runs the heat exchanger simulation using a specified stream approach. * @@ -729,7 +728,6 @@ public void runSpecifiedStream(UUID id) { // This method needs to be defined based on specific requirements } - public double getTemperatureApproach() { return temperatureApproach; } diff --git a/src/main/java/neqsim/process/equipment/heatexchanger/MultiStreamHeatExchangerInterface.java b/src/main/java/neqsim/process/equipment/heatexchanger/MultiStreamHeatExchangerInterface.java index c3b371dbdb..e8e104f60d 100644 --- a/src/main/java/neqsim/process/equipment/heatexchanger/MultiStreamHeatExchangerInterface.java +++ b/src/main/java/neqsim/process/equipment/heatexchanger/MultiStreamHeatExchangerInterface.java @@ -23,7 +23,6 @@ * @version 1.0 */ public interface MultiStreamHeatExchangerInterface extends ProcessEquipmentInterface { - // ================================ // Stream Management Methods // ================================ diff --git a/src/main/java/neqsim/process/equipment/stream/Stream.java b/src/main/java/neqsim/process/equipment/stream/Stream.java index 59571daf9c..0cb586863a 100644 --- a/src/main/java/neqsim/process/equipment/stream/Stream.java +++ b/src/main/java/neqsim/process/equipment/stream/Stream.java @@ -52,7 +52,6 @@ public class Stream extends ProcessEquipmentBaseClass implements StreamInterface protected double lastFlowRate = 0.0; protected double[] lastComposition = null; - /** * Constructor for Stream. * diff --git a/src/main/java/neqsim/process/equipment/util/Calculator.java b/src/main/java/neqsim/process/equipment/util/Calculator.java index 6f2fccef5e..338a610878 100644 --- a/src/main/java/neqsim/process/equipment/util/Calculator.java +++ b/src/main/java/neqsim/process/equipment/util/Calculator.java @@ -1,7 +1,6 @@ package neqsim.process.equipment.util; import java.util.ArrayList; -import java.util.Iterator; import java.util.UUID; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/neqsim/process/equipment/valve/ThrottlingValve.java b/src/main/java/neqsim/process/equipment/valve/ThrottlingValve.java index 174fb732d9..bc379aa9b4 100644 --- a/src/main/java/neqsim/process/equipment/valve/ThrottlingValve.java +++ b/src/main/java/neqsim/process/equipment/valve/ThrottlingValve.java @@ -456,7 +456,6 @@ public void run(UUID id) { thermoSystem.setPressure(thermoSystem.getPressure(pressureUnit) - deltaPressure, pressureUnit); setOutletPressure(thermoSystem.getPressure()); - } if ((thermoSystem.getPressure(pressureUnit) - pressure) < 0) { diff --git a/src/main/java/neqsim/process/processmodel/ProcessModel.java b/src/main/java/neqsim/process/processmodel/ProcessModel.java index 899fe21ab7..dac8bf6f5e 100644 --- a/src/main/java/neqsim/process/processmodel/ProcessModel.java +++ b/src/main/java/neqsim/process/processmodel/ProcessModel.java @@ -7,15 +7,10 @@ /** *

- * ProcessModel class. + * ProcessModel class. Manages a collection of processes that can be run in steps or continuously. *

- * - * Manages a collection of processes that can be run in steps or continuously. - * - * */ public class ProcessModel implements Runnable { - /** Logger object for class. */ static Logger logger = LogManager.getLogger(ProcessModel.class); private Map processes = new LinkedHashMap<>(); diff --git a/src/main/java/neqsim/thermo/characterization/PlusFractionModel.java b/src/main/java/neqsim/thermo/characterization/PlusFractionModel.java index 04a89cefc8..cc4fc09807 100644 --- a/src/main/java/neqsim/thermo/characterization/PlusFractionModel.java +++ b/src/main/java/neqsim/thermo/characterization/PlusFractionModel.java @@ -316,7 +316,6 @@ public PedersenHeavyOilPlusModel() { } class WhitsonGammaModel extends PedersenPlusModel { - /** Serialization version UID. */ private static final long serialVersionUID = 1000; public double[] zValues; diff --git a/src/main/java/neqsim/thermo/component/Component.java b/src/main/java/neqsim/thermo/component/Component.java index a81862f52b..baa5c92a34 100644 --- a/src/main/java/neqsim/thermo/component/Component.java +++ b/src/main/java/neqsim/thermo/component/Component.java @@ -1883,7 +1883,6 @@ public void setMolarMass(double value, String unit) { molarMass = refMolarMass * 1.0 / conversionFactor; } - /** {@inheritDoc} */ @Override public final boolean doSolidCheck() { diff --git a/src/main/java/neqsim/thermo/component/ComponentGEWilson.java b/src/main/java/neqsim/thermo/component/ComponentGEWilson.java index cf448d05a8..92a8f9b0d4 100644 --- a/src/main/java/neqsim/thermo/component/ComponentGEWilson.java +++ b/src/main/java/neqsim/thermo/component/ComponentGEWilson.java @@ -72,7 +72,6 @@ public double getGamma(PhaseInterface phase, int numberOfComponents, double temp public double getGamma(PhaseInterface phase, int numberOfComponents, double temperature, double pressure, PhaseType pt, double[][] HValpha, double[][] HVgij, double[][] intparam, String[][] mixRule) { - return 0.0; } diff --git a/src/main/java/neqsim/thermo/mixingrule/CPAMixingRules.java b/src/main/java/neqsim/thermo/mixingrule/CPAMixingRules.java index feaee35f33..3dc4e7d362 100644 --- a/src/main/java/neqsim/thermo/mixingrule/CPAMixingRules.java +++ b/src/main/java/neqsim/thermo/mixingrule/CPAMixingRules.java @@ -193,7 +193,6 @@ public double calcDelta(int siteNumber1, int siteNumber2, int compnumb1, int com * ((PhaseCPAInterface) phase).getGcpa(); } - public double calcDelta(int compnumb1, int compnumb2, PhaseInterface phase, double temperature, double pressure, int numbcomp) { if (assosSchemeType[compnumb1][compnumb2] == 0) { diff --git a/src/test/java/neqsim/physicalproperties/system/PhysicalPropertyModelTest.java b/src/test/java/neqsim/physicalproperties/system/PhysicalPropertyModelTest.java index e0833531b9..528cb165aa 100644 --- a/src/test/java/neqsim/physicalproperties/system/PhysicalPropertyModelTest.java +++ b/src/test/java/neqsim/physicalproperties/system/PhysicalPropertyModelTest.java @@ -14,7 +14,6 @@ void testByName() { assertEquals(PhysicalPropertyModel.WATER, PhysicalPropertyModel.byName("water")); } - @Test void testByValue() { assertEquals(PhysicalPropertyModel.AMINE, PhysicalPropertyModel.byValue(3)); diff --git a/src/test/java/neqsim/process/equipment/compressor/CompressorChartTest.java b/src/test/java/neqsim/process/equipment/compressor/CompressorChartTest.java index 2f3f17cd6c..89493921c8 100644 --- a/src/test/java/neqsim/process/equipment/compressor/CompressorChartTest.java +++ b/src/test/java/neqsim/process/equipment/compressor/CompressorChartTest.java @@ -383,5 +383,4 @@ public void runCurveTest2() { org.apache.logging.log4j.LogManager.getLogger(CompressorChartTest.class) .debug("surge flow rate " + comp1.getSurgeFlowRate()); } - } diff --git a/src/test/java/neqsim/process/equipment/compressor/CompressorTest.java b/src/test/java/neqsim/process/equipment/compressor/CompressorTest.java index 2dce2ab859..0c9dcc0943 100644 --- a/src/test/java/neqsim/process/equipment/compressor/CompressorTest.java +++ b/src/test/java/neqsim/process/equipment/compressor/CompressorTest.java @@ -296,7 +296,6 @@ public void testPowerEffSpec() { // compressor1.getOutletStream().getFluid().prettyPrint(); } - /** *

* test run with energy stream input. diff --git a/src/test/java/neqsim/process/equipment/heatexchanger/MultiStreamHeatExchangerTest.java b/src/test/java/neqsim/process/equipment/heatexchanger/MultiStreamHeatExchangerTest.java index 98bcc58a02..1e1274d36f 100644 --- a/src/test/java/neqsim/process/equipment/heatexchanger/MultiStreamHeatExchangerTest.java +++ b/src/test/java/neqsim/process/equipment/heatexchanger/MultiStreamHeatExchangerTest.java @@ -72,12 +72,10 @@ void testRun1() { assertEquals(97.992627692, heatEx.getOutStream(2).getTemperature("C"), 1e-3); assertEquals(69.477801, heatEx.getOutStream(0).getTemperature("C"), 1e-3); assertEquals(1000, heatEx.getUAvalue(), 0.1); - } @Test void testRun2() { - neqsim.process.processmodel.ProcessSystem operations = new neqsim.process.processmodel.ProcessSystem(); @@ -160,7 +158,5 @@ void testRun2() { assertEquals(-26.931795168, separator2.getFluid().getTemperature("C"), 1e-3); assertEquals(17.37650429489, heatEx.getOutStream(1).getTemperature("C"), 1e-3); - } - } diff --git a/src/test/java/neqsim/process/equipment/pump/PumpChartTest.java b/src/test/java/neqsim/process/equipment/pump/PumpChartTest.java index d65a42db91..c201e97eb8 100644 --- a/src/test/java/neqsim/process/equipment/pump/PumpChartTest.java +++ b/src/test/java/neqsim/process/equipment/pump/PumpChartTest.java @@ -2,7 +2,6 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import neqsim.process.equipment.pump.PumpChart; public class PumpChartTest { @Test diff --git a/src/test/java/neqsim/process/equipment/pump/PumpTest.java b/src/test/java/neqsim/process/equipment/pump/PumpTest.java index 4f538aabff..8904d3926c 100644 --- a/src/test/java/neqsim/process/equipment/pump/PumpTest.java +++ b/src/test/java/neqsim/process/equipment/pump/PumpTest.java @@ -2,7 +2,6 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import neqsim.process.equipment.pump.Pump; import neqsim.process.equipment.stream.Stream; /** diff --git a/src/test/java/neqsim/process/equipment/separator/SeparatorTest.java b/src/test/java/neqsim/process/equipment/separator/SeparatorTest.java index 175f23fd8f..56b326523b 100644 --- a/src/test/java/neqsim/process/equipment/separator/SeparatorTest.java +++ b/src/test/java/neqsim/process/equipment/separator/SeparatorTest.java @@ -89,7 +89,6 @@ public void testSimpleSeparator() { fluid1.setTemperature(55.0, "C"); fluid1.setPressure(55.0, "bara"); - Stream feedStream = new Stream("feed fluid", fluid1); Separator separator1 = new Separator("sep1", feedStream); @@ -98,13 +97,10 @@ public void testSimpleSeparator() { processOps.add(separator1); processOps.run(); - Assertions.assertEquals(0.06976026260, feedStream.getFluid().getPhase(PhaseType.OIL).getBeta(), 1e-5); Assertions.assertEquals(0.06976026260, separator1.getFluid().getPhase(PhaseType.OIL).getBeta(), 1e-5); - - } } diff --git a/src/test/java/neqsim/process/equipment/stream/StreamTest.java b/src/test/java/neqsim/process/equipment/stream/StreamTest.java index 2581763165..222e978e42 100644 --- a/src/test/java/neqsim/process/equipment/stream/StreamTest.java +++ b/src/test/java/neqsim/process/equipment/stream/StreamTest.java @@ -6,7 +6,6 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import neqsim.process.equipment.stream.Stream; import neqsim.process.processmodel.ProcessSystem; import neqsim.thermo.system.SystemSrkEos; diff --git a/src/test/java/neqsim/process/equipment/stream/VirtualStreamTest.java b/src/test/java/neqsim/process/equipment/stream/VirtualStreamTest.java index 588640caeb..2b672ec894 100644 --- a/src/test/java/neqsim/process/equipment/stream/VirtualStreamTest.java +++ b/src/test/java/neqsim/process/equipment/stream/VirtualStreamTest.java @@ -3,8 +3,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import neqsim.process.equipment.stream.Stream; -import neqsim.process.equipment.stream.VirtualStream; import neqsim.process.processmodel.ProcessSystem; import neqsim.thermo.system.SystemSrkEos; diff --git a/src/test/java/neqsim/process/equipment/util/FlowSetterTest.java b/src/test/java/neqsim/process/equipment/util/FlowSetterTest.java index 16d4ca8cb8..427efc734d 100644 --- a/src/test/java/neqsim/process/equipment/util/FlowSetterTest.java +++ b/src/test/java/neqsim/process/equipment/util/FlowSetterTest.java @@ -5,7 +5,6 @@ import neqsim.process.equipment.separator.ThreePhaseSeparator; import neqsim.process.equipment.stream.Stream; import neqsim.process.equipment.stream.StreamInterface; -import neqsim.process.equipment.util.FlowSetter; import neqsim.process.measurementdevice.MultiPhaseMeter; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; diff --git a/src/test/java/neqsim/process/equipment/util/GORfitterTest.java b/src/test/java/neqsim/process/equipment/util/GORfitterTest.java index d031146228..18db7cadce 100644 --- a/src/test/java/neqsim/process/equipment/util/GORfitterTest.java +++ b/src/test/java/neqsim/process/equipment/util/GORfitterTest.java @@ -3,7 +3,6 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import neqsim.process.equipment.stream.Stream; -import neqsim.process.equipment.util.GORfitter; import neqsim.process.measurementdevice.MultiPhaseMeter; import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.system.SystemInterface; diff --git a/src/test/java/neqsim/process/equipment/util/MPFMfitterTest.java b/src/test/java/neqsim/process/equipment/util/MPFMfitterTest.java index f6345d7191..0a49f91858 100644 --- a/src/test/java/neqsim/process/equipment/util/MPFMfitterTest.java +++ b/src/test/java/neqsim/process/equipment/util/MPFMfitterTest.java @@ -3,7 +3,6 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import neqsim.process.equipment.stream.Stream; -import neqsim.process.equipment.util.MPFMfitter; import neqsim.process.measurementdevice.MultiPhaseMeter; import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.system.SystemInterface; diff --git a/src/test/java/neqsim/process/measurementdevice/pHProbeTest.java b/src/test/java/neqsim/process/measurementdevice/pHProbeTest.java index 49309d9b09..0704c512ae 100644 --- a/src/test/java/neqsim/process/measurementdevice/pHProbeTest.java +++ b/src/test/java/neqsim/process/measurementdevice/pHProbeTest.java @@ -7,7 +7,6 @@ import org.junit.jupiter.api.Test; import neqsim.process.equipment.stream.Stream; import neqsim.process.equipment.stream.StreamInterface; -import neqsim.process.measurementdevice.pHProbe; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkCPAstatoil; diff --git a/src/test/java/neqsim/process/processmodel/CombinedModelsTest.java b/src/test/java/neqsim/process/processmodel/CombinedModelsTest.java index 100dd98bf0..0cdb68e55f 100644 --- a/src/test/java/neqsim/process/processmodel/CombinedModelsTest.java +++ b/src/test/java/neqsim/process/processmodel/CombinedModelsTest.java @@ -71,7 +71,6 @@ public ProcessSystem getinletModel() { }; public ProcessSystem getCompressorProcess(StreamInterface gasFeedStream) { - neqsim.process.equipment.compressor.Compressor compressor1 = new neqsim.process.equipment.compressor.Compressor("Compressor1", gasFeedStream); compressor1.setPolytropicEfficiency(0.56); @@ -89,7 +88,6 @@ public ProcessModel getCombinedModel() { ProcessSystem compressorProcess = getCompressorProcess( ((ThreePhaseSeparator) inletProcess.getUnit("1st stage separator")).getGasOutStream()); - ProcessModel combinedProcess = new ProcessModel(); combinedProcess.add("feed process", inletProcess); combinedProcess.add("compressor process", compressorProcess); @@ -122,7 +120,6 @@ public void testCombinedProcess() { ((Compressor) (fullProcess.get("compressor process")).getUnit("Compressor1")) .setOutletPressure(100.0, "bara"); - try { fullProcess.run(); } catch (Exception ex) { @@ -133,7 +130,5 @@ public void testCombinedProcess() { ((Compressor) fullProcess.get("compressor process").getUnit("Compressor1")) .getOutletStream().getTemperature("C"), 0.1); - } - } diff --git a/src/test/java/neqsim/process/processmodel/CompressorModuleTest.java b/src/test/java/neqsim/process/processmodel/CompressorModuleTest.java index ec6cca92ba..f63502093c 100644 --- a/src/test/java/neqsim/process/processmodel/CompressorModuleTest.java +++ b/src/test/java/neqsim/process/processmodel/CompressorModuleTest.java @@ -155,11 +155,9 @@ public void testProcess() { feedStream.setFlowRate(204094, "kg/hr"); operations.run(); - assertTrue(seccondStageCompressor.isSurge(seccondStageCompressor.getPolytropicFluidHead(), seccondStageCompressor.getInletStream().getFlowRate("m3/hr"))); - double pressurespeedclac = seccondStageCompressor.getOutletPressure(); double speedcomp = seccondStageCompressor.getSpeed(); diff --git a/src/test/java/neqsim/process/processmodel/LargeCombinedModelsTest.java b/src/test/java/neqsim/process/processmodel/LargeCombinedModelsTest.java index 6e09b0a21b..e2664e1c3e 100644 --- a/src/test/java/neqsim/process/processmodel/LargeCombinedModelsTest.java +++ b/src/test/java/neqsim/process/processmodel/LargeCombinedModelsTest.java @@ -35,7 +35,6 @@ public class LargeCombinedModelsTest { ProcessInput inp = new ProcessInput(); public static class ProcessInput { - private List moleRateHP; public List moleRateLP; public Double flowFirstStage = 30.0; @@ -80,7 +79,6 @@ public static void updateInput(ProcessSystem process, ProcessInput input) { * @return a ProcessSystem object representing the well stream and manifold model */ public ProcessSystem getWellStreamAndManifoldModel(SystemInterface feedFluid) { - ProcessSystem process = new ProcessSystem(); Stream wellStreamHP = new Stream("HP well stream", feedFluid.clone()); @@ -144,7 +142,6 @@ public void testWellStreamAndManifoldModel() { - ((Splitter) process.getUnit("LP manifold")).getSplitStream(0).getFlowRate("kg/hr") - ((Splitter) process.getUnit("LP manifold")).getSplitStream(1).getFlowRate("kg/hr"), ((Stream) process.getUnit("LP well stream")).getFlowRate("kg/hr") / 10000.0); - } /** @@ -156,7 +153,6 @@ public void testWellStreamAndManifoldModel() { */ public ProcessSystem createSeparationTrainProcess(StreamInterface firstStageStream, StreamInterface seccondStageStream) { - ProcessSystem process = new ProcessSystem(); Heater feedTPsetterFirstStage = new Heater("feed TP setter", firstStageStream); @@ -451,8 +447,6 @@ public void testSeparationTrainProcess() { public ProcessSystem createExpanderProcessModel(Separator dewPointScrubber2, ThreePhaseSeparator fourthStageSeparator, Mixer secondstagegasmixer, Mixer firststagegasmixer, Mixer mpLiqmixer) { - - ProcessSystem process = new ProcessSystem(); EnergyStream expander_energy_stream = @@ -826,7 +820,6 @@ public ProcessSystem getExportCopressorModel(StreamInterface feedStream) { @Test public void testExportCompressorModel() { - SystemInterface gasFluid = new SystemPrEos(273.15 + 20.0, 10.0); gasFluid.addComponent("methane", 0.9); gasFluid.addComponent("ethane", 0.1); @@ -843,7 +836,6 @@ public void testExportCompressorModel() { Assertions.assertEquals(12, ((Splitter) exportCompressorSystem.getUnit("TEE-104")) .getSplitStream(0).getFlowRate("MSm3/day"), 0.1); - } public ProcessModel getCombinedModel() { @@ -1014,7 +1006,6 @@ public void testCombinedProcessRunStep() { ((Compressor) fullProcess.get("compressor process B").getUnit("KA27841")).getOutletStream() .getPressure("bara"), 1.5); - } // @Test @@ -1028,7 +1019,6 @@ public void testCombinedProcess() { logger.debug(ex.getMessage(), ex); } - Assertions.assertEquals(0.0, ((Stream) fullProcess.get("well and manifold process").getUnit("HP well stream")) .getFlowRate("kg/hr") @@ -1130,7 +1120,6 @@ public void testCombinedProcess() { ((Compressor) fullProcess.get("compressor process B").getUnit("KA27841")).getOutletStream() .getPressure("bara"), 0.5); - } // @Test @@ -1189,12 +1178,10 @@ public void testCombinedProcessAsThread2() { } } catch (InterruptedException e) { logger.debug("Thread was interrupted: " + e.getMessage()); - } catch (Exception e) { logger.debug("Thread interrupted: " + e.getMessage()); } - // ProcessSystem expProcessA = fullProcess.get("expander process A"); // Thread expProcessThreadA = expProcessA.runAsThread(); @@ -1291,7 +1278,5 @@ public void testCombinedProcessAsThread() { ((Compressor) fullProcess.get("compressor process B").getUnit("KA27841")).getOutletStream() .getPressure("bara"), 0.5); - } - } diff --git a/src/test/java/neqsim/process/processmodel/ProcessSystemRunTransientTest.java b/src/test/java/neqsim/process/processmodel/ProcessSystemRunTransientTest.java index b6c4b935ea..26ed0b6870 100644 --- a/src/test/java/neqsim/process/processmodel/ProcessSystemRunTransientTest.java +++ b/src/test/java/neqsim/process/processmodel/ProcessSystemRunTransientTest.java @@ -770,7 +770,6 @@ public void testAntiSurgeControl() { @Test public void testValveRegulator() { - neqsim.thermo.system.SystemSrkEos fluid1 = new neqsim.thermo.system.SystemSrkEos((273.15 + 25.0), 10.00); fluid1.addComponent("methane", 0.900); diff --git a/src/test/java/neqsim/process/processmodel/ProcessSystemTest.java b/src/test/java/neqsim/process/processmodel/ProcessSystemTest.java index 61492b281b..71240554ea 100644 --- a/src/test/java/neqsim/process/processmodel/ProcessSystemTest.java +++ b/src/test/java/neqsim/process/processmodel/ProcessSystemTest.java @@ -589,7 +589,6 @@ public void runTEGProcessTest2() { 1e-6); } - @Test public void testRun_step() { neqsim.thermo.system.SystemInterface feedGas = diff --git a/src/test/java/neqsim/process/processmodel/ReferenceProcessTest.java b/src/test/java/neqsim/process/processmodel/ReferenceProcessTest.java index 62c2e161e9..3f50a67370 100644 --- a/src/test/java/neqsim/process/processmodel/ReferenceProcessTest.java +++ b/src/test/java/neqsim/process/processmodel/ReferenceProcessTest.java @@ -6,7 +6,6 @@ import neqsim.thermo.system.SystemSrkEos; public class ReferenceProcessTest extends neqsim.NeqSimTest { - @Test public void testProcess() { SystemInterface thermoSystem = new SystemSrkEos(298.0, 10.0); @@ -46,18 +45,18 @@ public void testProcess() { wellStream.setPressure(90.0, "bara"); neqsim.process.equipment.separator.ThreePhaseSeparator firstStageSeparator = - new neqsim.process.equipment.separator.ThreePhaseSeparator( - "1st stage separator", wellStream); + new neqsim.process.equipment.separator.ThreePhaseSeparator("1st stage separator", + wellStream); neqsim.process.equipment.heatexchanger.Heater oilHeaterSecondStage = - new neqsim.process.equipment.heatexchanger.Heater( - "oil heater second stage", firstStageSeparator.getOilOutStream()); + new neqsim.process.equipment.heatexchanger.Heater("oil heater second stage", + firstStageSeparator.getOilOutStream()); oilHeaterSecondStage.setOutPressure(30.0); oilHeaterSecondStage.setOutTemperature(68.0, "C"); neqsim.process.equipment.separator.ThreePhaseSeparator secondStageSeparator = - new neqsim.process.equipment.separator.ThreePhaseSeparator( - "2nd stage separator", oilHeaterSecondStage.getOutletStream()); + new neqsim.process.equipment.separator.ThreePhaseSeparator("2nd stage separator", + oilHeaterSecondStage.getOutletStream()); neqsim.process.equipment.heatexchanger.Heater oilHeaterThirdStage = new neqsim.process.equipment.heatexchanger.Heater("oil heater third stage", @@ -66,18 +65,18 @@ public void testProcess() { oilHeaterThirdStage.setOutTemperature(70.0, "C"); neqsim.process.equipment.separator.ThreePhaseSeparator thirdStageSeparator = - new neqsim.process.equipment.separator.ThreePhaseSeparator( - "3rd stage separator", oilHeaterThirdStage.getOutletStream()); + new neqsim.process.equipment.separator.ThreePhaseSeparator("3rd stage separator", + oilHeaterThirdStage.getOutletStream()); neqsim.process.equipment.heatexchanger.Heater oilHeaterStandardStage = - new neqsim.process.equipment.heatexchanger.Heater( - "oil heater standard stage", thirdStageSeparator.getOilOutStream()); + new neqsim.process.equipment.heatexchanger.Heater("oil heater standard stage", + thirdStageSeparator.getOilOutStream()); oilHeaterStandardStage.setOutPressure(1.01325); oilHeaterStandardStage.setOutTemperature(15.0, "C"); neqsim.process.equipment.separator.ThreePhaseSeparator standardStageSeparator = - new neqsim.process.equipment.separator.ThreePhaseSeparator( - "standard stage separator", oilHeaterStandardStage.getOutletStream()); + new neqsim.process.equipment.separator.ThreePhaseSeparator("standard stage separator", + oilHeaterStandardStage.getOutletStream()); neqsim.process.equipment.mixer.Mixer gasMixer = new neqsim.process.equipment.mixer.Mixer("gas mixer"); @@ -87,12 +86,10 @@ public void testProcess() { gasMixer.addStream(standardStageSeparator.getGasOutStream()); gasMixer.setOutTemperature(288.15); - neqsim.process.equipment.stream.Stream exportoil = - new neqsim.process.equipment.stream.Stream("export oil", - standardStageSeparator.getOilOutStream()); + neqsim.process.equipment.stream.Stream exportoil = new neqsim.process.equipment.stream.Stream( + "export oil", standardStageSeparator.getOilOutStream()); neqsim.process.equipment.stream.Stream exportgas = - new neqsim.process.equipment.stream.Stream("export gas", - gasMixer.getOutletStream()); + new neqsim.process.equipment.stream.Stream("export gas", gasMixer.getOutletStream()); neqsim.process.processmodel.ProcessSystem oilprocess = new neqsim.process.processmodel.ProcessSystem(); diff --git a/src/test/java/neqsim/process/processmodel/SalesGasAndStableOilTest.java b/src/test/java/neqsim/process/processmodel/SalesGasAndStableOilTest.java index 9aef10e6b2..fa51434c9b 100644 --- a/src/test/java/neqsim/process/processmodel/SalesGasAndStableOilTest.java +++ b/src/test/java/neqsim/process/processmodel/SalesGasAndStableOilTest.java @@ -100,7 +100,6 @@ public void testProcess2() { oilHeaterFromFirstStage.setOutTemperature(80.0, "C"); oilHeaterFromFirstStage.run(); - ThreePhaseSeparator secondStageSeparator = new neqsim.process.equipment.separator.ThreePhaseSeparator("2nd stage separator", oilHeaterFromFirstStage.getOutStream()); @@ -158,7 +157,6 @@ public void testProcess2() { firstStageCooler.setOutTemperature(28.9, "C"); firstStageCooler.run(); - Separator firstStageScrubber = new neqsim.process.equipment.separator.Separator( "1st stage scrubber", firstStageCooler.getOutStream()); firstStageScrubber.run(); @@ -291,16 +289,7 @@ public void testProcess2() { // DPCUScrubber.getFluid().prettyPrint(); // richGasMixer.getOutStream().getFluid().prettyPrint(); - - /* - * - * - * - * - * - * - * * hpResycle = jneqsim.process.equipment.util.Recycle("HP liq resycle") * hpResycle.addStream(hpLiqmixer.getOutStream()) hpResycle.setOutletStream(oilFirstStage) * hpResycle.setTolerance(1e-2) @@ -331,7 +320,5 @@ public void testProcess2() { * :75.0, 'ngl_routing_to_oil': 0.1, 'TEXcompOutPressure': 47.0, 'KA27831A_outpressure': 95.3, * 'KA27831B_outpressure':95.3, 'KA27841A_outpressure': 150.5, 'KA27841B_outpressure':150.5, */ - } - } diff --git a/src/test/java/neqsim/process/util/report/ReportTest.java b/src/test/java/neqsim/process/util/report/ReportTest.java index 01a8dc43e2..90d66f8f9b 100644 --- a/src/test/java/neqsim/process/util/report/ReportTest.java +++ b/src/test/java/neqsim/process/util/report/ReportTest.java @@ -7,7 +7,6 @@ import neqsim.process.equipment.stream.Stream; import neqsim.process.equipment.valve.ThrottlingValve; import neqsim.process.processmodel.ProcessSystem; -import neqsim.process.util.report.Report; import neqsim.thermo.system.SystemSrkEos; public class ReportTest { diff --git a/src/test/java/neqsim/thermo/characterization/PlusFractionModelTest.java b/src/test/java/neqsim/thermo/characterization/PlusFractionModelTest.java index 59a97feaa5..2268f3a70e 100644 --- a/src/test/java/neqsim/thermo/characterization/PlusFractionModelTest.java +++ b/src/test/java/neqsim/thermo/characterization/PlusFractionModelTest.java @@ -8,7 +8,6 @@ import neqsim.thermodynamicoperations.ThermodynamicOperations; public class PlusFractionModelTest { - @Test void testPedersenPlusModelCharacterization() { SystemInterface thermoSystem = null; @@ -190,6 +189,5 @@ void testC6C7PlusModel() { // heavier components assertEquals(16, thermoSystem.getNumberOfComponents()); - } } diff --git a/src/test/java/neqsim/thermo/component/NewComponentTest.java b/src/test/java/neqsim/thermo/component/NewComponentTest.java index 14bb4db0c6..40bb28dfcd 100644 --- a/src/test/java/neqsim/thermo/component/NewComponentTest.java +++ b/src/test/java/neqsim/thermo/component/NewComponentTest.java @@ -159,7 +159,6 @@ public void testComponentsulfuric_acid() { assertEquals(3.447289881042099E-6, thermoSystem.getPhase(0).getComponent("sulfuric acid").getx(), 100e-9); - thermoSystem = new SystemSrkEos(273.15 + 25.0, 100.6); thermoSystem.addComponent("nitric acid", 1.0); thermoSystem.addComponent("CO2", 1.0); diff --git a/src/test/java/neqsim/thermo/mixingrule/EosMixingRulesTest.java b/src/test/java/neqsim/thermo/mixingrule/EosMixingRulesTest.java index d24b262457..016dd84da6 100644 --- a/src/test/java/neqsim/thermo/mixingrule/EosMixingRulesTest.java +++ b/src/test/java/neqsim/thermo/mixingrule/EosMixingRulesTest.java @@ -9,14 +9,9 @@ * Test class for verifying the behavior of EOS (Equation of State) mixing rules in the NeqSim * library. */ -/** - * This class contains unit tests for verifying the behavior of different mixing rules in the neqsim - * thermodynamic system. - */ public class EosMixingRulesTest { @Test void testSetMixingRuleName() { - neqsim.thermo.system.SystemPrEos testSystem = new neqsim.thermo.system.SystemPrEos(298.0, 10.0); testSystem.addComponent("nitrogen", 0.01); testSystem.addComponent("CO2", 0.01); @@ -25,8 +20,6 @@ void testSetMixingRuleName() { testSystem.changeComponentName(testSystem.getComponent(1).getName(), (testSystem.getComponent(1).getName() + "__well1")); - - testSystem.addComponent("nitrogen", 0.01); testSystem.addComponent("CO2", 0.01); testSystem.changeComponentName(testSystem.getComponent(2).getName(), @@ -34,7 +27,6 @@ void testSetMixingRuleName() { testSystem.changeComponentName(testSystem.getComponent(3).getName(), (testSystem.getComponent(3).getName() + "__well2")); - testSystem.setMixingRule("classic"); double kij = @@ -45,12 +37,10 @@ void testSetMixingRuleName() { // Print kij assertEquals(-0.019997, kij, 1e-5); assertTrue(kij == kij2); - } @Test void testMEGOil() { - neqsim.thermo.system.SystemSrkCPAstatoil testSystem = new neqsim.thermo.system.SystemSrkCPAstatoil(298.0, 10.0); testSystem.addTBPfraction("C8", 0.01, 90.9 / 1000.0, 0.9); @@ -63,12 +53,10 @@ void testMEGOil() { // Print kij assertEquals(-0.05, kij, 1e-5); - } @Test void testHCoilInter() { - neqsim.thermo.system.SystemPrEos testSystem = new neqsim.thermo.system.SystemPrEos(298.0, 10.0); testSystem.addTBPfraction("C8", 0.01, 90.9 / 1000.0, 0.9); testSystem.addComponent("CO2", 0.01); @@ -77,7 +65,6 @@ void testHCoilInter() { testSystem.changeComponentName(testSystem.getComponent(1).getName(), (testSystem.getComponent(1).getName() + "__well1")); - testSystem.addTBPfraction("C8", 0.01, 90.9 / 1000.0, 0.9); testSystem.addComponent("CO2", 0.01); testSystem.changeComponentName(testSystem.getComponent(2).getName(), diff --git a/src/test/java/neqsim/thermo/system/AcidTest.java b/src/test/java/neqsim/thermo/system/AcidTest.java index c932d2c0a6..a4cd98932f 100644 --- a/src/test/java/neqsim/thermo/system/AcidTest.java +++ b/src/test/java/neqsim/thermo/system/AcidTest.java @@ -54,15 +54,13 @@ public void testtestBubpAcid() { assertEquals(33.2215005, testSystem.getPressure(), 0.001); assertEquals(928.60315, testSystem.getDensity("kg/m3"), 0.001); - double t = 373.0; double vapp = Math.exp(50.323 + -5378.2 / t + -4.2030 * Math.log(t) + 3.4697e-6 * Math.pow(t, 2)) / 1e5; assertEquals(0.9857520491, vapp, 0.001); - double dens = 1.938 / (0.24225 * (1 + Math.pow(1 - t / 588, 0.24435)));// * 46.025; - + // double dens = 1.938 / (0.24225 * (1 + Math.pow(1 - t / 588, 0.24435)));// * 46.025; // assertEquals(1002.54762, dens, 0.001); String scheme = @@ -90,7 +88,6 @@ public void testtestBubpAcid() { assertEquals(0.3338, m); } - /** *

* testtestBubpAcid. @@ -114,15 +111,13 @@ public void testtestBubpaceticacid() { assertEquals(0.999088711628, testSystem.getPressure(), 0.001); assertEquals(817.50556, testSystem.getDensity("kg/m3"), 0.001); - double t = 373.0; double vapp = Math.exp(50.323 + -5378.2 / t + -4.2030 * Math.log(t) + 3.4697e-6 * Math.pow(t, 2)) / 1e5; assertEquals(0.9857520491, vapp, 0.001); - double dens = 1.938 / (0.24225 * (1 + Math.pow(1 - t / 588, 0.24435)));// * 46.025; - + // double dens = 1.938 / (0.24225 * (1 + Math.pow(1 - t / 588, 0.24435)));// * 46.025; // assertEquals(1002.54762, dens, 0.001); String scheme = testSystem.getPhase(PhaseType.AQUEOUS).getComponent(0).getAssociationScheme(); diff --git a/src/test/java/neqsim/thermo/util/gerg/GERG2008Test.java b/src/test/java/neqsim/thermo/util/gerg/GERG2008Test.java index de3c4fb537..896eac018c 100644 --- a/src/test/java/neqsim/thermo/util/gerg/GERG2008Test.java +++ b/src/test/java/neqsim/thermo/util/gerg/GERG2008Test.java @@ -8,8 +8,6 @@ import org.netlib.util.doubleW; import org.netlib.util.intW; - - public class GERG2008Test { private GERG2008 gerg; @@ -94,6 +92,5 @@ public void testPropertiesGERG() { assertTrue(Kappa.val != 0); assertTrue(A.val != 0); assertEquals(0.83232372466, Z.val, 1e-5); - } } diff --git a/src/test/java/neqsim/thermo/util/readwrite/EclipseFluidReadWriteTest.java b/src/test/java/neqsim/thermo/util/readwrite/EclipseFluidReadWriteTest.java index 2db8b750a3..abd4a7686d 100644 --- a/src/test/java/neqsim/thermo/util/readwrite/EclipseFluidReadWriteTest.java +++ b/src/test/java/neqsim/thermo/util/readwrite/EclipseFluidReadWriteTest.java @@ -114,6 +114,5 @@ void testReadFluidR() throws IOException { testOps.TPflash(); // testSystem.prettyPrint(); // Assertions.assertEquals(0.9270363530, testSystem.getBeta(0), 1e-6); - } } diff --git a/src/test/java/neqsim/thermodynamicoperations/flashops/TPgradientFlashTest.java b/src/test/java/neqsim/thermodynamicoperations/flashops/TPgradientFlashTest.java index 06a6a8ed00..9959027f55 100644 --- a/src/test/java/neqsim/thermodynamicoperations/flashops/TPgradientFlashTest.java +++ b/src/test/java/neqsim/thermodynamicoperations/flashops/TPgradientFlashTest.java @@ -38,8 +38,7 @@ void testRun() { @Test void testGradient() { - - double depth = 1000.0; + // double depth = 1000.0; double temperature = 273.15 + 70; double pressure = 80.0; @@ -50,7 +49,6 @@ void testGradient() { testSystem.addComponent("hydrogen", 1.0); testSystem.addComponent("methane", 8.0); testSystem.addComponent("propane", 1.0); - testSystem.createDatabase(true); testSystem.setMixingRule(2); @@ -70,7 +68,5 @@ void testGradient() { // .println(newSystem.getComponent("hydrogen").getx() + " " + newSystem.getPressure()); } assertEquals(0.0964169380341, x_h2.get(6), 1e-4); - } - }