diff --git a/pom.xml b/pom.xml index d19a354a09..b26166068a 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ ${revision}${sha1}${changelist} - 3.0.4 + 3.0.5 UTF-8 UTF-8 diff --git a/pomJava21.xml b/pomJava21.xml index 04e7304b6a..1b16c25e56 100644 --- a/pomJava21.xml +++ b/pomJava21.xml @@ -13,7 +13,7 @@ ${revision}${sha1}${changelist} - 3.0.4 + 3.0.5 UTF-8 UTF-8 diff --git a/pomJava8.xml b/pomJava8.xml index 1798e46bdb..08187a8ddc 100644 --- a/pomJava8.xml +++ b/pomJava8.xml @@ -13,7 +13,7 @@ ${revision}${sha1}${changelist}-Java8 - 3.0.4 + 3.0.5 UTF-8 UTF-8 diff --git a/src/main/java/neqsim/process/equipment/util/Calculator.java b/src/main/java/neqsim/process/equipment/util/Calculator.java index 130cc6020e..a64952a59d 100644 --- a/src/main/java/neqsim/process/equipment/util/Calculator.java +++ b/src/main/java/neqsim/process/equipment/util/Calculator.java @@ -43,7 +43,7 @@ public Calculator(String name) { *

* * @param unit a {@link neqsim.process.equipment.ProcessEquipmentInterface} - * object + * object */ public void addInputVariable(ProcessEquipmentInterface unit) { inputVariable.add(unit); @@ -60,21 +60,10 @@ public ProcessEquipmentInterface getOutputVariable() { return outputVariable; } - /** {@inheritDoc} */ - @Override - public boolean needRecalculation() { - Iterator iter = inputVariable.iterator(); - while (iter.hasNext()) { - ProcessEquipmentInterface str = iter.next(); - if (!str.solved()) { - return true; - } - } - return false; - } - /** - *

runAntiSurgeCalc.

+ *

+ * runAntiSurgeCalc. + *

* * @param id a {@link java.util.UUID} object */ @@ -95,7 +84,7 @@ public void runAntiSurgeCalc(UUID id) { flowInAntiSurge = 1e-6; } - anitSurgeSplitter.setFlowRates(new double[] {-1, flowInAntiSurge}, "MSm3/day"); + anitSurgeSplitter.setFlowRates(new double[] { -1, flowInAntiSurge }, "MSm3/day"); anitSurgeSplitter.run(); anitSurgeSplitter.setCalculationIdentifier(id); } @@ -142,7 +131,8 @@ public void run(UUID id) { *

* * @param outputVariable a - * {@link neqsim.process.equipment.ProcessEquipmentInterface} object + * {@link neqsim.process.equipment.ProcessEquipmentInterface} + * object */ public void setOutputVariable(ProcessEquipmentInterface outputVariable) { this.outputVariable = outputVariable; diff --git a/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermSrk.java b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermSrk.java index 6748b9250f..04b398fc37 100644 --- a/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermSrk.java +++ b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermSrk.java @@ -55,7 +55,7 @@ public void setm(double val) { double[] acentricConstants = {-0.176, 1.574, (0.48 - this.m)}; solve.setConstants(acentricConstants); getComponent().setAcentricFactor(solve.solve(0.25)); - System.out.println("solve accen " + getComponent().getAcentricFactor()); + // System.out.println("solve accen " + getComponent().getAcentricFactor()); } /** {@inheritDoc} */ diff --git a/src/test/java/neqsim/thermo/system/AcidTest.java b/src/test/java/neqsim/thermo/system/AcidTest.java index aaee9cc4d7..548e254571 100644 --- a/src/test/java/neqsim/thermo/system/AcidTest.java +++ b/src/test/java/neqsim/thermo/system/AcidTest.java @@ -25,7 +25,6 @@ public void testAcid() { testSystem.setMixingRule(10); ThermodynamicOperations testOps = new ThermodynamicOperations(testSystem); testOps.TPflash(); - testSystem.prettyPrint(); } /** @@ -85,7 +84,6 @@ public void testtestBubpAcid() { assertEquals(0.0155, boundvol); assertEquals(41917.0, assenergy); assertEquals(0.3338, m); - testSystem.prettyPrint(); } @@ -138,7 +136,6 @@ public void testtestBubpAceticAcid() { assertEquals(0.00452, boundvol); assertEquals(40323.0, assenergy); assertEquals(0.4644000000000, m, 0.0001); - testSystem.prettyPrint(); } /** @@ -175,7 +172,6 @@ public void testtestWater() { assertEquals(0.0692, boundvol); assertEquals(16655.0, assenergy); assertEquals(.6735900000000007, m, 0.00001); - testSystem.prettyPrint(); } /** @@ -212,6 +208,5 @@ public void testtestMEG() { assertEquals(0.0141, boundvol); assertEquals(19752.0, assenergy); assertEquals(0.6743999999999983, m); - testSystem.prettyPrint(); } }