@@ -77,10 +78,9 @@ public double calcInterphaseMassTransferCoefficient(int phase, double schmidtNum double massTrans = 0; if (phase == 1) { // massTrans = 0.0002; - redMassTrans = - 0.0051 * Math.pow(node.getReynoldsNumber(phase), 0.67) * Math.pow(schmidtNumber, -0.5) - * Math.pow(node.getGeometry().getPacking().getSurfaceAreaPrVolume() - * node.getGeometry().getPacking().getSize(), 0.4); + redMassTrans = 0.0051 * Math.pow(node.getReynoldsNumber(phase), 0.67) * Math.pow(schmidtNumber, -0.5) + * Math.pow(node.getGeometry().getPacking().getSurfaceAreaPrVolume() + * node.getGeometry().getPacking().getSize(), 0.4); massTrans = redMassTrans * Math.pow( node.getBulkSystem().getPhases()[phase].getPhysicalProperties().getKinematicViscosity() * gravity, @@ -88,10 +88,9 @@ public double calcInterphaseMassTransferCoefficient(int phase, double schmidtNum System.out.println("mas trans liq " + massTrans); } if (phase == 0) { - redMassTrans = - 3.6 * Math.pow(node.getReynoldsNumber(phase), 0.7) * Math.pow(schmidtNumber, 0.33) - * Math.pow(node.getGeometry().getPacking().getSurfaceAreaPrVolume() - * node.getGeometry().getPacking().getSize(), -2.0); + redMassTrans = 3.6 * Math.pow(node.getReynoldsNumber(phase), 0.7) * Math.pow(schmidtNumber, 0.33) + * Math.pow(node.getGeometry().getPacking().getSurfaceAreaPrVolume() + * node.getGeometry().getPacking().getSize(), -2.0); massTrans = redMassTrans * node.getGeometry().getPacking().getSurfaceAreaPrVolume() * node.getBulkSystem().getPhases()[phase].getPhysicalProperties().getKinematicViscosity() / schmidtNumber; diff --git a/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/interphasetransportcoefficient/interphasetwophase/interphaseReactorFlow/InterphaseReactorFlow.java b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/interphasetransportcoefficient/interphasetwophase/interphasereactorflow/InterphaseReactorFlow.java similarity index 87% rename from src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/interphasetransportcoefficient/interphasetwophase/interphaseReactorFlow/InterphaseReactorFlow.java rename to src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/interphasetransportcoefficient/interphasetwophase/interphasereactorflow/InterphaseReactorFlow.java index 60e75eb0a..b7c59f582 100644 --- a/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/interphasetransportcoefficient/interphasetwophase/interphaseReactorFlow/InterphaseReactorFlow.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/interphasetransportcoefficient/interphasetwophase/interphasereactorflow/InterphaseReactorFlow.java @@ -1,4 +1,4 @@ -package neqsim.fluidmechanics.flownode.fluidboundary.interphasetransportcoefficient.interphasetwophase.interphaseReactorFlow; +package neqsim.fluidmechanics.flownode.fluidboundary.interphasetransportcoefficient.interphasetwophase.interphasereactorflow; import neqsim.fluidmechanics.flownode.FlowNodeInterface; import neqsim.fluidmechanics.flownode.fluidboundary.interphasetransportcoefficient.interphasetwophase.InterphaseTwoPhase; @@ -17,7 +17,8 @@ public class InterphaseReactorFlow extends InterphaseTwoPhase { * Constructor for InterphaseReactorFlow. *
*/ - public InterphaseReactorFlow() {} + public InterphaseReactorFlow() { + } /** *diff --git a/src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasereactorflownode/TwoPhasePackedBedFlowNode.java b/src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasereactorflownode/TwoPhasePackedBedFlowNode.java index 41c92225f..f8c5a86da 100644 --- a/src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasereactorflownode/TwoPhasePackedBedFlowNode.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasereactorflownode/TwoPhasePackedBedFlowNode.java @@ -1,7 +1,7 @@ package neqsim.fluidmechanics.flownode.twophasenode.twophasereactorflownode; import neqsim.fluidmechanics.flownode.FlowNodeInterface; -import neqsim.fluidmechanics.flownode.fluidboundary.interphasetransportcoefficient.interphasetwophase.interphaseReactorFlow.InterphasePackedBed; +import neqsim.fluidmechanics.flownode.fluidboundary.interphasetransportcoefficient.interphasetwophase.interphasereactorflow.InterphasePackedBed; import neqsim.fluidmechanics.flownode.twophasenode.TwoPhaseFlowNode; import neqsim.fluidmechanics.geometrydefinitions.GeometryDefinitionInterface; import neqsim.fluidmechanics.geometrydefinitions.reactor.ReactorData; @@ -35,16 +35,16 @@ public TwoPhasePackedBedFlowNode() { *
* * @param system a {@link neqsim.thermo.system.SystemInterface} object - * @param pipe a {@link neqsim.fluidmechanics.geometrydefinitions.GeometryDefinitionInterface} - * object + * @param pipe a + * {@link neqsim.fluidmechanics.geometrydefinitions.GeometryDefinitionInterface} + * object */ public TwoPhasePackedBedFlowNode(SystemInterface system, GeometryDefinitionInterface pipe) { super(system, pipe); this.flowNodeType = "packed bed"; this.interphaseTransportCoefficient = new InterphasePackedBed(this); - this.fluidBoundary = - new neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.nonequilibriumfluidboundary.filmmodelboundary.KrishnaStandartFilmModel( - this); + this.fluidBoundary = new neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.nonequilibriumfluidboundary.filmmodelboundary.KrishnaStandartFilmModel( + this); } /** @@ -52,19 +52,19 @@ public TwoPhasePackedBedFlowNode(SystemInterface system, GeometryDefinitionInter * Constructor for TwoPhasePackedBedFlowNode. * * - * @param system a {@link neqsim.thermo.system.SystemInterface} object + * @param system a {@link neqsim.thermo.system.SystemInterface} object * @param interphaseSystem a {@link neqsim.thermo.system.SystemInterface} object - * @param pipe a {@link neqsim.fluidmechanics.geometrydefinitions.GeometryDefinitionInterface} - * object + * @param pipe a + * {@link neqsim.fluidmechanics.geometrydefinitions.GeometryDefinitionInterface} + * object */ public TwoPhasePackedBedFlowNode(SystemInterface system, SystemInterface interphaseSystem, GeometryDefinitionInterface pipe) { super(system, pipe); this.flowNodeType = "packed bed"; this.interphaseTransportCoefficient = new InterphasePackedBed(this); - this.fluidBoundary = - new neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.nonequilibriumfluidboundary.filmmodelboundary.KrishnaStandartFilmModel( - this); + this.fluidBoundary = new neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.nonequilibriumfluidboundary.filmmodelboundary.KrishnaStandartFilmModel( + this); } /** {@inheritDoc} */ @@ -106,14 +106,12 @@ public double calcHydraulicDiameter() { /** {@inheritDoc} */ @Override public double calcReynoldNumber() { - reynoldsNumber[1] = - getSuperficialVelocity(1) / getGeometry().getPacking().getSurfaceAreaPrVolume() - * bulkSystem.getPhases()[1].getPhysicalProperties().getDensity() - / bulkSystem.getPhases()[1].getPhysicalProperties().getViscosity(); - reynoldsNumber[0] = - getSuperficialVelocity(0) / getGeometry().getPacking().getSurfaceAreaPrVolume() - * bulkSystem.getPhases()[0].getPhysicalProperties().getDensity() - / bulkSystem.getPhases()[0].getPhysicalProperties().getViscosity(); + reynoldsNumber[1] = getSuperficialVelocity(1) / getGeometry().getPacking().getSurfaceAreaPrVolume() + * bulkSystem.getPhases()[1].getPhysicalProperties().getDensity() + / bulkSystem.getPhases()[1].getPhysicalProperties().getViscosity(); + reynoldsNumber[0] = getSuperficialVelocity(0) / getGeometry().getPacking().getSurfaceAreaPrVolume() + * bulkSystem.getPhases()[0].getPhysicalProperties().getDensity() + / bulkSystem.getPhases()[0].getPhysicalProperties().getViscosity(); System.out.println("rey liq " + reynoldsNumber[1]); System.out.println("rey gas " + reynoldsNumber[0]); return reynoldsNumber[1]; @@ -122,8 +120,7 @@ public double calcReynoldNumber() { /** {@inheritDoc} */ @Override public double calcContactLength() { - interphaseContactArea = - pipe.getPacking().getSurfaceAreaPrVolume() * getLengthOfNode() * pipe.getArea(); + interphaseContactArea = pipe.getPacking().getSurfaceAreaPrVolume() * getLengthOfNode() * pipe.getArea(); return wallContactLength[0]; } @@ -152,8 +149,8 @@ public void update() { for (int componentNumber = 0; componentNumber < getBulkSystem().getPhases()[0] .getNumberOfComponents(); componentNumber++) { if (componentNumber == 1) { - double liquidMolarRate = - getFluidBoundary().getInterphaseMolarFlux(componentNumber) * getInterphaseContactArea(); // getInterphaseContactLength(0)*getGeometry().getNodeLength(); + double liquidMolarRate = getFluidBoundary().getInterphaseMolarFlux(componentNumber) + * getInterphaseContactArea(); // getInterphaseContactLength(0)*getGeometry().getNodeLength(); double gasMolarRate = -getFluidBoundary().getInterphaseMolarFlux(componentNumber) * getInterphaseContactArea(); // getInterphaseContactLength(0)*getGeometry().getNodeLength(); System.out.println("liquidMolarRate" + liquidMolarRate); diff --git a/src/main/java/neqsim/physicalproperties/util/parameterFitting/pureComponentParameterFitting/purecompinterfacetension/ParachorFunction.java b/src/main/java/neqsim/physicalproperties/util/parameterfitting/purecomponentparameterfitting/purecompinterfacetension/ParachorFunction.java similarity index 91% rename from src/main/java/neqsim/physicalproperties/util/parameterFitting/pureComponentParameterFitting/purecompinterfacetension/ParachorFunction.java rename to src/main/java/neqsim/physicalproperties/util/parameterfitting/purecomponentparameterfitting/purecompinterfacetension/ParachorFunction.java index 227f5880c..53b513eb0 100644 --- a/src/main/java/neqsim/physicalproperties/util/parameterFitting/pureComponentParameterFitting/purecompinterfacetension/ParachorFunction.java +++ b/src/main/java/neqsim/physicalproperties/util/parameterfitting/purecomponentparameterfitting/purecompinterfacetension/ParachorFunction.java @@ -1,4 +1,4 @@ -package neqsim.physicalproperties.util.parameterFitting.pureComponentParameterFitting.purecompinterfacetension; +package neqsim.physicalproperties.util.parameterfitting.purecomponentparameterfitting.purecompinterfacetension; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/neqsim/physicalproperties/util/parameterFitting/pureComponentParameterFitting/purecompinterfacetension/TestParachorFit.java b/src/main/java/neqsim/physicalproperties/util/parameterfitting/purecomponentparameterfitting/purecompinterfacetension/TestParachorFit.java similarity index 96% rename from src/main/java/neqsim/physicalproperties/util/parameterFitting/pureComponentParameterFitting/purecompinterfacetension/TestParachorFit.java rename to src/main/java/neqsim/physicalproperties/util/parameterfitting/purecomponentparameterfitting/purecompinterfacetension/TestParachorFit.java index 2defe1ca2..22cd962a3 100644 --- a/src/main/java/neqsim/physicalproperties/util/parameterFitting/pureComponentParameterFitting/purecompinterfacetension/TestParachorFit.java +++ b/src/main/java/neqsim/physicalproperties/util/parameterfitting/purecomponentparameterfitting/purecompinterfacetension/TestParachorFit.java @@ -1,4 +1,4 @@ -package neqsim.physicalproperties.util.parameterFitting.pureComponentParameterFitting.purecompinterfacetension; +package neqsim.physicalproperties.util.parameterfitting.purecomponentparameterfitting.purecompinterfacetension; import java.sql.ResultSet; import java.util.ArrayList; diff --git a/src/main/java/neqsim/physicalproperties/util/parameterFitting/pureComponentParameterFitting/purecompviscosity/chungMethod/ChungFunction.java b/src/main/java/neqsim/physicalproperties/util/parameterfitting/purecomponentparameterfitting/purecompviscosity/chungmethod/ChungFunction.java similarity index 88% rename from src/main/java/neqsim/physicalproperties/util/parameterFitting/pureComponentParameterFitting/purecompviscosity/chungMethod/ChungFunction.java rename to src/main/java/neqsim/physicalproperties/util/parameterfitting/purecomponentparameterfitting/purecompviscosity/chungmethod/ChungFunction.java index 735fc8540..df1c69edb 100644 --- a/src/main/java/neqsim/physicalproperties/util/parameterFitting/pureComponentParameterFitting/purecompviscosity/chungMethod/ChungFunction.java +++ b/src/main/java/neqsim/physicalproperties/util/parameterfitting/purecomponentparameterfitting/purecompviscosity/chungmethod/ChungFunction.java @@ -1,4 +1,4 @@ -package neqsim.physicalproperties.util.parameterFitting.pureComponentParameterFitting.purecompviscosity.chungMethod; +package neqsim.physicalproperties.util.parameterfitting.purecomponentparameterfitting.purecompviscosity.chungMethod; import neqsim.statistics.parameterfitting.nonlinearparameterfitting.LevenbergMarquardtFunction; diff --git a/src/main/java/neqsim/physicalproperties/util/parameterFitting/pureComponentParameterFitting/purecompviscosity/chungMethod/TestChungFit.java b/src/main/java/neqsim/physicalproperties/util/parameterfitting/purecomponentparameterfitting/purecompviscosity/chungmethod/TestChungFit.java similarity index 86% rename from src/main/java/neqsim/physicalproperties/util/parameterFitting/pureComponentParameterFitting/purecompviscosity/chungMethod/TestChungFit.java rename to src/main/java/neqsim/physicalproperties/util/parameterfitting/purecomponentparameterfitting/purecompviscosity/chungmethod/TestChungFit.java index e6d7cf698..8d1bc42b2 100644 --- a/src/main/java/neqsim/physicalproperties/util/parameterFitting/pureComponentParameterFitting/purecompviscosity/chungMethod/TestChungFit.java +++ b/src/main/java/neqsim/physicalproperties/util/parameterfitting/purecomponentparameterfitting/purecompviscosity/chungmethod/TestChungFit.java @@ -1,4 +1,4 @@ -package neqsim.physicalproperties.util.parameterFitting.pureComponentParameterFitting.purecompviscosity.chungMethod; +package neqsim.physicalproperties.util.parameterfitting.purecomponentparameterfitting.purecompviscosity.chungMethod; import java.sql.ResultSet; import java.util.ArrayList; @@ -37,11 +37,11 @@ public static void main(String[] args) { try (NeqSimDataBase database = new NeqSimDataBase(); ResultSet dataSet = database.getResultSet("SELECT * FROM purecomponentviscosity") // WHERE - // ComponentName='MDEA*'"); + // ComponentName='MDEA*'"); ) { while (dataSet.next()) { ChungFunction function = new ChungFunction(); - double guess[] = {0.3211}; + double guess[] = { 0.3211 }; function.setInitialGuess(guess); SystemInterface testSystem = new SystemSrkEos(280, 0.001); @@ -50,8 +50,8 @@ public static void main(String[] args) { testSystem.createDatabase(true); testSystem.init(0); testSystem.setMixingRule(2); - double sample1[] = {Double.parseDouble(dataSet.getString("Temperature"))}; - double standardDeviation1[] = {0.1}; + double sample1[] = { Double.parseDouble(dataSet.getString("Temperature")) }; + double standardDeviation1[] = { 0.1 }; SampleValue sample = new SampleValue(Double.parseDouble(dataSet.getString("Viscosity")), 0.001, sample1, standardDeviation1); sample.setFunction(function); diff --git a/src/main/java/neqsim/physicalproperties/util/parameterFitting/pureComponentParameterFitting/purecompviscosity/linearLiquidModel/TestViscosityFit.java b/src/main/java/neqsim/physicalproperties/util/parameterfitting/purecomponentparameterfitting/purecompviscosity/linearliquidmodel/TestViscosityFit.java similarity index 91% rename from src/main/java/neqsim/physicalproperties/util/parameterFitting/pureComponentParameterFitting/purecompviscosity/linearLiquidModel/TestViscosityFit.java rename to src/main/java/neqsim/physicalproperties/util/parameterfitting/purecomponentparameterfitting/purecompviscosity/linearliquidmodel/TestViscosityFit.java index 2a5659890..3f53525de 100644 --- a/src/main/java/neqsim/physicalproperties/util/parameterFitting/pureComponentParameterFitting/purecompviscosity/linearLiquidModel/TestViscosityFit.java +++ b/src/main/java/neqsim/physicalproperties/util/parameterfitting/purecomponentparameterfitting/purecompviscosity/linearliquidmodel/TestViscosityFit.java @@ -1,4 +1,4 @@ -package neqsim.physicalproperties.util.parameterFitting.pureComponentParameterFitting.purecompviscosity.linearLiquidModel; +package neqsim.physicalproperties.util.parameterfitting.purecomponentparameterfitting.purecompviscosity.linearliquidmodel; import java.sql.ResultSet; import java.util.ArrayList; @@ -42,7 +42,7 @@ public static void main(String[] args) { ViscosityFunction function = new ViscosityFunction(); // double guess[] = {-66.2, 11810, 0.1331, -0.0000983}; //mdea // double guess[] = {-5.771E1, 7.647E3, 1.442E-1, -1.357E-4}; //water - double guess[] = {-10.14, 3868.803, -0.00550507}; // ,0.000001}; //,0.001}; //MEG + double guess[] = { -10.14, 3868.803, -0.00550507 }; // ,0.000001}; //,0.001}; //MEG // double guess[] = { -53.92523097004079, 9741.992308,0,0.106066223998382}; // //TEG function.setInitialGuess(guess); @@ -55,8 +55,8 @@ public static void main(String[] args) { double temp = Double.parseDouble(dataSet.getString("Temperature")); testSystem.setTemperature(temp); testSystem.init(0); - double sample1[] = {temp}; - double standardDeviation1[] = {0.1}; + double sample1[] = { temp }; + double standardDeviation1[] = { 0.1 }; SampleValue sample = new SampleValue(Double.parseDouble(dataSet.getString("Viscosity")), Double.parseDouble(dataSet.getString("StdDev")), sample1, standardDeviation1); sample.setFunction(function); diff --git a/src/main/java/neqsim/physicalproperties/util/parameterFitting/pureComponentParameterFitting/purecompviscosity/linearLiquidModel/ViscosityFunction.java b/src/main/java/neqsim/physicalproperties/util/parameterfitting/purecomponentparameterfitting/purecompviscosity/linearliquidmodel/ViscosityFunction.java similarity index 85% rename from src/main/java/neqsim/physicalproperties/util/parameterFitting/pureComponentParameterFitting/purecompviscosity/linearLiquidModel/ViscosityFunction.java rename to src/main/java/neqsim/physicalproperties/util/parameterfitting/purecomponentparameterfitting/purecompviscosity/linearliquidmodel/ViscosityFunction.java index 997aa6122..351ef48af 100644 --- a/src/main/java/neqsim/physicalproperties/util/parameterFitting/pureComponentParameterFitting/purecompviscosity/linearLiquidModel/ViscosityFunction.java +++ b/src/main/java/neqsim/physicalproperties/util/parameterfitting/purecomponentparameterfitting/purecompviscosity/linearliquidmodel/ViscosityFunction.java @@ -4,7 +4,7 @@ * Created on 24. januar 2001, 23:30 */ -package neqsim.physicalproperties.util.parameterFitting.pureComponentParameterFitting.purecompviscosity.linearLiquidModel; +package neqsim.physicalproperties.util.parameterfitting.purecomponentparameterfitting.purecompviscosity.linearliquidmodel; import neqsim.statistics.parameterfitting.nonlinearparameterfitting.LevenbergMarquardtFunction; @@ -22,7 +22,8 @@ public class ViscosityFunction extends LevenbergMarquardtFunction { * Constructor for ViscosityFunction. * */ - public ViscosityFunction() {} + public ViscosityFunction() { + } /** {@inheritDoc} */ @Override diff --git a/src/main/java/neqsim/processsimulation/mechanicaldesign/absorber/AbsorberMechanicalDesign.java b/src/main/java/neqsim/processsimulation/mechanicaldesign/absorber/AbsorberMechanicalDesign.java index c56e88120..b39f9ec53 100644 --- a/src/main/java/neqsim/processsimulation/mechanicaldesign/absorber/AbsorberMechanicalDesign.java +++ b/src/main/java/neqsim/processsimulation/mechanicaldesign/absorber/AbsorberMechanicalDesign.java @@ -7,7 +7,7 @@ import neqsim.processsimulation.processequipment.absorber.SimpleTEGAbsorber; import neqsim.processsimulation.processequipment.separator.Separator; import neqsim.processsimulation.processequipment.separator.SeparatorInterface; -import neqsim.processsimulation.processequipment.separator.sectionType.SeparatorSection; +import neqsim.processsimulation.processequipment.separator.sectiontype.SeparatorSection; /** *@@ -30,8 +30,9 @@ public class AbsorberMechanicalDesign extends SeparatorMechanicalDesign { * Constructor for AbsorberMechanicalDesign. *
* - * @param equipment a {@link neqsim.processsimulation.processequipment.ProcessEquipmentInterface} - * object + * @param equipment a + * {@link neqsim.processsimulation.processequipment.ProcessEquipmentInterface} + * object */ public AbsorberMechanicalDesign(ProcessEquipmentInterface equipment) { super(equipment); @@ -45,9 +46,8 @@ public void readDesignSpecifications() { if (getDesignStandard().containsKey("pressure vessel design code")) { System.out.println("pressure vessel code standard: " + getDesignStandard().get("pressure vessel design code").getStandardName()); - wallThickness = - ((PressureVesselDesignStandard) getDesignStandard().get("pressure vessel design code")) - .calcWallThickness(); + wallThickness = ((PressureVesselDesignStandard) getDesignStandard().get("pressure vessel design code")) + .calcWallThickness(); } else { System.out.println("no pressure vessel code standard specified......"); return; @@ -65,12 +65,10 @@ public void readDesignSpecifications() { if (getDesignStandard().containsKey("separator process design")) { System.out.println("separator process design: " + getDesignStandard().get("separator process design").getStandardName()); - gasLoadFactor = - ((SeparatorDesignStandard) getDesignStandard().get("separator process design")) - .getGasLoadFactor(); - volumeSafetyFactor = - ((SeparatorDesignStandard) getDesignStandard().get("separator process design")) - .getVolumetricDesignFactor(); + gasLoadFactor = ((SeparatorDesignStandard) getDesignStandard().get("separator process design")) + .getGasLoadFactor(); + volumeSafetyFactor = ((SeparatorDesignStandard) getDesignStandard().get("separator process design")) + .getVolumetricDesignFactor(); } else { System.out.println("no separator process design specified......"); } @@ -101,7 +99,7 @@ public void calcDesign() { double gasDensity = ((Separator) getProcessEquipment()).getGasOutStream().getThermoSystem() .getPhase(0).getPhysicalProperties().getDensity(); double liqDensity = 1000.0; // ((SimpleTEGAbsorber) - // getProcessEquipment()).getLiquidOutStream().getThermoSystem().getPhase(1).getPhysicalProperties().getDensity(); + // getProcessEquipment()).getLiquidOutStream().getThermoSystem().getPhase(1).getPhysicalProperties().getDensity(); // maxDesignVolumeFlow = volumeSafetyFactor * ((Separator) // getProcessEquipment()).getThermoSystem().getPhase(0).getVolume() / 1e5; diff --git a/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/GasScrubberMechanicalDesign.java b/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/GasScrubberMechanicalDesign.java index 322580025..1d9d24270 100644 --- a/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/GasScrubberMechanicalDesign.java +++ b/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/GasScrubberMechanicalDesign.java @@ -1,11 +1,11 @@ package neqsim.processsimulation.mechanicaldesign.separator; import neqsim.processsimulation.mechanicaldesign.designstandards.GasScrubberDesignStandard; -import neqsim.processsimulation.mechanicaldesign.separator.sectionType.SepDesignSection; +import neqsim.processsimulation.mechanicaldesign.separator.sectiontype.SepDesignSection; import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; import neqsim.processsimulation.processequipment.separator.Separator; import neqsim.processsimulation.processequipment.separator.SeparatorInterface; -import neqsim.processsimulation.processequipment.separator.sectionType.SeparatorSection; +import neqsim.processsimulation.processequipment.separator.sectiontype.SeparatorSection; /** *@@ -23,8 +23,9 @@ public class GasScrubberMechanicalDesign extends SeparatorMechanicalDesign { * Constructor for GasScrubberMechanicalDesign. *
* - * @param equipment a {@link neqsim.processsimulation.processequipment.ProcessEquipmentInterface} - * object + * @param equipment a + * {@link neqsim.processsimulation.processequipment.ProcessEquipmentInterface} + * object */ public GasScrubberMechanicalDesign(ProcessEquipmentInterface equipment) { super(equipment); @@ -38,12 +39,10 @@ public void readDesignSpecifications() { if (getDesignStandard().containsKey("gas scrubber process design")) { System.out.println("gas scrubber process design: " + getDesignStandard().get("gas scrubber process design").getStandardName()); - gasLoadFactor = - ((GasScrubberDesignStandard) getDesignStandard().get("gas scrubber process design")) - .getGasLoadFactor(); - volumeSafetyFactor = - ((GasScrubberDesignStandard) getDesignStandard().get("gas scrubber process design")) - .getVolumetricDesignFactor(); + gasLoadFactor = ((GasScrubberDesignStandard) getDesignStandard().get("gas scrubber process design")) + .getGasLoadFactor(); + volumeSafetyFactor = ((GasScrubberDesignStandard) getDesignStandard().get("gas scrubber process design")) + .getVolumetricDesignFactor(); } else { System.out.println("no separator process design specified......"); } @@ -112,11 +111,15 @@ public void calcDesign() { moduleLength = tantanLength * 1.5; moduleHeight = innerDiameter * 2; /* - * System.out.println("wall thickness: " + separator.getName() + " " + getWallThickness() + - * " m"); System.out.println("separator dry weigth: " + emptyVesselWeight + " kg"); + * System.out.println("wall thickness: " + separator.getName() + " " + + * getWallThickness() + + * " m"); System.out.println("separator dry weigth: " + emptyVesselWeight + + * " kg"); * System.out.println("total skid weigth: " + totalSkidWeight + " kg"); - * System.out.println("foot print: width:" + moduleWidth + " length " + moduleLength + - * " height " + moduleHeight + " meter."); System.out.println("mechanical price: " + + * System.out.println("foot print: width:" + moduleWidth + " length " + + * moduleLength + + * " height " + moduleHeight + " meter."); + * System.out.println("mechanical price: " + * materialsCost + " kNOK"); */ setWeigthVesselShell(emptyVesselWeight); diff --git a/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/SeparatorMechanicalDesign.java b/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/SeparatorMechanicalDesign.java index d138d9dfe..f300bc80d 100644 --- a/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/SeparatorMechanicalDesign.java +++ b/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/SeparatorMechanicalDesign.java @@ -13,7 +13,7 @@ import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; import neqsim.processsimulation.processequipment.separator.Separator; import neqsim.processsimulation.processequipment.separator.SeparatorInterface; -import neqsim.processsimulation.processequipment.separator.sectionType.SeparatorSection; +import neqsim.processsimulation.processequipment.separator.sectiontype.SeparatorSection; /** *@@ -35,8 +35,9 @@ public class SeparatorMechanicalDesign extends MechanicalDesign { * Constructor for SeparatorMechanicalDesign. *
* - * @param equipment a {@link neqsim.processsimulation.processequipment.ProcessEquipmentInterface} - * object + * @param equipment a + * {@link neqsim.processsimulation.processequipment.ProcessEquipmentInterface} + * object */ public SeparatorMechanicalDesign(ProcessEquipmentInterface equipment) { super(equipment); @@ -56,9 +57,8 @@ public void readDesignSpecifications() { if (getDesignStandard().containsKey("pressure vessel design code")) { System.out.println("pressure vessel code standard: " + getDesignStandard().get("pressure vessel design code").getStandardName()); - wallThickness = - ((PressureVesselDesignStandard) getDesignStandard().get("pressure vessel design code")) - .calcWallThickness(); + wallThickness = ((PressureVesselDesignStandard) getDesignStandard().get("pressure vessel design code")) + .calcWallThickness(); } else { System.out.println("no pressure vessel code standard specified......"); } @@ -66,13 +66,11 @@ public void readDesignSpecifications() { if (getDesignStandard().containsKey("separator process design")) { System.out.println("separator process design: " + getDesignStandard().get("separator process design").getStandardName()); - gasLoadFactor = - ((SeparatorDesignStandard) getDesignStandard().get("separator process design")) - .getGasLoadFactor(); + gasLoadFactor = ((SeparatorDesignStandard) getDesignStandard().get("separator process design")) + .getGasLoadFactor(); Fg = ((SeparatorDesignStandard) getDesignStandard().get("separator process design")).getFg(); - volumeSafetyFactor = - ((SeparatorDesignStandard) getDesignStandard().get("separator process design")) - .getVolumetricDesignFactor(); + volumeSafetyFactor = ((SeparatorDesignStandard) getDesignStandard().get("separator process design")) + .getVolumetricDesignFactor(); retentionTime = 120.0; // ((SeparatorDesignStandard) // getDesignStandard().get("separator process // design")).getLiquidRetentionTime("API12J", this); @@ -88,7 +86,7 @@ public void displayResults() { Container dialogContentPane = dialog.getContentPane(); dialogContentPane.setLayout(new BorderLayout()); - String[] names = {"Name", "Value", "Unit"}; + String[] names = { "Name", "Value", "Unit" }; String[][] table = new String[16][3]; // createTable(getProcessEquipment().getName()); table[1][0] = "Separator Inner Diameter"; @@ -188,7 +186,8 @@ public void calcDesign() { if (sepratorLength / innerDiameter > 6 || sepratorLength / innerDiameter < 3) { // System.out - // .println("Fg need to be modified ... L/D separator= " + sepratorLength / innerDiameter); + // .println("Fg need to be modified ... L/D separator= " + sepratorLength / + // innerDiameter); tantanLength = innerDiameter * 5.0; sepratorLength = tantanLength + innerDiameter; } @@ -196,8 +195,7 @@ public void calcDesign() { // alternative design double bubbleDiameter = 250.0e-6; - double bubVelocity = - 9.82 * Math.pow(bubbleDiameter, 2.0) * (liqDensity - gasDensity) / 18.0 / liqViscosity; + double bubVelocity = 9.82 * Math.pow(bubbleDiameter, 2.0) * (liqDensity - gasDensity) / 18.0 / liqViscosity; double Ar = ((SeparatorInterface) getProcessEquipment()).getThermoSystem().getLiquidVolume() / 1e5 / bubVelocity; double Daim = Math.sqrt(Ar / 4.0); @@ -233,11 +231,15 @@ public void calcDesign() { // } /* - * System.out.println("wall thickness: " + separator.getName() + " " + getWallThickness() + - * " m"); System.out.println("separator dry weigth: " + emptyVesselWeight + " kg"); + * System.out.println("wall thickness: " + separator.getName() + " " + + * getWallThickness() + + * " m"); System.out.println("separator dry weigth: " + emptyVesselWeight + + * " kg"); * System.out.println("total skid weigth: " + totalSkidWeight + " kg"); - * System.out.println("foot print: width:" + moduleWidth + " length " + moduleLength + - * " height " + moduleHeight + " meter."); System.out.println("mechanical price: " + + * System.out.println("foot print: width:" + moduleWidth + " length " + + * moduleLength + + * " height " + moduleHeight + " meter."); + * System.out.println("mechanical price: " + * materialsCost + " kNOK"); */ setWeigthVesselShell(emptyVesselWeight); diff --git a/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectionType/DistillationTraySection.java b/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectiontype/DistillationTraySection.java similarity index 91% rename from src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectionType/DistillationTraySection.java rename to src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectiontype/DistillationTraySection.java index 94a65d9af..3f1bb30ee 100644 --- a/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectionType/DistillationTraySection.java +++ b/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectiontype/DistillationTraySection.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.mechanicaldesign.separator.sectionType; +package neqsim.processsimulation.mechanicaldesign.separator.sectiontype; -import neqsim.processsimulation.processequipment.separator.sectionType.SeparatorSection; +import neqsim.processsimulation.processequipment.separator.sectiontype.SeparatorSection; /** *@@ -17,8 +17,8 @@ public class DistillationTraySection extends SepDesignSection { *
* * @param separatorSection a - * {@link neqsim.processsimulation.processequipment.separator.sectionType.SeparatorSection} - * object + * {@link neqsim.processsimulation.processequipment.separator.sectiontype.SeparatorSection} + * object */ public DistillationTraySection(SeparatorSection separatorSection) { super(separatorSection); diff --git a/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectionType/MecMeshSection.java b/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectiontype/MecMeshSection.java similarity index 90% rename from src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectionType/MecMeshSection.java rename to src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectiontype/MecMeshSection.java index fde722b1b..c347a55f9 100644 --- a/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectionType/MecMeshSection.java +++ b/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectiontype/MecMeshSection.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.mechanicaldesign.separator.sectionType; +package neqsim.processsimulation.mechanicaldesign.separator.sectiontype; -import neqsim.processsimulation.processequipment.separator.sectionType.SeparatorSection; +import neqsim.processsimulation.processequipment.separator.sectiontype.SeparatorSection; /** *@@ -17,8 +17,8 @@ public class MecMeshSection extends SepDesignSection { *
* * @param separatorSection a - * {@link neqsim.processsimulation.processequipment.separator.sectionType.SeparatorSection} - * object + * {@link neqsim.processsimulation.processequipment.separator.sectiontype.SeparatorSection} + * object */ public MecMeshSection(SeparatorSection separatorSection) { super(separatorSection); diff --git a/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectionType/MechManwaySection.java b/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectiontype/MechManwaySection.java similarity index 85% rename from src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectionType/MechManwaySection.java rename to src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectiontype/MechManwaySection.java index c08faf0ec..b37945dee 100644 --- a/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectionType/MechManwaySection.java +++ b/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectiontype/MechManwaySection.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.mechanicaldesign.separator.sectionType; +package neqsim.processsimulation.mechanicaldesign.separator.sectiontype; -import neqsim.processsimulation.processequipment.separator.sectionType.SeparatorSection; +import neqsim.processsimulation.processequipment.separator.sectiontype.SeparatorSection; /** *@@ -17,8 +17,8 @@ public class MechManwaySection extends SepDesignSection { *
* * @param separatorSection a - * {@link neqsim.processsimulation.processequipment.separator.sectionType.SeparatorSection} - * object + * {@link neqsim.processsimulation.processequipment.separator.sectiontype.SeparatorSection} + * object */ public MechManwaySection(SeparatorSection separatorSection) { super(separatorSection); diff --git a/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectionType/MechNozzleSection.java b/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectiontype/MechNozzleSection.java similarity index 89% rename from src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectionType/MechNozzleSection.java rename to src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectiontype/MechNozzleSection.java index 9b96799ed..914ddbb8d 100644 --- a/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectionType/MechNozzleSection.java +++ b/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectiontype/MechNozzleSection.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.mechanicaldesign.separator.sectionType; +package neqsim.processsimulation.mechanicaldesign.separator.sectiontype; -import neqsim.processsimulation.processequipment.separator.sectionType.SeparatorSection; +import neqsim.processsimulation.processequipment.separator.sectiontype.SeparatorSection; /** *@@ -17,8 +17,8 @@ public class MechNozzleSection extends SepDesignSection { *
* * @param separatorSection a - * {@link neqsim.processsimulation.processequipment.separator.sectionType.SeparatorSection} - * object + * {@link neqsim.processsimulation.processequipment.separator.sectiontype.SeparatorSection} + * object */ public MechNozzleSection(SeparatorSection separatorSection) { super(separatorSection); diff --git a/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectionType/MechVaneSection.java b/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectiontype/MechVaneSection.java similarity index 87% rename from src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectionType/MechVaneSection.java rename to src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectiontype/MechVaneSection.java index 172c75827..25e1b6bc0 100644 --- a/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectionType/MechVaneSection.java +++ b/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectiontype/MechVaneSection.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.mechanicaldesign.separator.sectionType; +package neqsim.processsimulation.mechanicaldesign.separator.sectiontype; -import neqsim.processsimulation.processequipment.separator.sectionType.SeparatorSection; +import neqsim.processsimulation.processequipment.separator.sectiontype.SeparatorSection; /** *@@ -17,8 +17,8 @@ public class MechVaneSection extends SepDesignSection { *
* * @param separatorSection a - * {@link neqsim.processsimulation.processequipment.separator.sectionType.SeparatorSection} - * object + * {@link neqsim.processsimulation.processequipment.separator.sectiontype.SeparatorSection} + * object */ public MechVaneSection(SeparatorSection separatorSection) { super(separatorSection); @@ -27,8 +27,7 @@ public MechVaneSection(SeparatorSection separatorSection) { /** {@inheritDoc} */ @Override public void calcDesign() { - double vesselDiameter = - separatorSection.getOuterDiameter() * 1e3; + double vesselDiameter = separatorSection.getOuterDiameter() * 1e3; if (vesselDiameter <= 616) { totalWeight = 6.0; } else if (vesselDiameter <= 770) { diff --git a/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectionType/SepDesignSection.java b/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectiontype/SepDesignSection.java similarity index 92% rename from src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectionType/SepDesignSection.java rename to src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectiontype/SepDesignSection.java index b64a92379..5a230dbfd 100644 --- a/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectionType/SepDesignSection.java +++ b/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectiontype/SepDesignSection.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.mechanicaldesign.separator.sectionType; +package neqsim.processsimulation.mechanicaldesign.separator.sectiontype; -import neqsim.processsimulation.processequipment.separator.sectionType.SeparatorSection; +import neqsim.processsimulation.processequipment.separator.sectiontype.SeparatorSection; /** *@@ -23,8 +23,8 @@ public class SepDesignSection { *
* * @param separatorSection a - * {@link neqsim.processsimulation.processequipment.separator.sectionType.SeparatorSection} - * object + * {@link neqsim.processsimulation.processequipment.separator.sectiontype.SeparatorSection} + * object */ public SepDesignSection(SeparatorSection separatorSection) { this.separatorSection = separatorSection; diff --git a/src/main/java/neqsim/processsimulation/processequipment/separator/NeqGasScrubber.java b/src/main/java/neqsim/processsimulation/processequipment/separator/NeqGasScrubber.java index 366b5766d..862c183a2 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/separator/NeqGasScrubber.java +++ b/src/main/java/neqsim/processsimulation/processequipment/separator/NeqGasScrubber.java @@ -3,7 +3,7 @@ import java.util.ArrayList; import java.util.UUID; import neqsim.processsimulation.mechanicaldesign.separator.GasScrubberMechanicalDesign; -import neqsim.processsimulation.processequipment.separator.sectionType.SeparatorSection; +import neqsim.processsimulation.processequipment.separator.sectiontype.SeparatorSection; import neqsim.processsimulation.processequipment.stream.Stream; import neqsim.processsimulation.processequipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; @@ -47,9 +47,10 @@ public NeqGasScrubber(String name) { * Constructor for NeqGasScrubber. * * - * @param name a {@link java.lang.String} object - * @param inletStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} - * object + * @param name a {@link java.lang.String} object + * @param inletStream a + * {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * object */ public NeqGasScrubber(String name, StreamInterface inletStream) { super(name, inletStream); @@ -134,5 +135,6 @@ public void run(UUID id) { /** {@inheritDoc} */ @Override - public void displayResult() {} + public void displayResult() { + } } diff --git a/src/main/java/neqsim/processsimulation/processequipment/separator/Separator.java b/src/main/java/neqsim/processsimulation/processequipment/separator/Separator.java index 7be36860f..1b0e3c9f0 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/separator/Separator.java +++ b/src/main/java/neqsim/processsimulation/processequipment/separator/Separator.java @@ -15,11 +15,11 @@ import neqsim.processsimulation.mechanicaldesign.separator.SeparatorMechanicalDesign; import neqsim.processsimulation.processequipment.ProcessEquipmentBaseClass; import neqsim.processsimulation.processequipment.mixer.Mixer; -import neqsim.processsimulation.processequipment.separator.sectionType.ManwaySection; -import neqsim.processsimulation.processequipment.separator.sectionType.MeshSection; -import neqsim.processsimulation.processequipment.separator.sectionType.NozzleSection; -import neqsim.processsimulation.processequipment.separator.sectionType.SeparatorSection; -import neqsim.processsimulation.processequipment.separator.sectionType.ValveSection; +import neqsim.processsimulation.processequipment.separator.sectiontype.ManwaySection; +import neqsim.processsimulation.processequipment.separator.sectiontype.MeshSection; +import neqsim.processsimulation.processequipment.separator.sectiontype.NozzleSection; +import neqsim.processsimulation.processequipment.separator.sectiontype.SeparatorSection; +import neqsim.processsimulation.processequipment.separator.sectiontype.ValveSection; import neqsim.processsimulation.processequipment.stream.Stream; import neqsim.processsimulation.processequipment.stream.StreamInterface; import neqsim.processsimulation.util.monitor.SeparatorResponse; @@ -64,10 +64,8 @@ public class Separator extends ProcessEquipmentBaseClass implements SeparatorInt /** LiquidLevel as volume fraction of liquidvolume/(liquid + gas volume). */ private double liquidLevel = 0.5; - double liquidVolume = - Math.PI * internalDiameter * internalDiameter / 4.0 * separatorLength * liquidLevel; - double gasVolume = - Math.PI * internalDiameter * internalDiameter / 4.0 * separatorLength * (1.0 - liquidLevel); + double liquidVolume = Math.PI * internalDiameter * internalDiameter / 4.0 * separatorLength * liquidLevel; + double gasVolume = Math.PI * internalDiameter * internalDiameter / 4.0 * separatorLength * (1.0 - liquidLevel); private double designLiquidLevelFraction = 0.8; ArrayListliquidOutStream.
*
*
- * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object
+ * @return a
+ * {@link neqsim.processsimulation.processequipment.stream.StreamInterface}
+ * object
*/
public StreamInterface getLiquidOutStream() {
return liquidOutStream;
@@ -160,7 +163,9 @@ public StreamInterface getLiquidOutStream() {
* Getter for the field gasOutStream.
*
*
- * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object
+ * @return a
+ * {@link neqsim.processsimulation.processequipment.stream.StreamInterface}
+ * object
*/
public StreamInterface getGasOutStream() {
return gasOutStream;
@@ -171,7 +176,9 @@ public StreamInterface getGasOutStream() {
* getGas.
*
*
- * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object
+ * @return a
+ * {@link neqsim.processsimulation.processequipment.stream.StreamInterface}
+ * object
*/
public StreamInterface getGas() {
return getGasOutStream();
@@ -182,7 +189,9 @@ public StreamInterface getGas() {
* getLiquid.
*
*
- * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object
+ * @return a
+ * {@link neqsim.processsimulation.processequipment.stream.StreamInterface}
+ * object
*/
public StreamInterface getLiquid() {
return getLiquidOutStream();
@@ -231,8 +240,7 @@ public void run(UUID id) {
thermoSystem = thermoSystem2;
} else {
try {
- liquidVolume =
- Math.PI * internalDiameter * internalDiameter / 4.0 * separatorLength * liquidLevel;
+ liquidVolume = Math.PI * internalDiameter * internalDiameter / 4.0 * separatorLength * liquidLevel;
gasVolume = Math.PI * internalDiameter * internalDiameter / 4.0 * separatorLength
* (1.0 - liquidLevel);
thermoSystem = thermoSystem2.clone();
@@ -315,8 +323,7 @@ public void runTransient(double dt, UUID id) {
thermoSystem.init(0);
for (int i = 0; i < thermoSystem.getPhase(0).getNumberOfComponents(); i++) {
double dncomp = 0.0;
- dncomp +=
- inletStreamMixer.getOutletStream().getThermoSystem().getComponent(i).getNumberOfmoles();
+ dncomp += inletStreamMixer.getOutletStream().getThermoSystem().getComponent(i).getNumberOfmoles();
double dniliq = 0.0;
if (hasliq) {
dniliq = -liquidOutStream.getThermoSystem().getComponent(i).getNumberOfmoles();
@@ -356,7 +363,8 @@ public void runTransient(double dt, UUID id) {
* getSeparatorLength();
gasVolume = (1.0 - getLiquidLevel()) * 3.14 / 4.0 * getInternalDiameter()
* getInternalDiameter() * getSeparatorLength();
- // System.out.println("gas volume " + gasVolume + " liq volime " + liquidVolume);
+ // System.out.println("gas volume " + gasVolume + " liq volime " +
+ // liquidVolume);
setCalculationIdentifier(id);
}
}
@@ -587,8 +595,7 @@ public double getDeRatedGasLoadFactor() {
public double getDeRatedGasLoadFactor(int phase) {
thermoSystem.initPhysicalProperties();
double derating = 1.0;
- double surfaceTension =
- thermoSystem.getInterphaseProperties().getSurfaceTension(phase - 1, phase);
+ double surfaceTension = thermoSystem.getInterphaseProperties().getSurfaceTension(phase - 1, phase);
if (surfaceTension < 10.0e-3) {
derating = 1.0 - 0.5 * (10.0e-3 - surfaceTension) / 10.0e-3;
}
@@ -650,7 +657,7 @@ public void setSeparatorLength(double separatorLength) {
*
* @param i a int
* @return a
- * {@link neqsim.processsimulation.processequipment.separator.sectionType.SeparatorSection}
+ * {@link neqsim.processsimulation.processequipment.separator.sectiontype.SeparatorSection}
* object
*/
public SeparatorSection getSeparatorSection(int i) {
@@ -664,7 +671,7 @@ public SeparatorSection getSeparatorSection(int i) {
*
* @param name a {@link java.lang.String} object
* @return a
- * {@link neqsim.processsimulation.processequipment.separator.sectionType.SeparatorSection}
+ * {@link neqsim.processsimulation.processequipment.separator.sectiontype.SeparatorSection}
* object
*/
public SeparatorSection getSeparatorSection(String name) {
@@ -850,7 +857,9 @@ public boolean equals(Object obj) {
* getFeedStream.
*
*
- * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object
+ * @return a
+ * {@link neqsim.processsimulation.processequipment.stream.StreamInterface}
+ * object
*/
public StreamInterface getFeedStream() {
return inletStreamMixer.getOutletStream();
@@ -863,7 +872,8 @@ public String toJson() {
}
/*
- * private class SeparatorReport extends Object{ public Double gasLoadFactor; SeparatorReport(){
+ * private class SeparatorReport extends Object{ public Double gasLoadFactor;
+ * SeparatorReport(){
* gasLoadFactor = getGasLoadFactor(); } }
*
* public SeparatorReport getReport(){ return this.new SeparatorReport(); }
diff --git a/src/main/java/neqsim/processsimulation/processequipment/separator/sectionType/ManwaySection.java b/src/main/java/neqsim/processsimulation/processequipment/separator/sectiontype/ManwaySection.java
similarity index 84%
rename from src/main/java/neqsim/processsimulation/processequipment/separator/sectionType/ManwaySection.java
rename to src/main/java/neqsim/processsimulation/processequipment/separator/sectiontype/ManwaySection.java
index 02d7a0169..f5bca7c08 100644
--- a/src/main/java/neqsim/processsimulation/processequipment/separator/sectionType/ManwaySection.java
+++ b/src/main/java/neqsim/processsimulation/processequipment/separator/sectiontype/ManwaySection.java
@@ -1,6 +1,6 @@
-package neqsim.processsimulation.processequipment.separator.sectionType;
+package neqsim.processsimulation.processequipment.separator.sectiontype;
-import neqsim.processsimulation.mechanicaldesign.separator.sectionType.MechManwaySection;
+import neqsim.processsimulation.mechanicaldesign.separator.sectiontype.MechManwaySection;
import neqsim.processsimulation.processequipment.separator.Separator;
/**
@@ -21,7 +21,9 @@ public class ManwaySection extends SeparatorSection {
*
* @param name a {@link java.lang.String} object
* @param type a {@link java.lang.String} object
- * @param sep a {@link neqsim.processsimulation.processequipment.separator.Separator} object
+ * @param sep a
+ * {@link neqsim.processsimulation.processequipment.separator.Separator}
+ * object
*/
public ManwaySection(String name, String type, Separator sep) {
super(name, type, sep);
diff --git a/src/main/java/neqsim/processsimulation/processequipment/separator/sectionType/MeshSection.java b/src/main/java/neqsim/processsimulation/processequipment/separator/sectiontype/MeshSection.java
similarity index 86%
rename from src/main/java/neqsim/processsimulation/processequipment/separator/sectionType/MeshSection.java
rename to src/main/java/neqsim/processsimulation/processequipment/separator/sectiontype/MeshSection.java
index 62c5ce147..a81a0b8dc 100644
--- a/src/main/java/neqsim/processsimulation/processequipment/separator/sectionType/MeshSection.java
+++ b/src/main/java/neqsim/processsimulation/processequipment/separator/sectiontype/MeshSection.java
@@ -1,6 +1,6 @@
-package neqsim.processsimulation.processequipment.separator.sectionType;
+package neqsim.processsimulation.processequipment.separator.sectiontype;
-import neqsim.processsimulation.mechanicaldesign.separator.sectionType.MecMeshSection;
+import neqsim.processsimulation.mechanicaldesign.separator.sectiontype.MecMeshSection;
import neqsim.processsimulation.processequipment.separator.Separator;
/**
@@ -21,7 +21,9 @@ public class MeshSection extends SeparatorSection {
*
* @param name a {@link java.lang.String} object
* @param type a {@link java.lang.String} object
- * @param sep a {@link neqsim.processsimulation.processequipment.separator.Separator} object
+ * @param sep a
+ * {@link neqsim.processsimulation.processequipment.separator.Separator}
+ * object
*/
public MeshSection(String name, String type, Separator sep) {
super(name, type, sep);
diff --git a/src/main/java/neqsim/processsimulation/processequipment/separator/sectionType/NozzleSection.java b/src/main/java/neqsim/processsimulation/processequipment/separator/sectiontype/NozzleSection.java
similarity index 84%
rename from src/main/java/neqsim/processsimulation/processequipment/separator/sectionType/NozzleSection.java
rename to src/main/java/neqsim/processsimulation/processequipment/separator/sectiontype/NozzleSection.java
index 877ca5fe6..cf8f8b728 100644
--- a/src/main/java/neqsim/processsimulation/processequipment/separator/sectionType/NozzleSection.java
+++ b/src/main/java/neqsim/processsimulation/processequipment/separator/sectiontype/NozzleSection.java
@@ -1,6 +1,6 @@
-package neqsim.processsimulation.processequipment.separator.sectionType;
+package neqsim.processsimulation.processequipment.separator.sectiontype;
-import neqsim.processsimulation.mechanicaldesign.separator.sectionType.MechNozzleSection;
+import neqsim.processsimulation.mechanicaldesign.separator.sectiontype.MechNozzleSection;
import neqsim.processsimulation.processequipment.separator.Separator;
/**
@@ -21,7 +21,9 @@ public class NozzleSection extends SeparatorSection {
*
* @param name a {@link java.lang.String} object
* @param type a {@link java.lang.String} object
- * @param sep a {@link neqsim.processsimulation.processequipment.separator.Separator} object
+ * @param sep a
+ * {@link neqsim.processsimulation.processequipment.separator.Separator}
+ * object
*/
public NozzleSection(String name, String type, Separator sep) {
super(name, type, sep);
diff --git a/src/main/java/neqsim/processsimulation/processequipment/separator/sectionType/PackedSection.java b/src/main/java/neqsim/processsimulation/processequipment/separator/sectiontype/PackedSection.java
similarity index 85%
rename from src/main/java/neqsim/processsimulation/processequipment/separator/sectionType/PackedSection.java
rename to src/main/java/neqsim/processsimulation/processequipment/separator/sectiontype/PackedSection.java
index f77f927d1..1dda81d09 100644
--- a/src/main/java/neqsim/processsimulation/processequipment/separator/sectionType/PackedSection.java
+++ b/src/main/java/neqsim/processsimulation/processequipment/separator/sectiontype/PackedSection.java
@@ -1,4 +1,4 @@
-package neqsim.processsimulation.processequipment.separator.sectionType;
+package neqsim.processsimulation.processequipment.separator.sectiontype;
import neqsim.processsimulation.processequipment.separator.Separator;
@@ -20,7 +20,9 @@ public class PackedSection extends SeparatorSection {
*
* @param name a {@link java.lang.String} object
* @param type a {@link java.lang.String} object
- * @param sep a {@link neqsim.processsimulation.processequipment.separator.Separator} object
+ * @param sep a
+ * {@link neqsim.processsimulation.processequipment.separator.Separator}
+ * object
*/
public PackedSection(String name, String type, Separator sep) {
super(name, type, sep);
diff --git a/src/main/java/neqsim/processsimulation/processequipment/separator/sectionType/SeparatorSection.java b/src/main/java/neqsim/processsimulation/processequipment/separator/sectiontype/SeparatorSection.java
similarity index 95%
rename from src/main/java/neqsim/processsimulation/processequipment/separator/sectionType/SeparatorSection.java
rename to src/main/java/neqsim/processsimulation/processequipment/separator/sectiontype/SeparatorSection.java
index b1b26762a..5fae06cca 100644
--- a/src/main/java/neqsim/processsimulation/processequipment/separator/sectionType/SeparatorSection.java
+++ b/src/main/java/neqsim/processsimulation/processequipment/separator/sectiontype/SeparatorSection.java
@@ -1,6 +1,6 @@
-package neqsim.processsimulation.processequipment.separator.sectionType;
+package neqsim.processsimulation.processequipment.separator.sectiontype;
-import neqsim.processsimulation.mechanicaldesign.separator.sectionType.SepDesignSection;
+import neqsim.processsimulation.mechanicaldesign.separator.sectiontype.SepDesignSection;
import neqsim.processsimulation.processequipment.separator.Separator;
import neqsim.util.NamedBaseClass;
@@ -29,7 +29,9 @@ public class SeparatorSection extends NamedBaseClass {
*
* @param name a {@link java.lang.String} object
* @param type a {@link java.lang.String} object
- * @param sep a {@link neqsim.processsimulation.processequipment.separator.Separator} object
+ * @param sep a
+ * {@link neqsim.processsimulation.processequipment.separator.Separator}
+ * object
*/
public SeparatorSection(String name, String type, Separator sep) {
super(name);
diff --git a/src/main/java/neqsim/processsimulation/processequipment/separator/sectionType/ValveSection.java b/src/main/java/neqsim/processsimulation/processequipment/separator/sectiontype/ValveSection.java
similarity index 85%
rename from src/main/java/neqsim/processsimulation/processequipment/separator/sectionType/ValveSection.java
rename to src/main/java/neqsim/processsimulation/processequipment/separator/sectiontype/ValveSection.java
index af921b6aa..e400ab42b 100644
--- a/src/main/java/neqsim/processsimulation/processequipment/separator/sectionType/ValveSection.java
+++ b/src/main/java/neqsim/processsimulation/processequipment/separator/sectiontype/ValveSection.java
@@ -1,6 +1,6 @@
-package neqsim.processsimulation.processequipment.separator.sectionType;
+package neqsim.processsimulation.processequipment.separator.sectiontype;
-import neqsim.processsimulation.mechanicaldesign.separator.sectionType.DistillationTraySection;
+import neqsim.processsimulation.mechanicaldesign.separator.sectiontype.DistillationTraySection;
import neqsim.processsimulation.processequipment.separator.Separator;
/**
@@ -21,7 +21,9 @@ public class ValveSection extends SeparatorSection {
*
* @param name a {@link java.lang.String} object
* @param type a {@link java.lang.String} object
- * @param sep a {@link neqsim.processsimulation.processequipment.separator.Separator} object
+ * @param sep a
+ * {@link neqsim.processsimulation.processequipment.separator.Separator}
+ * object
*/
public ValveSection(String name, String type, Separator sep) {
super(name, type, sep);
diff --git a/src/main/java/neqsim/processsimulation/processequipment/separator/sectionType/VaneSection.java b/src/main/java/neqsim/processsimulation/processequipment/separator/sectiontype/VaneSection.java
similarity index 86%
rename from src/main/java/neqsim/processsimulation/processequipment/separator/sectionType/VaneSection.java
rename to src/main/java/neqsim/processsimulation/processequipment/separator/sectiontype/VaneSection.java
index 044391574..5f9e92ac6 100644
--- a/src/main/java/neqsim/processsimulation/processequipment/separator/sectionType/VaneSection.java
+++ b/src/main/java/neqsim/processsimulation/processequipment/separator/sectiontype/VaneSection.java
@@ -1,6 +1,6 @@
-package neqsim.processsimulation.processequipment.separator.sectionType;
+package neqsim.processsimulation.processequipment.separator.sectiontype;
-import neqsim.processsimulation.mechanicaldesign.separator.sectionType.MechVaneSection;
+import neqsim.processsimulation.mechanicaldesign.separator.sectiontype.MechVaneSection;
import neqsim.processsimulation.processequipment.separator.Separator;
/**
@@ -21,7 +21,9 @@ public class VaneSection extends SeparatorSection {
*
* @param name a {@link java.lang.String} object
* @param type a {@link java.lang.String} object
- * @param sep a {@link neqsim.processsimulation.processequipment.separator.Separator} object
+ * @param sep a
+ * {@link neqsim.processsimulation.processequipment.separator.Separator}
+ * object
*/
public VaneSection(String name, String type, Separator sep) {
super(name, type, sep);
diff --git a/src/main/java/neqsim/pvtsimulation/simulation/DensitySim.java b/src/main/java/neqsim/pvtsimulation/simulation/DensitySim.java
index eafa2d6a3..3860c23a1 100644
--- a/src/main/java/neqsim/pvtsimulation/simulation/DensitySim.java
+++ b/src/main/java/neqsim/pvtsimulation/simulation/DensitySim.java
@@ -3,7 +3,7 @@
import java.util.ArrayList;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
-import neqsim.physicalproperties.util.parameterFitting.pureComponentParameterFitting.purecompviscosity.linearLiquidModel.ViscosityFunction;
+import neqsim.physicalproperties.util.parameterfitting.purecomponentparameterfitting.purecompviscosity.linearliquidmodel.ViscosityFunction;
import neqsim.statistics.parameterfitting.SampleSet;
import neqsim.statistics.parameterfitting.SampleValue;
import neqsim.statistics.parameterfitting.nonlinearparameterfitting.LevenbergMarquardt;
@@ -50,7 +50,7 @@ public DensitySim(SystemInterface tempSystem) {
*
*
* @param temperature an array of type double
- * @param pressure an array of type double
+ * @param pressure an array of type double
*/
public void setTemperaturesAndPressures(double[] temperature, double[] pressure) {
this.pressure = pressure;
@@ -71,7 +71,7 @@ public void runTuning() {
for (int i = 0; i < experimentalData[0].length; i++) {
ViscosityFunction function = new ViscosityFunction();
- double[] guess = {1.0}; // getThermoSystem().getPhase(0).getComponent(0).getCriticalViscosity()};
+ double[] guess = { 1.0 }; // getThermoSystem().getPhase(0).getComponent(0).getCriticalViscosity()};
function.setInitialGuess(guess);
SystemInterface tempSystem = getThermoSystem(); // getThermoSystem().clone();
@@ -80,11 +80,10 @@ public void runTuning() {
tempSystem.setPressure(pressure[i]);
thermoOps.TPflash();
// tempSystem.display();
- double[] sample1 = {temperature[i]};
+ double[] sample1 = { temperature[i] };
double viscosity = experimentalData[0][i];
- double[] standardDeviation1 = {1.5};
- SampleValue sample =
- new SampleValue(viscosity, viscosity / 50.0, sample1, standardDeviation1);
+ double[] standardDeviation1 = { 1.5 };
+ SampleValue sample = new SampleValue(viscosity, viscosity / 50.0, sample1, standardDeviation1);
sample.setFunction(function);
sample.setThermodynamicSystem(tempSystem);
sampleList.add(sample);
@@ -130,8 +129,7 @@ public void runCalc() {
oilDensity[i] = getThermoSystem().getPhase("oil").getPhysicalProperties().getViscosity();
}
if (getThermoSystem().hasPhaseType("aqueous")) {
- aqueousDensity[i] =
- getThermoSystem().getPhase("aqueous").getPhysicalProperties().getViscosity();
+ aqueousDensity[i] = getThermoSystem().getPhase("aqueous").getPhysicalProperties().getViscosity();
}
}
}
@@ -162,12 +160,12 @@ public static void main(String[] args) {
tempSystem.init(1);
DensitySim sepSim = new DensitySim(tempSystem);
- double[] temps = {300.15, 293.15, 283.15, 273.15, 264.15};
- double[] pres = {5, 5, 5, 5.0, 5.0};
+ double[] temps = { 300.15, 293.15, 283.15, 273.15, 264.15 };
+ double[] pres = { 5, 5, 5, 5.0, 5.0 };
sepSim.setTemperaturesAndPressures(temps, pres);
sepSim.runCalc();
- double[][] expData = {{2e-4, 3e-4, 4e-4, 5e-4, 6e-4},};
+ double[][] expData = { { 2e-4, 3e-4, 4e-4, 5e-4, 6e-4 }, };
sepSim.setExperimentalData(expData);
// sepSim.runTuning();
sepSim.runCalc();
diff --git a/src/main/java/neqsim/pvtsimulation/simulation/ViscositySim.java b/src/main/java/neqsim/pvtsimulation/simulation/ViscositySim.java
index 08dad1875..8d723da4e 100644
--- a/src/main/java/neqsim/pvtsimulation/simulation/ViscositySim.java
+++ b/src/main/java/neqsim/pvtsimulation/simulation/ViscositySim.java
@@ -3,7 +3,7 @@
import java.util.ArrayList;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
-import neqsim.physicalproperties.util.parameterFitting.pureComponentParameterFitting.purecompviscosity.linearLiquidModel.ViscosityFunction;
+import neqsim.physicalproperties.util.parameterfitting.purecomponentparameterfitting.purecompviscosity.linearliquidmodel.ViscosityFunction;
import neqsim.statistics.parameterfitting.SampleSet;
import neqsim.statistics.parameterfitting.SampleValue;
import neqsim.statistics.parameterfitting.nonlinearparameterfitting.LevenbergMarquardt;
@@ -50,7 +50,7 @@ public ViscositySim(SystemInterface tempSystem) {
*
*
* @param temperature an array of type double
- * @param pressure an array of type double
+ * @param pressure an array of type double
*/
public void setTemperaturesAndPressures(double[] temperature, double[] pressure) {
this.pressure = pressure;
@@ -71,7 +71,7 @@ public void runTuning() {
for (int i = 0; i < experimentalData[0].length; i++) {
ViscosityFunction function = new ViscosityFunction();
- double[] guess = {1.0}; // getThermoSystem().getPhase(0).getComponent(0).getCriticalViscosity()};
+ double[] guess = { 1.0 }; // getThermoSystem().getPhase(0).getComponent(0).getCriticalViscosity()};
function.setInitialGuess(guess);
SystemInterface tempSystem = getThermoSystem().clone();
@@ -80,11 +80,10 @@ public void runTuning() {
tempSystem.setPressure(pressure[i]);
thermoOps.TPflash();
// tempSystem.display();
- double[] sample1 = {temperature[i]};
+ double[] sample1 = { temperature[i] };
double viscosity = experimentalData[0][i];
- double[] standardDeviation1 = {1.5};
- SampleValue sample =
- new SampleValue(viscosity, viscosity / 50.0, sample1, standardDeviation1);
+ double[] standardDeviation1 = { 1.5 };
+ SampleValue sample = new SampleValue(viscosity, viscosity / 50.0, sample1, standardDeviation1);
sample.setFunction(function);
sample.setThermodynamicSystem(tempSystem);
sampleList.add(sample);
@@ -128,8 +127,7 @@ public void runCalc() {
oilViscosity[i] = getThermoSystem().getPhase("oil").getPhysicalProperties().getViscosity();
}
if (getThermoSystem().hasPhaseType("aqueous")) {
- aqueousViscosity[i] =
- getThermoSystem().getPhase("aqueous").getPhysicalProperties().getViscosity();
+ aqueousViscosity[i] = getThermoSystem().getPhase("aqueous").getPhysicalProperties().getViscosity();
}
}
}
@@ -162,12 +160,12 @@ public static void main(String[] args) {
tempSystem.init(1);
ViscositySim sepSim = new ViscositySim(tempSystem);
- double[] temps = {300.15, 293.15, 283.15, 273.15, 264.15};
- double[] pres = {5, 5, 5, 5.0, 5.0};
+ double[] temps = { 300.15, 293.15, 283.15, 273.15, 264.15 };
+ double[] pres = { 5, 5, 5, 5.0, 5.0 };
sepSim.setTemperaturesAndPressures(temps, pres);
sepSim.runCalc();
- double[][] expData = {{2e-4, 3e-4, 4e-4, 5e-4, 6e-4},};
+ double[][] expData = { { 2e-4, 3e-4, 4e-4, 5e-4, 6e-4 }, };
sepSim.setExperimentalData(expData);
// sepSim.runTuning();
sepSim.runCalc();
diff --git a/src/main/java/neqsim/pvtsimulation/simulation/ViscosityWaxOilSim.java b/src/main/java/neqsim/pvtsimulation/simulation/ViscosityWaxOilSim.java
index 3c245ab65..2b5f41821 100644
--- a/src/main/java/neqsim/pvtsimulation/simulation/ViscosityWaxOilSim.java
+++ b/src/main/java/neqsim/pvtsimulation/simulation/ViscosityWaxOilSim.java
@@ -3,7 +3,7 @@
import java.util.ArrayList;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
-import neqsim.physicalproperties.util.parameterFitting.pureComponentParameterFitting.purecompviscosity.linearLiquidModel.ViscosityFunction;
+import neqsim.physicalproperties.util.parameterfitting.purecomponentparameterfitting.purecompviscosity.linearliquidmodel.ViscosityFunction;
import neqsim.statistics.parameterfitting.SampleSet;
import neqsim.statistics.parameterfitting.SampleValue;
import neqsim.statistics.parameterfitting.nonlinearparameterfitting.LevenbergMarquardt;
@@ -54,7 +54,7 @@ public ViscosityWaxOilSim(SystemInterface tempSystem) {
*
*
* @param temperature an array of type double
- * @param pressure an array of type double
+ * @param pressure an array of type double
*/
public void setTemperaturesAndPressures(double[] temperature, double[] pressure) {
this.pressure = pressure;
@@ -75,7 +75,7 @@ public void runTuning() {
for (int i = 0; i < experimentalData[0].length; i++) {
ViscosityFunction function = new ViscosityFunction();
- double[] guess = {1.0}; // getThermoSystem().getPhase(0).getComponent(0).getCriticalViscosity()};
+ double[] guess = { 1.0 }; // getThermoSystem().getPhase(0).getComponent(0).getCriticalViscosity()};
function.setInitialGuess(guess);
SystemInterface tempSystem = getThermoSystem().clone();
@@ -84,11 +84,10 @@ public void runTuning() {
tempSystem.setPressure(pressure[i]);
thermoOps.TPflash();
// tempSystem.display();
- double[] sample1 = {shareRate[i]};
+ double[] sample1 = { shareRate[i] };
double viscosity = experimentalData[0][i];
- double[] standardDeviation1 = {1.5};
- SampleValue sample =
- new SampleValue(viscosity, viscosity / 50.0, sample1, standardDeviation1);
+ double[] standardDeviation1 = { 1.5 };
+ SampleValue sample = new SampleValue(viscosity, viscosity / 50.0, sample1, standardDeviation1);
sample.setFunction(function);
sample.setThermodynamicSystem(tempSystem);
sampleList.add(sample);
@@ -128,8 +127,7 @@ public void runCalc() {
getThermoSystem().initPhysicalProperties();
waxFraction[i] = 0.0;
if (getThermoSystem().hasPhaseType("wax") && getThermoSystem().hasPhaseType("oil")) {
- waxFraction[i] =
- getThermoSystem().getWtFraction(getThermoSystem().getPhaseNumberOfPhase("wax"));
+ waxFraction[i] = getThermoSystem().getWtFraction(getThermoSystem().getPhaseNumberOfPhase("wax"));
oilwaxDispersionViscosity[i] = getThermoSystem().getPhase("oil").getPhysicalProperties()
.getViscosityOfWaxyOil(waxFraction[i], getShareRate()[i]);
}
@@ -140,8 +138,7 @@ public void runCalc() {
oilViscosity[i] = getThermoSystem().getPhase("oil").getPhysicalProperties().getViscosity();
}
if (getThermoSystem().hasPhaseType("aqueous")) {
- aqueousViscosity[i] =
- getThermoSystem().getPhase("aqueous").getPhysicalProperties().getViscosity();
+ aqueousViscosity[i] = getThermoSystem().getPhase("aqueous").getPhysicalProperties().getViscosity();
}
}
}
@@ -172,13 +169,13 @@ public static void main(String[] args) {
tempSystem.init(1);
ViscosityWaxOilSim sepSim = new ViscosityWaxOilSim(tempSystem);
- double[] temps = {300.15, 293.15, 283.15, 273.15, 264.15};
- double[] pres = {5, 5, 5, 5.0, 5.0};
+ double[] temps = { 300.15, 293.15, 283.15, 273.15, 264.15 };
+ double[] pres = { 5, 5, 5, 5.0, 5.0 };
sepSim.setTemperaturesAndPressures(temps, pres);
- sepSim.setShareRate(new double[] {0, 0, 0, 100, 100});
+ sepSim.setShareRate(new double[] { 0, 0, 0, 100, 100 });
sepSim.runCalc();
- double[][] expData = {{2e-4, 3e-4, 4e-4, 5e-4, 6e-4},};
+ double[][] expData = { { 2e-4, 3e-4, 4e-4, 5e-4, 6e-4 }, };
sepSim.setExperimentalData(expData);
sepSim.runTuning();
// sepSim.runCalc();
diff --git a/src/main/java/neqsim/thermo/phase/Phase.java b/src/main/java/neqsim/thermo/phase/Phase.java
index a46483900..86d75fc06 100644
--- a/src/main/java/neqsim/thermo/phase/Phase.java
+++ b/src/main/java/neqsim/thermo/phase/Phase.java
@@ -461,7 +461,7 @@ public void setPhysicalProperties() {
// System.out.println("Physical properties: Default model");
setPhysicalProperties(physicalPropertyType);
// physicalProperty = new
- // physicalProperties.physicalPropertySystem.commonPhasePhysicalProperties.DefaultPhysicalProperties(this,0,0);
+ // physicalproperties.physicalPropertySystem.commonPhasePhysicalProperties.DefaultPhysicalProperties(this,0,0);
}
/** {@inheritDoc} */
diff --git a/src/main/java/neqsim/util/python/init.py b/src/main/java/neqsim/util/python/init.py
index 4879dfdac..ff374bdac 100644
--- a/src/main/java/neqsim/util/python/init.py
+++ b/src/main/java/neqsim/util/python/init.py
@@ -1,21 +1,21 @@
from javax.swing import *
from thermo.system import *
-from thermodynamicOperations import *
-from processSimulation import *
-from processSimulation.processEquipment import *
-from processSimulation.processEquipment.stream import *
-from processSimulation.processEquipment.mixer import *
-from processSimulation.processEquipment.stream import *
-from processSimulation.processEquipment.separator import *
-from processSimulation.processEquipment.valve import *
-from processSimulation.processEquipment.pipeline import *
-from processSimulation.processSystem import *
+from thermodynamicoperations import *
+from processsimulation import *
+from processsimulation.processequipment import *
+from processsimulation.processequipment.stream import *
+from processsimulation.processequipment.mixer import *
+from processsimulation.processequipment.stream import *
+from processsimulation.processequipment.separator import *
+from processsimulation.processequipment.valve import *
+from processsimulation.processequipment.pipeline import *
+from processsimulation.processsystem import *
from Numeric import *
from java.sql import *
from util.database import *
#from visad.python.JPythonMethods import *
-from statistics.parameterFitting import *
-from statistics.parameterFitting.nonLinearParameterFitting import *
+from statistics.parameterfitting import *
+from statistics.parameterfitting.nonlinearparameterfitting import *
#from visad.python import *
#from util.pythonScript.pythonTools.mathTools import *
#from fluidMechanics.geometryDefinitions import *