From f9f5788f7582f12e5ec7cc68c89522502a89a469 Mon Sep 17 00:00:00 2001 From: Even Solbraa <41290109+EvenSol@users.noreply.github.com> Date: Sat, 2 Nov 2024 22:44:20 +0100 Subject: [PATCH 01/21] update recycle methods (#1159) * update recycle methods * update * remove print --- .../processequipment/util/Recycle.java | 170 +++++++++++------- .../splitter/ComponentSplitterTest.java | 2 +- .../processsystem/CompressorModule.java | 2 +- .../processsystem/GlycolModulesTest.java | 2 +- .../processsystem/OilGasProcessTest.java | 2 +- .../ProcessSystemRunTransientTest.java | 2 +- .../processsystem/ProcessSystemTest.java | 1 + 7 files changed, 113 insertions(+), 68 deletions(-) diff --git a/src/main/java/neqsim/processsimulation/processequipment/util/Recycle.java b/src/main/java/neqsim/processsimulation/processequipment/util/Recycle.java index 2ef92ca01..fdd107f2b 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/util/Recycle.java +++ b/src/main/java/neqsim/processsimulation/processequipment/util/Recycle.java @@ -28,17 +28,16 @@ public class Recycle extends ProcessEquipmentBaseClass implements MixerInterface protected StreamInterface mixedStream; StreamInterface lastIterationStream = null; private StreamInterface outletStream = null; - private double tolerance = 1e-2; private int priority = 100; - private double error = 1e10; - private double errorFlow = 1e10; boolean firstTime = true; int iterations = 0; int maxIterations = 10; - - double compositionAccuracy = 1.0; - double temperatureAccuracy = 1.0; - double flowAccuracy = 1.0e-2; + private double errorComposition = 1e10; + private double errorFlow = 1e10; + private double errorTemperature = 1e10; + private double flowTolerance = 1e-2; + private double compositionTolerance = 1e-2; + private double temperatureTolerance = 1e-2; /** *

@@ -53,35 +52,68 @@ public Recycle(String name) { /** *

- * Setter for the field compositionAccuracy. + * Setter for the field compositionTolerance. + *

+ * + * @param compositionTolerance a double + */ + public void setCompositionTolerance(double compositionTolerance) { + this.compositionTolerance = compositionTolerance; + } + + /** + *

+ * Getter for the field compositionTolerance. *

* - * @param compositionAccuracy a double + * @return a double */ - public void setCompositionAccuracy(double compositionAccuracy) { - this.compositionAccuracy = compositionAccuracy; + public double getCompositionTolerance() { + return this.compositionTolerance; } /** *

- * Setter for the field temperatureAccuracy. + * Setter for the field temperatureTolerance. *

* - * @param temperatureAccuracy a double + * @param temperatureTolerance a double in % error */ - public void setTemperatureAccuracy(double temperatureAccuracy) { - this.temperatureAccuracy = temperatureAccuracy; + public void setTemperatureTolerance(double temperatureTolerance) { + this.temperatureTolerance = temperatureTolerance; } /** *

- * Setter for the field flowAccuracy. + * Getter for the field temperatureTolerance. *

* - * @param flowAccuracy a double + * @return a double */ - public void setFlowAccuracy(double flowAccuracy) { - this.flowAccuracy = flowAccuracy; + public double getTemperatureTolerance() { + return this.temperatureTolerance; + } + + /** + *

+ * Setter for the field flowTolerance. + *

+ * + * @param flowTolerance a double + */ + public void setFlowTolerance(double flowTolerance) { + this.flowTolerance = flowTolerance; + } + + /** + *

+ * Getter for the field flowTolerance. + *

+ * + * @return a double + */ + public double getFlowTolerance() { + return this.flowTolerance; } /** @@ -285,8 +317,8 @@ public void run(UUID id) { double enthalpy = 0.0; SystemInterface thermoSystem2 = streams.get(0).getThermoSystem().clone(); if (numberOfInputStreams == 1 && thermoSystem2.getFlowRate("kg/hr") < 1e-100) { - setError(0); - setErrorFlow(0); + setErrorCompositon(0.0); + setErrorFlow(0.0); return; } mixedStream.setThermoSystem(thermoSystem2); @@ -314,8 +346,9 @@ public void run(UUID id) { testOps.TPflash(); } mixedStream.setCalculationIdentifier(id); - setError(massBalanceCheck()); - setErrorFlow(massBalanceCheck2()); + setErrorCompositon(compositionBalanceCheck()); + setErrorFlow(flowBalanceCheck()); + setErrorTemperature(temperatureBalanceCheck()); lastIterationStream = mixedStream.clone(); outletStream.setThermoSystem(mixedStream.getThermoSystem()); outletStream.setCalculationIdentifier(id); @@ -338,7 +371,7 @@ public void run(UUID id) { * * @return a double */ - public double massBalanceCheck2() { + public double flowBalanceCheck() { double abs_sum_errorFlow = 0.0; if (mixedStream.getFlowRate("kg/sec") < 1.0) { abs_sum_errorFlow += @@ -353,18 +386,12 @@ public double massBalanceCheck2() { /** *

- * massBalanceCheck. + * compositionBalanceCheck. *

* * @return a double */ - public double massBalanceCheck() { - // logger.info("flow rate new " + - // mixedStream.getThermoSystem().getFlowRate("kg/hr")); - // logger.info("temperature " + - // mixedStream.getThermoSystem().getTemperature("C")); - // logger.info("pressure " + - // mixedStream.getThermoSystem().getPressure("bara")); + public double compositionBalanceCheck() { if (lastIterationStream.getFluid().getNumberOfComponents() != mixedStream.getFluid() .getNumberOfComponents()) { return 10.0; @@ -372,11 +399,6 @@ public double massBalanceCheck() { double abs_sum_error = 0.0; for (int i = 0; i < mixedStream.getThermoSystem().getPhase(0).getNumberOfComponents(); i++) { - // logger.info("x last " + - // lastIterationStream.getThermoSystem().getPhase(0).getComponent(i).getx()); - // logger.info("x new " + - // mixedStream.getThermoSystem().getPhase(0).getComponent(i).getx()); - abs_sum_error += Math.abs(mixedStream.getThermoSystem().getPhase(0).getComponent(i).getx() - lastIterationStream.getThermoSystem().getPhase(0).getComponent(i).getx()); } @@ -384,6 +406,24 @@ public double massBalanceCheck() { return abs_sum_error; } + + /** + *

+ * temperatureBalanceCheck. + *

+ * + * @return a double + */ + public double temperatureBalanceCheck() { + double error = 0.0; + for (int i = 0; i < mixedStream.getThermoSystem().getNumberOfPhases(); i++) { + error += Math.abs((mixedStream.getThermoSystem().getPhase(i).getTemperature() + - lastIterationStream.getThermoSystem().getPhase(i).getTemperature()) + / lastIterationStream.getThermoSystem().getPhase(i).getTemperature()) * 100.0; + } + return error; + } + /** {@inheritDoc} */ @Override public void displayResult() {} @@ -413,68 +453,71 @@ public void setTemperature(double temp) { /** *

- * Getter for the field tolerance. + * Setter for the tolerance fields. *

- * - * @return the tolerance + * Set tolerances to tolerance input. + * + * @param tolerance the tolerance to set */ - public double getTolerance() { - return tolerance; + public void setTolerance(double tolerance) { + this.flowTolerance = tolerance; + this.temperatureTolerance = tolerance; + this.compositionTolerance = tolerance; } /** *

- * Setter for the field tolerance. + * Setter for the field errorTemperature. *

* - * @param tolerance the tolerance to set + * @param errorTemperature the errorTemperature to set */ - public void setTolerance(double tolerance) { - this.tolerance = tolerance; + public void setErrorTemperature(double errorTemperature) { + this.errorTemperature = errorTemperature; } /** *

- * Getter for the field error. + * Setter for the field errorFlow. *

* - * @return the error + * @param errorFlow the error to set */ - public double getError() { - return error; + public void setErrorFlow(double errorFlow) { + this.errorFlow = errorFlow; } /** *

- * Setter for the field error. + * Getter for the field errorFlow. *

* - * @param error the error to set + * @return a double */ - public void setError(double error) { - this.error = error; + public double getErrorFlow() { + return errorFlow; } /** *

- * Setter for the field errorFlow. + * Setter for the field errorComposition. *

* - * @param errorFlow the error to set + * @param errorComposition the error to set */ - public void setErrorFlow(double errorFlow) { - this.errorFlow = errorFlow; + public void setErrorCompositon(double errorComposition) { + this.errorComposition = errorComposition; } /** *

- * Getter for the field errorFlow. + * Getter for the field errorComposition. *

* * @return a double */ - public double getErrorFlow() { - return errorFlow; + public double getErrorComposition() { + return errorComposition; } /** @@ -502,8 +545,9 @@ public void setPriority(int priority) { /** {@inheritDoc} */ @Override public boolean solved() { - if (Math.abs(this.error) < tolerance && Math.abs(this.errorFlow) < flowAccuracy - && iterations > 1) { + if (Math.abs(this.errorComposition) < compositionTolerance + && Math.abs(this.errorFlow) < flowTolerance + && Math.abs(this.errorTemperature) < temperatureTolerance && iterations > 1) { return true; } else { return false; diff --git a/src/test/java/neqsim/processsimulation/processequipment/splitter/ComponentSplitterTest.java b/src/test/java/neqsim/processsimulation/processequipment/splitter/ComponentSplitterTest.java index e12586a09..a718905e5 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/splitter/ComponentSplitterTest.java +++ b/src/test/java/neqsim/processsimulation/processequipment/splitter/ComponentSplitterTest.java @@ -157,7 +157,7 @@ public void testRunSplitter2() { Recycle recycle1 = new Recycle("recycle 1"); recycle1.addStream(valve1.getOutletStream()); recycle1.setOutletStream(streamresycl); - recycle1.setFlowAccuracy(1e-6); + recycle1.setFlowTolerance(1e-6); StreamInterface exportStream = splitter.getSplitStream(0); diff --git a/src/test/java/neqsim/processsimulation/processsystem/CompressorModule.java b/src/test/java/neqsim/processsimulation/processsystem/CompressorModule.java index 5e22b3050..a39e91a81 100644 --- a/src/test/java/neqsim/processsimulation/processsystem/CompressorModule.java +++ b/src/test/java/neqsim/processsimulation/processsystem/CompressorModule.java @@ -134,7 +134,7 @@ public void testProcess() { operations.run(); - assertEquals(2046.8012652616517, recycleScrubberStream.getFlowRate("kg/hr"), 0.1); + assertEquals(2042.17826, recycleScrubberStream.getFlowRate("kg/hr"), 0.1); neqsim.processsimulation.processequipment.compressor.CompressorChartGenerator compchartgenerator = new neqsim.processsimulation.processequipment.compressor.CompressorChartGenerator( diff --git a/src/test/java/neqsim/processsimulation/processsystem/GlycolModulesTest.java b/src/test/java/neqsim/processsimulation/processsystem/GlycolModulesTest.java index 08925d28b..eff2fe10a 100644 --- a/src/test/java/neqsim/processsimulation/processsystem/GlycolModulesTest.java +++ b/src/test/java/neqsim/processsimulation/processsystem/GlycolModulesTest.java @@ -403,6 +403,6 @@ public void runProcessTEG() throws InterruptedException { } catch (Exception ex) { } - System.out.println(splitterGasToFlare.getSplitStream(1).getFlowRate("kg/hr")); + // System.out.println(splitterGasToFlare.getSplitStream(1).getFlowRate("kg/hr")); } } diff --git a/src/test/java/neqsim/processsimulation/processsystem/OilGasProcessTest.java b/src/test/java/neqsim/processsimulation/processsystem/OilGasProcessTest.java index 67f93b79c..946479700 100644 --- a/src/test/java/neqsim/processsimulation/processsystem/OilGasProcessTest.java +++ b/src/test/java/neqsim/processsimulation/processsystem/OilGasProcessTest.java @@ -295,7 +295,7 @@ public void runAntiSurgeProcess2() throws InterruptedException { Recycle recycl = new Recycle("rec"); recycl.addStream(antisurgevalve.getOutletStream()); recycl.setOutletStream(recyclegasstream); - recycl.setFlowAccuracy(1e-2); + recycl.setFlowTolerance(1e-2); neqsim.processsimulation.processsystem.ProcessSystem operations = new neqsim.processsimulation.processsystem.ProcessSystem(); diff --git a/src/test/java/neqsim/processsimulation/processsystem/ProcessSystemRunTransientTest.java b/src/test/java/neqsim/processsimulation/processsystem/ProcessSystemRunTransientTest.java index 9924376cc..f7ec65b5f 100644 --- a/src/test/java/neqsim/processsimulation/processsystem/ProcessSystemRunTransientTest.java +++ b/src/test/java/neqsim/processsimulation/processsystem/ProcessSystemRunTransientTest.java @@ -633,7 +633,7 @@ public void testAntiSurgeControl() { Recycle recycle = new Recycle("recycle 1"); recycle.addStream(recycleValve.getOutletStream()); recycle.setOutletStream(resycstream); - recycle.setFlowAccuracy(1e-4); + recycle.setFlowTolerance(1e-4); ThrottlingValve valve2 = new ThrottlingValve("valve_2", splitter.getSplitStream(0)); valve2.setOutletPressure(50.0); diff --git a/src/test/java/neqsim/processsimulation/processsystem/ProcessSystemTest.java b/src/test/java/neqsim/processsimulation/processsystem/ProcessSystemTest.java index c1519845c..2a18b5784 100644 --- a/src/test/java/neqsim/processsimulation/processsystem/ProcessSystemTest.java +++ b/src/test/java/neqsim/processsimulation/processsystem/ProcessSystemTest.java @@ -783,6 +783,7 @@ public void testRun_step() { Recycle recycleGasFromStripper = new Recycle("stripping gas recirc"); recycleGasFromStripper.addStream(stripper.getGasOutStream()); recycleGasFromStripper.setOutletStream(gasToReboiler); + recycleGasFromStripper.setTolerance(1.0e-2); neqsim.thermo.system.SystemInterface pureTEG = (neqsim.thermo.system.SystemInterface) feedGas.clone(); From df5659e7450b45bf334b8a5795805e041efc83b2 Mon Sep 17 00:00:00 2001 From: Even Solbraa <41290109+EvenSol@users.noreply.github.com> Date: Sun, 3 Nov 2024 09:31:49 +0100 Subject: [PATCH 02/21] added error pressure (#1160) --- .../processequipment/util/Recycle.java | 91 +++++++++++++++---- 1 file changed, 72 insertions(+), 19 deletions(-) diff --git a/src/main/java/neqsim/processsimulation/processequipment/util/Recycle.java b/src/main/java/neqsim/processsimulation/processequipment/util/Recycle.java index fdd107f2b..d5a3537c8 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/util/Recycle.java +++ b/src/main/java/neqsim/processsimulation/processequipment/util/Recycle.java @@ -35,9 +35,11 @@ public class Recycle extends ProcessEquipmentBaseClass implements MixerInterface private double errorComposition = 1e10; private double errorFlow = 1e10; private double errorTemperature = 1e10; + private double errorPressure = 1e10; private double flowTolerance = 1e-2; private double compositionTolerance = 1e-2; private double temperatureTolerance = 1e-2; + private double pressureTolerance = 1e-2; /** *

@@ -181,7 +183,9 @@ public void addStream(StreamInterface newStream) { *

* * @param i a int - * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @return a + * {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * object */ public StreamInterface getStream(int i) { return streams.get(i); @@ -200,13 +204,11 @@ public void mixStream() { for (int i = 0; i < streams.get(k).getThermoSystem().getPhase(0) .getNumberOfComponents(); i++) { boolean gotComponent = false; - String componentName = - streams.get(k).getThermoSystem().getPhase(0).getComponent(i).getName(); + String componentName = streams.get(k).getThermoSystem().getPhase(0).getComponent(i).getName(); // logger.info("adding: " + componentName); // int numberOfPhases = streams.get(k).getThermoSystem().getNumberOfPhases(); - double moles = - streams.get(k).getThermoSystem().getPhase(0).getComponent(i).getNumberOfmoles(); + double moles = streams.get(k).getThermoSystem().getPhase(0).getComponent(i).getNumberOfmoles(); // logger.info("moles: " + moles + " " + // mixedStream.getThermoSystem().getPhase(0).getNumberOfComponents()); for (int p = 0; p < mixedStream.getThermoSystem().getPhase(0) @@ -214,8 +216,7 @@ public void mixStream() { if (mixedStream.getThermoSystem().getPhase(0).getComponent(p).getName() .equals(componentName)) { gotComponent = true; - index = - streams.get(0).getThermoSystem().getPhase(0).getComponent(p).getComponentNumber(); + index = streams.get(0).getThermoSystem().getPhase(0).getComponent(p).getComponentNumber(); // compName = streams.get(0).getThermoSystem().getPhase(0).getComponent(p) // .getComponentName(); } @@ -285,8 +286,9 @@ public StreamInterface getOutStream() { * initiateDownstreamProperties. *

* - * @param outstream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} - * object + * @param outstream a + * {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * object */ public void initiateDownstreamProperties(StreamInterface outstream) { lastIterationStream = outstream.clone(); @@ -349,6 +351,7 @@ public void run(UUID id) { setErrorCompositon(compositionBalanceCheck()); setErrorFlow(flowBalanceCheck()); setErrorTemperature(temperatureBalanceCheck()); + setErrorPressure(pressureBalanceCheck()); lastIterationStream = mixedStream.clone(); outletStream.setThermoSystem(mixedStream.getThermoSystem()); outletStream.setCalculationIdentifier(id); @@ -374,12 +377,10 @@ public void run(UUID id) { public double flowBalanceCheck() { double abs_sum_errorFlow = 0.0; if (mixedStream.getFlowRate("kg/sec") < 1.0) { - abs_sum_errorFlow += - Math.abs(mixedStream.getFlowRate("kg/sec") - lastIterationStream.getFlowRate("kg/sec")); + abs_sum_errorFlow += Math.abs(mixedStream.getFlowRate("kg/sec") - lastIterationStream.getFlowRate("kg/sec")); } else { - abs_sum_errorFlow += - Math.abs(mixedStream.getFlowRate("kg/sec") - lastIterationStream.getFlowRate("kg/sec")) - / mixedStream.getFlowRate("kg/sec") * 100.0; + abs_sum_errorFlow += Math.abs(mixedStream.getFlowRate("kg/sec") - lastIterationStream.getFlowRate("kg/sec")) + / mixedStream.getFlowRate("kg/sec") * 100.0; } return abs_sum_errorFlow; } @@ -406,7 +407,6 @@ public double compositionBalanceCheck() { return abs_sum_error; } - /** *

* temperatureBalanceCheck. @@ -424,9 +424,27 @@ public double temperatureBalanceCheck() { return error; } + /** + *

+ * pressureBalanceCheck. + *

+ * + * @return a double + */ + public double pressureBalanceCheck() { + double error = 0.0; + for (int i = 0; i < mixedStream.getThermoSystem().getNumberOfPhases(); i++) { + error += Math.abs((mixedStream.getThermoSystem().getPhase(i).getPressure() + - lastIterationStream.getThermoSystem().getPhase(i).getPressure()) + / lastIterationStream.getThermoSystem().getPhase(i).getPressure()) * 100.0; + } + return error; + } + /** {@inheritDoc} */ @Override - public void displayResult() {} + public void displayResult() { + } /** {@inheritDoc} */ @Override @@ -476,6 +494,17 @@ public void setErrorTemperature(double errorTemperature) { this.errorTemperature = errorTemperature; } + /** + *

+ * Setter for the field errorPressure. + *

+ * + * @param errorPressure the errorPressure to set + */ + public void setErrorPressure(double errorPressure) { + this.errorPressure = errorPressure; + } + /** *

* Setter for the field errorFlow. @@ -498,6 +527,28 @@ public double getErrorFlow() { return errorFlow; } + /** + *

+ * Getter for the field errorTemperature. + *

+ * + * @return a double + */ + public double getErrorTemperature() { + return errorTemperature; + } + + /** + *

+ * Getter for the field errorPressure. + *

+ * + * @return a double + */ + public double getErrorPressure() { + return errorPressure; + } + /** *

* Setter for the field errorComposition. @@ -547,7 +598,8 @@ public void setPriority(int priority) { public boolean solved() { if (Math.abs(this.errorComposition) < compositionTolerance && Math.abs(this.errorFlow) < flowTolerance - && Math.abs(this.errorTemperature) < temperatureTolerance && iterations > 1) { + && Math.abs(this.errorTemperature) < temperatureTolerance + && Math.abs(this.errorPressure) < pressureTolerance && iterations > 1) { return true; } else { return false; @@ -576,8 +628,9 @@ public StreamInterface getOutletStream() { * Setter for the field outletStream. *

* - * @param outletStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} - * object + * @param outletStream a + * {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * object */ public void setOutletStream(StreamInterface outletStream) { this.outletStream = outletStream; From 76c9d739b7c92b4ec7342ebaf7fe69915a89a6f5 Mon Sep 17 00:00:00 2001 From: Even Solbraa <41290109+EvenSol@users.noreply.github.com> Date: Sun, 3 Nov 2024 10:20:25 +0100 Subject: [PATCH 03/21] change process package names (#1161) * changed process package names * update * update --- .../SimulationBaseClass.java | 2 +- .../SimulationInterface.java | 2 +- .../conditionmonitor/ConditionMonitor.java | 16 ++--- .../ConditionMonitorSpecifications.java | 2 +- .../ControllerDeviceBaseClass.java | 4 +- .../ControllerDeviceInterface.java | 6 +- .../costestimation/CostEstimateBaseClass.java | 10 +-- .../UnitCostEstimateBaseClass.java | 6 +- .../compressor/CompressorCostEstimate.java | 8 +-- .../separator/SeparatorCostEstimate.java | 8 +-- .../valve/ValveCostEstimate.java | 8 +-- .../equipment}/ProcessEquipmentBaseClass.java | 18 ++--- .../equipment}/ProcessEquipmentInterface.java | 16 ++--- .../equipment}/TwoPortEquipment.java | 4 +- .../equipment}/TwoPortInterface.java | 6 +- .../absorber/AbsorberInterface.java | 4 +- .../equipment}/absorber/SimpleAbsorber.java | 20 +++--- .../absorber/SimpleTEGAbsorber.java | 22 +++--- .../absorber/WaterStripperColumn.java | 18 ++--- .../equipment}/adsorber/SimpleAdsorber.java | 14 ++-- .../equipment}/compressor/AntiSurge.java | 2 +- .../equipment}/compressor/Compressor.java | 22 +++--- .../compressor/CompressorChart.java | 2 +- .../CompressorChartAlternativeMapLookup.java | 10 +-- .../compressor/CompressorChartGenerator.java | 6 +- .../compressor/CompressorChartInterface.java | 10 +-- .../compressor/CompressorCurve.java | 2 +- .../compressor/CompressorInterface.java | 8 +-- .../compressor/CompressorPropertyProfile.java | 2 +- .../equipment}/compressor/StoneWallCurve.java | 2 +- .../equipment}/compressor/SurgeCurve.java | 2 +- .../equipment}/distillation/Condenser.java | 10 +-- .../distillation/DistillationColumn.java | 32 ++++----- .../distillation/DistillationInterface.java | 4 +- .../equipment}/distillation/Reboiler.java | 4 +- .../equipment}/distillation/SimpleTray.java | 12 ++-- .../distillation/TrayInterface.java | 8 +-- .../equipment}/distillation/VLSolidTray.java | 6 +- .../equipment}/expander/Expander.java | 8 +-- .../expander/ExpanderInterface.java | 6 +- .../equipment}/expander/ExpanderOld.java | 8 +-- .../equipment}/filter/CharCoalFilter.java | 4 +- .../equipment}/filter/Filter.java | 10 +-- .../equipment}/heatexchanger/Cooler.java | 8 +-- .../heatexchanger/HeatExchanger.java | 18 ++--- .../heatexchanger/HeatExchangerInterface.java | 21 ++++++ .../equipment}/heatexchanger/Heater.java | 12 ++-- .../heatexchanger/HeaterInterface.java | 4 +- .../equipment}/heatexchanger/NeqHeater.java | 4 +- .../equipment}/heatexchanger/ReBoiler.java | 8 +-- .../equipment}/manifold/Manifold.java | 16 ++--- .../equipment}/mixer/Mixer.java | 8 +-- .../equipment}/mixer/MixerInterface.java | 14 ++-- .../equipment}/mixer/StaticMixer.java | 2 +- .../equipment}/mixer/StaticNeqMixer.java | 2 +- .../equipment}/mixer/StaticPhaseMixer.java | 2 +- .../equipment}/pipeline/AdiabaticPipe.java | 10 +-- .../pipeline/AdiabaticTwoPhasePipe.java | 4 +- .../equipment}/pipeline/Fittings.java | 2 +- .../pipeline/IncompressiblePipeFlow.java | 10 +-- .../equipment}/pipeline/OnePhasePipeLine.java | 6 +- .../pipeline/PipeBeggsAndBrills.java | 4 +- .../pipeline/PipeLineInterface.java | 6 +- .../equipment}/pipeline/Pipeline.java | 10 +-- .../pipeline/SimpleTPoutPipeline.java | 4 +- .../equipment}/pipeline/TwoPhasePipeLine.java | 6 +- .../powergeneration/GasTurbine.java | 20 +++--- .../equipment}/pump/Pump.java | 12 ++-- .../equipment}/pump/PumpChart.java | 8 +-- .../equipment}/pump/PumpChartInterface.java | 2 +- .../equipment}/pump/PumpCurve.java | 2 +- .../equipment}/pump/PumpInterface.java | 6 +- .../equipment}/reservoir/ReservoirCVDsim.java | 4 +- .../reservoir/ReservoirDiffLibsim.java | 4 +- .../equipment}/reservoir/ReservoirTPsim.java | 10 +-- .../equipment}/reservoir/SimpleReservoir.java | 36 +++++----- .../equipment}/reservoir/Well.java | 8 +-- .../equipment}/reservoir/WellFlow.java | 6 +- .../equipment}/separator/GasScrubber.java | 8 +-- .../separator/GasScrubberSimple.java | 10 +-- .../equipment}/separator/Hydrocyclone.java | 12 ++-- .../equipment}/separator/NeqGasScrubber.java | 12 ++-- .../equipment}/separator/Separator.java | 44 ++++++------ .../separator/SeparatorInterface.java | 4 +- .../separator/ThreePhaseSeparator.java | 14 ++-- .../separator/TwoPhaseSeparator.java | 8 +-- .../separator/sectiontype/ManwaySection.java | 8 +-- .../separator/sectiontype/MeshSection.java | 8 +-- .../separator/sectiontype/NozzleSection.java | 8 +-- .../separator/sectiontype/PackedSection.java | 6 +- .../sectiontype/SeparatorSection.java | 8 +-- .../separator/sectiontype/ValveSection.java | 8 +-- .../separator/sectiontype/VaneSection.java | 8 +-- .../splitter/ComponentSplitter.java | 14 ++-- .../equipment}/splitter/Splitter.java | 12 ++-- .../splitter/SplitterInterface.java | 10 +-- .../equipment}/stream/EnergyStream.java | 2 +- .../equipment}/stream/EquilibriumStream.java | 2 +- .../stream/IronIonSaturationStream.java | 2 +- .../equipment}/stream/NeqStream.java | 2 +- .../stream/ScalePotentialCheckStream.java | 2 +- .../equipment}/stream/Stream.java | 8 +-- .../equipment}/stream/StreamInterface.java | 8 +-- .../equipment}/stream/VirtualStream.java | 10 +-- .../equipment}/subsea/SimpleFlowLine.java | 12 ++-- .../equipment}/subsea/SubseaWell.java | 20 +++--- .../equipment}/tank/Tank.java | 24 +++---- .../equipment}/util/Adjuster.java | 22 +++--- .../equipment}/util/Calculator.java | 18 ++--- .../equipment}/util/FlowRateAdjuster.java | 16 ++--- .../equipment}/util/FlowSetter.java | 24 +++---- .../equipment}/util/GORfitter.java | 8 +-- .../equipment}/util/MPFMfitter.java | 10 +-- .../util/MoleFractionControllerUtil.java | 10 +-- .../equipment}/util/NeqSimUnit.java | 10 +-- .../equipment}/util/PressureDrop.java | 8 +-- .../equipment}/util/Recycle.java | 40 +++++------ .../equipment}/util/RecycleController.java | 8 +-- .../equipment}/util/SetPoint.java | 28 ++++---- .../equipment}/util/StreamSaturatorUtil.java | 8 +-- .../equipment}/util/StreamTransition.java | 12 ++-- .../equipment}/valve/SafetyValve.java | 6 +- .../equipment}/valve/ThrottlingValve.java | 12 ++-- .../equipment}/valve/ValveInterface.java | 6 +- .../CombustionEmissionsCalculator.java | 8 +-- .../measurementdevice/CompressorMonitor.java | 8 +-- .../CricondenbarAnalyser.java | 8 +-- .../FlowInducedVibrationAnalyser.java | 8 +-- ...HydrateEquilibriumTemperatureAnalyser.java | 6 +- .../measurementdevice/LevelTransmitter.java | 8 +-- .../MeasurementDeviceBaseClass.java | 4 +- .../MeasurementDeviceInterface.java | 6 +- .../measurementdevice/MolarMassAnalyser.java | 8 +-- .../measurementdevice/MultiPhaseMeter.java | 8 +-- .../measurementdevice/NMVOCAnalyser.java | 8 +-- .../PressureTransmitter.java | 8 +-- .../StreamMeasurementDeviceBaseClass.java | 4 +- .../TemperatureTransmitter.java | 8 +-- .../VolumeFlowTransmitter.java | 8 +-- .../WaterContentAnalyser.java | 8 +-- .../WaterDewPointAnalyser.java | 8 +-- .../measurementdevice/WellAllocator.java | 12 ++-- .../online/OnlineSignal.java | 2 +- .../measurementdevice/pHProbe.java | 8 +-- .../simpleflowregime/FluidSevereSlug.java | 2 +- .../simpleflowregime/Pipe.java | 2 +- .../simpleflowregime/SevereSlugAnalyser.java | 42 +++++------ .../mechanicaldesign/MechanicalDesign.java | 28 ++++---- .../SystemMechanicalDesign.java | 10 +-- .../absorber/AbsorberMechanicalDesign.java | 20 +++--- .../adsorber/AdsorberMechanicalDesign.java | 16 ++--- .../CompressorMechanicalDesign.java | 18 ++--- .../AbsorptionColumnDesignStandard.java | 6 +- .../AdsorptionDehydrationDesignStandard.java | 6 +- .../CompressorDesignStandard.java | 6 +- .../designstandards/DesignStandard.java | 6 +- .../GasScrubberDesignStandard.java | 6 +- .../JointEfficiencyPipelineStandard.java | 6 +- .../JointEfficiencyPlateStandard.java | 6 +- .../MaterialPipeDesignStandard.java | 6 +- .../MaterialPlateDesignStandard.java | 6 +- .../PipelineDesignStandard.java | 6 +- .../designstandards/PipingDesignStandard.java | 6 +- .../PressureVesselDesignStandard.java | 8 +-- .../SeparatorDesignStandard.java | 10 +-- .../designstandards/ValveDesignStandard.java | 6 +- .../pipeline/PipelineMechanicalDesign.java | 20 +++--- .../GasScrubberMechanicalDesign.java | 16 ++--- .../separator/SeparatorMechanicalDesign.java | 22 +++--- .../sectiontype/DistillationTraySection.java | 6 +- .../separator/sectiontype/MecMeshSection.java | 6 +- .../sectiontype/MechManwaySection.java | 6 +- .../sectiontype/MechNozzleSection.java | 6 +- .../sectiontype/MechVaneSection.java | 6 +- .../sectiontype/SepDesignSection.java | 6 +- .../valve/ValveMechanicalDesign.java | 14 ++-- .../processmodel}/ModuleInterface.java | 14 ++-- .../processmodel}/ProcessModule.java | 12 ++-- .../processmodel}/ProcessModuleBaseClass.java | 18 ++--- .../processmodel}/ProcessSystem.java | 46 ++++++------ .../AdsorptionDehydrationlModule.java | 22 +++--- .../processmodules/CO2RemovalModule.java | 8 +-- .../processmodules/DPCUModule.java | 38 +++++----- .../GlycolDehydrationlModule.java | 32 ++++----- .../processmodules/MEGReclaimerModule.java | 18 ++--- .../MixerGasProcessingModule.java | 26 +++---- .../processmodules/PropaneCoolingModule.java | 18 ++--- .../processmodules/SeparationTrainModule.java | 30 ++++---- .../SeparationTrainModuleSimple.java | 30 ++++---- .../processmodules/WellFluidModule.java | 24 +++---- .../util/monitor/CompressorResponse.java | 6 +- .../util/monitor/FluidComponentResponse.java | 2 +- .../util/monitor/FluidResponse.java | 2 +- .../util/monitor/HXResponse.java | 6 +- .../util/monitor/HeaterResponse.java | 6 +- .../util/monitor/MPMResponse.java | 6 +- .../util/monitor/PumpResponse.java | 6 +- .../util/monitor/SeparatorResponse.java | 10 +-- .../util/monitor/StreamResponse.java | 6 +- .../monitor/ThreePhaseSeparatorResponse.java | 10 +-- .../util/monitor/Value.java | 2 +- .../util/monitor/ValveResponse.java | 6 +- .../util/monitor/WellAllocatorResponse.java | 6 +- .../util/report/Report.java | 20 +++--- .../heatexchanger/HeatExchangerInterface.java | 21 ------ .../neqsim/thermo/system/SystemThermo.java | 4 +- .../util/example/WettedWall_CO2_water.java | 10 +-- .../ControllerDeviceBaseClassTest.java | 1 + .../CombustionEmissionsCalculatorTest.java | 3 +- .../FLowInducedVibrationTest.java | 13 ++-- .../MultiPhaseMeterTest.java | 7 +- .../measurementdevice/WellAllocatorTest.java | 13 ++-- .../measurementdevice/nmVOCTest.java | 5 +- .../measurementdevice/pHProbeTest.java | 5 +- .../simpleflowregime/SevereSlugTest.java | 3 +- .../SystemMechanicalDesignTest.java | 47 ++++++------ .../absorber/SimpleAbsorberTest.java | 6 +- .../adsorber/SimpleAdsorberTest.java | 6 +- .../compressor/CompressorCalculationTest.java | 7 +- .../compressor/CompressorChartTest.java | 8 ++- .../CompressorPropertyProfileTest.java | 8 +-- .../compressor/CompressorTest.java | 19 ++--- .../distillation/DistillationColumnTest.java | 6 +- .../heatexchanger/HeatExchangerTest.java | 23 +++--- .../heatexchanger/HeaterTest.java | 5 +- .../manifold/ManifoldTest.java | 5 +- .../processequipment/mixer/MixerTest.java | 9 +-- .../pipeline/AdiabaticTwoPhasePipeTest.java | 7 +- .../pipeline/BeggsAndBrillsPipeTest.java | 27 +++---- .../pipeline/PipelineTest.java | 9 ++- .../powergeneration/GasTurbineTest.java | 3 +- .../processequipment/pump/PumpChartTest.java | 1 + .../processequipment/pump/PumpTest.java | 3 +- .../reservoir/SimpleReservoirTest.java | 3 +- .../reservoir/WellFlowTest.java | 52 +++++++------- .../separator/SeparatorTest.java | 9 +-- .../separator/ThreePhaseSeparatorTest.java | 6 +- .../splitter/ComponentSplitterTest.java | 16 +++-- .../processequipment/stream/StreamTest.java | 3 +- .../stream/VirtualStreamTest.java | 4 +- .../processequipment/util/AdjusterTest.java | 32 ++++----- .../processequipment/util/FlowSetterTest.java | 17 ++--- .../processequipment/util/GORfitterTest.java | 9 +-- .../processequipment/util/MPFMfitterTest.java | 9 +-- .../util/PressureDropTest.java | 3 +- .../util/StreamSaturatorUtilTest.java | 5 +- .../valve/ThrottlingValveTest.java | 3 +- .../CombinedOilGasFieldTest.java | 8 +-- .../processsystem/CompressorModule.java | 30 ++++---- .../processsystem/GlycolModulesTest.java | 72 +++++++++---------- .../processsystem/GlycolRigTest.java | 33 ++++----- .../processsystem/MLA_bug_test.java | 33 ++++----- .../processsystem/OilGasProcessTest.java | 56 +++++++-------- .../processsystem/OilProcessTest.java | 1 + .../ProcessSystemControllerTest.java | 13 ++-- .../ProcessSystemRunTransientTest.java | 47 ++++++------ .../ProcessSystemSerializationTest.java | 42 +++++------ .../processsystem/ProcessSystemTest.java | 47 ++++++------ .../processsystem/ReferenceProcessTest.java | 48 ++++++------- .../processsystem/waterDegasserTest.java | 40 +++++------ .../util/example/LNGfilling.java | 10 +-- .../util/example/LNGfilling2.java | 12 ++-- .../util/example/LNGtankfilling.java | 18 ++--- .../util/example/MEGinjection.java | 24 +++---- .../util/example/MasstransferMeOH.java | 18 ++--- .../util/example/OffshoreProcess.java | 22 +++--- .../util/example/OffshoreProcess2.java | 14 ++-- .../util/example/OffshoreProcess3.java | 26 +++---- .../util/example/OnshoreMEGprocess.java | 38 +++++----- .../util/example/OnshoreProcess1.java | 32 ++++----- .../util/example/TEGAbsorberTest.java | 20 +++--- .../util/example/TEGdehydrationProcess2.java | 28 ++++---- .../TEGdehydrationProcessDistillation.java | 34 ++++----- .../TEGdehydrationProcessDistillation3.java | 34 ++++----- ...TEGdehydrationProcessDistillationAaHa.java | 44 ++++++------ .../TEGdehydrationProcessDistillationGFA.java | 50 ++++++------- .../TEGdehydrationProcessDistillationJS.java | 42 +++++------ .../util/example/TEGstripperProcess.java | 8 +-- .../util/example/TestMechanicalDesign.java | 8 +-- .../util/example/TestNeqsim.java | 8 +-- .../util/example/TestOnlineProcess.java | 10 +-- .../util/example/TestProcess4.java | 8 +-- .../util/example/TestSeparationTrain.java | 22 +++--- .../util/example/TestSlugcatcher.java | 12 ++-- .../util/example/TestTransientFlow.java | 18 ++--- .../util/example/TestTransientFlow2.java | 16 ++--- .../util/example/WellStreamMixer.java | 10 +-- .../util/example/compressorTest.java | 16 ++--- .../util/example/compressorTest12.java | 4 +- .../util/example/compressorTest_1.java | 8 +-- .../util/example/destillation1.java | 12 ++-- .../util/example/destillation2.java | 8 +-- .../util/example/expander1.java | 10 +-- .../util/example/gasPipeline.java | 12 ++-- .../util/example/multiThreadTest.java | 24 +++---- .../util/example/oxygenRemovalWater.java | 14 ++-- .../util/example/process1.java | 10 +-- .../util/example/process1Test.java | 10 +-- .../util/example/process2.java | 20 +++--- .../util/example/processCO2MDEA.java | 10 +-- .../util/example/propaneCoolingCycle.java | 16 ++--- .../propaneMultiStageCoolingCycle.java | 14 ++-- .../example/propaneTwoStageCoolingCycle.java | 20 +++--- .../util/example/shtokman.java | 14 ++-- .../util/example/shtokman_MEG.java | 10 +-- .../util/example/simpleGasScrubber.java | 8 +-- .../util/example/simpleTopSideProcess.java | 22 +++--- .../util/example/simpleTopSideProcess2.java | 18 ++--- .../util/example/testGasScrubber.java | 12 ++-- .../util/example/threePhaseSeparation.java | 12 ++-- .../util/example/threePhaseSeparation_1.java | 8 +-- .../util/monitor/SeparatorResponseTest.java | 12 ++-- .../util/report/ReportTest.java | 13 ++-- .../thermo/util/example/ReadFluidData2.java | 6 +- 314 files changed, 2013 insertions(+), 1966 deletions(-) rename src/main/java/neqsim/{processsimulation => process}/SimulationBaseClass.java (98%) rename src/main/java/neqsim/{processsimulation => process}/SimulationInterface.java (99%) rename src/main/java/neqsim/{processsimulation => process}/conditionmonitor/ConditionMonitor.java (71%) rename src/main/java/neqsim/{processsimulation => process}/conditionmonitor/ConditionMonitorSpecifications.java (90%) rename src/main/java/neqsim/{processsimulation => process}/controllerdevice/ControllerDeviceBaseClass.java (97%) rename src/main/java/neqsim/{processsimulation => process}/controllerdevice/ControllerDeviceInterface.java (92%) rename src/main/java/neqsim/{processsimulation => process}/costestimation/CostEstimateBaseClass.java (85%) rename src/main/java/neqsim/{processsimulation => process}/costestimation/UnitCostEstimateBaseClass.java (87%) rename src/main/java/neqsim/{processsimulation => process}/costestimation/compressor/CompressorCostEstimate.java (70%) rename src/main/java/neqsim/{processsimulation => process}/costestimation/separator/SeparatorCostEstimate.java (70%) rename src/main/java/neqsim/{processsimulation => process}/costestimation/valve/ValveCostEstimate.java (70%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/ProcessEquipmentBaseClass.java (91%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/ProcessEquipmentInterface.java (86%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/TwoPortEquipment.java (95%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/TwoPortInterface.java (91%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/absorber/AbsorberInterface.java (69%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/absorber/SimpleAbsorber.java (91%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/absorber/SimpleTEGAbsorber.java (95%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/absorber/WaterStripperColumn.java (95%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/adsorber/SimpleAdsorber.java (93%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/compressor/AntiSurge.java (97%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/compressor/Compressor.java (98%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/compressor/CompressorChart.java (99%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/compressor/CompressorChartAlternativeMapLookup.java (98%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/compressor/CompressorChartGenerator.java (91%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/compressor/CompressorChartInterface.java (89%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/compressor/CompressorCurve.java (96%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/compressor/CompressorInterface.java (84%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/compressor/CompressorPropertyProfile.java (96%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/compressor/StoneWallCurve.java (98%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/compressor/SurgeCurve.java (98%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/distillation/Condenser.java (92%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/distillation/DistillationColumn.java (95%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/distillation/DistillationInterface.java (68%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/distillation/Reboiler.java (93%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/distillation/SimpleTray.java (92%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/distillation/TrayInterface.java (57%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/distillation/VLSolidTray.java (94%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/expander/Expander.java (92%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/expander/ExpanderInterface.java (58%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/expander/ExpanderOld.java (95%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/filter/CharCoalFilter.java (75%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/filter/Filter.java (86%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/heatexchanger/Cooler.java (81%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/heatexchanger/HeatExchanger.java (96%) create mode 100644 src/main/java/neqsim/process/equipment/heatexchanger/HeatExchangerInterface.java rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/heatexchanger/Heater.java (95%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/heatexchanger/HeaterInterface.java (87%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/heatexchanger/NeqHeater.java (91%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/heatexchanger/ReBoiler.java (87%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/manifold/Manifold.java (77%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/mixer/Mixer.java (98%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/mixer/MixerInterface.java (66%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/mixer/StaticMixer.java (98%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/mixer/StaticNeqMixer.java (98%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/mixer/StaticPhaseMixer.java (98%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/pipeline/AdiabaticPipe.java (96%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/pipeline/AdiabaticTwoPhasePipe.java (98%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/pipeline/Fittings.java (97%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/pipeline/IncompressiblePipeFlow.java (93%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/pipeline/OnePhasePipeLine.java (86%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/pipeline/PipeBeggsAndBrills.java (99%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/pipeline/PipeLineInterface.java (91%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/pipeline/Pipeline.java (96%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/pipeline/SimpleTPoutPipeline.java (94%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/pipeline/TwoPhasePipeLine.java (83%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/powergeneration/GasTurbine.java (89%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/pump/Pump.java (96%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/pump/PumpChart.java (98%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/pump/PumpChartInterface.java (98%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/pump/PumpCurve.java (94%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/pump/PumpInterface.java (65%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/reservoir/ReservoirCVDsim.java (83%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/reservoir/ReservoirDiffLibsim.java (84%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/reservoir/ReservoirTPsim.java (90%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/reservoir/SimpleReservoir.java (94%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/reservoir/Well.java (90%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/reservoir/WellFlow.java (94%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/separator/GasScrubber.java (72%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/separator/GasScrubberSimple.java (90%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/separator/Hydrocyclone.java (87%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/separator/NeqGasScrubber.java (86%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/separator/Separator.java (93%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/separator/SeparatorInterface.java (86%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/separator/ThreePhaseSeparator.java (93%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/separator/TwoPhaseSeparator.java (89%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/separator/sectiontype/ManwaySection.java (69%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/separator/sectiontype/MeshSection.java (72%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/separator/sectiontype/NozzleSection.java (69%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/separator/sectiontype/PackedSection.java (76%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/separator/sectiontype/SeparatorSection.java (91%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/separator/sectiontype/ValveSection.java (71%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/separator/sectiontype/VaneSection.java (72%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/splitter/ComponentSplitter.java (84%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/splitter/Splitter.java (93%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/splitter/SplitterInterface.java (58%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/stream/EnergyStream.java (96%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/stream/EquilibriumStream.java (97%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/stream/IronIonSaturationStream.java (98%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/stream/NeqStream.java (97%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/stream/ScalePotentialCheckStream.java (97%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/stream/Stream.java (98%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/stream/StreamInterface.java (94%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/stream/VirtualStream.java (88%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/subsea/SimpleFlowLine.java (82%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/subsea/SubseaWell.java (88%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/tank/Tank.java (92%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/util/Adjuster.java (92%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/util/Calculator.java (83%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/util/FlowRateAdjuster.java (90%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/util/FlowSetter.java (93%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/util/GORfitter.java (95%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/util/MPFMfitter.java (95%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/util/MoleFractionControllerUtil.java (91%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/util/NeqSimUnit.java (96%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/util/PressureDrop.java (87%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/util/Recycle.java (92%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/util/RecycleController.java (93%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/util/SetPoint.java (83%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/util/StreamSaturatorUtil.java (92%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/util/StreamTransition.java (85%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/valve/SafetyValve.java (86%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/valve/ThrottlingValve.java (98%) rename src/main/java/neqsim/{processsimulation/processequipment => process/equipment}/valve/ValveInterface.java (88%) rename src/main/java/neqsim/{processsimulation => process}/measurementdevice/CombustionEmissionsCalculator.java (90%) rename src/main/java/neqsim/{processsimulation => process}/measurementdevice/CompressorMonitor.java (77%) rename src/main/java/neqsim/{processsimulation => process}/measurementdevice/CricondenbarAnalyser.java (89%) rename src/main/java/neqsim/{processsimulation => process}/measurementdevice/FlowInducedVibrationAnalyser.java (93%) rename src/main/java/neqsim/{processsimulation => process}/measurementdevice/HydrateEquilibriumTemperatureAnalyser.java (91%) rename src/main/java/neqsim/{processsimulation => process}/measurementdevice/LevelTransmitter.java (78%) rename src/main/java/neqsim/{processsimulation => process}/measurementdevice/MeasurementDeviceBaseClass.java (97%) rename src/main/java/neqsim/{processsimulation => process}/measurementdevice/MeasurementDeviceInterface.java (91%) rename src/main/java/neqsim/{processsimulation => process}/measurementdevice/MolarMassAnalyser.java (77%) rename src/main/java/neqsim/{processsimulation => process}/measurementdevice/MultiPhaseMeter.java (96%) rename src/main/java/neqsim/{processsimulation => process}/measurementdevice/NMVOCAnalyser.java (83%) rename src/main/java/neqsim/{processsimulation => process}/measurementdevice/PressureTransmitter.java (73%) rename src/main/java/neqsim/{processsimulation => process}/measurementdevice/StreamMeasurementDeviceBaseClass.java (88%) rename src/main/java/neqsim/{processsimulation => process}/measurementdevice/TemperatureTransmitter.java (75%) rename src/main/java/neqsim/{processsimulation => process}/measurementdevice/VolumeFlowTransmitter.java (89%) rename src/main/java/neqsim/{processsimulation => process}/measurementdevice/WaterContentAnalyser.java (81%) rename src/main/java/neqsim/{processsimulation => process}/measurementdevice/WaterDewPointAnalyser.java (92%) rename src/main/java/neqsim/{processsimulation => process}/measurementdevice/WellAllocator.java (82%) rename src/main/java/neqsim/{processsimulation => process}/measurementdevice/online/OnlineSignal.java (97%) rename src/main/java/neqsim/{processsimulation => process}/measurementdevice/pHProbe.java (91%) rename src/main/java/neqsim/{processsimulation => process}/measurementdevice/simpleflowregime/FluidSevereSlug.java (97%) rename src/main/java/neqsim/{processsimulation => process}/measurementdevice/simpleflowregime/Pipe.java (97%) rename src/main/java/neqsim/{processsimulation => process}/measurementdevice/simpleflowregime/SevereSlugAnalyser.java (92%) rename src/main/java/neqsim/{processsimulation => process}/mechanicaldesign/MechanicalDesign.java (96%) rename src/main/java/neqsim/{processsimulation => process}/mechanicaldesign/SystemMechanicalDesign.java (93%) rename src/main/java/neqsim/{processsimulation => process}/mechanicaldesign/absorber/AbsorberMechanicalDesign.java (88%) rename src/main/java/neqsim/{processsimulation => process}/mechanicaldesign/adsorber/AdsorberMechanicalDesign.java (89%) rename src/main/java/neqsim/{processsimulation => process}/mechanicaldesign/compressor/CompressorMechanicalDesign.java (91%) rename src/main/java/neqsim/{processsimulation => process}/mechanicaldesign/designstandards/AbsorptionColumnDesignStandard.java (89%) rename src/main/java/neqsim/{processsimulation => process}/mechanicaldesign/designstandards/AdsorptionDehydrationDesignStandard.java (91%) rename src/main/java/neqsim/{processsimulation => process}/mechanicaldesign/designstandards/CompressorDesignStandard.java (89%) rename src/main/java/neqsim/{processsimulation => process}/mechanicaldesign/designstandards/DesignStandard.java (90%) rename src/main/java/neqsim/{processsimulation => process}/mechanicaldesign/designstandards/GasScrubberDesignStandard.java (92%) rename src/main/java/neqsim/{processsimulation => process}/mechanicaldesign/designstandards/JointEfficiencyPipelineStandard.java (84%) rename src/main/java/neqsim/{processsimulation => process}/mechanicaldesign/designstandards/JointEfficiencyPlateStandard.java (84%) rename src/main/java/neqsim/{processsimulation => process}/mechanicaldesign/designstandards/MaterialPipeDesignStandard.java (94%) rename src/main/java/neqsim/{processsimulation => process}/mechanicaldesign/designstandards/MaterialPlateDesignStandard.java (93%) rename src/main/java/neqsim/{processsimulation => process}/mechanicaldesign/designstandards/PipelineDesignStandard.java (88%) rename src/main/java/neqsim/{processsimulation => process}/mechanicaldesign/designstandards/PipingDesignStandard.java (65%) rename src/main/java/neqsim/{processsimulation => process}/mechanicaldesign/designstandards/PressureVesselDesignStandard.java (89%) rename src/main/java/neqsim/{processsimulation => process}/mechanicaldesign/designstandards/SeparatorDesignStandard.java (91%) rename src/main/java/neqsim/{processsimulation => process}/mechanicaldesign/designstandards/ValveDesignStandard.java (73%) rename src/main/java/neqsim/{processsimulation => process}/mechanicaldesign/pipeline/PipelineMechanicalDesign.java (85%) rename src/main/java/neqsim/{processsimulation => process}/mechanicaldesign/separator/GasScrubberMechanicalDesign.java (88%) rename src/main/java/neqsim/{processsimulation => process}/mechanicaldesign/separator/SeparatorMechanicalDesign.java (91%) rename src/main/java/neqsim/{processsimulation => process}/mechanicaldesign/separator/sectiontype/DistillationTraySection.java (87%) rename src/main/java/neqsim/{processsimulation => process}/mechanicaldesign/separator/sectiontype/MecMeshSection.java (86%) rename src/main/java/neqsim/{processsimulation => process}/mechanicaldesign/separator/sectiontype/MechManwaySection.java (78%) rename src/main/java/neqsim/{processsimulation => process}/mechanicaldesign/separator/sectiontype/MechNozzleSection.java (84%) rename src/main/java/neqsim/{processsimulation => process}/mechanicaldesign/separator/sectiontype/MechVaneSection.java (86%) rename src/main/java/neqsim/{processsimulation => process}/mechanicaldesign/separator/sectiontype/SepDesignSection.java (88%) rename src/main/java/neqsim/{processsimulation => process}/mechanicaldesign/valve/ValveMechanicalDesign.java (84%) rename src/main/java/neqsim/{processsimulation/processsystem => process/processmodel}/ModuleInterface.java (77%) rename src/main/java/neqsim/{processsimulation/processsystem => process/processmodel}/ProcessModule.java (94%) rename src/main/java/neqsim/{processsimulation/processsystem => process/processmodel}/ProcessModuleBaseClass.java (88%) rename src/main/java/neqsim/{processsimulation/processsystem => process/processmodel}/ProcessSystem.java (93%) rename src/main/java/neqsim/{processsimulation/processsystem => process/processmodel}/processmodules/AdsorptionDehydrationlModule.java (90%) rename src/main/java/neqsim/{processsimulation/processsystem => process/processmodel}/processmodules/CO2RemovalModule.java (90%) rename src/main/java/neqsim/{processsimulation/processsystem => process/processmodel}/processmodules/DPCUModule.java (89%) rename src/main/java/neqsim/{processsimulation/processsystem => process/processmodel}/processmodules/GlycolDehydrationlModule.java (94%) rename src/main/java/neqsim/{processsimulation/processsystem => process/processmodel}/processmodules/MEGReclaimerModule.java (89%) rename src/main/java/neqsim/{processsimulation/processsystem => process/processmodel}/processmodules/MixerGasProcessingModule.java (91%) rename src/main/java/neqsim/{processsimulation/processsystem => process/processmodel}/processmodules/PropaneCoolingModule.java (91%) rename src/main/java/neqsim/{processsimulation/processsystem => process/processmodel}/processmodules/SeparationTrainModule.java (92%) rename src/main/java/neqsim/{processsimulation/processsystem => process/processmodel}/processmodules/SeparationTrainModuleSimple.java (92%) rename src/main/java/neqsim/{processsimulation/processsystem => process/processmodel}/processmodules/WellFluidModule.java (90%) rename src/main/java/neqsim/{processsimulation => process}/util/monitor/CompressorResponse.java (91%) rename src/main/java/neqsim/{processsimulation => process}/util/monitor/FluidComponentResponse.java (98%) rename src/main/java/neqsim/{processsimulation => process}/util/monitor/FluidResponse.java (99%) rename src/main/java/neqsim/{processsimulation => process}/util/monitor/HXResponse.java (84%) rename src/main/java/neqsim/{processsimulation => process}/util/monitor/HeaterResponse.java (72%) rename src/main/java/neqsim/{processsimulation => process}/util/monitor/MPMResponse.java (77%) rename src/main/java/neqsim/{processsimulation => process}/util/monitor/PumpResponse.java (91%) rename src/main/java/neqsim/{processsimulation => process}/util/monitor/SeparatorResponse.java (81%) rename src/main/java/neqsim/{processsimulation => process}/util/monitor/StreamResponse.java (98%) rename src/main/java/neqsim/{processsimulation => process}/util/monitor/ThreePhaseSeparatorResponse.java (74%) rename src/main/java/neqsim/{processsimulation => process}/util/monitor/Value.java (89%) rename src/main/java/neqsim/{processsimulation => process}/util/monitor/ValveResponse.java (80%) rename src/main/java/neqsim/{processsimulation => process}/util/monitor/WellAllocatorResponse.java (75%) rename src/main/java/neqsim/{processsimulation => process}/util/report/Report.java (80%) delete mode 100644 src/main/java/neqsim/processsimulation/processequipment/heatexchanger/HeatExchangerInterface.java diff --git a/src/main/java/neqsim/processsimulation/SimulationBaseClass.java b/src/main/java/neqsim/process/SimulationBaseClass.java similarity index 98% rename from src/main/java/neqsim/processsimulation/SimulationBaseClass.java rename to src/main/java/neqsim/process/SimulationBaseClass.java index 84494d32a..63b776867 100644 --- a/src/main/java/neqsim/processsimulation/SimulationBaseClass.java +++ b/src/main/java/neqsim/process/SimulationBaseClass.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation; +package neqsim.process; import java.util.UUID; import neqsim.util.NamedBaseClass; diff --git a/src/main/java/neqsim/processsimulation/SimulationInterface.java b/src/main/java/neqsim/process/SimulationInterface.java similarity index 99% rename from src/main/java/neqsim/processsimulation/SimulationInterface.java rename to src/main/java/neqsim/process/SimulationInterface.java index ef7ca9670..3bd5962eb 100644 --- a/src/main/java/neqsim/processsimulation/SimulationInterface.java +++ b/src/main/java/neqsim/process/SimulationInterface.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation; +package neqsim.process; import java.io.Serializable; import java.util.UUID; diff --git a/src/main/java/neqsim/processsimulation/conditionmonitor/ConditionMonitor.java b/src/main/java/neqsim/process/conditionmonitor/ConditionMonitor.java similarity index 71% rename from src/main/java/neqsim/processsimulation/conditionmonitor/ConditionMonitor.java rename to src/main/java/neqsim/process/conditionmonitor/ConditionMonitor.java index b29c49c1f..cfb1dd09a 100644 --- a/src/main/java/neqsim/processsimulation/conditionmonitor/ConditionMonitor.java +++ b/src/main/java/neqsim/process/conditionmonitor/ConditionMonitor.java @@ -1,7 +1,7 @@ -package neqsim.processsimulation.conditionmonitor; +package neqsim.process.conditionmonitor; import java.util.ArrayList; -import neqsim.processsimulation.processsystem.ProcessSystem; +import neqsim.process.processmodel.ProcessSystem; /** *

@@ -29,7 +29,7 @@ public ConditionMonitor() {} * Constructor for ConditionMonitor. *

* - * @param refprocess a {@link neqsim.processsimulation.processsystem.ProcessSystem} object + * @param refprocess a {@link neqsim.process.processmodel.ProcessSystem} object */ public ConditionMonitor(ProcessSystem refprocess) { this.refprocess = refprocess; @@ -44,12 +44,12 @@ public ConditionMonitor(ProcessSystem refprocess) { * @param unitName a {@link java.lang.String} object */ public void conditionAnalysis(String unitName) { - neqsim.processsimulation.processequipment.ProcessEquipmentBaseClass refUn = - (neqsim.processsimulation.processequipment.ProcessEquipmentBaseClass) refprocess + neqsim.process.equipment.ProcessEquipmentBaseClass refUn = + (neqsim.process.equipment.ProcessEquipmentBaseClass) refprocess .getUnit(unitName); - ((neqsim.processsimulation.processequipment.ProcessEquipmentInterface) process + ((neqsim.process.equipment.ProcessEquipmentInterface) process .getUnit(unitName)).runConditionAnalysis(refUn); - report += ((neqsim.processsimulation.processequipment.ProcessEquipmentInterface) process + report += ((neqsim.process.equipment.ProcessEquipmentInterface) process .getUnit(unitName)).getConditionAnalysisMessage(); } @@ -81,7 +81,7 @@ public String getReport() { * Getter for the field process. *

* - * @return a {@link neqsim.processsimulation.processsystem.ProcessSystem} object + * @return a {@link neqsim.process.processmodel.ProcessSystem} object */ public ProcessSystem getProcess() { return process; diff --git a/src/main/java/neqsim/processsimulation/conditionmonitor/ConditionMonitorSpecifications.java b/src/main/java/neqsim/process/conditionmonitor/ConditionMonitorSpecifications.java similarity index 90% rename from src/main/java/neqsim/processsimulation/conditionmonitor/ConditionMonitorSpecifications.java rename to src/main/java/neqsim/process/conditionmonitor/ConditionMonitorSpecifications.java index 261f5eff6..f3574ad19 100644 --- a/src/main/java/neqsim/processsimulation/conditionmonitor/ConditionMonitorSpecifications.java +++ b/src/main/java/neqsim/process/conditionmonitor/ConditionMonitorSpecifications.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.conditionmonitor; +package neqsim.process.conditionmonitor; /** *

diff --git a/src/main/java/neqsim/processsimulation/controllerdevice/ControllerDeviceBaseClass.java b/src/main/java/neqsim/process/controllerdevice/ControllerDeviceBaseClass.java similarity index 97% rename from src/main/java/neqsim/processsimulation/controllerdevice/ControllerDeviceBaseClass.java rename to src/main/java/neqsim/process/controllerdevice/ControllerDeviceBaseClass.java index 6f60ac291..28f0c1c44 100644 --- a/src/main/java/neqsim/processsimulation/controllerdevice/ControllerDeviceBaseClass.java +++ b/src/main/java/neqsim/process/controllerdevice/ControllerDeviceBaseClass.java @@ -4,12 +4,12 @@ * Created on 10. oktober 2006, 19:59 */ -package neqsim.processsimulation.controllerdevice; +package neqsim.process.controllerdevice; import java.util.UUID; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.measurementdevice.MeasurementDeviceInterface; +import neqsim.process.measurementdevice.MeasurementDeviceInterface; import neqsim.util.NamedBaseClass; /** diff --git a/src/main/java/neqsim/processsimulation/controllerdevice/ControllerDeviceInterface.java b/src/main/java/neqsim/process/controllerdevice/ControllerDeviceInterface.java similarity index 92% rename from src/main/java/neqsim/processsimulation/controllerdevice/ControllerDeviceInterface.java rename to src/main/java/neqsim/process/controllerdevice/ControllerDeviceInterface.java index ae580c119..ae336a29a 100644 --- a/src/main/java/neqsim/processsimulation/controllerdevice/ControllerDeviceInterface.java +++ b/src/main/java/neqsim/process/controllerdevice/ControllerDeviceInterface.java @@ -1,7 +1,7 @@ -package neqsim.processsimulation.controllerdevice; +package neqsim.process.controllerdevice; import java.util.UUID; -import neqsim.processsimulation.measurementdevice.MeasurementDeviceInterface; +import neqsim.process.measurementdevice.MeasurementDeviceInterface; /** *

@@ -53,7 +53,7 @@ public interface ControllerDeviceInterface extends java.io.Serializable { * setTransmitter. *

* - * @param device a {@link neqsim.processsimulation.measurementdevice.MeasurementDeviceInterface} + * @param device a {@link neqsim.process.measurementdevice.MeasurementDeviceInterface} * object */ public void setTransmitter(MeasurementDeviceInterface device); diff --git a/src/main/java/neqsim/processsimulation/costestimation/CostEstimateBaseClass.java b/src/main/java/neqsim/process/costestimation/CostEstimateBaseClass.java similarity index 85% rename from src/main/java/neqsim/processsimulation/costestimation/CostEstimateBaseClass.java rename to src/main/java/neqsim/process/costestimation/CostEstimateBaseClass.java index e8fb6492d..7510c75e2 100644 --- a/src/main/java/neqsim/processsimulation/costestimation/CostEstimateBaseClass.java +++ b/src/main/java/neqsim/process/costestimation/CostEstimateBaseClass.java @@ -1,11 +1,11 @@ -package neqsim.processsimulation.costestimation; +package neqsim.process.costestimation; import java.util.ArrayList; import java.util.Objects; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.mechanicaldesign.SystemMechanicalDesign; -import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; +import neqsim.process.equipment.ProcessEquipmentInterface; +import neqsim.process.mechanicaldesign.SystemMechanicalDesign; /** *

@@ -27,7 +27,7 @@ public class CostEstimateBaseClass implements java.io.Serializable { * Constructor for CostEstimateBaseClass. *

* - * @param processdesign a {@link neqsim.processsimulation.mechanicaldesign.SystemMechanicalDesign} + * @param processdesign a {@link neqsim.process.mechanicaldesign.SystemMechanicalDesign} * object */ public CostEstimateBaseClass(SystemMechanicalDesign processdesign) { @@ -39,7 +39,7 @@ public CostEstimateBaseClass(SystemMechanicalDesign processdesign) { * Constructor for CostEstimateBaseClass. *

* - * @param processdesign a {@link neqsim.processsimulation.mechanicaldesign.SystemMechanicalDesign} + * @param processdesign a {@link neqsim.process.mechanicaldesign.SystemMechanicalDesign} * @param costFactor cost factor */ public CostEstimateBaseClass(SystemMechanicalDesign processdesign, double costFactor) { diff --git a/src/main/java/neqsim/processsimulation/costestimation/UnitCostEstimateBaseClass.java b/src/main/java/neqsim/process/costestimation/UnitCostEstimateBaseClass.java similarity index 87% rename from src/main/java/neqsim/processsimulation/costestimation/UnitCostEstimateBaseClass.java rename to src/main/java/neqsim/process/costestimation/UnitCostEstimateBaseClass.java index 789433df8..c61509d51 100644 --- a/src/main/java/neqsim/processsimulation/costestimation/UnitCostEstimateBaseClass.java +++ b/src/main/java/neqsim/process/costestimation/UnitCostEstimateBaseClass.java @@ -1,7 +1,7 @@ -package neqsim.processsimulation.costestimation; +package neqsim.process.costestimation; import java.util.Objects; -import neqsim.processsimulation.mechanicaldesign.MechanicalDesign; +import neqsim.process.mechanicaldesign.MechanicalDesign; /** *

@@ -29,7 +29,7 @@ public UnitCostEstimateBaseClass() {} * Constructor for UnitCostEstimateBaseClass. *

* - * @param mechanicalEquipment a {@link neqsim.processsimulation.mechanicaldesign.MechanicalDesign} + * @param mechanicalEquipment a {@link neqsim.process.mechanicaldesign.MechanicalDesign} * object */ public UnitCostEstimateBaseClass(MechanicalDesign mechanicalEquipment) { diff --git a/src/main/java/neqsim/processsimulation/costestimation/compressor/CompressorCostEstimate.java b/src/main/java/neqsim/process/costestimation/compressor/CompressorCostEstimate.java similarity index 70% rename from src/main/java/neqsim/processsimulation/costestimation/compressor/CompressorCostEstimate.java rename to src/main/java/neqsim/process/costestimation/compressor/CompressorCostEstimate.java index f2d159bae..b01193835 100644 --- a/src/main/java/neqsim/processsimulation/costestimation/compressor/CompressorCostEstimate.java +++ b/src/main/java/neqsim/process/costestimation/compressor/CompressorCostEstimate.java @@ -1,7 +1,7 @@ -package neqsim.processsimulation.costestimation.compressor; +package neqsim.process.costestimation.compressor; -import neqsim.processsimulation.costestimation.UnitCostEstimateBaseClass; -import neqsim.processsimulation.mechanicaldesign.compressor.CompressorMechanicalDesign; +import neqsim.process.costestimation.UnitCostEstimateBaseClass; +import neqsim.process.mechanicaldesign.compressor.CompressorMechanicalDesign; /** *

@@ -20,7 +20,7 @@ public class CompressorCostEstimate extends UnitCostEstimateBaseClass { *

* * @param mechanicalEquipment a - * {@link neqsim.processsimulation.mechanicaldesign.compressor.CompressorMechanicalDesign} + * {@link neqsim.process.mechanicaldesign.compressor.CompressorMechanicalDesign} * object */ public CompressorCostEstimate(CompressorMechanicalDesign mechanicalEquipment) { diff --git a/src/main/java/neqsim/processsimulation/costestimation/separator/SeparatorCostEstimate.java b/src/main/java/neqsim/process/costestimation/separator/SeparatorCostEstimate.java similarity index 70% rename from src/main/java/neqsim/processsimulation/costestimation/separator/SeparatorCostEstimate.java rename to src/main/java/neqsim/process/costestimation/separator/SeparatorCostEstimate.java index 4ebbf8d30..83027014d 100644 --- a/src/main/java/neqsim/processsimulation/costestimation/separator/SeparatorCostEstimate.java +++ b/src/main/java/neqsim/process/costestimation/separator/SeparatorCostEstimate.java @@ -1,7 +1,7 @@ -package neqsim.processsimulation.costestimation.separator; +package neqsim.process.costestimation.separator; -import neqsim.processsimulation.costestimation.UnitCostEstimateBaseClass; -import neqsim.processsimulation.mechanicaldesign.separator.SeparatorMechanicalDesign; +import neqsim.process.costestimation.UnitCostEstimateBaseClass; +import neqsim.process.mechanicaldesign.separator.SeparatorMechanicalDesign; /** *

@@ -20,7 +20,7 @@ public class SeparatorCostEstimate extends UnitCostEstimateBaseClass { *

* * @param mechanicalEquipment a - * {@link neqsim.processsimulation.mechanicaldesign.separator.SeparatorMechanicalDesign} + * {@link neqsim.process.mechanicaldesign.separator.SeparatorMechanicalDesign} * object */ public SeparatorCostEstimate(SeparatorMechanicalDesign mechanicalEquipment) { diff --git a/src/main/java/neqsim/processsimulation/costestimation/valve/ValveCostEstimate.java b/src/main/java/neqsim/process/costestimation/valve/ValveCostEstimate.java similarity index 70% rename from src/main/java/neqsim/processsimulation/costestimation/valve/ValveCostEstimate.java rename to src/main/java/neqsim/process/costestimation/valve/ValveCostEstimate.java index 63adc8913..cff037ac8 100644 --- a/src/main/java/neqsim/processsimulation/costestimation/valve/ValveCostEstimate.java +++ b/src/main/java/neqsim/process/costestimation/valve/ValveCostEstimate.java @@ -1,7 +1,7 @@ -package neqsim.processsimulation.costestimation.valve; +package neqsim.process.costestimation.valve; -import neqsim.processsimulation.costestimation.UnitCostEstimateBaseClass; -import neqsim.processsimulation.mechanicaldesign.valve.ValveMechanicalDesign; +import neqsim.process.costestimation.UnitCostEstimateBaseClass; +import neqsim.process.mechanicaldesign.valve.ValveMechanicalDesign; /** *

@@ -20,7 +20,7 @@ public class ValveCostEstimate extends UnitCostEstimateBaseClass { *

* * @param mechanicalEquipment a - * {@link neqsim.processsimulation.mechanicaldesign.valve.ValveMechanicalDesign} object + * {@link neqsim.process.mechanicaldesign.valve.ValveMechanicalDesign} object */ public ValveCostEstimate(ValveMechanicalDesign mechanicalEquipment) { super(mechanicalEquipment); diff --git a/src/main/java/neqsim/processsimulation/processequipment/ProcessEquipmentBaseClass.java b/src/main/java/neqsim/process/equipment/ProcessEquipmentBaseClass.java similarity index 91% rename from src/main/java/neqsim/processsimulation/processequipment/ProcessEquipmentBaseClass.java rename to src/main/java/neqsim/process/equipment/ProcessEquipmentBaseClass.java index f16324b36..9a1385773 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/ProcessEquipmentBaseClass.java +++ b/src/main/java/neqsim/process/equipment/ProcessEquipmentBaseClass.java @@ -4,18 +4,18 @@ * Created on 6. juni 2006, 15:12 */ -package neqsim.processsimulation.processequipment; +package neqsim.process.equipment; import java.util.Arrays; import java.util.HashMap; import java.util.Objects; import java.util.UUID; import org.apache.commons.lang.SerializationUtils; -import neqsim.processsimulation.SimulationBaseClass; -import neqsim.processsimulation.controllerdevice.ControllerDeviceInterface; -import neqsim.processsimulation.mechanicaldesign.MechanicalDesign; -import neqsim.processsimulation.processequipment.stream.EnergyStream; -import neqsim.processsimulation.util.report.Report; +import neqsim.process.SimulationBaseClass; +import neqsim.process.controllerdevice.ControllerDeviceInterface; +import neqsim.process.equipment.stream.EnergyStream; +import neqsim.process.mechanicaldesign.MechanicalDesign; +import neqsim.process.util.report.Report; import neqsim.thermo.system.SystemInterface; /** @@ -102,7 +102,7 @@ public void setController(ControllerDeviceInterface controller) { * Setter for the field flowValveController. *

* - * @param controller a {@link neqsim.processsimulation.controllerdevice.ControllerDeviceInterface} + * @param controller a {@link neqsim.process.controllerdevice.ControllerDeviceInterface} * object */ public void setFlowValveController(ControllerDeviceInterface controller) { @@ -154,7 +154,7 @@ public boolean solved() { * Getter for the field energyStream. *

* - * @return a {@link neqsim.processsimulation.processequipment.stream.EnergyStream} object + * @return a {@link neqsim.process.equipment.stream.EnergyStream} object */ public EnergyStream getEnergyStream() { return energyStream; @@ -165,7 +165,7 @@ public EnergyStream getEnergyStream() { * Setter for the field energyStream. *

* - * @param energyStream a {@link neqsim.processsimulation.processequipment.stream.EnergyStream} + * @param energyStream a {@link neqsim.process.equipment.stream.EnergyStream} * object */ public void setEnergyStream(EnergyStream energyStream) { diff --git a/src/main/java/neqsim/processsimulation/processequipment/ProcessEquipmentInterface.java b/src/main/java/neqsim/process/equipment/ProcessEquipmentInterface.java similarity index 86% rename from src/main/java/neqsim/processsimulation/processequipment/ProcessEquipmentInterface.java rename to src/main/java/neqsim/process/equipment/ProcessEquipmentInterface.java index b6324b6e4..ee6b796da 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/ProcessEquipmentInterface.java +++ b/src/main/java/neqsim/process/equipment/ProcessEquipmentInterface.java @@ -1,8 +1,8 @@ -package neqsim.processsimulation.processequipment; +package neqsim.process.equipment; -import neqsim.processsimulation.SimulationInterface; -import neqsim.processsimulation.controllerdevice.ControllerDeviceInterface; -import neqsim.processsimulation.mechanicaldesign.MechanicalDesign; +import neqsim.process.SimulationInterface; +import neqsim.process.controllerdevice.ControllerDeviceInterface; +import neqsim.process.mechanicaldesign.MechanicalDesign; import neqsim.thermo.system.SystemInterface; /** @@ -35,7 +35,7 @@ default void initMechanicalDesign() {} * Get a mechanicalDesign for the equipment. *

* - * @return a {@link neqsim.processsimulation.mechanicaldesign.MechanicalDesign} object + * @return a {@link neqsim.process.mechanicaldesign.MechanicalDesign} object */ public MechanicalDesign getMechanicalDesign(); @@ -89,7 +89,7 @@ public default boolean needRecalculation() { * setController. *

* - * @param controller a {@link neqsim.processsimulation.controllerdevice.ControllerDeviceInterface} + * @param controller a {@link neqsim.process.controllerdevice.ControllerDeviceInterface} * object */ public void setController(ControllerDeviceInterface controller); @@ -99,7 +99,7 @@ public default boolean needRecalculation() { * getController. *

* - * @return a {@link neqsim.processsimulation.controllerdevice.ControllerDeviceInterface} object + * @return a {@link neqsim.process.controllerdevice.ControllerDeviceInterface} object */ public ControllerDeviceInterface getController(); @@ -167,7 +167,7 @@ public default SystemInterface getFluid() { *

* * @param refExchanger a - * {@link neqsim.processsimulation.processequipment.ProcessEquipmentInterface} object + * {@link neqsim.process.equipment.ProcessEquipmentInterface} object */ public void runConditionAnalysis(ProcessEquipmentInterface refExchanger); diff --git a/src/main/java/neqsim/processsimulation/processequipment/TwoPortEquipment.java b/src/main/java/neqsim/process/equipment/TwoPortEquipment.java similarity index 95% rename from src/main/java/neqsim/processsimulation/processequipment/TwoPortEquipment.java rename to src/main/java/neqsim/process/equipment/TwoPortEquipment.java index b7fff9d05..0833e753f 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/TwoPortEquipment.java +++ b/src/main/java/neqsim/process/equipment/TwoPortEquipment.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.processequipment; +package neqsim.process.equipment; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.stream.StreamInterface; /** * Abstract class defining ProcessEquipment with one inlet and one outlet. diff --git a/src/main/java/neqsim/processsimulation/processequipment/TwoPortInterface.java b/src/main/java/neqsim/process/equipment/TwoPortInterface.java similarity index 91% rename from src/main/java/neqsim/processsimulation/processequipment/TwoPortInterface.java rename to src/main/java/neqsim/process/equipment/TwoPortInterface.java index e7b5dcf5d..966cad21a 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/TwoPortInterface.java +++ b/src/main/java/neqsim/process/equipment/TwoPortInterface.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.processequipment; +package neqsim.process.equipment; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.stream.StreamInterface; /** * Interface for processEquipment with a single inlet stream and a single outlet stream. @@ -19,7 +19,7 @@ public interface TwoPortInterface { /** * Get inlet Stream of twoport. * - * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @return a {@link neqsim.process.equipment.stream.StreamInterface} object */ @Deprecated public default StreamInterface getInStream() { diff --git a/src/main/java/neqsim/processsimulation/processequipment/absorber/AbsorberInterface.java b/src/main/java/neqsim/process/equipment/absorber/AbsorberInterface.java similarity index 69% rename from src/main/java/neqsim/processsimulation/processequipment/absorber/AbsorberInterface.java rename to src/main/java/neqsim/process/equipment/absorber/AbsorberInterface.java index e0521ffa1..369833af0 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/absorber/AbsorberInterface.java +++ b/src/main/java/neqsim/process/equipment/absorber/AbsorberInterface.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.processequipment.absorber; +package neqsim.process.equipment.absorber; -import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; +import neqsim.process.equipment.ProcessEquipmentInterface; /** *

diff --git a/src/main/java/neqsim/processsimulation/processequipment/absorber/SimpleAbsorber.java b/src/main/java/neqsim/process/equipment/absorber/SimpleAbsorber.java similarity index 91% rename from src/main/java/neqsim/processsimulation/processequipment/absorber/SimpleAbsorber.java rename to src/main/java/neqsim/process/equipment/absorber/SimpleAbsorber.java index 59eb766b7..5e2aa3577 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/absorber/SimpleAbsorber.java +++ b/src/main/java/neqsim/process/equipment/absorber/SimpleAbsorber.java @@ -1,10 +1,10 @@ -package neqsim.processsimulation.processequipment.absorber; +package neqsim.process.equipment.absorber; import java.util.UUID; -import neqsim.processsimulation.mechanicaldesign.absorber.AbsorberMechanicalDesign; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.mechanicaldesign.absorber.AbsorberMechanicalDesign; import neqsim.thermo.system.SystemInterface; /** @@ -49,7 +49,7 @@ public SimpleAbsorber(String name) { *

* * @param name name of absorber - * @param inStream1 a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param inStream1 a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public SimpleAbsorber(String name, StreamInterface inStream1) { @@ -100,7 +100,7 @@ public void setdT(double dT) { * Getter for the field outStream. *

* - * @return a {@link neqsim.processsimulation.processequipment.stream.Stream} object + * @return a {@link neqsim.process.equipment.stream.Stream} object */ public StreamInterface getOutStream() { return outStream[0]; @@ -112,7 +112,7 @@ public StreamInterface getOutStream() { *

* * @param i a int - * @return a {@link neqsim.processsimulation.processequipment.stream.Stream} object + * @return a {@link neqsim.process.equipment.stream.Stream} object */ public StreamInterface getOutStream(int i) { return outStream[i]; @@ -123,7 +123,7 @@ public StreamInterface getOutStream(int i) { * getSolventInStream. *

* - * @return a {@link neqsim.processsimulation.processequipment.stream.Stream} object + * @return a {@link neqsim.process.equipment.stream.Stream} object */ public StreamInterface getSolventInStream() { return inStream[0]; @@ -135,7 +135,7 @@ public StreamInterface getSolventInStream() { *

* * @param i a int - * @return a {@link neqsim.processsimulation.processequipment.stream.Stream} object + * @return a {@link neqsim.process.equipment.stream.Stream} object */ public StreamInterface getInStream(int i) { return inStream[i]; diff --git a/src/main/java/neqsim/processsimulation/processequipment/absorber/SimpleTEGAbsorber.java b/src/main/java/neqsim/process/equipment/absorber/SimpleTEGAbsorber.java similarity index 95% rename from src/main/java/neqsim/processsimulation/processequipment/absorber/SimpleTEGAbsorber.java rename to src/main/java/neqsim/process/equipment/absorber/SimpleTEGAbsorber.java index 8150eb231..0d90dcc1f 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/absorber/SimpleTEGAbsorber.java +++ b/src/main/java/neqsim/process/equipment/absorber/SimpleTEGAbsorber.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.absorber; +package neqsim.process.equipment.absorber; import java.awt.Container; import java.awt.FlowLayout; @@ -12,8 +12,8 @@ import javax.swing.JTable; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.ProcessEquipmentInterface; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -73,7 +73,7 @@ public void addStream(StreamInterface newStream) { * addGasInStream. *

* - * @param newStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param newStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public void addGasInStream(StreamInterface newStream) { @@ -88,7 +88,7 @@ public void addGasInStream(StreamInterface newStream) { * addSolventInStream. *

* - * @param newStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param newStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public void addSolventInStream(StreamInterface newStream) { @@ -104,7 +104,7 @@ public void addSolventInStream(StreamInterface newStream) { * replaceSolventInStream. *

* - * @param newStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param newStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public void replaceSolventInStream(StreamInterface newStream) { @@ -212,7 +212,7 @@ public StreamInterface getOutStream() { * getInStream. *

* - * @return a {@link neqsim.processsimulation.processequipment.stream.Stream} object + * @return a {@link neqsim.process.equipment.stream.Stream} object */ public StreamInterface getInStream() { return gasInStream; @@ -229,7 +229,7 @@ public StreamInterface getGasOutStream() { * Getter for the field gasInStream. *

* - * @return a {@link neqsim.processsimulation.processequipment.stream.Stream} object + * @return a {@link neqsim.process.equipment.stream.Stream} object */ public StreamInterface getGasInStream() { return gasInStream; @@ -530,7 +530,7 @@ public void displayResult() { * Setter for the field gasOutStream. *

* - * @param gasOutStream a {@link neqsim.processsimulation.processequipment.stream.Stream} object + * @param gasOutStream a {@link neqsim.process.equipment.stream.Stream} object */ public void setGasOutStream(StreamInterface gasOutStream) { this.gasOutStream = gasOutStream; @@ -541,7 +541,7 @@ public void setGasOutStream(StreamInterface gasOutStream) { * Getter for the field solventOutStream. *

* - * @return a {@link neqsim.processsimulation.processequipment.stream.Stream} object + * @return a {@link neqsim.process.equipment.stream.Stream} object */ public StreamInterface getSolventOutStream() { return solventOutStream; @@ -553,7 +553,7 @@ public StreamInterface getSolventOutStream() { *

* * @param solventOutStream a - * {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * {@link neqsim.process.equipment.stream.StreamInterface} object */ public void setSolventOutStream(StreamInterface solventOutStream) { this.solventOutStream = solventOutStream; diff --git a/src/main/java/neqsim/processsimulation/processequipment/absorber/WaterStripperColumn.java b/src/main/java/neqsim/process/equipment/absorber/WaterStripperColumn.java similarity index 95% rename from src/main/java/neqsim/processsimulation/processequipment/absorber/WaterStripperColumn.java rename to src/main/java/neqsim/process/equipment/absorber/WaterStripperColumn.java index 8011cb749..2b43cd7c4 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/absorber/WaterStripperColumn.java +++ b/src/main/java/neqsim/process/equipment/absorber/WaterStripperColumn.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.absorber; +package neqsim.process.equipment.absorber; import java.awt.Container; import java.awt.FlowLayout; @@ -12,7 +12,7 @@ import javax.swing.JTable; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.phase.PhaseType; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -75,7 +75,7 @@ public void addStream(StreamInterface newStream) { * addGasInStream. *

* - * @param newStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param newStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public void addGasInStream(StreamInterface newStream) { @@ -89,7 +89,7 @@ public void addGasInStream(StreamInterface newStream) { * addSolventInStream. *

* - * @param newStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param newStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public void addSolventInStream(StreamInterface newStream) { @@ -104,7 +104,7 @@ public void addSolventInStream(StreamInterface newStream) { * replaceSolventInStream. *

* - * @param newStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param newStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public void replaceSolventInStream(StreamInterface newStream) { @@ -212,7 +212,7 @@ public StreamInterface getOutStream() { * getInStream. *

* - * @return a {@link neqsim.processsimulation.processequipment.stream.Stream} object + * @return a {@link neqsim.process.equipment.stream.Stream} object */ public StreamInterface getInStream() { return gasInStream; @@ -506,7 +506,7 @@ public void setWaterDewPointTemperature(double waterDewPointTemperature, double * Setter for the field gasOutStream. *

* - * @param gasOutStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param gasOutStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public void setGasOutStream(StreamInterface gasOutStream) { @@ -518,7 +518,7 @@ public void setGasOutStream(StreamInterface gasOutStream) { * Getter for the field solventOutStream. *

* - * @return a {@link neqsim.processsimulation.processequipment.stream.Stream} object + * @return a {@link neqsim.process.equipment.stream.Stream} object */ public StreamInterface getSolventOutStream() { return solventOutStream; @@ -530,7 +530,7 @@ public StreamInterface getSolventOutStream() { *

* * @param solventOutStream a - * {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * {@link neqsim.process.equipment.stream.StreamInterface} object */ public void setSolventOutStream(StreamInterface solventOutStream) { this.solventOutStream = solventOutStream; diff --git a/src/main/java/neqsim/processsimulation/processequipment/adsorber/SimpleAdsorber.java b/src/main/java/neqsim/process/equipment/adsorber/SimpleAdsorber.java similarity index 93% rename from src/main/java/neqsim/processsimulation/processequipment/adsorber/SimpleAdsorber.java rename to src/main/java/neqsim/process/equipment/adsorber/SimpleAdsorber.java index e2fb7b3a5..1c3d55725 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/adsorber/SimpleAdsorber.java +++ b/src/main/java/neqsim/process/equipment/adsorber/SimpleAdsorber.java @@ -1,10 +1,10 @@ -package neqsim.processsimulation.processequipment.adsorber; +package neqsim.process.equipment.adsorber; import java.util.UUID; -import neqsim.processsimulation.mechanicaldesign.adsorber.AdsorberMechanicalDesign; -import neqsim.processsimulation.processequipment.ProcessEquipmentBaseClass; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.ProcessEquipmentBaseClass; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.mechanicaldesign.adsorber.AdsorberMechanicalDesign; import neqsim.thermo.system.SystemInterface; /** @@ -48,7 +48,7 @@ public SimpleAdsorber(String name) { *

* * @param name name of the unit operation - * @param inStream1 a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param inStream1 a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public SimpleAdsorber(String name, StreamInterface inStream1) { @@ -100,7 +100,7 @@ public void setdT(double dT) { *

* * @param i a int - * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @return a {@link neqsim.process.equipment.stream.StreamInterface} object */ public StreamInterface getOutStream(int i) { return outStream[i]; diff --git a/src/main/java/neqsim/processsimulation/processequipment/compressor/AntiSurge.java b/src/main/java/neqsim/process/equipment/compressor/AntiSurge.java similarity index 97% rename from src/main/java/neqsim/processsimulation/processequipment/compressor/AntiSurge.java rename to src/main/java/neqsim/process/equipment/compressor/AntiSurge.java index fb3c0a733..1fe56eb59 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/compressor/AntiSurge.java +++ b/src/main/java/neqsim/process/equipment/compressor/AntiSurge.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.compressor; +package neqsim.process.equipment.compressor; import java.util.Objects; diff --git a/src/main/java/neqsim/processsimulation/processequipment/compressor/Compressor.java b/src/main/java/neqsim/process/equipment/compressor/Compressor.java similarity index 98% rename from src/main/java/neqsim/processsimulation/processequipment/compressor/Compressor.java rename to src/main/java/neqsim/process/equipment/compressor/Compressor.java index 53fc6e815..d97bc3cf8 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/compressor/Compressor.java +++ b/src/main/java/neqsim/process/equipment/compressor/Compressor.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.compressor; +package neqsim.process.equipment.compressor; import java.awt.Container; import java.awt.FlowLayout; @@ -14,10 +14,10 @@ import org.apache.logging.log4j.Logger; import com.google.gson.GsonBuilder; import neqsim.physicalproperties.PhysicalPropertyType; -import neqsim.processsimulation.mechanicaldesign.compressor.CompressorMechanicalDesign; -import neqsim.processsimulation.processequipment.TwoPortEquipment; -import neqsim.processsimulation.processequipment.stream.StreamInterface; -import neqsim.processsimulation.util.monitor.CompressorResponse; +import neqsim.process.equipment.TwoPortEquipment; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.mechanicaldesign.compressor.CompressorMechanicalDesign; +import neqsim.process.util.monitor.CompressorResponse; import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -80,7 +80,7 @@ public Compressor(String name) { *

* * @param name a {@link java.lang.String} object - * @param inletStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param inletStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public Compressor(String name, StreamInterface inletStream) { @@ -926,7 +926,7 @@ public SystemInterface getThermoSystem() { * Getter for the field compressorChart. *

* - * @return a {@link neqsim.processsimulation.processequipment.compressor.CompressorChartInterface} + * @return a {@link neqsim.process.equipment.compressor.CompressorChartInterface} * object */ public CompressorChartInterface getCompressorChart() { @@ -939,7 +939,7 @@ public CompressorChartInterface getCompressorChart() { *

* * @param compressorChart a - * {@link neqsim.processsimulation.processequipment.compressor.CompressorChart} object + * {@link neqsim.process.equipment.compressor.CompressorChart} object */ public void setCompressorChart(CompressorChart compressorChart) { this.compressorChart = compressorChart; @@ -990,7 +990,7 @@ public boolean isStoneWall(double flow, double head) { * Setter for the field antiSurge. *

* - * @param antiSurge a {@link neqsim.processsimulation.processequipment.compressor.AntiSurge} + * @param antiSurge a {@link neqsim.process.equipment.compressor.AntiSurge} * object */ public void setAntiSurge(AntiSurge antiSurge) { @@ -1253,7 +1253,7 @@ public void setUseGERG2008(boolean useGERG2008) { *

* * @return a - * {@link neqsim.processsimulation.processequipment.compressor.CompressorPropertyProfile} + * {@link neqsim.process.equipment.compressor.CompressorPropertyProfile} * object */ public CompressorPropertyProfile getPropertyProfile() { @@ -1266,7 +1266,7 @@ public CompressorPropertyProfile getPropertyProfile() { *

* * @param propertyProfile a - * {@link neqsim.processsimulation.processequipment.compressor.CompressorPropertyProfile} + * {@link neqsim.process.equipment.compressor.CompressorPropertyProfile} * object */ public void setPropertyProfile(CompressorPropertyProfile propertyProfile) { diff --git a/src/main/java/neqsim/processsimulation/processequipment/compressor/CompressorChart.java b/src/main/java/neqsim/process/equipment/compressor/CompressorChart.java similarity index 99% rename from src/main/java/neqsim/processsimulation/processequipment/compressor/CompressorChart.java rename to src/main/java/neqsim/process/equipment/compressor/CompressorChart.java index dfdfb8dbb..925c0c350 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/compressor/CompressorChart.java +++ b/src/main/java/neqsim/process/equipment/compressor/CompressorChart.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.compressor; +package neqsim.process.equipment.compressor; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/neqsim/processsimulation/processequipment/compressor/CompressorChartAlternativeMapLookup.java b/src/main/java/neqsim/process/equipment/compressor/CompressorChartAlternativeMapLookup.java similarity index 98% rename from src/main/java/neqsim/processsimulation/processequipment/compressor/CompressorChartAlternativeMapLookup.java rename to src/main/java/neqsim/process/equipment/compressor/CompressorChartAlternativeMapLookup.java index 8fea23435..7e4895eb5 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/compressor/CompressorChartAlternativeMapLookup.java +++ b/src/main/java/neqsim/process/equipment/compressor/CompressorChartAlternativeMapLookup.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.compressor; +package neqsim.process.equipment.compressor; import java.util.ArrayList; import java.util.Arrays; @@ -8,7 +8,7 @@ import org.apache.commons.math3.fitting.WeightedObservedPoints; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.stream.Stream; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; @@ -181,7 +181,7 @@ public void addSurgeCurve(double[] flow, double[] head) { *

* * @param refSpeed a double - * @return a {@link neqsim.processsimulation.processequipment.compressor.CompressorCurve} object + * @return a {@link neqsim.process.equipment.compressor.CompressorCurve} object */ public CompressorCurve getCurveAtRefSpeed(double refSpeed) { for (int i = 0; i < chartValues.size(); i++) { @@ -432,8 +432,8 @@ public static void main(String[] args) { * comp1.getCompressorChart().getStoneWallCurve().setCurve(chartConditions, stoneWallflow, * stoneWallHead); */ - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(comp1); operations.run(); diff --git a/src/main/java/neqsim/processsimulation/processequipment/compressor/CompressorChartGenerator.java b/src/main/java/neqsim/process/equipment/compressor/CompressorChartGenerator.java similarity index 91% rename from src/main/java/neqsim/processsimulation/processequipment/compressor/CompressorChartGenerator.java rename to src/main/java/neqsim/process/equipment/compressor/CompressorChartGenerator.java index fd54d346c..55d11a90f 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/compressor/CompressorChartGenerator.java +++ b/src/main/java/neqsim/process/equipment/compressor/CompressorChartGenerator.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.compressor; +package neqsim.process.equipment.compressor; import neqsim.physicalproperties.PhysicalPropertyType; @@ -15,7 +15,7 @@ public class CompressorChartGenerator { * Constructor for CompressorChartGenerator. *

* - * @param inpcompressor a {@link neqsim.processsimulation.processequipment.compressor.Compressor} + * @param inpcompressor a {@link neqsim.process.equipment.compressor.Compressor} * object */ public CompressorChartGenerator(Compressor inpcompressor) { @@ -28,7 +28,7 @@ public CompressorChartGenerator(Compressor inpcompressor) { *

* * @param generationOption string to specify how to generate the compressor chart - * @return a {@link neqsim.processsimulation.processequipment.compressor.CompressorChart} object + * @return a {@link neqsim.process.equipment.compressor.CompressorChart} object */ public CompressorChart generateCompressorChart(String generationOption) { // Generation compressor chart diff --git a/src/main/java/neqsim/processsimulation/processequipment/compressor/CompressorChartInterface.java b/src/main/java/neqsim/process/equipment/compressor/CompressorChartInterface.java similarity index 89% rename from src/main/java/neqsim/processsimulation/processequipment/compressor/CompressorChartInterface.java rename to src/main/java/neqsim/process/equipment/compressor/CompressorChartInterface.java index e85500737..078ec1800 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/compressor/CompressorChartInterface.java +++ b/src/main/java/neqsim/process/equipment/compressor/CompressorChartInterface.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.compressor; +package neqsim.process.equipment.compressor; /** *

@@ -108,7 +108,7 @@ public void setReferenceConditions(double refMW, double refTemperature, double r * getSurgeCurve. *

* - * @return a {@link neqsim.processsimulation.processequipment.compressor.SurgeCurve} object + * @return a {@link neqsim.process.equipment.compressor.SurgeCurve} object */ public SurgeCurve getSurgeCurve(); @@ -117,7 +117,7 @@ public void setReferenceConditions(double refMW, double refTemperature, double r * setSurgeCurve. *

* - * @param surgeCurve a {@link neqsim.processsimulation.processequipment.compressor.SurgeCurve} + * @param surgeCurve a {@link neqsim.process.equipment.compressor.SurgeCurve} * object */ public void setSurgeCurve(SurgeCurve surgeCurve); @@ -127,7 +127,7 @@ public void setReferenceConditions(double refMW, double refTemperature, double r * getStoneWallCurve. *

* - * @return a {@link neqsim.processsimulation.processequipment.compressor.StoneWallCurve} object + * @return a {@link neqsim.process.equipment.compressor.StoneWallCurve} object */ public StoneWallCurve getStoneWallCurve(); @@ -137,7 +137,7 @@ public void setReferenceConditions(double refMW, double refTemperature, double r *

* * @param stoneWallCurve a - * {@link neqsim.processsimulation.processequipment.compressor.StoneWallCurve} object + * {@link neqsim.process.equipment.compressor.StoneWallCurve} object */ public void setStoneWallCurve(StoneWallCurve stoneWallCurve); diff --git a/src/main/java/neqsim/processsimulation/processequipment/compressor/CompressorCurve.java b/src/main/java/neqsim/process/equipment/compressor/CompressorCurve.java similarity index 96% rename from src/main/java/neqsim/processsimulation/processequipment/compressor/CompressorCurve.java rename to src/main/java/neqsim/process/equipment/compressor/CompressorCurve.java index 0bc5251ed..917768953 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/compressor/CompressorCurve.java +++ b/src/main/java/neqsim/process/equipment/compressor/CompressorCurve.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.compressor; +package neqsim.process.equipment.compressor; import java.util.Arrays; import java.util.Objects; diff --git a/src/main/java/neqsim/processsimulation/processequipment/compressor/CompressorInterface.java b/src/main/java/neqsim/process/equipment/compressor/CompressorInterface.java similarity index 84% rename from src/main/java/neqsim/processsimulation/processequipment/compressor/CompressorInterface.java rename to src/main/java/neqsim/process/equipment/compressor/CompressorInterface.java index 27d1c3022..d9bfdf543 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/compressor/CompressorInterface.java +++ b/src/main/java/neqsim/process/equipment/compressor/CompressorInterface.java @@ -4,10 +4,10 @@ * Created on 22. august 2001, 17:20 */ -package neqsim.processsimulation.processequipment.compressor; +package neqsim.process.equipment.compressor; -import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; -import neqsim.processsimulation.processequipment.TwoPortInterface; +import neqsim.process.equipment.ProcessEquipmentInterface; +import neqsim.process.equipment.TwoPortInterface; /** *

@@ -68,7 +68,7 @@ public interface CompressorInterface extends ProcessEquipmentInterface, TwoPortI * getAntiSurge. *

* - * @return a {@link neqsim.processsimulation.processequipment.compressor.AntiSurge} object + * @return a {@link neqsim.process.equipment.compressor.AntiSurge} object */ public AntiSurge getAntiSurge(); diff --git a/src/main/java/neqsim/processsimulation/processequipment/compressor/CompressorPropertyProfile.java b/src/main/java/neqsim/process/equipment/compressor/CompressorPropertyProfile.java similarity index 96% rename from src/main/java/neqsim/processsimulation/processequipment/compressor/CompressorPropertyProfile.java rename to src/main/java/neqsim/process/equipment/compressor/CompressorPropertyProfile.java index 19a7e4537..1b26b2c18 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/compressor/CompressorPropertyProfile.java +++ b/src/main/java/neqsim/process/equipment/compressor/CompressorPropertyProfile.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.compressor; +package neqsim.process.equipment.compressor; import java.io.Serializable; import java.util.ArrayList; diff --git a/src/main/java/neqsim/processsimulation/processequipment/compressor/StoneWallCurve.java b/src/main/java/neqsim/process/equipment/compressor/StoneWallCurve.java similarity index 98% rename from src/main/java/neqsim/processsimulation/processequipment/compressor/StoneWallCurve.java rename to src/main/java/neqsim/process/equipment/compressor/StoneWallCurve.java index a7f21d57e..2d9aa760d 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/compressor/StoneWallCurve.java +++ b/src/main/java/neqsim/process/equipment/compressor/StoneWallCurve.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.compressor; +package neqsim.process.equipment.compressor; import java.util.Arrays; import java.util.Objects; diff --git a/src/main/java/neqsim/processsimulation/processequipment/compressor/SurgeCurve.java b/src/main/java/neqsim/process/equipment/compressor/SurgeCurve.java similarity index 98% rename from src/main/java/neqsim/processsimulation/processequipment/compressor/SurgeCurve.java rename to src/main/java/neqsim/process/equipment/compressor/SurgeCurve.java index d08634a79..e4177604b 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/compressor/SurgeCurve.java +++ b/src/main/java/neqsim/process/equipment/compressor/SurgeCurve.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.compressor; +package neqsim.process.equipment.compressor; import java.util.Arrays; import java.util.Objects; diff --git a/src/main/java/neqsim/processsimulation/processequipment/distillation/Condenser.java b/src/main/java/neqsim/process/equipment/distillation/Condenser.java similarity index 92% rename from src/main/java/neqsim/processsimulation/processequipment/distillation/Condenser.java rename to src/main/java/neqsim/process/equipment/distillation/Condenser.java index 4f11891ba..322f733f4 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/distillation/Condenser.java +++ b/src/main/java/neqsim/process/equipment/distillation/Condenser.java @@ -1,9 +1,9 @@ -package neqsim.processsimulation.processequipment.distillation; +package neqsim.process.equipment.distillation; import java.util.UUID; -import neqsim.processsimulation.processequipment.splitter.Splitter; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.splitter.Splitter; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -94,7 +94,7 @@ public StreamInterface getGasOutStream() { * getProductOutStream. *

* - * @return a {@link neqsim.processsimulation.processequipment.stream.Stream} object + * @return a {@link neqsim.process.equipment.stream.Stream} object */ public StreamInterface getProductOutStream() { return getGasOutStream(); diff --git a/src/main/java/neqsim/processsimulation/processequipment/distillation/DistillationColumn.java b/src/main/java/neqsim/process/equipment/distillation/DistillationColumn.java similarity index 95% rename from src/main/java/neqsim/processsimulation/processequipment/distillation/DistillationColumn.java rename to src/main/java/neqsim/process/equipment/distillation/DistillationColumn.java index 358543132..55dde1436 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/distillation/DistillationColumn.java +++ b/src/main/java/neqsim/process/equipment/distillation/DistillationColumn.java @@ -1,15 +1,15 @@ -package neqsim.processsimulation.processequipment.distillation; +package neqsim.process.equipment.distillation; import java.util.ArrayList; import java.util.Objects; import java.util.UUID; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.processequipment.ProcessEquipmentBaseClass; -import neqsim.processsimulation.processequipment.heatexchanger.Heater; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.ProcessEquipmentBaseClass; +import neqsim.process.equipment.heatexchanger.Heater; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -43,7 +43,7 @@ public class DistillationColumn extends ProcessEquipmentBaseClass implements Dis StreamInterface feedStream = null; boolean stream_3isset = false; private double internalDiameter = 1.0; - neqsim.processsimulation.processsystem.ProcessSystem distoperations; + neqsim.process.processmodel.ProcessSystem distoperations; Heater heater; Separator separator2; private double err = 1.0e10; @@ -63,7 +63,7 @@ public DistillationColumn(String name, int numberOfTraysLocal, boolean hasReboil super(name); this.hasReboiler = hasReboiler; this.hasCondenser = hasCondenser; - distoperations = new neqsim.processsimulation.processsystem.ProcessSystem(); + distoperations = new neqsim.process.processmodel.ProcessSystem(); this.numberOfTrays = numberOfTraysLocal; if (hasReboiler) { trays.add(new Reboiler("Reboiler")); @@ -86,7 +86,7 @@ public DistillationColumn(String name, int numberOfTraysLocal, boolean hasReboil * addFeedStream. *

* - * @param inputStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param inputStream a {@link neqsim.process.equipment.stream.StreamInterface} * object * @param feedTrayNumber a int */ @@ -206,7 +206,7 @@ public void init() { * Getter for the field gasOutStream. *

* - * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @return a {@link neqsim.process.equipment.stream.StreamInterface} object */ public StreamInterface getGasOutStream() { return gasOutStream; @@ -217,7 +217,7 @@ public StreamInterface getGasOutStream() { * Getter for the field liquidOutStream. *

* - * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @return a {@link neqsim.process.equipment.stream.StreamInterface} object */ public StreamInterface getLiquidOutStream() { return liquidOutStream; @@ -229,7 +229,7 @@ public StreamInterface getLiquidOutStream() { *

* * @param trayNumber a int - * @return a {@link neqsim.processsimulation.processequipment.distillation.SimpleTray} object + * @return a {@link neqsim.process.equipment.distillation.SimpleTray} object */ public SimpleTray getTray(int trayNumber) { return trays.get(trayNumber); @@ -575,8 +575,8 @@ public static void main(String[] args) { // column.getCondenser().setHeatInput(-70000.0); // ((Condenser) column.getCondenser()).setRefluxRatio(0.2); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(column); operations.run(); @@ -591,7 +591,7 @@ public static void main(String[] args) { * getReboiler. *

* - * @return a {@link neqsim.processsimulation.processequipment.distillation.SimpleTray} object + * @return a {@link neqsim.process.equipment.distillation.SimpleTray} object */ public SimpleTray getReboiler() { return trays.get(0); @@ -602,7 +602,7 @@ public SimpleTray getReboiler() { * getCondenser. *

* - * @return a {@link neqsim.processsimulation.processequipment.distillation.SimpleTray} object + * @return a {@link neqsim.process.equipment.distillation.SimpleTray} object */ public SimpleTray getCondenser() { return trays.get(trays.size() - 1); diff --git a/src/main/java/neqsim/processsimulation/processequipment/distillation/DistillationInterface.java b/src/main/java/neqsim/process/equipment/distillation/DistillationInterface.java similarity index 68% rename from src/main/java/neqsim/processsimulation/processequipment/distillation/DistillationInterface.java rename to src/main/java/neqsim/process/equipment/distillation/DistillationInterface.java index 560ca3d1d..2c89ecade 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/distillation/DistillationInterface.java +++ b/src/main/java/neqsim/process/equipment/distillation/DistillationInterface.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.processequipment.distillation; +package neqsim.process.equipment.distillation; -import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; +import neqsim.process.equipment.ProcessEquipmentInterface; /** *

diff --git a/src/main/java/neqsim/processsimulation/processequipment/distillation/Reboiler.java b/src/main/java/neqsim/process/equipment/distillation/Reboiler.java similarity index 93% rename from src/main/java/neqsim/processsimulation/processequipment/distillation/Reboiler.java rename to src/main/java/neqsim/process/equipment/distillation/Reboiler.java index f9408373a..3150f7f9c 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/distillation/Reboiler.java +++ b/src/main/java/neqsim/process/equipment/distillation/Reboiler.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.distillation; +package neqsim.process.equipment.distillation; import java.util.UUID; import neqsim.thermo.system.SystemInterface; @@ -12,7 +12,7 @@ * @author ESOL * @version $Id: $Id */ -public class Reboiler extends neqsim.processsimulation.processequipment.distillation.SimpleTray { +public class Reboiler extends neqsim.process.equipment.distillation.SimpleTray { private static final long serialVersionUID = 1000; private double refluxRatio = 0.1; diff --git a/src/main/java/neqsim/processsimulation/processequipment/distillation/SimpleTray.java b/src/main/java/neqsim/process/equipment/distillation/SimpleTray.java similarity index 92% rename from src/main/java/neqsim/processsimulation/processequipment/distillation/SimpleTray.java rename to src/main/java/neqsim/process/equipment/distillation/SimpleTray.java index 19fbe66b5..caa53592c 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/distillation/SimpleTray.java +++ b/src/main/java/neqsim/process/equipment/distillation/SimpleTray.java @@ -1,10 +1,10 @@ -package neqsim.processsimulation.processequipment.distillation; +package neqsim.process.equipment.distillation; import java.util.UUID; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -16,7 +16,7 @@ * @author ESOL * @version $Id: $Id */ -public class SimpleTray extends neqsim.processsimulation.processequipment.mixer.Mixer +public class SimpleTray extends neqsim.process.equipment.mixer.Mixer implements TrayInterface { private static final long serialVersionUID = 1000; static Logger logger = LogManager.getLogger(SimpleTray.class); @@ -180,7 +180,7 @@ public void run(UUID id) { * getGasOutStream. *

* - * @return a {@link neqsim.processsimulation.processequipment.stream.Stream} object + * @return a {@link neqsim.process.equipment.stream.Stream} object */ public StreamInterface getGasOutStream() { return new Stream("", mixedStream.getThermoSystem().phaseToSystem(0)); @@ -191,7 +191,7 @@ public StreamInterface getGasOutStream() { * getLiquidOutStream. *

* - * @return a {@link neqsim.processsimulation.processequipment.stream.Stream} object + * @return a {@link neqsim.process.equipment.stream.Stream} object */ public StreamInterface getLiquidOutStream() { return new Stream("", mixedStream.getThermoSystem().phaseToSystem(1)); diff --git a/src/main/java/neqsim/processsimulation/processequipment/distillation/TrayInterface.java b/src/main/java/neqsim/process/equipment/distillation/TrayInterface.java similarity index 57% rename from src/main/java/neqsim/processsimulation/processequipment/distillation/TrayInterface.java rename to src/main/java/neqsim/process/equipment/distillation/TrayInterface.java index 9e1d574d3..13f3109c8 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/distillation/TrayInterface.java +++ b/src/main/java/neqsim/process/equipment/distillation/TrayInterface.java @@ -1,7 +1,7 @@ -package neqsim.processsimulation.processequipment.distillation; +package neqsim.process.equipment.distillation; -import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.ProcessEquipmentInterface; +import neqsim.process.equipment.stream.StreamInterface; /** *

@@ -17,7 +17,7 @@ public interface TrayInterface extends ProcessEquipmentInterface { * addStream. *

* - * @param newStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param newStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public void addStream(StreamInterface newStream); diff --git a/src/main/java/neqsim/processsimulation/processequipment/distillation/VLSolidTray.java b/src/main/java/neqsim/process/equipment/distillation/VLSolidTray.java similarity index 94% rename from src/main/java/neqsim/processsimulation/processequipment/distillation/VLSolidTray.java rename to src/main/java/neqsim/process/equipment/distillation/VLSolidTray.java index 540d7d87f..33e88f69a 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/distillation/VLSolidTray.java +++ b/src/main/java/neqsim/process/equipment/distillation/VLSolidTray.java @@ -1,8 +1,8 @@ -package neqsim.processsimulation.processequipment.distillation; +package neqsim.process.equipment.distillation; import java.util.UUID; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; diff --git a/src/main/java/neqsim/processsimulation/processequipment/expander/Expander.java b/src/main/java/neqsim/process/equipment/expander/Expander.java similarity index 92% rename from src/main/java/neqsim/processsimulation/processequipment/expander/Expander.java rename to src/main/java/neqsim/process/equipment/expander/Expander.java index c4a13cd96..606c8079e 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/expander/Expander.java +++ b/src/main/java/neqsim/process/equipment/expander/Expander.java @@ -1,8 +1,8 @@ -package neqsim.processsimulation.processequipment.expander; +package neqsim.process.equipment.expander; import java.util.UUID; -import neqsim.processsimulation.processequipment.compressor.Compressor; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.compressor.Compressor; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; /** @@ -31,7 +31,7 @@ public Expander(String name) { *

* * @param name a {@link java.lang.String} object - * @param inletStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param inletStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public Expander(String name, StreamInterface inletStream) { diff --git a/src/main/java/neqsim/processsimulation/processequipment/expander/ExpanderInterface.java b/src/main/java/neqsim/process/equipment/expander/ExpanderInterface.java similarity index 58% rename from src/main/java/neqsim/processsimulation/processequipment/expander/ExpanderInterface.java rename to src/main/java/neqsim/process/equipment/expander/ExpanderInterface.java index 614b4fc86..4709a4bf4 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/expander/ExpanderInterface.java +++ b/src/main/java/neqsim/process/equipment/expander/ExpanderInterface.java @@ -1,7 +1,7 @@ -package neqsim.processsimulation.processequipment.expander; +package neqsim.process.equipment.expander; -import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; -import neqsim.processsimulation.processequipment.TwoPortInterface; +import neqsim.process.equipment.ProcessEquipmentInterface; +import neqsim.process.equipment.TwoPortInterface; /** *

diff --git a/src/main/java/neqsim/processsimulation/processequipment/expander/ExpanderOld.java b/src/main/java/neqsim/process/equipment/expander/ExpanderOld.java similarity index 95% rename from src/main/java/neqsim/processsimulation/processequipment/expander/ExpanderOld.java rename to src/main/java/neqsim/process/equipment/expander/ExpanderOld.java index 2407cf4fc..5bfb7ee9f 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/expander/ExpanderOld.java +++ b/src/main/java/neqsim/process/equipment/expander/ExpanderOld.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.expander; +package neqsim.process.equipment.expander; import java.awt.Container; import java.awt.FlowLayout; @@ -9,8 +9,8 @@ import javax.swing.JFrame; import javax.swing.JScrollPane; import javax.swing.JTable; -import neqsim.processsimulation.processequipment.TwoPortEquipment; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.TwoPortEquipment; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -47,7 +47,7 @@ public ExpanderOld(String name) { *

* * @param name name of expander - * @param inletStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param inletStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public ExpanderOld(String name, StreamInterface inletStream) { diff --git a/src/main/java/neqsim/processsimulation/processequipment/filter/CharCoalFilter.java b/src/main/java/neqsim/process/equipment/filter/CharCoalFilter.java similarity index 75% rename from src/main/java/neqsim/processsimulation/processequipment/filter/CharCoalFilter.java rename to src/main/java/neqsim/process/equipment/filter/CharCoalFilter.java index 68b8ad6f2..f46c64aa3 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/filter/CharCoalFilter.java +++ b/src/main/java/neqsim/process/equipment/filter/CharCoalFilter.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.processequipment.filter; +package neqsim.process.equipment.filter; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.stream.StreamInterface; /** *

diff --git a/src/main/java/neqsim/processsimulation/processequipment/filter/Filter.java b/src/main/java/neqsim/process/equipment/filter/Filter.java similarity index 86% rename from src/main/java/neqsim/processsimulation/processequipment/filter/Filter.java rename to src/main/java/neqsim/process/equipment/filter/Filter.java index e3b82ef69..de54dc208 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/filter/Filter.java +++ b/src/main/java/neqsim/process/equipment/filter/Filter.java @@ -1,9 +1,9 @@ -package neqsim.processsimulation.processequipment.filter; +package neqsim.process.equipment.filter; import java.util.UUID; -import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; -import neqsim.processsimulation.processequipment.TwoPortEquipment; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.ProcessEquipmentInterface; +import neqsim.process.equipment.TwoPortEquipment; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -27,7 +27,7 @@ public class Filter extends TwoPortEquipment { *

* * @param name name of filter - * @param inStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param inStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public Filter(String name, StreamInterface inStream) { diff --git a/src/main/java/neqsim/processsimulation/processequipment/heatexchanger/Cooler.java b/src/main/java/neqsim/process/equipment/heatexchanger/Cooler.java similarity index 81% rename from src/main/java/neqsim/processsimulation/processequipment/heatexchanger/Cooler.java rename to src/main/java/neqsim/process/equipment/heatexchanger/Cooler.java index 384ff2682..926e30da1 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/heatexchanger/Cooler.java +++ b/src/main/java/neqsim/process/equipment/heatexchanger/Cooler.java @@ -1,9 +1,9 @@ -package neqsim.processsimulation.processequipment.heatexchanger; +package neqsim.process.equipment.heatexchanger; import java.util.UUID; import com.google.gson.GsonBuilder; -import neqsim.processsimulation.processequipment.stream.StreamInterface; -import neqsim.processsimulation.util.monitor.HeaterResponse; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.util.monitor.HeaterResponse; /** *

@@ -31,7 +31,7 @@ public Cooler(String name) { *

* * @param name a {@link java.lang.String} object - * @param inStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param inStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public Cooler(String name, StreamInterface inStream) { diff --git a/src/main/java/neqsim/processsimulation/processequipment/heatexchanger/HeatExchanger.java b/src/main/java/neqsim/process/equipment/heatexchanger/HeatExchanger.java similarity index 96% rename from src/main/java/neqsim/processsimulation/processequipment/heatexchanger/HeatExchanger.java rename to src/main/java/neqsim/process/equipment/heatexchanger/HeatExchanger.java index 337fb4ec7..bc66576de 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/heatexchanger/HeatExchanger.java +++ b/src/main/java/neqsim/process/equipment/heatexchanger/HeatExchanger.java @@ -4,15 +4,15 @@ * Created on 15. mars 2001, 14:17 */ -package neqsim.processsimulation.processequipment.heatexchanger; +package neqsim.process.equipment.heatexchanger; import java.util.UUID; import com.google.gson.GsonBuilder; -import neqsim.processsimulation.conditionmonitor.ConditionMonitorSpecifications; -import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; -import neqsim.processsimulation.util.monitor.HXResponse; +import neqsim.process.conditionmonitor.ConditionMonitorSpecifications; +import neqsim.process.equipment.ProcessEquipmentInterface; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.util.monitor.HXResponse; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -89,7 +89,7 @@ public HeatExchanger(String name, StreamInterface inStream1, StreamInterface inS * Add inlet stream. *

* - * @param inStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param inStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public void addInStream(StreamInterface inStream) { @@ -104,7 +104,7 @@ public void addInStream(StreamInterface inStream) { *

* * @param number a int - * @param inStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param inStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public void setFeedStream(int number, StreamInterface inStream) { @@ -139,7 +139,7 @@ public StreamInterface getOutStream(int i) { *

* * @param i a int - * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @return a {@link neqsim.process.equipment.stream.StreamInterface} object */ public StreamInterface getInStream(int i) { return inStream[i]; diff --git a/src/main/java/neqsim/process/equipment/heatexchanger/HeatExchangerInterface.java b/src/main/java/neqsim/process/equipment/heatexchanger/HeatExchangerInterface.java new file mode 100644 index 000000000..d1c4a0999 --- /dev/null +++ b/src/main/java/neqsim/process/equipment/heatexchanger/HeatExchangerInterface.java @@ -0,0 +1,21 @@ +package neqsim.process.equipment.heatexchanger; + +/** + *

+ * HeatExchangerInterface interface. + *

+ * + * @author esol + * @version $Id: $Id + */ +public interface HeatExchangerInterface extends HeaterInterface { + /** + *

+ * getOutStream. + *

+ * + * @param i a int + * @return a {@link neqsim.process.equipment.stream.StreamInterface} object + */ + public neqsim.process.equipment.stream.StreamInterface getOutStream(int i); +} diff --git a/src/main/java/neqsim/processsimulation/processequipment/heatexchanger/Heater.java b/src/main/java/neqsim/process/equipment/heatexchanger/Heater.java similarity index 95% rename from src/main/java/neqsim/processsimulation/processequipment/heatexchanger/Heater.java rename to src/main/java/neqsim/process/equipment/heatexchanger/Heater.java index 0ae88be9d..f9f117fac 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/heatexchanger/Heater.java +++ b/src/main/java/neqsim/process/equipment/heatexchanger/Heater.java @@ -4,14 +4,14 @@ * Created on 15. mars 2001, 14:17 */ -package neqsim.processsimulation.processequipment.heatexchanger; +package neqsim.process.equipment.heatexchanger; import java.util.UUID; import com.google.gson.GsonBuilder; -import neqsim.processsimulation.processequipment.TwoPortEquipment; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; -import neqsim.processsimulation.util.monitor.HeaterResponse; +import neqsim.process.equipment.TwoPortEquipment; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.util.monitor.HeaterResponse; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -60,7 +60,7 @@ public Heater(String name) { *

* * @param name a {@link java.lang.String} object - * @param inStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param inStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public Heater(String name, StreamInterface inStream) { diff --git a/src/main/java/neqsim/processsimulation/processequipment/heatexchanger/HeaterInterface.java b/src/main/java/neqsim/process/equipment/heatexchanger/HeaterInterface.java similarity index 87% rename from src/main/java/neqsim/processsimulation/processequipment/heatexchanger/HeaterInterface.java rename to src/main/java/neqsim/process/equipment/heatexchanger/HeaterInterface.java index c899c5431..cd01819b2 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/heatexchanger/HeaterInterface.java +++ b/src/main/java/neqsim/process/equipment/heatexchanger/HeaterInterface.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.processequipment.heatexchanger; +package neqsim.process.equipment.heatexchanger; -import neqsim.processsimulation.SimulationInterface; +import neqsim.process.SimulationInterface; /** *

diff --git a/src/main/java/neqsim/processsimulation/processequipment/heatexchanger/NeqHeater.java b/src/main/java/neqsim/process/equipment/heatexchanger/NeqHeater.java similarity index 91% rename from src/main/java/neqsim/processsimulation/processequipment/heatexchanger/NeqHeater.java rename to src/main/java/neqsim/process/equipment/heatexchanger/NeqHeater.java index 7cc5fee02..feb9b5390 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/heatexchanger/NeqHeater.java +++ b/src/main/java/neqsim/process/equipment/heatexchanger/NeqHeater.java @@ -1,7 +1,7 @@ -package neqsim.processsimulation.processequipment.heatexchanger; +package neqsim.process.equipment.heatexchanger; import java.util.UUID; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; /** diff --git a/src/main/java/neqsim/processsimulation/processequipment/heatexchanger/ReBoiler.java b/src/main/java/neqsim/process/equipment/heatexchanger/ReBoiler.java similarity index 87% rename from src/main/java/neqsim/processsimulation/processequipment/heatexchanger/ReBoiler.java rename to src/main/java/neqsim/process/equipment/heatexchanger/ReBoiler.java index 491a6edb6..9064e727e 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/heatexchanger/ReBoiler.java +++ b/src/main/java/neqsim/process/equipment/heatexchanger/ReBoiler.java @@ -1,8 +1,8 @@ -package neqsim.processsimulation.processequipment.heatexchanger; +package neqsim.process.equipment.heatexchanger; import java.util.UUID; -import neqsim.processsimulation.processequipment.TwoPortEquipment; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.TwoPortEquipment; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -27,7 +27,7 @@ public class ReBoiler extends TwoPortEquipment { *

* * @param name name of reboiler - * @param inStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param inStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public ReBoiler(String name, StreamInterface inStream) { diff --git a/src/main/java/neqsim/processsimulation/processequipment/manifold/Manifold.java b/src/main/java/neqsim/process/equipment/manifold/Manifold.java similarity index 77% rename from src/main/java/neqsim/processsimulation/processequipment/manifold/Manifold.java rename to src/main/java/neqsim/process/equipment/manifold/Manifold.java index 2d1ad5de0..708d8df05 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/manifold/Manifold.java +++ b/src/main/java/neqsim/process/equipment/manifold/Manifold.java @@ -1,12 +1,12 @@ -package neqsim.processsimulation.processequipment.manifold; +package neqsim.process.equipment.manifold; import java.util.UUID; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.processequipment.ProcessEquipmentBaseClass; -import neqsim.processsimulation.processequipment.mixer.Mixer; -import neqsim.processsimulation.processequipment.splitter.Splitter; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.ProcessEquipmentBaseClass; +import neqsim.process.equipment.mixer.Mixer; +import neqsim.process.equipment.splitter.Splitter; +import neqsim.process.equipment.stream.StreamInterface; /** *

@@ -44,7 +44,7 @@ public Manifold(String name) { * addStream. *

* - * @param newStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param newStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public void addStream(StreamInterface newStream) { @@ -70,7 +70,7 @@ public void setSplitFactors(double[] splitFact) { *

* * @param i a int - * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @return a {@link neqsim.process.equipment.stream.StreamInterface} object */ public StreamInterface getSplitStream(int i) { return localsplitter.getSplitStream(i); @@ -81,7 +81,7 @@ public StreamInterface getSplitStream(int i) { * getMixedStream. *

* - * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @return a {@link neqsim.process.equipment.stream.StreamInterface} */ public StreamInterface getMixedStream() { return localmixer.getOutletStream(); diff --git a/src/main/java/neqsim/processsimulation/processequipment/mixer/Mixer.java b/src/main/java/neqsim/process/equipment/mixer/Mixer.java similarity index 98% rename from src/main/java/neqsim/processsimulation/processequipment/mixer/Mixer.java rename to src/main/java/neqsim/process/equipment/mixer/Mixer.java index a9fdaf31d..860d73867 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/mixer/Mixer.java +++ b/src/main/java/neqsim/process/equipment/mixer/Mixer.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.mixer; +package neqsim.process.equipment.mixer; import java.awt.Container; import java.awt.FlowLayout; @@ -14,8 +14,8 @@ import javax.swing.JTable; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.processequipment.ProcessEquipmentBaseClass; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.ProcessEquipmentBaseClass; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -92,7 +92,7 @@ public void addStream(StreamInterface newStream) { *

* * @param i a int - * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @return a {@link neqsim.process.equipment.stream.StreamInterface} object */ public StreamInterface getStream(int i) { return streams.get(i); diff --git a/src/main/java/neqsim/processsimulation/processequipment/mixer/MixerInterface.java b/src/main/java/neqsim/process/equipment/mixer/MixerInterface.java similarity index 66% rename from src/main/java/neqsim/processsimulation/processequipment/mixer/MixerInterface.java rename to src/main/java/neqsim/process/equipment/mixer/MixerInterface.java index 662243ed6..cc8d7dcc5 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/mixer/MixerInterface.java +++ b/src/main/java/neqsim/process/equipment/mixer/MixerInterface.java @@ -4,10 +4,10 @@ * Created on 21. august 2001, 22:28 */ -package neqsim.processsimulation.processequipment.mixer; +package neqsim.process.equipment.mixer; -import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.ProcessEquipmentInterface; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; /** @@ -24,7 +24,7 @@ public interface MixerInterface extends ProcessEquipmentInterface { * addStream. *

* - * @param newStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param newStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public void addStream(StreamInterface newStream); @@ -34,7 +34,7 @@ public interface MixerInterface extends ProcessEquipmentInterface { * Getter for outlet stream object. *

* - * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @return a {@link neqsim.process.equipment.stream.StreamInterface} object */ public StreamInterface getOutletStream(); @@ -43,7 +43,7 @@ public interface MixerInterface extends ProcessEquipmentInterface { * Getter for outlet stream object. *

* - * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @return a {@link neqsim.process.equipment.stream.StreamInterface} object * @deprecated use {@link #getOutletStream} instead */ @Deprecated @@ -57,7 +57,7 @@ public default StreamInterface getOutStream() { *

* * @param i a int - * @param newStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param newStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public void replaceStream(int i, StreamInterface newStream); diff --git a/src/main/java/neqsim/processsimulation/processequipment/mixer/StaticMixer.java b/src/main/java/neqsim/process/equipment/mixer/StaticMixer.java similarity index 98% rename from src/main/java/neqsim/processsimulation/processequipment/mixer/StaticMixer.java rename to src/main/java/neqsim/process/equipment/mixer/StaticMixer.java index 54becee62..cb908579a 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/mixer/StaticMixer.java +++ b/src/main/java/neqsim/process/equipment/mixer/StaticMixer.java @@ -4,7 +4,7 @@ * Created on 11. mars 2001, 01:49 */ -package neqsim.processsimulation.processequipment.mixer; +package neqsim.process.equipment.mixer; import java.util.UUID; import neqsim.thermodynamicoperations.ThermodynamicOperations; diff --git a/src/main/java/neqsim/processsimulation/processequipment/mixer/StaticNeqMixer.java b/src/main/java/neqsim/process/equipment/mixer/StaticNeqMixer.java similarity index 98% rename from src/main/java/neqsim/processsimulation/processequipment/mixer/StaticNeqMixer.java rename to src/main/java/neqsim/process/equipment/mixer/StaticNeqMixer.java index 2876a89d1..b89db56d1 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/mixer/StaticNeqMixer.java +++ b/src/main/java/neqsim/process/equipment/mixer/StaticNeqMixer.java @@ -4,7 +4,7 @@ * Created on 11. mars 2001, 01:49 */ -package neqsim.processsimulation.processequipment.mixer; +package neqsim.process.equipment.mixer; import java.util.UUID; import neqsim.thermo.system.SystemInterface; diff --git a/src/main/java/neqsim/processsimulation/processequipment/mixer/StaticPhaseMixer.java b/src/main/java/neqsim/process/equipment/mixer/StaticPhaseMixer.java similarity index 98% rename from src/main/java/neqsim/processsimulation/processequipment/mixer/StaticPhaseMixer.java rename to src/main/java/neqsim/process/equipment/mixer/StaticPhaseMixer.java index 3826735f1..7325f6cee 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/mixer/StaticPhaseMixer.java +++ b/src/main/java/neqsim/process/equipment/mixer/StaticPhaseMixer.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.mixer; +package neqsim.process.equipment.mixer; import java.util.UUID; import neqsim.thermo.phase.PhaseType; diff --git a/src/main/java/neqsim/processsimulation/processequipment/pipeline/AdiabaticPipe.java b/src/main/java/neqsim/process/equipment/pipeline/AdiabaticPipe.java similarity index 96% rename from src/main/java/neqsim/processsimulation/processequipment/pipeline/AdiabaticPipe.java rename to src/main/java/neqsim/process/equipment/pipeline/AdiabaticPipe.java index d663489a6..4f1dba80a 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/pipeline/AdiabaticPipe.java +++ b/src/main/java/neqsim/process/equipment/pipeline/AdiabaticPipe.java @@ -1,9 +1,9 @@ -package neqsim.processsimulation.processequipment.pipeline; +package neqsim.process.equipment.pipeline; import java.util.UUID; import neqsim.fluidmechanics.flowsystem.FlowSystemInterface; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; /** @@ -366,8 +366,8 @@ public static void main(String[] name) { pipe.setPipeWallRoughness(5e-6); pipe.setOutPressure(112.0); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(pipe); operations.run(); diff --git a/src/main/java/neqsim/processsimulation/processequipment/pipeline/AdiabaticTwoPhasePipe.java b/src/main/java/neqsim/process/equipment/pipeline/AdiabaticTwoPhasePipe.java similarity index 98% rename from src/main/java/neqsim/processsimulation/processequipment/pipeline/AdiabaticTwoPhasePipe.java rename to src/main/java/neqsim/process/equipment/pipeline/AdiabaticTwoPhasePipe.java index 72a5c9bb6..bf0664a81 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/pipeline/AdiabaticTwoPhasePipe.java +++ b/src/main/java/neqsim/process/equipment/pipeline/AdiabaticTwoPhasePipe.java @@ -1,8 +1,8 @@ -package neqsim.processsimulation.processequipment.pipeline; +package neqsim.process.equipment.pipeline; import java.util.UUID; import neqsim.fluidmechanics.flowsystem.FlowSystemInterface; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; diff --git a/src/main/java/neqsim/processsimulation/processequipment/pipeline/Fittings.java b/src/main/java/neqsim/process/equipment/pipeline/Fittings.java similarity index 97% rename from src/main/java/neqsim/processsimulation/processequipment/pipeline/Fittings.java rename to src/main/java/neqsim/process/equipment/pipeline/Fittings.java index 871773b78..6259727ad 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/pipeline/Fittings.java +++ b/src/main/java/neqsim/process/equipment/pipeline/Fittings.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.pipeline; +package neqsim.process.equipment.pipeline; import java.io.Serializable; import java.util.ArrayList; diff --git a/src/main/java/neqsim/processsimulation/processequipment/pipeline/IncompressiblePipeFlow.java b/src/main/java/neqsim/process/equipment/pipeline/IncompressiblePipeFlow.java similarity index 93% rename from src/main/java/neqsim/processsimulation/processequipment/pipeline/IncompressiblePipeFlow.java rename to src/main/java/neqsim/process/equipment/pipeline/IncompressiblePipeFlow.java index eecbaa019..f3bb588f6 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/pipeline/IncompressiblePipeFlow.java +++ b/src/main/java/neqsim/process/equipment/pipeline/IncompressiblePipeFlow.java @@ -1,8 +1,8 @@ -package neqsim.processsimulation.processequipment.pipeline; +package neqsim.process.equipment.pipeline; import java.util.UUID; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; /** @@ -149,8 +149,8 @@ public static void main(String[] name) { pipe2.setInletElevation(10); pipe2.setOutletElevation(0); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(pipe); operations.add(pipe2); diff --git a/src/main/java/neqsim/processsimulation/processequipment/pipeline/OnePhasePipeLine.java b/src/main/java/neqsim/process/equipment/pipeline/OnePhasePipeLine.java similarity index 86% rename from src/main/java/neqsim/processsimulation/processequipment/pipeline/OnePhasePipeLine.java rename to src/main/java/neqsim/process/equipment/pipeline/OnePhasePipeLine.java index 3883b5c96..332670da2 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/pipeline/OnePhasePipeLine.java +++ b/src/main/java/neqsim/process/equipment/pipeline/OnePhasePipeLine.java @@ -4,11 +4,11 @@ * Created on 21. august 2001, 20:44 */ -package neqsim.processsimulation.processequipment.pipeline; +package neqsim.process.equipment.pipeline; import java.util.UUID; import neqsim.fluidmechanics.flowsystem.onephaseflowsystem.pipeflowsystem.PipeFlowSystem; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.stream.StreamInterface; /** *

@@ -26,7 +26,7 @@ public class OnePhasePipeLine extends Pipeline { * Constructor for OnePhasePipeLine. *

* - * @param inStream a {@link neqsim.processsimulation.processequipment.stream.Stream} object + * @param inStream a {@link neqsim.process.equipment.stream.Stream} object */ public OnePhasePipeLine(StreamInterface inStream) { this("OnePhasePipeLine", inStream); diff --git a/src/main/java/neqsim/processsimulation/processequipment/pipeline/PipeBeggsAndBrills.java b/src/main/java/neqsim/process/equipment/pipeline/PipeBeggsAndBrills.java similarity index 99% rename from src/main/java/neqsim/processsimulation/processequipment/pipeline/PipeBeggsAndBrills.java rename to src/main/java/neqsim/process/equipment/pipeline/PipeBeggsAndBrills.java index 34e8d56e2..d2a851786 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/pipeline/PipeBeggsAndBrills.java +++ b/src/main/java/neqsim/process/equipment/pipeline/PipeBeggsAndBrills.java @@ -1,10 +1,10 @@ -package neqsim.processsimulation.processequipment.pipeline; +package neqsim.process.equipment.pipeline; import java.sql.SQLException; import java.util.ArrayList; import java.util.List; import java.util.UUID; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; diff --git a/src/main/java/neqsim/processsimulation/processequipment/pipeline/PipeLineInterface.java b/src/main/java/neqsim/process/equipment/pipeline/PipeLineInterface.java similarity index 91% rename from src/main/java/neqsim/processsimulation/processequipment/pipeline/PipeLineInterface.java rename to src/main/java/neqsim/process/equipment/pipeline/PipeLineInterface.java index 9a65b348d..2fa05d65f 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/pipeline/PipeLineInterface.java +++ b/src/main/java/neqsim/process/equipment/pipeline/PipeLineInterface.java @@ -4,11 +4,11 @@ * Created on 21. august 2001, 20:44 */ -package neqsim.processsimulation.processequipment.pipeline; +package neqsim.process.equipment.pipeline; import neqsim.fluidmechanics.flowsystem.FlowSystemInterface; -import neqsim.processsimulation.SimulationInterface; -import neqsim.processsimulation.processequipment.TwoPortInterface; +import neqsim.process.SimulationInterface; +import neqsim.process.equipment.TwoPortInterface; /** *

diff --git a/src/main/java/neqsim/processsimulation/processequipment/pipeline/Pipeline.java b/src/main/java/neqsim/process/equipment/pipeline/Pipeline.java similarity index 96% rename from src/main/java/neqsim/processsimulation/processequipment/pipeline/Pipeline.java rename to src/main/java/neqsim/process/equipment/pipeline/Pipeline.java index fe6963c76..669106af5 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/pipeline/Pipeline.java +++ b/src/main/java/neqsim/process/equipment/pipeline/Pipeline.java @@ -4,7 +4,7 @@ * Created on 14. mars 2001, 22:30 */ -package neqsim.processsimulation.processequipment.pipeline; +package neqsim.process.equipment.pipeline; import java.util.UUID; import org.apache.logging.log4j.LogManager; @@ -12,9 +12,9 @@ import neqsim.fluidmechanics.flowsystem.FlowSystemInterface; import neqsim.fluidmechanics.geometrydefinitions.GeometryDefinitionInterface; import neqsim.fluidmechanics.geometrydefinitions.pipe.PipeData; -import neqsim.processsimulation.mechanicaldesign.pipeline.PipelineMechanicalDesign; -import neqsim.processsimulation.processequipment.TwoPortEquipment; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.TwoPortEquipment; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.mechanicaldesign.pipeline.PipelineMechanicalDesign; import neqsim.thermo.system.SystemInterface; /** @@ -65,7 +65,7 @@ public Pipeline(String name) { *

* * @param name a {@link java.lang.String} object - * @param inStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param inStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public Pipeline(String name, StreamInterface inStream) { diff --git a/src/main/java/neqsim/processsimulation/processequipment/pipeline/SimpleTPoutPipeline.java b/src/main/java/neqsim/process/equipment/pipeline/SimpleTPoutPipeline.java similarity index 94% rename from src/main/java/neqsim/processsimulation/processequipment/pipeline/SimpleTPoutPipeline.java rename to src/main/java/neqsim/process/equipment/pipeline/SimpleTPoutPipeline.java index 6c8888167..2ce3cb776 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/pipeline/SimpleTPoutPipeline.java +++ b/src/main/java/neqsim/process/equipment/pipeline/SimpleTPoutPipeline.java @@ -1,8 +1,8 @@ -package neqsim.processsimulation.processequipment.pipeline; +package neqsim.process.equipment.pipeline; import java.util.UUID; import neqsim.fluidmechanics.flowsystem.FlowSystemInterface; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; /** diff --git a/src/main/java/neqsim/processsimulation/processequipment/pipeline/TwoPhasePipeLine.java b/src/main/java/neqsim/process/equipment/pipeline/TwoPhasePipeLine.java similarity index 83% rename from src/main/java/neqsim/processsimulation/processequipment/pipeline/TwoPhasePipeLine.java rename to src/main/java/neqsim/process/equipment/pipeline/TwoPhasePipeLine.java index daa60c6f9..468b8cd18 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/pipeline/TwoPhasePipeLine.java +++ b/src/main/java/neqsim/process/equipment/pipeline/TwoPhasePipeLine.java @@ -4,11 +4,11 @@ * Created on 21. august 2001, 20:45 */ -package neqsim.processsimulation.processequipment.pipeline; +package neqsim.process.equipment.pipeline; import java.util.UUID; import neqsim.fluidmechanics.flowsystem.twophaseflowsystem.twophasepipeflowsystem.TwoPhasePipeFlowSystem; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.stream.StreamInterface; /** *

@@ -36,7 +36,7 @@ public TwoPhasePipeLine(String name) { *

* * @param name a {@link java.lang.String} object - * @param inStream a {@link neqsim.processsimulation.processequipment.stream.Stream} object + * @param inStream a {@link neqsim.process.equipment.stream.Stream} object */ public TwoPhasePipeLine(String name, StreamInterface inStream) { super(name, inStream); diff --git a/src/main/java/neqsim/processsimulation/processequipment/powergeneration/GasTurbine.java b/src/main/java/neqsim/process/equipment/powergeneration/GasTurbine.java similarity index 89% rename from src/main/java/neqsim/processsimulation/processequipment/powergeneration/GasTurbine.java rename to src/main/java/neqsim/process/equipment/powergeneration/GasTurbine.java index d4e4e1a3e..5087229ad 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/powergeneration/GasTurbine.java +++ b/src/main/java/neqsim/process/equipment/powergeneration/GasTurbine.java @@ -1,16 +1,16 @@ -package neqsim.processsimulation.processequipment.powergeneration; +package neqsim.process.equipment.powergeneration; import java.util.UUID; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.mechanicaldesign.compressor.CompressorMechanicalDesign; -import neqsim.processsimulation.processequipment.TwoPortEquipment; -import neqsim.processsimulation.processequipment.compressor.Compressor; -import neqsim.processsimulation.processequipment.expander.Expander; -import neqsim.processsimulation.processequipment.heatexchanger.Cooler; -import neqsim.processsimulation.processequipment.heatexchanger.Heater; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.TwoPortEquipment; +import neqsim.process.equipment.compressor.Compressor; +import neqsim.process.equipment.expander.Expander; +import neqsim.process.equipment.heatexchanger.Cooler; +import neqsim.process.equipment.heatexchanger.Heater; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.mechanicaldesign.compressor.CompressorMechanicalDesign; import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.system.SystemInterface; @@ -71,7 +71,7 @@ public GasTurbine(String name) { *

* * @param name a {@link java.lang.String} object - * @param inletStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param inletStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public GasTurbine(String name, StreamInterface inletStream) { diff --git a/src/main/java/neqsim/processsimulation/processequipment/pump/Pump.java b/src/main/java/neqsim/process/equipment/pump/Pump.java similarity index 96% rename from src/main/java/neqsim/processsimulation/processequipment/pump/Pump.java rename to src/main/java/neqsim/process/equipment/pump/Pump.java index f28f15802..d011d0067 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/pump/Pump.java +++ b/src/main/java/neqsim/process/equipment/pump/Pump.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.pump; +package neqsim.process.equipment.pump; import java.awt.Container; import java.awt.FlowLayout; @@ -10,9 +10,9 @@ import javax.swing.JScrollPane; import javax.swing.JTable; import com.google.gson.GsonBuilder; -import neqsim.processsimulation.processequipment.TwoPortEquipment; -import neqsim.processsimulation.processequipment.stream.StreamInterface; -import neqsim.processsimulation.util.monitor.PumpResponse; +import neqsim.process.equipment.TwoPortEquipment; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.util.monitor.PumpResponse; import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -57,7 +57,7 @@ public Pump(String name) { *

* * @param name name of pump - * @param inletStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param inletStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public Pump(String name, StreamInterface inletStream) { @@ -435,7 +435,7 @@ public double getSpeed() { * Getter for the field pumpChart. *

* - * @return a {@link neqsim.processsimulation.processequipment.pump.PumpChart} object + * @return a {@link neqsim.process.equipment.pump.PumpChart} object */ public PumpChart getPumpChart() { return pumpChart; diff --git a/src/main/java/neqsim/processsimulation/processequipment/pump/PumpChart.java b/src/main/java/neqsim/process/equipment/pump/PumpChart.java similarity index 98% rename from src/main/java/neqsim/processsimulation/processequipment/pump/PumpChart.java rename to src/main/java/neqsim/process/equipment/pump/PumpChart.java index 32d6ca146..2f1ab98e1 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/pump/PumpChart.java +++ b/src/main/java/neqsim/process/equipment/pump/PumpChart.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.pump; +package neqsim.process.equipment.pump; import java.util.ArrayList; import java.util.Arrays; @@ -7,7 +7,7 @@ import org.apache.commons.math3.fitting.WeightedObservedPoints; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.stream.Stream; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; @@ -288,8 +288,8 @@ public static void main(String[] args) { pump1.getPumpChart().setCurves(chartConditions, speed, flow, head, efficiency); pump1.getPumpChart().setHeadUnit("kJ/kg"); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(pump1); operations.run(); diff --git a/src/main/java/neqsim/processsimulation/processequipment/pump/PumpChartInterface.java b/src/main/java/neqsim/process/equipment/pump/PumpChartInterface.java similarity index 98% rename from src/main/java/neqsim/processsimulation/processequipment/pump/PumpChartInterface.java rename to src/main/java/neqsim/process/equipment/pump/PumpChartInterface.java index 723daaec3..288608a15 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/pump/PumpChartInterface.java +++ b/src/main/java/neqsim/process/equipment/pump/PumpChartInterface.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.pump; +package neqsim.process.equipment.pump; /** *

diff --git a/src/main/java/neqsim/processsimulation/processequipment/pump/PumpCurve.java b/src/main/java/neqsim/process/equipment/pump/PumpCurve.java similarity index 94% rename from src/main/java/neqsim/processsimulation/processequipment/pump/PumpCurve.java rename to src/main/java/neqsim/process/equipment/pump/PumpCurve.java index c7de10dc1..8a5c87579 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/pump/PumpCurve.java +++ b/src/main/java/neqsim/process/equipment/pump/PumpCurve.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.pump; +package neqsim.process.equipment.pump; /** *

diff --git a/src/main/java/neqsim/processsimulation/processequipment/pump/PumpInterface.java b/src/main/java/neqsim/process/equipment/pump/PumpInterface.java similarity index 65% rename from src/main/java/neqsim/processsimulation/processequipment/pump/PumpInterface.java rename to src/main/java/neqsim/process/equipment/pump/PumpInterface.java index 44d7e49e6..2c1420557 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/pump/PumpInterface.java +++ b/src/main/java/neqsim/process/equipment/pump/PumpInterface.java @@ -1,7 +1,7 @@ -package neqsim.processsimulation.processequipment.pump; +package neqsim.process.equipment.pump; -import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; -import neqsim.processsimulation.processequipment.TwoPortInterface; +import neqsim.process.equipment.ProcessEquipmentInterface; +import neqsim.process.equipment.TwoPortInterface; /** *

diff --git a/src/main/java/neqsim/processsimulation/processequipment/reservoir/ReservoirCVDsim.java b/src/main/java/neqsim/process/equipment/reservoir/ReservoirCVDsim.java similarity index 83% rename from src/main/java/neqsim/processsimulation/processequipment/reservoir/ReservoirCVDsim.java rename to src/main/java/neqsim/process/equipment/reservoir/ReservoirCVDsim.java index aa508f327..6d21c8427 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/reservoir/ReservoirCVDsim.java +++ b/src/main/java/neqsim/process/equipment/reservoir/ReservoirCVDsim.java @@ -1,7 +1,7 @@ -package neqsim.processsimulation.processequipment.reservoir; +package neqsim.process.equipment.reservoir; import java.util.UUID; -import neqsim.processsimulation.processequipment.ProcessEquipmentBaseClass; +import neqsim.process.equipment.ProcessEquipmentBaseClass; import neqsim.thermo.system.SystemInterface; /** diff --git a/src/main/java/neqsim/processsimulation/processequipment/reservoir/ReservoirDiffLibsim.java b/src/main/java/neqsim/process/equipment/reservoir/ReservoirDiffLibsim.java similarity index 84% rename from src/main/java/neqsim/processsimulation/processequipment/reservoir/ReservoirDiffLibsim.java rename to src/main/java/neqsim/process/equipment/reservoir/ReservoirDiffLibsim.java index 184773bad..c209156b1 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/reservoir/ReservoirDiffLibsim.java +++ b/src/main/java/neqsim/process/equipment/reservoir/ReservoirDiffLibsim.java @@ -1,7 +1,7 @@ -package neqsim.processsimulation.processequipment.reservoir; +package neqsim.process.equipment.reservoir; import java.util.UUID; -import neqsim.processsimulation.processequipment.ProcessEquipmentBaseClass; +import neqsim.process.equipment.ProcessEquipmentBaseClass; import neqsim.thermo.system.SystemInterface; /** diff --git a/src/main/java/neqsim/processsimulation/processequipment/reservoir/ReservoirTPsim.java b/src/main/java/neqsim/process/equipment/reservoir/ReservoirTPsim.java similarity index 90% rename from src/main/java/neqsim/processsimulation/processequipment/reservoir/ReservoirTPsim.java rename to src/main/java/neqsim/process/equipment/reservoir/ReservoirTPsim.java index dea428675..7bda53cdb 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/reservoir/ReservoirTPsim.java +++ b/src/main/java/neqsim/process/equipment/reservoir/ReservoirTPsim.java @@ -1,9 +1,9 @@ -package neqsim.processsimulation.processequipment.reservoir; +package neqsim.process.equipment.reservoir; import java.util.UUID; -import neqsim.processsimulation.processequipment.ProcessEquipmentBaseClass; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.ProcessEquipmentBaseClass; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -80,7 +80,7 @@ public void run(UUID id) { * Getter for the field outStream. *

* - * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @return a {@link neqsim.process.equipment.stream.StreamInterface} object */ public StreamInterface getOutStream() { return outStream; diff --git a/src/main/java/neqsim/processsimulation/processequipment/reservoir/SimpleReservoir.java b/src/main/java/neqsim/process/equipment/reservoir/SimpleReservoir.java similarity index 94% rename from src/main/java/neqsim/processsimulation/processequipment/reservoir/SimpleReservoir.java rename to src/main/java/neqsim/process/equipment/reservoir/SimpleReservoir.java index 46344e6f2..f1133bbb7 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/reservoir/SimpleReservoir.java +++ b/src/main/java/neqsim/process/equipment/reservoir/SimpleReservoir.java @@ -4,14 +4,14 @@ * Created on 12. mars 2001, 19:48 */ -package neqsim.processsimulation.processequipment.reservoir; +package neqsim.process.equipment.reservoir; import java.util.ArrayList; import java.util.UUID; -import neqsim.processsimulation.processequipment.ProcessEquipmentBaseClass; -import neqsim.processsimulation.processequipment.pipeline.AdiabaticTwoPhasePipe; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.ProcessEquipmentBaseClass; +import neqsim.process.equipment.pipeline.AdiabaticTwoPhasePipe; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -84,7 +84,7 @@ public SystemInterface getReservoirFluid() { *

* * @param name a {@link java.lang.String} object - * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @return a {@link neqsim.process.equipment.stream.StreamInterface} object */ public StreamInterface addGasProducer(String name) { Well newWell = new Well(name); @@ -102,7 +102,7 @@ public StreamInterface addGasProducer(String name) { *

* * @param name a {@link java.lang.String} object - * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @return a {@link neqsim.process.equipment.stream.StreamInterface} object */ public StreamInterface addOilProducer(String name) { Well newWell = new Well(name); @@ -120,7 +120,7 @@ public StreamInterface addOilProducer(String name) { *

* * @param name a {@link java.lang.String} object - * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @return a {@link neqsim.process.equipment.stream.StreamInterface} object */ public StreamInterface addWaterInjector(String name) { Well newWell = new Well(name); @@ -139,7 +139,7 @@ public StreamInterface addWaterInjector(String name) { *

* * @param name a {@link java.lang.String} object - * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @return a {@link neqsim.process.equipment.stream.StreamInterface} object */ public StreamInterface addWaterProducer(String name) { Well newWell = new Well(name); @@ -157,7 +157,7 @@ public StreamInterface addWaterProducer(String name) { *

* * @param name a {@link java.lang.String} object - * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @return a {@link neqsim.process.equipment.stream.StreamInterface} object */ public StreamInterface addGasInjector(String name) { Well newWell = new Well(name); @@ -225,7 +225,7 @@ public double getOilInPlace(String unit) { *

* * @param i a int - * @return a {@link neqsim.processsimulation.processequipment.reservoir.Well} object + * @return a {@link neqsim.process.equipment.reservoir.Well} object */ public Well getGasProducer(int i) { return gasProducer.get(i); @@ -237,7 +237,7 @@ public Well getGasProducer(int i) { *

* * @param i a int - * @return a {@link neqsim.processsimulation.processequipment.reservoir.Well} object + * @return a {@link neqsim.process.equipment.reservoir.Well} object */ public Well getOilProducer(int i) { return oilProducer.get(i); @@ -249,7 +249,7 @@ public Well getOilProducer(int i) { *

* * @param name a {@link java.lang.String} object - * @return a {@link neqsim.processsimulation.processequipment.reservoir.Well} object + * @return a {@link neqsim.process.equipment.reservoir.Well} object */ public Well getOilProducer(String name) { for (int i = 0; i < oilProducer.size(); i++) { @@ -266,7 +266,7 @@ public Well getOilProducer(String name) { *

* * @param i a int - * @return a {@link neqsim.processsimulation.processequipment.reservoir.Well} object + * @return a {@link neqsim.process.equipment.reservoir.Well} object */ public Well getWaterProducer(int i) { return waterProducer.get(i); @@ -278,7 +278,7 @@ public Well getWaterProducer(int i) { *

* * @param i a int - * @return a {@link neqsim.processsimulation.processequipment.reservoir.Well} object + * @return a {@link neqsim.process.equipment.reservoir.Well} object */ public Well getWaterInjector(int i) { return waterInjector.get(i); @@ -290,7 +290,7 @@ public Well getWaterInjector(int i) { *

* * @param i a int - * @return a {@link neqsim.processsimulation.processequipment.reservoir.Well} object + * @return a {@link neqsim.process.equipment.reservoir.Well} object */ public Well getGasInjector(int i) { return gasInjector.get(i); @@ -631,8 +631,8 @@ public static void main(String[] args) { StreamInterface producedGasStream = reservoirOps.addGasProducer("SLP_A32562G"); StreamInterface waterInjectorStream = reservoirOps.addWaterInjector("SLP_WI32562O"); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(reservoirOps); // operations.save("c:/temp/resmode1.neqsim"); diff --git a/src/main/java/neqsim/processsimulation/processequipment/reservoir/Well.java b/src/main/java/neqsim/process/equipment/reservoir/Well.java similarity index 90% rename from src/main/java/neqsim/processsimulation/processequipment/reservoir/Well.java rename to src/main/java/neqsim/process/equipment/reservoir/Well.java index ef6a521f9..fefe1140a 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/reservoir/Well.java +++ b/src/main/java/neqsim/process/equipment/reservoir/Well.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.processequipment.reservoir; +package neqsim.process.equipment.reservoir; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -38,7 +38,7 @@ public Well(String name) { * Getter for the field stream. *

* - * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @return a {@link neqsim.process.equipment.stream.StreamInterface} object */ public StreamInterface getStream() { return stream; @@ -49,7 +49,7 @@ public StreamInterface getStream() { * Setter for the field stream. *

* - * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @param stream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public void setStream(StreamInterface stream) { this.stream = stream; diff --git a/src/main/java/neqsim/processsimulation/processequipment/reservoir/WellFlow.java b/src/main/java/neqsim/process/equipment/reservoir/WellFlow.java similarity index 94% rename from src/main/java/neqsim/processsimulation/processequipment/reservoir/WellFlow.java rename to src/main/java/neqsim/process/equipment/reservoir/WellFlow.java index 9eaea584f..c632f4434 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/reservoir/WellFlow.java +++ b/src/main/java/neqsim/process/equipment/reservoir/WellFlow.java @@ -1,10 +1,10 @@ -package neqsim.processsimulation.processequipment.reservoir; +package neqsim.process.equipment.reservoir; import java.util.UUID; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.processequipment.TwoPortEquipment; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; +import neqsim.process.equipment.TwoPortEquipment; +import neqsim.process.equipment.valve.ThrottlingValve; import neqsim.thermo.system.SystemInterface; /** diff --git a/src/main/java/neqsim/processsimulation/processequipment/separator/GasScrubber.java b/src/main/java/neqsim/process/equipment/separator/GasScrubber.java similarity index 72% rename from src/main/java/neqsim/processsimulation/processequipment/separator/GasScrubber.java rename to src/main/java/neqsim/process/equipment/separator/GasScrubber.java index 0cd964b55..cec0d9baf 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/separator/GasScrubber.java +++ b/src/main/java/neqsim/process/equipment/separator/GasScrubber.java @@ -4,10 +4,10 @@ * Created on 12. mars 2001, 19:48 */ -package neqsim.processsimulation.processequipment.separator; +package neqsim.process.equipment.separator; -import neqsim.processsimulation.mechanicaldesign.separator.GasScrubberMechanicalDesign; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.mechanicaldesign.separator.GasScrubberMechanicalDesign; /** *

@@ -36,7 +36,7 @@ public GasScrubber(String name) { *

* * @param name a {@link java.lang.String} object - * @param inletStream a {@link neqsim.processsimulation.processequipment.stream.Stream} object + * @param inletStream a {@link neqsim.process.equipment.stream.Stream} object */ public GasScrubber(String name, StreamInterface inletStream) { super(name, inletStream); diff --git a/src/main/java/neqsim/processsimulation/processequipment/separator/GasScrubberSimple.java b/src/main/java/neqsim/process/equipment/separator/GasScrubberSimple.java similarity index 90% rename from src/main/java/neqsim/processsimulation/processequipment/separator/GasScrubberSimple.java rename to src/main/java/neqsim/process/equipment/separator/GasScrubberSimple.java index 1d9f89914..1a3585447 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/separator/GasScrubberSimple.java +++ b/src/main/java/neqsim/process/equipment/separator/GasScrubberSimple.java @@ -4,12 +4,12 @@ * Created on 12. mars 2001, 19:48 */ -package neqsim.processsimulation.processequipment.separator; +package neqsim.process.equipment.separator; import java.util.UUID; -import neqsim.processsimulation.mechanicaldesign.separator.GasScrubberMechanicalDesign; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.mechanicaldesign.separator.GasScrubberMechanicalDesign; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -49,7 +49,7 @@ public GasScrubberSimple(String name) { *

* * @param name a {@link java.lang.String} object - * @param inletStream a {@link neqsim.processsimulation.processequipment.stream.Stream} object + * @param inletStream a {@link neqsim.process.equipment.stream.Stream} object */ public GasScrubberSimple(String name, StreamInterface inletStream) { super(name, inletStream); diff --git a/src/main/java/neqsim/processsimulation/processequipment/separator/Hydrocyclone.java b/src/main/java/neqsim/process/equipment/separator/Hydrocyclone.java similarity index 87% rename from src/main/java/neqsim/processsimulation/processequipment/separator/Hydrocyclone.java rename to src/main/java/neqsim/process/equipment/separator/Hydrocyclone.java index adfd09d20..474955b40 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/separator/Hydrocyclone.java +++ b/src/main/java/neqsim/process/equipment/separator/Hydrocyclone.java @@ -1,8 +1,8 @@ -package neqsim.processsimulation.processequipment.separator; +package neqsim.process.equipment.separator; import java.util.UUID; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; /** @@ -39,7 +39,7 @@ public Hydrocyclone(String name) { *

* * @param name a {@link java.lang.String} object - * @param inletStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param inletStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public Hydrocyclone(String name, StreamInterface inletStream) { @@ -61,7 +61,7 @@ public void setInletStream(StreamInterface inletStream) { * Getter for the field waterOutStream. *

* - * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @return a {@link neqsim.process.equipment.stream.StreamInterface} object */ public StreamInterface getWaterOutStream() { return waterOutStream; @@ -72,7 +72,7 @@ public StreamInterface getWaterOutStream() { * getOilOutStream. *

* - * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @return a {@link neqsim.process.equipment.stream.StreamInterface} object */ public StreamInterface getOilOutStream() { return liquidOutStream; diff --git a/src/main/java/neqsim/processsimulation/processequipment/separator/NeqGasScrubber.java b/src/main/java/neqsim/process/equipment/separator/NeqGasScrubber.java similarity index 86% rename from src/main/java/neqsim/processsimulation/processequipment/separator/NeqGasScrubber.java rename to src/main/java/neqsim/process/equipment/separator/NeqGasScrubber.java index 377cfcf09..0931e1b1d 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/separator/NeqGasScrubber.java +++ b/src/main/java/neqsim/process/equipment/separator/NeqGasScrubber.java @@ -1,11 +1,11 @@ -package neqsim.processsimulation.processequipment.separator; +package neqsim.process.equipment.separator; 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.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.separator.sectiontype.SeparatorSection; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.mechanicaldesign.separator.GasScrubberMechanicalDesign; import neqsim.thermo.system.SystemInterface; /** @@ -48,7 +48,7 @@ public NeqGasScrubber(String name) { *

* * @param name a {@link java.lang.String} object - * @param inletStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param inletStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public NeqGasScrubber(String name, StreamInterface inletStream) { diff --git a/src/main/java/neqsim/processsimulation/processequipment/separator/Separator.java b/src/main/java/neqsim/process/equipment/separator/Separator.java similarity index 93% rename from src/main/java/neqsim/processsimulation/processequipment/separator/Separator.java rename to src/main/java/neqsim/process/equipment/separator/Separator.java index 51bfa9489..6b67b8d0a 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/separator/Separator.java +++ b/src/main/java/neqsim/process/equipment/separator/Separator.java @@ -4,7 +4,7 @@ * Created on 12. mars 2001, 19:48 */ -package neqsim.processsimulation.processequipment.separator; +package neqsim.process.equipment.separator; import java.util.ArrayList; import java.util.Objects; @@ -13,17 +13,17 @@ import org.apache.logging.log4j.Logger; import com.google.gson.GsonBuilder; import neqsim.physicalproperties.PhysicalPropertyType; -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.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; -import neqsim.processsimulation.util.monitor.SeparatorResponse; +import neqsim.process.equipment.ProcessEquipmentBaseClass; +import neqsim.process.equipment.mixer.Mixer; +import neqsim.process.equipment.separator.sectiontype.ManwaySection; +import neqsim.process.equipment.separator.sectiontype.MeshSection; +import neqsim.process.equipment.separator.sectiontype.NozzleSection; +import neqsim.process.equipment.separator.sectiontype.SeparatorSection; +import neqsim.process.equipment.separator.sectiontype.ValveSection; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.mechanicaldesign.separator.SeparatorMechanicalDesign; +import neqsim.process.util.monitor.SeparatorResponse; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -88,7 +88,7 @@ public Separator(String name) { * Constructor for Separator. * * @param name a {@link java.lang.String} object - * @param inletStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param inletStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public Separator(String name, StreamInterface inletStream) { @@ -114,7 +114,7 @@ public void initMechanicalDesign() { * setInletStream. *

* - * @param inletStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param inletStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public void setInletStream(StreamInterface inletStream) { @@ -133,7 +133,7 @@ public void setInletStream(StreamInterface inletStream) { * addStream. *

* - * @param newStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param newStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public void addStream(StreamInterface newStream) { @@ -150,7 +150,7 @@ public void addStream(StreamInterface newStream) { * Getter for the field liquidOutStream. *

* - * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @return a {@link neqsim.process.equipment.stream.StreamInterface} object */ public StreamInterface getLiquidOutStream() { return liquidOutStream; @@ -161,7 +161,7 @@ public StreamInterface getLiquidOutStream() { * Getter for the field gasOutStream. *

* - * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @return a {@link neqsim.process.equipment.stream.StreamInterface} object */ public StreamInterface getGasOutStream() { return gasOutStream; @@ -172,7 +172,7 @@ public StreamInterface getGasOutStream() { * getGas. *

* - * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @return a {@link neqsim.process.equipment.stream.StreamInterface} object */ public StreamInterface getGas() { return getGasOutStream(); @@ -183,7 +183,7 @@ public StreamInterface getGas() { * getLiquid. *

* - * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @return a {@link neqsim.process.equipment.stream.StreamInterface} object */ public StreamInterface getLiquid() { return getLiquidOutStream(); @@ -652,7 +652,7 @@ public void setSeparatorLength(double separatorLength) { * * @param i a int * @return a - * {@link neqsim.processsimulation.processequipment.separator.sectiontype.SeparatorSection} + * {@link neqsim.process.equipment.separator.sectiontype.SeparatorSection} * object */ public SeparatorSection getSeparatorSection(int i) { @@ -666,7 +666,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.process.equipment.separator.sectiontype.SeparatorSection} * object */ public SeparatorSection getSeparatorSection(String name) { @@ -852,7 +852,7 @@ public boolean equals(Object obj) { * getFeedStream. *

* - * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @return a {@link neqsim.process.equipment.stream.StreamInterface} object */ public StreamInterface getFeedStream() { return inletStreamMixer.getOutletStream(); diff --git a/src/main/java/neqsim/processsimulation/processequipment/separator/SeparatorInterface.java b/src/main/java/neqsim/process/equipment/separator/SeparatorInterface.java similarity index 86% rename from src/main/java/neqsim/processsimulation/processequipment/separator/SeparatorInterface.java rename to src/main/java/neqsim/process/equipment/separator/SeparatorInterface.java index c9d463fad..7b84a3d77 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/separator/SeparatorInterface.java +++ b/src/main/java/neqsim/process/equipment/separator/SeparatorInterface.java @@ -4,9 +4,9 @@ * Created on 22. august 2001, 17:22 */ -package neqsim.processsimulation.processequipment.separator; +package neqsim.process.equipment.separator; -import neqsim.processsimulation.SimulationInterface; +import neqsim.process.SimulationInterface; import neqsim.thermo.system.SystemInterface; /** diff --git a/src/main/java/neqsim/processsimulation/processequipment/separator/ThreePhaseSeparator.java b/src/main/java/neqsim/process/equipment/separator/ThreePhaseSeparator.java similarity index 93% rename from src/main/java/neqsim/processsimulation/processequipment/separator/ThreePhaseSeparator.java rename to src/main/java/neqsim/process/equipment/separator/ThreePhaseSeparator.java index 69d4100ad..dd2f4b774 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/separator/ThreePhaseSeparator.java +++ b/src/main/java/neqsim/process/equipment/separator/ThreePhaseSeparator.java @@ -1,10 +1,10 @@ -package neqsim.processsimulation.processequipment.separator; +package neqsim.process.equipment.separator; import java.util.UUID; import com.google.gson.GsonBuilder; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; -import neqsim.processsimulation.util.monitor.SeparatorResponse; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.util.monitor.SeparatorResponse; import neqsim.thermodynamicoperations.ThermodynamicOperations; /** @@ -56,7 +56,7 @@ public ThreePhaseSeparator(String name) { *

* * @param name a {@link java.lang.String} object - * @param inletStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param inletStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public ThreePhaseSeparator(String name, StreamInterface inletStream) { @@ -118,7 +118,7 @@ public void setInletStream(StreamInterface inletStream) { * Getter for the field waterOutStream. *

* - * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @return a {@link neqsim.process.equipment.stream.StreamInterface} object */ public StreamInterface getWaterOutStream() { return waterOutStream; @@ -129,7 +129,7 @@ public StreamInterface getWaterOutStream() { * getOilOutStream. *

* - * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @return a {@link neqsim.process.equipment.stream.StreamInterface} object */ public StreamInterface getOilOutStream() { return liquidOutStream; diff --git a/src/main/java/neqsim/processsimulation/processequipment/separator/TwoPhaseSeparator.java b/src/main/java/neqsim/process/equipment/separator/TwoPhaseSeparator.java similarity index 89% rename from src/main/java/neqsim/processsimulation/processequipment/separator/TwoPhaseSeparator.java rename to src/main/java/neqsim/process/equipment/separator/TwoPhaseSeparator.java index 338a0292a..1e19439ae 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/separator/TwoPhaseSeparator.java +++ b/src/main/java/neqsim/process/equipment/separator/TwoPhaseSeparator.java @@ -1,8 +1,8 @@ -package neqsim.processsimulation.processequipment.separator; +package neqsim.process.equipment.separator; import java.util.UUID; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; /** @@ -42,7 +42,7 @@ public TwoPhaseSeparator(String name) { *

* * @param name a {@link java.lang.String} object - * @param inletStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param inletStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public TwoPhaseSeparator(String name, StreamInterface inletStream) { diff --git a/src/main/java/neqsim/processsimulation/processequipment/separator/sectiontype/ManwaySection.java b/src/main/java/neqsim/process/equipment/separator/sectiontype/ManwaySection.java similarity index 69% rename from src/main/java/neqsim/processsimulation/processequipment/separator/sectiontype/ManwaySection.java rename to src/main/java/neqsim/process/equipment/separator/sectiontype/ManwaySection.java index f5bca7c08..e774b780d 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/separator/sectiontype/ManwaySection.java +++ b/src/main/java/neqsim/process/equipment/separator/sectiontype/ManwaySection.java @@ -1,7 +1,7 @@ -package neqsim.processsimulation.processequipment.separator.sectiontype; +package neqsim.process.equipment.separator.sectiontype; -import neqsim.processsimulation.mechanicaldesign.separator.sectiontype.MechManwaySection; -import neqsim.processsimulation.processequipment.separator.Separator; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.mechanicaldesign.separator.sectiontype.MechManwaySection; /** *

@@ -22,7 +22,7 @@ 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} + * {@link neqsim.process.equipment.separator.Separator} * object */ public ManwaySection(String name, String type, Separator sep) { diff --git a/src/main/java/neqsim/processsimulation/processequipment/separator/sectiontype/MeshSection.java b/src/main/java/neqsim/process/equipment/separator/sectiontype/MeshSection.java similarity index 72% rename from src/main/java/neqsim/processsimulation/processequipment/separator/sectiontype/MeshSection.java rename to src/main/java/neqsim/process/equipment/separator/sectiontype/MeshSection.java index a81a0b8dc..ec12d0dca 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/separator/sectiontype/MeshSection.java +++ b/src/main/java/neqsim/process/equipment/separator/sectiontype/MeshSection.java @@ -1,7 +1,7 @@ -package neqsim.processsimulation.processequipment.separator.sectiontype; +package neqsim.process.equipment.separator.sectiontype; -import neqsim.processsimulation.mechanicaldesign.separator.sectiontype.MecMeshSection; -import neqsim.processsimulation.processequipment.separator.Separator; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.mechanicaldesign.separator.sectiontype.MecMeshSection; /** *

@@ -22,7 +22,7 @@ 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} + * {@link neqsim.process.equipment.separator.Separator} * object */ public MeshSection(String name, String type, Separator sep) { diff --git a/src/main/java/neqsim/processsimulation/processequipment/separator/sectiontype/NozzleSection.java b/src/main/java/neqsim/process/equipment/separator/sectiontype/NozzleSection.java similarity index 69% rename from src/main/java/neqsim/processsimulation/processequipment/separator/sectiontype/NozzleSection.java rename to src/main/java/neqsim/process/equipment/separator/sectiontype/NozzleSection.java index cf8f8b728..fce382827 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/separator/sectiontype/NozzleSection.java +++ b/src/main/java/neqsim/process/equipment/separator/sectiontype/NozzleSection.java @@ -1,7 +1,7 @@ -package neqsim.processsimulation.processequipment.separator.sectiontype; +package neqsim.process.equipment.separator.sectiontype; -import neqsim.processsimulation.mechanicaldesign.separator.sectiontype.MechNozzleSection; -import neqsim.processsimulation.processequipment.separator.Separator; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.mechanicaldesign.separator.sectiontype.MechNozzleSection; /** *

@@ -22,7 +22,7 @@ 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} + * {@link neqsim.process.equipment.separator.Separator} * object */ public NozzleSection(String name, String type, Separator sep) { diff --git a/src/main/java/neqsim/processsimulation/processequipment/separator/sectiontype/PackedSection.java b/src/main/java/neqsim/process/equipment/separator/sectiontype/PackedSection.java similarity index 76% rename from src/main/java/neqsim/processsimulation/processequipment/separator/sectiontype/PackedSection.java rename to src/main/java/neqsim/process/equipment/separator/sectiontype/PackedSection.java index 1dda81d09..4ae30d94d 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/separator/sectiontype/PackedSection.java +++ b/src/main/java/neqsim/process/equipment/separator/sectiontype/PackedSection.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.processequipment.separator.sectiontype; +package neqsim.process.equipment.separator.sectiontype; -import neqsim.processsimulation.processequipment.separator.Separator; +import neqsim.process.equipment.separator.Separator; /** *

@@ -21,7 +21,7 @@ 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} + * {@link neqsim.process.equipment.separator.Separator} * object */ public PackedSection(String name, String type, Separator sep) { diff --git a/src/main/java/neqsim/processsimulation/processequipment/separator/sectiontype/SeparatorSection.java b/src/main/java/neqsim/process/equipment/separator/sectiontype/SeparatorSection.java similarity index 91% rename from src/main/java/neqsim/processsimulation/processequipment/separator/sectiontype/SeparatorSection.java rename to src/main/java/neqsim/process/equipment/separator/sectiontype/SeparatorSection.java index 5fae06cca..95b05746d 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/separator/sectiontype/SeparatorSection.java +++ b/src/main/java/neqsim/process/equipment/separator/sectiontype/SeparatorSection.java @@ -1,7 +1,7 @@ -package neqsim.processsimulation.processequipment.separator.sectiontype; +package neqsim.process.equipment.separator.sectiontype; -import neqsim.processsimulation.mechanicaldesign.separator.sectiontype.SepDesignSection; -import neqsim.processsimulation.processequipment.separator.Separator; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.mechanicaldesign.separator.sectiontype.SepDesignSection; import neqsim.util.NamedBaseClass; /** @@ -30,7 +30,7 @@ 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} + * {@link neqsim.process.equipment.separator.Separator} * object */ public SeparatorSection(String name, String type, Separator sep) { diff --git a/src/main/java/neqsim/processsimulation/processequipment/separator/sectiontype/ValveSection.java b/src/main/java/neqsim/process/equipment/separator/sectiontype/ValveSection.java similarity index 71% rename from src/main/java/neqsim/processsimulation/processequipment/separator/sectiontype/ValveSection.java rename to src/main/java/neqsim/process/equipment/separator/sectiontype/ValveSection.java index 3dd8296fa..14f684001 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/separator/sectiontype/ValveSection.java +++ b/src/main/java/neqsim/process/equipment/separator/sectiontype/ValveSection.java @@ -1,7 +1,7 @@ -package neqsim.processsimulation.processequipment.separator.sectiontype; +package neqsim.process.equipment.separator.sectiontype; -import neqsim.processsimulation.mechanicaldesign.separator.sectiontype.DistillationTraySection; -import neqsim.processsimulation.processequipment.separator.Separator; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.mechanicaldesign.separator.sectiontype.DistillationTraySection; /** *

@@ -21,7 +21,7 @@ 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.process.equipment.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/process/equipment/separator/sectiontype/VaneSection.java similarity index 72% rename from src/main/java/neqsim/processsimulation/processequipment/separator/sectiontype/VaneSection.java rename to src/main/java/neqsim/process/equipment/separator/sectiontype/VaneSection.java index 5f9e92ac6..f7816204e 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/separator/sectiontype/VaneSection.java +++ b/src/main/java/neqsim/process/equipment/separator/sectiontype/VaneSection.java @@ -1,7 +1,7 @@ -package neqsim.processsimulation.processequipment.separator.sectiontype; +package neqsim.process.equipment.separator.sectiontype; -import neqsim.processsimulation.mechanicaldesign.separator.sectiontype.MechVaneSection; -import neqsim.processsimulation.processequipment.separator.Separator; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.mechanicaldesign.separator.sectiontype.MechVaneSection; /** *

@@ -22,7 +22,7 @@ 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} + * {@link neqsim.process.equipment.separator.Separator} * object */ public VaneSection(String name, String type, Separator sep) { diff --git a/src/main/java/neqsim/processsimulation/processequipment/splitter/ComponentSplitter.java b/src/main/java/neqsim/process/equipment/splitter/ComponentSplitter.java similarity index 84% rename from src/main/java/neqsim/processsimulation/processequipment/splitter/ComponentSplitter.java rename to src/main/java/neqsim/process/equipment/splitter/ComponentSplitter.java index ffe6f50f8..255867df6 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/splitter/ComponentSplitter.java +++ b/src/main/java/neqsim/process/equipment/splitter/ComponentSplitter.java @@ -1,11 +1,11 @@ -package neqsim.processsimulation.processequipment.splitter; +package neqsim.process.equipment.splitter; import java.util.UUID; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.processequipment.ProcessEquipmentBaseClass; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.ProcessEquipmentBaseClass; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -42,7 +42,7 @@ public ComponentSplitter(String name) { *

* * @param name a {@link java.lang.String} object - * @param inletStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param inletStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public ComponentSplitter(String name, StreamInterface inletStream) { @@ -66,7 +66,7 @@ public void setSplitFactors(double[] factors) { * Setter for the field inletStream. *

* - * @param inletStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param inletStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public void setInletStream(StreamInterface inletStream) { @@ -88,7 +88,7 @@ public void setInletStream(StreamInterface inletStream) { *

* * @param i a int - * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @return a {@link neqsim.process.equipment.stream.StreamInterface} object */ public StreamInterface getSplitStream(int i) { return splitStream[i]; diff --git a/src/main/java/neqsim/processsimulation/processequipment/splitter/Splitter.java b/src/main/java/neqsim/process/equipment/splitter/Splitter.java similarity index 93% rename from src/main/java/neqsim/processsimulation/processequipment/splitter/Splitter.java rename to src/main/java/neqsim/process/equipment/splitter/Splitter.java index dd0b12785..1edc3494c 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/splitter/Splitter.java +++ b/src/main/java/neqsim/process/equipment/splitter/Splitter.java @@ -1,12 +1,12 @@ -package neqsim.processsimulation.processequipment.splitter; +package neqsim.process.equipment.splitter; import java.util.UUID; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.processequipment.ProcessEquipmentBaseClass; -import neqsim.processsimulation.processequipment.mixer.Mixer; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.ProcessEquipmentBaseClass; +import neqsim.process.equipment.mixer.Mixer; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -60,7 +60,7 @@ public Splitter(String name, StreamInterface inStream) { *

* * @param name a {@link java.lang.String} object - * @param inletStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param inletStream a {@link neqsim.process.equipment.stream.StreamInterface} * object * @param i a int */ diff --git a/src/main/java/neqsim/processsimulation/processequipment/splitter/SplitterInterface.java b/src/main/java/neqsim/process/equipment/splitter/SplitterInterface.java similarity index 58% rename from src/main/java/neqsim/processsimulation/processequipment/splitter/SplitterInterface.java rename to src/main/java/neqsim/process/equipment/splitter/SplitterInterface.java index e3f3663b2..e6ecaecfb 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/splitter/SplitterInterface.java +++ b/src/main/java/neqsim/process/equipment/splitter/SplitterInterface.java @@ -1,7 +1,7 @@ -package neqsim.processsimulation.processequipment.splitter; +package neqsim.process.equipment.splitter; -import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.ProcessEquipmentInterface; +import neqsim.process.equipment.stream.StreamInterface; /** *

@@ -26,7 +26,7 @@ public interface SplitterInterface extends ProcessEquipmentInterface { * setInletStream. *

* - * @param inletStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param inletStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public void setInletStream(StreamInterface inletStream); @@ -37,7 +37,7 @@ public interface SplitterInterface extends ProcessEquipmentInterface { *

* * @param i a int - * @return a {@link neqsim.processsimulation.processequipment.stream.Stream} object + * @return a {@link neqsim.process.equipment.stream.Stream} object */ public StreamInterface getSplitStream(int i); } diff --git a/src/main/java/neqsim/processsimulation/processequipment/stream/EnergyStream.java b/src/main/java/neqsim/process/equipment/stream/EnergyStream.java similarity index 96% rename from src/main/java/neqsim/processsimulation/processequipment/stream/EnergyStream.java rename to src/main/java/neqsim/process/equipment/stream/EnergyStream.java index 4b4bfac8f..30d2c0e55 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/stream/EnergyStream.java +++ b/src/main/java/neqsim/process/equipment/stream/EnergyStream.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.stream; +package neqsim.process.equipment.stream; import java.util.Objects; import org.apache.logging.log4j.LogManager; diff --git a/src/main/java/neqsim/processsimulation/processequipment/stream/EquilibriumStream.java b/src/main/java/neqsim/process/equipment/stream/EquilibriumStream.java similarity index 97% rename from src/main/java/neqsim/processsimulation/processequipment/stream/EquilibriumStream.java rename to src/main/java/neqsim/process/equipment/stream/EquilibriumStream.java index f6904b8c2..dcc70fe70 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/stream/EquilibriumStream.java +++ b/src/main/java/neqsim/process/equipment/stream/EquilibriumStream.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.stream; +package neqsim.process.equipment.stream; import java.util.UUID; import org.apache.logging.log4j.LogManager; diff --git a/src/main/java/neqsim/processsimulation/processequipment/stream/IronIonSaturationStream.java b/src/main/java/neqsim/process/equipment/stream/IronIonSaturationStream.java similarity index 98% rename from src/main/java/neqsim/processsimulation/processequipment/stream/IronIonSaturationStream.java rename to src/main/java/neqsim/process/equipment/stream/IronIonSaturationStream.java index 956f39c67..4e34ff202 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/stream/IronIonSaturationStream.java +++ b/src/main/java/neqsim/process/equipment/stream/IronIonSaturationStream.java @@ -4,7 +4,7 @@ * Created on 12. mars 2001, 13:11 */ -package neqsim.processsimulation.processequipment.stream; +package neqsim.process.equipment.stream; import java.util.UUID; import org.apache.logging.log4j.LogManager; diff --git a/src/main/java/neqsim/processsimulation/processequipment/stream/NeqStream.java b/src/main/java/neqsim/process/equipment/stream/NeqStream.java similarity index 97% rename from src/main/java/neqsim/processsimulation/processequipment/stream/NeqStream.java rename to src/main/java/neqsim/process/equipment/stream/NeqStream.java index fb3c31519..7c5680d6c 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/stream/NeqStream.java +++ b/src/main/java/neqsim/process/equipment/stream/NeqStream.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.stream; +package neqsim.process.equipment.stream; import java.util.UUID; import org.apache.logging.log4j.LogManager; diff --git a/src/main/java/neqsim/processsimulation/processequipment/stream/ScalePotentialCheckStream.java b/src/main/java/neqsim/process/equipment/stream/ScalePotentialCheckStream.java similarity index 97% rename from src/main/java/neqsim/processsimulation/processequipment/stream/ScalePotentialCheckStream.java rename to src/main/java/neqsim/process/equipment/stream/ScalePotentialCheckStream.java index 7d6804ff1..26daebb33 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/stream/ScalePotentialCheckStream.java +++ b/src/main/java/neqsim/process/equipment/stream/ScalePotentialCheckStream.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.stream; +package neqsim.process.equipment.stream; import java.util.UUID; import org.apache.logging.log4j.LogManager; diff --git a/src/main/java/neqsim/processsimulation/processequipment/stream/Stream.java b/src/main/java/neqsim/process/equipment/stream/Stream.java similarity index 98% rename from src/main/java/neqsim/processsimulation/processequipment/stream/Stream.java rename to src/main/java/neqsim/process/equipment/stream/Stream.java index c8d48f285..278a4db38 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/stream/Stream.java +++ b/src/main/java/neqsim/process/equipment/stream/Stream.java @@ -4,7 +4,7 @@ * Created on 12. mars 2001, 13:11 */ -package neqsim.processsimulation.processequipment.stream; +package neqsim.process.equipment.stream; import java.util.ArrayList; import java.util.HashMap; @@ -12,8 +12,8 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import com.google.gson.GsonBuilder; -import neqsim.processsimulation.processequipment.ProcessEquipmentBaseClass; -import neqsim.processsimulation.util.monitor.StreamResponse; +import neqsim.process.equipment.ProcessEquipmentBaseClass; +import neqsim.process.util.monitor.StreamResponse; import neqsim.standards.gasquality.Standard_ISO6976; import neqsim.standards.oilquality.Standard_ASTM_D6377; import neqsim.thermo.system.SystemInterface; @@ -629,7 +629,7 @@ public double LCV() { * Setter for the field stream. *

* - * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @param stream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public void setStream(StreamInterface stream) { this.stream = stream; diff --git a/src/main/java/neqsim/processsimulation/processequipment/stream/StreamInterface.java b/src/main/java/neqsim/process/equipment/stream/StreamInterface.java similarity index 94% rename from src/main/java/neqsim/processsimulation/processequipment/stream/StreamInterface.java rename to src/main/java/neqsim/process/equipment/stream/StreamInterface.java index dbd4c6790..a647b4edf 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/stream/StreamInterface.java +++ b/src/main/java/neqsim/process/equipment/stream/StreamInterface.java @@ -4,9 +4,9 @@ * Created on 21. august 2001, 22:49 */ -package neqsim.processsimulation.processequipment.stream; +package neqsim.process.equipment.stream; -import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; +import neqsim.process.equipment.ProcessEquipmentInterface; import neqsim.standards.gasquality.Standard_ISO6976; import neqsim.thermo.system.SystemInterface; @@ -177,7 +177,7 @@ public default double getFlowRate(String unit) { * Clone object. *

* - * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @return a {@link neqsim.process.equipment.stream.StreamInterface} object */ public StreamInterface clone(); @@ -187,7 +187,7 @@ public default double getFlowRate(String unit) { *

* * @param name Name of cloned object - * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @return a {@link neqsim.process.equipment.stream.StreamInterface} object */ public StreamInterface clone(String name); diff --git a/src/main/java/neqsim/processsimulation/processequipment/stream/VirtualStream.java b/src/main/java/neqsim/process/equipment/stream/VirtualStream.java similarity index 88% rename from src/main/java/neqsim/processsimulation/processequipment/stream/VirtualStream.java rename to src/main/java/neqsim/process/equipment/stream/VirtualStream.java index f342b1a3c..8b3f51534 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/stream/VirtualStream.java +++ b/src/main/java/neqsim/process/equipment/stream/VirtualStream.java @@ -1,9 +1,9 @@ -package neqsim.processsimulation.processequipment.stream; +package neqsim.process.equipment.stream; import java.util.UUID; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.processequipment.ProcessEquipmentBaseClass; +import neqsim.process.equipment.ProcessEquipmentBaseClass; /** *

@@ -38,7 +38,7 @@ public class VirtualStream extends ProcessEquipmentBaseClass { *

* * @param name a {@link java.lang.String} object - * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @param stream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public VirtualStream(String name, StreamInterface stream) { super(name); @@ -61,7 +61,7 @@ public VirtualStream(String name) { * setReferenceStream. *

* - * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @param stream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public void setReferenceStream(StreamInterface stream) { refStream = stream; @@ -148,7 +148,7 @@ public void run(UUID id) { * Getter for the field outStream. *

* - * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @return a {@link neqsim.process.equipment.stream.StreamInterface} object */ public StreamInterface getOutStream() { return outStream; diff --git a/src/main/java/neqsim/processsimulation/processequipment/subsea/SimpleFlowLine.java b/src/main/java/neqsim/process/equipment/subsea/SimpleFlowLine.java similarity index 82% rename from src/main/java/neqsim/processsimulation/processequipment/subsea/SimpleFlowLine.java rename to src/main/java/neqsim/process/equipment/subsea/SimpleFlowLine.java index 5f3d28dba..a86e9c58d 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/subsea/SimpleFlowLine.java +++ b/src/main/java/neqsim/process/equipment/subsea/SimpleFlowLine.java @@ -1,9 +1,9 @@ -package neqsim.processsimulation.processequipment.subsea; +package neqsim.process.equipment.subsea; import java.util.UUID; -import neqsim.processsimulation.processequipment.TwoPortEquipment; -import neqsim.processsimulation.processequipment.pipeline.AdiabaticTwoPhasePipe; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.TwoPortEquipment; +import neqsim.process.equipment.pipeline.AdiabaticTwoPhasePipe; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; /** @@ -26,7 +26,7 @@ public class SimpleFlowLine extends TwoPortEquipment { * Constructor for SimpleFlowLine. * * @param name Name of SimpleFlowLine object - * @param inStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param inStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public SimpleFlowLine(String name, StreamInterface inStream) { @@ -40,7 +40,7 @@ public SimpleFlowLine(String name, StreamInterface inStream) { * Getter for the field pipeline. *

* - * @return a {@link neqsim.processsimulation.processequipment.pipeline.AdiabaticTwoPhasePipe} + * @return a {@link neqsim.process.equipment.pipeline.AdiabaticTwoPhasePipe} * object */ public AdiabaticTwoPhasePipe getPipeline() { diff --git a/src/main/java/neqsim/processsimulation/processequipment/subsea/SubseaWell.java b/src/main/java/neqsim/process/equipment/subsea/SubseaWell.java similarity index 88% rename from src/main/java/neqsim/processsimulation/processequipment/subsea/SubseaWell.java rename to src/main/java/neqsim/process/equipment/subsea/SubseaWell.java index 9f2b0ff05..05e37d730 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/subsea/SubseaWell.java +++ b/src/main/java/neqsim/process/equipment/subsea/SubseaWell.java @@ -1,14 +1,14 @@ -package neqsim.processsimulation.processequipment.subsea; +package neqsim.process.equipment.subsea; import java.util.ArrayList; import java.util.UUID; -import neqsim.processsimulation.processequipment.TwoPortEquipment; -import neqsim.processsimulation.processequipment.pipeline.AdiabaticTwoPhasePipe; -import neqsim.processsimulation.processequipment.reservoir.SimpleReservoir; -import neqsim.processsimulation.processequipment.stream.StreamInterface; -import neqsim.processsimulation.processequipment.util.Adjuster; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; -import neqsim.processsimulation.processsystem.ProcessSystem; +import neqsim.process.equipment.TwoPortEquipment; +import neqsim.process.equipment.pipeline.AdiabaticTwoPhasePipe; +import neqsim.process.equipment.reservoir.SimpleReservoir; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.equipment.util.Adjuster; +import neqsim.process.equipment.valve.ThrottlingValve; +import neqsim.process.processmodel.ProcessSystem; /** *

@@ -31,7 +31,7 @@ public class SubseaWell extends TwoPortEquipment { *

* * @param name Name of well - * @param instream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param instream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public SubseaWell(String name, StreamInterface instream) { @@ -45,7 +45,7 @@ public SubseaWell(String name, StreamInterface instream) { * Getter for the field pipeline. *

* - * @return a {@link neqsim.processsimulation.processequipment.pipeline.AdiabaticTwoPhasePipe} + * @return a {@link neqsim.process.equipment.pipeline.AdiabaticTwoPhasePipe} * object */ public AdiabaticTwoPhasePipe getPipeline() { diff --git a/src/main/java/neqsim/processsimulation/processequipment/tank/Tank.java b/src/main/java/neqsim/process/equipment/tank/Tank.java similarity index 92% rename from src/main/java/neqsim/processsimulation/processequipment/tank/Tank.java rename to src/main/java/neqsim/process/equipment/tank/Tank.java index e6774e8fd..ab8df1d2c 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/tank/Tank.java +++ b/src/main/java/neqsim/process/equipment/tank/Tank.java @@ -1,10 +1,10 @@ -package neqsim.processsimulation.processequipment.tank; +package neqsim.process.equipment.tank; import java.util.UUID; -import neqsim.processsimulation.processequipment.ProcessEquipmentBaseClass; -import neqsim.processsimulation.processequipment.mixer.Mixer; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.ProcessEquipmentBaseClass; +import neqsim.process.equipment.mixer.Mixer; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -61,7 +61,7 @@ public Tank(String name) { *

* * @param name a {@link java.lang.String} object - * @param inletStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param inletStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public Tank(String name, StreamInterface inletStream) { @@ -74,7 +74,7 @@ public Tank(String name, StreamInterface inletStream) { * setInletStream. *

* - * @param inletStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param inletStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public void setInletStream(StreamInterface inletStream) { @@ -93,7 +93,7 @@ public void setInletStream(StreamInterface inletStream) { * addStream. *

* - * @param newStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param newStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public void addStream(StreamInterface newStream) { @@ -110,7 +110,7 @@ public void addStream(StreamInterface newStream) { * Getter for the field liquidOutStream. *

* - * @return a {@link neqsim.processsimulation.processequipment.stream.Stream} object + * @return a {@link neqsim.process.equipment.stream.Stream} object */ public StreamInterface getLiquidOutStream() { return liquidOutStream; @@ -121,7 +121,7 @@ public StreamInterface getLiquidOutStream() { * Getter for the field gasOutStream. *

* - * @return a {@link neqsim.processsimulation.processequipment.stream.Stream} object + * @return a {@link neqsim.process.equipment.stream.Stream} object */ public StreamInterface getGasOutStream() { return gasOutStream; @@ -132,7 +132,7 @@ public StreamInterface getGasOutStream() { * getGas. *

* - * @return a {@link neqsim.processsimulation.processequipment.stream.Stream} object + * @return a {@link neqsim.process.equipment.stream.Stream} object */ public StreamInterface getGas() { return getGasOutStream(); @@ -143,7 +143,7 @@ public StreamInterface getGas() { * getLiquid. *

* - * @return a {@link neqsim.processsimulation.processequipment.stream.Stream} object + * @return a {@link neqsim.process.equipment.stream.Stream} object */ public StreamInterface getLiquid() { return getLiquidOutStream(); diff --git a/src/main/java/neqsim/processsimulation/processequipment/util/Adjuster.java b/src/main/java/neqsim/process/equipment/util/Adjuster.java similarity index 92% rename from src/main/java/neqsim/processsimulation/processequipment/util/Adjuster.java rename to src/main/java/neqsim/process/equipment/util/Adjuster.java index 90f537ed7..5cf0e15e0 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/util/Adjuster.java +++ b/src/main/java/neqsim/process/equipment/util/Adjuster.java @@ -1,11 +1,11 @@ -package neqsim.processsimulation.processequipment.util; +package neqsim.process.equipment.util; import java.util.UUID; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.processequipment.ProcessEquipmentBaseClass; -import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.ProcessEquipmentBaseClass; +import neqsim.process.equipment.ProcessEquipmentInterface; +import neqsim.process.equipment.stream.Stream; /** *

@@ -58,7 +58,7 @@ public Adjuster(String name) { *

* * @param adjustedEquipment a - * {@link neqsim.processsimulation.processequipment.ProcessEquipmentInterface} object + * {@link neqsim.process.equipment.ProcessEquipmentInterface} object * @param adjstedVariable a {@link java.lang.String} object * @param unit a string */ @@ -75,7 +75,7 @@ public void setAdjustedVariable(ProcessEquipmentInterface adjustedEquipment, *

* * @param adjustedEquipment a - * {@link neqsim.processsimulation.processequipment.ProcessEquipmentInterface} object + * {@link neqsim.process.equipment.ProcessEquipmentInterface} object * @param adjstedVariable a {@link java.lang.String} object */ public void setAdjustedVariable(ProcessEquipmentInterface adjustedEquipment, @@ -90,7 +90,7 @@ public void setAdjustedVariable(ProcessEquipmentInterface adjustedEquipment, *

* * @param targetEquipment a - * {@link neqsim.processsimulation.processequipment.ProcessEquipmentInterface} object + * {@link neqsim.process.equipment.ProcessEquipmentInterface} object * @param targetVariable a {@link java.lang.String} object * @param targetValue a double * @param targetUnit a {@link java.lang.String} object @@ -109,7 +109,7 @@ public void setTargetVariable(ProcessEquipmentInterface targetEquipment, String *

* * @param targetEquipment a - * {@link neqsim.processsimulation.processequipment.ProcessEquipmentInterface} object + * {@link neqsim.process.equipment.ProcessEquipmentInterface} object * @param targetVariable a {@link java.lang.String} object * @param targetValue a double * @param targetUnit a {@link java.lang.String} object @@ -130,7 +130,7 @@ public void setTargetVariable(ProcessEquipmentInterface targetEquipment, String *

* * @param targetEquipment a - * {@link neqsim.processsimulation.processequipment.ProcessEquipmentInterface} object + * {@link neqsim.process.equipment.ProcessEquipmentInterface} object * @param targetVariable a {@link java.lang.String} object * @param targetValue a double * @param targetUnit a {@link java.lang.String} object @@ -320,8 +320,8 @@ public static void main(String[] args) { adjuster1.setAdjustedVariable(stream_1, "molarFlow"); adjuster1.setTargetVariable(stream_1, "gasVolumeFlow", 10.0, "MSm3/day", ""); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(adjuster1); diff --git a/src/main/java/neqsim/processsimulation/processequipment/util/Calculator.java b/src/main/java/neqsim/process/equipment/util/Calculator.java similarity index 83% rename from src/main/java/neqsim/processsimulation/processequipment/util/Calculator.java rename to src/main/java/neqsim/process/equipment/util/Calculator.java index 1fdaa1406..130cc6020 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/util/Calculator.java +++ b/src/main/java/neqsim/process/equipment/util/Calculator.java @@ -1,14 +1,14 @@ -package neqsim.processsimulation.processequipment.util; +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; -import neqsim.processsimulation.processequipment.ProcessEquipmentBaseClass; -import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; -import neqsim.processsimulation.processequipment.compressor.Compressor; -import neqsim.processsimulation.processequipment.splitter.Splitter; +import neqsim.process.equipment.ProcessEquipmentBaseClass; +import neqsim.process.equipment.ProcessEquipmentInterface; +import neqsim.process.equipment.compressor.Compressor; +import neqsim.process.equipment.splitter.Splitter; /** *

@@ -42,7 +42,7 @@ public Calculator(String name) { * addInputVariable. *

* - * @param unit a {@link neqsim.processsimulation.processequipment.ProcessEquipmentInterface} + * @param unit a {@link neqsim.process.equipment.ProcessEquipmentInterface} * object */ public void addInputVariable(ProcessEquipmentInterface unit) { @@ -54,7 +54,7 @@ public void addInputVariable(ProcessEquipmentInterface unit) { * Getter for the field outputVariable. *

* - * @return a {@link neqsim.processsimulation.processequipment.ProcessEquipmentInterface} object + * @return a {@link neqsim.process.equipment.ProcessEquipmentInterface} object */ public ProcessEquipmentInterface getOutputVariable() { return outputVariable; @@ -125,7 +125,7 @@ public void run(UUID id) { if (sum < 0.0) { sum = 0.0; } - ((neqsim.processsimulation.processequipment.stream.Stream) outputVariable).setFlowRate(sum, + ((neqsim.process.equipment.stream.Stream) outputVariable).setFlowRate(sum, "kg/hr"); outputVariable.run(); outputVariable.setCalculationIdentifier(id); @@ -142,7 +142,7 @@ public void run(UUID id) { *

* * @param outputVariable a - * {@link neqsim.processsimulation.processequipment.ProcessEquipmentInterface} object + * {@link neqsim.process.equipment.ProcessEquipmentInterface} object */ public void setOutputVariable(ProcessEquipmentInterface outputVariable) { this.outputVariable = outputVariable; diff --git a/src/main/java/neqsim/processsimulation/processequipment/util/FlowRateAdjuster.java b/src/main/java/neqsim/process/equipment/util/FlowRateAdjuster.java similarity index 90% rename from src/main/java/neqsim/processsimulation/processequipment/util/FlowRateAdjuster.java rename to src/main/java/neqsim/process/equipment/util/FlowRateAdjuster.java index 88676e914..74d5268a6 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/util/FlowRateAdjuster.java +++ b/src/main/java/neqsim/process/equipment/util/FlowRateAdjuster.java @@ -1,14 +1,14 @@ -package neqsim.processsimulation.processequipment.util; +package neqsim.process.equipment.util; import java.util.UUID; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; -import neqsim.processsimulation.processequipment.TwoPortEquipment; -import neqsim.processsimulation.processequipment.mixer.Mixer; -import neqsim.processsimulation.processequipment.mixer.StaticMixer; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.ProcessEquipmentInterface; +import neqsim.process.equipment.TwoPortEquipment; +import neqsim.process.equipment.mixer.Mixer; +import neqsim.process.equipment.mixer.StaticMixer; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -72,7 +72,7 @@ public FlowRateAdjuster(String name) { *

* * @param name a {@link java.lang.String} object - * @param inStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param inStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public FlowRateAdjuster(String name, StreamInterface inStream) { diff --git a/src/main/java/neqsim/processsimulation/processequipment/util/FlowSetter.java b/src/main/java/neqsim/process/equipment/util/FlowSetter.java similarity index 93% rename from src/main/java/neqsim/processsimulation/processequipment/util/FlowSetter.java rename to src/main/java/neqsim/process/equipment/util/FlowSetter.java index 5fb13320f..4e4c393ab 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/util/FlowSetter.java +++ b/src/main/java/neqsim/process/equipment/util/FlowSetter.java @@ -1,16 +1,16 @@ -package neqsim.processsimulation.processequipment.util; +package neqsim.process.equipment.util; import java.util.UUID; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import neqsim.physicalproperties.PhysicalPropertyType; -import neqsim.processsimulation.processequipment.TwoPortEquipment; -import neqsim.processsimulation.processequipment.heatexchanger.Heater; -import neqsim.processsimulation.processequipment.mixer.Mixer; -import neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; -import neqsim.processsimulation.processsystem.ProcessSystem; +import neqsim.process.equipment.TwoPortEquipment; +import neqsim.process.equipment.heatexchanger.Heater; +import neqsim.process.equipment.mixer.Mixer; +import neqsim.process.equipment.separator.ThreePhaseSeparator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.processmodel.ProcessSystem; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; import neqsim.util.exception.InvalidInputException; @@ -46,7 +46,7 @@ public class FlowSetter extends TwoPortEquipment { *

* * @param name a {@link java.lang.String} object - * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @param stream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public FlowSetter(String name, StreamInterface stream) { super(name, stream); @@ -303,9 +303,9 @@ public void run(UUID id) { * createReferenceProcess. *

* - * @param feedStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param feedStream a {@link neqsim.process.equipment.stream.StreamInterface} * object - * @return a {@link neqsim.processsimulation.processsystem.ProcessSystem} object + * @return a {@link neqsim.process.processmodel.ProcessSystem} object */ public ProcessSystem createReferenceProcess(StreamInterface feedStream) { ProcessSystem referenceProcess = new ProcessSystem(); @@ -378,7 +378,7 @@ public ProcessSystem createReferenceProcess(StreamInterface feedStream) { * Getter for the field referenceProcess. *

* - * @return a {@link neqsim.processsimulation.processsystem.ProcessSystem} object + * @return a {@link neqsim.process.processmodel.ProcessSystem} object */ public ProcessSystem getReferenceProcess() { return referenceProcess; diff --git a/src/main/java/neqsim/processsimulation/processequipment/util/GORfitter.java b/src/main/java/neqsim/process/equipment/util/GORfitter.java similarity index 95% rename from src/main/java/neqsim/processsimulation/processequipment/util/GORfitter.java rename to src/main/java/neqsim/process/equipment/util/GORfitter.java index cf1099828..2c59b542b 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/util/GORfitter.java +++ b/src/main/java/neqsim/process/equipment/util/GORfitter.java @@ -1,11 +1,11 @@ -package neqsim.processsimulation.processequipment.util; +package neqsim.process.equipment.util; import java.util.UUID; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import neqsim.physicalproperties.PhysicalPropertyType; -import neqsim.processsimulation.processequipment.TwoPortEquipment; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.TwoPortEquipment; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -38,7 +38,7 @@ public class GORfitter extends TwoPortEquipment { *

* * @param name a {@link java.lang.String} object - * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @param stream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public GORfitter(String name, StreamInterface stream) { super(name, stream); diff --git a/src/main/java/neqsim/processsimulation/processequipment/util/MPFMfitter.java b/src/main/java/neqsim/process/equipment/util/MPFMfitter.java similarity index 95% rename from src/main/java/neqsim/processsimulation/processequipment/util/MPFMfitter.java rename to src/main/java/neqsim/process/equipment/util/MPFMfitter.java index b4db94768..0d57764ba 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/util/MPFMfitter.java +++ b/src/main/java/neqsim/process/equipment/util/MPFMfitter.java @@ -1,11 +1,11 @@ -package neqsim.processsimulation.processequipment.util; +package neqsim.process.equipment.util; import java.util.UUID; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import neqsim.physicalproperties.PhysicalPropertyType; -import neqsim.processsimulation.processequipment.TwoPortEquipment; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.TwoPortEquipment; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -49,7 +49,7 @@ public MPFMfitter() { * Constructor for MPFMfitter. *

* - * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @param stream a {@link neqsim.process.equipment.stream.StreamInterface} object */ @Deprecated public MPFMfitter(StreamInterface stream) { @@ -62,7 +62,7 @@ public MPFMfitter(StreamInterface stream) { *

* * @param name a {@link java.lang.String} object - * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @param stream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public MPFMfitter(String name, StreamInterface stream) { super(name, stream); diff --git a/src/main/java/neqsim/processsimulation/processequipment/util/MoleFractionControllerUtil.java b/src/main/java/neqsim/process/equipment/util/MoleFractionControllerUtil.java similarity index 91% rename from src/main/java/neqsim/processsimulation/processequipment/util/MoleFractionControllerUtil.java rename to src/main/java/neqsim/process/equipment/util/MoleFractionControllerUtil.java index 6c21252e9..6f09db982 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/util/MoleFractionControllerUtil.java +++ b/src/main/java/neqsim/process/equipment/util/MoleFractionControllerUtil.java @@ -1,9 +1,9 @@ -package neqsim.processsimulation.processequipment.util; +package neqsim.process.equipment.util; import java.util.UUID; -import neqsim.processsimulation.processequipment.TwoPortEquipment; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.TwoPortEquipment; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -31,7 +31,7 @@ public class MoleFractionControllerUtil extends TwoPortEquipment { * Constructor for MoleFractionControllerUtil. *

* - * @param inletStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param inletStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public MoleFractionControllerUtil(StreamInterface inletStream) { diff --git a/src/main/java/neqsim/processsimulation/processequipment/util/NeqSimUnit.java b/src/main/java/neqsim/process/equipment/util/NeqSimUnit.java similarity index 96% rename from src/main/java/neqsim/processsimulation/processequipment/util/NeqSimUnit.java rename to src/main/java/neqsim/process/equipment/util/NeqSimUnit.java index e39b4bbe2..e6476464d 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/util/NeqSimUnit.java +++ b/src/main/java/neqsim/process/equipment/util/NeqSimUnit.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.util; +package neqsim.process.equipment.util; import java.util.UUID; import neqsim.fluidmechanics.flownode.FlowNodeInterface; @@ -6,9 +6,9 @@ import neqsim.fluidmechanics.flownode.twophasenode.twophasepipeflownode.DropletFlowNode; import neqsim.fluidmechanics.flownode.twophasenode.twophasepipeflownode.StratifiedFlowNode; import neqsim.fluidmechanics.geometrydefinitions.pipe.PipeData; -import neqsim.processsimulation.processequipment.TwoPortEquipment; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.TwoPortEquipment; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; /** @@ -36,7 +36,7 @@ public class NeqSimUnit extends TwoPortEquipment { * Constructor for NeqSimUnit. *

* - * @param inletStream a {@link neqsim.processsimulation.processequipment.stream.Stream} object + * @param inletStream a {@link neqsim.process.equipment.stream.Stream} object * @param equipment a {@link java.lang.String} object * @param flowPattern a {@link java.lang.String} object */ diff --git a/src/main/java/neqsim/processsimulation/processequipment/util/PressureDrop.java b/src/main/java/neqsim/process/equipment/util/PressureDrop.java similarity index 87% rename from src/main/java/neqsim/processsimulation/processequipment/util/PressureDrop.java rename to src/main/java/neqsim/process/equipment/util/PressureDrop.java index 9178841b5..fb5534c59 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/util/PressureDrop.java +++ b/src/main/java/neqsim/process/equipment/util/PressureDrop.java @@ -1,10 +1,10 @@ -package neqsim.processsimulation.processequipment.util; +package neqsim.process.equipment.util; import java.util.UUID; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.processequipment.stream.StreamInterface; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.equipment.valve.ThrottlingValve; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -58,7 +58,7 @@ public void setPressureDrop(double pressureDrop, String unit) { *

* * @param name a {@link java.lang.String} object - * @param inletStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param inletStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public PressureDrop(String name, StreamInterface inletStream) { diff --git a/src/main/java/neqsim/processsimulation/processequipment/util/Recycle.java b/src/main/java/neqsim/process/equipment/util/Recycle.java similarity index 92% rename from src/main/java/neqsim/processsimulation/processequipment/util/Recycle.java rename to src/main/java/neqsim/process/equipment/util/Recycle.java index d5a3537c8..47abbdd2a 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/util/Recycle.java +++ b/src/main/java/neqsim/process/equipment/util/Recycle.java @@ -1,12 +1,12 @@ -package neqsim.processsimulation.processequipment.util; +package neqsim.process.equipment.util; import java.util.ArrayList; import java.util.UUID; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.processequipment.ProcessEquipmentBaseClass; -import neqsim.processsimulation.processequipment.mixer.MixerInterface; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.ProcessEquipmentBaseClass; +import neqsim.process.equipment.mixer.MixerInterface; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -183,9 +183,7 @@ public void addStream(StreamInterface newStream) { *

* * @param i a int - * @return a - * {@link neqsim.processsimulation.processequipment.stream.StreamInterface} - * object + * @return a {@link neqsim.process.equipment.stream.StreamInterface} object */ public StreamInterface getStream(int i) { return streams.get(i); @@ -204,11 +202,13 @@ public void mixStream() { for (int i = 0; i < streams.get(k).getThermoSystem().getPhase(0) .getNumberOfComponents(); i++) { boolean gotComponent = false; - String componentName = streams.get(k).getThermoSystem().getPhase(0).getComponent(i).getName(); + String componentName = + streams.get(k).getThermoSystem().getPhase(0).getComponent(i).getName(); // logger.info("adding: " + componentName); // int numberOfPhases = streams.get(k).getThermoSystem().getNumberOfPhases(); - double moles = streams.get(k).getThermoSystem().getPhase(0).getComponent(i).getNumberOfmoles(); + double moles = + streams.get(k).getThermoSystem().getPhase(0).getComponent(i).getNumberOfmoles(); // logger.info("moles: " + moles + " " + // mixedStream.getThermoSystem().getPhase(0).getNumberOfComponents()); for (int p = 0; p < mixedStream.getThermoSystem().getPhase(0) @@ -216,7 +216,8 @@ public void mixStream() { if (mixedStream.getThermoSystem().getPhase(0).getComponent(p).getName() .equals(componentName)) { gotComponent = true; - index = streams.get(0).getThermoSystem().getPhase(0).getComponent(p).getComponentNumber(); + index = + streams.get(0).getThermoSystem().getPhase(0).getComponent(p).getComponentNumber(); // compName = streams.get(0).getThermoSystem().getPhase(0).getComponent(p) // .getComponentName(); } @@ -286,9 +287,7 @@ public StreamInterface getOutStream() { * initiateDownstreamProperties. *

* - * @param outstream a - * {@link neqsim.processsimulation.processequipment.stream.StreamInterface} - * object + * @param outstream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public void initiateDownstreamProperties(StreamInterface outstream) { lastIterationStream = outstream.clone(); @@ -377,10 +376,12 @@ public void run(UUID id) { public double flowBalanceCheck() { double abs_sum_errorFlow = 0.0; if (mixedStream.getFlowRate("kg/sec") < 1.0) { - abs_sum_errorFlow += Math.abs(mixedStream.getFlowRate("kg/sec") - lastIterationStream.getFlowRate("kg/sec")); + abs_sum_errorFlow += + Math.abs(mixedStream.getFlowRate("kg/sec") - lastIterationStream.getFlowRate("kg/sec")); } else { - abs_sum_errorFlow += Math.abs(mixedStream.getFlowRate("kg/sec") - lastIterationStream.getFlowRate("kg/sec")) - / mixedStream.getFlowRate("kg/sec") * 100.0; + abs_sum_errorFlow += + Math.abs(mixedStream.getFlowRate("kg/sec") - lastIterationStream.getFlowRate("kg/sec")) + / mixedStream.getFlowRate("kg/sec") * 100.0; } return abs_sum_errorFlow; } @@ -443,8 +444,7 @@ public double pressureBalanceCheck() { /** {@inheritDoc} */ @Override - public void displayResult() { - } + public void displayResult() {} /** {@inheritDoc} */ @Override @@ -628,9 +628,7 @@ public StreamInterface getOutletStream() { * Setter for the field outletStream. *

* - * @param outletStream a - * {@link neqsim.processsimulation.processequipment.stream.StreamInterface} - * object + * @param outletStream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public void setOutletStream(StreamInterface outletStream) { this.outletStream = outletStream; diff --git a/src/main/java/neqsim/processsimulation/processequipment/util/RecycleController.java b/src/main/java/neqsim/process/equipment/util/RecycleController.java similarity index 93% rename from src/main/java/neqsim/processsimulation/processequipment/util/RecycleController.java rename to src/main/java/neqsim/process/equipment/util/RecycleController.java index 29eaf3bde..65878adfb 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/util/RecycleController.java +++ b/src/main/java/neqsim/process/equipment/util/RecycleController.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.util; +package neqsim.process.equipment.util; import java.util.ArrayList; import java.util.Objects; @@ -60,7 +60,7 @@ public void resetPriorityLevel() { * addRecycle. *

* - * @param recycle a {@link neqsim.processsimulation.processequipment.util.Recycle} object + * @param recycle a {@link neqsim.process.equipment.util.Recycle} object */ public void addRecycle(Recycle recycle) { recycleArray.add(recycle); @@ -72,7 +72,7 @@ public void addRecycle(Recycle recycle) { * doSolveRecycle. *

* - * @param recycle a {@link neqsim.processsimulation.processequipment.util.Recycle} object + * @param recycle a {@link neqsim.process.equipment.util.Recycle} object * @return a boolean */ public boolean doSolveRecycle(Recycle recycle) { @@ -88,7 +88,7 @@ public boolean doSolveRecycle(Recycle recycle) { * isHighestPriority. *

* - * @param recycle a {@link neqsim.processsimulation.processequipment.util.Recycle} object + * @param recycle a {@link neqsim.process.equipment.util.Recycle} object * @return a boolean */ public boolean isHighestPriority(Recycle recycle) { diff --git a/src/main/java/neqsim/processsimulation/processequipment/util/SetPoint.java b/src/main/java/neqsim/process/equipment/util/SetPoint.java similarity index 83% rename from src/main/java/neqsim/processsimulation/processequipment/util/SetPoint.java rename to src/main/java/neqsim/process/equipment/util/SetPoint.java index d23878c8c..adab9e5f3 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/util/SetPoint.java +++ b/src/main/java/neqsim/process/equipment/util/SetPoint.java @@ -1,11 +1,11 @@ -package neqsim.processsimulation.processequipment.util; +package neqsim.process.equipment.util; import java.util.UUID; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.processequipment.ProcessEquipmentBaseClass; -import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.ProcessEquipmentBaseClass; +import neqsim.process.equipment.ProcessEquipmentInterface; +import neqsim.process.equipment.stream.Stream; /** *

@@ -60,10 +60,10 @@ public SetPoint(String name) { * * @param name a {@link java.lang.String} object * @param targetEquipment a - * {@link neqsim.processsimulation.processequipment.ProcessEquipmentInterface} object + * {@link neqsim.process.equipment.ProcessEquipmentInterface} object * @param targetVariable a {@link java.lang.String} object * @param sourceEquipment a - * {@link neqsim.processsimulation.processequipment.ProcessEquipmentInterface} object + * {@link neqsim.process.equipment.ProcessEquipmentInterface} object */ public SetPoint(String name, ProcessEquipmentInterface targetEquipment, String targetVariable, ProcessEquipmentInterface sourceEquipment) { @@ -80,7 +80,7 @@ public SetPoint(String name, ProcessEquipmentInterface targetEquipment, String t *

* * @param adjustedEquipment a - * {@link neqsim.processsimulation.processequipment.ProcessEquipmentInterface} object + * {@link neqsim.process.equipment.ProcessEquipmentInterface} object * @param adjstedVariable a {@link java.lang.String} object */ public void setSourceVariable(ProcessEquipmentInterface adjustedEquipment, @@ -95,7 +95,7 @@ public void setSourceVariable(ProcessEquipmentInterface adjustedEquipment, *

* * @param adjustedEquipment a - * {@link neqsim.processsimulation.processequipment.ProcessEquipmentInterface} object + * {@link neqsim.process.equipment.ProcessEquipmentInterface} object */ public void setSourceVariable(ProcessEquipmentInterface adjustedEquipment) { this.sourceEquipment = adjustedEquipment; @@ -107,7 +107,7 @@ public void setSourceVariable(ProcessEquipmentInterface adjustedEquipment) { *

* * @param targetEquipment a - * {@link neqsim.processsimulation.processequipment.ProcessEquipmentInterface} object + * {@link neqsim.process.equipment.ProcessEquipmentInterface} object * @param targetVariable a {@link java.lang.String} object * @param targetValue a double * @param targetUnit a {@link java.lang.String} object @@ -126,7 +126,7 @@ public void setTargetVariable(ProcessEquipmentInterface targetEquipment, String *

* * @param targetEquipment a - * {@link neqsim.processsimulation.processequipment.ProcessEquipmentInterface} object + * {@link neqsim.process.equipment.ProcessEquipmentInterface} object * @param targetVariable a {@link java.lang.String} object */ public void setTargetVariable(ProcessEquipmentInterface targetEquipment, String targetVariable) { @@ -140,7 +140,7 @@ public void setTargetVariable(ProcessEquipmentInterface targetEquipment, String *

* * @param targetEquipment a - * {@link neqsim.processsimulation.processequipment.ProcessEquipmentInterface} object + * {@link neqsim.process.equipment.ProcessEquipmentInterface} object * @param targetVariable a {@link java.lang.String} object * @param targetValue a double * @param targetUnit a {@link java.lang.String} object @@ -161,7 +161,7 @@ public void setTargetVariable(ProcessEquipmentInterface targetEquipment, String *

* * @param targetEquipment a - * {@link neqsim.processsimulation.processequipment.ProcessEquipmentInterface} object + * {@link neqsim.process.equipment.ProcessEquipmentInterface} object * @param targetVariable a {@link java.lang.String} object * @param targetValue a double * @param targetUnit a {@link java.lang.String} object @@ -222,8 +222,8 @@ public static void main(String[] args) { adjuster1.setSourceVariable(stream_1, "molarFlow"); adjuster1.setTargetVariable(stream_1, "gasVolumeFlow", 10.0, "", "MSm3/day"); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(adjuster1); diff --git a/src/main/java/neqsim/processsimulation/processequipment/util/StreamSaturatorUtil.java b/src/main/java/neqsim/process/equipment/util/StreamSaturatorUtil.java similarity index 92% rename from src/main/java/neqsim/processsimulation/processequipment/util/StreamSaturatorUtil.java rename to src/main/java/neqsim/process/equipment/util/StreamSaturatorUtil.java index f20342a3c..2296148bf 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/util/StreamSaturatorUtil.java +++ b/src/main/java/neqsim/process/equipment/util/StreamSaturatorUtil.java @@ -1,9 +1,9 @@ -package neqsim.processsimulation.processequipment.util; +package neqsim.process.equipment.util; import java.util.UUID; -import neqsim.processsimulation.processequipment.TwoPortEquipment; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.TwoPortEquipment; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; diff --git a/src/main/java/neqsim/processsimulation/processequipment/util/StreamTransition.java b/src/main/java/neqsim/process/equipment/util/StreamTransition.java similarity index 85% rename from src/main/java/neqsim/processsimulation/processequipment/util/StreamTransition.java rename to src/main/java/neqsim/process/equipment/util/StreamTransition.java index 091ab3178..22f9e99b3 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/util/StreamTransition.java +++ b/src/main/java/neqsim/process/equipment/util/StreamTransition.java @@ -1,9 +1,9 @@ -package neqsim.processsimulation.processequipment.util; +package neqsim.process.equipment.util; import java.util.UUID; -import neqsim.processsimulation.processequipment.TwoPortEquipment; -import neqsim.processsimulation.processequipment.stream.StreamInterface; -import neqsim.processsimulation.processsystem.ProcessSystem; +import neqsim.process.equipment.TwoPortEquipment; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.processmodel.ProcessSystem; import neqsim.thermo.system.SystemInterface; /** @@ -23,9 +23,9 @@ public class StreamTransition extends TwoPortEquipment { *

* * @param name name of unit operation - * @param inletStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param inletStream a {@link neqsim.process.equipment.stream.StreamInterface} * object - * @param outletStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param outletStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public StreamTransition(String name, StreamInterface inletStream, StreamInterface outletStream) { diff --git a/src/main/java/neqsim/processsimulation/processequipment/valve/SafetyValve.java b/src/main/java/neqsim/process/equipment/valve/SafetyValve.java similarity index 86% rename from src/main/java/neqsim/processsimulation/processequipment/valve/SafetyValve.java rename to src/main/java/neqsim/process/equipment/valve/SafetyValve.java index a417f5f43..1d8fce0b6 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/valve/SafetyValve.java +++ b/src/main/java/neqsim/process/equipment/valve/SafetyValve.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.processequipment.valve; +package neqsim.process.equipment.valve; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.stream.StreamInterface; /** *

@@ -31,7 +31,7 @@ public SafetyValve(String name) { *

* * @param name a {@link java.lang.String} object - * @param inletStream a {@link neqsim.processsimulation.processequipment.stream.Stream} object + * @param inletStream a {@link neqsim.process.equipment.stream.Stream} object */ public SafetyValve(String name, StreamInterface inletStream) { super(name, inletStream); diff --git a/src/main/java/neqsim/processsimulation/processequipment/valve/ThrottlingValve.java b/src/main/java/neqsim/process/equipment/valve/ThrottlingValve.java similarity index 98% rename from src/main/java/neqsim/processsimulation/processequipment/valve/ThrottlingValve.java rename to src/main/java/neqsim/process/equipment/valve/ThrottlingValve.java index d9382fdb9..c0ee5710b 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/valve/ThrottlingValve.java +++ b/src/main/java/neqsim/process/equipment/valve/ThrottlingValve.java @@ -1,14 +1,14 @@ -package neqsim.processsimulation.processequipment.valve; +package neqsim.process.equipment.valve; import java.util.UUID; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import com.google.gson.GsonBuilder; import neqsim.physicalproperties.PhysicalPropertyType; -import neqsim.processsimulation.mechanicaldesign.valve.ValveMechanicalDesign; -import neqsim.processsimulation.processequipment.TwoPortEquipment; -import neqsim.processsimulation.processequipment.stream.StreamInterface; -import neqsim.processsimulation.util.monitor.ValveResponse; +import neqsim.process.equipment.TwoPortEquipment; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.mechanicaldesign.valve.ValveMechanicalDesign; +import neqsim.process.util.monitor.ValveResponse; import neqsim.thermo.phase.PhaseType; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -61,7 +61,7 @@ public ThrottlingValve(String name) { *

* * @param name a {@link java.lang.String} object - * @param inletStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param inletStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public ThrottlingValve(String name, StreamInterface inletStream) { diff --git a/src/main/java/neqsim/processsimulation/processequipment/valve/ValveInterface.java b/src/main/java/neqsim/process/equipment/valve/ValveInterface.java similarity index 88% rename from src/main/java/neqsim/processsimulation/processequipment/valve/ValveInterface.java rename to src/main/java/neqsim/process/equipment/valve/ValveInterface.java index 50c6d4f4a..9f4c18482 100644 --- a/src/main/java/neqsim/processsimulation/processequipment/valve/ValveInterface.java +++ b/src/main/java/neqsim/process/equipment/valve/ValveInterface.java @@ -4,10 +4,10 @@ * Created on 22. august 2001, 17:20 */ -package neqsim.processsimulation.processequipment.valve; +package neqsim.process.equipment.valve; -import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; -import neqsim.processsimulation.processequipment.TwoPortInterface; +import neqsim.process.equipment.ProcessEquipmentInterface; +import neqsim.process.equipment.TwoPortInterface; import neqsim.thermo.system.SystemInterface; /** diff --git a/src/main/java/neqsim/processsimulation/measurementdevice/CombustionEmissionsCalculator.java b/src/main/java/neqsim/process/measurementdevice/CombustionEmissionsCalculator.java similarity index 90% rename from src/main/java/neqsim/processsimulation/measurementdevice/CombustionEmissionsCalculator.java rename to src/main/java/neqsim/process/measurementdevice/CombustionEmissionsCalculator.java index 7bfea8f8e..6ed55f82e 100644 --- a/src/main/java/neqsim/processsimulation/measurementdevice/CombustionEmissionsCalculator.java +++ b/src/main/java/neqsim/process/measurementdevice/CombustionEmissionsCalculator.java @@ -1,8 +1,8 @@ -package neqsim.processsimulation.measurementdevice; +package neqsim.process.measurementdevice; import java.util.HashMap; import java.util.Map; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.stream.StreamInterface; /** *

@@ -26,7 +26,7 @@ public class CombustionEmissionsCalculator extends StreamMeasurementDeviceBaseCl * Constructor for CombustionEmissionsCalculator. *

* - * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @param stream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public CombustionEmissionsCalculator(StreamInterface stream) { this("EmissionCalculator", stream); @@ -38,7 +38,7 @@ public CombustionEmissionsCalculator(StreamInterface stream) { *

* * @param name Name of WaterDewPointAnalyser - * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @param stream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public CombustionEmissionsCalculator(String name, StreamInterface stream) { super(name, "kg/hr", stream); diff --git a/src/main/java/neqsim/processsimulation/measurementdevice/CompressorMonitor.java b/src/main/java/neqsim/process/measurementdevice/CompressorMonitor.java similarity index 77% rename from src/main/java/neqsim/processsimulation/measurementdevice/CompressorMonitor.java rename to src/main/java/neqsim/process/measurementdevice/CompressorMonitor.java index fd340d4c1..ac4d14876 100644 --- a/src/main/java/neqsim/processsimulation/measurementdevice/CompressorMonitor.java +++ b/src/main/java/neqsim/process/measurementdevice/CompressorMonitor.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.measurementdevice; +package neqsim.process.measurementdevice; -import neqsim.processsimulation.processequipment.compressor.Compressor; +import neqsim.process.equipment.compressor.Compressor; /** *

@@ -19,7 +19,7 @@ public class CompressorMonitor extends MeasurementDeviceBaseClass { * Constructor for CompressorMonitor. *

* - * @param compressor a {@link neqsim.processsimulation.processequipment.compressor.Compressor} + * @param compressor a {@link neqsim.process.equipment.compressor.Compressor} * object */ public CompressorMonitor(Compressor compressor) { @@ -32,7 +32,7 @@ public CompressorMonitor(Compressor compressor) { *

* * @param name Name of Compressor - * @param compressor a {@link neqsim.processsimulation.processequipment.compressor.Compressor} + * @param compressor a {@link neqsim.process.equipment.compressor.Compressor} */ public CompressorMonitor(String name, Compressor compressor) { super(name, "rpm"); diff --git a/src/main/java/neqsim/processsimulation/measurementdevice/CricondenbarAnalyser.java b/src/main/java/neqsim/process/measurementdevice/CricondenbarAnalyser.java similarity index 89% rename from src/main/java/neqsim/processsimulation/measurementdevice/CricondenbarAnalyser.java rename to src/main/java/neqsim/process/measurementdevice/CricondenbarAnalyser.java index 4df9fafd7..ecbaee9d1 100644 --- a/src/main/java/neqsim/processsimulation/measurementdevice/CricondenbarAnalyser.java +++ b/src/main/java/neqsim/process/measurementdevice/CricondenbarAnalyser.java @@ -1,8 +1,8 @@ -package neqsim.processsimulation.measurementdevice; +package neqsim.process.measurementdevice; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -23,7 +23,7 @@ public class CricondenbarAnalyser extends StreamMeasurementDeviceBaseClass { * Constructor for CricondenbarAnalyser. *

* - * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @param stream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public CricondenbarAnalyser(StreamInterface stream) { this("CricondenbarAnalyser", stream); @@ -35,7 +35,7 @@ public CricondenbarAnalyser(StreamInterface stream) { *

* * @param name Name of CricondenbarAnalyser - * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @param stream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public CricondenbarAnalyser(String name, StreamInterface stream) { super(name, "K", stream); diff --git a/src/main/java/neqsim/processsimulation/measurementdevice/FlowInducedVibrationAnalyser.java b/src/main/java/neqsim/process/measurementdevice/FlowInducedVibrationAnalyser.java similarity index 93% rename from src/main/java/neqsim/processsimulation/measurementdevice/FlowInducedVibrationAnalyser.java rename to src/main/java/neqsim/process/measurementdevice/FlowInducedVibrationAnalyser.java index d403c3e72..55ba4540c 100644 --- a/src/main/java/neqsim/processsimulation/measurementdevice/FlowInducedVibrationAnalyser.java +++ b/src/main/java/neqsim/process/measurementdevice/FlowInducedVibrationAnalyser.java @@ -1,8 +1,8 @@ -package neqsim.processsimulation.measurementdevice; +package neqsim.process.measurementdevice; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.processequipment.pipeline.PipeBeggsAndBrills; +import neqsim.process.equipment.pipeline.PipeBeggsAndBrills; /** *

@@ -35,7 +35,7 @@ public class FlowInducedVibrationAnalyser extends MeasurementDeviceBaseClass { * Constructor for WaterDewPointAnalyser. *

* - * @param pipe a {@link neqsim.processsimulation.processequipment.pipeline.PipeBeggsAndBrills} + * @param pipe a {@link neqsim.process.equipment.pipeline.PipeBeggsAndBrills} * object */ public FlowInducedVibrationAnalyser(PipeBeggsAndBrills pipe) { @@ -48,7 +48,7 @@ public FlowInducedVibrationAnalyser(PipeBeggsAndBrills pipe) { *

* * @param name Name of FlowInducedVibrationAnalyser - * @param pipe a {@link neqsim.processsimulation.processequipment.pipeline.PipeBeggsAndBrills} + * @param pipe a {@link neqsim.process.equipment.pipeline.PipeBeggsAndBrills} * object */ public FlowInducedVibrationAnalyser(String name, PipeBeggsAndBrills pipe) { diff --git a/src/main/java/neqsim/processsimulation/measurementdevice/HydrateEquilibriumTemperatureAnalyser.java b/src/main/java/neqsim/process/measurementdevice/HydrateEquilibriumTemperatureAnalyser.java similarity index 91% rename from src/main/java/neqsim/processsimulation/measurementdevice/HydrateEquilibriumTemperatureAnalyser.java rename to src/main/java/neqsim/process/measurementdevice/HydrateEquilibriumTemperatureAnalyser.java index a280292a0..f60600230 100644 --- a/src/main/java/neqsim/processsimulation/measurementdevice/HydrateEquilibriumTemperatureAnalyser.java +++ b/src/main/java/neqsim/process/measurementdevice/HydrateEquilibriumTemperatureAnalyser.java @@ -1,8 +1,8 @@ -package neqsim.processsimulation.measurementdevice; +package neqsim.process.measurementdevice; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -26,7 +26,7 @@ public class HydrateEquilibriumTemperatureAnalyser extends StreamMeasurementDevi *

* * @param name Name of HydrateEquilibriumTemperatureAnalyser - * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @param stream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public HydrateEquilibriumTemperatureAnalyser(String name, StreamInterface stream) { super(name, "K", stream); diff --git a/src/main/java/neqsim/processsimulation/measurementdevice/LevelTransmitter.java b/src/main/java/neqsim/process/measurementdevice/LevelTransmitter.java similarity index 78% rename from src/main/java/neqsim/processsimulation/measurementdevice/LevelTransmitter.java rename to src/main/java/neqsim/process/measurementdevice/LevelTransmitter.java index fa9a4072f..8aa7a5b7a 100644 --- a/src/main/java/neqsim/processsimulation/measurementdevice/LevelTransmitter.java +++ b/src/main/java/neqsim/process/measurementdevice/LevelTransmitter.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.measurementdevice; +package neqsim.process.measurementdevice; -import neqsim.processsimulation.processequipment.separator.Separator; +import neqsim.process.equipment.separator.Separator; /** *

@@ -20,7 +20,7 @@ public class LevelTransmitter extends MeasurementDeviceBaseClass { * Constructor for LevelTransmitter. *

* - * @param separator a {@link neqsim.processsimulation.processequipment.separator.Separator} object + * @param separator a {@link neqsim.process.equipment.separator.Separator} object */ public LevelTransmitter(Separator separator) { this("LevelTransmitter", separator); @@ -32,7 +32,7 @@ public LevelTransmitter(Separator separator) { *

* * @param name Name of LevelTransmitter - * @param separator a {@link neqsim.processsimulation.processequipment.separator.Separator} object + * @param separator a {@link neqsim.process.equipment.separator.Separator} object */ public LevelTransmitter(String name, Separator separator) { super(name, ""); diff --git a/src/main/java/neqsim/processsimulation/measurementdevice/MeasurementDeviceBaseClass.java b/src/main/java/neqsim/process/measurementdevice/MeasurementDeviceBaseClass.java similarity index 97% rename from src/main/java/neqsim/processsimulation/measurementdevice/MeasurementDeviceBaseClass.java rename to src/main/java/neqsim/process/measurementdevice/MeasurementDeviceBaseClass.java index cdd629e97..23edc2c11 100644 --- a/src/main/java/neqsim/processsimulation/measurementdevice/MeasurementDeviceBaseClass.java +++ b/src/main/java/neqsim/process/measurementdevice/MeasurementDeviceBaseClass.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.measurementdevice; +package neqsim.process.measurementdevice; -import neqsim.processsimulation.measurementdevice.online.OnlineSignal; +import neqsim.process.measurementdevice.online.OnlineSignal; import neqsim.util.NamedBaseClass; /** diff --git a/src/main/java/neqsim/processsimulation/measurementdevice/MeasurementDeviceInterface.java b/src/main/java/neqsim/process/measurementdevice/MeasurementDeviceInterface.java similarity index 91% rename from src/main/java/neqsim/processsimulation/measurementdevice/MeasurementDeviceInterface.java rename to src/main/java/neqsim/process/measurementdevice/MeasurementDeviceInterface.java index d96fff2c8..875cf1f27 100644 --- a/src/main/java/neqsim/processsimulation/measurementdevice/MeasurementDeviceInterface.java +++ b/src/main/java/neqsim/process/measurementdevice/MeasurementDeviceInterface.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.measurementdevice; +package neqsim.process.measurementdevice; -import neqsim.processsimulation.measurementdevice.online.OnlineSignal; +import neqsim.process.measurementdevice.online.OnlineSignal; import neqsim.util.NamedInterface; /** @@ -45,7 +45,7 @@ public default double getMeasuredValue() { * getOnlineSignal. *

* - * @return a {@link neqsim.processsimulation.measurementdevice.online.OnlineSignal} object + * @return a {@link neqsim.process.measurementdevice.online.OnlineSignal} object */ public OnlineSignal getOnlineSignal(); diff --git a/src/main/java/neqsim/processsimulation/measurementdevice/MolarMassAnalyser.java b/src/main/java/neqsim/process/measurementdevice/MolarMassAnalyser.java similarity index 77% rename from src/main/java/neqsim/processsimulation/measurementdevice/MolarMassAnalyser.java rename to src/main/java/neqsim/process/measurementdevice/MolarMassAnalyser.java index 3f2e276dc..c63670e45 100644 --- a/src/main/java/neqsim/processsimulation/measurementdevice/MolarMassAnalyser.java +++ b/src/main/java/neqsim/process/measurementdevice/MolarMassAnalyser.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.measurementdevice; +package neqsim.process.measurementdevice; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.stream.StreamInterface; /** *

@@ -18,7 +18,7 @@ public class MolarMassAnalyser extends StreamMeasurementDeviceBaseClass { * Constructor for MolarMassAnalyser. *

* - * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @param stream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public MolarMassAnalyser(StreamInterface stream) { this("molar mass analyser", stream); @@ -30,7 +30,7 @@ public MolarMassAnalyser(StreamInterface stream) { *

* * @param name Name of MolarMassAnalyser - * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @param stream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public MolarMassAnalyser(String name, StreamInterface stream) { super(name, "gr/mol", stream); diff --git a/src/main/java/neqsim/processsimulation/measurementdevice/MultiPhaseMeter.java b/src/main/java/neqsim/process/measurementdevice/MultiPhaseMeter.java similarity index 96% rename from src/main/java/neqsim/processsimulation/measurementdevice/MultiPhaseMeter.java rename to src/main/java/neqsim/process/measurementdevice/MultiPhaseMeter.java index d20af235f..7a2b3d494 100644 --- a/src/main/java/neqsim/processsimulation/measurementdevice/MultiPhaseMeter.java +++ b/src/main/java/neqsim/process/measurementdevice/MultiPhaseMeter.java @@ -1,9 +1,9 @@ -package neqsim.processsimulation.measurementdevice; +package neqsim.process.measurementdevice; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import neqsim.physicalproperties.PhysicalPropertyType; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -30,7 +30,7 @@ public class MultiPhaseMeter extends StreamMeasurementDeviceBaseClass { * Constructor for MultiPhaseMeter. *

* - * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @param stream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public MultiPhaseMeter(StreamInterface stream) { this("Multi Phase Meter", stream); @@ -42,7 +42,7 @@ public MultiPhaseMeter(StreamInterface stream) { *

* * @param name a {@link java.lang.String} object - * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @param stream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public MultiPhaseMeter(String name, StreamInterface stream) { super(name, "kg/hr", stream); diff --git a/src/main/java/neqsim/processsimulation/measurementdevice/NMVOCAnalyser.java b/src/main/java/neqsim/process/measurementdevice/NMVOCAnalyser.java similarity index 83% rename from src/main/java/neqsim/processsimulation/measurementdevice/NMVOCAnalyser.java rename to src/main/java/neqsim/process/measurementdevice/NMVOCAnalyser.java index a0c49f038..6bcfbfd8f 100644 --- a/src/main/java/neqsim/processsimulation/measurementdevice/NMVOCAnalyser.java +++ b/src/main/java/neqsim/process/measurementdevice/NMVOCAnalyser.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.measurementdevice; +package neqsim.process.measurementdevice; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.stream.StreamInterface; /** *

@@ -18,7 +18,7 @@ public class NMVOCAnalyser extends StreamMeasurementDeviceBaseClass { * Constructor for NMVOCAnalyser. *

* - * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @param stream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public NMVOCAnalyser(StreamInterface stream) { this("NM VOC Analyser", stream); @@ -30,7 +30,7 @@ public NMVOCAnalyser(StreamInterface stream) { *

* * @param name Name of NMVOCAnalyser - * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @param stream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public NMVOCAnalyser(String name, StreamInterface stream) { super(name, "kg/hr", stream); diff --git a/src/main/java/neqsim/processsimulation/measurementdevice/PressureTransmitter.java b/src/main/java/neqsim/process/measurementdevice/PressureTransmitter.java similarity index 73% rename from src/main/java/neqsim/processsimulation/measurementdevice/PressureTransmitter.java rename to src/main/java/neqsim/process/measurementdevice/PressureTransmitter.java index 648f16855..41db6467d 100644 --- a/src/main/java/neqsim/processsimulation/measurementdevice/PressureTransmitter.java +++ b/src/main/java/neqsim/process/measurementdevice/PressureTransmitter.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.measurementdevice; +package neqsim.process.measurementdevice; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.stream.StreamInterface; /** *

@@ -18,7 +18,7 @@ public class PressureTransmitter extends StreamMeasurementDeviceBaseClass { * Constructor for PressureTransmitter. *

* - * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @param stream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public PressureTransmitter(StreamInterface stream) { this("Pressure Transmitter", stream); @@ -30,7 +30,7 @@ public PressureTransmitter(StreamInterface stream) { *

* * @param name Name of PressureTransmitter - * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @param stream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public PressureTransmitter(String name, StreamInterface stream) { super(name, "bar", stream); diff --git a/src/main/java/neqsim/processsimulation/measurementdevice/StreamMeasurementDeviceBaseClass.java b/src/main/java/neqsim/process/measurementdevice/StreamMeasurementDeviceBaseClass.java similarity index 88% rename from src/main/java/neqsim/processsimulation/measurementdevice/StreamMeasurementDeviceBaseClass.java rename to src/main/java/neqsim/process/measurementdevice/StreamMeasurementDeviceBaseClass.java index 2993eb300..9502268ed 100644 --- a/src/main/java/neqsim/processsimulation/measurementdevice/StreamMeasurementDeviceBaseClass.java +++ b/src/main/java/neqsim/process/measurementdevice/StreamMeasurementDeviceBaseClass.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.measurementdevice; +package neqsim.process.measurementdevice; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.stream.StreamInterface; /** *

diff --git a/src/main/java/neqsim/processsimulation/measurementdevice/TemperatureTransmitter.java b/src/main/java/neqsim/process/measurementdevice/TemperatureTransmitter.java similarity index 75% rename from src/main/java/neqsim/processsimulation/measurementdevice/TemperatureTransmitter.java rename to src/main/java/neqsim/process/measurementdevice/TemperatureTransmitter.java index ffa9aab88..80d0603c0 100644 --- a/src/main/java/neqsim/processsimulation/measurementdevice/TemperatureTransmitter.java +++ b/src/main/java/neqsim/process/measurementdevice/TemperatureTransmitter.java @@ -4,9 +4,9 @@ * Created on 6. juni 2006, 15:24 */ -package neqsim.processsimulation.measurementdevice; +package neqsim.process.measurementdevice; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.stream.StreamInterface; /** *

@@ -24,7 +24,7 @@ public class TemperatureTransmitter extends StreamMeasurementDeviceBaseClass { * Constructor for TemperatureTransmitter. *

* - * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @param stream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public TemperatureTransmitter(StreamInterface stream) { this("Temperature Transmitter", stream); @@ -36,7 +36,7 @@ public TemperatureTransmitter(StreamInterface stream) { *

* * @param name Name of TemperatureTransmitter - * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @param stream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public TemperatureTransmitter(String name, StreamInterface stream) { super(name, "K", stream); diff --git a/src/main/java/neqsim/processsimulation/measurementdevice/VolumeFlowTransmitter.java b/src/main/java/neqsim/process/measurementdevice/VolumeFlowTransmitter.java similarity index 89% rename from src/main/java/neqsim/processsimulation/measurementdevice/VolumeFlowTransmitter.java rename to src/main/java/neqsim/process/measurementdevice/VolumeFlowTransmitter.java index 5553ce434..44e139ce5 100644 --- a/src/main/java/neqsim/processsimulation/measurementdevice/VolumeFlowTransmitter.java +++ b/src/main/java/neqsim/process/measurementdevice/VolumeFlowTransmitter.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.measurementdevice; +package neqsim.process.measurementdevice; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.ThermodynamicConstantsInterface; /** @@ -21,7 +21,7 @@ public class VolumeFlowTransmitter extends StreamMeasurementDeviceBaseClass { * Constructor for VolumeFlowTransmitter. *

* - * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @param stream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public VolumeFlowTransmitter(StreamInterface stream) { this("volume flow rate", stream); @@ -33,7 +33,7 @@ public VolumeFlowTransmitter(StreamInterface stream) { *

* * @param name Name of VolumeFlowTransmitter - * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @param stream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public VolumeFlowTransmitter(String name, StreamInterface stream) { super(name, "m^3/hr", stream); diff --git a/src/main/java/neqsim/processsimulation/measurementdevice/WaterContentAnalyser.java b/src/main/java/neqsim/process/measurementdevice/WaterContentAnalyser.java similarity index 81% rename from src/main/java/neqsim/processsimulation/measurementdevice/WaterContentAnalyser.java rename to src/main/java/neqsim/process/measurementdevice/WaterContentAnalyser.java index 0762e9bdf..a8f7cc5bf 100644 --- a/src/main/java/neqsim/processsimulation/measurementdevice/WaterContentAnalyser.java +++ b/src/main/java/neqsim/process/measurementdevice/WaterContentAnalyser.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.measurementdevice; +package neqsim.process.measurementdevice; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.stream.StreamInterface; /** *

@@ -18,7 +18,7 @@ public class WaterContentAnalyser extends StreamMeasurementDeviceBaseClass { * Constructor for WaterContentAnalyser. *

* - * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @param stream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public WaterContentAnalyser(StreamInterface stream) { this("water analyser", stream); @@ -30,7 +30,7 @@ public WaterContentAnalyser(StreamInterface stream) { *

* * @param name Name of WaterContentAnalyser - * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @param stream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public WaterContentAnalyser(String name, StreamInterface stream) { super(name, "kg/day", stream); diff --git a/src/main/java/neqsim/processsimulation/measurementdevice/WaterDewPointAnalyser.java b/src/main/java/neqsim/process/measurementdevice/WaterDewPointAnalyser.java similarity index 92% rename from src/main/java/neqsim/processsimulation/measurementdevice/WaterDewPointAnalyser.java rename to src/main/java/neqsim/process/measurementdevice/WaterDewPointAnalyser.java index 2893b9a68..24cbc5216 100644 --- a/src/main/java/neqsim/processsimulation/measurementdevice/WaterDewPointAnalyser.java +++ b/src/main/java/neqsim/process/measurementdevice/WaterDewPointAnalyser.java @@ -1,8 +1,8 @@ -package neqsim.processsimulation.measurementdevice; +package neqsim.process.measurementdevice; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.util.empiric.BukacekWaterInGas; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -27,7 +27,7 @@ public class WaterDewPointAnalyser extends StreamMeasurementDeviceBaseClass { * Constructor for WaterDewPointAnalyser. *

* - * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @param stream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public WaterDewPointAnalyser(StreamInterface stream) { this("WaterDewPointAnalyser", stream); @@ -39,7 +39,7 @@ public WaterDewPointAnalyser(StreamInterface stream) { *

* * @param name Name of WaterDewPointAnalyser - * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @param stream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public WaterDewPointAnalyser(String name, StreamInterface stream) { super(name, "K", stream); diff --git a/src/main/java/neqsim/processsimulation/measurementdevice/WellAllocator.java b/src/main/java/neqsim/process/measurementdevice/WellAllocator.java similarity index 82% rename from src/main/java/neqsim/processsimulation/measurementdevice/WellAllocator.java rename to src/main/java/neqsim/process/measurementdevice/WellAllocator.java index e45ab3969..1563d59c3 100644 --- a/src/main/java/neqsim/processsimulation/measurementdevice/WellAllocator.java +++ b/src/main/java/neqsim/process/measurementdevice/WellAllocator.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.measurementdevice; +package neqsim.process.measurementdevice; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.stream.StreamInterface; /** *

@@ -20,7 +20,7 @@ public class WellAllocator extends StreamMeasurementDeviceBaseClass { * Constructor for WellAllocator. *

* - * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @param stream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public WellAllocator(StreamInterface stream) { this("Well Allocator", stream); @@ -32,7 +32,7 @@ public WellAllocator(StreamInterface stream) { *

* * @param name a {@link java.lang.String} object - * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @param stream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public WellAllocator(String name, StreamInterface stream) { super(name, "kg/hr", stream); @@ -43,7 +43,7 @@ public WellAllocator(String name, StreamInterface stream) { * Setter for the field exportGasStream. *

* - * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @param stream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public void setExportGasStream(StreamInterface stream) { this.exportGasStream = stream; @@ -54,7 +54,7 @@ public void setExportGasStream(StreamInterface stream) { * Setter for the field exportOilStream. *

* - * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @param stream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public void setExportOilStream(StreamInterface stream) { this.exportOilStream = stream; diff --git a/src/main/java/neqsim/processsimulation/measurementdevice/online/OnlineSignal.java b/src/main/java/neqsim/process/measurementdevice/online/OnlineSignal.java similarity index 97% rename from src/main/java/neqsim/processsimulation/measurementdevice/online/OnlineSignal.java rename to src/main/java/neqsim/process/measurementdevice/online/OnlineSignal.java index 447aad3f4..a5b52294e 100644 --- a/src/main/java/neqsim/processsimulation/measurementdevice/online/OnlineSignal.java +++ b/src/main/java/neqsim/process/measurementdevice/online/OnlineSignal.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.measurementdevice.online; +package neqsim.process.measurementdevice.online; import java.util.Date; diff --git a/src/main/java/neqsim/processsimulation/measurementdevice/pHProbe.java b/src/main/java/neqsim/process/measurementdevice/pHProbe.java similarity index 91% rename from src/main/java/neqsim/processsimulation/measurementdevice/pHProbe.java rename to src/main/java/neqsim/process/measurementdevice/pHProbe.java index 7603bb592..bde487fcb 100644 --- a/src/main/java/neqsim/processsimulation/measurementdevice/pHProbe.java +++ b/src/main/java/neqsim/process/measurementdevice/pHProbe.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.measurementdevice; +package neqsim.process.measurementdevice; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -25,7 +25,7 @@ public class pHProbe extends StreamMeasurementDeviceBaseClass { * Constructor for pHProbe. *

* - * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @param stream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public pHProbe(StreamInterface stream) { this("phProbe", stream); @@ -37,7 +37,7 @@ public pHProbe(StreamInterface stream) { *

* * @param name Name of pHProbe - * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @param stream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public pHProbe(String name, StreamInterface stream) { super(name, "", stream); diff --git a/src/main/java/neqsim/processsimulation/measurementdevice/simpleflowregime/FluidSevereSlug.java b/src/main/java/neqsim/process/measurementdevice/simpleflowregime/FluidSevereSlug.java similarity index 97% rename from src/main/java/neqsim/processsimulation/measurementdevice/simpleflowregime/FluidSevereSlug.java rename to src/main/java/neqsim/process/measurementdevice/simpleflowregime/FluidSevereSlug.java index 7d54c7df4..dc25c07ae 100644 --- a/src/main/java/neqsim/processsimulation/measurementdevice/simpleflowregime/FluidSevereSlug.java +++ b/src/main/java/neqsim/process/measurementdevice/simpleflowregime/FluidSevereSlug.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.measurementdevice.simpleflowregime; +package neqsim.process.measurementdevice.simpleflowregime; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; diff --git a/src/main/java/neqsim/processsimulation/measurementdevice/simpleflowregime/Pipe.java b/src/main/java/neqsim/process/measurementdevice/simpleflowregime/Pipe.java similarity index 97% rename from src/main/java/neqsim/processsimulation/measurementdevice/simpleflowregime/Pipe.java rename to src/main/java/neqsim/process/measurementdevice/simpleflowregime/Pipe.java index 98a26febe..02d82bdbc 100644 --- a/src/main/java/neqsim/processsimulation/measurementdevice/simpleflowregime/Pipe.java +++ b/src/main/java/neqsim/process/measurementdevice/simpleflowregime/Pipe.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.measurementdevice.simpleflowregime; +package neqsim.process.measurementdevice.simpleflowregime; /** *

diff --git a/src/main/java/neqsim/processsimulation/measurementdevice/simpleflowregime/SevereSlugAnalyser.java b/src/main/java/neqsim/process/measurementdevice/simpleflowregime/SevereSlugAnalyser.java similarity index 92% rename from src/main/java/neqsim/processsimulation/measurementdevice/simpleflowregime/SevereSlugAnalyser.java rename to src/main/java/neqsim/process/measurementdevice/simpleflowregime/SevereSlugAnalyser.java index f55053cf1..b0d18128e 100644 --- a/src/main/java/neqsim/processsimulation/measurementdevice/simpleflowregime/SevereSlugAnalyser.java +++ b/src/main/java/neqsim/process/measurementdevice/simpleflowregime/SevereSlugAnalyser.java @@ -1,11 +1,11 @@ -package neqsim.processsimulation.measurementdevice.simpleflowregime; +package neqsim.process.measurementdevice.simpleflowregime; import java.util.Arrays; import java.util.Collections; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.measurementdevice.MeasurementDeviceBaseClass; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.measurementdevice.MeasurementDeviceBaseClass; import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -419,7 +419,7 @@ public double getSimulationTime() { *

* * @param fluid a - * {@link neqsim.processsimulation.measurementdevice.simpleflowregime.FluidSevereSlug} + * {@link neqsim.process.measurementdevice.simpleflowregime.FluidSevereSlug} * object * @return a double */ @@ -435,9 +435,9 @@ public double gasConst(FluidSevereSlug fluid) { * slugHoldUp. *

* - * @param pipe a {@link neqsim.processsimulation.measurementdevice.simpleflowregime.Pipe} object + * @param pipe a {@link neqsim.process.measurementdevice.simpleflowregime.Pipe} object * @param severeSlug a - * {@link neqsim.processsimulation.measurementdevice.simpleflowregime.SevereSlugAnalyser} + * {@link neqsim.process.measurementdevice.simpleflowregime.SevereSlugAnalyser} * object * @return a double */ @@ -458,11 +458,11 @@ public double slugHoldUp(Pipe pipe, SevereSlugAnalyser severeSlug) { *

* * @param fluid a - * {@link neqsim.processsimulation.measurementdevice.simpleflowregime.FluidSevereSlug} + * {@link neqsim.process.measurementdevice.simpleflowregime.FluidSevereSlug} * object - * @param pipe a {@link neqsim.processsimulation.measurementdevice.simpleflowregime.Pipe} object + * @param pipe a {@link neqsim.process.measurementdevice.simpleflowregime.Pipe} object * @param severeSlug a - * {@link neqsim.processsimulation.measurementdevice.simpleflowregime.SevereSlugAnalyser} + * {@link neqsim.process.measurementdevice.simpleflowregime.SevereSlugAnalyser} * object * @return a double */ @@ -524,11 +524,11 @@ public double stratifiedHoldUp(FluidSevereSlug fluid, Pipe pipe, SevereSlugAnaly *

* * @param fluid a - * {@link neqsim.processsimulation.measurementdevice.simpleflowregime.FluidSevereSlug} + * {@link neqsim.process.measurementdevice.simpleflowregime.FluidSevereSlug} * object - * @param pipe a {@link neqsim.processsimulation.measurementdevice.simpleflowregime.Pipe} object + * @param pipe a {@link neqsim.process.measurementdevice.simpleflowregime.Pipe} object * @param severeSlug a - * {@link neqsim.processsimulation.measurementdevice.simpleflowregime.SevereSlugAnalyser} + * {@link neqsim.process.measurementdevice.simpleflowregime.SevereSlugAnalyser} * object */ public void runSevereSlug(FluidSevereSlug fluid, Pipe pipe, SevereSlugAnalyser severeSlug) { @@ -634,11 +634,11 @@ public void runSevereSlug(FluidSevereSlug fluid, Pipe pipe, SevereSlugAnalyser s *

* * @param fluid a - * {@link neqsim.processsimulation.measurementdevice.simpleflowregime.FluidSevereSlug} + * {@link neqsim.process.measurementdevice.simpleflowregime.FluidSevereSlug} * object - * @param pipe a {@link neqsim.processsimulation.measurementdevice.simpleflowregime.Pipe} object + * @param pipe a {@link neqsim.process.measurementdevice.simpleflowregime.Pipe} object * @param severeSlug a - * {@link neqsim.processsimulation.measurementdevice.simpleflowregime.SevereSlugAnalyser} + * {@link neqsim.process.measurementdevice.simpleflowregime.SevereSlugAnalyser} * object * @return a {@link java.lang.String} object */ @@ -714,11 +714,11 @@ public double getMeasuredValue(String unit) { *

* * @param fluid a - * {@link neqsim.processsimulation.measurementdevice.simpleflowregime.FluidSevereSlug} + * {@link neqsim.process.measurementdevice.simpleflowregime.FluidSevereSlug} * object - * @param pipe a {@link neqsim.processsimulation.measurementdevice.simpleflowregime.Pipe} object + * @param pipe a {@link neqsim.process.measurementdevice.simpleflowregime.Pipe} object * @param severeSlug a - * {@link neqsim.processsimulation.measurementdevice.simpleflowregime.SevereSlugAnalyser} + * {@link neqsim.process.measurementdevice.simpleflowregime.SevereSlugAnalyser} * object * @return a double */ @@ -765,11 +765,11 @@ public String getPredictedFlowRegime() { *

* * @param fluid a - * {@link neqsim.processsimulation.measurementdevice.simpleflowregime.FluidSevereSlug} + * {@link neqsim.process.measurementdevice.simpleflowregime.FluidSevereSlug} * object - * @param pipe a {@link neqsim.processsimulation.measurementdevice.simpleflowregime.Pipe} object + * @param pipe a {@link neqsim.process.measurementdevice.simpleflowregime.Pipe} object * @param severeSlug a - * {@link neqsim.processsimulation.measurementdevice.simpleflowregime.SevereSlugAnalyser} + * {@link neqsim.process.measurementdevice.simpleflowregime.SevereSlugAnalyser} * object * @return a {@link java.lang.String} object */ diff --git a/src/main/java/neqsim/processsimulation/mechanicaldesign/MechanicalDesign.java b/src/main/java/neqsim/process/mechanicaldesign/MechanicalDesign.java similarity index 96% rename from src/main/java/neqsim/processsimulation/mechanicaldesign/MechanicalDesign.java rename to src/main/java/neqsim/process/mechanicaldesign/MechanicalDesign.java index 598d88413..0bda8d3f4 100644 --- a/src/main/java/neqsim/processsimulation/mechanicaldesign/MechanicalDesign.java +++ b/src/main/java/neqsim/process/mechanicaldesign/MechanicalDesign.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.mechanicaldesign; +package neqsim.process.mechanicaldesign; import java.awt.BorderLayout; import java.awt.Container; @@ -7,18 +7,18 @@ import javax.swing.JFrame; import javax.swing.JScrollPane; import javax.swing.JTable; -import neqsim.processsimulation.costestimation.UnitCostEstimateBaseClass; -import neqsim.processsimulation.mechanicaldesign.designstandards.AdsorptionDehydrationDesignStandard; -import neqsim.processsimulation.mechanicaldesign.designstandards.CompressorDesignStandard; -import neqsim.processsimulation.mechanicaldesign.designstandards.DesignStandard; -import neqsim.processsimulation.mechanicaldesign.designstandards.GasScrubberDesignStandard; -import neqsim.processsimulation.mechanicaldesign.designstandards.JointEfficiencyPlateStandard; -import neqsim.processsimulation.mechanicaldesign.designstandards.MaterialPipeDesignStandard; -import neqsim.processsimulation.mechanicaldesign.designstandards.MaterialPlateDesignStandard; -import neqsim.processsimulation.mechanicaldesign.designstandards.PipelineDesignStandard; -import neqsim.processsimulation.mechanicaldesign.designstandards.PressureVesselDesignStandard; -import neqsim.processsimulation.mechanicaldesign.designstandards.SeparatorDesignStandard; -import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; +import neqsim.process.costestimation.UnitCostEstimateBaseClass; +import neqsim.process.equipment.ProcessEquipmentInterface; +import neqsim.process.mechanicaldesign.designstandards.AdsorptionDehydrationDesignStandard; +import neqsim.process.mechanicaldesign.designstandards.CompressorDesignStandard; +import neqsim.process.mechanicaldesign.designstandards.DesignStandard; +import neqsim.process.mechanicaldesign.designstandards.GasScrubberDesignStandard; +import neqsim.process.mechanicaldesign.designstandards.JointEfficiencyPlateStandard; +import neqsim.process.mechanicaldesign.designstandards.MaterialPipeDesignStandard; +import neqsim.process.mechanicaldesign.designstandards.MaterialPlateDesignStandard; +import neqsim.process.mechanicaldesign.designstandards.PipelineDesignStandard; +import neqsim.process.mechanicaldesign.designstandards.PressureVesselDesignStandard; +import neqsim.process.mechanicaldesign.designstandards.SeparatorDesignStandard; /** *

@@ -128,7 +128,7 @@ public void setMaterialDesignStandard(MaterialPlateDesignStandard materialDesign *

* * @param processEquipment a - * {@link neqsim.processsimulation.processequipment.ProcessEquipmentInterface} object + * {@link neqsim.process.equipment.ProcessEquipmentInterface} object */ public MechanicalDesign(ProcessEquipmentInterface processEquipment) { this.processEquipment = processEquipment; diff --git a/src/main/java/neqsim/processsimulation/mechanicaldesign/SystemMechanicalDesign.java b/src/main/java/neqsim/process/mechanicaldesign/SystemMechanicalDesign.java similarity index 93% rename from src/main/java/neqsim/processsimulation/mechanicaldesign/SystemMechanicalDesign.java rename to src/main/java/neqsim/process/mechanicaldesign/SystemMechanicalDesign.java index 373744394..f787bdfd2 100644 --- a/src/main/java/neqsim/processsimulation/mechanicaldesign/SystemMechanicalDesign.java +++ b/src/main/java/neqsim/process/mechanicaldesign/SystemMechanicalDesign.java @@ -1,11 +1,11 @@ -package neqsim.processsimulation.mechanicaldesign; +package neqsim.process.mechanicaldesign; import java.util.ArrayList; import java.util.Objects; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; -import neqsim.processsimulation.processsystem.ProcessSystem; +import neqsim.process.equipment.ProcessEquipmentInterface; +import neqsim.process.processmodel.ProcessSystem; /** *

@@ -30,7 +30,7 @@ public class SystemMechanicalDesign implements java.io.Serializable { * Constructor for SystemMechanicalDesign. *

* - * @param processSystem a {@link neqsim.processsimulation.processsystem.ProcessSystem} object + * @param processSystem a {@link neqsim.process.processmodel.ProcessSystem} object */ public SystemMechanicalDesign(ProcessSystem processSystem) { this.processSystem = processSystem; @@ -41,7 +41,7 @@ public SystemMechanicalDesign(ProcessSystem processSystem) { * getProcess. *

* - * @return a {@link neqsim.processsimulation.processsystem.ProcessSystem} object + * @return a {@link neqsim.process.processmodel.ProcessSystem} object */ public ProcessSystem getProcess() { return processSystem; diff --git a/src/main/java/neqsim/processsimulation/mechanicaldesign/absorber/AbsorberMechanicalDesign.java b/src/main/java/neqsim/process/mechanicaldesign/absorber/AbsorberMechanicalDesign.java similarity index 88% rename from src/main/java/neqsim/processsimulation/mechanicaldesign/absorber/AbsorberMechanicalDesign.java rename to src/main/java/neqsim/process/mechanicaldesign/absorber/AbsorberMechanicalDesign.java index b2ec38768..b86ecb798 100644 --- a/src/main/java/neqsim/processsimulation/mechanicaldesign/absorber/AbsorberMechanicalDesign.java +++ b/src/main/java/neqsim/process/mechanicaldesign/absorber/AbsorberMechanicalDesign.java @@ -1,13 +1,13 @@ -package neqsim.processsimulation.mechanicaldesign.absorber; +package neqsim.process.mechanicaldesign.absorber; -import neqsim.processsimulation.mechanicaldesign.designstandards.PressureVesselDesignStandard; -import neqsim.processsimulation.mechanicaldesign.designstandards.SeparatorDesignStandard; -import neqsim.processsimulation.mechanicaldesign.separator.SeparatorMechanicalDesign; -import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; -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.process.equipment.ProcessEquipmentInterface; +import neqsim.process.equipment.absorber.SimpleTEGAbsorber; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.separator.SeparatorInterface; +import neqsim.process.equipment.separator.sectiontype.SeparatorSection; +import neqsim.process.mechanicaldesign.designstandards.PressureVesselDesignStandard; +import neqsim.process.mechanicaldesign.designstandards.SeparatorDesignStandard; +import neqsim.process.mechanicaldesign.separator.SeparatorMechanicalDesign; /** *

@@ -30,7 +30,7 @@ public class AbsorberMechanicalDesign extends SeparatorMechanicalDesign { * Constructor for AbsorberMechanicalDesign. *

* - * @param equipment a {@link neqsim.processsimulation.processequipment.ProcessEquipmentInterface} + * @param equipment a {@link neqsim.process.equipment.ProcessEquipmentInterface} * object */ public AbsorberMechanicalDesign(ProcessEquipmentInterface equipment) { diff --git a/src/main/java/neqsim/processsimulation/mechanicaldesign/adsorber/AdsorberMechanicalDesign.java b/src/main/java/neqsim/process/mechanicaldesign/adsorber/AdsorberMechanicalDesign.java similarity index 89% rename from src/main/java/neqsim/processsimulation/mechanicaldesign/adsorber/AdsorberMechanicalDesign.java rename to src/main/java/neqsim/process/mechanicaldesign/adsorber/AdsorberMechanicalDesign.java index 62d2a2ba0..b0b7c3f9a 100644 --- a/src/main/java/neqsim/processsimulation/mechanicaldesign/adsorber/AdsorberMechanicalDesign.java +++ b/src/main/java/neqsim/process/mechanicaldesign/adsorber/AdsorberMechanicalDesign.java @@ -1,11 +1,11 @@ -package neqsim.processsimulation.mechanicaldesign.adsorber; +package neqsim.process.mechanicaldesign.adsorber; -import neqsim.processsimulation.mechanicaldesign.MechanicalDesign; -import neqsim.processsimulation.mechanicaldesign.designstandards.PressureVesselDesignStandard; -import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; -import neqsim.processsimulation.processequipment.adsorber.SimpleAdsorber; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.separator.SeparatorInterface; +import neqsim.process.equipment.ProcessEquipmentInterface; +import neqsim.process.equipment.adsorber.SimpleAdsorber; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.separator.SeparatorInterface; +import neqsim.process.mechanicaldesign.MechanicalDesign; +import neqsim.process.mechanicaldesign.designstandards.PressureVesselDesignStandard; /** *

@@ -27,7 +27,7 @@ public class AdsorberMechanicalDesign extends MechanicalDesign { * Constructor for AdsorberMechanicalDesign. *

* - * @param equipment a {@link neqsim.processsimulation.processequipment.ProcessEquipmentInterface} + * @param equipment a {@link neqsim.process.equipment.ProcessEquipmentInterface} * object */ public AdsorberMechanicalDesign(ProcessEquipmentInterface equipment) { diff --git a/src/main/java/neqsim/processsimulation/mechanicaldesign/compressor/CompressorMechanicalDesign.java b/src/main/java/neqsim/process/mechanicaldesign/compressor/CompressorMechanicalDesign.java similarity index 91% rename from src/main/java/neqsim/processsimulation/mechanicaldesign/compressor/CompressorMechanicalDesign.java rename to src/main/java/neqsim/process/mechanicaldesign/compressor/CompressorMechanicalDesign.java index 0bbd57b9c..cd5c9a5d9 100644 --- a/src/main/java/neqsim/processsimulation/mechanicaldesign/compressor/CompressorMechanicalDesign.java +++ b/src/main/java/neqsim/process/mechanicaldesign/compressor/CompressorMechanicalDesign.java @@ -1,17 +1,17 @@ -package neqsim.processsimulation.mechanicaldesign.compressor; +package neqsim.process.mechanicaldesign.compressor; import java.awt.BorderLayout; import java.awt.Container; import javax.swing.JFrame; import javax.swing.JScrollPane; import javax.swing.JTable; -import neqsim.processsimulation.costestimation.compressor.CompressorCostEstimate; -import neqsim.processsimulation.mechanicaldesign.MechanicalDesign; -import neqsim.processsimulation.mechanicaldesign.designstandards.CompressorDesignStandard; -import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; -import neqsim.processsimulation.processequipment.compressor.Compressor; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.separator.SeparatorInterface; +import neqsim.process.costestimation.compressor.CompressorCostEstimate; +import neqsim.process.equipment.ProcessEquipmentInterface; +import neqsim.process.equipment.compressor.Compressor; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.separator.SeparatorInterface; +import neqsim.process.mechanicaldesign.MechanicalDesign; +import neqsim.process.mechanicaldesign.designstandards.CompressorDesignStandard; /** *

@@ -31,7 +31,7 @@ public class CompressorMechanicalDesign extends MechanicalDesign { * Constructor for CompressorMechanicalDesign. *

* - * @param equipment a {@link neqsim.processsimulation.processequipment.ProcessEquipmentInterface} + * @param equipment a {@link neqsim.process.equipment.ProcessEquipmentInterface} * object */ public CompressorMechanicalDesign(ProcessEquipmentInterface equipment) { diff --git a/src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/AbsorptionColumnDesignStandard.java b/src/main/java/neqsim/process/mechanicaldesign/designstandards/AbsorptionColumnDesignStandard.java similarity index 89% rename from src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/AbsorptionColumnDesignStandard.java rename to src/main/java/neqsim/process/mechanicaldesign/designstandards/AbsorptionColumnDesignStandard.java index d4d633825..c6f8a2603 100644 --- a/src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/AbsorptionColumnDesignStandard.java +++ b/src/main/java/neqsim/process/mechanicaldesign/designstandards/AbsorptionColumnDesignStandard.java @@ -1,8 +1,8 @@ -package neqsim.processsimulation.mechanicaldesign.designstandards; +package neqsim.process.mechanicaldesign.designstandards; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.mechanicaldesign.MechanicalDesign; +import neqsim.process.mechanicaldesign.MechanicalDesign; /** *

@@ -24,7 +24,7 @@ public class AbsorptionColumnDesignStandard extends DesignStandard { *

* * @param name a {@link java.lang.String} object - * @param equipmentInn a {@link neqsim.processsimulation.mechanicaldesign.MechanicalDesign} object + * @param equipmentInn a {@link neqsim.process.mechanicaldesign.MechanicalDesign} object */ public AbsorptionColumnDesignStandard(String name, MechanicalDesign equipmentInn) { super(name, equipmentInn); diff --git a/src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/AdsorptionDehydrationDesignStandard.java b/src/main/java/neqsim/process/mechanicaldesign/designstandards/AdsorptionDehydrationDesignStandard.java similarity index 91% rename from src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/AdsorptionDehydrationDesignStandard.java rename to src/main/java/neqsim/process/mechanicaldesign/designstandards/AdsorptionDehydrationDesignStandard.java index 88fd8a1ad..ccc6e02b4 100644 --- a/src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/AdsorptionDehydrationDesignStandard.java +++ b/src/main/java/neqsim/process/mechanicaldesign/designstandards/AdsorptionDehydrationDesignStandard.java @@ -1,8 +1,8 @@ -package neqsim.processsimulation.mechanicaldesign.designstandards; +package neqsim.process.mechanicaldesign.designstandards; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.mechanicaldesign.MechanicalDesign; +import neqsim.process.mechanicaldesign.MechanicalDesign; /** *

@@ -24,7 +24,7 @@ public class AdsorptionDehydrationDesignStandard extends DesignStandard { *

* * @param name a {@link java.lang.String} object - * @param equipmentInn a {@link neqsim.processsimulation.mechanicaldesign.MechanicalDesign} object + * @param equipmentInn a {@link neqsim.process.mechanicaldesign.MechanicalDesign} object */ public AdsorptionDehydrationDesignStandard(String name, MechanicalDesign equipmentInn) { super(name, equipmentInn); diff --git a/src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/CompressorDesignStandard.java b/src/main/java/neqsim/process/mechanicaldesign/designstandards/CompressorDesignStandard.java similarity index 89% rename from src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/CompressorDesignStandard.java rename to src/main/java/neqsim/process/mechanicaldesign/designstandards/CompressorDesignStandard.java index 085e1e106..0aa320519 100644 --- a/src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/CompressorDesignStandard.java +++ b/src/main/java/neqsim/process/mechanicaldesign/designstandards/CompressorDesignStandard.java @@ -1,8 +1,8 @@ -package neqsim.processsimulation.mechanicaldesign.designstandards; +package neqsim.process.mechanicaldesign.designstandards; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.mechanicaldesign.MechanicalDesign; +import neqsim.process.mechanicaldesign.MechanicalDesign; /** *

@@ -24,7 +24,7 @@ public class CompressorDesignStandard extends DesignStandard { *

* * @param name a {@link java.lang.String} object - * @param equipmentInn a {@link neqsim.processsimulation.mechanicaldesign.MechanicalDesign} object + * @param equipmentInn a {@link neqsim.process.mechanicaldesign.MechanicalDesign} object */ public CompressorDesignStandard(String name, MechanicalDesign equipmentInn) { super(name, equipmentInn); diff --git a/src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/DesignStandard.java b/src/main/java/neqsim/process/mechanicaldesign/designstandards/DesignStandard.java similarity index 90% rename from src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/DesignStandard.java rename to src/main/java/neqsim/process/mechanicaldesign/designstandards/DesignStandard.java index 5d384fbb4..f16321577 100644 --- a/src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/DesignStandard.java +++ b/src/main/java/neqsim/process/mechanicaldesign/designstandards/DesignStandard.java @@ -1,7 +1,7 @@ -package neqsim.processsimulation.mechanicaldesign.designstandards; +package neqsim.process.mechanicaldesign.designstandards; import java.util.Objects; -import neqsim.processsimulation.mechanicaldesign.MechanicalDesign; +import neqsim.process.mechanicaldesign.MechanicalDesign; /** *

@@ -30,7 +30,7 @@ public DesignStandard() {} *

* * @param name a {@link java.lang.String} object - * @param equipmentInn a {@link neqsim.processsimulation.mechanicaldesign.MechanicalDesign} object + * @param equipmentInn a {@link neqsim.process.mechanicaldesign.MechanicalDesign} object */ public DesignStandard(String name, MechanicalDesign equipmentInn) { equipment = equipmentInn; diff --git a/src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/GasScrubberDesignStandard.java b/src/main/java/neqsim/process/mechanicaldesign/designstandards/GasScrubberDesignStandard.java similarity index 92% rename from src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/GasScrubberDesignStandard.java rename to src/main/java/neqsim/process/mechanicaldesign/designstandards/GasScrubberDesignStandard.java index 31d66c6ce..facdfb6b1 100644 --- a/src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/GasScrubberDesignStandard.java +++ b/src/main/java/neqsim/process/mechanicaldesign/designstandards/GasScrubberDesignStandard.java @@ -1,8 +1,8 @@ -package neqsim.processsimulation.mechanicaldesign.designstandards; +package neqsim.process.mechanicaldesign.designstandards; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.mechanicaldesign.MechanicalDesign; +import neqsim.process.mechanicaldesign.MechanicalDesign; /** *

@@ -28,7 +28,7 @@ public class GasScrubberDesignStandard extends DesignStandard { *

* * @param name a {@link java.lang.String} object - * @param equipmentInn a {@link neqsim.processsimulation.mechanicaldesign.MechanicalDesign} object + * @param equipmentInn a {@link neqsim.process.mechanicaldesign.MechanicalDesign} object */ public GasScrubberDesignStandard(String name, MechanicalDesign equipmentInn) { super(name, equipmentInn); diff --git a/src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/JointEfficiencyPipelineStandard.java b/src/main/java/neqsim/process/mechanicaldesign/designstandards/JointEfficiencyPipelineStandard.java similarity index 84% rename from src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/JointEfficiencyPipelineStandard.java rename to src/main/java/neqsim/process/mechanicaldesign/designstandards/JointEfficiencyPipelineStandard.java index 2e686f2d2..920c2a9ef 100644 --- a/src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/JointEfficiencyPipelineStandard.java +++ b/src/main/java/neqsim/process/mechanicaldesign/designstandards/JointEfficiencyPipelineStandard.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.mechanicaldesign.designstandards; +package neqsim.process.mechanicaldesign.designstandards; -import neqsim.processsimulation.mechanicaldesign.MechanicalDesign; +import neqsim.process.mechanicaldesign.MechanicalDesign; /** *

@@ -19,7 +19,7 @@ public class JointEfficiencyPipelineStandard extends DesignStandard { *

* * @param name a {@link java.lang.String} object - * @param equipmentInn a {@link neqsim.processsimulation.mechanicaldesign.MechanicalDesign} object + * @param equipmentInn a {@link neqsim.process.mechanicaldesign.MechanicalDesign} object */ public JointEfficiencyPipelineStandard(String name, MechanicalDesign equipmentInn) { super(name, equipmentInn); diff --git a/src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/JointEfficiencyPlateStandard.java b/src/main/java/neqsim/process/mechanicaldesign/designstandards/JointEfficiencyPlateStandard.java similarity index 84% rename from src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/JointEfficiencyPlateStandard.java rename to src/main/java/neqsim/process/mechanicaldesign/designstandards/JointEfficiencyPlateStandard.java index b124f8abe..a8bfc53cc 100644 --- a/src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/JointEfficiencyPlateStandard.java +++ b/src/main/java/neqsim/process/mechanicaldesign/designstandards/JointEfficiencyPlateStandard.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.mechanicaldesign.designstandards; +package neqsim.process.mechanicaldesign.designstandards; -import neqsim.processsimulation.mechanicaldesign.MechanicalDesign; +import neqsim.process.mechanicaldesign.MechanicalDesign; /** *

@@ -19,7 +19,7 @@ public class JointEfficiencyPlateStandard extends DesignStandard { *

* * @param name a {@link java.lang.String} object - * @param equipmentInn a {@link neqsim.processsimulation.mechanicaldesign.MechanicalDesign} object + * @param equipmentInn a {@link neqsim.process.mechanicaldesign.MechanicalDesign} object */ public JointEfficiencyPlateStandard(String name, MechanicalDesign equipmentInn) { super(name, equipmentInn); diff --git a/src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/MaterialPipeDesignStandard.java b/src/main/java/neqsim/process/mechanicaldesign/designstandards/MaterialPipeDesignStandard.java similarity index 94% rename from src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/MaterialPipeDesignStandard.java rename to src/main/java/neqsim/process/mechanicaldesign/designstandards/MaterialPipeDesignStandard.java index a29c88a37..3e5e06ae9 100644 --- a/src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/MaterialPipeDesignStandard.java +++ b/src/main/java/neqsim/process/mechanicaldesign/designstandards/MaterialPipeDesignStandard.java @@ -1,8 +1,8 @@ -package neqsim.processsimulation.mechanicaldesign.designstandards; +package neqsim.process.mechanicaldesign.designstandards; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.mechanicaldesign.MechanicalDesign; +import neqsim.process.mechanicaldesign.MechanicalDesign; /** *

@@ -29,7 +29,7 @@ public MaterialPipeDesignStandard() {} *

* * @param name a {@link java.lang.String} object - * @param equipmentInn a {@link neqsim.processsimulation.mechanicaldesign.MechanicalDesign} object + * @param equipmentInn a {@link neqsim.process.mechanicaldesign.MechanicalDesign} object */ public MaterialPipeDesignStandard(String name, MechanicalDesign equipmentInn) { super(name, equipmentInn); diff --git a/src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/MaterialPlateDesignStandard.java b/src/main/java/neqsim/process/mechanicaldesign/designstandards/MaterialPlateDesignStandard.java similarity index 93% rename from src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/MaterialPlateDesignStandard.java rename to src/main/java/neqsim/process/mechanicaldesign/designstandards/MaterialPlateDesignStandard.java index 9c4b559cc..61e85773f 100644 --- a/src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/MaterialPlateDesignStandard.java +++ b/src/main/java/neqsim/process/mechanicaldesign/designstandards/MaterialPlateDesignStandard.java @@ -1,8 +1,8 @@ -package neqsim.processsimulation.mechanicaldesign.designstandards; +package neqsim.process.mechanicaldesign.designstandards; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.mechanicaldesign.MechanicalDesign; +import neqsim.process.mechanicaldesign.MechanicalDesign; /** *

@@ -29,7 +29,7 @@ public MaterialPlateDesignStandard() {} *

* * @param name a {@link java.lang.String} object - * @param equipmentInn a {@link neqsim.processsimulation.mechanicaldesign.MechanicalDesign} object + * @param equipmentInn a {@link neqsim.process.mechanicaldesign.MechanicalDesign} object */ public MaterialPlateDesignStandard(String name, MechanicalDesign equipmentInn) { super(name, equipmentInn); diff --git a/src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/PipelineDesignStandard.java b/src/main/java/neqsim/process/mechanicaldesign/designstandards/PipelineDesignStandard.java similarity index 88% rename from src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/PipelineDesignStandard.java rename to src/main/java/neqsim/process/mechanicaldesign/designstandards/PipelineDesignStandard.java index 92e9a633b..79e4130b3 100644 --- a/src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/PipelineDesignStandard.java +++ b/src/main/java/neqsim/process/mechanicaldesign/designstandards/PipelineDesignStandard.java @@ -1,8 +1,8 @@ -package neqsim.processsimulation.mechanicaldesign.designstandards; +package neqsim.process.mechanicaldesign.designstandards; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.mechanicaldesign.MechanicalDesign; +import neqsim.process.mechanicaldesign.MechanicalDesign; /** *

@@ -24,7 +24,7 @@ public class PipelineDesignStandard extends DesignStandard { *

* * @param name a {@link java.lang.String} object - * @param equipmentInn a {@link neqsim.processsimulation.mechanicaldesign.MechanicalDesign} object + * @param equipmentInn a {@link neqsim.process.mechanicaldesign.MechanicalDesign} object */ public PipelineDesignStandard(String name, MechanicalDesign equipmentInn) { super(name, equipmentInn); diff --git a/src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/PipingDesignStandard.java b/src/main/java/neqsim/process/mechanicaldesign/designstandards/PipingDesignStandard.java similarity index 65% rename from src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/PipingDesignStandard.java rename to src/main/java/neqsim/process/mechanicaldesign/designstandards/PipingDesignStandard.java index ab1fc3a58..639ebeab9 100644 --- a/src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/PipingDesignStandard.java +++ b/src/main/java/neqsim/process/mechanicaldesign/designstandards/PipingDesignStandard.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.mechanicaldesign.designstandards; +package neqsim.process.mechanicaldesign.designstandards; -import neqsim.processsimulation.mechanicaldesign.MechanicalDesign; +import neqsim.process.mechanicaldesign.MechanicalDesign; /** *

@@ -19,7 +19,7 @@ public class PipingDesignStandard extends DesignStandard { *

* * @param name a {@link java.lang.String} object - * @param equipmentInn a {@link neqsim.processsimulation.mechanicaldesign.MechanicalDesign} object + * @param equipmentInn a {@link neqsim.process.mechanicaldesign.MechanicalDesign} object */ public PipingDesignStandard(String name, MechanicalDesign equipmentInn) { super(name, equipmentInn); diff --git a/src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/PressureVesselDesignStandard.java b/src/main/java/neqsim/process/mechanicaldesign/designstandards/PressureVesselDesignStandard.java similarity index 89% rename from src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/PressureVesselDesignStandard.java rename to src/main/java/neqsim/process/mechanicaldesign/designstandards/PressureVesselDesignStandard.java index 65f50e3b9..d61236678 100644 --- a/src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/PressureVesselDesignStandard.java +++ b/src/main/java/neqsim/process/mechanicaldesign/designstandards/PressureVesselDesignStandard.java @@ -1,7 +1,7 @@ -package neqsim.processsimulation.mechanicaldesign.designstandards; +package neqsim.process.mechanicaldesign.designstandards; -import neqsim.processsimulation.mechanicaldesign.MechanicalDesign; -import neqsim.processsimulation.processequipment.separator.Separator; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.mechanicaldesign.MechanicalDesign; /** *

@@ -20,7 +20,7 @@ public class PressureVesselDesignStandard extends DesignStandard { *

* * @param name a {@link java.lang.String} object - * @param equipmentInn a {@link neqsim.processsimulation.mechanicaldesign.MechanicalDesign} object + * @param equipmentInn a {@link neqsim.process.mechanicaldesign.MechanicalDesign} object */ public PressureVesselDesignStandard(String name, MechanicalDesign equipmentInn) { super(name, equipmentInn); diff --git a/src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/SeparatorDesignStandard.java b/src/main/java/neqsim/process/mechanicaldesign/designstandards/SeparatorDesignStandard.java similarity index 91% rename from src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/SeparatorDesignStandard.java rename to src/main/java/neqsim/process/mechanicaldesign/designstandards/SeparatorDesignStandard.java index 42f301222..b088484d0 100644 --- a/src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/SeparatorDesignStandard.java +++ b/src/main/java/neqsim/process/mechanicaldesign/designstandards/SeparatorDesignStandard.java @@ -1,9 +1,9 @@ -package neqsim.processsimulation.mechanicaldesign.designstandards; +package neqsim.process.mechanicaldesign.designstandards; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.mechanicaldesign.MechanicalDesign; -import neqsim.processsimulation.processequipment.separator.SeparatorInterface; +import neqsim.process.equipment.separator.SeparatorInterface; +import neqsim.process.mechanicaldesign.MechanicalDesign; /** *

@@ -49,7 +49,7 @@ public void setFg(double Fg) { *

* * @param name a {@link java.lang.String} object - * @param equipmentInn a {@link neqsim.processsimulation.mechanicaldesign.MechanicalDesign} object + * @param equipmentInn a {@link neqsim.process.mechanicaldesign.MechanicalDesign} object */ public SeparatorDesignStandard(String name, MechanicalDesign equipmentInn) { super(name, equipmentInn); @@ -142,7 +142,7 @@ public void setVolumetricDesignFactor(double volumetricDesignFactor) { *

* * @param name a {@link java.lang.String} object - * @param equipmentInn a {@link neqsim.processsimulation.mechanicaldesign.MechanicalDesign} object + * @param equipmentInn a {@link neqsim.process.mechanicaldesign.MechanicalDesign} object * @return a double */ public double getLiquidRetentionTime(String name, MechanicalDesign equipmentInn) { diff --git a/src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/ValveDesignStandard.java b/src/main/java/neqsim/process/mechanicaldesign/designstandards/ValveDesignStandard.java similarity index 73% rename from src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/ValveDesignStandard.java rename to src/main/java/neqsim/process/mechanicaldesign/designstandards/ValveDesignStandard.java index 68b7c8820..88c84baaa 100644 --- a/src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/ValveDesignStandard.java +++ b/src/main/java/neqsim/process/mechanicaldesign/designstandards/ValveDesignStandard.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.mechanicaldesign.designstandards; +package neqsim.process.mechanicaldesign.designstandards; -import neqsim.processsimulation.mechanicaldesign.MechanicalDesign; +import neqsim.process.mechanicaldesign.MechanicalDesign; /** *

@@ -32,7 +32,7 @@ public double getValveCvMax() { *

* * @param name a {@link java.lang.String} object - * @param equipmentInn a {@link neqsim.processsimulation.mechanicaldesign.MechanicalDesign} object + * @param equipmentInn a {@link neqsim.process.mechanicaldesign.MechanicalDesign} object */ public ValveDesignStandard(String name, MechanicalDesign equipmentInn) { super(name, equipmentInn); diff --git a/src/main/java/neqsim/processsimulation/mechanicaldesign/pipeline/PipelineMechanicalDesign.java b/src/main/java/neqsim/process/mechanicaldesign/pipeline/PipelineMechanicalDesign.java similarity index 85% rename from src/main/java/neqsim/processsimulation/mechanicaldesign/pipeline/PipelineMechanicalDesign.java rename to src/main/java/neqsim/process/mechanicaldesign/pipeline/PipelineMechanicalDesign.java index b6272e7c8..fca0221bd 100644 --- a/src/main/java/neqsim/processsimulation/mechanicaldesign/pipeline/PipelineMechanicalDesign.java +++ b/src/main/java/neqsim/process/mechanicaldesign/pipeline/PipelineMechanicalDesign.java @@ -1,11 +1,11 @@ -package neqsim.processsimulation.mechanicaldesign.pipeline; +package neqsim.process.mechanicaldesign.pipeline; -import neqsim.processsimulation.mechanicaldesign.MechanicalDesign; -import neqsim.processsimulation.mechanicaldesign.designstandards.MaterialPipeDesignStandard; -import neqsim.processsimulation.mechanicaldesign.designstandards.PipelineDesignStandard; -import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; -import neqsim.processsimulation.processequipment.pipeline.AdiabaticPipe; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.ProcessEquipmentInterface; +import neqsim.process.equipment.pipeline.AdiabaticPipe; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.mechanicaldesign.MechanicalDesign; +import neqsim.process.mechanicaldesign.designstandards.MaterialPipeDesignStandard; +import neqsim.process.mechanicaldesign.designstandards.PipelineDesignStandard; /** *

@@ -26,7 +26,7 @@ public class PipelineMechanicalDesign extends MechanicalDesign { * Constructor for PipelineMechanicalDesign. *

* - * @param equipment a {@link neqsim.processsimulation.processequipment.ProcessEquipmentInterface} + * @param equipment a {@link neqsim.process.equipment.ProcessEquipmentInterface} * object */ public PipelineMechanicalDesign(ProcessEquipmentInterface equipment) { @@ -117,8 +117,8 @@ public static void main(String args[]) { pipe.getMechanicalDesign().setMinOperationPressure(50.0); pipe.getMechanicalDesign().setMaxDesignGassVolumeFlow(100.0); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(pipe); diff --git a/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/GasScrubberMechanicalDesign.java b/src/main/java/neqsim/process/mechanicaldesign/separator/GasScrubberMechanicalDesign.java similarity index 88% rename from src/main/java/neqsim/processsimulation/mechanicaldesign/separator/GasScrubberMechanicalDesign.java rename to src/main/java/neqsim/process/mechanicaldesign/separator/GasScrubberMechanicalDesign.java index 55fbd0175..53ad7137a 100644 --- a/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/GasScrubberMechanicalDesign.java +++ b/src/main/java/neqsim/process/mechanicaldesign/separator/GasScrubberMechanicalDesign.java @@ -1,11 +1,11 @@ -package neqsim.processsimulation.mechanicaldesign.separator; +package neqsim.process.mechanicaldesign.separator; -import neqsim.processsimulation.mechanicaldesign.designstandards.GasScrubberDesignStandard; -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.process.equipment.ProcessEquipmentInterface; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.separator.SeparatorInterface; +import neqsim.process.equipment.separator.sectiontype.SeparatorSection; +import neqsim.process.mechanicaldesign.designstandards.GasScrubberDesignStandard; +import neqsim.process.mechanicaldesign.separator.sectiontype.SepDesignSection; /** *

@@ -23,7 +23,7 @@ public class GasScrubberMechanicalDesign extends SeparatorMechanicalDesign { * Constructor for GasScrubberMechanicalDesign. *

* - * @param equipment a {@link neqsim.processsimulation.processequipment.ProcessEquipmentInterface} + * @param equipment a {@link neqsim.process.equipment.ProcessEquipmentInterface} * object */ public GasScrubberMechanicalDesign(ProcessEquipmentInterface equipment) { diff --git a/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/SeparatorMechanicalDesign.java b/src/main/java/neqsim/process/mechanicaldesign/separator/SeparatorMechanicalDesign.java similarity index 91% rename from src/main/java/neqsim/processsimulation/mechanicaldesign/separator/SeparatorMechanicalDesign.java rename to src/main/java/neqsim/process/mechanicaldesign/separator/SeparatorMechanicalDesign.java index 170b49e59..e7253235e 100644 --- a/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/SeparatorMechanicalDesign.java +++ b/src/main/java/neqsim/process/mechanicaldesign/separator/SeparatorMechanicalDesign.java @@ -1,19 +1,19 @@ -package neqsim.processsimulation.mechanicaldesign.separator; +package neqsim.process.mechanicaldesign.separator; import java.awt.BorderLayout; import java.awt.Container; import javax.swing.JFrame; import javax.swing.JScrollPane; import javax.swing.JTable; -import neqsim.processsimulation.costestimation.separator.SeparatorCostEstimate; -import neqsim.processsimulation.mechanicaldesign.MechanicalDesign; -import neqsim.processsimulation.mechanicaldesign.designstandards.MaterialPlateDesignStandard; -import neqsim.processsimulation.mechanicaldesign.designstandards.PressureVesselDesignStandard; -import neqsim.processsimulation.mechanicaldesign.designstandards.SeparatorDesignStandard; -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.process.costestimation.separator.SeparatorCostEstimate; +import neqsim.process.equipment.ProcessEquipmentInterface; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.separator.SeparatorInterface; +import neqsim.process.equipment.separator.sectiontype.SeparatorSection; +import neqsim.process.mechanicaldesign.MechanicalDesign; +import neqsim.process.mechanicaldesign.designstandards.MaterialPlateDesignStandard; +import neqsim.process.mechanicaldesign.designstandards.PressureVesselDesignStandard; +import neqsim.process.mechanicaldesign.designstandards.SeparatorDesignStandard; /** *

@@ -35,7 +35,7 @@ public class SeparatorMechanicalDesign extends MechanicalDesign { * Constructor for SeparatorMechanicalDesign. *

* - * @param equipment a {@link neqsim.processsimulation.processequipment.ProcessEquipmentInterface} + * @param equipment a {@link neqsim.process.equipment.ProcessEquipmentInterface} * object */ public SeparatorMechanicalDesign(ProcessEquipmentInterface equipment) { diff --git a/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectiontype/DistillationTraySection.java b/src/main/java/neqsim/process/mechanicaldesign/separator/sectiontype/DistillationTraySection.java similarity index 87% rename from src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectiontype/DistillationTraySection.java rename to src/main/java/neqsim/process/mechanicaldesign/separator/sectiontype/DistillationTraySection.java index 65fd2595a..3c20553ea 100644 --- a/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectiontype/DistillationTraySection.java +++ b/src/main/java/neqsim/process/mechanicaldesign/separator/sectiontype/DistillationTraySection.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.mechanicaldesign.separator.sectiontype; +package neqsim.process.mechanicaldesign.separator.sectiontype; -import neqsim.processsimulation.processequipment.separator.sectiontype.SeparatorSection; +import neqsim.process.equipment.separator.sectiontype.SeparatorSection; /** *

@@ -17,7 +17,7 @@ public class DistillationTraySection extends SepDesignSection { *

* * @param separatorSection a - * {@link neqsim.processsimulation.processequipment.separator.sectiontype.SeparatorSection} + * {@link neqsim.process.equipment.separator.sectiontype.SeparatorSection} * object */ public DistillationTraySection(SeparatorSection separatorSection) { diff --git a/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectiontype/MecMeshSection.java b/src/main/java/neqsim/process/mechanicaldesign/separator/sectiontype/MecMeshSection.java similarity index 86% rename from src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectiontype/MecMeshSection.java rename to src/main/java/neqsim/process/mechanicaldesign/separator/sectiontype/MecMeshSection.java index c347a55f9..c68fd8e14 100644 --- a/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectiontype/MecMeshSection.java +++ b/src/main/java/neqsim/process/mechanicaldesign/separator/sectiontype/MecMeshSection.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.mechanicaldesign.separator.sectiontype; +package neqsim.process.mechanicaldesign.separator.sectiontype; -import neqsim.processsimulation.processequipment.separator.sectiontype.SeparatorSection; +import neqsim.process.equipment.separator.sectiontype.SeparatorSection; /** *

@@ -17,7 +17,7 @@ public class MecMeshSection extends SepDesignSection { *

* * @param separatorSection a - * {@link neqsim.processsimulation.processequipment.separator.sectiontype.SeparatorSection} + * {@link neqsim.process.equipment.separator.sectiontype.SeparatorSection} * object */ public MecMeshSection(SeparatorSection separatorSection) { diff --git a/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectiontype/MechManwaySection.java b/src/main/java/neqsim/process/mechanicaldesign/separator/sectiontype/MechManwaySection.java similarity index 78% rename from src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectiontype/MechManwaySection.java rename to src/main/java/neqsim/process/mechanicaldesign/separator/sectiontype/MechManwaySection.java index b37945dee..e1b6c320d 100644 --- a/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectiontype/MechManwaySection.java +++ b/src/main/java/neqsim/process/mechanicaldesign/separator/sectiontype/MechManwaySection.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.mechanicaldesign.separator.sectiontype; +package neqsim.process.mechanicaldesign.separator.sectiontype; -import neqsim.processsimulation.processequipment.separator.sectiontype.SeparatorSection; +import neqsim.process.equipment.separator.sectiontype.SeparatorSection; /** *

@@ -17,7 +17,7 @@ public class MechManwaySection extends SepDesignSection { *

* * @param separatorSection a - * {@link neqsim.processsimulation.processequipment.separator.sectiontype.SeparatorSection} + * {@link neqsim.process.equipment.separator.sectiontype.SeparatorSection} * object */ public MechManwaySection(SeparatorSection separatorSection) { diff --git a/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectiontype/MechNozzleSection.java b/src/main/java/neqsim/process/mechanicaldesign/separator/sectiontype/MechNozzleSection.java similarity index 84% rename from src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectiontype/MechNozzleSection.java rename to src/main/java/neqsim/process/mechanicaldesign/separator/sectiontype/MechNozzleSection.java index 914ddbb8d..eecfe49dc 100644 --- a/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectiontype/MechNozzleSection.java +++ b/src/main/java/neqsim/process/mechanicaldesign/separator/sectiontype/MechNozzleSection.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.mechanicaldesign.separator.sectiontype; +package neqsim.process.mechanicaldesign.separator.sectiontype; -import neqsim.processsimulation.processequipment.separator.sectiontype.SeparatorSection; +import neqsim.process.equipment.separator.sectiontype.SeparatorSection; /** *

@@ -17,7 +17,7 @@ public class MechNozzleSection extends SepDesignSection { *

* * @param separatorSection a - * {@link neqsim.processsimulation.processequipment.separator.sectiontype.SeparatorSection} + * {@link neqsim.process.equipment.separator.sectiontype.SeparatorSection} * object */ public MechNozzleSection(SeparatorSection separatorSection) { diff --git a/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectiontype/MechVaneSection.java b/src/main/java/neqsim/process/mechanicaldesign/separator/sectiontype/MechVaneSection.java similarity index 86% rename from src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectiontype/MechVaneSection.java rename to src/main/java/neqsim/process/mechanicaldesign/separator/sectiontype/MechVaneSection.java index 25e1b6bc0..df0c2f9e6 100644 --- a/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectiontype/MechVaneSection.java +++ b/src/main/java/neqsim/process/mechanicaldesign/separator/sectiontype/MechVaneSection.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.mechanicaldesign.separator.sectiontype; +package neqsim.process.mechanicaldesign.separator.sectiontype; -import neqsim.processsimulation.processequipment.separator.sectiontype.SeparatorSection; +import neqsim.process.equipment.separator.sectiontype.SeparatorSection; /** *

@@ -17,7 +17,7 @@ public class MechVaneSection extends SepDesignSection { *

* * @param separatorSection a - * {@link neqsim.processsimulation.processequipment.separator.sectiontype.SeparatorSection} + * {@link neqsim.process.equipment.separator.sectiontype.SeparatorSection} * object */ public MechVaneSection(SeparatorSection separatorSection) { diff --git a/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectiontype/SepDesignSection.java b/src/main/java/neqsim/process/mechanicaldesign/separator/sectiontype/SepDesignSection.java similarity index 88% rename from src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectiontype/SepDesignSection.java rename to src/main/java/neqsim/process/mechanicaldesign/separator/sectiontype/SepDesignSection.java index 5a230dbfd..15d04356d 100644 --- a/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectiontype/SepDesignSection.java +++ b/src/main/java/neqsim/process/mechanicaldesign/separator/sectiontype/SepDesignSection.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.mechanicaldesign.separator.sectiontype; +package neqsim.process.mechanicaldesign.separator.sectiontype; -import neqsim.processsimulation.processequipment.separator.sectiontype.SeparatorSection; +import neqsim.process.equipment.separator.sectiontype.SeparatorSection; /** *

@@ -23,7 +23,7 @@ public class SepDesignSection { *

* * @param separatorSection a - * {@link neqsim.processsimulation.processequipment.separator.sectiontype.SeparatorSection} + * {@link neqsim.process.equipment.separator.sectiontype.SeparatorSection} * object */ public SepDesignSection(SeparatorSection separatorSection) { diff --git a/src/main/java/neqsim/processsimulation/mechanicaldesign/valve/ValveMechanicalDesign.java b/src/main/java/neqsim/process/mechanicaldesign/valve/ValveMechanicalDesign.java similarity index 84% rename from src/main/java/neqsim/processsimulation/mechanicaldesign/valve/ValveMechanicalDesign.java rename to src/main/java/neqsim/process/mechanicaldesign/valve/ValveMechanicalDesign.java index 98fc11cb9..279ae62fb 100644 --- a/src/main/java/neqsim/processsimulation/mechanicaldesign/valve/ValveMechanicalDesign.java +++ b/src/main/java/neqsim/process/mechanicaldesign/valve/ValveMechanicalDesign.java @@ -1,15 +1,15 @@ -package neqsim.processsimulation.mechanicaldesign.valve; +package neqsim.process.mechanicaldesign.valve; import java.awt.BorderLayout; import java.awt.Container; import javax.swing.JFrame; import javax.swing.JScrollPane; import javax.swing.JTable; -import neqsim.processsimulation.costestimation.valve.ValveCostEstimate; -import neqsim.processsimulation.mechanicaldesign.MechanicalDesign; -import neqsim.processsimulation.mechanicaldesign.designstandards.ValveDesignStandard; -import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; +import neqsim.process.costestimation.valve.ValveCostEstimate; +import neqsim.process.equipment.ProcessEquipmentInterface; +import neqsim.process.equipment.valve.ThrottlingValve; +import neqsim.process.mechanicaldesign.MechanicalDesign; +import neqsim.process.mechanicaldesign.designstandards.ValveDesignStandard; /** *

@@ -33,7 +33,7 @@ public class ValveMechanicalDesign extends MechanicalDesign { * Constructor for ValveMechanicalDesign. *

* - * @param equipment a {@link neqsim.processsimulation.processequipment.ProcessEquipmentInterface} + * @param equipment a {@link neqsim.process.equipment.ProcessEquipmentInterface} * object */ public ValveMechanicalDesign(ProcessEquipmentInterface equipment) { diff --git a/src/main/java/neqsim/processsimulation/processsystem/ModuleInterface.java b/src/main/java/neqsim/process/processmodel/ModuleInterface.java similarity index 77% rename from src/main/java/neqsim/processsimulation/processsystem/ModuleInterface.java rename to src/main/java/neqsim/process/processmodel/ModuleInterface.java index 442282c1c..1af537750 100644 --- a/src/main/java/neqsim/processsimulation/processsystem/ModuleInterface.java +++ b/src/main/java/neqsim/process/processmodel/ModuleInterface.java @@ -4,10 +4,10 @@ * Created on 1. november 2006, 21:48 */ -package neqsim.processsimulation.processsystem; +package neqsim.process.processmodel; -import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.ProcessEquipmentInterface; +import neqsim.process.equipment.stream.StreamInterface; /** *

@@ -23,9 +23,9 @@ public interface ModuleInterface extends ProcessEquipmentInterface { * getOperations. *

* - * @return a {@link neqsim.processsimulation.processsystem.ProcessSystem} object + * @return a {@link neqsim.process.processmodel.ProcessSystem} object */ - public neqsim.processsimulation.processsystem.ProcessSystem getOperations(); + public neqsim.process.processmodel.ProcessSystem getOperations(); /** *

@@ -33,7 +33,7 @@ public interface ModuleInterface extends ProcessEquipmentInterface { *

* * @param streamName a {@link java.lang.String} object - * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @param stream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public void addInputStream(String streamName, StreamInterface stream); @@ -43,7 +43,7 @@ public interface ModuleInterface extends ProcessEquipmentInterface { *

* * @param streamName a {@link java.lang.String} object - * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object + * @return a {@link neqsim.process.equipment.stream.StreamInterface} object */ public StreamInterface getOutputStream(String streamName); diff --git a/src/main/java/neqsim/processsimulation/processsystem/ProcessModule.java b/src/main/java/neqsim/process/processmodel/ProcessModule.java similarity index 94% rename from src/main/java/neqsim/processsimulation/processsystem/ProcessModule.java rename to src/main/java/neqsim/process/processmodel/ProcessModule.java index 29c571edc..73bb0876e 100644 --- a/src/main/java/neqsim/processsimulation/processsystem/ProcessModule.java +++ b/src/main/java/neqsim/process/processmodel/ProcessModule.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processsystem; +package neqsim.process.processmodel; import java.util.ArrayList; import java.util.List; @@ -6,10 +6,10 @@ import org.apache.commons.lang.SerializationUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.SimulationBaseClass; -import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; -import neqsim.processsimulation.processequipment.util.Recycle; -import neqsim.processsimulation.util.report.Report; +import neqsim.process.SimulationBaseClass; +import neqsim.process.equipment.ProcessEquipmentInterface; +import neqsim.process.equipment.util.Recycle; +import neqsim.process.util.report.Report; /** * A class representing a process module class that can contain unit operations and other modules. @@ -230,7 +230,7 @@ public Object getMeasurementDevice(String name) { * Create deep copy. *

* - * @return a {@link neqsim.processsimulation.processsystem.ProcessModule} object + * @return a {@link neqsim.process.processmodel.ProcessModule} object */ public ProcessModule copy() { byte[] bytes = SerializationUtils.serialize(this); diff --git a/src/main/java/neqsim/processsimulation/processsystem/ProcessModuleBaseClass.java b/src/main/java/neqsim/process/processmodel/ProcessModuleBaseClass.java similarity index 88% rename from src/main/java/neqsim/processsimulation/processsystem/ProcessModuleBaseClass.java rename to src/main/java/neqsim/process/processmodel/ProcessModuleBaseClass.java index 10f4665d9..af38992db 100644 --- a/src/main/java/neqsim/processsimulation/processsystem/ProcessModuleBaseClass.java +++ b/src/main/java/neqsim/process/processmodel/ProcessModuleBaseClass.java @@ -4,14 +4,14 @@ * Created on 1. november 2006, 22:07 */ -package neqsim.processsimulation.processsystem; +package neqsim.process.processmodel; import java.util.UUID; -import neqsim.processsimulation.SimulationBaseClass; -import neqsim.processsimulation.controllerdevice.ControllerDeviceInterface; -import neqsim.processsimulation.mechanicaldesign.MechanicalDesign; -import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; -import neqsim.processsimulation.util.report.Report; +import neqsim.process.SimulationBaseClass; +import neqsim.process.controllerdevice.ControllerDeviceInterface; +import neqsim.process.equipment.ProcessEquipmentInterface; +import neqsim.process.mechanicaldesign.MechanicalDesign; +import neqsim.process.util.report.Report; import neqsim.thermo.system.SystemInterface; /** @@ -31,8 +31,8 @@ public abstract class ProcessModuleBaseClass extends SimulationBaseClass protected boolean isInitializedStreams = false; private boolean isCalcDesign = false; - private neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + private neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); /** *

@@ -117,7 +117,7 @@ public void setIsCalcDesign(boolean isCalcDesign) { /** {@inheritDoc} */ @Override - public neqsim.processsimulation.processsystem.ProcessSystem getOperations() { + public neqsim.process.processmodel.ProcessSystem getOperations() { return operations; } diff --git a/src/main/java/neqsim/processsimulation/processsystem/ProcessSystem.java b/src/main/java/neqsim/process/processmodel/ProcessSystem.java similarity index 93% rename from src/main/java/neqsim/processsimulation/processsystem/ProcessSystem.java rename to src/main/java/neqsim/process/processmodel/ProcessSystem.java index e047c52be..ada973b75 100644 --- a/src/main/java/neqsim/processsimulation/processsystem/ProcessSystem.java +++ b/src/main/java/neqsim/process/processmodel/ProcessSystem.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processsystem; +package neqsim.process.processmodel; import java.io.FileInputStream; import java.io.FileOutputStream; @@ -11,14 +11,14 @@ import org.apache.commons.lang.SerializationUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.SimulationBaseClass; -import neqsim.processsimulation.conditionmonitor.ConditionMonitor; -import neqsim.processsimulation.measurementdevice.MeasurementDeviceInterface; -import neqsim.processsimulation.processequipment.ProcessEquipmentBaseClass; -import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; -import neqsim.processsimulation.processequipment.util.Recycle; -import neqsim.processsimulation.processequipment.util.RecycleController; -import neqsim.processsimulation.util.report.Report; +import neqsim.process.SimulationBaseClass; +import neqsim.process.conditionmonitor.ConditionMonitor; +import neqsim.process.equipment.ProcessEquipmentBaseClass; +import neqsim.process.equipment.ProcessEquipmentInterface; +import neqsim.process.equipment.util.Recycle; +import neqsim.process.equipment.util.RecycleController; +import neqsim.process.measurementdevice.MeasurementDeviceInterface; +import neqsim.process.util.report.Report; import neqsim.thermo.system.SystemInterface; /** @@ -67,7 +67,7 @@ public ProcessSystem(String name) { * Add to end. *

* - * @param operation a {@link neqsim.processsimulation.processequipment.ProcessEquipmentInterface} + * @param operation a {@link neqsim.process.equipment.ProcessEquipmentInterface} * object */ public void add(ProcessEquipmentInterface operation) { @@ -81,7 +81,7 @@ public void add(ProcessEquipmentInterface operation) { *

* * @param position 0-based position - * @param operation a {@link neqsim.processsimulation.processequipment.ProcessEquipmentInterface} + * @param operation a {@link neqsim.process.equipment.ProcessEquipmentInterface} * object */ public void add(int position, ProcessEquipmentInterface operation) { @@ -114,7 +114,7 @@ public void add(int position, ProcessEquipmentInterface operation) { *

* * @param measurementDevice a - * {@link neqsim.processsimulation.measurementdevice.MeasurementDeviceInterface} object + * {@link neqsim.process.measurementdevice.MeasurementDeviceInterface} object */ public void add(MeasurementDeviceInterface measurementDevice) { measurementDevices.add(measurementDevice); @@ -126,7 +126,7 @@ public void add(MeasurementDeviceInterface measurementDevice) { *

* * @param operations an array of - * {@link neqsim.processsimulation.processequipment.ProcessEquipmentInterface} objects + * {@link neqsim.process.equipment.ProcessEquipmentInterface} objects */ public void add(ProcessEquipmentInterface[] operations) { getUnitOperations().addAll(Arrays.asList(operations)); @@ -180,7 +180,7 @@ public boolean hasUnitName(String name) { *

* * @param name Name of measurement device - * @return a {@link neqsim.processsimulation.measurementdevice.MeasurementDeviceInterface} object + * @return a {@link neqsim.process.measurementdevice.MeasurementDeviceInterface} object */ public MeasurementDeviceInterface getMeasurementDevice(String name) { for (int i = 0; i < measurementDevices.size(); i++) { @@ -222,7 +222,7 @@ public int getUnitNumber(String name) { *

* * @param unitName a {@link java.lang.String} object - * @param operation a {@link neqsim.processsimulation.processequipment.ProcessEquipmentBaseClass} + * @param operation a {@link neqsim.process.equipment.ProcessEquipmentBaseClass} * object */ public void replaceObject(String unitName, ProcessEquipmentBaseClass operation) { @@ -440,7 +440,7 @@ public void run(UUID id) { for (int i = 0; i < unitOperations.size(); i++) { if (unitOperations.get(i).getClass().getSimpleName().equals("Adjuster")) { - if (!((neqsim.processsimulation.processequipment.util.Adjuster) unitOperations.get(i)) + if (!((neqsim.process.equipment.util.Adjuster) unitOperations.get(i)) .solved()) { isConverged = false; break; @@ -655,7 +655,7 @@ public void save(String filePath) { *

* * @param filePath a {@link java.lang.String} object - * @return a {@link neqsim.processsimulation.processsystem.ProcessSystem} object + * @return a {@link neqsim.process.processmodel.ProcessSystem} object */ public static ProcessSystem open(String filePath) { try (ObjectInputStream objectinputstream = @@ -784,10 +784,10 @@ public double getPower(String unit) { double power = 0.0; for (int i = 0; i < unitOperations.size(); i++) { if (unitOperations.get(i).getClass().getSimpleName().equals("Compressor")) { - power += ((neqsim.processsimulation.processequipment.compressor.Compressor) unitOperations + power += ((neqsim.process.equipment.compressor.Compressor) unitOperations .get(i)).getPower(); } else if (unitOperations.get(i).getClass().getSimpleName().equals("Pump")) { - power += ((neqsim.processsimulation.processequipment.pump.Pump) unitOperations.get(i)) + power += ((neqsim.process.equipment.pump.Pump) unitOperations.get(i)) .getPower(); } } @@ -813,7 +813,7 @@ public double getCoolerDuty(String unit) { for (int i = 0; i < unitOperations.size(); i++) { if (unitOperations.get(i).getClass().getSimpleName().equals("Cooler")) { heat += - ((neqsim.processsimulation.processequipment.heatexchanger.Cooler) unitOperations.get(i)) + ((neqsim.process.equipment.heatexchanger.Cooler) unitOperations.get(i)) .getDuty(); } } @@ -839,7 +839,7 @@ public double getHeaterDuty(String unit) { for (int i = 0; i < unitOperations.size(); i++) { if (unitOperations.get(i).getClass().getSimpleName().equals("Heater")) { heat += - ((neqsim.processsimulation.processequipment.heatexchanger.Heater) unitOperations.get(i)) + ((neqsim.process.equipment.heatexchanger.Heater) unitOperations.get(i)) .getDuty(); } } @@ -879,7 +879,7 @@ public void setSurroundingTemperature(double surroundingTemperature) { * Create deep copy. *

* - * @return a {@link neqsim.processsimulation.processsystem.ProcessSystem} object + * @return a {@link neqsim.process.processmodel.ProcessSystem} object */ public ProcessSystem copy() { byte[] bytes = SerializationUtils.serialize(this); @@ -892,7 +892,7 @@ public ProcessSystem copy() { * getConditionMonitor. *

* - * @return a {@link neqsim.processsimulation.conditionmonitor.ConditionMonitor} object + * @return a {@link neqsim.process.conditionmonitor.ConditionMonitor} object */ public ConditionMonitor getConditionMonitor() { return new ConditionMonitor(this); diff --git a/src/main/java/neqsim/processsimulation/processsystem/processmodules/AdsorptionDehydrationlModule.java b/src/main/java/neqsim/process/processmodel/processmodules/AdsorptionDehydrationlModule.java similarity index 90% rename from src/main/java/neqsim/processsimulation/processsystem/processmodules/AdsorptionDehydrationlModule.java rename to src/main/java/neqsim/process/processmodel/processmodules/AdsorptionDehydrationlModule.java index d07cb1934..98030a05e 100644 --- a/src/main/java/neqsim/processsimulation/processsystem/processmodules/AdsorptionDehydrationlModule.java +++ b/src/main/java/neqsim/process/processmodel/processmodules/AdsorptionDehydrationlModule.java @@ -1,14 +1,14 @@ -package neqsim.processsimulation.processsystem.processmodules; +package neqsim.process.processmodel.processmodules; import java.util.UUID; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; -import neqsim.processsimulation.processequipment.adsorber.SimpleAdsorber; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; -import neqsim.processsimulation.processsystem.ProcessModuleBaseClass; +import neqsim.process.equipment.ProcessEquipmentInterface; +import neqsim.process.equipment.adsorber.SimpleAdsorber; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.processmodel.ProcessModuleBaseClass; import neqsim.thermo.ThermodynamicConstantsInterface; /** @@ -213,8 +213,8 @@ public static void main(String[] args) { Stream inletStream = new Stream("inletStream", testSystem); Separator separator = new Separator("Separator 1", inletStream); - neqsim.processsimulation.processsystem.processmodules.AdsorptionDehydrationlModule adsorptionPlant = - new neqsim.processsimulation.processsystem.processmodules.AdsorptionDehydrationlModule( + neqsim.process.processmodel.processmodules.AdsorptionDehydrationlModule adsorptionPlant = + new neqsim.process.processmodel.processmodules.AdsorptionDehydrationlModule( "absPlant"); adsorptionPlant.addInputStream("gasStreamToAdsorber", separator.getGasOutStream()); adsorptionPlant.setSpecification("water dew point temperature", 273.15 - 100.0); @@ -226,8 +226,8 @@ public static void main(String[] args) { adsorptionPlant.setSpecification("maxDesignPressure", 100.0); adsorptionPlant.setSpecification("maxDesignTemperature", 100.0); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(inletStream); operations.add(separator); operations.add(adsorptionPlant); diff --git a/src/main/java/neqsim/processsimulation/processsystem/processmodules/CO2RemovalModule.java b/src/main/java/neqsim/process/processmodel/processmodules/CO2RemovalModule.java similarity index 90% rename from src/main/java/neqsim/processsimulation/processsystem/processmodules/CO2RemovalModule.java rename to src/main/java/neqsim/process/processmodel/processmodules/CO2RemovalModule.java index fb3d38883..9e6736334 100644 --- a/src/main/java/neqsim/processsimulation/processsystem/processmodules/CO2RemovalModule.java +++ b/src/main/java/neqsim/process/processmodel/processmodules/CO2RemovalModule.java @@ -1,11 +1,11 @@ -package neqsim.processsimulation.processsystem.processmodules; +package neqsim.process.processmodel.processmodules; import java.util.UUID; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.stream.StreamInterface; -import neqsim.processsimulation.processsystem.ProcessModuleBaseClass; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.processmodel.ProcessModuleBaseClass; /** *

diff --git a/src/main/java/neqsim/processsimulation/processsystem/processmodules/DPCUModule.java b/src/main/java/neqsim/process/processmodel/processmodules/DPCUModule.java similarity index 89% rename from src/main/java/neqsim/processsimulation/processsystem/processmodules/DPCUModule.java rename to src/main/java/neqsim/process/processmodel/processmodules/DPCUModule.java index a22449967..5e3aeb427 100644 --- a/src/main/java/neqsim/processsimulation/processsystem/processmodules/DPCUModule.java +++ b/src/main/java/neqsim/process/processmodel/processmodules/DPCUModule.java @@ -1,24 +1,24 @@ -package neqsim.processsimulation.processsystem.processmodules; +package neqsim.process.processmodel.processmodules; import java.util.UUID; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.processequipment.compressor.Compressor; -import neqsim.processsimulation.processequipment.distillation.Condenser; -import neqsim.processsimulation.processequipment.distillation.DistillationColumn; -import neqsim.processsimulation.processequipment.distillation.Reboiler; -import neqsim.processsimulation.processequipment.expander.Expander; -import neqsim.processsimulation.processequipment.heatexchanger.Cooler; -import neqsim.processsimulation.processequipment.heatexchanger.HeatExchanger; -import neqsim.processsimulation.processequipment.mixer.Mixer; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.splitter.Splitter; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; -import neqsim.processsimulation.processequipment.util.Recycle; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; -import neqsim.processsimulation.processequipment.valve.ValveInterface; -import neqsim.processsimulation.processsystem.ProcessModuleBaseClass; +import neqsim.process.equipment.compressor.Compressor; +import neqsim.process.equipment.distillation.Condenser; +import neqsim.process.equipment.distillation.DistillationColumn; +import neqsim.process.equipment.distillation.Reboiler; +import neqsim.process.equipment.expander.Expander; +import neqsim.process.equipment.heatexchanger.Cooler; +import neqsim.process.equipment.heatexchanger.HeatExchanger; +import neqsim.process.equipment.mixer.Mixer; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.splitter.Splitter; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.equipment.util.Recycle; +import neqsim.process.equipment.valve.ThrottlingValve; +import neqsim.process.equipment.valve.ValveInterface; +import neqsim.process.processmodel.ProcessModuleBaseClass; /** *

@@ -313,8 +313,8 @@ public static void main(String[] args) { dpcuModule.addInputStream("feed stream", feedStream); dpcuModule.setSpecification("pressure after reduction valve", 108.0); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(feedStream); operations.add(dpcuModule); operations.run(); diff --git a/src/main/java/neqsim/processsimulation/processsystem/processmodules/GlycolDehydrationlModule.java b/src/main/java/neqsim/process/processmodel/processmodules/GlycolDehydrationlModule.java similarity index 94% rename from src/main/java/neqsim/processsimulation/processsystem/processmodules/GlycolDehydrationlModule.java rename to src/main/java/neqsim/process/processmodel/processmodules/GlycolDehydrationlModule.java index ba729a0a7..d41f00053 100644 --- a/src/main/java/neqsim/processsimulation/processsystem/processmodules/GlycolDehydrationlModule.java +++ b/src/main/java/neqsim/process/processmodel/processmodules/GlycolDehydrationlModule.java @@ -1,19 +1,19 @@ -package neqsim.processsimulation.processsystem.processmodules; +package neqsim.process.processmodel.processmodules; import java.util.UUID; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.processequipment.ProcessEquipmentBaseClass; -import neqsim.processsimulation.processequipment.absorber.SimpleTEGAbsorber; -import neqsim.processsimulation.processequipment.heatexchanger.Cooler; -import neqsim.processsimulation.processequipment.heatexchanger.Heater; -import neqsim.processsimulation.processequipment.pump.Pump; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; -import neqsim.processsimulation.processequipment.util.StreamSaturatorUtil; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; -import neqsim.processsimulation.processsystem.ProcessModuleBaseClass; +import neqsim.process.equipment.ProcessEquipmentBaseClass; +import neqsim.process.equipment.absorber.SimpleTEGAbsorber; +import neqsim.process.equipment.heatexchanger.Cooler; +import neqsim.process.equipment.heatexchanger.Heater; +import neqsim.process.equipment.pump.Pump; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.equipment.util.StreamSaturatorUtil; +import neqsim.process.equipment.valve.ThrottlingValve; +import neqsim.process.processmodel.ProcessModuleBaseClass; /** *

@@ -471,8 +471,8 @@ public static void main(String[] args) { Separator separator = new Separator("Separator 1", saturator.getOutletStream()); - neqsim.processsimulation.processsystem.processmodules.GlycolDehydrationlModule TEGplant = - new neqsim.processsimulation.processsystem.processmodules.GlycolDehydrationlModule( + neqsim.process.processmodel.processmodules.GlycolDehydrationlModule TEGplant = + new neqsim.process.processmodel.processmodules.GlycolDehydrationlModule( "TEGplant"); TEGplant.addInputStream("gasStreamToAbsorber", saturator.getOutletStream()); TEGplant.addInputStream("strippingGas", strippingGasStream); @@ -486,8 +486,8 @@ public static void main(String[] args) { TEGplant.setSpecification("regenerationPressure", 1.21325); TEGplant.setSpecification("reboilerTemperature", 273.15 + 205.0); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(gasinletStream); operations.add(saturator); // operations.add(separator); diff --git a/src/main/java/neqsim/processsimulation/processsystem/processmodules/MEGReclaimerModule.java b/src/main/java/neqsim/process/processmodel/processmodules/MEGReclaimerModule.java similarity index 89% rename from src/main/java/neqsim/processsimulation/processsystem/processmodules/MEGReclaimerModule.java rename to src/main/java/neqsim/process/processmodel/processmodules/MEGReclaimerModule.java index e28c01267..f428f5189 100644 --- a/src/main/java/neqsim/processsimulation/processsystem/processmodules/MEGReclaimerModule.java +++ b/src/main/java/neqsim/process/processmodel/processmodules/MEGReclaimerModule.java @@ -1,16 +1,16 @@ -package neqsim.processsimulation.processsystem.processmodules; +package neqsim.process.processmodel.processmodules; import java.util.UUID; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.processequipment.heatexchanger.Heater; -import neqsim.processsimulation.processequipment.mixer.Mixer; -import neqsim.processsimulation.processequipment.pump.Pump; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; -import neqsim.processsimulation.processsystem.ProcessModuleBaseClass; +import neqsim.process.equipment.heatexchanger.Heater; +import neqsim.process.equipment.mixer.Mixer; +import neqsim.process.equipment.pump.Pump; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.equipment.valve.ThrottlingValve; +import neqsim.process.processmodel.ProcessModuleBaseClass; /** *

diff --git a/src/main/java/neqsim/processsimulation/processsystem/processmodules/MixerGasProcessingModule.java b/src/main/java/neqsim/process/processmodel/processmodules/MixerGasProcessingModule.java similarity index 91% rename from src/main/java/neqsim/processsimulation/processsystem/processmodules/MixerGasProcessingModule.java rename to src/main/java/neqsim/process/processmodel/processmodules/MixerGasProcessingModule.java index 6e04b8a60..91c42bbf0 100644 --- a/src/main/java/neqsim/processsimulation/processsystem/processmodules/MixerGasProcessingModule.java +++ b/src/main/java/neqsim/process/processmodel/processmodules/MixerGasProcessingModule.java @@ -1,16 +1,16 @@ -package neqsim.processsimulation.processsystem.processmodules; +package neqsim.process.processmodel.processmodules; import java.util.UUID; -import neqsim.processsimulation.processequipment.compressor.Compressor; -import neqsim.processsimulation.processequipment.heatexchanger.Cooler; -import neqsim.processsimulation.processequipment.mixer.Mixer; -import neqsim.processsimulation.processequipment.pump.Pump; -import neqsim.processsimulation.processequipment.pump.PumpInterface; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; -import neqsim.processsimulation.processequipment.util.Recycle; -import neqsim.processsimulation.processsystem.ProcessModuleBaseClass; +import neqsim.process.equipment.compressor.Compressor; +import neqsim.process.equipment.heatexchanger.Cooler; +import neqsim.process.equipment.mixer.Mixer; +import neqsim.process.equipment.pump.Pump; +import neqsim.process.equipment.pump.PumpInterface; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.equipment.util.Recycle; +import neqsim.process.processmodel.ProcessModuleBaseClass; /** *

@@ -256,8 +256,8 @@ public static void main(String[] args) { separationModule.setSpecification("export gas temperature", 30.0); separationModule.setSpecification("liquid pump out pressure", 150.0); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(wellStream); operations.add(glycolFeedStream); operations.add(separationModule); diff --git a/src/main/java/neqsim/processsimulation/processsystem/processmodules/PropaneCoolingModule.java b/src/main/java/neqsim/process/processmodel/processmodules/PropaneCoolingModule.java similarity index 91% rename from src/main/java/neqsim/processsimulation/processsystem/processmodules/PropaneCoolingModule.java rename to src/main/java/neqsim/process/processmodel/processmodules/PropaneCoolingModule.java index 37ab8b29c..ef073bf6e 100644 --- a/src/main/java/neqsim/processsimulation/processsystem/processmodules/PropaneCoolingModule.java +++ b/src/main/java/neqsim/process/processmodel/processmodules/PropaneCoolingModule.java @@ -1,14 +1,14 @@ -package neqsim.processsimulation.processsystem.processmodules; +package neqsim.process.processmodel.processmodules; import java.util.UUID; -import neqsim.processsimulation.processequipment.compressor.Compressor; -import neqsim.processsimulation.processequipment.compressor.CompressorInterface; -import neqsim.processsimulation.processequipment.heatexchanger.Cooler; -import neqsim.processsimulation.processequipment.heatexchanger.Heater; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; -import neqsim.processsimulation.processsystem.ProcessModuleBaseClass; +import neqsim.process.equipment.compressor.Compressor; +import neqsim.process.equipment.compressor.CompressorInterface; +import neqsim.process.equipment.heatexchanger.Cooler; +import neqsim.process.equipment.heatexchanger.Heater; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.equipment.valve.ThrottlingValve; +import neqsim.process.processmodel.ProcessModuleBaseClass; /** *

diff --git a/src/main/java/neqsim/processsimulation/processsystem/processmodules/SeparationTrainModule.java b/src/main/java/neqsim/process/processmodel/processmodules/SeparationTrainModule.java similarity index 92% rename from src/main/java/neqsim/processsimulation/processsystem/processmodules/SeparationTrainModule.java rename to src/main/java/neqsim/process/processmodel/processmodules/SeparationTrainModule.java index df0ff90ad..5b2f55cc0 100644 --- a/src/main/java/neqsim/processsimulation/processsystem/processmodules/SeparationTrainModule.java +++ b/src/main/java/neqsim/process/processmodel/processmodules/SeparationTrainModule.java @@ -1,18 +1,18 @@ -package neqsim.processsimulation.processsystem.processmodules; +package neqsim.process.processmodel.processmodules; import java.util.UUID; -import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; -import neqsim.processsimulation.processequipment.compressor.Compressor; -import neqsim.processsimulation.processequipment.heatexchanger.Cooler; -import neqsim.processsimulation.processequipment.heatexchanger.Heater; -import neqsim.processsimulation.processequipment.mixer.Mixer; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; -import neqsim.processsimulation.processequipment.util.Recycle; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; -import neqsim.processsimulation.processsystem.ProcessModuleBaseClass; +import neqsim.process.equipment.ProcessEquipmentInterface; +import neqsim.process.equipment.compressor.Compressor; +import neqsim.process.equipment.heatexchanger.Cooler; +import neqsim.process.equipment.heatexchanger.Heater; +import neqsim.process.equipment.mixer.Mixer; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.separator.ThreePhaseSeparator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.equipment.util.Recycle; +import neqsim.process.equipment.valve.ThrottlingValve; +import neqsim.process.processmodel.ProcessModuleBaseClass; /** *

@@ -265,8 +265,8 @@ public static void main(String[] args) { 273.15 + 25.0); separationModule.setSpecification("Export oil temperature", 273.15 + 25.0); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(wellStream); operations.add(separationModule); diff --git a/src/main/java/neqsim/processsimulation/processsystem/processmodules/SeparationTrainModuleSimple.java b/src/main/java/neqsim/process/processmodel/processmodules/SeparationTrainModuleSimple.java similarity index 92% rename from src/main/java/neqsim/processsimulation/processsystem/processmodules/SeparationTrainModuleSimple.java rename to src/main/java/neqsim/process/processmodel/processmodules/SeparationTrainModuleSimple.java index 29b441bf0..aa5de67a4 100644 --- a/src/main/java/neqsim/processsimulation/processsystem/processmodules/SeparationTrainModuleSimple.java +++ b/src/main/java/neqsim/process/processmodel/processmodules/SeparationTrainModuleSimple.java @@ -1,18 +1,18 @@ -package neqsim.processsimulation.processsystem.processmodules; +package neqsim.process.processmodel.processmodules; import java.util.UUID; -import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; -import neqsim.processsimulation.processequipment.compressor.Compressor; -import neqsim.processsimulation.processequipment.heatexchanger.Cooler; -import neqsim.processsimulation.processequipment.heatexchanger.Heater; -import neqsim.processsimulation.processequipment.mixer.Mixer; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; -import neqsim.processsimulation.processequipment.util.Recycle; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; -import neqsim.processsimulation.processsystem.ProcessModuleBaseClass; +import neqsim.process.equipment.ProcessEquipmentInterface; +import neqsim.process.equipment.compressor.Compressor; +import neqsim.process.equipment.heatexchanger.Cooler; +import neqsim.process.equipment.heatexchanger.Heater; +import neqsim.process.equipment.mixer.Mixer; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.separator.ThreePhaseSeparator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.equipment.util.Recycle; +import neqsim.process.equipment.valve.ThrottlingValve; +import neqsim.process.processmodel.ProcessModuleBaseClass; /** *

@@ -261,8 +261,8 @@ public static void main(String[] args) { 273.15 + 25.0); separationModule.setSpecification("Export oil temperature", 273.15 + 25.0); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(wellStream); operations.add(separationModule); diff --git a/src/main/java/neqsim/processsimulation/processsystem/processmodules/WellFluidModule.java b/src/main/java/neqsim/process/processmodel/processmodules/WellFluidModule.java similarity index 90% rename from src/main/java/neqsim/processsimulation/processsystem/processmodules/WellFluidModule.java rename to src/main/java/neqsim/process/processmodel/processmodules/WellFluidModule.java index eee44390d..1d8c3a5e2 100644 --- a/src/main/java/neqsim/processsimulation/processsystem/processmodules/WellFluidModule.java +++ b/src/main/java/neqsim/process/processmodel/processmodules/WellFluidModule.java @@ -1,15 +1,15 @@ -package neqsim.processsimulation.processsystem.processmodules; +package neqsim.process.processmodel.processmodules; import java.util.UUID; -import neqsim.processsimulation.processequipment.heatexchanger.Cooler; -import neqsim.processsimulation.processequipment.heatexchanger.Heater; -import neqsim.processsimulation.processequipment.mixer.Mixer; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; -import neqsim.processsimulation.processsystem.ProcessModuleBaseClass; +import neqsim.process.equipment.heatexchanger.Cooler; +import neqsim.process.equipment.heatexchanger.Heater; +import neqsim.process.equipment.mixer.Mixer; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.separator.ThreePhaseSeparator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.equipment.valve.ThrottlingValve; +import neqsim.process.processmodel.ProcessModuleBaseClass; import neqsim.thermo.ThermodynamicConstantsInterface; /** @@ -249,8 +249,8 @@ public static void main(String[] args) { separationModule.setSpecification("Third stage pressure", ThermodynamicConstantsInterface.referencePressure); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(wellStream); operations.add(separationModule); diff --git a/src/main/java/neqsim/processsimulation/util/monitor/CompressorResponse.java b/src/main/java/neqsim/process/util/monitor/CompressorResponse.java similarity index 91% rename from src/main/java/neqsim/processsimulation/util/monitor/CompressorResponse.java rename to src/main/java/neqsim/process/util/monitor/CompressorResponse.java index 4f2c5d7af..d25649726 100644 --- a/src/main/java/neqsim/processsimulation/util/monitor/CompressorResponse.java +++ b/src/main/java/neqsim/process/util/monitor/CompressorResponse.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.util.monitor; +package neqsim.process.util.monitor; -import neqsim.processsimulation.processequipment.compressor.Compressor; +import neqsim.process.equipment.compressor.Compressor; /** *

@@ -42,7 +42,7 @@ public CompressorResponse() {} *

* * @param inputCompressor a - * {@link neqsim.processsimulation.processequipment.compressor.Compressor} object + * {@link neqsim.process.equipment.compressor.Compressor} object */ public CompressorResponse(Compressor inputCompressor) { name = inputCompressor.getName(); diff --git a/src/main/java/neqsim/processsimulation/util/monitor/FluidComponentResponse.java b/src/main/java/neqsim/process/util/monitor/FluidComponentResponse.java similarity index 98% rename from src/main/java/neqsim/processsimulation/util/monitor/FluidComponentResponse.java rename to src/main/java/neqsim/process/util/monitor/FluidComponentResponse.java index 23e773723..5fa2c769b 100644 --- a/src/main/java/neqsim/processsimulation/util/monitor/FluidComponentResponse.java +++ b/src/main/java/neqsim/process/util/monitor/FluidComponentResponse.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.monitor; +package neqsim.process.util.monitor; import java.util.HashMap; import org.apache.logging.log4j.LogManager; diff --git a/src/main/java/neqsim/processsimulation/util/monitor/FluidResponse.java b/src/main/java/neqsim/process/util/monitor/FluidResponse.java similarity index 99% rename from src/main/java/neqsim/processsimulation/util/monitor/FluidResponse.java rename to src/main/java/neqsim/process/util/monitor/FluidResponse.java index 96d9e0517..d4e413cab 100644 --- a/src/main/java/neqsim/processsimulation/util/monitor/FluidResponse.java +++ b/src/main/java/neqsim/process/util/monitor/FluidResponse.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.monitor; +package neqsim.process.util.monitor; import java.util.HashMap; import org.apache.logging.log4j.LogManager; diff --git a/src/main/java/neqsim/processsimulation/util/monitor/HXResponse.java b/src/main/java/neqsim/process/util/monitor/HXResponse.java similarity index 84% rename from src/main/java/neqsim/processsimulation/util/monitor/HXResponse.java rename to src/main/java/neqsim/process/util/monitor/HXResponse.java index d7b3a5e3f..8e135c4ad 100644 --- a/src/main/java/neqsim/processsimulation/util/monitor/HXResponse.java +++ b/src/main/java/neqsim/process/util/monitor/HXResponse.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.util.monitor; +package neqsim.process.util.monitor; -import neqsim.processsimulation.processequipment.heatexchanger.HeatExchanger; +import neqsim.process.equipment.heatexchanger.HeatExchanger; /** *

@@ -37,7 +37,7 @@ public HXResponse() {} *

* * @param inputHeatExchanger a - * {@link neqsim.processsimulation.processequipment.heatexchanger.HeatExchanger} object + * {@link neqsim.process.equipment.heatexchanger.HeatExchanger} object */ public HXResponse(HeatExchanger inputHeatExchanger) { name = inputHeatExchanger.getName(); diff --git a/src/main/java/neqsim/processsimulation/util/monitor/HeaterResponse.java b/src/main/java/neqsim/process/util/monitor/HeaterResponse.java similarity index 72% rename from src/main/java/neqsim/processsimulation/util/monitor/HeaterResponse.java rename to src/main/java/neqsim/process/util/monitor/HeaterResponse.java index 7d612f21b..5f2fc8ed5 100644 --- a/src/main/java/neqsim/processsimulation/util/monitor/HeaterResponse.java +++ b/src/main/java/neqsim/process/util/monitor/HeaterResponse.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.util.monitor; +package neqsim.process.util.monitor; -import neqsim.processsimulation.processequipment.heatexchanger.Heater; +import neqsim.process.equipment.heatexchanger.Heater; /** *

@@ -22,7 +22,7 @@ public class HeaterResponse { * Constructor for HeaterResponse. *

* - * @param inputHeater a {@link neqsim.processsimulation.processequipment.heatexchanger.Heater} object + * @param inputHeater a {@link neqsim.process.equipment.heatexchanger.Heater} object */ public HeaterResponse(Heater inputHeater) { name = inputHeater.getName(); diff --git a/src/main/java/neqsim/processsimulation/util/monitor/MPMResponse.java b/src/main/java/neqsim/process/util/monitor/MPMResponse.java similarity index 77% rename from src/main/java/neqsim/processsimulation/util/monitor/MPMResponse.java rename to src/main/java/neqsim/process/util/monitor/MPMResponse.java index e6a805120..9647bb167 100644 --- a/src/main/java/neqsim/processsimulation/util/monitor/MPMResponse.java +++ b/src/main/java/neqsim/process/util/monitor/MPMResponse.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.util.monitor; +package neqsim.process.util.monitor; -import neqsim.processsimulation.measurementdevice.MultiPhaseMeter; +import neqsim.process.measurementdevice.MultiPhaseMeter; /** *

@@ -19,7 +19,7 @@ public class MPMResponse { * Constructor for MPMResponse. *

* - * @param inputMPM a {@link neqsim.processsimulation.measurementdevice.MultiPhaseMeter} object + * @param inputMPM a {@link neqsim.process.measurementdevice.MultiPhaseMeter} object */ public MPMResponse(MultiPhaseMeter inputMPM) { name = inputMPM.getName(); diff --git a/src/main/java/neqsim/processsimulation/util/monitor/PumpResponse.java b/src/main/java/neqsim/process/util/monitor/PumpResponse.java similarity index 91% rename from src/main/java/neqsim/processsimulation/util/monitor/PumpResponse.java rename to src/main/java/neqsim/process/util/monitor/PumpResponse.java index 7d8aae8b9..afef090d1 100644 --- a/src/main/java/neqsim/processsimulation/util/monitor/PumpResponse.java +++ b/src/main/java/neqsim/process/util/monitor/PumpResponse.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.util.monitor; +package neqsim.process.util.monitor; -import neqsim.processsimulation.processequipment.pump.Pump; +import neqsim.process.equipment.pump.Pump; /** *

@@ -35,7 +35,7 @@ public class PumpResponse { * Constructor for PumpResponse. *

* - * @param inputPump a {@link neqsim.processsimulation.processequipment.pump.Pump} object + * @param inputPump a {@link neqsim.process.equipment.pump.Pump} object */ public PumpResponse(Pump inputPump) { name = inputPump.getName(); diff --git a/src/main/java/neqsim/processsimulation/util/monitor/SeparatorResponse.java b/src/main/java/neqsim/process/util/monitor/SeparatorResponse.java similarity index 81% rename from src/main/java/neqsim/processsimulation/util/monitor/SeparatorResponse.java rename to src/main/java/neqsim/process/util/monitor/SeparatorResponse.java index b615964c0..cf286887c 100644 --- a/src/main/java/neqsim/processsimulation/util/monitor/SeparatorResponse.java +++ b/src/main/java/neqsim/process/util/monitor/SeparatorResponse.java @@ -1,7 +1,7 @@ -package neqsim.processsimulation.util.monitor; +package neqsim.process.util.monitor; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.separator.ThreePhaseSeparator; /** *

@@ -22,7 +22,7 @@ public class SeparatorResponse { *

* * @param inputSeparator a - * {@link neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator} object + * {@link neqsim.process.equipment.separator.ThreePhaseSeparator} object */ public SeparatorResponse(ThreePhaseSeparator inputSeparator) { name = inputSeparator.getName(); @@ -45,7 +45,7 @@ public SeparatorResponse(ThreePhaseSeparator inputSeparator) { * Constructor for SeparatorResponse. *

* - * @param inputSeparator a {@link neqsim.processsimulation.processequipment.separator.Separator} + * @param inputSeparator a {@link neqsim.process.equipment.separator.Separator} * object */ public SeparatorResponse(Separator inputSeparator) { diff --git a/src/main/java/neqsim/processsimulation/util/monitor/StreamResponse.java b/src/main/java/neqsim/process/util/monitor/StreamResponse.java similarity index 98% rename from src/main/java/neqsim/processsimulation/util/monitor/StreamResponse.java rename to src/main/java/neqsim/process/util/monitor/StreamResponse.java index 3081843e6..46b27e6f1 100644 --- a/src/main/java/neqsim/processsimulation/util/monitor/StreamResponse.java +++ b/src/main/java/neqsim/process/util/monitor/StreamResponse.java @@ -1,9 +1,9 @@ -package neqsim.processsimulation.util.monitor; +package neqsim.process.util.monitor; import java.util.HashMap; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.standards.gasquality.Standard_ISO6976; /** @@ -29,7 +29,7 @@ public class StreamResponse { * Constructor for StreamResponse. *

* - * @param inputStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} + * @param inputStream a {@link neqsim.process.equipment.stream.StreamInterface} * object */ public StreamResponse(StreamInterface inputStream) { diff --git a/src/main/java/neqsim/processsimulation/util/monitor/ThreePhaseSeparatorResponse.java b/src/main/java/neqsim/process/util/monitor/ThreePhaseSeparatorResponse.java similarity index 74% rename from src/main/java/neqsim/processsimulation/util/monitor/ThreePhaseSeparatorResponse.java rename to src/main/java/neqsim/process/util/monitor/ThreePhaseSeparatorResponse.java index 105f82dcb..8bbd875dc 100644 --- a/src/main/java/neqsim/processsimulation/util/monitor/ThreePhaseSeparatorResponse.java +++ b/src/main/java/neqsim/process/util/monitor/ThreePhaseSeparatorResponse.java @@ -1,7 +1,7 @@ -package neqsim.processsimulation.util.monitor; +package neqsim.process.util.monitor; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.separator.ThreePhaseSeparator; /** *

@@ -22,7 +22,7 @@ public class ThreePhaseSeparatorResponse { * Constructor for ThreePhaseSeparatorResponse. *

* - * @param inputSeparator a {@link neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator} object + * @param inputSeparator a {@link neqsim.process.equipment.separator.ThreePhaseSeparator} object */ public ThreePhaseSeparatorResponse(ThreePhaseSeparator inputSeparator) { name = inputSeparator.getName(); @@ -37,7 +37,7 @@ public ThreePhaseSeparatorResponse(ThreePhaseSeparator inputSeparator) { * Constructor for ThreePhaseSeparatorResponse. *

* - * @param inputSeparator a {@link neqsim.processsimulation.processequipment.separator.Separator} object + * @param inputSeparator a {@link neqsim.process.equipment.separator.Separator} object */ public ThreePhaseSeparatorResponse(Separator inputSeparator) { name = inputSeparator.getName(); diff --git a/src/main/java/neqsim/processsimulation/util/monitor/Value.java b/src/main/java/neqsim/process/util/monitor/Value.java similarity index 89% rename from src/main/java/neqsim/processsimulation/util/monitor/Value.java rename to src/main/java/neqsim/process/util/monitor/Value.java index 0a56d3d73..1b02be415 100644 --- a/src/main/java/neqsim/processsimulation/util/monitor/Value.java +++ b/src/main/java/neqsim/process/util/monitor/Value.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.monitor; +package neqsim.process.util.monitor; /** * Unit class nested within Units. diff --git a/src/main/java/neqsim/processsimulation/util/monitor/ValveResponse.java b/src/main/java/neqsim/process/util/monitor/ValveResponse.java similarity index 80% rename from src/main/java/neqsim/processsimulation/util/monitor/ValveResponse.java rename to src/main/java/neqsim/process/util/monitor/ValveResponse.java index 017b99939..fcd9fd97f 100644 --- a/src/main/java/neqsim/processsimulation/util/monitor/ValveResponse.java +++ b/src/main/java/neqsim/process/util/monitor/ValveResponse.java @@ -1,7 +1,7 @@ -package neqsim.processsimulation.util.monitor; +package neqsim.process.util.monitor; import java.util.ArrayList; -import neqsim.processsimulation.processequipment.valve.ValveInterface; +import neqsim.process.equipment.valve.ValveInterface; /** *

@@ -20,7 +20,7 @@ public class ValveResponse { * Constructor for StreamResponse. *

* - * @param valve a {@link neqsim.processsimulation.processequipment.valve.ValveInterface} object + * @param valve a {@link neqsim.process.equipment.valve.ValveInterface} object */ public ValveResponse(ValveInterface valve) { name = valve.getName(); diff --git a/src/main/java/neqsim/processsimulation/util/monitor/WellAllocatorResponse.java b/src/main/java/neqsim/process/util/monitor/WellAllocatorResponse.java similarity index 75% rename from src/main/java/neqsim/processsimulation/util/monitor/WellAllocatorResponse.java rename to src/main/java/neqsim/process/util/monitor/WellAllocatorResponse.java index 53a0127b6..53bd27d75 100644 --- a/src/main/java/neqsim/processsimulation/util/monitor/WellAllocatorResponse.java +++ b/src/main/java/neqsim/process/util/monitor/WellAllocatorResponse.java @@ -1,6 +1,6 @@ -package neqsim.processsimulation.util.monitor; +package neqsim.process.util.monitor; -import neqsim.processsimulation.measurementdevice.WellAllocator; +import neqsim.process.measurementdevice.WellAllocator; /** *

@@ -19,7 +19,7 @@ public class WellAllocatorResponse { * Constructor for WellAllocatorResponse. *

* - * @param inputAllocator a {@link neqsim.processsimulation.measurementdevice.WellAllocator} object + * @param inputAllocator a {@link neqsim.process.measurementdevice.WellAllocator} object */ public WellAllocatorResponse(WellAllocator inputAllocator) { name = inputAllocator.getName(); diff --git a/src/main/java/neqsim/processsimulation/util/report/Report.java b/src/main/java/neqsim/process/util/report/Report.java similarity index 80% rename from src/main/java/neqsim/processsimulation/util/report/Report.java rename to src/main/java/neqsim/process/util/report/Report.java index 7a8a43ef1..cc8e41b74 100644 --- a/src/main/java/neqsim/processsimulation/util/report/Report.java +++ b/src/main/java/neqsim/process/util/report/Report.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.report; +package neqsim.process.util.report; import java.util.HashMap; import java.util.Map; @@ -8,11 +8,11 @@ import com.google.gson.GsonBuilder; import com.google.gson.JsonObject; import com.google.gson.JsonParser; -import neqsim.processsimulation.processequipment.ProcessEquipmentBaseClass; -import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; -import neqsim.processsimulation.processsystem.ProcessModule; -import neqsim.processsimulation.processsystem.ProcessModuleBaseClass; -import neqsim.processsimulation.processsystem.ProcessSystem; +import neqsim.process.equipment.ProcessEquipmentBaseClass; +import neqsim.process.equipment.ProcessEquipmentInterface; +import neqsim.process.processmodel.ProcessModule; +import neqsim.process.processmodel.ProcessModuleBaseClass; +import neqsim.process.processmodel.ProcessSystem; import neqsim.thermo.system.SystemInterface; /** @@ -34,7 +34,7 @@ public class Report { * Constructor for Report. *

* - * @param process a {@link neqsim.processsimulation.processsystem.ProcessSystem} object + * @param process a {@link neqsim.process.processmodel.ProcessSystem} object */ public Report(ProcessSystem process) { this.process = process; @@ -57,7 +57,7 @@ public Report(SystemInterface fluid) { *

* * @param processEquipmentBaseClass a - * {@link neqsim.processsimulation.processequipment.ProcessEquipmentBaseClass} object + * {@link neqsim.process.equipment.ProcessEquipmentBaseClass} object */ public Report(ProcessEquipmentBaseClass processEquipmentBaseClass) { processEquipment = processEquipmentBaseClass; @@ -68,7 +68,7 @@ public Report(ProcessEquipmentBaseClass processEquipmentBaseClass) { * Constructor for Report. *

* - * @param processModule a {@link neqsim.processsimulation.processsystem.ProcessModule} object + * @param processModule a {@link neqsim.process.processmodel.ProcessModule} object */ public Report(ProcessModule processModule) { // TODO Auto-generated constructor stub @@ -80,7 +80,7 @@ public Report(ProcessModule processModule) { *

* * @param processModuleBaseClass a - * {@link neqsim.processsimulation.processsystem.ProcessModuleBaseClass} object + * {@link neqsim.process.processmodel.ProcessModuleBaseClass} object */ public Report(ProcessModuleBaseClass processModuleBaseClass) { // TODO Auto-generated constructor stub diff --git a/src/main/java/neqsim/processsimulation/processequipment/heatexchanger/HeatExchangerInterface.java b/src/main/java/neqsim/processsimulation/processequipment/heatexchanger/HeatExchangerInterface.java deleted file mode 100644 index 8947fceae..000000000 --- a/src/main/java/neqsim/processsimulation/processequipment/heatexchanger/HeatExchangerInterface.java +++ /dev/null @@ -1,21 +0,0 @@ -package neqsim.processsimulation.processequipment.heatexchanger; - -/** - *

- * HeatExchangerInterface interface. - *

- * - * @author esol - * @version $Id: $Id - */ -public interface HeatExchangerInterface extends HeaterInterface { - /** - *

- * getOutStream. - *

- * - * @param i a int - * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object - */ - public neqsim.processsimulation.processequipment.stream.StreamInterface getOutStream(int i); -} diff --git a/src/main/java/neqsim/thermo/system/SystemThermo.java b/src/main/java/neqsim/thermo/system/SystemThermo.java index 7125e89dc..baed65f4d 100644 --- a/src/main/java/neqsim/thermo/system/SystemThermo.java +++ b/src/main/java/neqsim/thermo/system/SystemThermo.java @@ -5050,14 +5050,14 @@ public double[] getzvector() { @Override public String toJson() { return new GsonBuilder().create() - .toJson(new neqsim.processsimulation.util.monitor.FluidResponse(this)); + .toJson(new neqsim.process.util.monitor.FluidResponse(this)); } /** {@inheritDoc} */ @Override public String toCompJson() { return new GsonBuilder().create() - .toJson(new neqsim.processsimulation.util.monitor.FluidComponentResponse(this)); + .toJson(new neqsim.process.util.monitor.FluidComponentResponse(this)); } /** {@inheritDoc} */ diff --git a/src/test/java/neqsim/fluidmechanics/util/example/WettedWall_CO2_water.java b/src/test/java/neqsim/fluidmechanics/util/example/WettedWall_CO2_water.java index 0bc35dcca..eb0cedb8e 100644 --- a/src/test/java/neqsim/fluidmechanics/util/example/WettedWall_CO2_water.java +++ b/src/test/java/neqsim/fluidmechanics/util/example/WettedWall_CO2_water.java @@ -1,10 +1,10 @@ package neqsim.fluidmechanics.util.example; -import neqsim.processsimulation.processequipment.pipeline.Pipeline; -import neqsim.processsimulation.processequipment.pipeline.TwoPhasePipeLine; -import neqsim.processsimulation.processequipment.stream.NeqStream; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processsystem.ProcessSystem; +import neqsim.process.equipment.pipeline.Pipeline; +import neqsim.process.equipment.pipeline.TwoPhasePipeLine; +import neqsim.process.equipment.stream.NeqStream; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.processmodel.ProcessSystem; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; diff --git a/src/test/java/neqsim/processsimulation/controllerdevice/ControllerDeviceBaseClassTest.java b/src/test/java/neqsim/processsimulation/controllerdevice/ControllerDeviceBaseClassTest.java index b981a50ab..43f59bdfc 100644 --- a/src/test/java/neqsim/processsimulation/controllerdevice/ControllerDeviceBaseClassTest.java +++ b/src/test/java/neqsim/processsimulation/controllerdevice/ControllerDeviceBaseClassTest.java @@ -3,6 +3,7 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; +import neqsim.process.controllerdevice.ControllerDeviceBaseClass; public class ControllerDeviceBaseClassTest { static ControllerDeviceBaseClass c; diff --git a/src/test/java/neqsim/processsimulation/measurementdevice/CombustionEmissionsCalculatorTest.java b/src/test/java/neqsim/processsimulation/measurementdevice/CombustionEmissionsCalculatorTest.java index 3c85e4f31..b97d45655 100644 --- a/src/test/java/neqsim/processsimulation/measurementdevice/CombustionEmissionsCalculatorTest.java +++ b/src/test/java/neqsim/processsimulation/measurementdevice/CombustionEmissionsCalculatorTest.java @@ -2,7 +2,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.measurementdevice.CombustionEmissionsCalculator; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; diff --git a/src/test/java/neqsim/processsimulation/measurementdevice/FLowInducedVibrationTest.java b/src/test/java/neqsim/processsimulation/measurementdevice/FLowInducedVibrationTest.java index 8591c2867..1f9ae0e16 100644 --- a/src/test/java/neqsim/processsimulation/measurementdevice/FLowInducedVibrationTest.java +++ b/src/test/java/neqsim/processsimulation/measurementdevice/FLowInducedVibrationTest.java @@ -2,10 +2,11 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processequipment.pipeline.PipeBeggsAndBrills; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.util.FlowRateAdjuster; -import neqsim.processsimulation.processsystem.ProcessSystem; +import neqsim.process.equipment.pipeline.PipeBeggsAndBrills; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.util.FlowRateAdjuster; +import neqsim.process.measurementdevice.FlowInducedVibrationAnalyser; +import neqsim.process.processmodel.ProcessSystem; import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -94,8 +95,8 @@ public void testSetUnit() { flowInducedVibrationAnalyserFRMS.setMethod("FRMS"); pipe.getOutletStream(); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(flowRateAdj); operations.add(pipe); diff --git a/src/test/java/neqsim/processsimulation/measurementdevice/MultiPhaseMeterTest.java b/src/test/java/neqsim/processsimulation/measurementdevice/MultiPhaseMeterTest.java index c546e4d14..d54a261a3 100644 --- a/src/test/java/neqsim/processsimulation/measurementdevice/MultiPhaseMeterTest.java +++ b/src/test/java/neqsim/processsimulation/measurementdevice/MultiPhaseMeterTest.java @@ -2,7 +2,8 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.measurementdevice.MultiPhaseMeter; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; @@ -33,8 +34,8 @@ void testMain() { multiPhaseMeter.setTemperature(90.0, "C"); multiPhaseMeter.setPressure(60.0, "bara"); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(multiPhaseMeter); operations.run(); diff --git a/src/test/java/neqsim/processsimulation/measurementdevice/WellAllocatorTest.java b/src/test/java/neqsim/processsimulation/measurementdevice/WellAllocatorTest.java index a0316002b..68ad4e626 100644 --- a/src/test/java/neqsim/processsimulation/measurementdevice/WellAllocatorTest.java +++ b/src/test/java/neqsim/processsimulation/measurementdevice/WellAllocatorTest.java @@ -3,9 +3,10 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.util.monitor.WellAllocatorResponse; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.measurementdevice.WellAllocator; +import neqsim.process.util.monitor.WellAllocatorResponse; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; @@ -17,7 +18,7 @@ class WellAllocatorTest extends neqsim.NeqSimTest { /** * Test method for - * {@link neqsim.processsimulation.measurementdevice.WellAllocator#getMeasuredValue(java.lang.String)}. + * {@link neqsim.process.measurementdevice.WellAllocator#getMeasuredValue(java.lang.String)}. */ @Test void testGetMeasuredValueString() { @@ -60,8 +61,8 @@ void testGetMeasuredValueString() { wellAlloc.setExportGasStream(stream_gasExp); wellAlloc.setExportOilStream(stream_oilExp); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(stream_2); operations.add(sep1); diff --git a/src/test/java/neqsim/processsimulation/measurementdevice/nmVOCTest.java b/src/test/java/neqsim/processsimulation/measurementdevice/nmVOCTest.java index d59c4006a..b5d793562 100644 --- a/src/test/java/neqsim/processsimulation/measurementdevice/nmVOCTest.java +++ b/src/test/java/neqsim/processsimulation/measurementdevice/nmVOCTest.java @@ -3,8 +3,9 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processsystem.ProcessSystem; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.measurementdevice.NMVOCAnalyser; +import neqsim.process.processmodel.ProcessSystem; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; diff --git a/src/test/java/neqsim/processsimulation/measurementdevice/pHProbeTest.java b/src/test/java/neqsim/processsimulation/measurementdevice/pHProbeTest.java index 958bfdbff..07a9ce701 100644 --- a/src/test/java/neqsim/processsimulation/measurementdevice/pHProbeTest.java +++ b/src/test/java/neqsim/processsimulation/measurementdevice/pHProbeTest.java @@ -5,8 +5,9 @@ import org.apache.logging.log4j.Logger; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +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/processsimulation/measurementdevice/simpleflowregime/SevereSlugTest.java b/src/test/java/neqsim/processsimulation/measurementdevice/simpleflowregime/SevereSlugTest.java index a591813e5..a35498041 100644 --- a/src/test/java/neqsim/processsimulation/measurementdevice/simpleflowregime/SevereSlugTest.java +++ b/src/test/java/neqsim/processsimulation/measurementdevice/simpleflowregime/SevereSlugTest.java @@ -2,7 +2,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.measurementdevice.simpleflowregime.SevereSlugAnalyser; public class SevereSlugTest { @Test diff --git a/src/test/java/neqsim/processsimulation/mechanicaldesign/SystemMechanicalDesignTest.java b/src/test/java/neqsim/processsimulation/mechanicaldesign/SystemMechanicalDesignTest.java index 6d97c4486..36e1745b3 100644 --- a/src/test/java/neqsim/processsimulation/mechanicaldesign/SystemMechanicalDesignTest.java +++ b/src/test/java/neqsim/processsimulation/mechanicaldesign/SystemMechanicalDesignTest.java @@ -2,25 +2,26 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.costestimation.CostEstimateBaseClass; -import neqsim.processsimulation.mechanicaldesign.pipeline.PipelineMechanicalDesign; -import neqsim.processsimulation.mechanicaldesign.separator.GasScrubberMechanicalDesign; -import neqsim.processsimulation.mechanicaldesign.separator.SeparatorMechanicalDesign; -import neqsim.processsimulation.mechanicaldesign.valve.ValveMechanicalDesign; -import neqsim.processsimulation.processequipment.heatexchanger.Heater; -import neqsim.processsimulation.processequipment.pipeline.AdiabaticPipe; -import neqsim.processsimulation.processequipment.pump.Pump; -import neqsim.processsimulation.processequipment.separator.GasScrubber; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; -import neqsim.processsimulation.processequipment.util.Recycle; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; +import neqsim.process.costestimation.CostEstimateBaseClass; +import neqsim.process.equipment.heatexchanger.Heater; +import neqsim.process.equipment.pipeline.AdiabaticPipe; +import neqsim.process.equipment.pump.Pump; +import neqsim.process.equipment.separator.GasScrubber; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.equipment.util.Recycle; +import neqsim.process.equipment.valve.ThrottlingValve; +import neqsim.process.mechanicaldesign.SystemMechanicalDesign; +import neqsim.process.mechanicaldesign.pipeline.PipelineMechanicalDesign; +import neqsim.process.mechanicaldesign.separator.GasScrubberMechanicalDesign; +import neqsim.process.mechanicaldesign.separator.SeparatorMechanicalDesign; +import neqsim.process.mechanicaldesign.valve.ValveMechanicalDesign; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; public class SystemMechanicalDesignTest { - static neqsim.processsimulation.processsystem.ProcessSystem operations; + static neqsim.process.processmodel.ProcessSystem operations; @BeforeAll static void createProcess() { @@ -61,8 +62,8 @@ static void createProcess() { feedStream.setTemperature(25.5, "C"); feedStream.setPressure(26.0, "bara"); - neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator seprator1stStage = - new neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator( + neqsim.process.equipment.separator.ThreePhaseSeparator seprator1stStage = + new neqsim.process.equipment.separator.ThreePhaseSeparator( "1st stage separator", feedStream); ThrottlingValve valve1 = new ThrottlingValve("valve1", seprator1stStage.getLiquidOutStream()); @@ -71,8 +72,8 @@ static void createProcess() { Heater oilHeater = new Heater("oil heater", valve1.getOutletStream()); oilHeater.setOutTemperature(359.0); - neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator seprator2ndStage = - new neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator( + neqsim.process.equipment.separator.ThreePhaseSeparator seprator2ndStage = + new neqsim.process.equipment.separator.ThreePhaseSeparator( "2nd stage separator", oilHeater.getOutletStream()); ThrottlingValve valve2 = new ThrottlingValve("valve2", seprator2ndStage.getLiquidOutStream()); @@ -81,8 +82,8 @@ static void createProcess() { StreamInterface recircstream1 = valve2.getOutletStream().clone("oilRecirc1"); recircstream1.setFlowRate(1e-6, "kg/hr"); - neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator seprator3rdStage = - new neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator( + neqsim.process.equipment.separator.ThreePhaseSeparator seprator3rdStage = + new neqsim.process.equipment.separator.ThreePhaseSeparator( "3rd stage separator"); seprator3rdStage.addStream(valve2.getOutletStream()); seprator3rdStage.addStream(recircstream1); @@ -106,7 +107,7 @@ static void createProcess() { recycle1.addStream(valveLP1.getOutletStream()); recycle1.setOutletStream(recircstream1); - operations = new neqsim.processsimulation.processsystem.ProcessSystem(); + operations = new neqsim.process.processmodel.ProcessSystem(); operations.add(feedStream); operations.add(seprator1stStage); operations.add(valve1); @@ -196,7 +197,7 @@ void testRunDesignCalculationforValve() { @Test void testRunDesignForPipeline() { AdiabaticPipe pipe = new AdiabaticPipe("pipe1", - ((neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator) operations + ((neqsim.process.equipment.separator.ThreePhaseSeparator) operations .getUnit("1st stage separator")).getGasOutStream()); pipe.setDiameter(1.0); pipe.setLength(1000.0); diff --git a/src/test/java/neqsim/processsimulation/processequipment/absorber/SimpleAbsorberTest.java b/src/test/java/neqsim/processsimulation/processequipment/absorber/SimpleAbsorberTest.java index 1019b49ec..b840273e8 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/absorber/SimpleAbsorberTest.java +++ b/src/test/java/neqsim/processsimulation/processequipment/absorber/SimpleAbsorberTest.java @@ -3,7 +3,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.stream.Stream; public class SimpleAbsorberTest extends neqsim.NeqSimTest { neqsim.thermo.system.SystemFurstElectrolyteEos testSystem; @@ -21,8 +21,8 @@ void setUp() { @Test void testRun() { Stream stream_Hot = new Stream("Stream1", testSystem); - neqsim.processsimulation.processequipment.absorber.SimpleAbsorber absorber1 = - new neqsim.processsimulation.processequipment.absorber.SimpleAbsorber("absorber", + neqsim.process.equipment.absorber.SimpleAbsorber absorber1 = + new neqsim.process.equipment.absorber.SimpleAbsorber("absorber", stream_Hot); absorber1.setAproachToEquilibrium(0.75); diff --git a/src/test/java/neqsim/processsimulation/processequipment/adsorber/SimpleAdsorberTest.java b/src/test/java/neqsim/processsimulation/processequipment/adsorber/SimpleAdsorberTest.java index 23167b9c7..384842cb4 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/adsorber/SimpleAdsorberTest.java +++ b/src/test/java/neqsim/processsimulation/processequipment/adsorber/SimpleAdsorberTest.java @@ -3,7 +3,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.stream.Stream; public class SimpleAdsorberTest extends neqsim.NeqSimTest { neqsim.thermo.system.SystemFurstElectrolyteEos testSystem; @@ -21,8 +21,8 @@ void setUp() { @Test void testRun() { Stream stream_Hot = new Stream("Stream1", testSystem); - neqsim.processsimulation.processequipment.adsorber.SimpleAdsorber adsorber1 = - new neqsim.processsimulation.processequipment.adsorber.SimpleAdsorber("adsorber", + neqsim.process.equipment.adsorber.SimpleAdsorber adsorber1 = + new neqsim.process.equipment.adsorber.SimpleAdsorber("adsorber", stream_Hot); adsorber1.setAproachToEquilibrium(0.75); diff --git a/src/test/java/neqsim/processsimulation/processequipment/compressor/CompressorCalculationTest.java b/src/test/java/neqsim/processsimulation/processequipment/compressor/CompressorCalculationTest.java index 4d086a27e..cb078c8bb 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/compressor/CompressorCalculationTest.java +++ b/src/test/java/neqsim/processsimulation/processequipment/compressor/CompressorCalculationTest.java @@ -3,7 +3,8 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.compressor.Compressor; +import neqsim.process.equipment.stream.Stream; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; @@ -96,8 +97,8 @@ public void testRun() { setCurves(); comp1.setUsePolytropicCalc(true); comp1.setSpeed(11918); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(comp1); operations.run(); diff --git a/src/test/java/neqsim/processsimulation/processequipment/compressor/CompressorChartTest.java b/src/test/java/neqsim/processsimulation/processequipment/compressor/CompressorChartTest.java index ed1692a38..b1a4a5ad1 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/compressor/CompressorChartTest.java +++ b/src/test/java/neqsim/processsimulation/processequipment/compressor/CompressorChartTest.java @@ -4,7 +4,9 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.compressor.Compressor; +import neqsim.process.equipment.compressor.CompressorChart; +import neqsim.process.equipment.stream.Stream; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; @@ -117,8 +119,8 @@ public void setUp() { @Test public void test_Run() { - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); Stream stream_1 = (Stream) comp1.getInletStream(); operations.add(stream_1); operations.add(comp1); diff --git a/src/test/java/neqsim/processsimulation/processequipment/compressor/CompressorPropertyProfileTest.java b/src/test/java/neqsim/processsimulation/processequipment/compressor/CompressorPropertyProfileTest.java index 25b79d425..1cc9e4a10 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/compressor/CompressorPropertyProfileTest.java +++ b/src/test/java/neqsim/processsimulation/processequipment/compressor/CompressorPropertyProfileTest.java @@ -3,8 +3,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processsystem.ProcessSystem; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.processmodel.ProcessSystem; import neqsim.thermo.system.SystemSrkEos; class CompressorPropertyProfileTest extends neqsim.NeqSimTest { @@ -15,7 +15,7 @@ class CompressorPropertyProfileTest extends neqsim.NeqSimTest { double gasFlowRate = 5.0; double pressure_Out = 150.0; ProcessSystem processOps = null; - neqsim.processsimulation.processequipment.compressor.Compressor compressor1 = null; + neqsim.process.equipment.compressor.Compressor compressor1 = null; /** *

@@ -33,7 +33,7 @@ public void setUp() { inletStream.setPressure(pressure_inlet, "bara"); inletStream.setTemperature(temperature_inlet, "C"); inletStream.setFlowRate(gasFlowRate, "MSm3/day"); - compressor1 = new neqsim.processsimulation.processequipment.compressor.Compressor("Compressor1", + compressor1 = new neqsim.process.equipment.compressor.Compressor("Compressor1", inletStream); compressor1.setOutletPressure(pressure_Out); compressor1.setUsePolytropicCalc(true); diff --git a/src/test/java/neqsim/processsimulation/processequipment/compressor/CompressorTest.java b/src/test/java/neqsim/processsimulation/processequipment/compressor/CompressorTest.java index 0f8f0a905..2ad2b977d 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/compressor/CompressorTest.java +++ b/src/test/java/neqsim/processsimulation/processequipment/compressor/CompressorTest.java @@ -12,8 +12,9 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processsystem.ProcessSystem; +import neqsim.process.equipment.compressor.Compressor; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.processmodel.ProcessSystem; import neqsim.thermo.system.SystemSrkEos; class CompressorTest extends neqsim.NeqSimTest { @@ -27,7 +28,7 @@ class CompressorTest extends neqsim.NeqSimTest { double pressure_Out = 150.0; double polytropicEff = 0.77; ProcessSystem processOps = null; - neqsim.processsimulation.processequipment.compressor.Compressor compressor1 = null; + neqsim.process.equipment.compressor.Compressor compressor1 = null; String unitName = "Compressor1"; @@ -148,8 +149,8 @@ public void testCompressorWithSrk() { inletStream.setTemperature(temperature_inlet, "C"); inletStream.setFlowRate(gasFlowRate, "MSm3/day"); inletStream.run(); - neqsim.processsimulation.processequipment.compressor.Compressor compressor1 = - new neqsim.processsimulation.processequipment.compressor.Compressor("Compressor1", + neqsim.process.equipment.compressor.Compressor compressor1 = + new neqsim.process.equipment.compressor.Compressor("Compressor1", inletStream); compressor1.setUsePolytropicCalc(true); compressor1.setOutletPressure(pressure_Out); @@ -177,8 +178,8 @@ public void testCompressorWithGERG2008() { inletStream.setTemperature(temperature_inlet, "C"); inletStream.setFlowRate(gasFlowRate, "MSm3/day"); inletStream.run(); - neqsim.processsimulation.processequipment.compressor.Compressor compressor1 = - new neqsim.processsimulation.processequipment.compressor.Compressor("Compressor1", + neqsim.process.equipment.compressor.Compressor compressor1 = + new neqsim.process.equipment.compressor.Compressor("Compressor1", inletStream); compressor1.setUsePolytropicCalc(true); compressor1.setOutletPressure(pressure_Out); @@ -208,8 +209,8 @@ public void testCompressorWithGERG2008_2() { inletStream.setTemperature(temperature_inlet, "C"); inletStream.setFlowRate(gasFlowRate, "MSm3/day"); inletStream.run(); - neqsim.processsimulation.processequipment.compressor.Compressor compressor1 = - new neqsim.processsimulation.processequipment.compressor.Compressor("Compressor1", + neqsim.process.equipment.compressor.Compressor compressor1 = + new neqsim.process.equipment.compressor.Compressor("Compressor1", inletStream); compressor1.setOutletPressure(pressure_Out); compressor1.setPolytropicEfficiency(0.56); diff --git a/src/test/java/neqsim/processsimulation/processequipment/distillation/DistillationColumnTest.java b/src/test/java/neqsim/processsimulation/processequipment/distillation/DistillationColumnTest.java index 4c2414e63..706e433b6 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/distillation/DistillationColumnTest.java +++ b/src/test/java/neqsim/processsimulation/processequipment/distillation/DistillationColumnTest.java @@ -2,8 +2,10 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.distillation.Condenser; +import neqsim.process.equipment.distillation.DistillationColumn; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; public class DistillationColumnTest { /** diff --git a/src/test/java/neqsim/processsimulation/processequipment/heatexchanger/HeatExchangerTest.java b/src/test/java/neqsim/processsimulation/processequipment/heatexchanger/HeatExchangerTest.java index f35dbe504..171c5077b 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/heatexchanger/HeatExchangerTest.java +++ b/src/test/java/neqsim/processsimulation/processequipment/heatexchanger/HeatExchangerTest.java @@ -3,10 +3,11 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.util.Recycle; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; +import neqsim.process.equipment.heatexchanger.HeatExchanger; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.util.Recycle; +import neqsim.process.equipment.valve.ThrottlingValve; import neqsim.thermodynamicoperations.ThermodynamicOperations; /** @@ -59,8 +60,8 @@ void testRun1() { resyc.addStream(valv1.getOutletStream()); resyc.setOutletStream(stream_Cold); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_Hot); operations.add(stream_Cold); operations.add(heatEx); @@ -89,12 +90,12 @@ void testRun2() { Stream stream_Cold = new Stream("Stream2", testSystem2); - neqsim.processsimulation.processequipment.heatexchanger.HeatExchanger heatExchanger1 = - new neqsim.processsimulation.processequipment.heatexchanger.HeatExchanger("heatEx", + neqsim.process.equipment.heatexchanger.HeatExchanger heatExchanger1 = + new neqsim.process.equipment.heatexchanger.HeatExchanger("heatEx", stream_Hot, stream_Cold); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_Hot); operations.add(stream_Cold); operations.add(heatExchanger1); @@ -107,7 +108,7 @@ void testRun2() { assertEquals(15780.77130, heatExchanger1.getUAvalue(), 1e-3); - heatExchanger1 = new neqsim.processsimulation.processequipment.heatexchanger.HeatExchanger( + heatExchanger1 = new neqsim.process.equipment.heatexchanger.HeatExchanger( "heatEx", stream_Hot, stream_Cold); heatExchanger1.setDeltaT(1.0); heatExchanger1.run(); diff --git a/src/test/java/neqsim/processsimulation/processequipment/heatexchanger/HeaterTest.java b/src/test/java/neqsim/processsimulation/processequipment/heatexchanger/HeaterTest.java index a628fdb72..b338878c8 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/heatexchanger/HeaterTest.java +++ b/src/test/java/neqsim/processsimulation/processequipment/heatexchanger/HeaterTest.java @@ -4,8 +4,9 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processsystem.ProcessSystem; +import neqsim.process.equipment.heatexchanger.Heater; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.processmodel.ProcessSystem; import neqsim.thermo.system.SystemSrkEos; public class HeaterTest { diff --git a/src/test/java/neqsim/processsimulation/processequipment/manifold/ManifoldTest.java b/src/test/java/neqsim/processsimulation/processequipment/manifold/ManifoldTest.java index 681046ced..de842d04e 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/manifold/ManifoldTest.java +++ b/src/test/java/neqsim/processsimulation/processequipment/manifold/ManifoldTest.java @@ -2,8 +2,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processsystem.ProcessSystem; +import neqsim.process.equipment.manifold.Manifold; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.processmodel.ProcessSystem; import neqsim.thermo.system.SystemSrkEos; public class ManifoldTest { diff --git a/src/test/java/neqsim/processsimulation/processequipment/mixer/MixerTest.java b/src/test/java/neqsim/processsimulation/processequipment/mixer/MixerTest.java index d0c53214f..252ea24d1 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/mixer/MixerTest.java +++ b/src/test/java/neqsim/processsimulation/processequipment/mixer/MixerTest.java @@ -5,8 +5,9 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processsystem.ProcessSystem; +import neqsim.process.equipment.mixer.Mixer; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.processmodel.ProcessSystem; import neqsim.thermo.system.SystemSrkEos; /** @@ -48,7 +49,7 @@ static void setUpBeforeClass() { } /** - * Test method for {@link neqsim.processsimulation.processequipment.mixer.Mixer#run()}. + * Test method for {@link neqsim.process.equipment.mixer.Mixer#run()}. */ @Test void testRun() { @@ -61,7 +62,7 @@ void testRun() { } /** - * Test method for {@link neqsim.processsimulation.processequipment.mixer.Mixer#run()}. + * Test method for {@link neqsim.process.equipment.mixer.Mixer#run()}. */ @Test void testNeedRecalculation() { diff --git a/src/test/java/neqsim/processsimulation/processequipment/pipeline/AdiabaticTwoPhasePipeTest.java b/src/test/java/neqsim/processsimulation/processequipment/pipeline/AdiabaticTwoPhasePipeTest.java index 982b81f93..e254a03e9 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/pipeline/AdiabaticTwoPhasePipeTest.java +++ b/src/test/java/neqsim/processsimulation/processequipment/pipeline/AdiabaticTwoPhasePipeTest.java @@ -2,7 +2,8 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.pipeline.AdiabaticTwoPhasePipe; +import neqsim.process.equipment.stream.Stream; public class AdiabaticTwoPhasePipeTest { @Test @@ -28,8 +29,8 @@ public void testMain() { pipe2.setPipeWallRoughness(5e-6); // pipe.setOutPressure(112.0); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(pipe); operations.add(pipe2); diff --git a/src/test/java/neqsim/processsimulation/processequipment/pipeline/BeggsAndBrillsPipeTest.java b/src/test/java/neqsim/processsimulation/processequipment/pipeline/BeggsAndBrillsPipeTest.java index 7383281f9..f8e80bb45 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/pipeline/BeggsAndBrillsPipeTest.java +++ b/src/test/java/neqsim/processsimulation/processequipment/pipeline/BeggsAndBrillsPipeTest.java @@ -2,7 +2,8 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.pipeline.PipeBeggsAndBrills; +import neqsim.process.equipment.stream.Stream; import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -76,8 +77,8 @@ public void testPipeLineBeggsAndBrills() { pipe.setNumberOfIncrements(20); pipe.setRunIsothermal(false); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(pipe); operations.run(); @@ -124,8 +125,8 @@ public void testPipeLineBeggsAndBrills2() { pipe.setNumberOfIncrements(50); pipe.setRunIsothermal(false); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(pipe); operations.run(); @@ -174,8 +175,8 @@ public void testPipeLineBeggsAndBrills3() { pipe.setNumberOfIncrements(10); pipe.setRunIsothermal(false); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(pipe); operations.run(); @@ -238,8 +239,8 @@ public void testPipeLineBeggsAndBrills4() { pipe.setRunIsothermal(false); // test with only water phase - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(pipe); operations.run(); @@ -292,8 +293,8 @@ public void testPipeLineBeggsAndBrills4() { pipe2.setNumberOfIncrements(10); pipe2.setRunIsothermal(false); - neqsim.processsimulation.processsystem.ProcessSystem operations2 = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations2 = + new neqsim.process.processmodel.ProcessSystem(); operations2.add(stream_2); operations2.add(pipe2); operations2.run(); @@ -331,8 +332,8 @@ public void testPipeLineBeggsAndBrills4() { pipe3.setNumberOfIncrements(10); pipe3.setRunIsothermal(false); - neqsim.processsimulation.processsystem.ProcessSystem operations3 = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations3 = + new neqsim.process.processmodel.ProcessSystem(); operations3.add(stream_3); operations3.add(pipe3); operations3.run(); diff --git a/src/test/java/neqsim/processsimulation/processequipment/pipeline/PipelineTest.java b/src/test/java/neqsim/processsimulation/processequipment/pipeline/PipelineTest.java index 7ed705642..5a40b069b 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/pipeline/PipelineTest.java +++ b/src/test/java/neqsim/processsimulation/processequipment/pipeline/PipelineTest.java @@ -2,7 +2,10 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.pipeline.AdiabaticPipe; +import neqsim.process.equipment.pipeline.OnePhasePipeLine; +import neqsim.process.equipment.pipeline.PipeBeggsAndBrills; +import neqsim.process.equipment.stream.Stream; public class PipelineTest { @Test @@ -52,8 +55,8 @@ public void testMain() { beggsBrilsPipe.setDiameter(diameter); beggsBrilsPipe.setRunIsothermal(false); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(pipeline); operations.add(simplePipeline); diff --git a/src/test/java/neqsim/processsimulation/processequipment/powergeneration/GasTurbineTest.java b/src/test/java/neqsim/processsimulation/processequipment/powergeneration/GasTurbineTest.java index a8f34de39..424b66a72 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/powergeneration/GasTurbineTest.java +++ b/src/test/java/neqsim/processsimulation/processequipment/powergeneration/GasTurbineTest.java @@ -7,7 +7,8 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.powergeneration.GasTurbine; +import neqsim.process.equipment.stream.Stream; import neqsim.thermo.system.SystemSrkEos; public class GasTurbineTest extends neqsim.NeqSimTest { diff --git a/src/test/java/neqsim/processsimulation/processequipment/pump/PumpChartTest.java b/src/test/java/neqsim/processsimulation/processequipment/pump/PumpChartTest.java index de6b4d7b5..f13fca692 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/pump/PumpChartTest.java +++ b/src/test/java/neqsim/processsimulation/processequipment/pump/PumpChartTest.java @@ -2,6 +2,7 @@ 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/processsimulation/processequipment/pump/PumpTest.java b/src/test/java/neqsim/processsimulation/processequipment/pump/PumpTest.java index ef11df068..e362643d7 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/pump/PumpTest.java +++ b/src/test/java/neqsim/processsimulation/processequipment/pump/PumpTest.java @@ -2,7 +2,8 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.pump.Pump; +import neqsim.process.equipment.stream.Stream; /** *

diff --git a/src/test/java/neqsim/processsimulation/processequipment/reservoir/SimpleReservoirTest.java b/src/test/java/neqsim/processsimulation/processequipment/reservoir/SimpleReservoirTest.java index 7334b6142..885a62c91 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/reservoir/SimpleReservoirTest.java +++ b/src/test/java/neqsim/processsimulation/processequipment/reservoir/SimpleReservoirTest.java @@ -4,7 +4,8 @@ import org.apache.logging.log4j.Logger; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.reservoir.SimpleReservoir; +import neqsim.process.equipment.stream.StreamInterface; public class SimpleReservoirTest { static Logger logger = LogManager.getLogger(SimpleReservoirTest.class); diff --git a/src/test/java/neqsim/processsimulation/processequipment/reservoir/WellFlowTest.java b/src/test/java/neqsim/processsimulation/processequipment/reservoir/WellFlowTest.java index 78fb2cbfa..d30eb6791 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/reservoir/WellFlowTest.java +++ b/src/test/java/neqsim/processsimulation/processequipment/reservoir/WellFlowTest.java @@ -1,11 +1,13 @@ package neqsim.processsimulation.processequipment.reservoir; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processequipment.pipeline.PipeBeggsAndBrills; -import neqsim.processsimulation.processequipment.stream.StreamInterface; -import neqsim.processsimulation.processequipment.util.Adjuster; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; -import neqsim.processsimulation.processsystem.ProcessSystem; +import neqsim.process.equipment.pipeline.PipeBeggsAndBrills; +import neqsim.process.equipment.reservoir.SimpleReservoir; +import neqsim.process.equipment.reservoir.WellFlow; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.equipment.util.Adjuster; +import neqsim.process.equipment.valve.ThrottlingValve; +import neqsim.process.processmodel.ProcessSystem; public class WellFlowTest { @Test @@ -56,53 +58,53 @@ void testRunTransientRes2() { double producxtionIndex = 10.000100751427403E-3; - neqsim.processsimulation.processequipment.reservoir.SimpleReservoir reservoirOps = - new neqsim.processsimulation.processequipment.reservoir.SimpleReservoir("Well 1 reservoir"); + neqsim.process.equipment.reservoir.SimpleReservoir reservoirOps = + new neqsim.process.equipment.reservoir.SimpleReservoir("Well 1 reservoir"); reservoirOps.setReservoirFluid(fluid1.clone(), 700000000.0, 1.0, 10.0e7); reservoirOps.setLowPressureLimit(10.0, "bara"); StreamInterface producedGasStream = reservoirOps.addGasProducer("SLP_A32566GI"); producedGasStream.setFlowRate(9.0, "MSm3/day"); - neqsim.processsimulation.processequipment.reservoir.WellFlow wellflow = - new neqsim.processsimulation.processequipment.reservoir.WellFlow("well flow unit"); + neqsim.process.equipment.reservoir.WellFlow wellflow = + new neqsim.process.equipment.reservoir.WellFlow("well flow unit"); wellflow.setInletStream(producedGasStream); wellflow.setWellProductionIndex(producxtionIndex); - neqsim.processsimulation.processequipment.pipeline.PipeBeggsAndBrills pipe = - new neqsim.processsimulation.processequipment.pipeline.PipeBeggsAndBrills("pipe", + neqsim.process.equipment.pipeline.PipeBeggsAndBrills pipe = + new neqsim.process.equipment.pipeline.PipeBeggsAndBrills("pipe", wellflow.getOutletStream()); pipe.setPipeWallRoughness(5e-6); pipe.setLength(170.0); pipe.setElevation(170); pipe.setDiameter(0.625); - neqsim.processsimulation.processequipment.compressor.Compressor compressor = - new neqsim.processsimulation.processequipment.compressor.Compressor("subcomp"); + neqsim.process.equipment.compressor.Compressor compressor = + new neqsim.process.equipment.compressor.Compressor("subcomp"); compressor.setInletStream(pipe.getOutletStream()); compressor.setUsePolytropicCalc(true); compressor.setPolytropicEfficiency(0.6); compressor.setCompressionRatio(2.0); - neqsim.processsimulation.processequipment.heatexchanger.Cooler intercooler = - new neqsim.processsimulation.processequipment.heatexchanger.Cooler("cooler", + neqsim.process.equipment.heatexchanger.Cooler intercooler = + new neqsim.process.equipment.heatexchanger.Cooler("cooler", compressor.getOutletStream()); intercooler.setOutTemperature(25.0, "C"); - neqsim.processsimulation.processequipment.compressor.Compressor compressor2 = - new neqsim.processsimulation.processequipment.compressor.Compressor("subcomp2"); + neqsim.process.equipment.compressor.Compressor compressor2 = + new neqsim.process.equipment.compressor.Compressor("subcomp2"); compressor2.setInletStream(intercooler.getOutletStream()); compressor2.setUsePolytropicCalc(true); compressor2.setPolytropicEfficiency(0.6); compressor2.setCompressionRatio(2.0); - neqsim.processsimulation.processequipment.heatexchanger.Heater cooler1 = - new neqsim.processsimulation.processequipment.heatexchanger.Heater("cooler 1", + neqsim.process.equipment.heatexchanger.Heater cooler1 = + new neqsim.process.equipment.heatexchanger.Heater("cooler 1", compressor2.getOutletStream()); cooler1.setOutTemperature(30.0, "C"); - neqsim.processsimulation.processequipment.pipeline.PipeBeggsAndBrills pipeline = - new neqsim.processsimulation.processequipment.pipeline.PipeBeggsAndBrills("pipeline", + neqsim.process.equipment.pipeline.PipeBeggsAndBrills pipeline = + new neqsim.process.equipment.pipeline.PipeBeggsAndBrills("pipeline", cooler1.getOutletStream()); pipeline.setPipeWallRoughness(50e-6); pipeline.setLength(50 * 1e3); @@ -111,16 +113,16 @@ void testRunTransientRes2() { double richgas_inlet_pressure = 150.0; double max_gas_production = 9.0; - neqsim.processsimulation.processequipment.util.Adjuster adjuster = - new neqsim.processsimulation.processequipment.util.Adjuster("adjuster"); + neqsim.process.equipment.util.Adjuster adjuster = + new neqsim.process.equipment.util.Adjuster("adjuster"); adjuster.setTargetVariable(pipeline.getOutletStream(), "pressure", richgas_inlet_pressure, "bara"); adjuster.setAdjustedVariable(producedGasStream, "flow", "MSm3/day"); adjuster.setMaxAdjustedValue(max_gas_production); adjuster.setMinAdjustedValue(1.0); - neqsim.processsimulation.processsystem.ProcessSystem process = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem process = + new neqsim.process.processmodel.ProcessSystem(); process.add(reservoirOps); process.add(wellflow); process.add(pipe); diff --git a/src/test/java/neqsim/processsimulation/processequipment/separator/SeparatorTest.java b/src/test/java/neqsim/processsimulation/processequipment/separator/SeparatorTest.java index b465c5cee..a45ff3bf1 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/separator/SeparatorTest.java +++ b/src/test/java/neqsim/processsimulation/processequipment/separator/SeparatorTest.java @@ -3,10 +3,11 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.measurementdevice.LevelTransmitter; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; -import neqsim.processsimulation.processsystem.ProcessSystem; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.measurementdevice.LevelTransmitter; +import neqsim.process.processmodel.ProcessSystem; import neqsim.thermo.system.SystemSrkCPAstatoil; /** diff --git a/src/test/java/neqsim/processsimulation/processequipment/separator/ThreePhaseSeparatorTest.java b/src/test/java/neqsim/processsimulation/processequipment/separator/ThreePhaseSeparatorTest.java index 169c702c1..da14df893 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/separator/ThreePhaseSeparatorTest.java +++ b/src/test/java/neqsim/processsimulation/processequipment/separator/ThreePhaseSeparatorTest.java @@ -6,9 +6,9 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; - -import neqsim.processsimulation.processequipment.heatexchanger.Heater; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.heatexchanger.Heater; +import neqsim.process.equipment.separator.ThreePhaseSeparator; +import neqsim.process.equipment.stream.Stream; import neqsim.thermo.phase.PhaseEosInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; diff --git a/src/test/java/neqsim/processsimulation/processequipment/splitter/ComponentSplitterTest.java b/src/test/java/neqsim/processsimulation/processequipment/splitter/ComponentSplitterTest.java index a718905e5..7ca433f30 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/splitter/ComponentSplitterTest.java +++ b/src/test/java/neqsim/processsimulation/processequipment/splitter/ComponentSplitterTest.java @@ -5,13 +5,15 @@ import org.apache.logging.log4j.Logger; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processequipment.compressor.Compressor; -import neqsim.processsimulation.processequipment.mixer.Mixer; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; -import neqsim.processsimulation.processequipment.util.Recycle; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; -import neqsim.processsimulation.processsystem.ProcessSystem; +import neqsim.process.equipment.compressor.Compressor; +import neqsim.process.equipment.mixer.Mixer; +import neqsim.process.equipment.splitter.ComponentSplitter; +import neqsim.process.equipment.splitter.Splitter; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.equipment.util.Recycle; +import neqsim.process.equipment.valve.ThrottlingValve; +import neqsim.process.processmodel.ProcessSystem; import neqsim.thermo.system.SystemSrkEos; class ComponentSplitterTest { diff --git a/src/test/java/neqsim/processsimulation/processequipment/stream/StreamTest.java b/src/test/java/neqsim/processsimulation/processequipment/stream/StreamTest.java index 9205f2668..bafcc3fa8 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/stream/StreamTest.java +++ b/src/test/java/neqsim/processsimulation/processequipment/stream/StreamTest.java @@ -6,7 +6,8 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processsystem.ProcessSystem; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.processmodel.ProcessSystem; import neqsim.thermo.system.SystemSrkEos; /** diff --git a/src/test/java/neqsim/processsimulation/processequipment/stream/VirtualStreamTest.java b/src/test/java/neqsim/processsimulation/processequipment/stream/VirtualStreamTest.java index 8cf0b72f0..15fc3817a 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/stream/VirtualStreamTest.java +++ b/src/test/java/neqsim/processsimulation/processequipment/stream/VirtualStreamTest.java @@ -3,7 +3,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processsystem.ProcessSystem; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.VirtualStream; +import neqsim.process.processmodel.ProcessSystem; import neqsim.thermo.system.SystemSrkEos; public class VirtualStreamTest { diff --git a/src/test/java/neqsim/processsimulation/processequipment/util/AdjusterTest.java b/src/test/java/neqsim/processsimulation/processequipment/util/AdjusterTest.java index f41701e4c..7f6624d00 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/util/AdjusterTest.java +++ b/src/test/java/neqsim/processsimulation/processequipment/util/AdjusterTest.java @@ -12,14 +12,14 @@ void testRun() { neqsim.thermo.system.SystemInterface fluid1 = neqsim.thermo.FluidCreator.create("light oil"); fluid1.setMixingRule("classic"); - neqsim.processsimulation.processequipment.stream.Stream stream1 = - new neqsim.processsimulation.processequipment.stream.Stream("light oil", fluid1.clone()); + neqsim.process.equipment.stream.Stream stream1 = + new neqsim.process.equipment.stream.Stream("light oil", fluid1.clone()); stream1.setFlowRate(1.5, "MSm3/day"); stream1.setPressure(bottomholepressure, "bara"); stream1.setTemperature(75.0, "C"); - neqsim.processsimulation.processequipment.pipeline.PipeBeggsAndBrills flowline1 = - new neqsim.processsimulation.processequipment.pipeline.PipeBeggsAndBrills("flowline", + neqsim.process.equipment.pipeline.PipeBeggsAndBrills flowline1 = + new neqsim.process.equipment.pipeline.PipeBeggsAndBrills("flowline", stream1); flowline1.setDiameter(0.25); flowline1.setPipeWallRoughness(15e-6); @@ -27,16 +27,16 @@ void testRun() { flowline1.setElevation(1200.0); flowline1.setNumberOfIncrements(20); - neqsim.processsimulation.processequipment.util.Adjuster adjuster = - new neqsim.processsimulation.processequipment.util.Adjuster("adjuster"); + neqsim.process.equipment.util.Adjuster adjuster = + new neqsim.process.equipment.util.Adjuster("adjuster"); adjuster.setTargetVariable(flowline1.getOutletStream(), "pressure", wellheadpressure, "bara"); adjuster.setAdjustedVariable(stream1, "flow", "MSm3/day"); adjuster.setMaxAdjustedValue(10.0); adjuster.setMinAdjustedValue(1); adjuster.setTolerance(1e-5); - neqsim.processsimulation.processsystem.ProcessSystem process = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem process = + new neqsim.process.processmodel.ProcessSystem(); process.add(stream1); process.add(flowline1); process.add(adjuster); @@ -54,14 +54,14 @@ void testRun2() { neqsim.thermo.system.SystemInterface fluid1 = neqsim.thermo.FluidCreator.create("light oil"); fluid1.setMixingRule("classic"); - neqsim.processsimulation.processequipment.stream.Stream stream1 = - new neqsim.processsimulation.processequipment.stream.Stream("light oil", fluid1.clone()); + neqsim.process.equipment.stream.Stream stream1 = + new neqsim.process.equipment.stream.Stream("light oil", fluid1.clone()); stream1.setFlowRate(4.0, "MSm3/day"); stream1.setPressure(170, "bara"); stream1.setTemperature(75.0, "C"); - neqsim.processsimulation.processequipment.pipeline.PipeBeggsAndBrills flowline1 = - new neqsim.processsimulation.processequipment.pipeline.PipeBeggsAndBrills("flowline", + neqsim.process.equipment.pipeline.PipeBeggsAndBrills flowline1 = + new neqsim.process.equipment.pipeline.PipeBeggsAndBrills("flowline", stream1); flowline1.setDiameter(0.25); flowline1.setPipeWallRoughness(15e-6); @@ -69,16 +69,16 @@ void testRun2() { flowline1.setElevation(1200.0); flowline1.setNumberOfIncrements(20); - neqsim.processsimulation.processequipment.util.Adjuster adjuster = - new neqsim.processsimulation.processequipment.util.Adjuster("adjuster"); + neqsim.process.equipment.util.Adjuster adjuster = + new neqsim.process.equipment.util.Adjuster("adjuster"); adjuster.setTargetVariable(flowline1.getOutletStream(), "pressure", wellheadpressure, "bara"); adjuster.setAdjustedVariable(stream1, "pressure", "bara"); adjuster.setMaxAdjustedValue(260.0); adjuster.setMinAdjustedValue(50.1); adjuster.setTolerance(1e-5); - neqsim.processsimulation.processsystem.ProcessSystem process = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem process = + new neqsim.process.processmodel.ProcessSystem(); process.add(stream1); process.add(flowline1); process.add(adjuster); diff --git a/src/test/java/neqsim/processsimulation/processequipment/util/FlowSetterTest.java b/src/test/java/neqsim/processsimulation/processequipment/util/FlowSetterTest.java index b76f83577..e26d8650c 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/util/FlowSetterTest.java +++ b/src/test/java/neqsim/processsimulation/processequipment/util/FlowSetterTest.java @@ -2,10 +2,11 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.measurementdevice.MultiPhaseMeter; -import neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +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; @@ -40,8 +41,8 @@ void testMain() { flowset.setGasFlowRate(multiPhaseMeter.getMeasuredValue("Gas Flow Rate", "Sm3/hr"), "Sm3/hr"); flowset.setOilFlowRate(multiPhaseMeter.getMeasuredValue("Oil Flow Rate", "m3/hr"), "m3/hr"); flowset.setWaterFlowRate(multiPhaseMeter.getMeasuredValue("Water Flow Rate", "m3/hr"), "m3/hr"); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(multiPhaseMeter); operations.add(flowset); @@ -89,8 +90,8 @@ void testProcessWithFlowSetter() { StreamInterface gasFromSepStream = separator.getGasOutStream(); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(flowset); operations.add(separator); diff --git a/src/test/java/neqsim/processsimulation/processequipment/util/GORfitterTest.java b/src/test/java/neqsim/processsimulation/processequipment/util/GORfitterTest.java index 2a62683db..ebbc4580a 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/util/GORfitterTest.java +++ b/src/test/java/neqsim/processsimulation/processequipment/util/GORfitterTest.java @@ -2,8 +2,9 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.measurementdevice.MultiPhaseMeter; -import neqsim.processsimulation.processequipment.stream.Stream; +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; import neqsim.thermo.system.SystemSrkEos; @@ -48,8 +49,8 @@ void testMain() { multiPhaseMeter2.setTemperature(90.0, "C"); multiPhaseMeter2.setPressure(60.0, "bara"); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(multiPhaseMeter); operations.add(gORFItter); diff --git a/src/test/java/neqsim/processsimulation/processequipment/util/MPFMfitterTest.java b/src/test/java/neqsim/processsimulation/processequipment/util/MPFMfitterTest.java index 9f19e5332..401363c51 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/util/MPFMfitterTest.java +++ b/src/test/java/neqsim/processsimulation/processequipment/util/MPFMfitterTest.java @@ -2,8 +2,9 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.measurementdevice.MultiPhaseMeter; -import neqsim.processsimulation.processequipment.stream.Stream; +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; import neqsim.thermo.system.SystemSrkEos; @@ -56,8 +57,8 @@ void testRun() { multiPhaseMeter2.setTemperature(90.0, "C"); multiPhaseMeter2.setPressure(60.0, "bara"); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(MPFMfitter); operations.add(stream_2); diff --git a/src/test/java/neqsim/processsimulation/processequipment/util/PressureDropTest.java b/src/test/java/neqsim/processsimulation/processequipment/util/PressureDropTest.java index fba8db02f..97e1c18d5 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/util/PressureDropTest.java +++ b/src/test/java/neqsim/processsimulation/processequipment/util/PressureDropTest.java @@ -2,7 +2,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.util.PressureDrop; import neqsim.thermo.system.SystemSrkEos; public class PressureDropTest { diff --git a/src/test/java/neqsim/processsimulation/processequipment/util/StreamSaturatorUtilTest.java b/src/test/java/neqsim/processsimulation/processequipment/util/StreamSaturatorUtilTest.java index b69e3703b..947966c4c 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/util/StreamSaturatorUtilTest.java +++ b/src/test/java/neqsim/processsimulation/processequipment/util/StreamSaturatorUtilTest.java @@ -4,8 +4,9 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processsystem.ProcessSystem; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.util.StreamSaturatorUtil; +import neqsim.process.processmodel.ProcessSystem; import neqsim.thermo.system.SystemSrkEos; public class StreamSaturatorUtilTest extends neqsim.NeqSimTest { diff --git a/src/test/java/neqsim/processsimulation/processequipment/valve/ThrottlingValveTest.java b/src/test/java/neqsim/processsimulation/processequipment/valve/ThrottlingValveTest.java index 1445dbce8..f4c94a24c 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/valve/ThrottlingValveTest.java +++ b/src/test/java/neqsim/processsimulation/processequipment/valve/ThrottlingValveTest.java @@ -2,7 +2,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.valve.ThrottlingValve; public class ThrottlingValveTest { @Test diff --git a/src/test/java/neqsim/processsimulation/processsystem/CombinedOilGasFieldTest.java b/src/test/java/neqsim/processsimulation/processsystem/CombinedOilGasFieldTest.java index 62b7404b3..48e6a9841 100644 --- a/src/test/java/neqsim/processsimulation/processsystem/CombinedOilGasFieldTest.java +++ b/src/test/java/neqsim/processsimulation/processsystem/CombinedOilGasFieldTest.java @@ -2,8 +2,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.measurementdevice.MultiPhaseMeter; -import neqsim.processsimulation.processequipment.reservoir.ReservoirTPsim; +import neqsim.process.equipment.reservoir.ReservoirTPsim; +import neqsim.process.measurementdevice.MultiPhaseMeter; public class CombinedOilGasFieldTest { @Test @@ -75,8 +75,8 @@ public void testreservoirTPsim() { // MPFMoil.setTemperature(60.0, "C"); // MPFMoil.setPressure(20.0, "bara"); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(reservoirGasTPsim); operations.add(MPFMgas); operations.run(); diff --git a/src/test/java/neqsim/processsimulation/processsystem/CompressorModule.java b/src/test/java/neqsim/processsimulation/processsystem/CompressorModule.java index a39e91a81..2509fb386 100644 --- a/src/test/java/neqsim/processsimulation/processsystem/CompressorModule.java +++ b/src/test/java/neqsim/processsimulation/processsystem/CompressorModule.java @@ -3,17 +3,17 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processequipment.compressor.Compressor; -import neqsim.processsimulation.processequipment.heatexchanger.Cooler; -import neqsim.processsimulation.processequipment.heatexchanger.Heater; -import neqsim.processsimulation.processequipment.mixer.Mixer; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator; -import neqsim.processsimulation.processequipment.splitter.Splitter; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; -import neqsim.processsimulation.processequipment.util.Recycle; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; +import neqsim.process.equipment.compressor.Compressor; +import neqsim.process.equipment.heatexchanger.Cooler; +import neqsim.process.equipment.heatexchanger.Heater; +import neqsim.process.equipment.mixer.Mixer; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.separator.ThreePhaseSeparator; +import neqsim.process.equipment.splitter.Splitter; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.equipment.util.Recycle; +import neqsim.process.equipment.valve.ThrottlingValve; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; @@ -113,8 +113,8 @@ public void testProcess() { recycle1.addStream(scrubber1.getLiquidOutStream()); recycle1.setOutletStream(recycleScrubberStream); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(feedStream); operations.add(inletSeparator); operations.add(oilHeater); @@ -136,8 +136,8 @@ public void testProcess() { assertEquals(2042.17826, recycleScrubberStream.getFlowRate("kg/hr"), 0.1); - neqsim.processsimulation.processequipment.compressor.CompressorChartGenerator compchartgenerator = - new neqsim.processsimulation.processequipment.compressor.CompressorChartGenerator( + neqsim.process.equipment.compressor.CompressorChartGenerator compchartgenerator = + new neqsim.process.equipment.compressor.CompressorChartGenerator( seccondStageCompressor); compchartgenerator.generateCompressorChart("mid range"); diff --git a/src/test/java/neqsim/processsimulation/processsystem/GlycolModulesTest.java b/src/test/java/neqsim/processsimulation/processsystem/GlycolModulesTest.java index eff2fe10a..027dda98f 100644 --- a/src/test/java/neqsim/processsimulation/processsystem/GlycolModulesTest.java +++ b/src/test/java/neqsim/processsimulation/processsystem/GlycolModulesTest.java @@ -1,22 +1,22 @@ package neqsim.processsimulation.processsystem; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.measurementdevice.HydrateEquilibriumTemperatureAnalyser; -import neqsim.processsimulation.measurementdevice.WaterDewPointAnalyser; -import neqsim.processsimulation.processequipment.absorber.SimpleTEGAbsorber; -import neqsim.processsimulation.processequipment.absorber.WaterStripperColumn; -import neqsim.processsimulation.processequipment.distillation.DistillationColumn; -import neqsim.processsimulation.processequipment.filter.Filter; -import neqsim.processsimulation.processequipment.heatexchanger.Heater; -import neqsim.processsimulation.processequipment.mixer.StaticMixer; -import neqsim.processsimulation.processequipment.pump.Pump; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.splitter.Splitter; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.util.Calculator; -import neqsim.processsimulation.processequipment.util.Recycle; -import neqsim.processsimulation.processequipment.util.StreamSaturatorUtil; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; +import neqsim.process.equipment.absorber.SimpleTEGAbsorber; +import neqsim.process.equipment.absorber.WaterStripperColumn; +import neqsim.process.equipment.distillation.DistillationColumn; +import neqsim.process.equipment.filter.Filter; +import neqsim.process.equipment.heatexchanger.Heater; +import neqsim.process.equipment.mixer.StaticMixer; +import neqsim.process.equipment.pump.Pump; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.splitter.Splitter; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.util.Calculator; +import neqsim.process.equipment.util.Recycle; +import neqsim.process.equipment.util.StreamSaturatorUtil; +import neqsim.process.equipment.valve.ThrottlingValve; +import neqsim.process.measurementdevice.HydrateEquilibriumTemperatureAnalyser; +import neqsim.process.measurementdevice.WaterDewPointAnalyser; import neqsim.thermo.phase.PhaseEosInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -301,8 +301,8 @@ public void runProcessTEG() throws InterruptedException { recycleLeanTEG.setPriority(200); recycleLeanTEG.setDownstreamProperty("flow rate"); - neqsim.processsimulation.processsystem.ProcessSystem operations1 = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations1 = + new neqsim.process.processmodel.ProcessSystem(); operations1.add(dryFeedGasSmøbukk); operations1.add(saturatedFeedGasSmøbukk); operations1.add(waterSaturatedFeedGasSmøbukk); @@ -318,8 +318,8 @@ public void runProcessTEG() throws InterruptedException { operations1.add(hydrateTAnalyser2); operations1.add(waterDewPointAnalyserToAbsorber); - neqsim.processsimulation.processsystem.ProcessSystem operations2 = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations2 = + new neqsim.process.processmodel.ProcessSystem(); // Rec module TEG operations2.add(TEGFeed); operations2.add(feedToAbsorber); @@ -336,8 +336,8 @@ public void runProcessTEG() throws InterruptedException { operations2.add(heatEx); operations2.add(strippingGas); - neqsim.processsimulation.processsystem.ProcessSystem operations3 = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations3 = + new neqsim.process.processmodel.ProcessSystem(); // Rec module gas to rebo,0 operations3.add(gasToReboiler); operations3.add(glycol_flash_valve2); @@ -352,8 +352,8 @@ public void runProcessTEG() throws InterruptedException { operations3.add(recycleFlareGas); // Finish Rec Stripping gas - neqsim.processsimulation.processsystem.ProcessSystem operations4 = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations4 = + new neqsim.process.processmodel.ProcessSystem(); operations4.add(liquidToTreatment); operations4.add(makeupTEG); operations4.add(makeupCalculator); @@ -363,34 +363,34 @@ public void runProcessTEG() throws InterruptedException { operations4.add(leanTEGtoabs); operations4.add(recycleLeanTEG); - neqsim.processsimulation.processsystem.ProcessSystem operations5 = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations5 = + new neqsim.process.processmodel.ProcessSystem(); // Finish Rec Lean TEG l operations5.add(dehydratedGas); operations5.add(waterDewPointAnalyser); operations5.add(waterDewPointAnalyser2); - neqsim.processsimulation.processsystem.ProcessModule module1 = - new neqsim.processsimulation.processsystem.ProcessModule("Start process"); + neqsim.process.processmodel.ProcessModule module1 = + new neqsim.process.processmodel.ProcessModule("Start process"); module1.add(operations1); module1.add(operations2); - neqsim.processsimulation.processsystem.ProcessModule module2 = - new neqsim.processsimulation.processsystem.ProcessModule("Column recycle"); + neqsim.process.processmodel.ProcessModule module2 = + new neqsim.process.processmodel.ProcessModule("Column recycle"); module2.add(operations3); - neqsim.processsimulation.processsystem.ProcessModule module3 = - new neqsim.processsimulation.processsystem.ProcessModule("TEG recycle"); + neqsim.process.processmodel.ProcessModule module3 = + new neqsim.process.processmodel.ProcessModule("TEG recycle"); module3.add(operations2); module3.add(module2); module3.add(operations4); - neqsim.processsimulation.processsystem.ProcessModule module4 = - new neqsim.processsimulation.processsystem.ProcessModule("Finish Process"); + neqsim.process.processmodel.ProcessModule module4 = + new neqsim.process.processmodel.ProcessModule("Finish Process"); module4.add(operations5); - neqsim.processsimulation.processsystem.ProcessModule modules = - new neqsim.processsimulation.processsystem.ProcessModule("Modules wrapper"); + neqsim.process.processmodel.ProcessModule modules = + new neqsim.process.processmodel.ProcessModule("Modules wrapper"); modules.add(module1); modules.add(module2); modules.add(module3); diff --git a/src/test/java/neqsim/processsimulation/processsystem/GlycolRigTest.java b/src/test/java/neqsim/processsimulation/processsystem/GlycolRigTest.java index fb2deb2f0..439fb5976 100644 --- a/src/test/java/neqsim/processsimulation/processsystem/GlycolRigTest.java +++ b/src/test/java/neqsim/processsimulation/processsystem/GlycolRigTest.java @@ -5,14 +5,15 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processequipment.absorber.WaterStripperColumn; -import neqsim.processsimulation.processequipment.compressor.Compressor; -import neqsim.processsimulation.processequipment.distillation.DistillationColumn; -import neqsim.processsimulation.processequipment.heatexchanger.Heater; -import neqsim.processsimulation.processequipment.mixer.Mixer; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.util.Recycle; +import neqsim.process.equipment.absorber.WaterStripperColumn; +import neqsim.process.equipment.compressor.Compressor; +import neqsim.process.equipment.distillation.DistillationColumn; +import neqsim.process.equipment.heatexchanger.Heater; +import neqsim.process.equipment.mixer.Mixer; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.util.Recycle; +import neqsim.process.processmodel.ProcessSystem; import neqsim.thermo.ThermodynamicConstantsInterface; /** @@ -102,8 +103,8 @@ public void runTEGProcessTest() { TEGWaterMixer.addStream(coolerStripper.getOutletStream()); TEGWaterMixer.addStream(liquidToTreatment); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(TEGtoRegenerator); operations.add(strippingGas); operations.add(gasToReboiler); @@ -198,8 +199,8 @@ public void runDistillationProcessTest() { column.setTopPressure(1.0 + ThermodynamicConstantsInterface.referencePressure); column.setBottomPressure(1.0 + ThermodynamicConstantsInterface.referencePressure); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(feedToRegenerator); operations.add(column); @@ -245,8 +246,8 @@ public void runDistillationProcessTest2() { column.setTopPressure(1.0 + 5.01325); column.setBottomPressure(1.0 + 5.01325); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(feedToRegenerator); operations.add(column); @@ -295,8 +296,8 @@ public void runDistillationProcessTest3() { column.addFeedStream(feedToRegenerator2, 0); column.addFeedStream(feedToRegenerator, 1); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(feedToRegenerator); operations.add(feedToRegenerator2); operations.add(column); diff --git a/src/test/java/neqsim/processsimulation/processsystem/MLA_bug_test.java b/src/test/java/neqsim/processsimulation/processsystem/MLA_bug_test.java index 816a23a8e..8099763e6 100644 --- a/src/test/java/neqsim/processsimulation/processsystem/MLA_bug_test.java +++ b/src/test/java/neqsim/processsimulation/processsystem/MLA_bug_test.java @@ -4,22 +4,23 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.measurementdevice.WaterDewPointAnalyser; -import neqsim.processsimulation.processequipment.absorber.SimpleTEGAbsorber; -import neqsim.processsimulation.processequipment.absorber.WaterStripperColumn; -import neqsim.processsimulation.processequipment.distillation.DistillationColumn; -import neqsim.processsimulation.processequipment.filter.Filter; -import neqsim.processsimulation.processequipment.heatexchanger.HeatExchanger; -import neqsim.processsimulation.processequipment.heatexchanger.Heater; -import neqsim.processsimulation.processequipment.mixer.Mixer; -import neqsim.processsimulation.processequipment.pump.Pump; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; -import neqsim.processsimulation.processequipment.util.Calculator; -import neqsim.processsimulation.processequipment.util.Recycle; -import neqsim.processsimulation.processequipment.util.StreamSaturatorUtil; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; +import neqsim.process.equipment.absorber.SimpleTEGAbsorber; +import neqsim.process.equipment.absorber.WaterStripperColumn; +import neqsim.process.equipment.distillation.DistillationColumn; +import neqsim.process.equipment.filter.Filter; +import neqsim.process.equipment.heatexchanger.HeatExchanger; +import neqsim.process.equipment.heatexchanger.Heater; +import neqsim.process.equipment.mixer.Mixer; +import neqsim.process.equipment.pump.Pump; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.equipment.util.Calculator; +import neqsim.process.equipment.util.Recycle; +import neqsim.process.equipment.util.StreamSaturatorUtil; +import neqsim.process.equipment.valve.ThrottlingValve; +import neqsim.process.measurementdevice.WaterDewPointAnalyser; +import neqsim.process.processmodel.ProcessSystem; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkCPA; import neqsim.thermo.util.empiric.BukacekWaterInGas; diff --git a/src/test/java/neqsim/processsimulation/processsystem/OilGasProcessTest.java b/src/test/java/neqsim/processsimulation/processsystem/OilGasProcessTest.java index 946479700..6de2aa2ee 100644 --- a/src/test/java/neqsim/processsimulation/processsystem/OilGasProcessTest.java +++ b/src/test/java/neqsim/processsimulation/processsystem/OilGasProcessTest.java @@ -2,18 +2,18 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processequipment.compressor.Compressor; -import neqsim.processsimulation.processequipment.heatexchanger.Cooler; -import neqsim.processsimulation.processequipment.heatexchanger.Heater; -import neqsim.processsimulation.processequipment.mixer.Mixer; -import neqsim.processsimulation.processequipment.pump.Pump; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.splitter.Splitter; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; -import neqsim.processsimulation.processequipment.util.Calculator; -import neqsim.processsimulation.processequipment.util.Recycle; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; +import neqsim.process.equipment.compressor.Compressor; +import neqsim.process.equipment.heatexchanger.Cooler; +import neqsim.process.equipment.heatexchanger.Heater; +import neqsim.process.equipment.mixer.Mixer; +import neqsim.process.equipment.pump.Pump; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.splitter.Splitter; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.equipment.util.Calculator; +import neqsim.process.equipment.util.Recycle; +import neqsim.process.equipment.valve.ThrottlingValve; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; @@ -57,8 +57,8 @@ public void runProcess() throws InterruptedException { feedStream.setTemperature(25.5, "C"); feedStream.setPressure(26.0, "bara"); - neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator seprator1stStage = - new neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator( + neqsim.process.equipment.separator.ThreePhaseSeparator seprator1stStage = + new neqsim.process.equipment.separator.ThreePhaseSeparator( "1st stage separator", feedStream); ThrottlingValve valve1 = new ThrottlingValve("valve1", seprator1stStage.getLiquidOutStream()); @@ -67,8 +67,8 @@ public void runProcess() throws InterruptedException { Heater oilHeater = new Heater("oil heater", valve1.getOutletStream()); oilHeater.setOutTemperature(359.0); - neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator seprator2ndStage = - new neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator( + neqsim.process.equipment.separator.ThreePhaseSeparator seprator2ndStage = + new neqsim.process.equipment.separator.ThreePhaseSeparator( "2nd stage separator", oilHeater.getOutletStream()); ThrottlingValve valve2 = new ThrottlingValve("valve2", seprator2ndStage.getLiquidOutStream()); @@ -77,8 +77,8 @@ public void runProcess() throws InterruptedException { StreamInterface recircstream1 = valve2.getOutletStream().clone("oilRecirc1"); recircstream1.setFlowRate(1e-6, "kg/hr"); - neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator seprator3rdStage = - new neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator( + neqsim.process.equipment.separator.ThreePhaseSeparator seprator3rdStage = + new neqsim.process.equipment.separator.ThreePhaseSeparator( "3rd stage separator"); seprator3rdStage.addStream(valve2.getOutletStream()); seprator3rdStage.addStream(recircstream1); @@ -102,8 +102,8 @@ public void runProcess() throws InterruptedException { recycle1.addStream(valveLP1.getOutletStream()); recycle1.setOutletStream(recircstream1); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(feedStream); operations.add(seprator1stStage); operations.add(valve1); @@ -161,8 +161,8 @@ public void runAntiSurgeProcess() throws InterruptedException { gascompressor.run(); double fluidh = gascompressor.getPolytropicFluidHead(); - neqsim.processsimulation.processequipment.compressor.CompressorChartGenerator compchartgenerator = - new neqsim.processsimulation.processequipment.compressor.CompressorChartGenerator( + neqsim.process.equipment.compressor.CompressorChartGenerator compchartgenerator = + new neqsim.process.equipment.compressor.CompressorChartGenerator( gascompressor); gascompressor.setCompressorChart(compchartgenerator.generateCompressorChart("mid range")); @@ -194,8 +194,8 @@ public void runAntiSurgeProcess() throws InterruptedException { antisurgeCalculator.addInputVariable(gascompressor); antisurgeCalculator.setOutputVariable(gassplitter); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(gas_from_separator); operations.add(recyclegasstream); operations.add(gasmixer); @@ -297,8 +297,8 @@ public void runAntiSurgeProcess2() throws InterruptedException { recycl.setOutletStream(recyclegasstream); recycl.setFlowTolerance(1e-2); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(gas_from_separator); operations.add(recyclegasstream); operations.add(gasmixer); @@ -314,8 +314,8 @@ public void runAntiSurgeProcess2() throws InterruptedException { double fluidh = gascompressor.getPolytropicFluidHead(); double flowratetocompressor = gascompressor.getInletStream().getFlowRate("MSm3/day"); - neqsim.processsimulation.processequipment.compressor.CompressorChartGenerator compchartgenerator = - new neqsim.processsimulation.processequipment.compressor.CompressorChartGenerator( + neqsim.process.equipment.compressor.CompressorChartGenerator compchartgenerator = + new neqsim.process.equipment.compressor.CompressorChartGenerator( gascompressor); gascompressor.setCompressorChart(compchartgenerator.generateCompressorChart("mid range")); gascompressor.setOutletPressure(90.0); diff --git a/src/test/java/neqsim/processsimulation/processsystem/OilProcessTest.java b/src/test/java/neqsim/processsimulation/processsystem/OilProcessTest.java index 366bb2909..f3c63ae65 100644 --- a/src/test/java/neqsim/processsimulation/processsystem/OilProcessTest.java +++ b/src/test/java/neqsim/processsimulation/processsystem/OilProcessTest.java @@ -3,6 +3,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.junit.jupiter.api.BeforeEach; +import neqsim.process.processmodel.ProcessSystem; /** * Test class for GlycolRig. diff --git a/src/test/java/neqsim/processsimulation/processsystem/ProcessSystemControllerTest.java b/src/test/java/neqsim/processsimulation/processsystem/ProcessSystemControllerTest.java index 8d88be03f..12a86affe 100644 --- a/src/test/java/neqsim/processsimulation/processsystem/ProcessSystemControllerTest.java +++ b/src/test/java/neqsim/processsimulation/processsystem/ProcessSystemControllerTest.java @@ -5,12 +5,13 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.controllerdevice.ControllerDeviceBaseClass; -import neqsim.processsimulation.controllerdevice.ControllerDeviceInterface; -import neqsim.processsimulation.measurementdevice.VolumeFlowTransmitter; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; +import neqsim.process.controllerdevice.ControllerDeviceBaseClass; +import neqsim.process.controllerdevice.ControllerDeviceInterface; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.valve.ThrottlingValve; +import neqsim.process.measurementdevice.VolumeFlowTransmitter; +import neqsim.process.processmodel.ProcessSystem; import neqsim.thermo.system.SystemInterface; public class ProcessSystemControllerTest extends neqsim.NeqSimTest { diff --git a/src/test/java/neqsim/processsimulation/processsystem/ProcessSystemRunTransientTest.java b/src/test/java/neqsim/processsimulation/processsystem/ProcessSystemRunTransientTest.java index f7ec65b5f..a253ca6cc 100644 --- a/src/test/java/neqsim/processsimulation/processsystem/ProcessSystemRunTransientTest.java +++ b/src/test/java/neqsim/processsimulation/processsystem/ProcessSystemRunTransientTest.java @@ -4,21 +4,22 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.SimulationInterface; -import neqsim.processsimulation.controllerdevice.ControllerDeviceBaseClass; -import neqsim.processsimulation.controllerdevice.ControllerDeviceInterface; -import neqsim.processsimulation.measurementdevice.CompressorMonitor; -import neqsim.processsimulation.measurementdevice.LevelTransmitter; -import neqsim.processsimulation.measurementdevice.PressureTransmitter; -import neqsim.processsimulation.measurementdevice.VolumeFlowTransmitter; -import neqsim.processsimulation.processequipment.compressor.Compressor; -import neqsim.processsimulation.processequipment.heatexchanger.Cooler; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.splitter.Splitter; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.util.Recycle; -import neqsim.processsimulation.processequipment.util.SetPoint; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; +import neqsim.process.SimulationInterface; +import neqsim.process.controllerdevice.ControllerDeviceBaseClass; +import neqsim.process.controllerdevice.ControllerDeviceInterface; +import neqsim.process.equipment.compressor.Compressor; +import neqsim.process.equipment.heatexchanger.Cooler; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.splitter.Splitter; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.util.Recycle; +import neqsim.process.equipment.util.SetPoint; +import neqsim.process.equipment.valve.ThrottlingValve; +import neqsim.process.measurementdevice.CompressorMonitor; +import neqsim.process.measurementdevice.LevelTransmitter; +import neqsim.process.measurementdevice.PressureTransmitter; +import neqsim.process.measurementdevice.VolumeFlowTransmitter; +import neqsim.process.processmodel.ProcessSystem; import neqsim.thermo.system.SystemInterface; public class ProcessSystemRunTransientTest extends neqsim.NeqSimTest { @@ -289,8 +290,8 @@ public void testDynamicCompressor() { */ assertEquals(100.0, compressor1.getOutletStream().getPressure(), 0.01); - neqsim.processsimulation.processequipment.compressor.CompressorChartGenerator compchartgenerator = - new neqsim.processsimulation.processequipment.compressor.CompressorChartGenerator( + neqsim.process.equipment.compressor.CompressorChartGenerator compchartgenerator = + new neqsim.process.equipment.compressor.CompressorChartGenerator( compressor1); compressor1.setCompressorChart(compchartgenerator.generateCompressorChart("normal")); compressor1.getCompressorChart().setUseCompressorChart(true); @@ -394,8 +395,8 @@ public void testDynamicCompressor22() { assertEquals(100.0, compressor1.getOutletStream().getPressure(), 0.01); // System.out.println("steady state with compressor curves....."); - neqsim.processsimulation.processequipment.compressor.CompressorChartGenerator compchartgenerator = - new neqsim.processsimulation.processequipment.compressor.CompressorChartGenerator( + neqsim.process.equipment.compressor.CompressorChartGenerator compchartgenerator = + new neqsim.process.equipment.compressor.CompressorChartGenerator( compressor1); compressor1.setCompressorChart(compchartgenerator.generateCompressorChart("normal")); compressor1.getCompressorChart().setUseCompressorChart(true); @@ -508,8 +509,8 @@ public void testDynamicCompressorSpeedControl() { */ assertEquals(100.0, compressor1.getOutletStream().getPressure(), 0.01); - neqsim.processsimulation.processequipment.compressor.CompressorChartGenerator compchartgenerator = - new neqsim.processsimulation.processequipment.compressor.CompressorChartGenerator( + neqsim.process.equipment.compressor.CompressorChartGenerator compchartgenerator = + new neqsim.process.equipment.compressor.CompressorChartGenerator( compressor1); compressor1.setCompressorChart(compchartgenerator.generateCompressorChart("normal")); compressor1.getCompressorChart().setUseCompressorChart(true); @@ -676,8 +677,8 @@ public void testAntiSurgeControl() { * " pres inn " + compressor1.getInletStream().getPressure() + " pres out " + * compressor1.getOutletStream().getPressure() + " distancetosurge "); */ - neqsim.processsimulation.processequipment.compressor.CompressorChartGenerator compchartgenerator = - new neqsim.processsimulation.processequipment.compressor.CompressorChartGenerator( + neqsim.process.equipment.compressor.CompressorChartGenerator compchartgenerator = + new neqsim.process.equipment.compressor.CompressorChartGenerator( compressor1); compressor1.setCompressorChart(compchartgenerator.generateCompressorChart("normal")); compressor1.getCompressorChart().setUseCompressorChart(true); diff --git a/src/test/java/neqsim/processsimulation/processsystem/ProcessSystemSerializationTest.java b/src/test/java/neqsim/processsimulation/processsystem/ProcessSystemSerializationTest.java index 68861499c..dcbf60d2d 100644 --- a/src/test/java/neqsim/processsimulation/processsystem/ProcessSystemSerializationTest.java +++ b/src/test/java/neqsim/processsimulation/processsystem/ProcessSystemSerializationTest.java @@ -3,23 +3,23 @@ import org.junit.jupiter.api.Test; import com.thoughtworks.xstream.XStream; import com.thoughtworks.xstream.security.AnyTypePermission; -import neqsim.processsimulation.measurementdevice.HydrateEquilibriumTemperatureAnalyser; -import neqsim.processsimulation.measurementdevice.WaterDewPointAnalyser; -import neqsim.processsimulation.processequipment.absorber.SimpleTEGAbsorber; -import neqsim.processsimulation.processequipment.absorber.WaterStripperColumn; -import neqsim.processsimulation.processequipment.distillation.DistillationColumn; -import neqsim.processsimulation.processequipment.filter.Filter; -import neqsim.processsimulation.processequipment.heatexchanger.HeatExchanger; -import neqsim.processsimulation.processequipment.heatexchanger.Heater; -import neqsim.processsimulation.processequipment.mixer.StaticMixer; -import neqsim.processsimulation.processequipment.pump.Pump; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.splitter.Splitter; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.util.Calculator; -import neqsim.processsimulation.processequipment.util.Recycle; -import neqsim.processsimulation.processequipment.util.StreamSaturatorUtil; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; +import neqsim.process.equipment.absorber.SimpleTEGAbsorber; +import neqsim.process.equipment.absorber.WaterStripperColumn; +import neqsim.process.equipment.distillation.DistillationColumn; +import neqsim.process.equipment.filter.Filter; +import neqsim.process.equipment.heatexchanger.HeatExchanger; +import neqsim.process.equipment.heatexchanger.Heater; +import neqsim.process.equipment.mixer.StaticMixer; +import neqsim.process.equipment.pump.Pump; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.splitter.Splitter; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.util.Calculator; +import neqsim.process.equipment.util.Recycle; +import neqsim.process.equipment.util.StreamSaturatorUtil; +import neqsim.process.equipment.valve.ThrottlingValve; +import neqsim.process.measurementdevice.HydrateEquilibriumTemperatureAnalyser; +import neqsim.process.measurementdevice.WaterDewPointAnalyser; public class ProcessSystemSerializationTest extends neqsim.NeqSimTest { @Test @@ -261,8 +261,8 @@ public void runTEGProcessTest2() { recycleLeanTEG.setPriority(200); recycleLeanTEG.setDownstreamProperty("flow rate"); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(dryFeedGasSmorbukk); operations.add(saturatedFeedGasSmorbukk); operations.add(waterSaturatedFeedGasSmorbukk); @@ -332,8 +332,8 @@ public void runTEGProcessTest2() { xstream.addPermission(AnyTypePermission.ANY); // Deserialize from xml - neqsim.processsimulation.processsystem.ProcessSystem operationsCopy = - (neqsim.processsimulation.processsystem.ProcessSystem) xstream.fromXML(xml); + neqsim.process.processmodel.ProcessSystem operationsCopy = + (neqsim.process.processmodel.ProcessSystem) xstream.fromXML(xml); operationsCopy.run(); } } diff --git a/src/test/java/neqsim/processsimulation/processsystem/ProcessSystemTest.java b/src/test/java/neqsim/processsimulation/processsystem/ProcessSystemTest.java index 2a18b5784..8016f3c8a 100644 --- a/src/test/java/neqsim/processsimulation/processsystem/ProcessSystemTest.java +++ b/src/test/java/neqsim/processsimulation/processsystem/ProcessSystemTest.java @@ -5,25 +5,26 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.measurementdevice.HydrateEquilibriumTemperatureAnalyser; -import neqsim.processsimulation.measurementdevice.WaterDewPointAnalyser; -import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; -import neqsim.processsimulation.processequipment.absorber.SimpleTEGAbsorber; -import neqsim.processsimulation.processequipment.absorber.WaterStripperColumn; -import neqsim.processsimulation.processequipment.distillation.DistillationColumn; -import neqsim.processsimulation.processequipment.filter.Filter; -import neqsim.processsimulation.processequipment.heatexchanger.HeatExchanger; -import neqsim.processsimulation.processequipment.heatexchanger.Heater; -import neqsim.processsimulation.processequipment.mixer.StaticMixer; -import neqsim.processsimulation.processequipment.pump.Pump; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.splitter.Splitter; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.tank.Tank; -import neqsim.processsimulation.processequipment.util.Calculator; -import neqsim.processsimulation.processequipment.util.Recycle; -import neqsim.processsimulation.processequipment.util.StreamSaturatorUtil; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; +import neqsim.process.equipment.ProcessEquipmentInterface; +import neqsim.process.equipment.absorber.SimpleTEGAbsorber; +import neqsim.process.equipment.absorber.WaterStripperColumn; +import neqsim.process.equipment.distillation.DistillationColumn; +import neqsim.process.equipment.filter.Filter; +import neqsim.process.equipment.heatexchanger.HeatExchanger; +import neqsim.process.equipment.heatexchanger.Heater; +import neqsim.process.equipment.mixer.StaticMixer; +import neqsim.process.equipment.pump.Pump; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.splitter.Splitter; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.tank.Tank; +import neqsim.process.equipment.util.Calculator; +import neqsim.process.equipment.util.Recycle; +import neqsim.process.equipment.util.StreamSaturatorUtil; +import neqsim.process.equipment.valve.ThrottlingValve; +import neqsim.process.measurementdevice.HydrateEquilibriumTemperatureAnalyser; +import neqsim.process.measurementdevice.WaterDewPointAnalyser; +import neqsim.process.processmodel.ProcessSystem; /** * Class for testing ProcessSystem class. @@ -509,8 +510,8 @@ public void runTEGProcessTest2() { recycleLeanTEG.setPriority(200); recycleLeanTEG.setDownstreamProperty("flow rate"); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(dryFeedGasSmorbukk); operations.add(saturatedFeedGasSmorbukk); operations.add(waterSaturatedFeedGasSmorbukk); @@ -827,8 +828,8 @@ public void testRun_step() { recycleLeanTEG.setPriority(200); recycleLeanTEG.setDownstreamProperty("flow rate"); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(dryFeedGasSmorbukk); operations.add(saturatedFeedGasSmorbukk); operations.add(waterSaturatedFeedGasSmorbukk); diff --git a/src/test/java/neqsim/processsimulation/processsystem/ReferenceProcessTest.java b/src/test/java/neqsim/processsimulation/processsystem/ReferenceProcessTest.java index 7c9fa48bd..f80a98d82 100644 --- a/src/test/java/neqsim/processsimulation/processsystem/ReferenceProcessTest.java +++ b/src/test/java/neqsim/processsimulation/processsystem/ReferenceProcessTest.java @@ -40,62 +40,62 @@ public void testProcess() { 0.007751, 0.014665, 0.004249, 0.004878, 0.004541, 0.007189, 0.006904, 0.004355, 0.007658, 0.003861, 0.003301, 0.002624, 0.001857, 0.001320, 0.001426, 0.001164, 0.000916}); - neqsim.processsimulation.processequipment.stream.Stream wellStream = - new neqsim.processsimulation.processequipment.stream.Stream("well stream", thermoSystem); + neqsim.process.equipment.stream.Stream wellStream = + new neqsim.process.equipment.stream.Stream("well stream", thermoSystem); wellStream.setTemperature(70.0, "C"); wellStream.setPressure(90.0, "bara"); - neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator firstStageSeparator = - new neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator( + neqsim.process.equipment.separator.ThreePhaseSeparator firstStageSeparator = + new neqsim.process.equipment.separator.ThreePhaseSeparator( "1st stage separator", wellStream); - neqsim.processsimulation.processequipment.heatexchanger.Heater oilHeaterSecondStage = - new neqsim.processsimulation.processequipment.heatexchanger.Heater( + neqsim.process.equipment.heatexchanger.Heater oilHeaterSecondStage = + new neqsim.process.equipment.heatexchanger.Heater( "oil heater second stage", firstStageSeparator.getOilOutStream()); oilHeaterSecondStage.setOutPressure(30.0); oilHeaterSecondStage.setOutTemperature(68.0, "C"); - neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator secondStageSeparator = - new neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator( + neqsim.process.equipment.separator.ThreePhaseSeparator secondStageSeparator = + new neqsim.process.equipment.separator.ThreePhaseSeparator( "2nd stage separator", oilHeaterSecondStage.getOutletStream()); - neqsim.processsimulation.processequipment.heatexchanger.Heater oilHeaterThirdStage = - new neqsim.processsimulation.processequipment.heatexchanger.Heater("oil heater third stage", + neqsim.process.equipment.heatexchanger.Heater oilHeaterThirdStage = + new neqsim.process.equipment.heatexchanger.Heater("oil heater third stage", secondStageSeparator.getOilOutStream()); oilHeaterThirdStage.setOutPressure(2.8); oilHeaterThirdStage.setOutTemperature(70.0, "C"); - neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator thirdStageSeparator = - new neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator( + neqsim.process.equipment.separator.ThreePhaseSeparator thirdStageSeparator = + new neqsim.process.equipment.separator.ThreePhaseSeparator( "3rd stage separator", oilHeaterThirdStage.getOutletStream()); - neqsim.processsimulation.processequipment.heatexchanger.Heater oilHeaterStandardStage = - new neqsim.processsimulation.processequipment.heatexchanger.Heater( + neqsim.process.equipment.heatexchanger.Heater oilHeaterStandardStage = + new neqsim.process.equipment.heatexchanger.Heater( "oil heater standard stage", thirdStageSeparator.getOilOutStream()); oilHeaterStandardStage.setOutPressure(1.01325); oilHeaterStandardStage.setOutTemperature(15.0, "C"); - neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator standardStageSeparator = - new neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator( + neqsim.process.equipment.separator.ThreePhaseSeparator standardStageSeparator = + new neqsim.process.equipment.separator.ThreePhaseSeparator( "standard stage separator", oilHeaterStandardStage.getOutletStream()); - neqsim.processsimulation.processequipment.mixer.Mixer gasMixer = - new neqsim.processsimulation.processequipment.mixer.Mixer("gas mixer"); + neqsim.process.equipment.mixer.Mixer gasMixer = + new neqsim.process.equipment.mixer.Mixer("gas mixer"); gasMixer.addStream(firstStageSeparator.getGasOutStream()); gasMixer.addStream(secondStageSeparator.getGasOutStream()); gasMixer.addStream(thirdStageSeparator.getGasOutStream()); gasMixer.addStream(standardStageSeparator.getGasOutStream()); gasMixer.setOutTemperature(288.15); - neqsim.processsimulation.processequipment.stream.Stream exportoil = - new neqsim.processsimulation.processequipment.stream.Stream("export oil", + neqsim.process.equipment.stream.Stream exportoil = + new neqsim.process.equipment.stream.Stream("export oil", standardStageSeparator.getOilOutStream()); - neqsim.processsimulation.processequipment.stream.Stream exportgas = - new neqsim.processsimulation.processequipment.stream.Stream("export gas", + neqsim.process.equipment.stream.Stream exportgas = + new neqsim.process.equipment.stream.Stream("export gas", gasMixer.getOutletStream()); - neqsim.processsimulation.processsystem.ProcessSystem oilprocess = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem oilprocess = + new neqsim.process.processmodel.ProcessSystem(); oilprocess.add(wellStream); oilprocess.add(firstStageSeparator); oilprocess.add(oilHeaterSecondStage); diff --git a/src/test/java/neqsim/processsimulation/processsystem/waterDegasserTest.java b/src/test/java/neqsim/processsimulation/processsystem/waterDegasserTest.java index 29dab6e12..eacc3d9f2 100644 --- a/src/test/java/neqsim/processsimulation/processsystem/waterDegasserTest.java +++ b/src/test/java/neqsim/processsimulation/processsystem/waterDegasserTest.java @@ -50,35 +50,35 @@ public void runProcess() throws InterruptedException { fluid1.setMultiPhaseCheck(true); fluid1.init(0); - neqsim.processsimulation.processequipment.stream.Stream inlet_stream_VA_01 = - new neqsim.processsimulation.processequipment.stream.Stream("INLET_STREAM_1ST_SEPARATOR", + neqsim.process.equipment.stream.Stream inlet_stream_VA_01 = + new neqsim.process.equipment.stream.Stream("INLET_STREAM_1ST_SEPARATOR", fluid1); inlet_stream_VA_01.setTemperature(79.36872863769531, "C"); inlet_stream_VA_01.setPressure(66.97672112018574, "bara"); inlet_stream_VA_01.setFlowRate(273050.4311185292, "kg/hr"); - neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator separator_VA_01 = - new neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator( + neqsim.process.equipment.separator.ThreePhaseSeparator separator_VA_01 = + new neqsim.process.equipment.separator.ThreePhaseSeparator( "FIRST_SEPARATOR", inlet_stream_VA_01); - neqsim.processsimulation.processequipment.heatexchanger.Heater TP_setter_hydrocyclone = - new neqsim.processsimulation.processequipment.heatexchanger.Heater( + neqsim.process.equipment.heatexchanger.Heater TP_setter_hydrocyclone = + new neqsim.process.equipment.heatexchanger.Heater( "TP_SETTER_HYDROCYCLONE_AFTER_1ST_SEPARATOR", separator_VA_01.getWaterOutStream()); TP_setter_hydrocyclone.setOutPressure(30.047772073489377, "bara"); - neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator hydrocyclone_main = - new neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator( + neqsim.process.equipment.separator.ThreePhaseSeparator hydrocyclone_main = + new neqsim.process.equipment.separator.ThreePhaseSeparator( "HYDROCYCLONE_AFTER_THE_1ST_SEPARATOR", TP_setter_hydrocyclone.getOutletStream()); // hydrocyclone_main.setEntrainment(0.0, "mole", "feed", "aqueous", "gas"); - neqsim.processsimulation.processequipment.heatexchanger.Heater heater_TP_setter_main_stream = - new neqsim.processsimulation.processequipment.heatexchanger.Heater( + neqsim.process.equipment.heatexchanger.Heater heater_TP_setter_main_stream = + new neqsim.process.equipment.heatexchanger.Heater( "TP_SETTER_FOR_THE_DEGASSER_MAIN_STREAM", hydrocyclone_main.getWaterOutStream()); heater_TP_setter_main_stream.setOutPressure(4.076956398010254, "bara"); heater_TP_setter_main_stream.setOutTemperature(76.51406860351562, "C"); - neqsim.processsimulation.processsystem.ProcessSystem process = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem process = + new neqsim.process.processmodel.ProcessSystem(); process.add(inlet_stream_VA_01); process.add(separator_VA_01); process.add(TP_setter_hydrocyclone); @@ -137,27 +137,27 @@ public void runProcess2() throws InterruptedException { fluid1.setMultiPhaseCheck(true); fluid1.init(0); - neqsim.processsimulation.processequipment.stream.Stream inlet_stream_VA_01 = - new neqsim.processsimulation.processequipment.stream.Stream("INLET_STREAM_1ST_SEPARATOR", + neqsim.process.equipment.stream.Stream inlet_stream_VA_01 = + new neqsim.process.equipment.stream.Stream("INLET_STREAM_1ST_SEPARATOR", fluid1); inlet_stream_VA_01.setTemperature(79.21922658197582, "C"); inlet_stream_VA_01.setPressure(62.3388000793457, "bara"); inlet_stream_VA_01.setFlowRate(450261.1588574318, "kg/hr"); inlet_stream_VA_01.run(); - neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator separator_VA_01 = - new neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator( + neqsim.process.equipment.separator.ThreePhaseSeparator separator_VA_01 = + new neqsim.process.equipment.separator.ThreePhaseSeparator( "FIRST_SEPARATOR", inlet_stream_VA_01); separator_VA_01.run(); - neqsim.processsimulation.processequipment.heatexchanger.Heater TP_setter_hydrocyclone = - new neqsim.processsimulation.processequipment.heatexchanger.Heater( + neqsim.process.equipment.heatexchanger.Heater TP_setter_hydrocyclone = + new neqsim.process.equipment.heatexchanger.Heater( "TP_SETTER_HYDROCYCLONE_AFTER_1ST_SEPARATOR", separator_VA_01.getWaterOutStream()); TP_setter_hydrocyclone.setOutPressure(61.0700675688386, "bara"); TP_setter_hydrocyclone.run(); - neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator hydrocyclone_main = - (new neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator( + neqsim.process.equipment.separator.ThreePhaseSeparator hydrocyclone_main = + (new neqsim.process.equipment.separator.ThreePhaseSeparator( "HYDROCYCLONE_AFTER_THE_1ST_SEPARATOR", TP_setter_hydrocyclone.getOutletStream())); hydrocyclone_main.setEntrainment(0.01, "mole", "feed", "aqueous", "gas"); hydrocyclone_main.run(); diff --git a/src/test/java/neqsim/processsimulation/util/example/LNGfilling.java b/src/test/java/neqsim/processsimulation/util/example/LNGfilling.java index b941935a1..c5f5ce3cf 100644 --- a/src/test/java/neqsim/processsimulation/util/example/LNGfilling.java +++ b/src/test/java/neqsim/processsimulation/util/example/LNGfilling.java @@ -6,8 +6,8 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.processequipment.mixer.Mixer; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.mixer.Mixer; +import neqsim.process.equipment.stream.Stream; /** *

@@ -44,12 +44,12 @@ public static void main(String args[]) { Stream stream_1 = new Stream("Methane Stream", testSystem); Stream stream_2 = new Stream("Nitrogen Stream", testSystem2); - Mixer mixer = new neqsim.processsimulation.processequipment.mixer.StaticMixer("LNG Tank Mix"); + Mixer mixer = new neqsim.process.equipment.mixer.StaticMixer("LNG Tank Mix"); mixer.addStream(stream_1); mixer.addStream(stream_2); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(stream_2); operations.add(mixer); diff --git a/src/test/java/neqsim/processsimulation/util/example/LNGfilling2.java b/src/test/java/neqsim/processsimulation/util/example/LNGfilling2.java index b3dd4c39a..4900c9488 100644 --- a/src/test/java/neqsim/processsimulation/util/example/LNGfilling2.java +++ b/src/test/java/neqsim/processsimulation/util/example/LNGfilling2.java @@ -1,8 +1,8 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; -import neqsim.processsimulation.processequipment.tank.Tank; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.equipment.tank.Tank; /** *

LNGfilling2 class.

@@ -37,13 +37,13 @@ public static void main(String args[]) { Stream stream_1 = new Stream("Methane Stream", testSystem); - Tank tank = new neqsim.processsimulation.processequipment.tank.Tank("tank"); + Tank tank = new neqsim.process.equipment.tank.Tank("tank"); tank.addStream(stream_1); StreamInterface liqstream = tank.getLiquidOutStream(); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(tank); operations.add(liqstream); diff --git a/src/test/java/neqsim/processsimulation/util/example/LNGtankfilling.java b/src/test/java/neqsim/processsimulation/util/example/LNGtankfilling.java index a9c1fbfd8..e141658fd 100644 --- a/src/test/java/neqsim/processsimulation/util/example/LNGtankfilling.java +++ b/src/test/java/neqsim/processsimulation/util/example/LNGtankfilling.java @@ -1,11 +1,11 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.measurementdevice.PressureTransmitter; -import neqsim.processsimulation.measurementdevice.TemperatureTransmitter; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.tank.Tank; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; -import neqsim.processsimulation.processequipment.valve.ValveInterface; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.tank.Tank; +import neqsim.process.equipment.valve.ThrottlingValve; +import neqsim.process.equipment.valve.ValveInterface; +import neqsim.process.measurementdevice.PressureTransmitter; +import neqsim.process.measurementdevice.TemperatureTransmitter; import neqsim.thermo.ThermodynamicConstantsInterface; /** @@ -63,7 +63,7 @@ public static void main(String args[]) { ValveInterface valve = new ThrottlingValve("valve", stream_1); valve.setOutletPressure(ThermodynamicConstantsInterface.referencePressure + 0.110); - Tank tank = new neqsim.processsimulation.processequipment.tank.Tank("tank"); + Tank tank = new neqsim.process.equipment.tank.Tank("tank"); tank.addStream(valve.getOutletStream()); // tank.addStream(stream_2); @@ -88,8 +88,8 @@ public static void main(String args[]) { // pressureController.setControllerSetPoint(ThermodynamicConstantsInterface.referencePressure+0.110); // pressureController.setControllerParameters(2.0,400,0); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(valve); operations.add(tank); diff --git a/src/test/java/neqsim/processsimulation/util/example/MEGinjection.java b/src/test/java/neqsim/processsimulation/util/example/MEGinjection.java index 3dac13953..406488f9d 100644 --- a/src/test/java/neqsim/processsimulation/util/example/MEGinjection.java +++ b/src/test/java/neqsim/processsimulation/util/example/MEGinjection.java @@ -1,12 +1,12 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.processequipment.heatexchanger.Heater; -import neqsim.processsimulation.processequipment.mixer.StaticMixer; -import neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator; -import neqsim.processsimulation.processequipment.splitter.Splitter; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.util.Adjuster; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; +import neqsim.process.equipment.heatexchanger.Heater; +import neqsim.process.equipment.mixer.StaticMixer; +import neqsim.process.equipment.separator.ThreePhaseSeparator; +import neqsim.process.equipment.splitter.Splitter; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.util.Adjuster; +import neqsim.process.equipment.valve.ThrottlingValve; /** *

@@ -78,8 +78,8 @@ public static void main(String[] args) { adjuster.setAdjustedVariable(MEGFeed, "mass flow"); adjuster.setTargetVariable(mixerStream, "mass fraction", 0.6, "-", "aqueous", "MEG"); - neqsim.processsimulation.processsystem.ProcessSystem MEGwelloperations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem MEGwelloperations = + new neqsim.process.processmodel.ProcessSystem(); MEGwelloperations.add(feedGasStream); MEGwelloperations.add(MEGFeed); MEGwelloperations.add(feedGasMEGmixer); @@ -110,7 +110,7 @@ public static void main(String[] args) { MEGFeedOnshore.setTemperature(35.0, "C"); MEGFeedOnshore.setPressure(80.0, "bara"); - neqsim.processsimulation.processequipment.splitter.Splitter MEGsplitter = + neqsim.process.equipment.splitter.Splitter MEGsplitter = new Splitter("MEG splitter", MEGFeedOnshore); MEGsplitter.setSplitFactors(new double[] {0.1, 0.1, 0.8}); @@ -121,8 +121,8 @@ public static void main(String[] args) { ThrottlingValve DPvalve1 = new ThrottlingValve("DP valve 1", MEGmixer1.getOutletStream()); DPvalve1.setOutletPressure(70.0); - neqsim.processsimulation.processsystem.ProcessSystem onshoreOperations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem onshoreOperations = + new neqsim.process.processmodel.ProcessSystem(); onshoreOperations.add(feedStream); onshoreOperations.add(onshoreChockeValve); onshoreOperations.add(slugCatcher); diff --git a/src/test/java/neqsim/processsimulation/util/example/MasstransferMeOH.java b/src/test/java/neqsim/processsimulation/util/example/MasstransferMeOH.java index 48255ab4c..66e2ccd65 100644 --- a/src/test/java/neqsim/processsimulation/util/example/MasstransferMeOH.java +++ b/src/test/java/neqsim/processsimulation/util/example/MasstransferMeOH.java @@ -1,10 +1,10 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.processequipment.mixer.StaticMixer; -import neqsim.processsimulation.processequipment.mixer.StaticPhaseMixer; -import neqsim.processsimulation.processequipment.separator.GasScrubber; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.util.StreamSaturatorUtil; +import neqsim.process.equipment.mixer.StaticMixer; +import neqsim.process.equipment.mixer.StaticPhaseMixer; +import neqsim.process.equipment.separator.GasScrubber; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.util.StreamSaturatorUtil; import neqsim.thermo.ThermodynamicConstantsInterface; /** @@ -59,8 +59,8 @@ public static void main(String[] args) { mainMixer.addStream(waterSaturatedFeedGas); mainMixer.addStream(MeOHFeed); - neqsim.processsimulation.processequipment.util.NeqSimUnit pipeline = - new neqsim.processsimulation.processequipment.util.NeqSimUnit(mainMixer.getOutletStream(), + neqsim.process.equipment.util.NeqSimUnit pipeline = + new neqsim.process.equipment.util.NeqSimUnit(mainMixer.getOutletStream(), "pipeline", "stratified"); pipeline.setLength(123.01); @@ -68,8 +68,8 @@ public static void main(String[] args) { Stream gasFromScrubber = new Stream("gasFromScrubber", scrubber.getGasOutStream()); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(dryFeedGas); operations.add(saturatedFeedGas); operations.add(waterSaturatedFeedGas); diff --git a/src/test/java/neqsim/processsimulation/util/example/OffshoreProcess.java b/src/test/java/neqsim/processsimulation/util/example/OffshoreProcess.java index b2d8eea61..93decf491 100644 --- a/src/test/java/neqsim/processsimulation/util/example/OffshoreProcess.java +++ b/src/test/java/neqsim/processsimulation/util/example/OffshoreProcess.java @@ -1,14 +1,14 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.processequipment.compressor.Compressor; -import neqsim.processsimulation.processequipment.mixer.Mixer; -import neqsim.processsimulation.processequipment.mixer.StaticPhaseMixer; -import neqsim.processsimulation.processequipment.pipeline.Pipeline; -import neqsim.processsimulation.processequipment.pipeline.TwoPhasePipeLine; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.stream.NeqStream; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.compressor.Compressor; +import neqsim.process.equipment.mixer.Mixer; +import neqsim.process.equipment.mixer.StaticPhaseMixer; +import neqsim.process.equipment.pipeline.Pipeline; +import neqsim.process.equipment.pipeline.TwoPhasePipeLine; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.stream.NeqStream; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; /** *

OffshoreProcess class.

@@ -113,8 +113,8 @@ public static void main(String args[]) { pipe.setEquilibriumMassTransfer(false); pipe.setEquilibriumHeatTransfer(false); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(separator); operations.add(stream_2); diff --git a/src/test/java/neqsim/processsimulation/util/example/OffshoreProcess2.java b/src/test/java/neqsim/processsimulation/util/example/OffshoreProcess2.java index d0df39a33..e8df49e30 100644 --- a/src/test/java/neqsim/processsimulation/util/example/OffshoreProcess2.java +++ b/src/test/java/neqsim/processsimulation/util/example/OffshoreProcess2.java @@ -1,10 +1,10 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.processequipment.mixer.Mixer; -import neqsim.processsimulation.processequipment.mixer.StaticPhaseMixer; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.mixer.Mixer; +import neqsim.process.equipment.mixer.StaticPhaseMixer; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkCPA; import neqsim.thermodynamicoperations.ThermodynamicOperations; @@ -74,8 +74,8 @@ public static void main(String args[]) { mixer.addStream(stream_2); mixer.addStream(stream_4); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(separator); operations.add(stream_2); diff --git a/src/test/java/neqsim/processsimulation/util/example/OffshoreProcess3.java b/src/test/java/neqsim/processsimulation/util/example/OffshoreProcess3.java index c82bf32e6..1d9c37fae 100644 --- a/src/test/java/neqsim/processsimulation/util/example/OffshoreProcess3.java +++ b/src/test/java/neqsim/processsimulation/util/example/OffshoreProcess3.java @@ -1,16 +1,16 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.processequipment.compressor.Compressor; -import neqsim.processsimulation.processequipment.heatexchanger.Cooler; -import neqsim.processsimulation.processequipment.heatexchanger.Heater; -import neqsim.processsimulation.processequipment.mixer.Mixer; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.util.MoleFractionControllerUtil; -import neqsim.processsimulation.processequipment.util.Recycle; -import neqsim.processsimulation.processequipment.util.SetPoint; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; +import neqsim.process.equipment.compressor.Compressor; +import neqsim.process.equipment.heatexchanger.Cooler; +import neqsim.process.equipment.heatexchanger.Heater; +import neqsim.process.equipment.mixer.Mixer; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.separator.ThreePhaseSeparator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.util.MoleFractionControllerUtil; +import neqsim.process.equipment.util.Recycle; +import neqsim.process.equipment.util.SetPoint; +import neqsim.process.equipment.valve.ThrottlingValve; import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.system.SystemSrkEos; @@ -206,8 +206,8 @@ public static void main(String[] args) { Stream exportGas = new Stream("export gas", exportGasCompressorCooler2.getOutletStream()); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(wellStream); operations.add(inletTempControl); operations.add(valve); diff --git a/src/test/java/neqsim/processsimulation/util/example/OnshoreMEGprocess.java b/src/test/java/neqsim/processsimulation/util/example/OnshoreMEGprocess.java index e43be1482..a195ed1d9 100644 --- a/src/test/java/neqsim/processsimulation/util/example/OnshoreMEGprocess.java +++ b/src/test/java/neqsim/processsimulation/util/example/OnshoreMEGprocess.java @@ -1,22 +1,22 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.processequipment.compressor.Compressor; -import neqsim.processsimulation.processequipment.distillation.Condenser; -import neqsim.processsimulation.processequipment.distillation.DistillationColumn; -import neqsim.processsimulation.processequipment.distillation.Reboiler; -import neqsim.processsimulation.processequipment.heatexchanger.Cooler; -import neqsim.processsimulation.processequipment.heatexchanger.HeatExchanger; -import neqsim.processsimulation.processequipment.heatexchanger.Heater; -import neqsim.processsimulation.processequipment.mixer.StaticMixer; -import neqsim.processsimulation.processequipment.pump.Pump; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator; -import neqsim.processsimulation.processequipment.splitter.Splitter; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.util.Calculator; -import neqsim.processsimulation.processequipment.util.Recycle; -import neqsim.processsimulation.processequipment.util.StreamSaturatorUtil; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; +import neqsim.process.equipment.compressor.Compressor; +import neqsim.process.equipment.distillation.Condenser; +import neqsim.process.equipment.distillation.DistillationColumn; +import neqsim.process.equipment.distillation.Reboiler; +import neqsim.process.equipment.heatexchanger.Cooler; +import neqsim.process.equipment.heatexchanger.HeatExchanger; +import neqsim.process.equipment.heatexchanger.Heater; +import neqsim.process.equipment.mixer.StaticMixer; +import neqsim.process.equipment.pump.Pump; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.separator.ThreePhaseSeparator; +import neqsim.process.equipment.splitter.Splitter; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.util.Calculator; +import neqsim.process.equipment.util.Recycle; +import neqsim.process.equipment.util.StreamSaturatorUtil; +import neqsim.process.equipment.valve.ThrottlingValve; /** *

@@ -208,8 +208,8 @@ public static void main(String[] args) { richMEGstreamHeater2.setEnergyStream(column.getCondenser().getEnergyStream()); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(dryFeedGas); operations.add(saturatedFeedGas); operations.add(waterSaturatedFeedGas); diff --git a/src/test/java/neqsim/processsimulation/util/example/OnshoreProcess1.java b/src/test/java/neqsim/processsimulation/util/example/OnshoreProcess1.java index 585de3faa..615b27457 100644 --- a/src/test/java/neqsim/processsimulation/util/example/OnshoreProcess1.java +++ b/src/test/java/neqsim/processsimulation/util/example/OnshoreProcess1.java @@ -2,20 +2,20 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.measurementdevice.MeasurementDeviceInterface; -import neqsim.processsimulation.measurementdevice.MolarMassAnalyser; -import neqsim.processsimulation.measurementdevice.PressureTransmitter; -import neqsim.processsimulation.measurementdevice.TemperatureTransmitter; -import neqsim.processsimulation.measurementdevice.VolumeFlowTransmitter; -import neqsim.processsimulation.measurementdevice.WaterContentAnalyser; -import neqsim.processsimulation.processequipment.heatexchanger.Heater; -import neqsim.processsimulation.processequipment.mixer.Mixer; -import neqsim.processsimulation.processequipment.pipeline.SimpleTPoutPipeline; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; +import neqsim.process.equipment.heatexchanger.Heater; +import neqsim.process.equipment.mixer.Mixer; +import neqsim.process.equipment.pipeline.SimpleTPoutPipeline; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.separator.ThreePhaseSeparator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.equipment.valve.ThrottlingValve; +import neqsim.process.measurementdevice.MeasurementDeviceInterface; +import neqsim.process.measurementdevice.MolarMassAnalyser; +import neqsim.process.measurementdevice.PressureTransmitter; +import neqsim.process.measurementdevice.TemperatureTransmitter; +import neqsim.process.measurementdevice.VolumeFlowTransmitter; +import neqsim.process.measurementdevice.WaterContentAnalyser; /** *

@@ -429,8 +429,8 @@ public static void main(String[] args) { // VolumeFlowTransmitter("Stream to CO2 removal Volume FLow",streamToCO2removal); // volumeTransmitter_StreamToCO2removal.setUnit("Nm^3/day"); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(reservoirTemperaturTransmitter); operations.add(reservoirPressureTransmitter); diff --git a/src/test/java/neqsim/processsimulation/util/example/TEGAbsorberTest.java b/src/test/java/neqsim/processsimulation/util/example/TEGAbsorberTest.java index deb0525b6..8793e9e24 100644 --- a/src/test/java/neqsim/processsimulation/util/example/TEGAbsorberTest.java +++ b/src/test/java/neqsim/processsimulation/util/example/TEGAbsorberTest.java @@ -1,13 +1,13 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.processequipment.absorber.SimpleTEGAbsorber; -import neqsim.processsimulation.processequipment.heatexchanger.ReBoiler; -import neqsim.processsimulation.processequipment.mixer.Mixer; -import neqsim.processsimulation.processequipment.separator.GasScrubberSimple; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; +import neqsim.process.equipment.absorber.SimpleTEGAbsorber; +import neqsim.process.equipment.heatexchanger.ReBoiler; +import neqsim.process.equipment.mixer.Mixer; +import neqsim.process.equipment.separator.GasScrubberSimple; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.equipment.valve.ThrottlingValve; /** *

@@ -99,8 +99,8 @@ public static void main(String args[]) { // processSimulation.processEquipment.absorber.SimpleGlycolAbsorber(gasStreamIn); // TEGabsorber.setName("TEGabsorber"); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(fluidStreamIn); operations.add(gasScrubber); operations.add(gasToAbsorber); diff --git a/src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcess2.java b/src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcess2.java index 996b5a204..094a28b43 100644 --- a/src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcess2.java +++ b/src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcess2.java @@ -1,17 +1,17 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.processequipment.absorber.SimpleTEGAbsorber; -import neqsim.processsimulation.processequipment.absorber.WaterStripperColumn; -import neqsim.processsimulation.processequipment.heatexchanger.Heater; -import neqsim.processsimulation.processequipment.mixer.Mixer; -import neqsim.processsimulation.processequipment.mixer.StaticMixer; -import neqsim.processsimulation.processequipment.pump.Pump; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.util.Calculator; -import neqsim.processsimulation.processequipment.util.Recycle; -import neqsim.processsimulation.processequipment.util.StreamSaturatorUtil; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; +import neqsim.process.equipment.absorber.SimpleTEGAbsorber; +import neqsim.process.equipment.absorber.WaterStripperColumn; +import neqsim.process.equipment.heatexchanger.Heater; +import neqsim.process.equipment.mixer.Mixer; +import neqsim.process.equipment.mixer.StaticMixer; +import neqsim.process.equipment.pump.Pump; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.util.Calculator; +import neqsim.process.equipment.util.Recycle; +import neqsim.process.equipment.util.StreamSaturatorUtil; +import neqsim.process.equipment.valve.ThrottlingValve; /** *

@@ -187,8 +187,8 @@ public static void main(String[] args) { Recycle recycleLeanTEG = new Recycle("lean TEG recycle"); recycleLeanTEG.addStream(makeupMixer.getOutletStream()); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(dryFeedGas); operations.add(saturatedFeedGas); operations.add(waterSaturatedFeedGas); diff --git a/src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcessDistillation.java b/src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcessDistillation.java index 1b80e4ed1..b943a60da 100644 --- a/src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcessDistillation.java +++ b/src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcessDistillation.java @@ -1,20 +1,20 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.processequipment.absorber.SimpleTEGAbsorber; -import neqsim.processsimulation.processequipment.absorber.WaterStripperColumn; -import neqsim.processsimulation.processequipment.distillation.Condenser; -import neqsim.processsimulation.processequipment.distillation.DistillationColumn; -import neqsim.processsimulation.processequipment.distillation.Reboiler; -import neqsim.processsimulation.processequipment.heatexchanger.HeatExchanger; -import neqsim.processsimulation.processequipment.heatexchanger.Heater; -import neqsim.processsimulation.processequipment.mixer.StaticMixer; -import neqsim.processsimulation.processequipment.pump.Pump; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.util.Calculator; -import neqsim.processsimulation.processequipment.util.Recycle; -import neqsim.processsimulation.processequipment.util.StreamSaturatorUtil; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; +import neqsim.process.equipment.absorber.SimpleTEGAbsorber; +import neqsim.process.equipment.absorber.WaterStripperColumn; +import neqsim.process.equipment.distillation.Condenser; +import neqsim.process.equipment.distillation.DistillationColumn; +import neqsim.process.equipment.distillation.Reboiler; +import neqsim.process.equipment.heatexchanger.HeatExchanger; +import neqsim.process.equipment.heatexchanger.Heater; +import neqsim.process.equipment.mixer.StaticMixer; +import neqsim.process.equipment.pump.Pump; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.util.Calculator; +import neqsim.process.equipment.util.Recycle; +import neqsim.process.equipment.util.StreamSaturatorUtil; +import neqsim.process.equipment.valve.ThrottlingValve; import neqsim.thermo.ThermodynamicConstantsInterface; /** @@ -197,8 +197,8 @@ public static void main(String[] args) { richGLycolHeaterCondenser.setEnergyStream(column.getCondenser().getEnergyStream()); // richGLycolHeater.isSetEnergyStream(); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(dryFeedGas); operations.add(saturatedFeedGas); operations.add(waterSaturatedFeedGas); diff --git a/src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcessDistillation3.java b/src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcessDistillation3.java index b6646f2da..861036a19 100644 --- a/src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcessDistillation3.java +++ b/src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcessDistillation3.java @@ -1,20 +1,20 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.processequipment.absorber.SimpleTEGAbsorber; -import neqsim.processsimulation.processequipment.absorber.WaterStripperColumn; -import neqsim.processsimulation.processequipment.distillation.Condenser; -import neqsim.processsimulation.processequipment.distillation.DistillationColumn; -import neqsim.processsimulation.processequipment.distillation.Reboiler; -import neqsim.processsimulation.processequipment.heatexchanger.HeatExchanger; -import neqsim.processsimulation.processequipment.heatexchanger.Heater; -import neqsim.processsimulation.processequipment.mixer.StaticMixer; -import neqsim.processsimulation.processequipment.pump.Pump; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.util.Calculator; -import neqsim.processsimulation.processequipment.util.Recycle; -import neqsim.processsimulation.processequipment.util.StreamSaturatorUtil; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; +import neqsim.process.equipment.absorber.SimpleTEGAbsorber; +import neqsim.process.equipment.absorber.WaterStripperColumn; +import neqsim.process.equipment.distillation.Condenser; +import neqsim.process.equipment.distillation.DistillationColumn; +import neqsim.process.equipment.distillation.Reboiler; +import neqsim.process.equipment.heatexchanger.HeatExchanger; +import neqsim.process.equipment.heatexchanger.Heater; +import neqsim.process.equipment.mixer.StaticMixer; +import neqsim.process.equipment.pump.Pump; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.util.Calculator; +import neqsim.process.equipment.util.Recycle; +import neqsim.process.equipment.util.StreamSaturatorUtil; +import neqsim.process.equipment.valve.ThrottlingValve; import neqsim.thermo.ThermodynamicConstantsInterface; /** @@ -194,8 +194,8 @@ public static void main(String[] args) { richGLycolHeaterCondenser.setEnergyStream(column.getCondenser().getEnergyStream()); richGLycolHeater.isSetEnergyStream(); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(dryFeedGas); operations.add(saturatedFeedGas); operations.add(waterSaturatedFeedGas); diff --git a/src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcessDistillationAaHa.java b/src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcessDistillationAaHa.java index 7fa1adcd2..3d490efd3 100644 --- a/src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcessDistillationAaHa.java +++ b/src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcessDistillationAaHa.java @@ -1,22 +1,22 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.conditionmonitor.ConditionMonitor; -import neqsim.processsimulation.measurementdevice.HydrateEquilibriumTemperatureAnalyser; -import neqsim.processsimulation.processequipment.absorber.SimpleTEGAbsorber; -import neqsim.processsimulation.processequipment.absorber.WaterStripperColumn; -import neqsim.processsimulation.processequipment.distillation.DistillationColumn; -import neqsim.processsimulation.processequipment.filter.Filter; -import neqsim.processsimulation.processequipment.heatexchanger.HeatExchanger; -import neqsim.processsimulation.processequipment.heatexchanger.Heater; -import neqsim.processsimulation.processequipment.mixer.StaticMixer; -import neqsim.processsimulation.processequipment.pump.Pump; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.util.Calculator; -import neqsim.processsimulation.processequipment.util.Recycle; -import neqsim.processsimulation.processequipment.util.SetPoint; -import neqsim.processsimulation.processequipment.util.StreamSaturatorUtil; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; +import neqsim.process.conditionmonitor.ConditionMonitor; +import neqsim.process.equipment.absorber.SimpleTEGAbsorber; +import neqsim.process.equipment.absorber.WaterStripperColumn; +import neqsim.process.equipment.distillation.DistillationColumn; +import neqsim.process.equipment.filter.Filter; +import neqsim.process.equipment.heatexchanger.HeatExchanger; +import neqsim.process.equipment.heatexchanger.Heater; +import neqsim.process.equipment.mixer.StaticMixer; +import neqsim.process.equipment.pump.Pump; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.util.Calculator; +import neqsim.process.equipment.util.Recycle; +import neqsim.process.equipment.util.SetPoint; +import neqsim.process.equipment.util.StreamSaturatorUtil; +import neqsim.process.equipment.valve.ThrottlingValve; +import neqsim.process.measurementdevice.HydrateEquilibriumTemperatureAnalyser; import neqsim.thermo.ThermodynamicConstantsInterface; /** @@ -34,9 +34,9 @@ public class TEGdehydrationProcessDistillationAaHa { * getProcess. *

* - * @return a {@link neqsim.processsimulation.processsystem.ProcessSystem} object + * @return a {@link neqsim.process.processmodel.ProcessSystem} object */ - public static neqsim.processsimulation.processsystem.ProcessSystem getProcess() { + public static neqsim.process.processmodel.ProcessSystem getProcess() { neqsim.thermo.system.SystemInterface feedGas = new neqsim.thermo.system.SystemSrkCPAstatoil(273.15 + 42.0, 10.00); feedGas.addComponent("nitrogen", 1.42); @@ -231,8 +231,8 @@ public static neqsim.processsimulation.processsystem.ProcessSystem getProcess() richGLycolHeaterCondenser.setEnergyStream(column.getCondenser().getEnergyStream()); // richGLycolHeater.isSetEnergyStream(); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(dryFeedGas); operations.add(saturatedFeedGas); operations.add(waterSaturatedFeedGas); @@ -286,7 +286,7 @@ public static neqsim.processsimulation.processsystem.ProcessSystem getProcess() */ @SuppressWarnings("unused") public static void main(String[] args) { - neqsim.processsimulation.processsystem.ProcessSystem operations = + neqsim.process.processmodel.ProcessSystem operations = TEGdehydrationProcessDistillationAaHa.getProcess(); operations.run(); diff --git a/src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcessDistillationGFA.java b/src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcessDistillationGFA.java index 3a8b9a716..5057796aa 100644 --- a/src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcessDistillationGFA.java +++ b/src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcessDistillationGFA.java @@ -1,25 +1,25 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.conditionmonitor.ConditionMonitor; -import neqsim.processsimulation.measurementdevice.HydrateEquilibriumTemperatureAnalyser; -import neqsim.processsimulation.measurementdevice.WaterDewPointAnalyser; -import neqsim.processsimulation.processequipment.absorber.SimpleTEGAbsorber; -import neqsim.processsimulation.processequipment.absorber.WaterStripperColumn; -import neqsim.processsimulation.processequipment.distillation.Condenser; -import neqsim.processsimulation.processequipment.distillation.DistillationColumn; -import neqsim.processsimulation.processequipment.distillation.Reboiler; -import neqsim.processsimulation.processequipment.filter.Filter; -import neqsim.processsimulation.processequipment.heatexchanger.HeatExchanger; -import neqsim.processsimulation.processequipment.heatexchanger.Heater; -import neqsim.processsimulation.processequipment.mixer.StaticMixer; -import neqsim.processsimulation.processequipment.pump.Pump; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.util.Calculator; -import neqsim.processsimulation.processequipment.util.Recycle; -import neqsim.processsimulation.processequipment.util.SetPoint; -import neqsim.processsimulation.processequipment.util.StreamSaturatorUtil; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; +import neqsim.process.conditionmonitor.ConditionMonitor; +import neqsim.process.equipment.absorber.SimpleTEGAbsorber; +import neqsim.process.equipment.absorber.WaterStripperColumn; +import neqsim.process.equipment.distillation.Condenser; +import neqsim.process.equipment.distillation.DistillationColumn; +import neqsim.process.equipment.distillation.Reboiler; +import neqsim.process.equipment.filter.Filter; +import neqsim.process.equipment.heatexchanger.HeatExchanger; +import neqsim.process.equipment.heatexchanger.Heater; +import neqsim.process.equipment.mixer.StaticMixer; +import neqsim.process.equipment.pump.Pump; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.util.Calculator; +import neqsim.process.equipment.util.Recycle; +import neqsim.process.equipment.util.SetPoint; +import neqsim.process.equipment.util.StreamSaturatorUtil; +import neqsim.process.equipment.valve.ThrottlingValve; +import neqsim.process.measurementdevice.HydrateEquilibriumTemperatureAnalyser; +import neqsim.process.measurementdevice.WaterDewPointAnalyser; /** *

@@ -161,9 +161,9 @@ public class TEGdehydrationProcessDistillationGFA { * getProcess. *

* - * @return a {@link neqsim.processsimulation.processsystem.ProcessSystem} object + * @return a {@link neqsim.process.processmodel.ProcessSystem} object */ - public neqsim.processsimulation.processsystem.ProcessSystem getProcess() { + public neqsim.process.processmodel.ProcessSystem getProcess() { // Create the input fluid to the TEG process and saturate it with water at // scrubber conditions neqsim.thermo.system.SystemInterface feedGas = @@ -346,8 +346,8 @@ public neqsim.processsimulation.processsystem.ProcessSystem getProcess() { richGLycolHeaterCondenser.setEnergyStream(column.getCondenser().getEnergyStream()); // richGLycolHeater.isSetEnergyStream(); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(dryFeedGas); operations.add(saturatedFeedGas); operations.add(waterSaturatedFeedGas); @@ -401,7 +401,7 @@ public neqsim.processsimulation.processsystem.ProcessSystem getProcess() { @SuppressWarnings("unused") public static void main(String[] args) { TEGdehydrationProcessDistillationGFA tempClass = new TEGdehydrationProcessDistillationGFA(); - neqsim.processsimulation.processsystem.ProcessSystem operations = tempClass.getProcess(); + neqsim.process.processmodel.ProcessSystem operations = tempClass.getProcess(); operations.run(); // operations.run(); // operations = diff --git a/src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcessDistillationJS.java b/src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcessDistillationJS.java index d425f6f9c..836b2562f 100644 --- a/src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcessDistillationJS.java +++ b/src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcessDistillationJS.java @@ -1,21 +1,21 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.measurementdevice.HydrateEquilibriumTemperatureAnalyser; -import neqsim.processsimulation.processequipment.absorber.SimpleTEGAbsorber; -import neqsim.processsimulation.processequipment.absorber.WaterStripperColumn; -import neqsim.processsimulation.processequipment.distillation.DistillationColumn; -import neqsim.processsimulation.processequipment.filter.Filter; -import neqsim.processsimulation.processequipment.heatexchanger.HeatExchanger; -import neqsim.processsimulation.processequipment.heatexchanger.Heater; -import neqsim.processsimulation.processequipment.mixer.StaticMixer; -import neqsim.processsimulation.processequipment.pump.Pump; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.util.Calculator; -import neqsim.processsimulation.processequipment.util.Recycle; -import neqsim.processsimulation.processequipment.util.SetPoint; -import neqsim.processsimulation.processequipment.util.StreamSaturatorUtil; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; +import neqsim.process.equipment.absorber.SimpleTEGAbsorber; +import neqsim.process.equipment.absorber.WaterStripperColumn; +import neqsim.process.equipment.distillation.DistillationColumn; +import neqsim.process.equipment.filter.Filter; +import neqsim.process.equipment.heatexchanger.HeatExchanger; +import neqsim.process.equipment.heatexchanger.Heater; +import neqsim.process.equipment.mixer.StaticMixer; +import neqsim.process.equipment.pump.Pump; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.util.Calculator; +import neqsim.process.equipment.util.Recycle; +import neqsim.process.equipment.util.SetPoint; +import neqsim.process.equipment.util.StreamSaturatorUtil; +import neqsim.process.equipment.valve.ThrottlingValve; +import neqsim.process.measurementdevice.HydrateEquilibriumTemperatureAnalyser; /** *

@@ -164,9 +164,9 @@ public TEGdehydrationProcessDistillationJS() {} * getProcess. *

* - * @return a {@link neqsim.processsimulation.processsystem.ProcessSystem} object + * @return a {@link neqsim.process.processmodel.ProcessSystem} object */ - public neqsim.processsimulation.processsystem.ProcessSystem getProcess() { + public neqsim.process.processmodel.ProcessSystem getProcess() { // Create the input fluid to the TEG process and saturate it with water at // scrubber conditions neqsim.thermo.system.SystemInterface feedGas = @@ -352,8 +352,8 @@ public neqsim.processsimulation.processsystem.ProcessSystem getProcess() { richGLycolHeaterCondenser.setEnergyStream(column.getCondenser().getEnergyStream()); // richGLycolHeater.isSetEnergyStream(); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(dryFeedGas); operations.add(saturatedFeedGas); operations.add(waterSaturatedFeedGas); @@ -408,7 +408,7 @@ public neqsim.processsimulation.processsystem.ProcessSystem getProcess() { */ public static void main(String[] args) { TEGdehydrationProcessDistillationJS tempClass = new TEGdehydrationProcessDistillationJS(); - neqsim.processsimulation.processsystem.ProcessSystem operations = tempClass.getProcess(); + neqsim.process.processmodel.ProcessSystem operations = tempClass.getProcess(); operations.run(); operations.save("c:/temp/TEGprocessJS.neqsim"); diff --git a/src/test/java/neqsim/processsimulation/util/example/TEGstripperProcess.java b/src/test/java/neqsim/processsimulation/util/example/TEGstripperProcess.java index 2e5fe5470..7be5af4fe 100644 --- a/src/test/java/neqsim/processsimulation/util/example/TEGstripperProcess.java +++ b/src/test/java/neqsim/processsimulation/util/example/TEGstripperProcess.java @@ -1,7 +1,7 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.processequipment.absorber.WaterStripperColumn; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.absorber.WaterStripperColumn; +import neqsim.process.equipment.stream.Stream; /** *

@@ -60,8 +60,8 @@ public static void main(String[] args) { stripper.setNumberOfStages(3); stripper.setStageEfficiency(0.5); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(dryFeedGas); operations.add(TEGFeed); operations.add(stripper); diff --git a/src/test/java/neqsim/processsimulation/util/example/TestMechanicalDesign.java b/src/test/java/neqsim/processsimulation/util/example/TestMechanicalDesign.java index 5b8dc215d..34d0d05e9 100644 --- a/src/test/java/neqsim/processsimulation/util/example/TestMechanicalDesign.java +++ b/src/test/java/neqsim/processsimulation/util/example/TestMechanicalDesign.java @@ -1,7 +1,7 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.stream.Stream; /** *

TestMechanicalDesign class.

@@ -54,8 +54,8 @@ public static void main(String args[]) { * "manway"); sep.getSeparatorSection("top manway").getMechanicalDesign().setANSIclass(300) * ; sep.getSeparatorSection("top manway").getMechanicalDesign(). setNominalSize("DN 500"); */ - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(sep); operations.run(); diff --git a/src/test/java/neqsim/processsimulation/util/example/TestNeqsim.java b/src/test/java/neqsim/processsimulation/util/example/TestNeqsim.java index dec5d82a8..c82a5ba39 100644 --- a/src/test/java/neqsim/processsimulation/util/example/TestNeqsim.java +++ b/src/test/java/neqsim/processsimulation/util/example/TestNeqsim.java @@ -1,7 +1,7 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.processequipment.compressor.Compressor; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.compressor.Compressor; +import neqsim.process.equipment.stream.Stream; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; @@ -67,8 +67,8 @@ public static void main(String[] args) { compressor1.setPolytropicEfficiency(0.64951); Stream stream2 = new Stream("stream2", compressor1.getOutletStream()); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream1); operations.add(compressor1); operations.add(stream2); diff --git a/src/test/java/neqsim/processsimulation/util/example/TestOnlineProcess.java b/src/test/java/neqsim/processsimulation/util/example/TestOnlineProcess.java index 21d4b3abe..e9ce96110 100644 --- a/src/test/java/neqsim/processsimulation/util/example/TestOnlineProcess.java +++ b/src/test/java/neqsim/processsimulation/util/example/TestOnlineProcess.java @@ -1,8 +1,8 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.measurementdevice.TemperatureTransmitter; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.valve.ThrottlingValve; +import neqsim.process.measurementdevice.TemperatureTransmitter; /** *

TestOnlineProcess class.

@@ -34,8 +34,8 @@ public static void main(String args[]) { ThrottlingValve valve_1 = new ThrottlingValve("valve_1", stream_1); valve_1.setOutletPressure(5.0); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(temperatureTransmitter); operations.add(valve_1); diff --git a/src/test/java/neqsim/processsimulation/util/example/TestProcess4.java b/src/test/java/neqsim/processsimulation/util/example/TestProcess4.java index 3d9b29c19..69a34c993 100644 --- a/src/test/java/neqsim/processsimulation/util/example/TestProcess4.java +++ b/src/test/java/neqsim/processsimulation/util/example/TestProcess4.java @@ -1,7 +1,7 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.stream.Stream; /** *

TestProcess4 class.

@@ -45,8 +45,8 @@ public static void main(String args[]) { Stream liquidStream = new Stream("liquidStream", separator.getLiquidOutStream()); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(separator); // operations.add(valve_1); diff --git a/src/test/java/neqsim/processsimulation/util/example/TestSeparationTrain.java b/src/test/java/neqsim/processsimulation/util/example/TestSeparationTrain.java index f1062dbda..7464b64d9 100644 --- a/src/test/java/neqsim/processsimulation/util/example/TestSeparationTrain.java +++ b/src/test/java/neqsim/processsimulation/util/example/TestSeparationTrain.java @@ -1,14 +1,14 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.processequipment.compressor.Compressor; -import neqsim.processsimulation.processequipment.heatexchanger.Cooler; -import neqsim.processsimulation.processequipment.heatexchanger.Heater; -import neqsim.processsimulation.processequipment.mixer.Mixer; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.util.Recycle; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; +import neqsim.process.equipment.compressor.Compressor; +import neqsim.process.equipment.heatexchanger.Cooler; +import neqsim.process.equipment.heatexchanger.Heater; +import neqsim.process.equipment.mixer.Mixer; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.separator.ThreePhaseSeparator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.util.Recycle; +import neqsim.process.equipment.valve.ThrottlingValve; /** *

@@ -108,8 +108,8 @@ public static void main(String args[]) { HPliquidRecycle.addStream(gasInletScrubber.getLiquidOutStream()); inletSeparator.addStream(HPliquidRecycle.getOutletStream()); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(wellStream); operations.add(inletSeparator); operations.add(liquidOutHeater); diff --git a/src/test/java/neqsim/processsimulation/util/example/TestSlugcatcher.java b/src/test/java/neqsim/processsimulation/util/example/TestSlugcatcher.java index e9601388a..13bc7a241 100644 --- a/src/test/java/neqsim/processsimulation/util/example/TestSlugcatcher.java +++ b/src/test/java/neqsim/processsimulation/util/example/TestSlugcatcher.java @@ -6,10 +6,10 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.measurementdevice.VolumeFlowTransmitter; -import neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; +import neqsim.process.equipment.separator.ThreePhaseSeparator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.valve.ThrottlingValve; +import neqsim.process.measurementdevice.VolumeFlowTransmitter; /** *

@@ -62,8 +62,8 @@ public static void main(String args[]) { "Water Volume FLow From Slug Catcher", separator2.getWaterOutStream()); volumeTransmitter4.setMeasuredPhaseNumber(0); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(separator); operations.add(valve1); diff --git a/src/test/java/neqsim/processsimulation/util/example/TestTransientFlow.java b/src/test/java/neqsim/processsimulation/util/example/TestTransientFlow.java index e35ea9718..491798332 100644 --- a/src/test/java/neqsim/processsimulation/util/example/TestTransientFlow.java +++ b/src/test/java/neqsim/processsimulation/util/example/TestTransientFlow.java @@ -6,13 +6,13 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.controllerdevice.ControllerDeviceBaseClass; -import neqsim.processsimulation.controllerdevice.ControllerDeviceInterface; -import neqsim.processsimulation.measurementdevice.LevelTransmitter; -import neqsim.processsimulation.measurementdevice.PressureTransmitter; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; +import neqsim.process.controllerdevice.ControllerDeviceBaseClass; +import neqsim.process.controllerdevice.ControllerDeviceInterface; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.valve.ThrottlingValve; +import neqsim.process.measurementdevice.LevelTransmitter; +import neqsim.process.measurementdevice.PressureTransmitter; /** *

@@ -94,8 +94,8 @@ public static void main(String args[]) { separatorPressureController.setControllerSetPoint(7.0); separatorPressureController.setControllerParameters(1.0, 300.0, 10.0); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(valve_1); diff --git a/src/test/java/neqsim/processsimulation/util/example/TestTransientFlow2.java b/src/test/java/neqsim/processsimulation/util/example/TestTransientFlow2.java index c1ae0e844..998312ce8 100644 --- a/src/test/java/neqsim/processsimulation/util/example/TestTransientFlow2.java +++ b/src/test/java/neqsim/processsimulation/util/example/TestTransientFlow2.java @@ -1,11 +1,11 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.controllerdevice.ControllerDeviceBaseClass; -import neqsim.processsimulation.controllerdevice.ControllerDeviceInterface; -import neqsim.processsimulation.measurementdevice.VolumeFlowTransmitter; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; +import neqsim.process.controllerdevice.ControllerDeviceBaseClass; +import neqsim.process.controllerdevice.ControllerDeviceInterface; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.valve.ThrottlingValve; +import neqsim.process.measurementdevice.VolumeFlowTransmitter; /** *

@@ -61,8 +61,8 @@ public static void main(String args[]) { flowController.setControllerSetPoint(1.0); flowController.setControllerParameters(0.7, 300.0, 0.0); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(valve_1); operations.add(separator_1); diff --git a/src/test/java/neqsim/processsimulation/util/example/WellStreamMixer.java b/src/test/java/neqsim/processsimulation/util/example/WellStreamMixer.java index ea9ef4071..92ca50c5d 100644 --- a/src/test/java/neqsim/processsimulation/util/example/WellStreamMixer.java +++ b/src/test/java/neqsim/processsimulation/util/example/WellStreamMixer.java @@ -1,8 +1,8 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.processequipment.mixer.Mixer; -import neqsim.processsimulation.processequipment.mixer.StaticMixer; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.mixer.Mixer; +import neqsim.process.equipment.mixer.StaticMixer; +import neqsim.process.equipment.stream.Stream; import neqsim.thermo.system.SystemSrkEos; /** @@ -70,8 +70,8 @@ public static void main(String[] args) { Stream mixerdStream = new Stream("mixed stream", wellStramMixer.getOutletStream()); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(wellStream_1); operations.add(wellStream_2); operations.add(wellStramMixer); diff --git a/src/test/java/neqsim/processsimulation/util/example/compressorTest.java b/src/test/java/neqsim/processsimulation/util/example/compressorTest.java index f0e1b57fe..e1f42b8bd 100644 --- a/src/test/java/neqsim/processsimulation/util/example/compressorTest.java +++ b/src/test/java/neqsim/processsimulation/util/example/compressorTest.java @@ -1,11 +1,11 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.processequipment.compressor.Compressor; -import neqsim.processsimulation.processequipment.mixer.MixerInterface; -import neqsim.processsimulation.processequipment.mixer.StaticMixer; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.compressor.Compressor; +import neqsim.process.equipment.mixer.MixerInterface; +import neqsim.process.equipment.mixer.StaticMixer; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; /** @@ -47,8 +47,8 @@ public static void main(String args[]) { mixer.addStream(stream_2); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(stream_2); operations.add(mixer); diff --git a/src/test/java/neqsim/processsimulation/util/example/compressorTest12.java b/src/test/java/neqsim/processsimulation/util/example/compressorTest12.java index 6a07bf4cf..4f8b753da 100644 --- a/src/test/java/neqsim/processsimulation/util/example/compressorTest12.java +++ b/src/test/java/neqsim/processsimulation/util/example/compressorTest12.java @@ -1,8 +1,8 @@ package neqsim.processsimulation.util.example; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processequipment.compressor.Compressor; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.compressor.Compressor; +import neqsim.process.equipment.stream.Stream; import neqsim.thermo.system.SystemInterface; /** diff --git a/src/test/java/neqsim/processsimulation/util/example/compressorTest_1.java b/src/test/java/neqsim/processsimulation/util/example/compressorTest_1.java index 0cd6633cb..79ee64d2a 100644 --- a/src/test/java/neqsim/processsimulation/util/example/compressorTest_1.java +++ b/src/test/java/neqsim/processsimulation/util/example/compressorTest_1.java @@ -2,8 +2,8 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.processequipment.compressor.Compressor; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.compressor.Compressor; +import neqsim.process.equipment.stream.Stream; /** *

@@ -39,8 +39,8 @@ public static void main(String args[]) { comp_1.setPolytropicEfficiency(0.74629255); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(comp_1); diff --git a/src/test/java/neqsim/processsimulation/util/example/destillation1.java b/src/test/java/neqsim/processsimulation/util/example/destillation1.java index 5d55d2579..0502948cd 100644 --- a/src/test/java/neqsim/processsimulation/util/example/destillation1.java +++ b/src/test/java/neqsim/processsimulation/util/example/destillation1.java @@ -1,9 +1,9 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.processequipment.distillation.Condenser; -import neqsim.processsimulation.processequipment.distillation.DistillationColumn; -import neqsim.processsimulation.processequipment.distillation.Reboiler; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.distillation.Condenser; +import neqsim.process.equipment.distillation.DistillationColumn; +import neqsim.process.equipment.distillation.Reboiler; +import neqsim.process.equipment.stream.Stream; import neqsim.thermodynamicoperations.ThermodynamicOperations; /** @@ -57,8 +57,8 @@ public static void main(String args[]) { * column2.getCondenser()).setRefluxRatio(0.01); */ - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(column); // operations.add(heater); diff --git a/src/test/java/neqsim/processsimulation/util/example/destillation2.java b/src/test/java/neqsim/processsimulation/util/example/destillation2.java index 6c5ed3219..68ce50cd9 100644 --- a/src/test/java/neqsim/processsimulation/util/example/destillation2.java +++ b/src/test/java/neqsim/processsimulation/util/example/destillation2.java @@ -1,7 +1,7 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.processequipment.distillation.DistillationColumn; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.distillation.DistillationColumn; +import neqsim.process.equipment.stream.Stream; /** *

@@ -46,8 +46,8 @@ public static void main(String args[]) { column.addFeedStream(feedGas, 0); column.getTray(2).addStream(TEGliq); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(feedGas); operations.add(TEGliq); operations.add(column); diff --git a/src/test/java/neqsim/processsimulation/util/example/expander1.java b/src/test/java/neqsim/processsimulation/util/example/expander1.java index 2ecf9a92b..6f26892fc 100644 --- a/src/test/java/neqsim/processsimulation/util/example/expander1.java +++ b/src/test/java/neqsim/processsimulation/util/example/expander1.java @@ -1,6 +1,6 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.stream.Stream; /** *

@@ -33,8 +33,8 @@ public static void main(String args[]) { // neqsim.processSimulation.processEquipment.expander.Expander expander = new // neqsim.processSimulation.processEquipment.expander.Expander(stream_1); - neqsim.processsimulation.processequipment.compressor.Compressor expander = - new neqsim.processsimulation.processequipment.compressor.Compressor("expander", + neqsim.process.equipment.compressor.Compressor expander = + new neqsim.process.equipment.compressor.Compressor("expander", stream_1); expander.setOutletPressure(80.0); @@ -42,8 +42,8 @@ public static void main(String args[]) { expander.setIsentropicEfficiency(0.9); expander.setUsePolytropicCalc(true); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(expander); diff --git a/src/test/java/neqsim/processsimulation/util/example/gasPipeline.java b/src/test/java/neqsim/processsimulation/util/example/gasPipeline.java index c3836a9a2..d496cbb95 100644 --- a/src/test/java/neqsim/processsimulation/util/example/gasPipeline.java +++ b/src/test/java/neqsim/processsimulation/util/example/gasPipeline.java @@ -1,9 +1,9 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.processequipment.pipeline.AdiabaticPipe; -import neqsim.processsimulation.processequipment.pipeline.AdiabaticTwoPhasePipe; -import neqsim.processsimulation.processequipment.pipeline.OnePhasePipeLine; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.pipeline.AdiabaticPipe; +import neqsim.process.equipment.pipeline.AdiabaticTwoPhasePipe; +import neqsim.process.equipment.pipeline.OnePhasePipeLine; +import neqsim.process.equipment.stream.Stream; /** *

gasPipeline class.

@@ -51,8 +51,8 @@ public static void main(String args[]) { simplePipeline2phase.setInletElevation(0.0); simplePipeline2phase.setOutletElevation(-100.0); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(pipeline); // operations.add(simplePipeline); diff --git a/src/test/java/neqsim/processsimulation/util/example/multiThreadTest.java b/src/test/java/neqsim/processsimulation/util/example/multiThreadTest.java index 3b789cddb..3e7c34c5b 100644 --- a/src/test/java/neqsim/processsimulation/util/example/multiThreadTest.java +++ b/src/test/java/neqsim/processsimulation/util/example/multiThreadTest.java @@ -2,14 +2,14 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.processequipment.compressor.Compressor; -import neqsim.processsimulation.processequipment.heatexchanger.Cooler; -import neqsim.processsimulation.processequipment.mixer.MixerInterface; -import neqsim.processsimulation.processequipment.mixer.StaticMixer; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; -import neqsim.processsimulation.processequipment.util.Recycle; +import neqsim.process.equipment.compressor.Compressor; +import neqsim.process.equipment.heatexchanger.Cooler; +import neqsim.process.equipment.mixer.MixerInterface; +import neqsim.process.equipment.mixer.StaticMixer; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.equipment.util.Recycle; import neqsim.thermodynamicoperations.ThermodynamicOperations; /** @@ -57,8 +57,8 @@ public static void main(String args[]) { cooler1.setOutTemperature(283.15 + 30); // mixer.addStream(stream_2); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(stream_2); operations.add(mixer); @@ -104,8 +104,8 @@ public static void main(String args[]) { mixer2.addStream(resyc.getOutletStream()); // mixer2.addStream(stream_222); - neqsim.processsimulation.processsystem.ProcessSystem operations2 = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations2 = + new neqsim.process.processmodel.ProcessSystem(); operations2.add(stream_22); operations2.add(mixer2); operations2.add(stream_32); diff --git a/src/test/java/neqsim/processsimulation/util/example/oxygenRemovalWater.java b/src/test/java/neqsim/processsimulation/util/example/oxygenRemovalWater.java index 7f3281093..341dcfc0b 100644 --- a/src/test/java/neqsim/processsimulation/util/example/oxygenRemovalWater.java +++ b/src/test/java/neqsim/processsimulation/util/example/oxygenRemovalWater.java @@ -1,10 +1,10 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.processequipment.heatexchanger.Heater; -import neqsim.processsimulation.processequipment.mixer.Mixer; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; +import neqsim.process.equipment.heatexchanger.Heater; +import neqsim.process.equipment.mixer.Mixer; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.valve.ThrottlingValve; import neqsim.thermo.ThermodynamicConstantsInterface; /** @@ -48,8 +48,8 @@ public static void main(String[] args) { ThrottlingValve LP_valve = new ThrottlingValve("LPventil", heater1.getOutletStream()); LP_valve.setOutletPressure(30.0e-3); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_air); operations.add(stream_water); operations.add(mix); diff --git a/src/test/java/neqsim/processsimulation/util/example/process1.java b/src/test/java/neqsim/processsimulation/util/example/process1.java index 384c132f6..1a55d84c2 100644 --- a/src/test/java/neqsim/processsimulation/util/example/process1.java +++ b/src/test/java/neqsim/processsimulation/util/example/process1.java @@ -1,6 +1,6 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.stream.Stream; import neqsim.thermodynamicoperations.ThermodynamicOperations; /** @@ -49,16 +49,16 @@ public static void main(String args[]) { Stream stream_1 = new Stream("Stream1", testSystem); - neqsim.processsimulation.processequipment.compressor.Compressor compr = - new neqsim.processsimulation.processequipment.compressor.Compressor("compr", + neqsim.process.equipment.compressor.Compressor compr = + new neqsim.process.equipment.compressor.Compressor("compr", stream_1); compr.setOutletPressure(80.0); compr.setOutTemperature(345.0); compr.setUsePolytropicCalc(true); // compr.setNumberOfCompressorCalcSteps(10); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(compr); diff --git a/src/test/java/neqsim/processsimulation/util/example/process1Test.java b/src/test/java/neqsim/processsimulation/util/example/process1Test.java index 29b54c02d..be3a60603 100644 --- a/src/test/java/neqsim/processsimulation/util/example/process1Test.java +++ b/src/test/java/neqsim/processsimulation/util/example/process1Test.java @@ -2,11 +2,11 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.stream.Stream; class process1Test extends neqsim.NeqSimTest { static neqsim.thermo.system.SystemInterface testSystem; - static neqsim.processsimulation.processsystem.ProcessSystem operations; + static neqsim.process.processmodel.ProcessSystem operations; /** *

@@ -25,14 +25,14 @@ public static void setUp() { Stream stream_1 = new Stream("Stream1", testSystem); - neqsim.processsimulation.processequipment.compressor.Compressor compr = - new neqsim.processsimulation.processequipment.compressor.Compressor("compr", stream_1); + neqsim.process.equipment.compressor.Compressor compr = + new neqsim.process.equipment.compressor.Compressor("compr", stream_1); compr.setOutletPressure(80.0); compr.setPolytropicEfficiency(0.9); compr.setIsentropicEfficiency(0.9); compr.setUsePolytropicCalc(true); - operations = new neqsim.processsimulation.processsystem.ProcessSystem(); + operations = new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(compr); } diff --git a/src/test/java/neqsim/processsimulation/util/example/process2.java b/src/test/java/neqsim/processsimulation/util/example/process2.java index ddc5d3bb5..0f3eee28d 100644 --- a/src/test/java/neqsim/processsimulation/util/example/process2.java +++ b/src/test/java/neqsim/processsimulation/util/example/process2.java @@ -1,13 +1,13 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.processequipment.heatexchanger.Heater; -import neqsim.processsimulation.processequipment.mixer.MixerInterface; -import neqsim.processsimulation.processequipment.mixer.StaticMixer; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.splitter.Splitter; -import neqsim.processsimulation.processequipment.splitter.SplitterInterface; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.heatexchanger.Heater; +import neqsim.process.equipment.mixer.MixerInterface; +import neqsim.process.equipment.mixer.StaticMixer; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.splitter.Splitter; +import neqsim.process.equipment.splitter.SplitterInterface; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; /** @@ -53,8 +53,8 @@ public static void main(String args[]) { mixer.addStream(stream_5); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(heater); operations.add(mixer); diff --git a/src/test/java/neqsim/processsimulation/util/example/processCO2MDEA.java b/src/test/java/neqsim/processsimulation/util/example/processCO2MDEA.java index d442ce99a..ff228c0f5 100644 --- a/src/test/java/neqsim/processsimulation/util/example/processCO2MDEA.java +++ b/src/test/java/neqsim/processsimulation/util/example/processCO2MDEA.java @@ -1,10 +1,10 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.processequipment.pipeline.Pipeline; -import neqsim.processsimulation.processequipment.pipeline.TwoPhasePipeLine; -import neqsim.processsimulation.processequipment.stream.NeqStream; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processsystem.ProcessSystem; +import neqsim.process.equipment.pipeline.Pipeline; +import neqsim.process.equipment.pipeline.TwoPhasePipeLine; +import neqsim.process.equipment.stream.NeqStream; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.processmodel.ProcessSystem; import neqsim.thermo.system.SystemFurstElectrolyteEos; import neqsim.thermo.system.SystemInterface; diff --git a/src/test/java/neqsim/processsimulation/util/example/propaneCoolingCycle.java b/src/test/java/neqsim/processsimulation/util/example/propaneCoolingCycle.java index ac06f816e..75383ad3c 100644 --- a/src/test/java/neqsim/processsimulation/util/example/propaneCoolingCycle.java +++ b/src/test/java/neqsim/processsimulation/util/example/propaneCoolingCycle.java @@ -1,11 +1,11 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.processequipment.compressor.Compressor; -import neqsim.processsimulation.processequipment.heatexchanger.Cooler; -import neqsim.processsimulation.processequipment.heatexchanger.Heater; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.util.SetPoint; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; +import neqsim.process.equipment.compressor.Compressor; +import neqsim.process.equipment.heatexchanger.Cooler; +import neqsim.process.equipment.heatexchanger.Heater; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.util.SetPoint; +import neqsim.process.equipment.valve.ThrottlingValve; /** *

@@ -61,8 +61,8 @@ public static void main(String args[]) { heater.setSpecification("out stream"); heater.setOutletStream(stream_1); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(JTvalve); diff --git a/src/test/java/neqsim/processsimulation/util/example/propaneMultiStageCoolingCycle.java b/src/test/java/neqsim/processsimulation/util/example/propaneMultiStageCoolingCycle.java index 7ebb7e4cd..1427e715f 100644 --- a/src/test/java/neqsim/processsimulation/util/example/propaneMultiStageCoolingCycle.java +++ b/src/test/java/neqsim/processsimulation/util/example/propaneMultiStageCoolingCycle.java @@ -1,10 +1,10 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.processequipment.heatexchanger.HeatExchanger; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; +import neqsim.process.equipment.heatexchanger.HeatExchanger; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.equipment.valve.ThrottlingValve; /** *

@@ -112,8 +112,8 @@ public static void main(String args[]) { Stream heatEx22stream = new Stream("heatEx22stream", heatEx22.getOutStream(0)); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_Ethane); operations.add(stream_1); diff --git a/src/test/java/neqsim/processsimulation/util/example/propaneTwoStageCoolingCycle.java b/src/test/java/neqsim/processsimulation/util/example/propaneTwoStageCoolingCycle.java index 0c4035eb3..2fb097136 100644 --- a/src/test/java/neqsim/processsimulation/util/example/propaneTwoStageCoolingCycle.java +++ b/src/test/java/neqsim/processsimulation/util/example/propaneTwoStageCoolingCycle.java @@ -1,13 +1,13 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.processequipment.compressor.Compressor; -import neqsim.processsimulation.processequipment.heatexchanger.Cooler; -import neqsim.processsimulation.processequipment.heatexchanger.Heater; -import neqsim.processsimulation.processequipment.mixer.Mixer; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; +import neqsim.process.equipment.compressor.Compressor; +import neqsim.process.equipment.heatexchanger.Cooler; +import neqsim.process.equipment.heatexchanger.Heater; +import neqsim.process.equipment.mixer.Mixer; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; +import neqsim.process.equipment.valve.ThrottlingValve; /** *

propaneTwoStageCoolingCycle class.

@@ -68,8 +68,8 @@ public static void main(String args[]) { cooler3.setSpecification("out stream"); cooler3.setOutletStream(stream_1); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(JTvalve1); operations.add(medPresSep); diff --git a/src/test/java/neqsim/processsimulation/util/example/shtokman.java b/src/test/java/neqsim/processsimulation/util/example/shtokman.java index 7dd148e15..27936cbe6 100644 --- a/src/test/java/neqsim/processsimulation/util/example/shtokman.java +++ b/src/test/java/neqsim/processsimulation/util/example/shtokman.java @@ -1,8 +1,8 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; /** *

@@ -43,12 +43,12 @@ public static void main(String args[]) { Separator separator = new Separator("Separator 1", stream_1); StreamInterface stream_2 = separator.getGasOutStream(); - neqsim.processsimulation.processequipment.heatexchanger.Heater heater = - new neqsim.processsimulation.processequipment.heatexchanger.Heater("heater", stream_2); + neqsim.process.equipment.heatexchanger.Heater heater = + new neqsim.process.equipment.heatexchanger.Heater("heater", stream_2); heater.setOutTemperature(273.15 + 35); heater.setPressureDrop(134); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(separator); operations.add(stream_2); diff --git a/src/test/java/neqsim/processsimulation/util/example/shtokman_MEG.java b/src/test/java/neqsim/processsimulation/util/example/shtokman_MEG.java index 2f049354c..4442e73e4 100644 --- a/src/test/java/neqsim/processsimulation/util/example/shtokman_MEG.java +++ b/src/test/java/neqsim/processsimulation/util/example/shtokman_MEG.java @@ -2,9 +2,9 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; /** @@ -40,8 +40,8 @@ public static void main(String args[]) { Separator separator = new Separator("Separator 1", stream_1); StreamInterface stream_2 = separator.getGasOutStream(); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); try { operations.add(separator); diff --git a/src/test/java/neqsim/processsimulation/util/example/simpleGasScrubber.java b/src/test/java/neqsim/processsimulation/util/example/simpleGasScrubber.java index 2ce0e1663..6d0514c05 100644 --- a/src/test/java/neqsim/processsimulation/util/example/simpleGasScrubber.java +++ b/src/test/java/neqsim/processsimulation/util/example/simpleGasScrubber.java @@ -1,7 +1,7 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.processequipment.separator.GasScrubberSimple; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.separator.GasScrubberSimple; +import neqsim.process.equipment.stream.Stream; import neqsim.thermodynamicoperations.ThermodynamicOperations; /** @@ -37,8 +37,8 @@ public static void main(String args[]) { Stream stream_2 = new Stream("gas from scrubber", gasScrubber.getGasOutStream()); Stream stream_3 = new Stream("liquid from scrubber", gasScrubber.getLiquidOutStream()); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(gasScrubber); operations.add(stream_2); diff --git a/src/test/java/neqsim/processsimulation/util/example/simpleTopSideProcess.java b/src/test/java/neqsim/processsimulation/util/example/simpleTopSideProcess.java index fdca20170..20936867b 100644 --- a/src/test/java/neqsim/processsimulation/util/example/simpleTopSideProcess.java +++ b/src/test/java/neqsim/processsimulation/util/example/simpleTopSideProcess.java @@ -1,12 +1,12 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.processequipment.compressor.Compressor; -import neqsim.processsimulation.processequipment.heatexchanger.Heater; -import neqsim.processsimulation.processequipment.mixer.Mixer; -import neqsim.processsimulation.processequipment.separator.GasScrubberSimple; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; +import neqsim.process.equipment.compressor.Compressor; +import neqsim.process.equipment.heatexchanger.Heater; +import neqsim.process.equipment.mixer.Mixer; +import neqsim.process.equipment.separator.GasScrubberSimple; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.valve.ThrottlingValve; /** *

simpleTopSideProcess class.

@@ -34,7 +34,7 @@ public static void main(String args[]) { testSystem.setMixingRule(2); Stream stream_1 = new Stream("Stream1", testSystem); - Mixer mixerHP = new neqsim.processsimulation.processequipment.mixer.StaticMixer("Mixer HP"); + Mixer mixerHP = new neqsim.process.equipment.mixer.StaticMixer("Mixer HP"); mixerHP.addStream(stream_1); Separator separator = new Separator("Separator 1", mixerHP.getOutletStream()); @@ -59,15 +59,15 @@ public static void main(String args[]) { mixerHP.addStream(stream_3); Mixer mixer = - new neqsim.processsimulation.processequipment.mixer.StaticMixer("Mixer export"); + new neqsim.process.equipment.mixer.StaticMixer("Mixer export"); mixer.addStream(separator.getGasOutStream()); mixer.addStream(gasScrubber.getGasOutStream()); Compressor HPcompressor = new Compressor("HPcompressor", mixer.getOutletStream()); HPcompressor.setOutletPressure(200.0); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(mixerHP); operations.add(separator); diff --git a/src/test/java/neqsim/processsimulation/util/example/simpleTopSideProcess2.java b/src/test/java/neqsim/processsimulation/util/example/simpleTopSideProcess2.java index 0405d6b4a..1cc6da0a9 100644 --- a/src/test/java/neqsim/processsimulation/util/example/simpleTopSideProcess2.java +++ b/src/test/java/neqsim/processsimulation/util/example/simpleTopSideProcess2.java @@ -1,11 +1,11 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.processequipment.heatexchanger.Heater; -import neqsim.processsimulation.processequipment.mixer.Mixer; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.util.Recycle; +import neqsim.process.equipment.heatexchanger.Heater; +import neqsim.process.equipment.mixer.Mixer; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.separator.ThreePhaseSeparator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.util.Recycle; /** *

@@ -30,7 +30,7 @@ public static void main(String args[]) { fluid.setPressure(5.0, "bara"); Stream stream_inlet = new Stream("Stream1", fluid); - Mixer mixer_inlet = new neqsim.processsimulation.processequipment.mixer.StaticMixer("Mixer HP"); + Mixer mixer_inlet = new neqsim.process.equipment.mixer.StaticMixer("Mixer HP"); mixer_inlet.addStream(stream_inlet); ThreePhaseSeparator separator_inlet = @@ -47,8 +47,8 @@ public static void main(String args[]) { recyleOp.addStream(scrubber.getLiquidOutStream()); mixer_inlet.addStream(recyleOp.getOutletStream()); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_inlet); operations.add(mixer_inlet); operations.add(separator_inlet); diff --git a/src/test/java/neqsim/processsimulation/util/example/testGasScrubber.java b/src/test/java/neqsim/processsimulation/util/example/testGasScrubber.java index 112f616de..d7ca8dad1 100644 --- a/src/test/java/neqsim/processsimulation/util/example/testGasScrubber.java +++ b/src/test/java/neqsim/processsimulation/util/example/testGasScrubber.java @@ -2,10 +2,10 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.processequipment.pipeline.AdiabaticPipe; -import neqsim.processsimulation.processequipment.separator.GasScrubberSimple; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.pipeline.AdiabaticPipe; +import neqsim.process.equipment.separator.GasScrubberSimple; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; /** *

@@ -67,8 +67,8 @@ public static void main(String args[]) { StreamInterface stream_3 = pipe.getOutletStream(); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(scrubber); operations.add(stream_2); diff --git a/src/test/java/neqsim/processsimulation/util/example/threePhaseSeparation.java b/src/test/java/neqsim/processsimulation/util/example/threePhaseSeparation.java index fddb06090..9a5865f05 100644 --- a/src/test/java/neqsim/processsimulation/util/example/threePhaseSeparation.java +++ b/src/test/java/neqsim/processsimulation/util/example/threePhaseSeparation.java @@ -1,9 +1,9 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.util.MoleFractionControllerUtil; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; +import neqsim.process.equipment.separator.ThreePhaseSeparator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.util.MoleFractionControllerUtil; +import neqsim.process.equipment.valve.ThrottlingValve; /** *

@@ -83,8 +83,8 @@ public static void main(String args[]) { // ThreePhaseSeparator separator2 = new ThreePhaseSeparator("Separator LP", // LP_valve.getOutStream()); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(separator); // operations.add(stream_2); diff --git a/src/test/java/neqsim/processsimulation/util/example/threePhaseSeparation_1.java b/src/test/java/neqsim/processsimulation/util/example/threePhaseSeparation_1.java index 4178593f1..f420896eb 100644 --- a/src/test/java/neqsim/processsimulation/util/example/threePhaseSeparation_1.java +++ b/src/test/java/neqsim/processsimulation/util/example/threePhaseSeparation_1.java @@ -1,7 +1,7 @@ package neqsim.processsimulation.util.example; -import neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator; -import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.process.equipment.separator.ThreePhaseSeparator; +import neqsim.process.equipment.stream.Stream; import neqsim.thermodynamicoperations.ThermodynamicOperations; /** @@ -37,8 +37,8 @@ public static void main(String args[]) { Stream stream_3 = new Stream("oil from separator", separator.getOilOutStream()); Stream stream_4 = new Stream("water from separator", separator.getWaterOutStream()); - neqsim.processsimulation.processsystem.ProcessSystem operations = - new neqsim.processsimulation.processsystem.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_1); operations.add(separator); operations.add(stream_2); diff --git a/src/test/java/neqsim/processsimulation/util/monitor/SeparatorResponseTest.java b/src/test/java/neqsim/processsimulation/util/monitor/SeparatorResponseTest.java index 02b378d67..9174441dd 100644 --- a/src/test/java/neqsim/processsimulation/util/monitor/SeparatorResponseTest.java +++ b/src/test/java/neqsim/processsimulation/util/monitor/SeparatorResponseTest.java @@ -4,12 +4,12 @@ import org.junit.jupiter.api.Test; import com.google.gson.JsonObject; import com.google.gson.JsonParser; -import neqsim.processsimulation.processequipment.heatexchanger.HeatExchanger; -import neqsim.processsimulation.processequipment.pump.Pump; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processsystem.ProcessSystem; +import neqsim.process.equipment.heatexchanger.HeatExchanger; +import neqsim.process.equipment.pump.Pump; +import neqsim.process.equipment.separator.Separator; +import neqsim.process.equipment.separator.ThreePhaseSeparator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.processmodel.ProcessSystem; import neqsim.thermo.system.SystemSrkEos; public class SeparatorResponseTest { diff --git a/src/test/java/neqsim/processsimulation/util/report/ReportTest.java b/src/test/java/neqsim/processsimulation/util/report/ReportTest.java index f7d759328..38555f39e 100644 --- a/src/test/java/neqsim/processsimulation/util/report/ReportTest.java +++ b/src/test/java/neqsim/processsimulation/util/report/ReportTest.java @@ -1,12 +1,13 @@ package neqsim.processsimulation.util.report; import org.junit.jupiter.api.Test; -import neqsim.processsimulation.processequipment.compressor.Compressor; -import neqsim.processsimulation.processequipment.mixer.Mixer; -import neqsim.processsimulation.processequipment.separator.Separator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.valve.ThrottlingValve; -import neqsim.processsimulation.processsystem.ProcessSystem; +import neqsim.process.equipment.compressor.Compressor; +import neqsim.process.equipment.mixer.Mixer; +import neqsim.process.equipment.separator.Separator; +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/util/example/ReadFluidData2.java b/src/test/java/neqsim/thermo/util/example/ReadFluidData2.java index c036fbd70..eec8b13fb 100644 --- a/src/test/java/neqsim/thermo/util/example/ReadFluidData2.java +++ b/src/test/java/neqsim/thermo/util/example/ReadFluidData2.java @@ -2,9 +2,9 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator; -import neqsim.processsimulation.processequipment.stream.Stream; -import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.process.equipment.separator.ThreePhaseSeparator; +import neqsim.process.equipment.stream.Stream; +import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; From 9e7143aa1129a56a41824aa0031b1a65d6b5973e Mon Sep 17 00:00:00 2001 From: Even Solbraa <41290109+EvenSol@users.noreply.github.com> Date: Sun, 3 Nov 2024 19:28:07 +0100 Subject: [PATCH 04/21] added tests (#1163) --- .../neqsim/thermo/util/gerg/DETAILTest.java | 106 ++++++++++++++++++ .../neqsim/thermo/util/gerg/GERG2008Test.java | 99 ++++++++++++++++ 2 files changed, 205 insertions(+) create mode 100644 src/test/java/neqsim/thermo/util/gerg/DETAILTest.java create mode 100644 src/test/java/neqsim/thermo/util/gerg/GERG2008Test.java diff --git a/src/test/java/neqsim/thermo/util/gerg/DETAILTest.java b/src/test/java/neqsim/thermo/util/gerg/DETAILTest.java new file mode 100644 index 000000000..04ca8df1a --- /dev/null +++ b/src/test/java/neqsim/thermo/util/gerg/DETAILTest.java @@ -0,0 +1,106 @@ +package neqsim.thermo.util.gerg; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.netlib.util.StringW; +import org.netlib.util.doubleW; +import org.netlib.util.intW; + +public class DETAILTest { + private DETAIL detail; + + @BeforeEach + public void setUp() { + detail = new DETAIL(); + detail.SetupDetail(); + } + + @Test + public void testSq() { + double result = detail.sq(3.0); + assertEquals(9.0, result, 1e-6); + } + + @Test + public void testMolarMassDetail() { + double[] x = new double[22]; + x[1] = 0.94; + x[3] = 0.05; + x[20] = 0.01; + doubleW Mm = new doubleW(0.0); + detail.MolarMassDetail(x, Mm); + assertEquals(17.320946, Mm.val, 1e-3); + } + + @Test + public void testPressureDetail() { + double T = 300.0; + double D = 10.0; + double[] x = new double[22]; + x[1] = 0.94; + x[3] = 0.05; + x[20] = 0.01; + doubleW P = new doubleW(0.0); + doubleW Z = new doubleW(0.0); + detail.PressureDetail(T, D, x, P, Z); + assertTrue(P.val > 0); + assertTrue(Z.val > 0); + } + + @Test + public void testDensityDetail() { + double T = 300.0; + double P = 1000.0; + double[] x = new double[22]; + x[1] = 0.94; + x[3] = 0.05; + x[20] = 0.01; + doubleW D = new doubleW(-1.0); + intW ierr = new intW(0); + StringW herr = new StringW(""); + detail.DensityDetail(T, P, x, D, ierr, herr); + assertEquals(0, ierr.val); + assertTrue(D.val > 0); + } + + @Test + public void testPropertiesDetail() { + double T = 300.0; + double D = 10.0; + double[] x = new double[22]; + x[1] = 0.94; + x[3] = 0.05; + x[20] = 0.01; + doubleW P = new doubleW(0.0); + doubleW Z = new doubleW(0.0); + doubleW dPdD = new doubleW(0.0); + doubleW d2PdD2 = new doubleW(0.0); + doubleW d2PdTD = new doubleW(0.0); + doubleW dPdT = new doubleW(0.0); + doubleW U = new doubleW(0.0); + doubleW H = new doubleW(0.0); + doubleW S = new doubleW(0.0); + doubleW Cv = new doubleW(0.0); + doubleW Cp = new doubleW(0.0); + doubleW W = new doubleW(0.0); + doubleW G = new doubleW(0.0); + doubleW JT = new doubleW(0.0); + doubleW Kappa = new doubleW(0.0); + detail.PropertiesDetail(T, D, x, P, Z, dPdD, d2PdD2, d2PdTD, dPdT, U, H, S, Cv, Cp, W, G, JT, + Kappa); + assertTrue(P.val > 0); + assertTrue(Z.val > 0); + assertFalse(U.val > 0); + assertFalse(H.val > 0); + assertTrue(S.val < 0); + assertTrue(Cv.val > 0); + assertTrue(Cp.val > 0); + assertTrue(W.val > 0); + assertTrue(G.val > 0); + assertTrue(JT.val != 0); + assertTrue(Kappa.val > 0); + } +} diff --git a/src/test/java/neqsim/thermo/util/gerg/GERG2008Test.java b/src/test/java/neqsim/thermo/util/gerg/GERG2008Test.java new file mode 100644 index 000000000..de3c4fb53 --- /dev/null +++ b/src/test/java/neqsim/thermo/util/gerg/GERG2008Test.java @@ -0,0 +1,99 @@ +package neqsim.thermo.util.gerg; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.netlib.util.StringW; +import org.netlib.util.doubleW; +import org.netlib.util.intW; + + + +public class GERG2008Test { + private GERG2008 gerg; + + @BeforeEach + public void setUp() { + gerg = new GERG2008(); + gerg.SetupGERG(); + } + + @Test + public void testMolarMassGERG() { + double[] x = new double[22]; + x[1] = 1.0; // Pure methane + doubleW Mm = new doubleW(0.0); + gerg.MolarMassGERG(x, Mm); + assertEquals(16.04246, Mm.val, 1e-5); + } + + @Test + public void testPressureGERG() { + double T = 300.0; + double D = 10.0; + double[] x = new double[22]; + x[1] = 1.0; // Pure methane + doubleW P = new doubleW(0.0); + doubleW Z = new doubleW(0.0); + gerg.PressureGERG(T, D, x, P, Z); + assertTrue(P.val > 0); + assertTrue(Z.val > 0); + } + + @Test + public void testDensityGERG() { + int iFlag = 0; + double T = 300.0; + double P = 1000.0; + double[] x = new double[22]; + x[1] = 1.0; // Pure methane + doubleW D = new doubleW(0.0); + intW ierr = new intW(0); + StringW herr = new StringW(""); + gerg.DensityGERG(iFlag, T, P, x, D, ierr, herr); + assertEquals(0, ierr.val); + assertTrue(D.val > 0); + assertEquals(0.4077469060672, D.val, 1e-5); + } + + @Test + public void testPropertiesGERG() { + double T = 300.0; + double D = 10.0; + double[] x = new double[22]; + x[1] = 1.0; // Pure methane + doubleW P = new doubleW(0.0); + doubleW Z = new doubleW(0.0); + doubleW dPdD = new doubleW(0.0); + doubleW d2PdD2 = new doubleW(0.0); + doubleW d2PdTD = new doubleW(0.0); + doubleW dPdT = new doubleW(0.0); + doubleW U = new doubleW(0.0); + doubleW H = new doubleW(0.0); + doubleW S = new doubleW(0.0); + doubleW Cv = new doubleW(0.0); + doubleW Cp = new doubleW(0.0); + doubleW W = new doubleW(0.0); + doubleW G = new doubleW(0.0); + doubleW JT = new doubleW(0.0); + doubleW Kappa = new doubleW(0.0); + doubleW A = new doubleW(0.0); + gerg.PropertiesGERG(T, D, x, P, Z, dPdD, d2PdD2, d2PdTD, dPdT, U, H, S, Cv, Cp, W, G, JT, Kappa, + A); + assertTrue(P.val > 0); + assertTrue(Z.val > 0); + assertTrue(U.val != 0); + assertTrue(H.val != 0); + assertTrue(S.val != 0); + assertTrue(Cv.val != 0); + assertTrue(Cp.val != 0); + assertTrue(W.val != 0); + assertTrue(G.val != 0); + assertTrue(JT.val != 0); + assertTrue(Kappa.val != 0); + assertTrue(A.val != 0); + assertEquals(0.83232372466, Z.val, 1e-5); + + } +} From 9f618cd2da2044d8249f03a4c3db0aaf26ae751b Mon Sep 17 00:00:00 2001 From: Even Solbraa <41290109+EvenSol@users.noreply.github.com> Date: Sun, 3 Nov 2024 19:44:15 +0100 Subject: [PATCH 05/21] update v.3.0.3 (#1165) --- pom.xml | 2 +- pomJava21.xml | 2 +- pomJava8.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index b2e7469f6..f8d652ed0 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ ${revision}${sha1}${changelist} - 3.0.2 + 3.0.3 UTF-8 UTF-8 diff --git a/pomJava21.xml b/pomJava21.xml index ebfd984d1..003fde25c 100644 --- a/pomJava21.xml +++ b/pomJava21.xml @@ -13,7 +13,7 @@ ${revision}${sha1}${changelist} - 3.0.2 + 3.0.3 UTF-8 UTF-8 diff --git a/pomJava8.xml b/pomJava8.xml index adde64c13..8ad43f784 100644 --- a/pomJava8.xml +++ b/pomJava8.xml @@ -13,7 +13,7 @@ ${revision}${sha1}${changelist}-Java8 - 3.0.2 + 3.0.3 UTF-8 UTF-8 From abfb9322a3f6b2ac258d5f0e6d2bb1476a18a897 Mon Sep 17 00:00:00 2001 From: Even Solbraa <41290109+EvenSol@users.noreply.github.com> Date: Sun, 3 Nov 2024 22:27:02 +0100 Subject: [PATCH 06/21] fix bugs (#1166) * fix bugs * update path --- .../equipment/separator/Separator.java | 17 +++----- .../process/equipment/stream/Stream.java | 4 +- .../neqsim/thermo/system/SystemInterface.java | 2 + .../neqsim/thermo/system/SystemThermo.java | 8 +++- .../ControllerDeviceBaseClassTest.java | 2 +- .../absorber/SimpleAbsorberTest.java | 2 +- .../adsorber/SimpleAdsorberTest.java | 2 +- .../compressor/CompressorCalculationTest.java | 2 +- .../compressor/CompressorChartTest.java | 2 +- .../CompressorPropertyProfileTest.java | 2 +- .../equipment}/compressor/CompressorTest.java | 2 +- .../distillation/DistillationColumnTest.java | 2 +- .../heatexchanger/HeatExchangerTest.java | 2 +- .../equipment}/heatexchanger/HeaterTest.java | 2 +- .../equipment}/manifold/ManifoldTest.java | 2 +- .../equipment}/mixer/MixerTest.java | 2 +- .../pipeline/AdiabaticTwoPhasePipeTest.java | 2 +- .../pipeline/BeggsAndBrillsPipeTest.java | 2 +- .../equipment}/pipeline/PipelineTest.java | 2 +- .../powergeneration/GasTurbineTest.java | 2 +- .../equipment}/pump/PumpChartTest.java | 2 +- .../equipment}/pump/PumpTest.java | 2 +- .../reservoir/SimpleReservoirTest.java | 2 +- .../equipment}/reservoir/WellFlowTest.java | 2 +- .../equipment}/separator/SeparatorTest.java | 41 ++++++++++++++++++- .../separator/ThreePhaseSeparatorTest.java | 2 +- .../splitter/ComponentSplitterTest.java | 2 +- .../equipment}/stream/StreamTest.java | 2 +- .../equipment}/stream/VirtualStreamTest.java | 2 +- .../equipment}/util/AdjusterTest.java | 2 +- .../equipment}/util/FlowSetterTest.java | 2 +- .../equipment}/util/GORfitterTest.java | 2 +- .../equipment}/util/MPFMfitterTest.java | 2 +- .../equipment}/util/PressureDropTest.java | 2 +- .../util/StreamSaturatorUtilTest.java | 2 +- .../equipment}/valve/ThrottlingValveTest.java | 2 +- .../CombustionEmissionsCalculatorTest.java | 2 +- .../FLowInducedVibrationTest.java | 2 +- .../MultiPhaseMeterTest.java | 2 +- .../measurementdevice/WellAllocatorTest.java | 2 +- .../measurementdevice/nmVOCTest.java | 2 +- .../measurementdevice/pHProbeTest.java | 2 +- .../simpleflowregime/SevereSlugTest.java | 2 +- .../SystemMechanicalDesignTest.java | 2 +- .../CombinedOilGasFieldTest.java | 2 +- .../processmodel}/CompressorModule.java | 2 +- .../processmodel}/GlycolModulesTest.java | 2 +- .../processmodel}/GlycolRigTest.java | 2 +- .../processmodel}/MLA_bug_test.java | 2 +- .../processmodel}/OilGasProcessTest.java | 2 +- .../processmodel}/OilProcessTest.java | 2 +- .../ProcessSystemControllerTest.java | 2 +- .../ProcessSystemRunTransientTest.java | 2 +- .../ProcessSystemSerializationTest.java | 2 +- .../processmodel}/ProcessSystemTest.java | 2 +- .../processmodel}/ReferenceProcessTest.java | 2 +- .../processmodel}/waterDegasserTest.java | 2 +- .../util/example/LNGfilling.java | 2 +- .../util/example/LNGfilling2.java | 2 +- .../util/example/LNGtankfilling.java | 2 +- .../util/example/MEGinjection.java | 2 +- .../util/example/MasstransferMeOH.java | 2 +- .../util/example/OffshoreProcess.java | 2 +- .../util/example/OffshoreProcess2.java | 2 +- .../util/example/OffshoreProcess3.java | 2 +- .../util/example/OnshoreMEGprocess.java | 2 +- .../util/example/OnshoreProcess1.java | 2 +- .../util/example/TEGAbsorberTest.java | 2 +- .../util/example/TEGdehydrationProcess2.java | 2 +- .../TEGdehydrationProcessDistillation.java | 2 +- .../TEGdehydrationProcessDistillation3.java | 2 +- ...TEGdehydrationProcessDistillationAaHa.java | 2 +- .../TEGdehydrationProcessDistillationGFA.java | 2 +- .../TEGdehydrationProcessDistillationJS.java | 2 +- .../util/example/TEGstripperProcess.java | 2 +- .../util/example/TestMechanicalDesign.java | 2 +- .../util/example/TestNeqsim.java | 2 +- .../util/example/TestOnlineProcess.java | 2 +- .../util/example/TestProcess4.java | 2 +- .../util/example/TestSeparationTrain.java | 2 +- .../util/example/TestSlugcatcher.java | 2 +- .../util/example/TestTransientFlow.java | 2 +- .../util/example/TestTransientFlow2.java | 2 +- .../util/example/WellStreamMixer.java | 2 +- .../util/example/compressorTest.java | 2 +- .../util/example/compressorTest12.java | 2 +- .../util/example/compressorTest_1.java | 2 +- .../util/example/destillation1.java | 2 +- .../util/example/destillation2.java | 2 +- .../util/example/expander1.java | 2 +- .../util/example/gasPipeline.java | 2 +- .../util/example/multiThreadTest.java | 2 +- .../util/example/oxygenRemovalWater.java | 2 +- .../util/example/process1.java | 2 +- .../util/example/process1Test.java | 2 +- .../util/example/process2.java | 2 +- .../util/example/processCO2MDEA.java | 2 +- .../util/example/propaneCoolingCycle.java | 2 +- .../propaneMultiStageCoolingCycle.java | 2 +- .../example/propaneTwoStageCoolingCycle.java | 2 +- .../util/example/shtokman.java | 2 +- .../util/example/shtokman_MEG.java | 2 +- .../util/example/simpleGasScrubber.java | 2 +- .../util/example/simpleTopSideProcess.java | 2 +- .../util/example/simpleTopSideProcess2.java | 2 +- .../util/example/testGasScrubber.java | 2 +- .../util/example/threePhaseSeparation.java | 2 +- .../util/example/threePhaseSeparation_1.java | 2 +- .../util/monitor/SeparatorResponseTest.java | 2 +- .../util/report/FluidCompinentReportTest.java | 2 +- .../util/report/FluidReportTest.java | 2 +- .../util/report/ReportTest.java | 2 +- 112 files changed, 163 insertions(+), 123 deletions(-) rename src/test/java/neqsim/{processsimulation => process}/controllerdevice/ControllerDeviceBaseClassTest.java (98%) rename src/test/java/neqsim/{processsimulation/processequipment => process/equipment}/absorber/SimpleAbsorberTest.java (95%) rename src/test/java/neqsim/{processsimulation/processequipment => process/equipment}/adsorber/SimpleAdsorberTest.java (95%) rename src/test/java/neqsim/{processsimulation/processequipment => process/equipment}/compressor/CompressorCalculationTest.java (99%) rename src/test/java/neqsim/{processsimulation/processequipment => process/equipment}/compressor/CompressorChartTest.java (99%) rename src/test/java/neqsim/{processsimulation/processequipment => process/equipment}/compressor/CompressorPropertyProfileTest.java (97%) rename src/test/java/neqsim/{processsimulation/processequipment => process/equipment}/compressor/CompressorTest.java (99%) rename src/test/java/neqsim/{processsimulation/processequipment => process/equipment}/distillation/DistillationColumnTest.java (99%) rename src/test/java/neqsim/{processsimulation/processequipment => process/equipment}/heatexchanger/HeatExchangerTest.java (98%) rename src/test/java/neqsim/{processsimulation/processequipment => process/equipment}/heatexchanger/HeaterTest.java (96%) rename src/test/java/neqsim/{processsimulation/processequipment => process/equipment}/manifold/ManifoldTest.java (98%) rename src/test/java/neqsim/{processsimulation/processequipment => process/equipment}/mixer/MixerTest.java (98%) rename src/test/java/neqsim/{processsimulation/processequipment => process/equipment}/pipeline/AdiabaticTwoPhasePipeTest.java (97%) rename src/test/java/neqsim/{processsimulation/processequipment => process/equipment}/pipeline/BeggsAndBrillsPipeTest.java (99%) rename src/test/java/neqsim/{processsimulation/processequipment => process/equipment}/pipeline/PipelineTest.java (97%) rename src/test/java/neqsim/{processsimulation/processequipment => process/equipment}/powergeneration/GasTurbineTest.java (97%) rename src/test/java/neqsim/{processsimulation/processequipment => process/equipment}/pump/PumpChartTest.java (93%) rename src/test/java/neqsim/{processsimulation/processequipment => process/equipment}/pump/PumpTest.java (98%) rename src/test/java/neqsim/{processsimulation/processequipment => process/equipment}/reservoir/SimpleReservoirTest.java (98%) rename src/test/java/neqsim/{processsimulation/processequipment => process/equipment}/reservoir/WellFlowTest.java (99%) rename src/test/java/neqsim/{processsimulation/processequipment => process/equipment}/separator/SeparatorTest.java (59%) rename src/test/java/neqsim/{processsimulation/processequipment => process/equipment}/separator/ThreePhaseSeparatorTest.java (99%) rename src/test/java/neqsim/{processsimulation/processequipment => process/equipment}/splitter/ComponentSplitterTest.java (99%) rename src/test/java/neqsim/{processsimulation/processequipment => process/equipment}/stream/StreamTest.java (97%) rename src/test/java/neqsim/{processsimulation/processequipment => process/equipment}/stream/VirtualStreamTest.java (97%) rename src/test/java/neqsim/{processsimulation/processequipment => process/equipment}/util/AdjusterTest.java (98%) rename src/test/java/neqsim/{processsimulation/processequipment => process/equipment}/util/FlowSetterTest.java (99%) rename src/test/java/neqsim/{processsimulation/processequipment => process/equipment}/util/GORfitterTest.java (98%) rename src/test/java/neqsim/{processsimulation/processequipment => process/equipment}/util/MPFMfitterTest.java (97%) rename src/test/java/neqsim/{processsimulation/processequipment => process/equipment}/util/PressureDropTest.java (95%) rename src/test/java/neqsim/{processsimulation/processequipment => process/equipment}/util/StreamSaturatorUtilTest.java (98%) rename src/test/java/neqsim/{processsimulation/processequipment => process/equipment}/valve/ThrottlingValveTest.java (97%) rename src/test/java/neqsim/{processsimulation => process}/measurementdevice/CombustionEmissionsCalculatorTest.java (95%) rename src/test/java/neqsim/{processsimulation => process}/measurementdevice/FLowInducedVibrationTest.java (99%) rename src/test/java/neqsim/{processsimulation => process}/measurementdevice/MultiPhaseMeterTest.java (97%) rename src/test/java/neqsim/{processsimulation => process}/measurementdevice/WellAllocatorTest.java (98%) rename src/test/java/neqsim/{processsimulation => process}/measurementdevice/nmVOCTest.java (99%) rename src/test/java/neqsim/{processsimulation => process}/measurementdevice/pHProbeTest.java (97%) rename src/test/java/neqsim/{processsimulation => process}/measurementdevice/simpleflowregime/SevereSlugTest.java (94%) rename src/test/java/neqsim/{processsimulation => process}/mechanicaldesign/SystemMechanicalDesignTest.java (99%) rename src/test/java/neqsim/{processsimulation/processsystem => process/processmodel}/CombinedOilGasFieldTest.java (98%) rename src/test/java/neqsim/{processsimulation/processsystem => process/processmodel}/CompressorModule.java (99%) rename src/test/java/neqsim/{processsimulation/processsystem => process/processmodel}/GlycolModulesTest.java (99%) rename src/test/java/neqsim/{processsimulation/processsystem => process/processmodel}/GlycolRigTest.java (99%) rename src/test/java/neqsim/{processsimulation/processsystem => process/processmodel}/MLA_bug_test.java (99%) rename src/test/java/neqsim/{processsimulation/processsystem => process/processmodel}/OilGasProcessTest.java (99%) rename src/test/java/neqsim/{processsimulation/processsystem => process/processmodel}/OilProcessTest.java (91%) rename src/test/java/neqsim/{processsimulation/processsystem => process/processmodel}/ProcessSystemControllerTest.java (98%) rename src/test/java/neqsim/{processsimulation/processsystem => process/processmodel}/ProcessSystemRunTransientTest.java (99%) rename src/test/java/neqsim/{processsimulation/processsystem => process/processmodel}/ProcessSystemSerializationTest.java (99%) rename src/test/java/neqsim/{processsimulation/processsystem => process/processmodel}/ProcessSystemTest.java (99%) rename src/test/java/neqsim/{processsimulation/processsystem => process/processmodel}/ReferenceProcessTest.java (99%) rename src/test/java/neqsim/{processsimulation/processsystem => process/processmodel}/waterDegasserTest.java (99%) rename src/test/java/neqsim/{processsimulation => process}/util/example/LNGfilling.java (97%) rename src/test/java/neqsim/{processsimulation => process}/util/example/LNGfilling2.java (97%) rename src/test/java/neqsim/{processsimulation => process}/util/example/LNGtankfilling.java (99%) rename src/test/java/neqsim/{processsimulation => process}/util/example/MEGinjection.java (99%) rename src/test/java/neqsim/{processsimulation => process}/util/example/MasstransferMeOH.java (98%) rename src/test/java/neqsim/{processsimulation => process}/util/example/OffshoreProcess.java (99%) rename src/test/java/neqsim/{processsimulation => process}/util/example/OffshoreProcess2.java (98%) rename src/test/java/neqsim/{processsimulation => process}/util/example/OffshoreProcess3.java (99%) rename src/test/java/neqsim/{processsimulation => process}/util/example/OnshoreMEGprocess.java (99%) rename src/test/java/neqsim/{processsimulation => process}/util/example/OnshoreProcess1.java (99%) rename src/test/java/neqsim/{processsimulation => process}/util/example/TEGAbsorberTest.java (99%) rename src/test/java/neqsim/{processsimulation => process}/util/example/TEGdehydrationProcess2.java (99%) rename src/test/java/neqsim/{processsimulation => process}/util/example/TEGdehydrationProcessDistillation.java (99%) rename src/test/java/neqsim/{processsimulation => process}/util/example/TEGdehydrationProcessDistillation3.java (99%) rename src/test/java/neqsim/{processsimulation => process}/util/example/TEGdehydrationProcessDistillationAaHa.java (99%) rename src/test/java/neqsim/{processsimulation => process}/util/example/TEGdehydrationProcessDistillationGFA.java (99%) rename src/test/java/neqsim/{processsimulation => process}/util/example/TEGdehydrationProcessDistillationJS.java (99%) rename src/test/java/neqsim/{processsimulation => process}/util/example/TEGstripperProcess.java (98%) rename src/test/java/neqsim/{processsimulation => process}/util/example/TestMechanicalDesign.java (98%) rename src/test/java/neqsim/{processsimulation => process}/util/example/TestNeqsim.java (99%) rename src/test/java/neqsim/{processsimulation => process}/util/example/TestOnlineProcess.java (97%) rename src/test/java/neqsim/{processsimulation => process}/util/example/TestProcess4.java (97%) rename src/test/java/neqsim/{processsimulation => process}/util/example/TestSeparationTrain.java (99%) rename src/test/java/neqsim/{processsimulation => process}/util/example/TestSlugcatcher.java (98%) rename src/test/java/neqsim/{processsimulation => process}/util/example/TestTransientFlow.java (99%) rename src/test/java/neqsim/{processsimulation => process}/util/example/TestTransientFlow2.java (98%) rename src/test/java/neqsim/{processsimulation => process}/util/example/WellStreamMixer.java (98%) rename src/test/java/neqsim/{processsimulation => process}/util/example/compressorTest.java (97%) rename src/test/java/neqsim/{processsimulation => process}/util/example/compressorTest12.java (98%) rename src/test/java/neqsim/{processsimulation => process}/util/example/compressorTest_1.java (98%) rename src/test/java/neqsim/{processsimulation => process}/util/example/destillation1.java (98%) rename src/test/java/neqsim/{processsimulation => process}/util/example/destillation2.java (97%) rename src/test/java/neqsim/{processsimulation => process}/util/example/expander1.java (97%) rename src/test/java/neqsim/{processsimulation => process}/util/example/gasPipeline.java (98%) rename src/test/java/neqsim/{processsimulation => process}/util/example/multiThreadTest.java (99%) rename src/test/java/neqsim/{processsimulation => process}/util/example/oxygenRemovalWater.java (98%) rename src/test/java/neqsim/{processsimulation => process}/util/example/process1.java (98%) rename src/test/java/neqsim/{processsimulation => process}/util/example/process1Test.java (96%) rename src/test/java/neqsim/{processsimulation => process}/util/example/process2.java (98%) rename src/test/java/neqsim/{processsimulation => process}/util/example/processCO2MDEA.java (97%) rename src/test/java/neqsim/{processsimulation => process}/util/example/propaneCoolingCycle.java (98%) rename src/test/java/neqsim/{processsimulation => process}/util/example/propaneMultiStageCoolingCycle.java (99%) rename src/test/java/neqsim/{processsimulation => process}/util/example/propaneTwoStageCoolingCycle.java (99%) rename src/test/java/neqsim/{processsimulation => process}/util/example/shtokman.java (98%) rename src/test/java/neqsim/{processsimulation => process}/util/example/shtokman_MEG.java (97%) rename src/test/java/neqsim/{processsimulation => process}/util/example/simpleGasScrubber.java (97%) rename src/test/java/neqsim/{processsimulation => process}/util/example/simpleTopSideProcess.java (98%) rename src/test/java/neqsim/{processsimulation => process}/util/example/simpleTopSideProcess2.java (98%) rename src/test/java/neqsim/{processsimulation => process}/util/example/testGasScrubber.java (99%) rename src/test/java/neqsim/{processsimulation => process}/util/example/threePhaseSeparation.java (98%) rename src/test/java/neqsim/{processsimulation => process}/util/example/threePhaseSeparation_1.java (98%) rename src/test/java/neqsim/{processsimulation => process}/util/monitor/SeparatorResponseTest.java (98%) rename src/test/java/neqsim/{processsimulation => process}/util/report/FluidCompinentReportTest.java (92%) rename src/test/java/neqsim/{processsimulation => process}/util/report/FluidReportTest.java (94%) rename src/test/java/neqsim/{processsimulation => process}/util/report/ReportTest.java (97%) diff --git a/src/main/java/neqsim/process/equipment/separator/Separator.java b/src/main/java/neqsim/process/equipment/separator/Separator.java index 6b67b8d0a..c8d35ad65 100644 --- a/src/main/java/neqsim/process/equipment/separator/Separator.java +++ b/src/main/java/neqsim/process/equipment/separator/Separator.java @@ -88,8 +88,7 @@ public Separator(String name) { * Constructor for Separator. * * @param name a {@link java.lang.String} object - * @param inletStream a {@link neqsim.process.equipment.stream.StreamInterface} - * object + * @param inletStream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public Separator(String name, StreamInterface inletStream) { this(name); @@ -114,8 +113,7 @@ public void initMechanicalDesign() { * setInletStream. *

* - * @param inletStream a {@link neqsim.process.equipment.stream.StreamInterface} - * object + * @param inletStream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public void setInletStream(StreamInterface inletStream) { inletStreamMixer.addStream(inletStream); @@ -133,8 +131,7 @@ public void setInletStream(StreamInterface inletStream) { * addStream. *

* - * @param newStream a {@link neqsim.process.equipment.stream.StreamInterface} - * object + * @param newStream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public void addStream(StreamInterface newStream) { if (numberOfInputStreams == 0) { @@ -651,9 +648,7 @@ public void setSeparatorLength(double separatorLength) { *

* * @param i a int - * @return a - * {@link neqsim.process.equipment.separator.sectiontype.SeparatorSection} - * object + * @return a {@link neqsim.process.equipment.separator.sectiontype.SeparatorSection} object */ public SeparatorSection getSeparatorSection(int i) { return separatorSection.get(i); @@ -665,9 +660,7 @@ public SeparatorSection getSeparatorSection(int i) { *

* * @param name a {@link java.lang.String} object - * @return a - * {@link neqsim.process.equipment.separator.sectiontype.SeparatorSection} - * object + * @return a {@link neqsim.process.equipment.separator.sectiontype.SeparatorSection} object */ public SeparatorSection getSeparatorSection(String name) { for (SeparatorSection sec : separatorSection) { diff --git a/src/main/java/neqsim/process/equipment/stream/Stream.java b/src/main/java/neqsim/process/equipment/stream/Stream.java index 278a4db38..aa2f5d163 100644 --- a/src/main/java/neqsim/process/equipment/stream/Stream.java +++ b/src/main/java/neqsim/process/equipment/stream/Stream.java @@ -329,7 +329,9 @@ public boolean needRecalculation() { /** {@inheritDoc} */ @Override public void run(UUID id) { - // logger.info("start flashing stream... " + streamNumber); + if (!getFluid().isInitialized()) { + getFluid().init(0); + } thermoSystem = getFluid().clone(); ThermodynamicOperations thermoOps = new ThermodynamicOperations(thermoSystem); diff --git a/src/main/java/neqsim/thermo/system/SystemInterface.java b/src/main/java/neqsim/thermo/system/SystemInterface.java index adb122649..3d30c7a79 100644 --- a/src/main/java/neqsim/thermo/system/SystemInterface.java +++ b/src/main/java/neqsim/thermo/system/SystemInterface.java @@ -2659,4 +2659,6 @@ public default void setPhysicalPropertyModel(int type) { * @param phasetypename a {@link java.lang.String} object */ public void setForceSinglePhase(String phasetypename); + + public boolean isInitialized(); } diff --git a/src/main/java/neqsim/thermo/system/SystemThermo.java b/src/main/java/neqsim/thermo/system/SystemThermo.java index baed65f4d..cec181e21 100644 --- a/src/main/java/neqsim/thermo/system/SystemThermo.java +++ b/src/main/java/neqsim/thermo/system/SystemThermo.java @@ -105,6 +105,11 @@ public abstract class SystemThermo implements SystemInterface { // Initialization boolean isInitialized = false; + + public boolean isInitialized() { + return isInitialized; + } + /** Maximum allowed number of phases . */ public int maxNumberOfPhases = 2; private int mixingRule = 1; @@ -5049,8 +5054,7 @@ public double[] getzvector() { /** {@inheritDoc} */ @Override public String toJson() { - return new GsonBuilder().create() - .toJson(new neqsim.process.util.monitor.FluidResponse(this)); + return new GsonBuilder().create().toJson(new neqsim.process.util.monitor.FluidResponse(this)); } /** {@inheritDoc} */ diff --git a/src/test/java/neqsim/processsimulation/controllerdevice/ControllerDeviceBaseClassTest.java b/src/test/java/neqsim/process/controllerdevice/ControllerDeviceBaseClassTest.java similarity index 98% rename from src/test/java/neqsim/processsimulation/controllerdevice/ControllerDeviceBaseClassTest.java rename to src/test/java/neqsim/process/controllerdevice/ControllerDeviceBaseClassTest.java index 43f59bdfc..07ab52a0d 100644 --- a/src/test/java/neqsim/processsimulation/controllerdevice/ControllerDeviceBaseClassTest.java +++ b/src/test/java/neqsim/process/controllerdevice/ControllerDeviceBaseClassTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.controllerdevice; +package neqsim.process.controllerdevice; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; diff --git a/src/test/java/neqsim/processsimulation/processequipment/absorber/SimpleAbsorberTest.java b/src/test/java/neqsim/process/equipment/absorber/SimpleAbsorberTest.java similarity index 95% rename from src/test/java/neqsim/processsimulation/processequipment/absorber/SimpleAbsorberTest.java rename to src/test/java/neqsim/process/equipment/absorber/SimpleAbsorberTest.java index b840273e8..737705140 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/absorber/SimpleAbsorberTest.java +++ b/src/test/java/neqsim/process/equipment/absorber/SimpleAbsorberTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.absorber; +package neqsim.process.equipment.absorber; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; diff --git a/src/test/java/neqsim/processsimulation/processequipment/adsorber/SimpleAdsorberTest.java b/src/test/java/neqsim/process/equipment/adsorber/SimpleAdsorberTest.java similarity index 95% rename from src/test/java/neqsim/processsimulation/processequipment/adsorber/SimpleAdsorberTest.java rename to src/test/java/neqsim/process/equipment/adsorber/SimpleAdsorberTest.java index 384842cb4..ec6c182c1 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/adsorber/SimpleAdsorberTest.java +++ b/src/test/java/neqsim/process/equipment/adsorber/SimpleAdsorberTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.adsorber; +package neqsim.process.equipment.adsorber; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; diff --git a/src/test/java/neqsim/processsimulation/processequipment/compressor/CompressorCalculationTest.java b/src/test/java/neqsim/process/equipment/compressor/CompressorCalculationTest.java similarity index 99% rename from src/test/java/neqsim/processsimulation/processequipment/compressor/CompressorCalculationTest.java rename to src/test/java/neqsim/process/equipment/compressor/CompressorCalculationTest.java index cb078c8bb..05f977ceb 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/compressor/CompressorCalculationTest.java +++ b/src/test/java/neqsim/process/equipment/compressor/CompressorCalculationTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.compressor; +package neqsim.process.equipment.compressor; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/neqsim/processsimulation/processequipment/compressor/CompressorChartTest.java b/src/test/java/neqsim/process/equipment/compressor/CompressorChartTest.java similarity index 99% rename from src/test/java/neqsim/processsimulation/processequipment/compressor/CompressorChartTest.java rename to src/test/java/neqsim/process/equipment/compressor/CompressorChartTest.java index b1a4a5ad1..d8e0229cc 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/compressor/CompressorChartTest.java +++ b/src/test/java/neqsim/process/equipment/compressor/CompressorChartTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.compressor; +package neqsim.process.equipment.compressor; import static org.junit.jupiter.api.Assertions.assertTrue; import org.junit.jupiter.api.Assertions; diff --git a/src/test/java/neqsim/processsimulation/processequipment/compressor/CompressorPropertyProfileTest.java b/src/test/java/neqsim/process/equipment/compressor/CompressorPropertyProfileTest.java similarity index 97% rename from src/test/java/neqsim/processsimulation/processequipment/compressor/CompressorPropertyProfileTest.java rename to src/test/java/neqsim/process/equipment/compressor/CompressorPropertyProfileTest.java index 1cc9e4a10..e34931b6b 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/compressor/CompressorPropertyProfileTest.java +++ b/src/test/java/neqsim/process/equipment/compressor/CompressorPropertyProfileTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.compressor; +package neqsim.process.equipment.compressor; import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/neqsim/processsimulation/processequipment/compressor/CompressorTest.java b/src/test/java/neqsim/process/equipment/compressor/CompressorTest.java similarity index 99% rename from src/test/java/neqsim/processsimulation/processequipment/compressor/CompressorTest.java rename to src/test/java/neqsim/process/equipment/compressor/CompressorTest.java index 2ad2b977d..830504be8 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/compressor/CompressorTest.java +++ b/src/test/java/neqsim/process/equipment/compressor/CompressorTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.compressor; +package neqsim.process.equipment.compressor; import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.File; diff --git a/src/test/java/neqsim/processsimulation/processequipment/distillation/DistillationColumnTest.java b/src/test/java/neqsim/process/equipment/distillation/DistillationColumnTest.java similarity index 99% rename from src/test/java/neqsim/processsimulation/processequipment/distillation/DistillationColumnTest.java rename to src/test/java/neqsim/process/equipment/distillation/DistillationColumnTest.java index 706e433b6..5b820bd6a 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/distillation/DistillationColumnTest.java +++ b/src/test/java/neqsim/process/equipment/distillation/DistillationColumnTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.distillation; +package neqsim.process.equipment.distillation; import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; diff --git a/src/test/java/neqsim/processsimulation/processequipment/heatexchanger/HeatExchangerTest.java b/src/test/java/neqsim/process/equipment/heatexchanger/HeatExchangerTest.java similarity index 98% rename from src/test/java/neqsim/processsimulation/processequipment/heatexchanger/HeatExchangerTest.java rename to src/test/java/neqsim/process/equipment/heatexchanger/HeatExchangerTest.java index 171c5077b..f3a048577 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/heatexchanger/HeatExchangerTest.java +++ b/src/test/java/neqsim/process/equipment/heatexchanger/HeatExchangerTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.heatexchanger; +package neqsim.process.equipment.heatexchanger; import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/neqsim/processsimulation/processequipment/heatexchanger/HeaterTest.java b/src/test/java/neqsim/process/equipment/heatexchanger/HeaterTest.java similarity index 96% rename from src/test/java/neqsim/processsimulation/processequipment/heatexchanger/HeaterTest.java rename to src/test/java/neqsim/process/equipment/heatexchanger/HeaterTest.java index b338878c8..a18b0aa4b 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/heatexchanger/HeaterTest.java +++ b/src/test/java/neqsim/process/equipment/heatexchanger/HeaterTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.heatexchanger; +package neqsim.process.equipment.heatexchanger; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/src/test/java/neqsim/processsimulation/processequipment/manifold/ManifoldTest.java b/src/test/java/neqsim/process/equipment/manifold/ManifoldTest.java similarity index 98% rename from src/test/java/neqsim/processsimulation/processequipment/manifold/ManifoldTest.java rename to src/test/java/neqsim/process/equipment/manifold/ManifoldTest.java index de842d04e..57cf38f56 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/manifold/ManifoldTest.java +++ b/src/test/java/neqsim/process/equipment/manifold/ManifoldTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.manifold; +package neqsim.process.equipment.manifold; import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; diff --git a/src/test/java/neqsim/processsimulation/processequipment/mixer/MixerTest.java b/src/test/java/neqsim/process/equipment/mixer/MixerTest.java similarity index 98% rename from src/test/java/neqsim/processsimulation/processequipment/mixer/MixerTest.java rename to src/test/java/neqsim/process/equipment/mixer/MixerTest.java index 252ea24d1..4d953c2ec 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/mixer/MixerTest.java +++ b/src/test/java/neqsim/process/equipment/mixer/MixerTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.mixer; +package neqsim.process.equipment.mixer; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/src/test/java/neqsim/processsimulation/processequipment/pipeline/AdiabaticTwoPhasePipeTest.java b/src/test/java/neqsim/process/equipment/pipeline/AdiabaticTwoPhasePipeTest.java similarity index 97% rename from src/test/java/neqsim/processsimulation/processequipment/pipeline/AdiabaticTwoPhasePipeTest.java rename to src/test/java/neqsim/process/equipment/pipeline/AdiabaticTwoPhasePipeTest.java index e254a03e9..02d4e1c90 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/pipeline/AdiabaticTwoPhasePipeTest.java +++ b/src/test/java/neqsim/process/equipment/pipeline/AdiabaticTwoPhasePipeTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.pipeline; +package neqsim.process.equipment.pipeline; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/src/test/java/neqsim/processsimulation/processequipment/pipeline/BeggsAndBrillsPipeTest.java b/src/test/java/neqsim/process/equipment/pipeline/BeggsAndBrillsPipeTest.java similarity index 99% rename from src/test/java/neqsim/processsimulation/processequipment/pipeline/BeggsAndBrillsPipeTest.java rename to src/test/java/neqsim/process/equipment/pipeline/BeggsAndBrillsPipeTest.java index f8e80bb45..a3fe6a5c3 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/pipeline/BeggsAndBrillsPipeTest.java +++ b/src/test/java/neqsim/process/equipment/pipeline/BeggsAndBrillsPipeTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.pipeline; +package neqsim.process.equipment.pipeline; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/src/test/java/neqsim/processsimulation/processequipment/pipeline/PipelineTest.java b/src/test/java/neqsim/process/equipment/pipeline/PipelineTest.java similarity index 97% rename from src/test/java/neqsim/processsimulation/processequipment/pipeline/PipelineTest.java rename to src/test/java/neqsim/process/equipment/pipeline/PipelineTest.java index 5a40b069b..74d52947b 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/pipeline/PipelineTest.java +++ b/src/test/java/neqsim/process/equipment/pipeline/PipelineTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.pipeline; +package neqsim.process.equipment.pipeline; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/src/test/java/neqsim/processsimulation/processequipment/powergeneration/GasTurbineTest.java b/src/test/java/neqsim/process/equipment/powergeneration/GasTurbineTest.java similarity index 97% rename from src/test/java/neqsim/processsimulation/processequipment/powergeneration/GasTurbineTest.java rename to src/test/java/neqsim/process/equipment/powergeneration/GasTurbineTest.java index 424b66a72..8133c82c8 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/powergeneration/GasTurbineTest.java +++ b/src/test/java/neqsim/process/equipment/powergeneration/GasTurbineTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.powergeneration; +package neqsim.process.equipment.powergeneration; import static org.junit.jupiter.api.Assertions.assertEquals; import org.apache.logging.log4j.LogManager; diff --git a/src/test/java/neqsim/processsimulation/processequipment/pump/PumpChartTest.java b/src/test/java/neqsim/process/equipment/pump/PumpChartTest.java similarity index 93% rename from src/test/java/neqsim/processsimulation/processequipment/pump/PumpChartTest.java rename to src/test/java/neqsim/process/equipment/pump/PumpChartTest.java index f13fca692..d65a42db9 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/pump/PumpChartTest.java +++ b/src/test/java/neqsim/process/equipment/pump/PumpChartTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.pump; +package neqsim.process.equipment.pump; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/src/test/java/neqsim/processsimulation/processequipment/pump/PumpTest.java b/src/test/java/neqsim/process/equipment/pump/PumpTest.java similarity index 98% rename from src/test/java/neqsim/processsimulation/processequipment/pump/PumpTest.java rename to src/test/java/neqsim/process/equipment/pump/PumpTest.java index e362643d7..4f538aabf 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/pump/PumpTest.java +++ b/src/test/java/neqsim/process/equipment/pump/PumpTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.pump; +package neqsim.process.equipment.pump; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/src/test/java/neqsim/processsimulation/processequipment/reservoir/SimpleReservoirTest.java b/src/test/java/neqsim/process/equipment/reservoir/SimpleReservoirTest.java similarity index 98% rename from src/test/java/neqsim/processsimulation/processequipment/reservoir/SimpleReservoirTest.java rename to src/test/java/neqsim/process/equipment/reservoir/SimpleReservoirTest.java index 885a62c91..926966e6f 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/reservoir/SimpleReservoirTest.java +++ b/src/test/java/neqsim/process/equipment/reservoir/SimpleReservoirTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.reservoir; +package neqsim.process.equipment.reservoir; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/test/java/neqsim/processsimulation/processequipment/reservoir/WellFlowTest.java b/src/test/java/neqsim/process/equipment/reservoir/WellFlowTest.java similarity index 99% rename from src/test/java/neqsim/processsimulation/processequipment/reservoir/WellFlowTest.java rename to src/test/java/neqsim/process/equipment/reservoir/WellFlowTest.java index d30eb6791..0a42388c9 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/reservoir/WellFlowTest.java +++ b/src/test/java/neqsim/process/equipment/reservoir/WellFlowTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.reservoir; +package neqsim.process.equipment.reservoir; import org.junit.jupiter.api.Test; import neqsim.process.equipment.pipeline.PipeBeggsAndBrills; diff --git a/src/test/java/neqsim/processsimulation/processequipment/separator/SeparatorTest.java b/src/test/java/neqsim/process/equipment/separator/SeparatorTest.java similarity index 59% rename from src/test/java/neqsim/processsimulation/processequipment/separator/SeparatorTest.java rename to src/test/java/neqsim/process/equipment/separator/SeparatorTest.java index a45ff3bf1..9d65fd22b 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/separator/SeparatorTest.java +++ b/src/test/java/neqsim/process/equipment/separator/SeparatorTest.java @@ -1,5 +1,6 @@ -package neqsim.processsimulation.processequipment.separator; +package neqsim.process.equipment.separator; +import static org.junit.jupiter.api.DynamicTest.stream; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -8,6 +9,7 @@ import neqsim.process.equipment.stream.StreamInterface; import neqsim.process.measurementdevice.LevelTransmitter; import neqsim.process.processmodel.ProcessSystem; +import neqsim.thermo.phase.PhaseType; import neqsim.thermo.system.SystemSrkCPAstatoil; /** @@ -65,4 +67,41 @@ public void testOnePhase() { processOps.run(); } + + @Test + public void testSimpleSeparator() { + neqsim.thermo.system.SystemSrkEos fluid1 = new neqsim.thermo.system.SystemSrkEos(280.0, 10.0); + fluid1.addComponent("water", 2.7); + fluid1.addComponent("nitrogen", 0.7); + fluid1.addComponent("CO2", 2.1); + fluid1.addComponent("methane", 70.0); + fluid1.addComponent("ethane", 10.0); + fluid1.addComponent("propane", 5.0); + fluid1.addComponent("i-butane", 3.0); + fluid1.addComponent("n-butane", 2.0); + fluid1.addComponent("i-pentane", 1.0); + fluid1.addComponent("n-pentane", 1.0); + fluid1.addTBPfraction("C6", 1.49985, 86.3 / 1000.0, 0.7432); + fluid1.addTBPfraction("C7", 0.49985, 103.3 / 1000.0, 0.76432); + fluid1.addTBPfraction("C8", 0.39985, 125.0 / 1000.0, 0.78432); + fluid1.addTBPfraction("C9", 0.49985, 145.0 / 1000.0, 0.79432); + fluid1.addTBPfraction("C10", 0.149985, 165.0 / 1000.0, 0.81); + fluid1.setMixingRule(2); + fluid1.setMultiPhaseCheck(true); + fluid1.setTemperature(55.0, "C"); + fluid1.setPressure(55.0, "bara"); + + + Stream feedStream = new Stream("feed fluid", fluid1); + Separator separator1 = new Separator("sep1", feedStream); + + processOps = new ProcessSystem(); + processOps.add(feedStream); + processOps.add(separator1); + processOps.run(); + + Assertions.assertEquals(0.1598175271755, + separator1.getFluid().getPhase(PhaseType.OIL).getBeta(), 1e-5); + + } } diff --git a/src/test/java/neqsim/processsimulation/processequipment/separator/ThreePhaseSeparatorTest.java b/src/test/java/neqsim/process/equipment/separator/ThreePhaseSeparatorTest.java similarity index 99% rename from src/test/java/neqsim/processsimulation/processequipment/separator/ThreePhaseSeparatorTest.java rename to src/test/java/neqsim/process/equipment/separator/ThreePhaseSeparatorTest.java index da14df893..8b2e32f92 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/separator/ThreePhaseSeparatorTest.java +++ b/src/test/java/neqsim/process/equipment/separator/ThreePhaseSeparatorTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.separator; +package neqsim.process.equipment.separator; import java.util.ArrayList; import java.util.List; diff --git a/src/test/java/neqsim/processsimulation/processequipment/splitter/ComponentSplitterTest.java b/src/test/java/neqsim/process/equipment/splitter/ComponentSplitterTest.java similarity index 99% rename from src/test/java/neqsim/processsimulation/processequipment/splitter/ComponentSplitterTest.java rename to src/test/java/neqsim/process/equipment/splitter/ComponentSplitterTest.java index 7ca433f30..887aca909 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/splitter/ComponentSplitterTest.java +++ b/src/test/java/neqsim/process/equipment/splitter/ComponentSplitterTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.splitter; +package neqsim.process.equipment.splitter; import static org.junit.jupiter.api.Assertions.assertEquals; import org.apache.logging.log4j.LogManager; diff --git a/src/test/java/neqsim/processsimulation/processequipment/stream/StreamTest.java b/src/test/java/neqsim/process/equipment/stream/StreamTest.java similarity index 97% rename from src/test/java/neqsim/processsimulation/processequipment/stream/StreamTest.java rename to src/test/java/neqsim/process/equipment/stream/StreamTest.java index bafcc3fa8..258176316 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/stream/StreamTest.java +++ b/src/test/java/neqsim/process/equipment/stream/StreamTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.stream; +package neqsim.process.equipment.stream; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/src/test/java/neqsim/processsimulation/processequipment/stream/VirtualStreamTest.java b/src/test/java/neqsim/process/equipment/stream/VirtualStreamTest.java similarity index 97% rename from src/test/java/neqsim/processsimulation/processequipment/stream/VirtualStreamTest.java rename to src/test/java/neqsim/process/equipment/stream/VirtualStreamTest.java index 15fc3817a..588640cae 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/stream/VirtualStreamTest.java +++ b/src/test/java/neqsim/process/equipment/stream/VirtualStreamTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.stream; +package neqsim.process.equipment.stream; import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/neqsim/processsimulation/processequipment/util/AdjusterTest.java b/src/test/java/neqsim/process/equipment/util/AdjusterTest.java similarity index 98% rename from src/test/java/neqsim/processsimulation/processequipment/util/AdjusterTest.java rename to src/test/java/neqsim/process/equipment/util/AdjusterTest.java index 7f6624d00..bc6f69c94 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/util/AdjusterTest.java +++ b/src/test/java/neqsim/process/equipment/util/AdjusterTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.util; +package neqsim.process.equipment.util; import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; diff --git a/src/test/java/neqsim/processsimulation/processequipment/util/FlowSetterTest.java b/src/test/java/neqsim/process/equipment/util/FlowSetterTest.java similarity index 99% rename from src/test/java/neqsim/processsimulation/processequipment/util/FlowSetterTest.java rename to src/test/java/neqsim/process/equipment/util/FlowSetterTest.java index e26d8650c..16d4ca8cb 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/util/FlowSetterTest.java +++ b/src/test/java/neqsim/process/equipment/util/FlowSetterTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.util; +package neqsim.process.equipment.util; import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; diff --git a/src/test/java/neqsim/processsimulation/processequipment/util/GORfitterTest.java b/src/test/java/neqsim/process/equipment/util/GORfitterTest.java similarity index 98% rename from src/test/java/neqsim/processsimulation/processequipment/util/GORfitterTest.java rename to src/test/java/neqsim/process/equipment/util/GORfitterTest.java index ebbc4580a..d03114622 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/util/GORfitterTest.java +++ b/src/test/java/neqsim/process/equipment/util/GORfitterTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.util; +package neqsim.process.equipment.util; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/src/test/java/neqsim/processsimulation/processequipment/util/MPFMfitterTest.java b/src/test/java/neqsim/process/equipment/util/MPFMfitterTest.java similarity index 97% rename from src/test/java/neqsim/processsimulation/processequipment/util/MPFMfitterTest.java rename to src/test/java/neqsim/process/equipment/util/MPFMfitterTest.java index 401363c51..f6345d719 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/util/MPFMfitterTest.java +++ b/src/test/java/neqsim/process/equipment/util/MPFMfitterTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.util; +package neqsim.process.equipment.util; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/src/test/java/neqsim/processsimulation/processequipment/util/PressureDropTest.java b/src/test/java/neqsim/process/equipment/util/PressureDropTest.java similarity index 95% rename from src/test/java/neqsim/processsimulation/processequipment/util/PressureDropTest.java rename to src/test/java/neqsim/process/equipment/util/PressureDropTest.java index 97e1c18d5..909bb6136 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/util/PressureDropTest.java +++ b/src/test/java/neqsim/process/equipment/util/PressureDropTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.util; +package neqsim.process.equipment.util; import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; diff --git a/src/test/java/neqsim/processsimulation/processequipment/util/StreamSaturatorUtilTest.java b/src/test/java/neqsim/process/equipment/util/StreamSaturatorUtilTest.java similarity index 98% rename from src/test/java/neqsim/processsimulation/processequipment/util/StreamSaturatorUtilTest.java rename to src/test/java/neqsim/process/equipment/util/StreamSaturatorUtilTest.java index 947966c4c..b77a19297 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/util/StreamSaturatorUtilTest.java +++ b/src/test/java/neqsim/process/equipment/util/StreamSaturatorUtilTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.util; +package neqsim.process.equipment.util; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/src/test/java/neqsim/processsimulation/processequipment/valve/ThrottlingValveTest.java b/src/test/java/neqsim/process/equipment/valve/ThrottlingValveTest.java similarity index 97% rename from src/test/java/neqsim/processsimulation/processequipment/valve/ThrottlingValveTest.java rename to src/test/java/neqsim/process/equipment/valve/ThrottlingValveTest.java index f4c94a24c..c66214278 100644 --- a/src/test/java/neqsim/processsimulation/processequipment/valve/ThrottlingValveTest.java +++ b/src/test/java/neqsim/process/equipment/valve/ThrottlingValveTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processequipment.valve; +package neqsim.process.equipment.valve; import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; diff --git a/src/test/java/neqsim/processsimulation/measurementdevice/CombustionEmissionsCalculatorTest.java b/src/test/java/neqsim/process/measurementdevice/CombustionEmissionsCalculatorTest.java similarity index 95% rename from src/test/java/neqsim/processsimulation/measurementdevice/CombustionEmissionsCalculatorTest.java rename to src/test/java/neqsim/process/measurementdevice/CombustionEmissionsCalculatorTest.java index b97d45655..1e0633767 100644 --- a/src/test/java/neqsim/processsimulation/measurementdevice/CombustionEmissionsCalculatorTest.java +++ b/src/test/java/neqsim/process/measurementdevice/CombustionEmissionsCalculatorTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.measurementdevice; +package neqsim.process.measurementdevice; import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; diff --git a/src/test/java/neqsim/processsimulation/measurementdevice/FLowInducedVibrationTest.java b/src/test/java/neqsim/process/measurementdevice/FLowInducedVibrationTest.java similarity index 99% rename from src/test/java/neqsim/processsimulation/measurementdevice/FLowInducedVibrationTest.java rename to src/test/java/neqsim/process/measurementdevice/FLowInducedVibrationTest.java index 1f9ae0e16..030ddd2d7 100644 --- a/src/test/java/neqsim/processsimulation/measurementdevice/FLowInducedVibrationTest.java +++ b/src/test/java/neqsim/process/measurementdevice/FLowInducedVibrationTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.measurementdevice; +package neqsim.process.measurementdevice; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/src/test/java/neqsim/processsimulation/measurementdevice/MultiPhaseMeterTest.java b/src/test/java/neqsim/process/measurementdevice/MultiPhaseMeterTest.java similarity index 97% rename from src/test/java/neqsim/processsimulation/measurementdevice/MultiPhaseMeterTest.java rename to src/test/java/neqsim/process/measurementdevice/MultiPhaseMeterTest.java index d54a261a3..933b13672 100644 --- a/src/test/java/neqsim/processsimulation/measurementdevice/MultiPhaseMeterTest.java +++ b/src/test/java/neqsim/process/measurementdevice/MultiPhaseMeterTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.measurementdevice; +package neqsim.process.measurementdevice; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/src/test/java/neqsim/processsimulation/measurementdevice/WellAllocatorTest.java b/src/test/java/neqsim/process/measurementdevice/WellAllocatorTest.java similarity index 98% rename from src/test/java/neqsim/processsimulation/measurementdevice/WellAllocatorTest.java rename to src/test/java/neqsim/process/measurementdevice/WellAllocatorTest.java index 68ad4e626..6fa8cd629 100644 --- a/src/test/java/neqsim/processsimulation/measurementdevice/WellAllocatorTest.java +++ b/src/test/java/neqsim/process/measurementdevice/WellAllocatorTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.measurementdevice; +package neqsim.process.measurementdevice; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/test/java/neqsim/processsimulation/measurementdevice/nmVOCTest.java b/src/test/java/neqsim/process/measurementdevice/nmVOCTest.java similarity index 99% rename from src/test/java/neqsim/processsimulation/measurementdevice/nmVOCTest.java rename to src/test/java/neqsim/process/measurementdevice/nmVOCTest.java index b5d793562..f18bab4ed 100644 --- a/src/test/java/neqsim/processsimulation/measurementdevice/nmVOCTest.java +++ b/src/test/java/neqsim/process/measurementdevice/nmVOCTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.measurementdevice; +package neqsim.process.measurementdevice; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; diff --git a/src/test/java/neqsim/processsimulation/measurementdevice/pHProbeTest.java b/src/test/java/neqsim/process/measurementdevice/pHProbeTest.java similarity index 97% rename from src/test/java/neqsim/processsimulation/measurementdevice/pHProbeTest.java rename to src/test/java/neqsim/process/measurementdevice/pHProbeTest.java index 07a9ce701..c25c625a7 100644 --- a/src/test/java/neqsim/processsimulation/measurementdevice/pHProbeTest.java +++ b/src/test/java/neqsim/process/measurementdevice/pHProbeTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.measurementdevice; +package neqsim.process.measurementdevice; import static org.junit.jupiter.api.Assertions.assertEquals; import org.apache.logging.log4j.LogManager; diff --git a/src/test/java/neqsim/processsimulation/measurementdevice/simpleflowregime/SevereSlugTest.java b/src/test/java/neqsim/process/measurementdevice/simpleflowregime/SevereSlugTest.java similarity index 94% rename from src/test/java/neqsim/processsimulation/measurementdevice/simpleflowregime/SevereSlugTest.java rename to src/test/java/neqsim/process/measurementdevice/simpleflowregime/SevereSlugTest.java index a35498041..f6450ef49 100644 --- a/src/test/java/neqsim/processsimulation/measurementdevice/simpleflowregime/SevereSlugTest.java +++ b/src/test/java/neqsim/process/measurementdevice/simpleflowregime/SevereSlugTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.measurementdevice.simpleflowregime; +package neqsim.process.measurementdevice.simpleflowregime; import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; diff --git a/src/test/java/neqsim/processsimulation/mechanicaldesign/SystemMechanicalDesignTest.java b/src/test/java/neqsim/process/mechanicaldesign/SystemMechanicalDesignTest.java similarity index 99% rename from src/test/java/neqsim/processsimulation/mechanicaldesign/SystemMechanicalDesignTest.java rename to src/test/java/neqsim/process/mechanicaldesign/SystemMechanicalDesignTest.java index 36e1745b3..df3ac23a3 100644 --- a/src/test/java/neqsim/processsimulation/mechanicaldesign/SystemMechanicalDesignTest.java +++ b/src/test/java/neqsim/process/mechanicaldesign/SystemMechanicalDesignTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.mechanicaldesign; +package neqsim.process.mechanicaldesign; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/src/test/java/neqsim/processsimulation/processsystem/CombinedOilGasFieldTest.java b/src/test/java/neqsim/process/processmodel/CombinedOilGasFieldTest.java similarity index 98% rename from src/test/java/neqsim/processsimulation/processsystem/CombinedOilGasFieldTest.java rename to src/test/java/neqsim/process/processmodel/CombinedOilGasFieldTest.java index 48e6a9841..722eba776 100644 --- a/src/test/java/neqsim/processsimulation/processsystem/CombinedOilGasFieldTest.java +++ b/src/test/java/neqsim/process/processmodel/CombinedOilGasFieldTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processsystem; +package neqsim.process.processmodel; import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; diff --git a/src/test/java/neqsim/processsimulation/processsystem/CompressorModule.java b/src/test/java/neqsim/process/processmodel/CompressorModule.java similarity index 99% rename from src/test/java/neqsim/processsimulation/processsystem/CompressorModule.java rename to src/test/java/neqsim/process/processmodel/CompressorModule.java index 2509fb386..38991ce72 100644 --- a/src/test/java/neqsim/processsimulation/processsystem/CompressorModule.java +++ b/src/test/java/neqsim/process/processmodel/CompressorModule.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processsystem; +package neqsim.process.processmodel; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/src/test/java/neqsim/processsimulation/processsystem/GlycolModulesTest.java b/src/test/java/neqsim/process/processmodel/GlycolModulesTest.java similarity index 99% rename from src/test/java/neqsim/processsimulation/processsystem/GlycolModulesTest.java rename to src/test/java/neqsim/process/processmodel/GlycolModulesTest.java index 027dda98f..2e8ba2e02 100644 --- a/src/test/java/neqsim/processsimulation/processsystem/GlycolModulesTest.java +++ b/src/test/java/neqsim/process/processmodel/GlycolModulesTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processsystem; +package neqsim.process.processmodel; import org.junit.jupiter.api.Test; import neqsim.process.equipment.absorber.SimpleTEGAbsorber; diff --git a/src/test/java/neqsim/processsimulation/processsystem/GlycolRigTest.java b/src/test/java/neqsim/process/processmodel/GlycolRigTest.java similarity index 99% rename from src/test/java/neqsim/processsimulation/processsystem/GlycolRigTest.java rename to src/test/java/neqsim/process/processmodel/GlycolRigTest.java index 439fb5976..06c77e571 100644 --- a/src/test/java/neqsim/processsimulation/processsystem/GlycolRigTest.java +++ b/src/test/java/neqsim/process/processmodel/GlycolRigTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processsystem; +package neqsim.process.processmodel; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/test/java/neqsim/processsimulation/processsystem/MLA_bug_test.java b/src/test/java/neqsim/process/processmodel/MLA_bug_test.java similarity index 99% rename from src/test/java/neqsim/processsimulation/processsystem/MLA_bug_test.java rename to src/test/java/neqsim/process/processmodel/MLA_bug_test.java index 8099763e6..723009d94 100644 --- a/src/test/java/neqsim/processsimulation/processsystem/MLA_bug_test.java +++ b/src/test/java/neqsim/process/processmodel/MLA_bug_test.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processsystem; +package neqsim.process.processmodel; import static org.junit.jupiter.api.Assertions.assertEquals; import org.apache.logging.log4j.LogManager; diff --git a/src/test/java/neqsim/processsimulation/processsystem/OilGasProcessTest.java b/src/test/java/neqsim/process/processmodel/OilGasProcessTest.java similarity index 99% rename from src/test/java/neqsim/processsimulation/processsystem/OilGasProcessTest.java rename to src/test/java/neqsim/process/processmodel/OilGasProcessTest.java index 6de2aa2ee..b528ae93e 100644 --- a/src/test/java/neqsim/processsimulation/processsystem/OilGasProcessTest.java +++ b/src/test/java/neqsim/process/processmodel/OilGasProcessTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processsystem; +package neqsim.process.processmodel; import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; diff --git a/src/test/java/neqsim/processsimulation/processsystem/OilProcessTest.java b/src/test/java/neqsim/process/processmodel/OilProcessTest.java similarity index 91% rename from src/test/java/neqsim/processsimulation/processsystem/OilProcessTest.java rename to src/test/java/neqsim/process/processmodel/OilProcessTest.java index f3c63ae65..bb871a1f1 100644 --- a/src/test/java/neqsim/processsimulation/processsystem/OilProcessTest.java +++ b/src/test/java/neqsim/process/processmodel/OilProcessTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processsystem; +package neqsim.process.processmodel; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/test/java/neqsim/processsimulation/processsystem/ProcessSystemControllerTest.java b/src/test/java/neqsim/process/processmodel/ProcessSystemControllerTest.java similarity index 98% rename from src/test/java/neqsim/processsimulation/processsystem/ProcessSystemControllerTest.java rename to src/test/java/neqsim/process/processmodel/ProcessSystemControllerTest.java index 12a86affe..0ec145789 100644 --- a/src/test/java/neqsim/processsimulation/processsystem/ProcessSystemControllerTest.java +++ b/src/test/java/neqsim/process/processmodel/ProcessSystemControllerTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processsystem; +package neqsim.process.processmodel; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/test/java/neqsim/processsimulation/processsystem/ProcessSystemRunTransientTest.java b/src/test/java/neqsim/process/processmodel/ProcessSystemRunTransientTest.java similarity index 99% rename from src/test/java/neqsim/processsimulation/processsystem/ProcessSystemRunTransientTest.java rename to src/test/java/neqsim/process/processmodel/ProcessSystemRunTransientTest.java index a253ca6cc..cf4cc2394 100644 --- a/src/test/java/neqsim/processsimulation/processsystem/ProcessSystemRunTransientTest.java +++ b/src/test/java/neqsim/process/processmodel/ProcessSystemRunTransientTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processsystem; +package neqsim.process.processmodel; import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Assertions; diff --git a/src/test/java/neqsim/processsimulation/processsystem/ProcessSystemSerializationTest.java b/src/test/java/neqsim/process/processmodel/ProcessSystemSerializationTest.java similarity index 99% rename from src/test/java/neqsim/processsimulation/processsystem/ProcessSystemSerializationTest.java rename to src/test/java/neqsim/process/processmodel/ProcessSystemSerializationTest.java index dcbf60d2d..5922cfb6c 100644 --- a/src/test/java/neqsim/processsimulation/processsystem/ProcessSystemSerializationTest.java +++ b/src/test/java/neqsim/process/processmodel/ProcessSystemSerializationTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processsystem; +package neqsim.process.processmodel; import org.junit.jupiter.api.Test; import com.thoughtworks.xstream.XStream; diff --git a/src/test/java/neqsim/processsimulation/processsystem/ProcessSystemTest.java b/src/test/java/neqsim/process/processmodel/ProcessSystemTest.java similarity index 99% rename from src/test/java/neqsim/processsimulation/processsystem/ProcessSystemTest.java rename to src/test/java/neqsim/process/processmodel/ProcessSystemTest.java index 8016f3c8a..947563d3d 100644 --- a/src/test/java/neqsim/processsimulation/processsystem/ProcessSystemTest.java +++ b/src/test/java/neqsim/process/processmodel/ProcessSystemTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processsystem; +package neqsim.process.processmodel; import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.ArrayList; diff --git a/src/test/java/neqsim/processsimulation/processsystem/ReferenceProcessTest.java b/src/test/java/neqsim/process/processmodel/ReferenceProcessTest.java similarity index 99% rename from src/test/java/neqsim/processsimulation/processsystem/ReferenceProcessTest.java rename to src/test/java/neqsim/process/processmodel/ReferenceProcessTest.java index f80a98d82..62c2e161e 100644 --- a/src/test/java/neqsim/processsimulation/processsystem/ReferenceProcessTest.java +++ b/src/test/java/neqsim/process/processmodel/ReferenceProcessTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processsystem; +package neqsim.process.processmodel; import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; diff --git a/src/test/java/neqsim/processsimulation/processsystem/waterDegasserTest.java b/src/test/java/neqsim/process/processmodel/waterDegasserTest.java similarity index 99% rename from src/test/java/neqsim/processsimulation/processsystem/waterDegasserTest.java rename to src/test/java/neqsim/process/processmodel/waterDegasserTest.java index eacc3d9f2..9d0e54520 100644 --- a/src/test/java/neqsim/processsimulation/processsystem/waterDegasserTest.java +++ b/src/test/java/neqsim/process/processmodel/waterDegasserTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.processsystem; +package neqsim.process.processmodel; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/test/java/neqsim/processsimulation/util/example/LNGfilling.java b/src/test/java/neqsim/process/util/example/LNGfilling.java similarity index 97% rename from src/test/java/neqsim/processsimulation/util/example/LNGfilling.java rename to src/test/java/neqsim/process/util/example/LNGfilling.java index c5f5ce3cf..3496aea92 100644 --- a/src/test/java/neqsim/processsimulation/util/example/LNGfilling.java +++ b/src/test/java/neqsim/process/util/example/LNGfilling.java @@ -4,7 +4,7 @@ * Created on 6. september 2006, 14:46 */ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.mixer.Mixer; import neqsim.process.equipment.stream.Stream; diff --git a/src/test/java/neqsim/processsimulation/util/example/LNGfilling2.java b/src/test/java/neqsim/process/util/example/LNGfilling2.java similarity index 97% rename from src/test/java/neqsim/processsimulation/util/example/LNGfilling2.java rename to src/test/java/neqsim/process/util/example/LNGfilling2.java index 4900c9488..8383eed6e 100644 --- a/src/test/java/neqsim/processsimulation/util/example/LNGfilling2.java +++ b/src/test/java/neqsim/process/util/example/LNGfilling2.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.stream.Stream; import neqsim.process.equipment.stream.StreamInterface; diff --git a/src/test/java/neqsim/processsimulation/util/example/LNGtankfilling.java b/src/test/java/neqsim/process/util/example/LNGtankfilling.java similarity index 99% rename from src/test/java/neqsim/processsimulation/util/example/LNGtankfilling.java rename to src/test/java/neqsim/process/util/example/LNGtankfilling.java index e141658fd..5b0d42ad6 100644 --- a/src/test/java/neqsim/processsimulation/util/example/LNGtankfilling.java +++ b/src/test/java/neqsim/process/util/example/LNGtankfilling.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.stream.Stream; import neqsim.process.equipment.tank.Tank; diff --git a/src/test/java/neqsim/processsimulation/util/example/MEGinjection.java b/src/test/java/neqsim/process/util/example/MEGinjection.java similarity index 99% rename from src/test/java/neqsim/processsimulation/util/example/MEGinjection.java rename to src/test/java/neqsim/process/util/example/MEGinjection.java index 406488f9d..ac751d3ba 100644 --- a/src/test/java/neqsim/processsimulation/util/example/MEGinjection.java +++ b/src/test/java/neqsim/process/util/example/MEGinjection.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.heatexchanger.Heater; import neqsim.process.equipment.mixer.StaticMixer; diff --git a/src/test/java/neqsim/processsimulation/util/example/MasstransferMeOH.java b/src/test/java/neqsim/process/util/example/MasstransferMeOH.java similarity index 98% rename from src/test/java/neqsim/processsimulation/util/example/MasstransferMeOH.java rename to src/test/java/neqsim/process/util/example/MasstransferMeOH.java index 66e2ccd65..9f2283f59 100644 --- a/src/test/java/neqsim/processsimulation/util/example/MasstransferMeOH.java +++ b/src/test/java/neqsim/process/util/example/MasstransferMeOH.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.mixer.StaticMixer; import neqsim.process.equipment.mixer.StaticPhaseMixer; diff --git a/src/test/java/neqsim/processsimulation/util/example/OffshoreProcess.java b/src/test/java/neqsim/process/util/example/OffshoreProcess.java similarity index 99% rename from src/test/java/neqsim/processsimulation/util/example/OffshoreProcess.java rename to src/test/java/neqsim/process/util/example/OffshoreProcess.java index 93decf491..1cfe3db17 100644 --- a/src/test/java/neqsim/processsimulation/util/example/OffshoreProcess.java +++ b/src/test/java/neqsim/process/util/example/OffshoreProcess.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.compressor.Compressor; import neqsim.process.equipment.mixer.Mixer; diff --git a/src/test/java/neqsim/processsimulation/util/example/OffshoreProcess2.java b/src/test/java/neqsim/process/util/example/OffshoreProcess2.java similarity index 98% rename from src/test/java/neqsim/processsimulation/util/example/OffshoreProcess2.java rename to src/test/java/neqsim/process/util/example/OffshoreProcess2.java index e8df49e30..fe6194d59 100644 --- a/src/test/java/neqsim/processsimulation/util/example/OffshoreProcess2.java +++ b/src/test/java/neqsim/process/util/example/OffshoreProcess2.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.mixer.Mixer; import neqsim.process.equipment.mixer.StaticPhaseMixer; diff --git a/src/test/java/neqsim/processsimulation/util/example/OffshoreProcess3.java b/src/test/java/neqsim/process/util/example/OffshoreProcess3.java similarity index 99% rename from src/test/java/neqsim/processsimulation/util/example/OffshoreProcess3.java rename to src/test/java/neqsim/process/util/example/OffshoreProcess3.java index 1d9c37fae..f9380ccf0 100644 --- a/src/test/java/neqsim/processsimulation/util/example/OffshoreProcess3.java +++ b/src/test/java/neqsim/process/util/example/OffshoreProcess3.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.compressor.Compressor; import neqsim.process.equipment.heatexchanger.Cooler; diff --git a/src/test/java/neqsim/processsimulation/util/example/OnshoreMEGprocess.java b/src/test/java/neqsim/process/util/example/OnshoreMEGprocess.java similarity index 99% rename from src/test/java/neqsim/processsimulation/util/example/OnshoreMEGprocess.java rename to src/test/java/neqsim/process/util/example/OnshoreMEGprocess.java index a195ed1d9..ab76b002c 100644 --- a/src/test/java/neqsim/processsimulation/util/example/OnshoreMEGprocess.java +++ b/src/test/java/neqsim/process/util/example/OnshoreMEGprocess.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.compressor.Compressor; import neqsim.process.equipment.distillation.Condenser; diff --git a/src/test/java/neqsim/processsimulation/util/example/OnshoreProcess1.java b/src/test/java/neqsim/process/util/example/OnshoreProcess1.java similarity index 99% rename from src/test/java/neqsim/processsimulation/util/example/OnshoreProcess1.java rename to src/test/java/neqsim/process/util/example/OnshoreProcess1.java index 615b27457..b20a8f009 100644 --- a/src/test/java/neqsim/processsimulation/util/example/OnshoreProcess1.java +++ b/src/test/java/neqsim/process/util/example/OnshoreProcess1.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/test/java/neqsim/processsimulation/util/example/TEGAbsorberTest.java b/src/test/java/neqsim/process/util/example/TEGAbsorberTest.java similarity index 99% rename from src/test/java/neqsim/processsimulation/util/example/TEGAbsorberTest.java rename to src/test/java/neqsim/process/util/example/TEGAbsorberTest.java index 8793e9e24..648fe7566 100644 --- a/src/test/java/neqsim/processsimulation/util/example/TEGAbsorberTest.java +++ b/src/test/java/neqsim/process/util/example/TEGAbsorberTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.absorber.SimpleTEGAbsorber; import neqsim.process.equipment.heatexchanger.ReBoiler; diff --git a/src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcess2.java b/src/test/java/neqsim/process/util/example/TEGdehydrationProcess2.java similarity index 99% rename from src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcess2.java rename to src/test/java/neqsim/process/util/example/TEGdehydrationProcess2.java index 094a28b43..839b1b28d 100644 --- a/src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcess2.java +++ b/src/test/java/neqsim/process/util/example/TEGdehydrationProcess2.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.absorber.SimpleTEGAbsorber; import neqsim.process.equipment.absorber.WaterStripperColumn; diff --git a/src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcessDistillation.java b/src/test/java/neqsim/process/util/example/TEGdehydrationProcessDistillation.java similarity index 99% rename from src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcessDistillation.java rename to src/test/java/neqsim/process/util/example/TEGdehydrationProcessDistillation.java index b943a60da..35b3ad947 100644 --- a/src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcessDistillation.java +++ b/src/test/java/neqsim/process/util/example/TEGdehydrationProcessDistillation.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.absorber.SimpleTEGAbsorber; import neqsim.process.equipment.absorber.WaterStripperColumn; diff --git a/src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcessDistillation3.java b/src/test/java/neqsim/process/util/example/TEGdehydrationProcessDistillation3.java similarity index 99% rename from src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcessDistillation3.java rename to src/test/java/neqsim/process/util/example/TEGdehydrationProcessDistillation3.java index 861036a19..db417d9e9 100644 --- a/src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcessDistillation3.java +++ b/src/test/java/neqsim/process/util/example/TEGdehydrationProcessDistillation3.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.absorber.SimpleTEGAbsorber; import neqsim.process.equipment.absorber.WaterStripperColumn; diff --git a/src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcessDistillationAaHa.java b/src/test/java/neqsim/process/util/example/TEGdehydrationProcessDistillationAaHa.java similarity index 99% rename from src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcessDistillationAaHa.java rename to src/test/java/neqsim/process/util/example/TEGdehydrationProcessDistillationAaHa.java index 3d490efd3..8e299aa20 100644 --- a/src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcessDistillationAaHa.java +++ b/src/test/java/neqsim/process/util/example/TEGdehydrationProcessDistillationAaHa.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.conditionmonitor.ConditionMonitor; import neqsim.process.equipment.absorber.SimpleTEGAbsorber; diff --git a/src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcessDistillationGFA.java b/src/test/java/neqsim/process/util/example/TEGdehydrationProcessDistillationGFA.java similarity index 99% rename from src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcessDistillationGFA.java rename to src/test/java/neqsim/process/util/example/TEGdehydrationProcessDistillationGFA.java index 5057796aa..15c91e3f0 100644 --- a/src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcessDistillationGFA.java +++ b/src/test/java/neqsim/process/util/example/TEGdehydrationProcessDistillationGFA.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.conditionmonitor.ConditionMonitor; import neqsim.process.equipment.absorber.SimpleTEGAbsorber; diff --git a/src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcessDistillationJS.java b/src/test/java/neqsim/process/util/example/TEGdehydrationProcessDistillationJS.java similarity index 99% rename from src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcessDistillationJS.java rename to src/test/java/neqsim/process/util/example/TEGdehydrationProcessDistillationJS.java index 836b2562f..1b6c180cf 100644 --- a/src/test/java/neqsim/processsimulation/util/example/TEGdehydrationProcessDistillationJS.java +++ b/src/test/java/neqsim/process/util/example/TEGdehydrationProcessDistillationJS.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.absorber.SimpleTEGAbsorber; import neqsim.process.equipment.absorber.WaterStripperColumn; diff --git a/src/test/java/neqsim/processsimulation/util/example/TEGstripperProcess.java b/src/test/java/neqsim/process/util/example/TEGstripperProcess.java similarity index 98% rename from src/test/java/neqsim/processsimulation/util/example/TEGstripperProcess.java rename to src/test/java/neqsim/process/util/example/TEGstripperProcess.java index 7be5af4fe..d6cc4f79d 100644 --- a/src/test/java/neqsim/processsimulation/util/example/TEGstripperProcess.java +++ b/src/test/java/neqsim/process/util/example/TEGstripperProcess.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.absorber.WaterStripperColumn; import neqsim.process.equipment.stream.Stream; diff --git a/src/test/java/neqsim/processsimulation/util/example/TestMechanicalDesign.java b/src/test/java/neqsim/process/util/example/TestMechanicalDesign.java similarity index 98% rename from src/test/java/neqsim/processsimulation/util/example/TestMechanicalDesign.java rename to src/test/java/neqsim/process/util/example/TestMechanicalDesign.java index 34d0d05e9..a30b548b7 100644 --- a/src/test/java/neqsim/processsimulation/util/example/TestMechanicalDesign.java +++ b/src/test/java/neqsim/process/util/example/TestMechanicalDesign.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.separator.Separator; import neqsim.process.equipment.stream.Stream; diff --git a/src/test/java/neqsim/processsimulation/util/example/TestNeqsim.java b/src/test/java/neqsim/process/util/example/TestNeqsim.java similarity index 99% rename from src/test/java/neqsim/processsimulation/util/example/TestNeqsim.java rename to src/test/java/neqsim/process/util/example/TestNeqsim.java index c82a5ba39..398cda41c 100644 --- a/src/test/java/neqsim/processsimulation/util/example/TestNeqsim.java +++ b/src/test/java/neqsim/process/util/example/TestNeqsim.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.compressor.Compressor; import neqsim.process.equipment.stream.Stream; diff --git a/src/test/java/neqsim/processsimulation/util/example/TestOnlineProcess.java b/src/test/java/neqsim/process/util/example/TestOnlineProcess.java similarity index 97% rename from src/test/java/neqsim/processsimulation/util/example/TestOnlineProcess.java rename to src/test/java/neqsim/process/util/example/TestOnlineProcess.java index e9ce96110..b70ce8a87 100644 --- a/src/test/java/neqsim/processsimulation/util/example/TestOnlineProcess.java +++ b/src/test/java/neqsim/process/util/example/TestOnlineProcess.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.stream.Stream; import neqsim.process.equipment.valve.ThrottlingValve; diff --git a/src/test/java/neqsim/processsimulation/util/example/TestProcess4.java b/src/test/java/neqsim/process/util/example/TestProcess4.java similarity index 97% rename from src/test/java/neqsim/processsimulation/util/example/TestProcess4.java rename to src/test/java/neqsim/process/util/example/TestProcess4.java index 69a34c993..c0f6bb7e4 100644 --- a/src/test/java/neqsim/processsimulation/util/example/TestProcess4.java +++ b/src/test/java/neqsim/process/util/example/TestProcess4.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.separator.Separator; import neqsim.process.equipment.stream.Stream; diff --git a/src/test/java/neqsim/processsimulation/util/example/TestSeparationTrain.java b/src/test/java/neqsim/process/util/example/TestSeparationTrain.java similarity index 99% rename from src/test/java/neqsim/processsimulation/util/example/TestSeparationTrain.java rename to src/test/java/neqsim/process/util/example/TestSeparationTrain.java index 7464b64d9..fee88080a 100644 --- a/src/test/java/neqsim/processsimulation/util/example/TestSeparationTrain.java +++ b/src/test/java/neqsim/process/util/example/TestSeparationTrain.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.compressor.Compressor; import neqsim.process.equipment.heatexchanger.Cooler; diff --git a/src/test/java/neqsim/processsimulation/util/example/TestSlugcatcher.java b/src/test/java/neqsim/process/util/example/TestSlugcatcher.java similarity index 98% rename from src/test/java/neqsim/processsimulation/util/example/TestSlugcatcher.java rename to src/test/java/neqsim/process/util/example/TestSlugcatcher.java index 13bc7a241..534fca263 100644 --- a/src/test/java/neqsim/processsimulation/util/example/TestSlugcatcher.java +++ b/src/test/java/neqsim/process/util/example/TestSlugcatcher.java @@ -4,7 +4,7 @@ * Created on 30. juli 2007, 18:49 */ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.separator.ThreePhaseSeparator; import neqsim.process.equipment.stream.Stream; diff --git a/src/test/java/neqsim/processsimulation/util/example/TestTransientFlow.java b/src/test/java/neqsim/process/util/example/TestTransientFlow.java similarity index 99% rename from src/test/java/neqsim/processsimulation/util/example/TestTransientFlow.java rename to src/test/java/neqsim/process/util/example/TestTransientFlow.java index 491798332..1ab2c09d8 100644 --- a/src/test/java/neqsim/processsimulation/util/example/TestTransientFlow.java +++ b/src/test/java/neqsim/process/util/example/TestTransientFlow.java @@ -4,7 +4,7 @@ * Created on 8. oktober 2006, 13:13 */ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.controllerdevice.ControllerDeviceBaseClass; import neqsim.process.controllerdevice.ControllerDeviceInterface; diff --git a/src/test/java/neqsim/processsimulation/util/example/TestTransientFlow2.java b/src/test/java/neqsim/process/util/example/TestTransientFlow2.java similarity index 98% rename from src/test/java/neqsim/processsimulation/util/example/TestTransientFlow2.java rename to src/test/java/neqsim/process/util/example/TestTransientFlow2.java index 998312ce8..981978cbe 100644 --- a/src/test/java/neqsim/processsimulation/util/example/TestTransientFlow2.java +++ b/src/test/java/neqsim/process/util/example/TestTransientFlow2.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.controllerdevice.ControllerDeviceBaseClass; import neqsim.process.controllerdevice.ControllerDeviceInterface; diff --git a/src/test/java/neqsim/processsimulation/util/example/WellStreamMixer.java b/src/test/java/neqsim/process/util/example/WellStreamMixer.java similarity index 98% rename from src/test/java/neqsim/processsimulation/util/example/WellStreamMixer.java rename to src/test/java/neqsim/process/util/example/WellStreamMixer.java index 92ca50c5d..6c72be05e 100644 --- a/src/test/java/neqsim/processsimulation/util/example/WellStreamMixer.java +++ b/src/test/java/neqsim/process/util/example/WellStreamMixer.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.mixer.Mixer; import neqsim.process.equipment.mixer.StaticMixer; diff --git a/src/test/java/neqsim/processsimulation/util/example/compressorTest.java b/src/test/java/neqsim/process/util/example/compressorTest.java similarity index 97% rename from src/test/java/neqsim/processsimulation/util/example/compressorTest.java rename to src/test/java/neqsim/process/util/example/compressorTest.java index e1f42b8bd..a611f5da6 100644 --- a/src/test/java/neqsim/processsimulation/util/example/compressorTest.java +++ b/src/test/java/neqsim/process/util/example/compressorTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.compressor.Compressor; import neqsim.process.equipment.mixer.MixerInterface; diff --git a/src/test/java/neqsim/processsimulation/util/example/compressorTest12.java b/src/test/java/neqsim/process/util/example/compressorTest12.java similarity index 98% rename from src/test/java/neqsim/processsimulation/util/example/compressorTest12.java rename to src/test/java/neqsim/process/util/example/compressorTest12.java index 4f8b753da..aa1abb052 100644 --- a/src/test/java/neqsim/processsimulation/util/example/compressorTest12.java +++ b/src/test/java/neqsim/process/util/example/compressorTest12.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import org.junit.jupiter.api.Test; import neqsim.process.equipment.compressor.Compressor; diff --git a/src/test/java/neqsim/processsimulation/util/example/compressorTest_1.java b/src/test/java/neqsim/process/util/example/compressorTest_1.java similarity index 98% rename from src/test/java/neqsim/processsimulation/util/example/compressorTest_1.java rename to src/test/java/neqsim/process/util/example/compressorTest_1.java index 79ee64d2a..27ec72e16 100644 --- a/src/test/java/neqsim/processsimulation/util/example/compressorTest_1.java +++ b/src/test/java/neqsim/process/util/example/compressorTest_1.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/test/java/neqsim/processsimulation/util/example/destillation1.java b/src/test/java/neqsim/process/util/example/destillation1.java similarity index 98% rename from src/test/java/neqsim/processsimulation/util/example/destillation1.java rename to src/test/java/neqsim/process/util/example/destillation1.java index 0502948cd..066b38344 100644 --- a/src/test/java/neqsim/processsimulation/util/example/destillation1.java +++ b/src/test/java/neqsim/process/util/example/destillation1.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.distillation.Condenser; import neqsim.process.equipment.distillation.DistillationColumn; diff --git a/src/test/java/neqsim/processsimulation/util/example/destillation2.java b/src/test/java/neqsim/process/util/example/destillation2.java similarity index 97% rename from src/test/java/neqsim/processsimulation/util/example/destillation2.java rename to src/test/java/neqsim/process/util/example/destillation2.java index 68ce50cd9..fee00bb7b 100644 --- a/src/test/java/neqsim/processsimulation/util/example/destillation2.java +++ b/src/test/java/neqsim/process/util/example/destillation2.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.distillation.DistillationColumn; import neqsim.process.equipment.stream.Stream; diff --git a/src/test/java/neqsim/processsimulation/util/example/expander1.java b/src/test/java/neqsim/process/util/example/expander1.java similarity index 97% rename from src/test/java/neqsim/processsimulation/util/example/expander1.java rename to src/test/java/neqsim/process/util/example/expander1.java index 6f26892fc..cf7400e46 100644 --- a/src/test/java/neqsim/processsimulation/util/example/expander1.java +++ b/src/test/java/neqsim/process/util/example/expander1.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.stream.Stream; diff --git a/src/test/java/neqsim/processsimulation/util/example/gasPipeline.java b/src/test/java/neqsim/process/util/example/gasPipeline.java similarity index 98% rename from src/test/java/neqsim/processsimulation/util/example/gasPipeline.java rename to src/test/java/neqsim/process/util/example/gasPipeline.java index d496cbb95..9af1e4955 100644 --- a/src/test/java/neqsim/processsimulation/util/example/gasPipeline.java +++ b/src/test/java/neqsim/process/util/example/gasPipeline.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.pipeline.AdiabaticPipe; import neqsim.process.equipment.pipeline.AdiabaticTwoPhasePipe; diff --git a/src/test/java/neqsim/processsimulation/util/example/multiThreadTest.java b/src/test/java/neqsim/process/util/example/multiThreadTest.java similarity index 99% rename from src/test/java/neqsim/processsimulation/util/example/multiThreadTest.java rename to src/test/java/neqsim/process/util/example/multiThreadTest.java index 3e7c34c5b..3b6d6c28a 100644 --- a/src/test/java/neqsim/processsimulation/util/example/multiThreadTest.java +++ b/src/test/java/neqsim/process/util/example/multiThreadTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/test/java/neqsim/processsimulation/util/example/oxygenRemovalWater.java b/src/test/java/neqsim/process/util/example/oxygenRemovalWater.java similarity index 98% rename from src/test/java/neqsim/processsimulation/util/example/oxygenRemovalWater.java rename to src/test/java/neqsim/process/util/example/oxygenRemovalWater.java index 341dcfc0b..0a99de073 100644 --- a/src/test/java/neqsim/processsimulation/util/example/oxygenRemovalWater.java +++ b/src/test/java/neqsim/process/util/example/oxygenRemovalWater.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.heatexchanger.Heater; import neqsim.process.equipment.mixer.Mixer; diff --git a/src/test/java/neqsim/processsimulation/util/example/process1.java b/src/test/java/neqsim/process/util/example/process1.java similarity index 98% rename from src/test/java/neqsim/processsimulation/util/example/process1.java rename to src/test/java/neqsim/process/util/example/process1.java index 1a55d84c2..bab899f5e 100644 --- a/src/test/java/neqsim/processsimulation/util/example/process1.java +++ b/src/test/java/neqsim/process/util/example/process1.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.stream.Stream; import neqsim.thermodynamicoperations.ThermodynamicOperations; diff --git a/src/test/java/neqsim/processsimulation/util/example/process1Test.java b/src/test/java/neqsim/process/util/example/process1Test.java similarity index 96% rename from src/test/java/neqsim/processsimulation/util/example/process1Test.java rename to src/test/java/neqsim/process/util/example/process1Test.java index be3a60603..6691cd102 100644 --- a/src/test/java/neqsim/processsimulation/util/example/process1Test.java +++ b/src/test/java/neqsim/process/util/example/process1Test.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/src/test/java/neqsim/processsimulation/util/example/process2.java b/src/test/java/neqsim/process/util/example/process2.java similarity index 98% rename from src/test/java/neqsim/processsimulation/util/example/process2.java rename to src/test/java/neqsim/process/util/example/process2.java index 0f3eee28d..ccd869cdb 100644 --- a/src/test/java/neqsim/processsimulation/util/example/process2.java +++ b/src/test/java/neqsim/process/util/example/process2.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.heatexchanger.Heater; import neqsim.process.equipment.mixer.MixerInterface; diff --git a/src/test/java/neqsim/processsimulation/util/example/processCO2MDEA.java b/src/test/java/neqsim/process/util/example/processCO2MDEA.java similarity index 97% rename from src/test/java/neqsim/processsimulation/util/example/processCO2MDEA.java rename to src/test/java/neqsim/process/util/example/processCO2MDEA.java index ff228c0f5..cc0dff2ee 100644 --- a/src/test/java/neqsim/processsimulation/util/example/processCO2MDEA.java +++ b/src/test/java/neqsim/process/util/example/processCO2MDEA.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.pipeline.Pipeline; import neqsim.process.equipment.pipeline.TwoPhasePipeLine; diff --git a/src/test/java/neqsim/processsimulation/util/example/propaneCoolingCycle.java b/src/test/java/neqsim/process/util/example/propaneCoolingCycle.java similarity index 98% rename from src/test/java/neqsim/processsimulation/util/example/propaneCoolingCycle.java rename to src/test/java/neqsim/process/util/example/propaneCoolingCycle.java index 75383ad3c..ed3da4766 100644 --- a/src/test/java/neqsim/processsimulation/util/example/propaneCoolingCycle.java +++ b/src/test/java/neqsim/process/util/example/propaneCoolingCycle.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.compressor.Compressor; import neqsim.process.equipment.heatexchanger.Cooler; diff --git a/src/test/java/neqsim/processsimulation/util/example/propaneMultiStageCoolingCycle.java b/src/test/java/neqsim/process/util/example/propaneMultiStageCoolingCycle.java similarity index 99% rename from src/test/java/neqsim/processsimulation/util/example/propaneMultiStageCoolingCycle.java rename to src/test/java/neqsim/process/util/example/propaneMultiStageCoolingCycle.java index 1427e715f..6aad038b9 100644 --- a/src/test/java/neqsim/processsimulation/util/example/propaneMultiStageCoolingCycle.java +++ b/src/test/java/neqsim/process/util/example/propaneMultiStageCoolingCycle.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.heatexchanger.HeatExchanger; import neqsim.process.equipment.separator.Separator; diff --git a/src/test/java/neqsim/processsimulation/util/example/propaneTwoStageCoolingCycle.java b/src/test/java/neqsim/process/util/example/propaneTwoStageCoolingCycle.java similarity index 99% rename from src/test/java/neqsim/processsimulation/util/example/propaneTwoStageCoolingCycle.java rename to src/test/java/neqsim/process/util/example/propaneTwoStageCoolingCycle.java index 2fb097136..f214f2e94 100644 --- a/src/test/java/neqsim/processsimulation/util/example/propaneTwoStageCoolingCycle.java +++ b/src/test/java/neqsim/process/util/example/propaneTwoStageCoolingCycle.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.compressor.Compressor; import neqsim.process.equipment.heatexchanger.Cooler; diff --git a/src/test/java/neqsim/processsimulation/util/example/shtokman.java b/src/test/java/neqsim/process/util/example/shtokman.java similarity index 98% rename from src/test/java/neqsim/processsimulation/util/example/shtokman.java rename to src/test/java/neqsim/process/util/example/shtokman.java index 27936cbe6..bbb3cbd9d 100644 --- a/src/test/java/neqsim/processsimulation/util/example/shtokman.java +++ b/src/test/java/neqsim/process/util/example/shtokman.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.separator.Separator; import neqsim.process.equipment.stream.Stream; diff --git a/src/test/java/neqsim/processsimulation/util/example/shtokman_MEG.java b/src/test/java/neqsim/process/util/example/shtokman_MEG.java similarity index 97% rename from src/test/java/neqsim/processsimulation/util/example/shtokman_MEG.java rename to src/test/java/neqsim/process/util/example/shtokman_MEG.java index 4442e73e4..8df9870ee 100644 --- a/src/test/java/neqsim/processsimulation/util/example/shtokman_MEG.java +++ b/src/test/java/neqsim/process/util/example/shtokman_MEG.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/test/java/neqsim/processsimulation/util/example/simpleGasScrubber.java b/src/test/java/neqsim/process/util/example/simpleGasScrubber.java similarity index 97% rename from src/test/java/neqsim/processsimulation/util/example/simpleGasScrubber.java rename to src/test/java/neqsim/process/util/example/simpleGasScrubber.java index 6d0514c05..009530c56 100644 --- a/src/test/java/neqsim/processsimulation/util/example/simpleGasScrubber.java +++ b/src/test/java/neqsim/process/util/example/simpleGasScrubber.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.separator.GasScrubberSimple; import neqsim.process.equipment.stream.Stream; diff --git a/src/test/java/neqsim/processsimulation/util/example/simpleTopSideProcess.java b/src/test/java/neqsim/process/util/example/simpleTopSideProcess.java similarity index 98% rename from src/test/java/neqsim/processsimulation/util/example/simpleTopSideProcess.java rename to src/test/java/neqsim/process/util/example/simpleTopSideProcess.java index 20936867b..e38238411 100644 --- a/src/test/java/neqsim/processsimulation/util/example/simpleTopSideProcess.java +++ b/src/test/java/neqsim/process/util/example/simpleTopSideProcess.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.compressor.Compressor; import neqsim.process.equipment.heatexchanger.Heater; diff --git a/src/test/java/neqsim/processsimulation/util/example/simpleTopSideProcess2.java b/src/test/java/neqsim/process/util/example/simpleTopSideProcess2.java similarity index 98% rename from src/test/java/neqsim/processsimulation/util/example/simpleTopSideProcess2.java rename to src/test/java/neqsim/process/util/example/simpleTopSideProcess2.java index 1cc6da0a9..4caa2899b 100644 --- a/src/test/java/neqsim/processsimulation/util/example/simpleTopSideProcess2.java +++ b/src/test/java/neqsim/process/util/example/simpleTopSideProcess2.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.heatexchanger.Heater; import neqsim.process.equipment.mixer.Mixer; diff --git a/src/test/java/neqsim/processsimulation/util/example/testGasScrubber.java b/src/test/java/neqsim/process/util/example/testGasScrubber.java similarity index 99% rename from src/test/java/neqsim/processsimulation/util/example/testGasScrubber.java rename to src/test/java/neqsim/process/util/example/testGasScrubber.java index d7ca8dad1..bf53cbebb 100644 --- a/src/test/java/neqsim/processsimulation/util/example/testGasScrubber.java +++ b/src/test/java/neqsim/process/util/example/testGasScrubber.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/test/java/neqsim/processsimulation/util/example/threePhaseSeparation.java b/src/test/java/neqsim/process/util/example/threePhaseSeparation.java similarity index 98% rename from src/test/java/neqsim/processsimulation/util/example/threePhaseSeparation.java rename to src/test/java/neqsim/process/util/example/threePhaseSeparation.java index 9a5865f05..8a39dd97d 100644 --- a/src/test/java/neqsim/processsimulation/util/example/threePhaseSeparation.java +++ b/src/test/java/neqsim/process/util/example/threePhaseSeparation.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.separator.ThreePhaseSeparator; import neqsim.process.equipment.stream.Stream; diff --git a/src/test/java/neqsim/processsimulation/util/example/threePhaseSeparation_1.java b/src/test/java/neqsim/process/util/example/threePhaseSeparation_1.java similarity index 98% rename from src/test/java/neqsim/processsimulation/util/example/threePhaseSeparation_1.java rename to src/test/java/neqsim/process/util/example/threePhaseSeparation_1.java index f420896eb..8c4b3d544 100644 --- a/src/test/java/neqsim/processsimulation/util/example/threePhaseSeparation_1.java +++ b/src/test/java/neqsim/process/util/example/threePhaseSeparation_1.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.example; +package neqsim.process.util.example; import neqsim.process.equipment.separator.ThreePhaseSeparator; import neqsim.process.equipment.stream.Stream; diff --git a/src/test/java/neqsim/processsimulation/util/monitor/SeparatorResponseTest.java b/src/test/java/neqsim/process/util/monitor/SeparatorResponseTest.java similarity index 98% rename from src/test/java/neqsim/processsimulation/util/monitor/SeparatorResponseTest.java rename to src/test/java/neqsim/process/util/monitor/SeparatorResponseTest.java index 9174441dd..a25423446 100644 --- a/src/test/java/neqsim/processsimulation/util/monitor/SeparatorResponseTest.java +++ b/src/test/java/neqsim/process/util/monitor/SeparatorResponseTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.monitor; +package neqsim.process.util.monitor; import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; diff --git a/src/test/java/neqsim/processsimulation/util/report/FluidCompinentReportTest.java b/src/test/java/neqsim/process/util/report/FluidCompinentReportTest.java similarity index 92% rename from src/test/java/neqsim/processsimulation/util/report/FluidCompinentReportTest.java rename to src/test/java/neqsim/process/util/report/FluidCompinentReportTest.java index 2b30323dc..12f0ba519 100644 --- a/src/test/java/neqsim/processsimulation/util/report/FluidCompinentReportTest.java +++ b/src/test/java/neqsim/process/util/report/FluidCompinentReportTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.report; +package neqsim.process.util.report; import org.junit.jupiter.api.Test; import neqsim.thermo.system.SystemSrkEos; diff --git a/src/test/java/neqsim/processsimulation/util/report/FluidReportTest.java b/src/test/java/neqsim/process/util/report/FluidReportTest.java similarity index 94% rename from src/test/java/neqsim/processsimulation/util/report/FluidReportTest.java rename to src/test/java/neqsim/process/util/report/FluidReportTest.java index 10d199e19..df8597446 100644 --- a/src/test/java/neqsim/processsimulation/util/report/FluidReportTest.java +++ b/src/test/java/neqsim/process/util/report/FluidReportTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.report; +package neqsim.process.util.report; import org.junit.jupiter.api.Test; import neqsim.thermo.system.SystemSrkEos; diff --git a/src/test/java/neqsim/processsimulation/util/report/ReportTest.java b/src/test/java/neqsim/process/util/report/ReportTest.java similarity index 97% rename from src/test/java/neqsim/processsimulation/util/report/ReportTest.java rename to src/test/java/neqsim/process/util/report/ReportTest.java index 38555f39e..01a8dc43e 100644 --- a/src/test/java/neqsim/processsimulation/util/report/ReportTest.java +++ b/src/test/java/neqsim/process/util/report/ReportTest.java @@ -1,4 +1,4 @@ -package neqsim.processsimulation.util.report; +package neqsim.process.util.report; import org.junit.jupiter.api.Test; import neqsim.process.equipment.compressor.Compressor; From 89b65df693649f9bdf12af28d742a9586921abfa Mon Sep 17 00:00:00 2001 From: Even Solbraa <41290109+EvenSol@users.noreply.github.com> Date: Mon, 4 Nov 2024 12:26:19 +0100 Subject: [PATCH 07/21] v3.0.4 (#1167) --- pom.xml | 2 +- pomJava21.xml | 2 +- pomJava8.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index f8d652ed0..8c33b34ed 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ ${revision}${sha1}${changelist} - 3.0.3 + 3.0.4 UTF-8 UTF-8 diff --git a/pomJava21.xml b/pomJava21.xml index 003fde25c..6615b8115 100644 --- a/pomJava21.xml +++ b/pomJava21.xml @@ -13,7 +13,7 @@ ${revision}${sha1}${changelist} - 3.0.3 + 3.0.4 UTF-8 UTF-8 diff --git a/pomJava8.xml b/pomJava8.xml index 8ad43f784..5ce60c6ee 100644 --- a/pomJava8.xml +++ b/pomJava8.xml @@ -13,7 +13,7 @@ ${revision}${sha1}${changelist}-Java8 - 3.0.3 + 3.0.4 UTF-8 UTF-8 From e3cfc3d792beda55fadd3c4431505eac727afcd2 Mon Sep 17 00:00:00 2001 From: Even Solbraa <41290109+EvenSol@users.noreply.github.com> Date: Tue, 5 Nov 2024 23:03:26 +0100 Subject: [PATCH 08/21] Transient test (#1168) * add transient test * update --- .../ProcessSystemRunTransientTest.java | 65 ++++++++++++++++--- 1 file changed, 56 insertions(+), 9 deletions(-) diff --git a/src/test/java/neqsim/process/processmodel/ProcessSystemRunTransientTest.java b/src/test/java/neqsim/process/processmodel/ProcessSystemRunTransientTest.java index cf4cc2394..72223aa78 100644 --- a/src/test/java/neqsim/process/processmodel/ProcessSystemRunTransientTest.java +++ b/src/test/java/neqsim/process/processmodel/ProcessSystemRunTransientTest.java @@ -19,7 +19,6 @@ import neqsim.process.measurementdevice.LevelTransmitter; import neqsim.process.measurementdevice.PressureTransmitter; import neqsim.process.measurementdevice.VolumeFlowTransmitter; -import neqsim.process.processmodel.ProcessSystem; import neqsim.thermo.system.SystemInterface; public class ProcessSystemRunTransientTest extends neqsim.NeqSimTest { @@ -291,8 +290,7 @@ public void testDynamicCompressor() { assertEquals(100.0, compressor1.getOutletStream().getPressure(), 0.01); neqsim.process.equipment.compressor.CompressorChartGenerator compchartgenerator = - new neqsim.process.equipment.compressor.CompressorChartGenerator( - compressor1); + new neqsim.process.equipment.compressor.CompressorChartGenerator(compressor1); compressor1.setCompressorChart(compchartgenerator.generateCompressorChart("normal")); compressor1.getCompressorChart().setUseCompressorChart(true); // compressor1.setCalculateSteadyState(true); @@ -396,8 +394,7 @@ public void testDynamicCompressor22() { // System.out.println("steady state with compressor curves....."); neqsim.process.equipment.compressor.CompressorChartGenerator compchartgenerator = - new neqsim.process.equipment.compressor.CompressorChartGenerator( - compressor1); + new neqsim.process.equipment.compressor.CompressorChartGenerator(compressor1); compressor1.setCompressorChart(compchartgenerator.generateCompressorChart("normal")); compressor1.getCompressorChart().setUseCompressorChart(true); // compressor1.setCalculateSteadyState(true); @@ -510,8 +507,7 @@ public void testDynamicCompressorSpeedControl() { assertEquals(100.0, compressor1.getOutletStream().getPressure(), 0.01); neqsim.process.equipment.compressor.CompressorChartGenerator compchartgenerator = - new neqsim.process.equipment.compressor.CompressorChartGenerator( - compressor1); + new neqsim.process.equipment.compressor.CompressorChartGenerator(compressor1); compressor1.setCompressorChart(compchartgenerator.generateCompressorChart("normal")); compressor1.getCompressorChart().setUseCompressorChart(true); // compressor1.setCalculateSteadyState(true); @@ -678,8 +674,7 @@ public void testAntiSurgeControl() { * compressor1.getOutletStream().getPressure() + " distancetosurge "); */ neqsim.process.equipment.compressor.CompressorChartGenerator compchartgenerator = - new neqsim.process.equipment.compressor.CompressorChartGenerator( - compressor1); + new neqsim.process.equipment.compressor.CompressorChartGenerator(compressor1); compressor1.setCompressorChart(compchartgenerator.generateCompressorChart("normal")); compressor1.getCompressorChart().setUseCompressorChart(true); p.run(); @@ -773,4 +768,56 @@ public void testAntiSurgeControl() { p.runTransient(); } } + + @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); + fluid1.addComponent("ethane", 0.100); + fluid1.addComponent("n-heptane", 1.00); + fluid1.setMixingRule("classic"); + + neqsim.process.equipment.stream.Stream stream1 = + new neqsim.process.equipment.stream.Stream("Stream1", fluid1); + stream1.setFlowRate(510.0, "kg/hr"); + stream1.setPressure(10.0, "bara"); + stream1.setCalculateSteadyState(true); + + neqsim.process.equipment.valve.ThrottlingValve valve1 = + new neqsim.process.equipment.valve.ThrottlingValve("valve_1", stream1); + valve1.setOutletPressure(5.0); + valve1.setPercentValveOpening(30.0); + valve1.setCalculateSteadyState(false); + + neqsim.process.equipment.separator.Separator separator1 = + new neqsim.process.equipment.separator.Separator("separator_1"); + separator1.addStream(valve1.getOutletStream()); + separator1.setCalculateSteadyState(true); + + neqsim.process.equipment.compressor.Compressor compressor1 = + new neqsim.process.equipment.compressor.Compressor("compressor_1"); + compressor1.setInletStream(separator1.getGasOutStream()); + compressor1.setOutletPressure(10.0, "bara"); + compressor1.setCalculateSteadyState(true); + + neqsim.process.processmodel.ProcessSystem p = new neqsim.process.processmodel.ProcessSystem(); + p.add(stream1); + p.add(valve1); + p.add(separator1); + p.add(compressor1); + + p.run(); + double compPower1 = compressor1.getPower("kW"); + valve1.setPercentValveOpening(30 - 25.0); + + p.runTransient(1.0); + double compPower2 = compressor1.getPower("kW"); + assertEquals(1.7776105238, compPower1 - compPower2, 0.0001); + + p.runTransient(12.0); + compPower2 = compressor1.getPower("kW"); + assertEquals(1.7776105238, compPower1 - compPower2, 0.0001); + } } From ccc1fc0e46dc14b4160ed9787f913f44f15f30a3 Mon Sep 17 00:00:00 2001 From: Even Solbraa <41290109+EvenSol@users.noreply.github.com> Date: Fri, 8 Nov 2024 13:31:02 +0100 Subject: [PATCH 09/21] Add reboiler duty results in test (#1171) --- .../java/neqsim/process/processmodel/MLA_bug_test.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/test/java/neqsim/process/processmodel/MLA_bug_test.java b/src/test/java/neqsim/process/processmodel/MLA_bug_test.java index 723009d94..fb149c358 100644 --- a/src/test/java/neqsim/process/processmodel/MLA_bug_test.java +++ b/src/test/java/neqsim/process/processmodel/MLA_bug_test.java @@ -7,6 +7,7 @@ import neqsim.process.equipment.absorber.SimpleTEGAbsorber; import neqsim.process.equipment.absorber.WaterStripperColumn; import neqsim.process.equipment.distillation.DistillationColumn; +import neqsim.process.equipment.distillation.Reboiler; import neqsim.process.equipment.filter.Filter; import neqsim.process.equipment.heatexchanger.HeatExchanger; import neqsim.process.equipment.heatexchanger.Heater; @@ -20,7 +21,6 @@ import neqsim.process.equipment.util.StreamSaturatorUtil; import neqsim.process.equipment.valve.ThrottlingValve; import neqsim.process.measurementdevice.WaterDewPointAnalyser; -import neqsim.process.processmodel.ProcessSystem; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkCPA; import neqsim.thermo.util.empiric.BukacekWaterInGas; @@ -215,7 +215,7 @@ public void runProcessTEG() throws InterruptedException { DistillationColumn column = new DistillationColumn("TEG regeneration column", 1, true, true); column.addFeedStream(glycol_flash_valve2.getOutletStream(), 1); column.getReboiler().setOutTemperature(273.15 + 197.5); - column.getCondenser().setOutTemperature(273.15 + 80.0); + column.getCondenser().setOutTemperature(273.15 + 85.0); column.getTray(1).addStream(gasToReboiler); column.setTopPressure(1.2); column.setBottomPressure(1.2); @@ -329,7 +329,11 @@ public void runProcessTEG() throws InterruptedException { // System.out.println("water in gas " + dehydratedGas.getFluid().getComponent("water").getx()); assertEquals(-19.1886678, - p.getMeasurementDevice("water dew point analyser3").getMeasuredValue("C"), 1e-2); + p.getMeasurementDevice("water dew point analyser3").getMeasuredValue("C"), 1e-1); + assertEquals(203.024331, + ((Reboiler) ((DistillationColumn) p.getUnit("TEG regeneration column")).getReboiler()) + .getDuty() / 1e3, + 1e-2); } @Test From 341fa9aca2f1357d7db86f4155eb55764741b112 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=85smund=20V=C3=A5ge=20Fannemel?= <34712686+asmfstatoil@users.noreply.github.com> Date: Sat, 9 Nov 2024 06:57:48 +0100 Subject: [PATCH 10/21] fix: pom.xml to reduce vulnerabilities (#1172) The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-JAVA-COMTHOUGHTWORKSXSTREAM-8352924 Co-authored-by: snyk-bot --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8c33b34ed..d19a354a0 100644 --- a/pom.xml +++ b/pom.xml @@ -63,7 +63,7 @@ com.thoughtworks.xstream xstream - 1.4.20 + 1.4.21 org.junit.jupiter From 9be63849338fd007db385aefc8688dd0b6973063 Mon Sep 17 00:00:00 2001 From: Even Solbraa <41290109+EvenSol@users.noreply.github.com> Date: Sat, 9 Nov 2024 15:05:35 +0100 Subject: [PATCH 11/21] Update pom xstream (#1173) * Update pom xstream * Update pomJava8.xml --- pomJava21.xml | 2 +- pomJava8.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pomJava21.xml b/pomJava21.xml index 6615b8115..04e7304b6 100644 --- a/pomJava21.xml +++ b/pomJava21.xml @@ -52,7 +52,7 @@ com.thoughtworks.xstream xstream - 1.4.20 + 1.4.21 org.apache.logging.log4j diff --git a/pomJava8.xml b/pomJava8.xml index 5ce60c6ee..1798e46bd 100644 --- a/pomJava8.xml +++ b/pomJava8.xml @@ -62,7 +62,7 @@ com.thoughtworks.xstream xstream - 1.4.20 + 1.4.21 org.junit.jupiter From c7d52cb834685a815414578b44d12e28b81659d2 Mon Sep 17 00:00:00 2001 From: Even Solbraa <41290109+EvenSol@users.noreply.github.com> Date: Mon, 11 Nov 2024 22:25:55 +0100 Subject: [PATCH 12/21] update1 (#1175) --- .../neqsim/process/equipment/mixer/Mixer.java | 14 ------- .../equipment/separator/Separator.java | 15 +++++++- .../separator/ThreePhaseSeparator.java | 18 ++++++++- .../process/equipment/splitter/Splitter.java | 37 ++++++++++++++++++- .../process/equipment/stream/Stream.java | 7 +++- .../process/equipment/mixer/MixerTest.java | 4 -- .../processmodel/CompressorModule.java | 5 +-- 7 files changed, 73 insertions(+), 27 deletions(-) diff --git a/src/main/java/neqsim/process/equipment/mixer/Mixer.java b/src/main/java/neqsim/process/equipment/mixer/Mixer.java index 860d73867..9e8269406 100644 --- a/src/main/java/neqsim/process/equipment/mixer/Mixer.java +++ b/src/main/java/neqsim/process/equipment/mixer/Mixer.java @@ -5,7 +5,6 @@ import java.text.DecimalFormat; import java.text.FieldPosition; import java.util.ArrayList; -import java.util.Iterator; import java.util.Objects; import java.util.UUID; import javax.swing.JDialog; @@ -195,19 +194,6 @@ public StreamInterface getOutletStream() { return mixedStream; } - /** {@inheritDoc} */ - @Override - public boolean needRecalculation() { - Iterator iter = streams.iterator(); - while (iter.hasNext()) { - StreamInterface str = iter.next(); - if (!str.solved()) { - return true; - } - } - return false; - } - /** {@inheritDoc} */ @Override public void run(UUID id) { diff --git a/src/main/java/neqsim/process/equipment/separator/Separator.java b/src/main/java/neqsim/process/equipment/separator/Separator.java index c8d35ad65..81f86346c 100644 --- a/src/main/java/neqsim/process/equipment/separator/Separator.java +++ b/src/main/java/neqsim/process/equipment/separator/Separator.java @@ -73,6 +73,9 @@ public class Separator extends ProcessEquipmentBaseClass implements SeparatorInt ArrayList separatorSection = new ArrayList(); SeparatorMechanicalDesign separatorMechanicalDesign; + private double lastEnthalpy; + private double lastFlowRate; + private double lastPressure; /** * Constructor for Separator. @@ -196,6 +199,17 @@ public SystemInterface getThermoSystem() { @Override public void run(UUID id) { inletStreamMixer.run(id); + double enthalpy = inletStreamMixer.getOutletStream().getFluid().getEnthalpy(); + double flow = inletStreamMixer.getOutletStream().getFlowRate("kg/hr"); + double pres = inletStreamMixer.getOutletStream().getPressure(); + if (Math.abs((lastEnthalpy - enthalpy) / enthalpy) < 1e-6 + && Math.abs((lastFlowRate - flow) / flow) < 1e-6 + && Math.abs((lastPressure - pres) / pres) < 1e-6) { + return; + } + lastEnthalpy = inletStreamMixer.getOutletStream().getFluid().getEnthalpy(); + lastFlowRate = inletStreamMixer.getOutletStream().getFlowRate("kg/hr"); + lastPressure = inletStreamMixer.getOutletStream().getPressure(); thermoSystem2 = inletStreamMixer.getOutletStream().getThermoSystem().clone(); thermoSystem2.setPressure(thermoSystem2.getPressure() - pressureDrop); @@ -268,7 +282,6 @@ public void run(UUID id) { logger.error(ex.getMessage(), ex); } } - setCalculationIdentifier(id); } diff --git a/src/main/java/neqsim/process/equipment/separator/ThreePhaseSeparator.java b/src/main/java/neqsim/process/equipment/separator/ThreePhaseSeparator.java index dd2f4b774..87c389467 100644 --- a/src/main/java/neqsim/process/equipment/separator/ThreePhaseSeparator.java +++ b/src/main/java/neqsim/process/equipment/separator/ThreePhaseSeparator.java @@ -41,6 +41,10 @@ public class ThreePhaseSeparator extends Separator { boolean useTempMultiPhaseCheck = false; + private double lastEnthalpy; + private double lastFlowRate; + private double lastPressure; + /** * Constructor for ThreePhaseSeparator. * @@ -56,8 +60,7 @@ public ThreePhaseSeparator(String name) { *

* * @param name a {@link java.lang.String} object - * @param inletStream a {@link neqsim.process.equipment.stream.StreamInterface} - * object + * @param inletStream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public ThreePhaseSeparator(String name, StreamInterface inletStream) { super(name, inletStream); @@ -139,6 +142,17 @@ public StreamInterface getOilOutStream() { @Override public void run(UUID id) { inletStreamMixer.run(id); + double enthalpy = inletStreamMixer.getOutletStream().getFluid().getEnthalpy(); + double flow = inletStreamMixer.getOutletStream().getFlowRate("kg/hr"); + double pres = inletStreamMixer.getOutletStream().getPressure(); + if (Math.abs((lastEnthalpy - enthalpy) / enthalpy) < 1e-6 + && Math.abs((lastFlowRate - flow) / flow) < 1e-6 + && Math.abs((lastPressure - pres) / pres) < 1e-6) { + return; + } + lastEnthalpy = inletStreamMixer.getOutletStream().getFluid().getEnthalpy(); + lastFlowRate = inletStreamMixer.getOutletStream().getFlowRate("kg/hr"); + lastPressure = inletStreamMixer.getOutletStream().getPressure(); thermoSystem = inletStreamMixer.getOutletStream().getThermoSystem().clone(); if (!thermoSystem.doMultiPhaseCheck()) { diff --git a/src/main/java/neqsim/process/equipment/splitter/Splitter.java b/src/main/java/neqsim/process/equipment/splitter/Splitter.java index 1edc3494c..a18d3bf67 100644 --- a/src/main/java/neqsim/process/equipment/splitter/Splitter.java +++ b/src/main/java/neqsim/process/equipment/splitter/Splitter.java @@ -1,5 +1,6 @@ package neqsim.process.equipment.splitter; +import java.util.Arrays; import java.util.UUID; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -33,6 +34,11 @@ public class Splitter extends ProcessEquipmentBaseClass implements SplitterInter double[] splitFactor = new double[1]; double[] flowRates; String flowUnit = "mole/sec"; + protected double[] oldSplitFactor = null; + protected double lastTemperature = 0.0; + protected double lastPressure = 0.0; + protected double lastFlowRate = 0.0; + protected double[] lastComposition = null; /** * Constructor for Splitter. @@ -60,8 +66,7 @@ public Splitter(String name, StreamInterface inStream) { *

* * @param name a {@link java.lang.String} object - * @param inletStream a {@link neqsim.process.equipment.stream.StreamInterface} - * object + * @param inletStream a {@link neqsim.process.equipment.stream.StreamInterface} object * @param i a int */ public Splitter(String name, StreamInterface inletStream, int i) { @@ -178,6 +183,22 @@ public StreamInterface getSplitStream(int i) { return splitStream[i]; } + /** {@inheritDoc} */ + @Override + public boolean needRecalculation() { + if (inletStream.getFluid().getTemperature() == lastTemperature + && inletStream.getFluid().getPressure() == lastPressure + && Math.abs(inletStream.getFluid().getFlowRate("kg/hr") - lastFlowRate) + / inletStream.getFluid().getFlowRate("kg/hr") < 1e-6 + && Arrays.equals(splitFactor, oldSplitFactor)) { + isSolved = true; + return false; + } else { + isSolved = false; + return true; + } + } + /** {@inheritDoc} */ @Override public void run(UUID id) { @@ -216,6 +237,12 @@ public void run(UUID id) { thermoOps.TPflash(); } + lastFlowRate = thermoSystem.getFlowRate("kg/hr"); + lastTemperature = thermoSystem.getTemperature(); + lastPressure = thermoSystem.getPressure(); + lastComposition = thermoSystem.getMolarComposition(); + oldSplitFactor = Arrays.copyOf(splitFactor, splitFactor.length); + setCalculationIdentifier(id); } @@ -237,6 +264,12 @@ public void runTransient(double dt, UUID id) { inletStream.setThermoSystem(mixer.getThermoSystem()); inletStream.run(); + + lastFlowRate = thermoSystem.getFlowRate("kg/hr"); + lastTemperature = thermoSystem.getTemperature(); + lastPressure = thermoSystem.getPressure(); + lastComposition = thermoSystem.getMolarComposition(); + oldSplitFactor = Arrays.copyOf(splitFactor, splitFactor.length); setCalculationIdentifier(id); } } diff --git a/src/main/java/neqsim/process/equipment/stream/Stream.java b/src/main/java/neqsim/process/equipment/stream/Stream.java index aa2f5d163..623d41f4f 100644 --- a/src/main/java/neqsim/process/equipment/stream/Stream.java +++ b/src/main/java/neqsim/process/equipment/stream/Stream.java @@ -7,6 +7,7 @@ package neqsim.process.equipment.stream; import java.util.ArrayList; +import java.util.Arrays; import java.util.HashMap; import java.util.UUID; import org.apache.logging.log4j.LogManager; @@ -46,6 +47,8 @@ public class Stream extends ProcessEquipmentBaseClass implements StreamInterface protected double lastTemperature = 0.0; protected double lastPressure = 0.0; protected double lastFlowRate = 0.0; + protected double[] lastComposition = null; + /** * Constructor for Stream. @@ -317,7 +320,8 @@ public boolean needRecalculation() { } if (getFluid().getTemperature() == lastTemperature && getFluid().getPressure() == lastPressure && Math.abs(getFluid().getFlowRate("kg/hr") - lastFlowRate) - / getFluid().getFlowRate("kg/hr") < 1e-6) { + / getFluid().getFlowRate("kg/hr") < 1e-6 + && Arrays.equals(getFluid().getMolarComposition(), lastComposition)) { isSolved = true; return false; } else { @@ -400,6 +404,7 @@ && getSpecification().equals("TP")) { lastFlowRate = thermoSystem.getFlowRate("kg/hr"); lastTemperature = thermoSystem.getTemperature(); lastPressure = thermoSystem.getPressure(); + lastComposition = thermoSystem.getMolarComposition(); if (stream != null) { stream.setFluid(thermoSystem); diff --git a/src/test/java/neqsim/process/equipment/mixer/MixerTest.java b/src/test/java/neqsim/process/equipment/mixer/MixerTest.java index 4d953c2ec..e87222518 100644 --- a/src/test/java/neqsim/process/equipment/mixer/MixerTest.java +++ b/src/test/java/neqsim/process/equipment/mixer/MixerTest.java @@ -5,7 +5,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import neqsim.process.equipment.mixer.Mixer; import neqsim.process.equipment.stream.Stream; import neqsim.process.processmodel.ProcessSystem; import neqsim.thermo.system.SystemSrkEos; @@ -77,12 +76,9 @@ void testNeedRecalculation() { processOps.run(); assertFalse(gasStream.needRecalculation()); assertFalse(waterStream.needRecalculation()); - assertFalse(testMixer.needRecalculation()); gasStream.setFlowRate(100.1, "kg/hr"); assertTrue(gasStream.needRecalculation()); - assertTrue(testMixer.needRecalculation()); processOps.run(); assertFalse(gasStream.needRecalculation()); - assertFalse(testMixer.needRecalculation()); } } diff --git a/src/test/java/neqsim/process/processmodel/CompressorModule.java b/src/test/java/neqsim/process/processmodel/CompressorModule.java index 38991ce72..a8d326090 100644 --- a/src/test/java/neqsim/process/processmodel/CompressorModule.java +++ b/src/test/java/neqsim/process/processmodel/CompressorModule.java @@ -134,11 +134,10 @@ public void testProcess() { operations.run(); - assertEquals(2042.17826, recycleScrubberStream.getFlowRate("kg/hr"), 0.1); + assertEquals(2046.0527, recycleScrubberStream.getFlowRate("kg/hr"), 0.1); neqsim.process.equipment.compressor.CompressorChartGenerator compchartgenerator = - new neqsim.process.equipment.compressor.CompressorChartGenerator( - seccondStageCompressor); + new neqsim.process.equipment.compressor.CompressorChartGenerator(seccondStageCompressor); compchartgenerator.generateCompressorChart("mid range"); seccondStageCompressor.setCompressorChart(compchartgenerator.generateCompressorChart("normal")); From 2c263923e9aeab93b40250d3fe88fe592ec81ab5 Mon Sep 17 00:00:00 2001 From: Even Solbraa <41290109+EvenSol@users.noreply.github.com> Date: Tue, 12 Nov 2024 19:51:01 +0100 Subject: [PATCH 13/21] update (#1176) * update * updated test * update * update * update * update --- .../nonlinearsolver/NewtonRhapson.java | 4 +- .../AttractiveTermBaseClass.java | 6 + .../AttractiveTermInterface.java | 2 + .../attractiveeosterm/AttractiveTermSrk.java | 4 +- src/main/resources/data/COMP.csv | 402 +++++++++--------- .../PlusFractionModelTest.java | 2 +- .../java/neqsim/thermo/system/AcidTest.java | 217 ++++++++++ 7 files changed, 432 insertions(+), 205 deletions(-) create mode 100644 src/test/java/neqsim/thermo/system/AcidTest.java diff --git a/src/main/java/neqsim/mathlib/nonlinearsolver/NewtonRhapson.java b/src/main/java/neqsim/mathlib/nonlinearsolver/NewtonRhapson.java index 2d168c8ac..268d95095 100644 --- a/src/main/java/neqsim/mathlib/nonlinearsolver/NewtonRhapson.java +++ b/src/main/java/neqsim/mathlib/nonlinearsolver/NewtonRhapson.java @@ -153,8 +153,8 @@ public double solve(double xin) { xNew2 = xNew; } - if (xNew < 0) { - xNew = 0; + if (xNew < -0.99) { + xNew = -0.99; // System.out.println("x++..........."); } if (xNew > 1.5) { diff --git a/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermBaseClass.java b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermBaseClass.java index 5439beaa7..ba226897b 100644 --- a/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermBaseClass.java +++ b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermBaseClass.java @@ -52,6 +52,12 @@ public void setm(double val) { logger.info("does not solve for accentric when new m is set... in AccentricBase class"); } + /** {@inheritDoc} */ + @Override + public double getm() { + return this.m; + } + /** {@inheritDoc} */ @Override public AttractiveTermBaseClass clone() { diff --git a/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermInterface.java b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermInterface.java index b358d8049..da96f8890 100644 --- a/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermInterface.java +++ b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermInterface.java @@ -119,4 +119,6 @@ public interface AttractiveTermInterface extends Cloneable, java.io.Serializable * @return a {@link neqsim.thermo.component.attractiveeosterm.AttractiveTermInterface} object */ public AttractiveTermInterface clone(); + + public double getm(); } diff --git a/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermSrk.java b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermSrk.java index fbd5c5881..6748b9250 100644 --- a/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermSrk.java +++ b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermSrk.java @@ -54,8 +54,8 @@ public void setm(double val) { solve.setOrder(2); double[] acentricConstants = {-0.176, 1.574, (0.48 - this.m)}; solve.setConstants(acentricConstants); - getComponent().setAcentricFactor(solve.solve(0.2)); - // System.out.println("solve accen " + component.getAcentricFactor()); + getComponent().setAcentricFactor(solve.solve(0.25)); + System.out.println("solve accen " + getComponent().getAcentricFactor()); } /** {@inheritDoc} */ diff --git a/src/main/resources/data/COMP.csv b/src/main/resources/data/COMP.csv index d27a5b69c..6bae29191 100644 --- a/src/main/resources/data/COMP.csv +++ b/src/main/resources/data/COMP.csv @@ -1,201 +1,203 @@ "ID","NAME","CASnumber","COMPTYPE","COMPINDEX","FORMULA","MOLARMASS","LIQDENS","TC","PC","ACSFACT","NORMBOIL","MWAVG","CRITVOL","PVMODEL","Href","CPA","CPB","CPC","CPD","CPE","AntoineVapPresLiqType","ANTOINEA","ANTOINEB","ANTOINEC","ANTOINED","ANTOINEE","DIPOLEMOMENT","VISCFACT","RACKETZ","volcorrSRK_T","LJDIAMETER","LJEPS","SphericalCoreRadius","LIQVISCMODEL","LIQVISC1","LIQVISC2","LIQVISC3","LIQVISC4","GIBBSENERGYOFFORMATION","DIELECTRICPARAMETER1","DIELECTRICPARAMETER2","DIELECTRICPARAMETER3","DIELECTRICPARAMETER4","DIELECTRICPARAMETER5","IONICCHARGE","REFERENCESTATETYPE","HenryCoef1","HenryCoef2","HenryCoef3","HenryCoef4","SCHWARTZENTRUBER1","SCHWARTZENTRUBER2","SCHWARTZENTRUBER3","LIQUIDCONDUCTIVITY1","LIQUIDCONDUCTIVITY2","LIQUIDCONDUCTIVITY3","PARACHOR","HEATOFFUSION","TRIPLEPOINTDENSITY","TRIPLEPOINTPRESSURE","TRIPLEPOINTTEMPERATURE","MELTINGPOINTTEMPERATURE","ENTHALPYOFFORMATION","ABSOLUTEENTROPY","SOLIDDENSITYCOEFS1","SOLIDDENSITYCOEFS2","SOLIDDENSITYCOEFS3","SOLIDDENSITYCOEFS4","SOLIDDENSITYCOEFS5","LIQUIDDENSITYCOEFS1","LIQUIDDENSITYCOEFS2","LIQUIDDENSITYCOEFS3","LIQUIDDENSITYCOEFS4","LIQUIDDENSITYCOEFS5","HEATOFVAPORIZATIONCOEFS1","HEATOFVAPORIZATIONCOEFS2","HEATOFVAPORIZATIONCOEFS3","HEATOFVAPORIZATIONCOEFS4","HEATOFVAPORIZATIONCOEFS5","STDDENS","MC1","MC2","MC3","MC1Solid","MC2Solid","MC3Solid","TwuCoon1","TwuCoon2","TwuCoon3","associationsites","associationscheme","racketZCPA","volcorrCPA_T","associationboundingvolume_SRK","associationenergy","aCPA_SRK","bCPA_SRK","mCPA_SRK","aCPA_PR","bCPA_PR","mCPA_PR","associationboundingvolume_PR","calcActivity","ANTOINESolidA","ANTOINESolidB","ANTOINESolidC","Hsub","criticalViscosity","HydrateA1Small","HydrateB1Small","HydrateA1Large","HydrateB1Large","HydrateA2Small","HydrateB2Small","HydrateA2Large","HydrateB2Large","HydrateFormer","mSAFT","sigmaSAFT","epsikSAFT","associationboundingvolume_PCSAFT","associationenergy_PCSAFT","LJDIAMETERHYDRATE","LJEPSHYDRATE","SphericalCoreRadiusHYDRATE","DeshMatIonicDiameter","waxformer","B2_largeGF","A1_smallGF","B1_smallGF","A1_largeGF","B1_largeGF","A2_smallGF","B2_smallGF","A2_largeGF","CPsolid1","CPsolid2","CPsolid3","CPsolid4","CPsolid5","CPliquid1","CPliquid2","CPliquid3","CPliquid4","CPliquid5","MCPR1","MCPR2","MCPR3","PARACHOR_CPA" -1,"methane","74-82-8","HC",1,"CH4",16.043000000,0.422182073,-82.590000000,45.990000000,0.011500000,-161.550000000,16.043000000,99.000000000,"Classic",2.600000000,37.978352000,-0.074618150,0.000301881,-0.000000283,9.070574e-11,"pow10",3.768700000,395.744000000,266.682000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2.520000000,155.809006022,0.406998625,3,-26.870000000,1150.000000000,0.187000000,-0.000521000,-50500.000000000,2.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"solute",900.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.303000000,-0.000605000,-0.000003200,77.300000000,941.000000000,452.000000000,0.116656057,90.690000000,90.650000000,-74520.000000000,186.000000000,33.022000000,-0.015870000,-0.000155000,0.000000000,0.000000000,2.920000000,0.290000000,191.000000000,0.289000000,0.000000000,8170.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.100000000,0.585700000,-0.720600000,1.289900000,0.000000000,0.000000000,0.000000000,0.122841598,0.914470789,2.741978611,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,4.186260000,1,1.000000000,-6.680820000,0.000000000,9700,0.000015293,0.047920000,1594.000000000,0.012440000,2952.000000000,0.002317000,2777.000000000,1.076000000,1323.000000000,"yes",1.000000000,3.703900119,150.029998779,0.000000000,0.000000000,3.190710941,155.809006022,0.406998625,1.000000000,0,900.000000000,0.000621000,2760.000000000,0.421000000,1963.100000000,0.004048680,2636.750000000,0.295270000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.392340000,0.000000000,0.000000000,77.300000000 -2,"ethane","74-84-0","HC",2,"C2H6",30.070000000,0.544459352,32.170000000,48.720000000,0.099500000,-88.550000000,30.070000000,148.000000000,"Classic",9761.100000000,34.735892000,-0.036806078,0.000470572,-0.000000552,2.0676918e-10,"pow10",3.954050000,663.720000000,256.681000000,0.000000000,0.000000000,1.700000000,0.000000000,0.000000000,0.000000000,3.264673065,176.701997247,0.513842135,3,-10.230000000,668.000000000,0.043900000,-0.000095900,-31900.000000000,2.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"solute",0.000000000,0.000000000,0.000000000,0.000000000,0.002582841,12.538290520,-18.380973790,-0.384000000,0.005250000,-0.000006370,108.900000000,2860.000000000,652.000000000,0.000011402,90.350000000,89.950000000,-84680.000000000,229.000000000,25.263000000,-0.010950000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,14703.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.100000000,0.654848544,-0.184389171,0.260160050,0.000000000,0.000000000,0.000000000,0.299607318,0.876626839,1.679238400,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,6.046090000,1,1.000000000,-3.333550000,0.000000000,20500,0.000021756,0.000000000,0.000000000,0.002999000,3861.000000000,0.000000000,0.000000000,0.007362000,4000.000000000,"yes",1.606900000,3.520600000,191.420000000,0.000000000,0.000000000,3.264673065,176.701997247,0.513842135,1.000000000,0,3363.000000000,0.000000000,0.000000000,0.109800000,2854.940000000,0.000000000,0.000000000,0.089386100,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.520050000,0.004300000,0.102920000,108.900000000 -3,"Cl-","0-0-0-0","ion",3,"Cl-",35.450000000,0.797000000,444.150000000,290.890000000,0.344000000,64.550000000,99.450000000,99.000000000,"Classic",1374.600000000,36.540030000,-0.034802404,0.000116811,-0.000000130,0.000000000,"log",-8.547960000,0.769820000,-3.108500000,1.544810000,0.000000000,1.700000000,0.215000000,0.000000000,0.000000000,3.600000000,481.800000000,0.000000000,3,-39.350000000,4826.000000000,0.109100000,-0.000113000,-587000.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,-1,"solute",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,-0.384000000,0.005250000,-0.000006370,52.878622600,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.797000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,3.600000000,481.800000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -4,"Na+","0-0-0-0","ion",4,"Na+",22.990000000,0.797000000,444.150000000,290.890000000,0.344000000,64.550000000,22.990000000,99.000000000,"Classic",1374.600000000,36.540030000,-0.034802404,0.000116811,-0.000000130,0.000000000,"log",-8.547960000,0.769820000,-3.108500000,1.544810000,0.000000000,1.700000000,0.215000000,0.000000000,0.000000000,5.680000000,481.800000000,0.000000000,3,-39.350000000,4826.000000000,0.109100000,-0.000113000,-587000.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,"solute",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,-0.384000000,0.005250000,-0.000006370,52.878622600,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1.038000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,3.680000000,481.800000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -5,"Mg++","0-0-0-0","ion",5,"Mg++",24.310000000,0.797000000,444.150000000,290.890000000,0.344000000,64.550000000,24.310000000,99.000000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",-8.547960000,0.769820000,-3.108500000,1.544810000,0.000000000,1.700000000,0.215000000,0.000000000,0.000000000,6.940000000,481.800000000,0.000000000,3,-39.350000000,4826.000000000,0.109100000,-0.000113000,-587000.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2,"solute",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1.038000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,6.940000000,481.800000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -6,"MDEA","74-82-8","amine",6,"MDEA",119.163200000,1.038000000,403.850000000,38.760000000,1.242000000,140.000000000,119.160000000,99.000000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",-8.547960000,0.769820000,-3.108500000,1.544810000,0.000000000,1.700000000,0.215000000,0.260355682,0.000000000,4.500000000,481.800000000,0.000000000,3,-75.190000000,12680.000000000,0.157300000,-0.000122500,57900.000000000,8.169760000,8989.300000000,0.000000000,0.000000000,0.000000000,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.521291873,-1.152080748,-0.013889882,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.797000000,2.298601539,-2.159763177,1.537096461,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,4,"4C",0.000000000,0.000000000,0.018008483,12276.382600000,342400.600100000,10.828737539,1.032854790,376276.884000000,10.783585850,1.258298307,0.000000000,1,17.387107060,1.762745870,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,4.500000000,481.800000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -7,"MDEA+","74-82-8","ion",7,"CH4O",120.163200000,1.038000000,403.850000000,38.760000000,1.242000000,64.550000000,120.160000000,99.000000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",-8.547960000,0.769820000,-3.108500000,1.544810000,0.000000000,1.700000000,0.215000000,0.000000000,0.000000000,4.500000000,481.800000000,0.000000000,3,-39.350000000,4826.000000000,0.109100000,-0.000113000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,"solute",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.797000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,4.500000000,481.800000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -8,"H3O+","74-82-8","ion",8,"H3O",19.020000000,0.797000000,444.150000000,290.890000000,0.344000000,64.550000000,19.020000000,99.000000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",-8.547960000,0.769820000,-3.108500000,1.544810000,0.000000000,1.700000000,0.215000000,0.000000000,0.000000000,4.060000000,481.800000000,0.000000000,3,-39.350000000,4826.000000000,0.109100000,-0.000113000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,"solute",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.797000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,4.060000000,481.800000000,0.000000000,9.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -9,"propane","74-98-6","HC",9,"CH4O",44.097000000,0.000000000,96.680000000,42.480000000,0.152300000,-42.050000000,44.097000000,203.000000000,"Classic",19519.600000000,31.983958000,0.042659134,0.000499754,-0.000000656,2.5598806e-10,"pow10",3.928280000,803.997000000,247.040000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,3.320577362,205.885946142,0.662379685,3,-7.764000000,722.000000000,0.023800000,-0.000046700,-24400.000000000,2.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"solute",0.000000000,0.000000000,0.000000000,0.000000000,-0.015069991,-4.344143673,4.007325591,-0.384000000,0.005250000,-0.000006370,151.900000000,6000.000000000,1000.000000000,0.000000001,85.470000000,85.500000000,-103840.000000000,189.000000000,18.861000000,-0.020332000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,15700.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.100000000,0.721211486,-0.099216642,0.181829227,0.000000000,0.000000000,0.000000000,0.435825883,0.866132179,1.395432818,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,91187.500000000,5.783400000,0.630700000,0.000000000,0.000000000,0.000000000,5.248690000,1,1.000000000,-11.125400000,0.000000000,28500,0.000024973,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.008264000,4521.000000000,"yes",2.002000000,3.618400000,208.110000000,0.000000000,0.000000000,3.320577362,205.885946142,0.662379685,1.000000000,0,3885.270000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.079900000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.618380000,-0.160710000,0.487850000,151.900000000 -10,"CO2","124-38-9","inert",10,"CO2",44.010000000,1.100000000,31.040000000,73.815000000,0.227600000,-78.500000000,44.010000000,94.000000000,"Classic",19459.100000000,18.583021051740495,0.08237963451147419,-7.930390038368174e-05,4.222181385638e-08,-9.577100164048891e-12,"pow10",7.532200000,835.060000000,268.223000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2.340000000,168.770000000,0.680500000,2,-7.811000000,3140.000000000,0.000000000,0.000000000,-394000.000000000,2.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"solute",94.491400000,-6789.040000000,-11.451900000,-0.010454000,0.000000000,0.000000000,0.000000000,-0.384000000,0.005250000,-0.000006370,78.000000000,9018.969300000,1000.000000000,5.185000000,216.580000000,216.592000000,-393500.000000000,189.000000000,32.939000000,0.068420000,-0.000284700,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,14490.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.100000000,0.881738930,-0.856255022,3.094939327,0.000000000,0.000000000,0.000000000,1.413601068,-0.605965449,1.101814948,2,"2A",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,6.812280000,-1301.679000000,-3.494000000,26100,0.000037687,4.856e-11,7470.000000000,0.098620000,2617.000000000,0.000060820,3691.000000000,0.168300000,2591.000000000,"yes",1.309700000,3.250700000,92.150000000,0.000000000,0.000000000,3.037207160,170.162382832,0.684633880,1.000000000,0,2119.560000000,0.000758596,2500.000000000,0.231198000,2419.560000000,0.007244960,2330.000000000,0.139898000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.713690000,-0.447640000,2.437520000,78.000000000 -11,"methanol","67-56-1","alcohol",11,"CH4O",32.042000000,0.797000000,239.490000000,80.960000000,0.559000000,64.550000000,32.042000000,99.000000000,"Classic",11133.000000000,39.192196000,-0.058081604,0.000350102,-0.000000369,1.276199e-10,"pow10",5.202770000,1580.080000000,239.500000000,0.000000000,0.000000000,1.700000000,0.215000000,0.200000000,0.000000000,3.626000000,481.800000000,0.000000000,3,-39.350000000,4826.000000000,0.109100000,-0.000113000,57900.000000000,-19.290500000,29814.500000000,-0.019678000,0.013189000,0.031144000,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,-0.384000000,0.005250000,-0.000006370,73.069489067,3177.000000000,1000.000000000,0.006110000,175.500000000,175.500000000,-242000.000000000,189.000000000,30.585000000,0.000000000,0.000000000,0.000000000,0.000000000,2.288000000,0.268500000,512.640000000,0.245300000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.797000000,1.437100000,-0.799420000,0.327800000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2,"2B",0.000000000,0.000000000,0.016100000,24591.000000000,40531.000000000,3.097800000,0.431020000,47052.000000000,3.300000000,0.903700000,0.044900000,1,17.387107060,-7582.406220000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",1.525500000,3.230000000,188.900000000,0.035176000,24106.443000000,3.626000000,481.800000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,-12706.000000000,958.780000000,-5.233200000,0.013152000,0.000000000,105800.000000000,-362.230000000,0.937900000,0.000000000,0.000000000,1.224003000,-0.273500000,-0.398230000,87.543852818 -12,"MEG","107-21-1","glycol",12,"C2H6O2",62.069000000,1.117000000,446.850000000,90.000000000,0.534700000,197.350000000,62.069000000,186.000000000,"Classic",32022.600000000,35.700000000,0.248400000,-0.000149700,0.000000030,0.000000000,"exp",13.629900000,6022.180000000,-28.250000000,0.000000000,0.000000000,2.308200000,0.215000000,0.248800000,0.000000000,3.626000000,481.800000000,0.000000000,3,-23.155244944,5694.484212533,0.023081509,0.000000000,57900.000000000,-19.290540000,29814.530000000,-0.019678500,0.013189000,0.031144000,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.654009012,-3.955117195,3.671191916,0.517338954,-0.000798169,0.000000064,133.328650000,9958.000000000,904.000000000,0.000002420,260.150000000,260.150000000,-388000.000000000,324.000000000,21.400000000,0.000000000,0.000000000,0.000000000,0.000000000,1.315100000,0.251250000,719.700000000,0.218700000,0.000000000,82900000.0000000,0.427000000,0.000000000,0.000000000,0.000000000,1.117000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,4,"4C",0.288384169,0.000389127,0.014100000,19752.000000000,108190.000000000,5.140000000,0.674400000,108190.000000000,5.140000000,0.674400000,0.051400000,1,17.090887000,-7800.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,3.626000000,481.800000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,35540.000000000,436.780000000,-0.184860000,0.000000000,0.000000000,35540.000000000,436.780000000,-0.184860000,0.000000000,0.000000000,0.910030000,1.349960000,-1.890020000,151.817427819 -13,"oxygen","7782-44-7","inert",13,"O2",31.999000000,0.000000000,-118.550000000,50.460000000,0.021000000,-182.950000000,31.999000000,73.400000000,"Classic",11103.100000000,30.17982,-0.014915316,5.4706e-05,-4.89e-08,1.488206e-11,"log",-6.282750000,1.736190000,-1.813490000,-0.025400000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,3.467000000,106.700000000,0.000000000,3,-4.771000000,215.000000000,0.013900000,-0.000062600,57900.000000000,-19.290500000,29814.500000000,-0.019678000,0.013189000,0.031144000,0,"solute",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,-0.384000000,0.005250000,-0.000006370,0.000000000,6000.000000000,1000.000000000,0.001463300,56.360000000,273.000000000,-242000.000000000,189.000000000,53.000000000,-0.007840000,0.000000000,0.000000000,0.000000000,5.460000000,0.305000000,647.000000000,0.081000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.100000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.017170000,2016.200000000,0.056960000,1662.300000000,0.097990000,1045.900000000,0.002681000,2563.900000000,"yes",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,3.467000000,106.700000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000 -14,"TEG","112-27-6","glycol",14,"C6H14O4",150.175000000,1.127000000,496.350000000,33.130000000,1.287400000,278.300000000,150.175000000,450.000000000,"Classic",93317.400000000,86.400000000,0.600800000,-0.000362200,0.000000072,0.000000000,"exp",6.756800000,3715.222000000,-1.299000000,0.000000000,0.000000000,2.200000000,0.215000000,0.242773578,0.000000000,3.626000000,481.800000000,0.000000000,3,-53.925230000,9741.992000000,0.106066000,-0.000075802,-394370.000000000,-19.290500000,29814.500000000,-0.019678000,0.013189000,0.031144000,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.394142583,-0.000547836,0.000000000,358.332712000,15900.000000000,1000.000000000,0.006110000,268.250000000,268.250000000,-242000.000000000,189.000000000,8.890000000,-0.007840000,0.000000000,0.000000000,0.000000000,0.596600000,0.262270000,769.500000000,0.245500000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,1.127000000,1.376906087,1.788921526,-4.378737499,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,4,"4C",0.284542458,-0.004423613,0.018800000,14337.000000000,391260.000000000,13.210000000,1.169200000,391260.000000000,13.210000000,1.169200000,0.018800000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,3.626000000,481.800000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,153800.000000000,587.000000000,0.000000000,0.000000000,0.000000000,153800.000000000,587.000000000,0.000000000,0.000000000,0.000000000,1.550750000,-0.777800000,0.317790000,349.636060455 -15,"DEG","111-46-6","glycol",15,"C4H10O3",106.122000000,1.119000000,471.450000000,46.610000000,1.201100000,245.850000000,106.122000000,316.000000000,"Classic",62670.000000000,73.100000000,0.346200000,-0.000146800,0.000000018,0.000000000,"exp",10.412400000,4122.520000000,-122.500000000,0.000000000,0.000000000,2.200000000,0.215000000,0.248900000,0.000000000,3.626000000,481.800000000,0.000000000,4,1385.090000000,495.540000000,0.000000000,0.000000000,-394370.000000000,-19.290500000,29814.500000000,-0.019678000,0.013189000,0.031144000,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,-0.384000000,0.005250000,-0.000006370,0.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,12.600000000,-0.007840000,0.000000000,0.000000000,0.000000000,0.836920000,0.261120000,744.600000000,0.242200000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,1.119000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,4,"4C",0.000000000,0.000000000,0.006400000,19684.000000000,264080.000000000,9.210000000,0.799100000,264080.000000000,9.210000000,0.799100000,0.006400000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,3.626000000,481.800000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,177000.000000000,0.000000000,0.000000000,0.000000000,0.000000000,125410.000000000,400.580000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000 -16,"nitrogen","7727-37-9","inert",16,"N2",28.013500000,0.807964860,-147.050000000,33.944000000,0.040300000,-195.750000000,28.014000000,89.800000000,"Classic",8330.800000000,29.3824747474747,-0.0030260473322971763,5.771148989898619e-06,4.686124061124461e-09,-4.086538461538615e-12,"pow10",5.739210000,167.930000000,254.481000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,3.132506748,126.578386713,0.359188902,2,-7.811000000,3140.000000000,0.000000000,0.000000000,-394370.000000000,-19.290500000,29814.500000000,-0.019678000,0.013189000,0.031144000,0,"solute",0.000000000,0.000000000,0.000000000,0.000000000,0.055118857,-2.346353896,1.568121600,-0.384000000,0.005250000,-0.000006370,41.000000000,720.000000000,870.000000000,0.125080000,63.150000000,63.300000000,0.000000000,192.000000000,37.870000000,-0.060272000,0.000000000,0.000000000,0.000000000,3.210000000,0.286000000,126.000000000,0.297000000,0.000000000,7490000.00000000,0.404000000,-0.317000000,0.273000000,0.000000000,0.100000000,0.574258329,-0.322594876,0.590654497,0.000000000,0.000000000,0.000000000,0.112629607,0.902199715,2.874960678,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2.601899073,1,1.000000000,-21.245480450,0.000000000,0,0.000017417,0.052800000,932.300000000,0.034150000,2240.000000000,0.007507000,2004.000000000,0.094770000,1596.000000000,"yes",1.205300000,3.313000000,90.960000000,0.000000000,0.000000000,3.132506748,126.578386713,0.359188902,1.000000000,0,1150.000000000,0.011645000,2159.000000000,0.400100000,1037.180000000,0.007180000,2090.000000000,0.300000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.436354704,0.000000000,0.000000000,41.000000000 -17,"n-butane","106-97-8","HC",17,"C4H10",58.123000000,0.000000000,151.970000000,37.960000000,0.200200000,-0.450000000,58.124000000,255.000000000,"Classic",29278.100000000,46.117758000,0.046026304,0.000669858,-0.000000878,3.4370076e-10,"pow10",3.932660000,935.773000000,238.789000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2.912500000,209.000000000,0.937900000,2,-7.811000000,3140.000000000,0.000000000,0.000000000,-394370.000000000,-19.290500000,29814.500000000,-0.019678000,0.013189000,0.031144000,0,"solute",0.000000000,0.000000000,0.000000000,0.000000000,-0.018486492,-4.921574519,4.858186966,-0.384000000,0.005250000,-0.000006370,191.700000000,6000.000000000,1000.000000000,0.000006762,134.860000000,138.150000000,-126150.000000000,189.000000000,15.194000000,-0.006886000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.100000000,0.808063555,-0.212724945,0.362961475,0.000000000,0.000000000,0.000000000,0.331800583,0.854692733,1.865828858,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,131427.400000000,7.208100000,0.707710000,0.000000000,0.000000000,0.000000000,5.764470000,1,1.000000000,-13.438500000,0.000000000,35900,0.000025768,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.001262000,4580.000000000,"yes",2.331600000,3.708600000,222.860000000,0.000000000,0.000000000,2.912500000,209.000000000,0.937900000,1.000000000,0,2691.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1.052980000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.671230000,-0.038030000,0.218860000,191.700000000 -18,"HCO3-","74-82-8","ion",18,"HCO3",61.000000000,0.797000000,444.150000000,290.890000000,0.344000000,64.550000000,61.000000000,99.000000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",-8.547960000,0.769820000,-3.108500000,1.544810000,0.000000000,1.700000000,0.215000000,0.000000000,0.000000000,3.120000000,481.800000000,0.000000000,3,-39.350000000,4826.000000000,0.109100000,-0.000113000,-587000.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,-1,"solute",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.797000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,3.120000000,481.800000000,0.000000000,4.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -19,"Li+","0-0-0-0","ion",19,"Li",6.941000000,0.797000000,444.150000000,290.890000000,0.344000000,64.550000000,6.941000000,99.000000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",-8.547960000,0.769820000,-3.108500000,1.544810000,0.000000000,1.700000000,0.215000000,0.000000000,0.000000000,4.760000000,481.800000000,0.000000000,3,-39.350000000,4826.000000000,0.109100000,-0.000113000,-587000.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,"solute",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.797000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,4.760000000,481.800000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -20,"K+","0-0-0-0","ion",20,"K",39.100000000,0.797000000,444.150000000,290.890000000,0.344000000,64.550000000,39.100000000,99.000000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",-8.547960000,0.769820000,-3.108500000,1.544810000,0.000000000,1.700000000,0.215000000,0.000000000,0.000000000,2.500000000,481.800000000,0.000000000,3,-39.350000000,4826.000000000,0.109100000,-0.000113000,-587000.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,"solute",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.797000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2.500000000,481.800000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -21,"Ca++","0-0-0-0","ion",21,"Ca2",40.080000000,0.797000000,444.150000000,290.890000000,0.344000000,64.550000000,40.080000000,99.000000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",-8.547960000,0.769820000,-3.108500000,1.544810000,0.000000000,1.700000000,0.215000000,0.000000000,0.000000000,6.200000000,481.800000000,0.000000000,3,-39.350000000,4826.000000000,0.109100000,-0.000113000,-587000.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2,"solute",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,-0.384000000,0.005250000,-0.000006370,52.878622600,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.797000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,6.200000000,481.800000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -22,"I-","0-0-0-0","ion",22,"I",126.900000000,0.797000000,444.150000000,290.890000000,0.344000000,64.550000000,126.900000000,99.000000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",-8.547960000,0.769820000,-3.108500000,1.544810000,0.000000000,1.700000000,0.215000000,0.000000000,0.000000000,4.320000000,481.800000000,0.000000000,3,-39.350000000,4826.000000000,0.109100000,-0.000113000,-587000.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,-1,"solute",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.797000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,4.320000000,481.800000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -23,"Sr++","0-0-0-0","ion",23,"Sr",87.620000000,0.797000000,444.150000000,290.890000000,0.344000000,64.550000000,32.042000000,99.000000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",-8.547960000,0.769820000,-3.108500000,1.544810000,0.000000000,1.700000000,0.215000000,0.000000000,0.000000000,6.200000000,481.800000000,0.000000000,3,-39.350000000,4826.000000000,0.109100000,-0.000113000,-587000.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2,"solute",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.797000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,6.200000000,481.800000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -24,"Ba++","0-0-0-0","ion",24,"Ba",137.300000000,0.797000000,444.150000000,290.890000000,0.344000000,64.550000000,137.300000000,99.000000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",-8.547960000,0.769820000,-3.108500000,1.544810000,0.000000000,1.700000000,0.215000000,0.000000000,0.000000000,5.800000000,481.800000000,0.000000000,3,-39.350000000,4826.000000000,0.109100000,-0.000113000,-587000.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2,"solute",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.797000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,5.800000000,481.800000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -25,"OH-","0-0-0-0","ion",25,"OH",17.001000000,0.797000000,444.150000000,290.890000000,0.344000000,64.550000000,17.001000000,99.000000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",-8.547960000,0.769820000,-3.108500000,1.544810000,0.000000000,1.700000000,0.215000000,0.000000000,0.000000000,3.520000000,481.800000000,0.000000000,3,-39.350000000,4826.000000000,0.109100000,-0.000113000,-157000.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,-1,"solute",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.797000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,3.520000000,481.800000000,0.000000000,3.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -26,"CO3--","0-0-0-0","ion",26,"CO3minus2",59.982000000,0.797000000,444.150000000,290.890000000,0.344000000,64.550000000,59.982000000,99.000000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",-8.547960000,0.769820000,-3.108500000,1.544810000,0.000000000,1.700000000,0.215000000,0.000000000,0.000000000,3.700000000,481.800000000,0.000000000,3,-39.350000000,4826.000000000,0.109100000,-0.000113000,-587000.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,-2,"solute",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.797000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,3.700000000,481.800000000,0.000000000,5.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -27,"NH4+","0-0-0-0","ion",27,"NH4",18.010000000,0.797000000,444.150000000,290.890000000,0.344000000,64.550000000,18.010000000,99.000000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"loglog",-8.547960000,0.769820000,-3.108500000,1.544810000,0.000000000,1.700000000,0.215000000,0.000000000,0.000000000,2.500000000,481.800000000,0.000000000,3,-39.350000000,4826.000000000,0.109100000,-0.000113000,-587000.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,"solute",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.797000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2.500000000,481.800000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -28,"Br-","0-0-0-0","ion",28,"Br",79.900000000,0.797000000,444.150000000,290.890000000,0.344000000,64.550000000,79.900000000,99.000000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",-8.547960000,0.769820000,-3.108500000,1.544810000,0.000000000,1.700000000,0.215000000,0.000000000,0.000000000,3.900000000,481.800000000,0.000000000,3,-39.350000000,4826.000000000,0.109100000,-0.000113000,-587000.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,-1,"solute",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.797000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,3.900000000,481.800000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -29,"n-pentane","109-66-0","HC",29,"nC5",72.150000000,0.626200000,196.550000000,33.700000000,0.251500000,36.050000000,72.151000000,304.000000000,"Classic",39036.600000000,62.803956000,-0.003059552,0.000984876,-0.000001242,4.7830442e-10,"pow10",6.852960000,1064.840000000,232.012000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,5.784000000,341.100000000,0.000000000,2,-7.811000000,3140.000000000,0.000000000,0.000000000,-394370.000000000,-19.290500000,29814.500000000,-0.019678000,0.013189000,0.031144000,0,"solute",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.340000000,0.043000000,-0.384000000,0.005250000,-0.000006370,233.900000000,8401.500000000,1000.000000000,0.000000686,143.420000000,143.420000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.903861134,-0.358553152,0.663885221,0.000000000,0.000000000,0.000000000,0.319903000,0.847895000,2.102010000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,181980.000000000,9.100800000,0.798580000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,42000,0.000025865,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",2.689600000,3.772900000,231.200000000,0.000000000,0.000000000,5.784000000,341.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.750630000,-0.107340000,0.387070000,233.900000000 -30,"n-hexane","110-54-3","HC",30,"C6H14",86.177000000,0.664000000,234.450000000,30.250000000,0.301300000,68.750000000,86.178000000,370.000000000,"Classic",48795.100000000,73.420934000,-0.001380124,0.001189068,-0.000001522,5.9228936e-10,"log",3.456040000,1044.038000000,-53.893000000,1000.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,5.949000000,399.300000000,0.000000000,2,-7.811000000,3140.000000000,0.000000000,0.000000000,-394370.000000000,-19.290500000,29814.500000000,-0.019678000,0.013189000,0.031144000,0,"solute",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.340000000,0.043000000,-0.384000000,0.005250000,-0.000006370,271.000000000,13080.000000000,1000.000000000,0.000011707,177.830000000,177.830000000,-167190.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,1.106100000,-1.441100000,2.917300000,0.000000000,0.000000000,0.000000000,0.175874000,0.865924000,3.536480000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,236810.000000000,10.789000000,0.831300000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000025784,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",3.057600000,3.798300000,236.770000000,0.000000000,0.000000000,5.949000000,399.300000000,0.000000000,1.000000000,1,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.834700000,-0.318030000,1.020850000,271.000000000 -31,"benzene","71-43-2","HC",31,"C6H6",78.114000000,0.886000000,289.010000000,48.980000000,0.210800000,80.150000000,78.114000000,259.000000000,"Classic",43185.000000000,29.523014000,-0.051413776,0.001194306,-0.000001646,6.8457476e-10,"pow10",3.985230000,1184.240000000,217.572000000,0.000000000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,205.900000000,9200.000000000,1000.000000000,0.048379070,278.500000000,278.500000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.835600000,-0.375000000,0.971500000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,"1A",0.000000000,0.000000000,0.113470000,0.000000000,178760.000000000,7.499000000,0.757600000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,45000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000262800,5951.000000000,"no",2.465300000,3.647800000,287.350000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.683090000,-0.105190000,0.667110000,205.900000000 -32,"toluene","108-88-3","HC",32,"C7H8",92.141000000,0.871000000,318.640000000,41.086000000,0.264100000,110.650000000,92.141000000,316.000000000,"Classic",52943.500000000,32.141924000,0.029581212,0.001110417,-0.000001551,6.393466e-10,"pow10",6.950870000,1342.310000000,219.187000000,0.000000000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.946900000,-0.589600000,1.213200000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,"1A",0.000000000,0.000000000,0.125100000,0.000000000,233750.000000000,9.214000000,0.803700000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",2.814900000,3.716900000,285.690000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.764650000,-0.097370000,0.425650000,207.000000000 -33,"n-heptane","142-82-5","HC",33,"C7H16",100.205000000,0.690000000,267.050000000,27.400000000,0.349500000,98.450000000,100.205000000,432.000000000,"Classic",58553.600000000,80.097076000,0.034552984,0.001288171,-0.000001668,6.459978e-10,"pow10",6.896770000,1264.900000000,216.544000000,0.000000000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,2.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,311.000000000,14100.000000000,1000.000000000,0.006110000,182.570000000,182.570000000,-187800.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,1.160500000,-1.260600000,2.551700000,0.000000000,0.000000000,0.000000000,0.423359000,0.835150000,1.982920000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,291780.000000000,12.535000000,0.913700000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",3.483100000,3.804900000,238.400000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,1,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.864790000,0.071560000,0.066920000,311.000000000 -34,"n-octane","111-65-9","HC",34,"C8H18",114.232000000,0.708000000,295.550000000,24.900000000,0.399600000,125.650000000,114.232000000,492.000000000,"Classic",68312.100000000,89.990736000,0.041428662,0.001475818,-0.000001923,7.465972e-10,"pow10",6.918680000,1351.990000000,209.155000000,0.000000000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,351.000000000,6000.000000000,1000.000000000,0.006110000,216.370000000,216.370000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.997500000,0.580400000,-1.207500000,0.000000000,0.000000000,0.000000000,0.367046000,0.833616000,2.365850000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,348750.000000000,14.244000000,0.994150000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",3.817600000,3.837300000,242.780000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.963310000,-0.256300000,0.886400000,351.000000000 -35,"nC10","124-18-5","HC",35,"C10H22",142.285000000,0.734000000,344.550000000,21.100000000,0.492300000,174.150000000,142.285000000,603.000000000,"Classic",87828.400000000,111.964638000,0.034411646,0.001922778,-0.000002533,9.951858e-10,"pow10",6.943630000,1495.170000000,193.858000000,0.000000000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,431.000000000,9300.000000000,1000.000000000,0.006110000,243.450000000,243.450000000,-249700.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,1.140600000,0.586700000,-1.361000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,473890.000000000,17.865000000,1.132430000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",4.662700000,3.838400000,243.870000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1.068180000,-0.072450000,0.436410000,431.000000000 -36,"n-nonane","111-84-2","HC",36,"C9H20",128.258000000,0.722000000,322.500000000,23.056000000,0.437700000,150.850000000,128.258000000,548.000000000,"Classic",78069.900000000,101.031728000,0.038036550,0.001697386,-0.000002226,8.700601e-10,"pow10",6.938930000,1431.820000000,202.110000000,0.000000000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,391.000000000,6000.000000000,1000.000000000,0.006110000,219.600000000,219.600000000,-228300.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,412506.100000000,16.035000000,1.046280000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000025792,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",4.207900000,3.844800000,244.510000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1.041220000,-0.229190000,0.647520000,391.000000000 -37,"hydrogen","1333-74-0","HC",37,"hydrogen",2.016000000,0.000000000,-239.950000000,12.970000000,-0.220000000,-252.750000000,2.016000000,65.000000000,"Classic",-9755.849721806,23.969262000,0.030603834,-0.000064184,0.000000057,-1.770882e-11,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -38,"argon","7440-37-1","HC",38,"argon",39.948000000,0.000000000,-122.350000000,48.740000000,-0.004000000,-185.850000000,39.948000000,74.900000000,"Classic",16633.200000000,20.785000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.689500000,83.800000000,83.800000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -39,"i-butane","75-28-5","HC",39,"C4H10",58.123000000,0.000000000,134.990000000,36.480000000,0.177000000,-11.750000000,58.124000000,263.000000000,"Classic",29278.100000000,27.860214000,0.148679262,0.000455357,-0.000000673,2.6962302e-10,"pow10",4.002720000,947.540000000,248.870000000,0.000000000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,3.081016220,225.150443898,0.870818654,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,181.500000000,6000.000000000,1000.000000000,0.000000140,113.540000000,273.000000000,-134510.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.780388360,-0.273389543,0.659787119,0.000000000,0.000000000,0.000000000,0.217971280,0.848891073,2.284036968,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,129094.000000000,7.470000000,0.702100000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,24540,0.000027115,0.000000000,0.000000000,0.081890000,4013.000000000,0.000000000,0.000000000,0.081890000,4013.000000000,"yes",2.261600000,3.757400000,216.530000000,0.000000000,0.000000000,3.081016220,225.150443898,0.870818654,1.000000000,0,4000.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.081640000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.656170000,-0.138700000,0.503920000,181.500000000 -40,"c-propane","74-98-6","HC",40,"C3H6",42.081000000,0.000000000,124.650000000,54.920000000,0.264000000,-32.750000000,42.081000000,170.000000000,"Classic",18117.100000000,37.354802000,-0.150458458,0.001059536,-0.000001334,5.3425764e-10,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,132.500000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,132.500000000 -41,"Cs+","74-82-8","ion",41,"Cs+",32.042000000,0.797000000,444.150000000,290.890000000,0.344000000,64.550000000,32.042000000,99.000000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",-8.547960000,0.769820000,-3.108500000,1.544810000,0.000000000,1.700000000,0.215000000,0.000000000,0.000000000,2.380000000,481.800000000,0.000000000,3,-39.350000000,4826.000000000,0.109100000,-0.000113000,-587000.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,"solute",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.797000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2.380000000,481.800000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -42,"Rb+","74-82-8","ion",42,"Rb+",32.042000000,0.797000000,444.150000000,290.890000000,0.344000000,64.550000000,32.042000000,99.000000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",-8.547960000,0.769820000,-3.108500000,1.544810000,0.000000000,1.700000000,0.215000000,0.000000000,0.000000000,2.360000000,481.800000000,0.000000000,3,-39.350000000,4826.000000000,0.109100000,-0.000113000,-587000.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,"solute",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.797000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2.360000000,481.800000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -43,"ice","74-82-8","ice",43,"H2O",18.015000000,0.999000000,374.150000000,220.890000000,0.344000000,100.000000000,18.015000000,56.000000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-57.710000000,7647.000000000,0.144200000,-0.000135700,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.082928410,-1.243257568,-0.253919105,-0.384000000,0.005250000,-0.000006370,207.000000000,2700.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,1.090000000,-0.638000000,0.635000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,4,"0",0.000000000,0.000000000,0.070118289,16201.000000000,11253.994270000,1.629710202,1.170113583,13855.596960000,1.456360879,0.664155324,0.046473789,1,17.387107060,-6141.762746000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -44,"nC11","1120-21-4","HC",44,"C11H24",156.300000000,0.743200000,365.850000000,19.500000000,0.530300000,195.950000000,156.300000000,660.000000000,"Classic",97578.500000000,-8.390000000,1.053000000,-0.000579900,0.000000123,0.000000000,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,471.000000000,22180.000000000,6860.000000000,0.006110000,247.580000000,247.580000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,1.155900000,-0.306210000,0.941190000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,552201.000000000,19.790900000,1.143700000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",4.908200000,3.889300000,248.820000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,1,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1.155900000,-0.306210000,0.941190000,471.000000000 -45,"nC12","112-40-3","HC",45,"C12H26",170.300000000,0.751300000,384.850000000,18.200000000,0.576400000,216.350000000,170.300000000,713.000020790,"Classic",107318.200000000,143.241906000,-0.060209988,0.002653995,-0.000003518,0.000000001,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,511.000000000,36820.000000000,1000.000000000,0.006110000,263.570000000,263.570000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,1.205870000,-0.323610000,1.076340000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,624030.000000000,21.624000000,1.195310000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",5.306000000,3.895900000,249.210000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,1,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1.205870000,-0.323610000,1.076340000,511.000000000 -46,"nC13","629-50-5","HC",46,"C13H28",184.400000000,0.758000000,401.850000000,16.800000000,0.617400000,235.450000000,184.400000000,780.000000000,"Classic",117127.500000000,154.191444000,-0.063485704,0.002876976,-0.000003822,0.000000001,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,554.300000000,28501.000000000,1000.000000000,0.006110000,267.790000000,267.790000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,1.291160000,-0.533470000,1.483180000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,766180.000000000,25.053000000,1.290570000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",5.687700000,3.914300000,249.780000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,1,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1.291160000,-0.533470000,1.483180000,554.300000000 -47,"nC14","629-59-4","HC",47,"C14H30",198.400000000,0.763900000,419.850000000,15.700000000,0.643000000,253.550000000,198.400000000,830.000000000,"Classic",126867.200000000,152.769750000,0.054747690,0.002686003,-0.000003547,0.000000001,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,594.600000000,45070.000000000,1000.000000000,0.006110000,279.020000000,279.020000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,1.294260000,0.020290000,0.104280000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",5.900200000,3.939600000,254.210000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,1,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1.294260000,0.020290000,0.104280000,594.600000000 -48,"nC15","629-62-9","HC",48,"C15H32",212.400000000,0.769100000,434.850000000,14.800000000,0.686300000,270.650000000,212.400000000,880.000000000,"Classic",136606.900000000,176.090520000,-0.070037136,0.003323022,-0.000004430,0.000000001,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,556.300000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,1.414720000,-0.638900000,1.603140000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",6.285500000,3.953100000,254.140000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,1,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1.414720000,-0.638900000,1.603140000,556.300000000 -49,"nC16","544-76-3","HC",49,"C16H34",226.400000000,0.773800000,443.850000000,14.190000000,0.742000000,286.850000000,226.400000000,920.000000000,"Classic",146346.600000000,330.456558000,-1.713947728,0.009545635,-0.000012932,0.000000005,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,675.200000000,47545.000000000,1000.000000000,0.006110000,291.300000000,291.300000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,1.430760000,-0.454150000,1.195570000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",6.648500000,3.955200000,254.700000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,1,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,675.200000000 -50,"nC17","629-78-7","HC",50,"C17H36",240.470000000,0.778000000,462.350000000,13.630000000,0.657200000,302.050000000,240.500000000,1000.000000000,"Classic",156155.900000000,197.981282000,-0.076571940,0.003768985,-0.000005038,0.000000002,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,715.500000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,1.463920000,-0.450710000,1.658120000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",6.980900000,3.967500000,255.650000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,1,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1.463920000,-0.450710000,1.658120000,715.500000000 -51,"nC18","593-45-3","HC",51,"C18H38",254.500000000,0.781900000,473.850000000,12.700000000,0.811000000,316.350000000,254.500000000,1030.000000000,"Classic",165895.600000000,208.930820000,-0.079839342,0.003991967,-0.000005342,0.000000002,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,755.800000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,1.543890000,-0.705930000,1.694580000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",7.327100000,3.966800000,256.200000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,1,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1.543890000,-0.705930000,1.694580000,755.800000000 -52,"nC19","629-92-5","HC",52,"C19H40",268.000000000,0.785400000,486.950000000,12.470000000,0.707300000,329.950000000,268.500000000,1085.000000000,"Classic",175635.300000000,219.880358000,-0.083123372,0.004214948,-0.000005646,0.000000002,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,796.100000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,1.467200000,-0.058400000,1.406340000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",7.717500000,3.972100000,256.000000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,1,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1.467200000,-0.058400000,1.406340000,796.100000000 -53,"nC20","112-95-8","HC",53,"C20H42",282.600000000,0.788100000,493.850000000,11.150000000,0.907000000,343.850000000,282.600000000,1140.000000000,"Classic",185444.600000000,230.829896000,-0.086374146,0.004437930,-0.000005950,0.000000002,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,836.400000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,1.781740000,-1.488860000,3.122780000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",7.984900000,3.986900000,257.750000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,1,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,836.400000000 -54,"nC21","629-94-7","HC",54,"C21H44",296.582000000,0.791100000,506.450000000,10.740000000,0.861000000,357.550000000,296.582000000,1195.000000000,"Classic",195171.800000000,230.829896000,-0.086374146,0.004437930,95.008038000,0.040390996,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,876.700000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,1.829097302,-1.002129722,1.025766200,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,1,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,876.700000000 -55,"nC22","629-97-0","HC",55,"C22H46",310.000000000,0.793700000,519.050000000,11.160000000,0.777000000,369.550000000,310.609000000,1250.000000000,"Classic",204930.300000000,230.829896000,-0.086374146,0.004437930,95.008038000,0.040390996,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,917.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,1.880405836,-1.070711658,1.049515300,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,1,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,917.000000000 -56,"nC23","638-67-5","HC",56,"C23H48",324.636000000,0.796100000,528.750000000,10.820000000,0.799000000,381.050000000,324.636000000,1305.000000000,"Classic",214688.800000000,230.829896000,-0.086374146,0.004437930,95.008038000,0.040390996,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,957.300000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,1.969047395,-1.194287269,1.090271820,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,1,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,957.300000000 -57,"nC24","646-31-1","HC",57,"C24H50",338.662000000,0.798400000,533.150000000,9.320000000,0.950000000,391.950000000,338.662000000,1360.000000000,"Classic",224446.600000000,230.829896000,-0.086374146,0.004437930,95.008038000,0.040390996,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,997.600000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,2.044270695,-1.304114220,1.124593100,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,1,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,997.600000000 -58,"22-dim-C3","463-82-1","HC",58,"C5H12",72.151000000,0.653999900,160.630000000,31.992000000,0.196400000,49.750000000,72.151000000,303.000000000,"Classic",39036.600000000,-95.012392000,1.297291618,-0.002775462,0.000003336,-0.000000001,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,225.900000000,10810.000000000,1000.000000000,0.006110000,256.760000000,256.760000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,33200,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",2.354300000,3.955000000,225.690000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.672670000,-0.179150000,0.814600000,225.900000000 -59,"22-dim-C4","75-83-2","HC",59,"C6H14",86.178000000,0.654000000,215.630000000,30.800000000,0.233900000,49.750000000,86.178000000,359.000000000,"Classic",48795.100000000,25.000198000,0.324736526,0.000403312,-0.000000685,2.7993238e-10,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,265.900000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",2.600800000,4.004200000,243.510000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.698860000,0.111900000,-0.063550000,265.900000000 -60,"23-dim-C4","79-29-8","HC",60,"C6H14",86.178000000,0.667000000,226.830000000,31.268000000,0.247500000,58.050000000,86.178000000,358.000000000,"Classic",48795.100000000,-18.407196000,0.618162528,-0.000307368,0.000000022,2.560712e-11,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,266.600000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",2.685300000,3.954500000,246.070000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.729270000,0.013220000,0.188750000,266.600000000 -61,"2-m-C5","107-83-5","HC",61,"C6H14",86.178000000,0.658000000,224.350000000,30.102000000,0.278100000,60.250000000,86.178000000,367.000000000,"Classic",48795.100000000,17.426144000,0.385927566,0.000259729,-0.000000567,2.4127228e-10,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,268.800000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",2.931700000,3.853500000,235.580000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.767140000,0.070530000,0.053360000,268.800000000 -62,"3-m-C5","96-14-0","HC",62,"C6H14",86.178000000,0.669000000,231.280000000,31.240000000,0.273700000,63.250000000,86.178000000,367.000000000,"Classic",48795.100000000,3.599962000,0.092642902,0.000060692,-0.000000134,5.73666e-11,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,267.400000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",2.885200000,3.860500000,240.480000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.811810000,-0.426930000,1.213850000,267.400000000 -63,"c-C5","287-92-3","HC",63,"C5H8",70.135000000,0.669000000,238.610000000,45.023000000,0.194300000,49.250000000,70.135000000,260.000000000,"Classic",37634.100000000,41.727966000,-0.164068476,0.001489619,-0.000001803,6.829951e-10,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,203.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.011610000,5479.000000000,"no",2.365500000,3.711400000,265.830000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.654610000,0.025740000,0.192520000,203.000000000 -64,"default","0-0-0-0","HC",64,"default",16.043000000,0.422182073,-82.586000000,45.389000000,0.008000000,-161.550000000,16.043000000,99.000000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",-6.004350000,1.188500000,-0.834080000,-1.228330000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,3.165000000,154.540000000,0.383400000,3,-26.870000000,1150.000000000,0.187000000,-0.000521000,-50500.000000000,2.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"solute",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.303000000,-0.000605000,-0.000003200,207.000000000,941.000000000,452.000000000,0.117000000,849.150000000,849.150000000,-74500.000000000,186.000000000,1.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1.000000000,0.000000000,0.000000000,0.000000000,0.000000000,10200000.0000000,0.261000000,-0.147000000,0.222000000,0.000000000,0.100000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",2.562000000,3.829600000,230.750000000,0.000000000,0.000000000,3.165000000,154.540000000,0.383400000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -65,"Piperazine","74-82-8","amine",65,"Piperazine",86.137000000,1.038000000,364.850000000,55.300000000,0.414000000,146.000000000,119.160000000,99.000000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",172.780000000,-13492.000000000,-21.910000000,0.000013780,2.000000000,1.700000000,0.000000000,0.000000000,0.000000000,3.960000000,481.800000000,0.000000000,3,-75.190000000,12680.000000000,0.157300000,-0.000122500,57900.000000000,148.900000000,0.000000000,-0.624910000,0.000771000,0.000000000,0,"solute",0.000000000,0.000000000,0.000000000,0.000000000,-0.198420000,-2.857000000,2.037300000,0.000000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.797000000,1.074477592,0.229022552,-0.421330787,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,17.387107060,1.762745870,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,3.960000000,481.800000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -66,"Piperazine+","74-82-8","ion",66,"Piperazine+",87.137000000,1.038000000,364.840000000,55.300000000,0.414000000,146.000000000,119.160000000,99.000000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",172.780000000,-13492.000000000,-21.910000000,0.000013780,2.000000000,1.700000000,0.000000000,0.000000000,0.000000000,7.000000000,481.800000000,0.000000000,3,-75.190000000,12680.000000000,0.157300000,-0.000122500,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,"solute",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.797000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,7.000000000,481.800000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -67,"PZCOO-","74-82-8","ion",67,"PiperazineCarbamate",129.147000000,1.038000000,364.840000000,55.300000000,0.414000000,146.000000000,119.160000000,99.000000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",172.780000000,-13492.000000000,-21.910000000,0.000013780,2.000000000,1.700000000,0.000000000,0.000000000,0.000000000,5.500000000,481.800000000,0.000000000,3,-75.190000000,12680.000000000,0.157300000,-0.000122500,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,-1,"solute",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.797000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,5.500000000,481.800000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -68,"H+PZCOO-","74-82-8","ion",68,"PiperazineCarbamate",130.147000000,1.038000000,729.680000000,110.600000000,0.414000000,292.000000000,119.160000000,99.000000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",172.780000000,-13492.000000000,-21.910000000,0.000013780,2.000000000,1.700000000,0.000000000,0.000000000,0.000000000,5.400000000,481.800000000,0.000000000,3,-75.190000000,12680.000000000,0.157300000,-0.000122500,57900.000000000,148.900000000,0.000000000,-0.624910000,0.000771000,0.000000000,0,"solute",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.797000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,5.400000000,481.800000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -69,"-OOCPZCOO-","74-82-8","ion",69,"PiperazineCarbamate",172.157000000,1.038000000,364.840000000,55.300000000,0.414000000,146.000000000,119.160000000,99.000000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",172.780000000,-13492.000000000,-21.910000000,0.000013780,2.000000000,1.700000000,0.000000000,0.000000000,0.000000000,7.000000000,481.800000000,0.000000000,3,-75.190000000,12680.000000000,0.157300000,-0.000122500,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,-2,"solute",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.797000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,7.000000000,481.800000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -70,"c-hexane","110-82-7","HC",70,"C6H8",84.161000000,0.783000000,280.390000000,40.748000000,0.211800000,80.750000000,84.161000000,260.000000000,"Classic",47392.600000000,33.546990000,-0.036855962,0.001399578,-0.000001727,6.4400244e-10,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,240.800000000,6000.000000000,1000.000000000,0.053397292,279.700000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,212570.000000000,9.083800000,0.742650000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,43200,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000436500,5951.000000000,"no",2.530300000,3.849900000,278.110000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.680540000,-0.068980000,0.576480000,240.800000000 -71,"22-DM-C5","590-35-2","HC",71,"C7H16",100.204000000,0.667000000,247.250000000,27.700000000,0.287000000,58.050000000,86.178000000,358.000000000,"Classic",0.000000000,10.932910000,0.502681068,0.000233872,-0.000000633,2.8550276e-10,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -72,"M-cy-C5","96-37-7","HC",72,"C7H16",84.161000000,0.667000000,259.640000000,37.845000000,0.230200000,100.900000000,86.178000000,358.000000000,"Classic",47392.600000000,44.721006000,-0.068657012,0.001437740,-0.000001799,6.8698582e-10,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,258.500000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.749520000,-0.390120000,1.166130000,258.500000000 -73,"24-DM-C5","74-82-8","HC",73,"C7H16",100.204000000,0.667000000,246.640000000,27.368000000,0.301800000,58.050000000,86.178000000,358.000000000,"Classic",0.000000000,-26.047762000,0.814131822,-0.000574663,0.000000201,-2.0785e-11,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.826810000,-0.184800000,0.710800000,207.000000000 -74,"223-TM-C4","594-82-1","HC",74,"C8H18",100.204000000,0.667000000,257.950000000,29.500000000,0.250000000,58.050000000,86.178000000,358.000000000,"Classic",58553.600000000,-5.911254000,0.611594468,-0.000083721,-0.000000250,1.3161062e-10,"loglog",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -75,"33-DM-C5","74-82-8","HC",75,"C7H16",100.204000000,0.667000000,263.150000000,29.500000000,0.269000000,58.050000000,86.178000000,358.000000000,"Classic",58553.600000000,-3.990720000,0.610372310,-0.000061523,-0.000000296,1.5148108e-10,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -76,"2-M-C6","591-76-4","HC",76,"C7H16",100.204000000,0.667000000,257.220000000,27.338000000,0.328200000,58.050000000,86.178000000,358.000000000,"Classic",58552.200000000,28.699928000,0.385545122,0.000452780,-0.000000821,3.3995946e-10,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.868400000,-0.213840000,0.728400000,207.000000000 -77,"23-DM-C5","74-82-8","HC",77,"C7H16",100.204000000,0.667000000,264.150000000,29.100000000,0.297000000,58.050000000,86.178000000,358.000000000,"Classic",0.000000000,-35.866596000,0.804030312,-0.000536585,0.000000185,-2.602282e-11,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,,,,207.000000000 -78,"11-DM-cy-C5","74-82-8","HC",78,"C7H16",100.204000000,0.667000000,226.750000000,31.310000000,0.247000000,58.050000000,86.178000000,358.000000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -79,"3-M-C6","589-34-4","HC",79,"C7H16",100.204000000,0.667000000,262.100000000,28.138000000,0.321600000,58.050000000,86.178000000,358.000000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"loglog",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,293.800000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.861240000,-0.239030000,0.782780000,293.800000000 -80,"cis-13-DM-cy-C5","74-82-8","HC",80,"C7H16",98.188000000,0.667000000,277.850000000,34.000000000,0.276000000,58.050000000,86.178000000,358.000000000,"Classic",57150.400000000,-20.967908000,0.503312932,0.000224727,-0.000000629,2.7943354e-10,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -81,"trans-13-DM-cy-C5","74-82-8","HC",81,"C7H16",98.188000000,0.667000000,279.850000000,34.000000000,0.253000000,58.050000000,86.178000000,358.000000000,"Classic",57150.400000000,-20.967908000,0.503312932,0.000224727,-0.000000629,2.7943354e-10,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -82,"trans-12-DM-cy-C5","74-82-8","HC",82,"C7H16",98.188000000,0.667000000,279.850000000,34.000000000,0.253000000,58.050000000,86.178000000,358.000000000,"Classic",57150.400000000,-54.500000000,0.759200000,-0.000448000,0.000000101,0.000000000,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -83,"224-TM-C5","74-82-8","HC",83,"C7H16",114.231000000,0.667000000,270.130000000,25.700000000,0.304000000,58.050000000,86.178000000,358.000000000,"Classic",0.000000000,3.192576000,0.640668526,0.000055288,-0.000000462,2.1774366e-10,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -84,"113-TM-cy-C5","74-82-8","HC",84,"C7H16",114.231000000,0.667000000,270.130000000,25.700000000,0.304000000,58.050000000,86.178000000,358.000000000,"Classic",66908.200000000,-7.490000000,0.630100000,-0.000254000,0.000000000,0.000000000,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -85,"22-DM-C6","74-82-8","HC",85,"C7H16",114.231000000,0.667000000,276.650000000,25.300000000,0.339000000,58.050000000,86.178000000,358.000000000,"Classic",0.000000000,28.699928000,0.459115708,0.000504327,-0.000000937,3.6348808e-10,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -86,"E-cy-C5","74-82-8","HC",86,"C7H16",98.188000000,0.667000000,296.370000000,33.977000000,0.271500000,58.050000000,86.178000000,358.000000000,"Classic",57151.100000000,48.611958000,-0.000399072,0.001455531,-0.000001870,7.1965984e-10,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,289.100000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.764250000,-0.013170000,0.287760000,289.100000000 -87,"25-DM-C6","74-82-8","HC",87,"C7H16",114.231000000,0.667000000,280.350000000,25.600000000,0.344000000,58.050000000,86.178000000,358.000000000,"Classic",0.000000000,-11.365238000,0.725687490,-0.000149568,-0.000000277,1.5439098e-10,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -88,"24-DM-C6","74-82-8","HC",88,"C7H16",114.231000000,0.667000000,280.350000000,25.600000000,0.343600000,58.050000000,86.178000000,358.000000000,"Classic",0.000000000,-28.034808000,0.903274530,-0.000604178,0.000000180,-8.56342e-12,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.882520000,-0.209990000,0.804150000,207.000000000 -89,"cis-13-DM-cy-C6","74-82-8","HC",89,"C7H16",114.231000000,0.667000000,318.000000000,29.384000000,0.236600000,58.050000000,86.178000000,358.000000000,"Classic",66908.200000000,-65.200000000,0.883900000,-0.000493200,0.000000102,0.000000000,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.631300000,0.682390000,-0.768230000,207.000000000 -90,"3-M-C7","589-81-1","HC",90,"C7H16",114.231000000,0.667000000,290.520000000,25.463000000,0.371600000,58.050000000,86.178000000,358.000000000,"Classic",68310.700000000,-9.220000000,0.786000000,-0.000440000,0.000000096,0.000000000,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,326.600000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.927720000,-0.276050000,0.942950000,326.600000000 -91,"3-E-C6","74-82-8","HC",91,"C7H16",114.231000000,0.667000000,292.250000000,26.100000000,0.362000000,58.050000000,86.178000000,358.000000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -92,"ethylbenzene","100-41-4","HC",92,"C7H16",106.168000000,0.871000000,344.020000000,36.094000000,0.303600000,58.050000000,86.178000000,358.000000000,"Classic",62702.000000000,37.778816000,0.087945492,0.001134362,-0.000001602,6.555589e-10,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,285.900000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,288600.000000000,10.872000000,0.853900000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",3.079900000,3.797400000,287.350000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.828530000,-0.182090000,0.651570000,285.900000000 -93,"m-Xylene","108-38-3","HC",93,"C7H16",106.170000000,0.868000000,343.900000000,35.412000000,0.326000000,139.120000000,106.167000000,358.000000000,"Classic",62702.000000000,33.272628000,0.145802618,0.000880452,-0.000001250,4.9950512e-10,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,301.400000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,"1A",0.000000000,0.000000000,0.120000000,0.000000000,290860.000000000,10.872000000,0.868100000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",3.186100000,3.756300000,283.980000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.866530000,-0.187400000,0.494120000,301.400000000 -94,"p-Xylene","106-42-3","HC",94,"C7H16",106.170000000,0.667000000,343.080000000,35.108000000,0.325900000,138.360000000,106.167000000,358.000000000,"Classic",62702.000000000,34.195482000,0.123953426,0.000981883,-0.000001390,5.6003104e-10,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,301.400000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,"1A",0.000000000,0.000000000,0.120000000,0.000000000,293166.300000000,10.980000000,0.862560000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.872230000,-0.317790000,0.808790000,301.400000000 -95,"o-Xylene","95-47-6","HC",95,"C7H16",106.167000000,0.667000000,357.220000000,37.342000000,0.312700000,139.150000000,106.167000000,358.000000000,"Classic",62702.000000000,27.344746000,0.283873216,0.000414785,-0.000000692,2.7752132e-10,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,301.400000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,"1A",0.000000000,0.000000000,0.120000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.844520000,-0.205100000,0.611540000,301.400000000 -97,"2-M-C8","3221-61-2","HC",97,"C7H16",100.204000000,0.667000000,313.600000000,22.900000000,0.421700000,58.050000000,86.178000000,358.000000000,"Classic",78069.200000000,49.168996000,0.391082246,0.000863575,-0.000001387,5.6967528e-10,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,359.400000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,359.400000000 -98,"ethylcyclohexane","1678-91-7","HC",98,"C8H16",100.204000000,0.667000000,336.000000000,30.398000000,0.245500000,58.050000000,86.178000000,358.000000000,"Classic",66908.200000000,-63.900000000,0.889400000,-0.000510800,0.000000110,0.000000000,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.636370000,0.727510000,-0.813160000,207.000000000 -99,"i-pentane","78-78-4","HC",99,"iC5",72.151000000,0.626000000,187.280000000,33.812000000,0.227500000,27.800000000,72.151000000,306.000000000,"Classic",39036.600000000,16.287126000,0.317519974,0.000202362,-0.000000430,1.799981e-10,"log",72.350000000,-5010.900000000,-7.883000000,0.000008979,2.000000000,0.000000000,0.000000000,0.000000000,0.000000000,5.784000000,341.100000000,0.000000000,2,-7.811000000,3140.000000000,0.000000000,0.000000000,-394370.000000000,-19.290500000,29814.500000000,-0.019678000,0.013189000,0.031144000,0,"solute",0.000000000,0.000000000,0.000000000,0.000000000,-0.030486678,-4.461903736,4.285718649,-0.384000000,0.005250000,-0.000006370,225.000000000,6000.000000000,1000.000000000,0.000000001,113.250000000,113.450000000,-242000.000000000,189.000000000,12.700000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.857887409,-0.267638226,0.458642756,0.000000000,0.000000000,0.000000000,0.342669912,0.851893781,1.921875279,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,5.347550000,1,1.000000000,-17.085200000,0.000000000,0,0.000027507,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,5.784000000,341.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.715820000,-0.100580000,0.383140000,225.000000000 -100,"H2S","7783-06-4","inert",100,"H2S",34.080000000,1.100000000,100.380000000,89.607000000,0.094200000,-59.650000000,34.080000000,98.500000000,"Classic",12550.900000000,35.467524000,-0.028583532,0.000109661,-0.000000110,4.057232e-11,"log",-6.956260000,1.196950000,-3.126140000,2.994480000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,3.620000000,195.200000000,0.000000000,2,-7.811000000,3140.000000000,0.000000000,0.000000000,-394000.000000000,2.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"solute",0.000000000,0.000000000,0.000000000,0.059565000,0.018570000,0.000000000,-2.078000000,-0.384000000,0.005250000,-0.000006370,80.100000000,6000.000000000,1000.000000000,0.232000000,187.660000000,187.660000000,-242000.000000000,189.000000000,53.000000000,-0.007840000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.100000000,0.550700000,0.453400000,-0.584100000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2,"2A",0.000000000,0.000000000,0.001160489,5000.000000000,44505.000000000,2.850000000,0.602650000,0.000000000,0.000000000,0.000000000,0.000000000,1,4.436810000,-829.439000000,-25.412000000,0,0.000000000,0.009928000,2999.000000000,0.016130000,3737.000000000,0.000268400,4242.000000000,0.855300000,2325.000000000,"yes",1.694100000,3.021400000,226.790000000,0.000000000,0.000000000,3.941000000,195.200000000,0.000000000,1.000000000,0,4119.560000000,0.004000000,3141.600000000,0.295855000,2936.130000000,0.001244960,2778.000000000,0.339898000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.509090000,-0.002814000,0.362150000,80.100000000 -101,"S8","74-82-8","other",101,"S8",256.480000000,0.990000000,885.000000000,63.000000000,0.205900000,444.600000000,256.480000000,449.500000000,"Classic",68312.100000000,89.990736000,0.041428662,0.001475818,-0.000001923,7.465972e-10,"log",5.201200000,1936.281000000,-20.143000000,1000.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,6.000000000,454.000000000,0.383400000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-50000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solute",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,-0.384000000,0.005250000,-0.000006370,351.000000000,12860.000000000,1000.000000000,0.000039662,392.750000000,392.750000000,0.000000000,0.000000000,12.000000000,1.000000000,1.000000000,1.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.990000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,8.046000000,-4600.000000000,-144.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1.200000000,132.000000000,0.383400000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,351.000000000 -102,"AceticAcid","74-82-8","acid",102,"Hac",60.053000000,0.990000000,319.550000000,57.860000000,0.462000000,117.890000000,60.050000000,171.000000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",4.682060000,1642.540000000,-39.764000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,3.820000000,132.000000000,0.383400000,3,-24.000000000,1122.000000000,0.200000000,0.000000000,-50000.000000000,6.200000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"solute",0.000000000,0.000000000,0.000000000,0.000000000,0.103200000,0.003650000,-2.064000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1000.000000000,0.000039662,250.000000000,250.000000000,0.000000000,0.000000000,12.000000000,1.000000000,1.000000000,1.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.990000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,8.046000000,-4600.000000000,-144.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,3.820000000,132.000000000,0.383400000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000 -103,"Ac-","74-82-8","ion",103,"Ac-",59.053000000,0.990000000,319.550000000,57.860000000,0.462000000,117.890000000,59.053000000,171.000000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",4.682060000,1642.540000000,-39.764000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,3.820000000,132.000000000,0.383400000,3,-24.000000000,1122.000000000,0.200000000,0.000000000,-50000.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,-1,"solute",0.000000000,0.000000000,0.000000000,0.000000000,0.103200000,0.003650000,-2.064000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1000.000000000,0.000039662,250.000000000,250.000000000,0.000000000,0.000000000,12.000000000,1.000000000,1.000000000,1.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.990000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,8.046000000,-4600.000000000,-144.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,3.820000000,132.000000000,0.383400000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000 -104,"neon","74-82-8","inert",104,"Ne",20.180000000,0.650000000,-228.750000000,26.652000000,-0.376000000,-248.700000000,18.050000000,25.000000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",29.755000000,-271.060000000,-2.608100000,0.000527000,2.000000000,1.800000000,0.076000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"solute",0.000000000,0.000000000,0.000000000,0.000000000,0.004662711,-207.888073200,167.156497400,0.000000000,0.000000000,0.000000000,207.000000000,6000.000000000,1000.000000000,0.438000000,24.560000000,24.450000000,-242000.000000000,189.000000000,74.691000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.484453999,-0.508813922,0.722394513,0.000000000,0.000000000,0.000000000,0.088380472,0.940022294,3.401190177,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,3.756410000,1,1.000000000,-1.503000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -105,"acetone","67-64-1","other",105,"Acetone",58.080000000,0.900000000,234.950000000,48.000000000,0.559000000,64.550000000,32.042000000,99.000000000,"Classic",0.000000000,42.617564000,0.012562454,0.000476475,-0.000000596,2.2680592e-10,"pow10",7.631300000,1566.690000000,273.419000000,0.000000000,0.000000000,1.700000000,0.215000000,0.000000000,0.000000000,3.626000000,481.800000000,0.000000000,3,-39.350000000,4826.000000000,0.109100000,-0.000113000,57900.000000000,-19.290500000,29814.500000000,-0.019678000,0.013189000,0.031144000,0,"solvent",,,,,0.000000000,0.000000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.797000000,1.437100000,-0.799420000,0.327800000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2,"2B",0.000000000,0.000000000,0.015400000,24476.000000000,40220.000000000,3.120000000,0.462300000,47052.000000000,3.300000000,0.903700000,0.044900000,1,17.387107060,-7582.406220000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,3.626000000,481.800000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -106,"HS-","74-82-8","ion",106,"HS-",33.080000000,1.100000000,100.050000000,89.370000000,0.100000000,-59.650000000,34.080000000,98.500000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",-6.956260000,1.196950000,-3.126140000,2.994480000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,3.600000000,195.200000000,0.000000000,2,-7.811000000,3140.000000000,0.000000000,0.000000000,-394000.000000000,2.000000000,0.000000000,0.000000000,0.000000000,0.000000000,-1,"solute",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.232000000,187.660000000,187.660000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.100000000,0.825200000,0.251500000,-1.703900000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.001160489,5000.000000000,34369.093554000,2.706357876,0.804782959,0.000000000,0.000000000,0.000000000,0.000000000,1,4.436810000,-829.439000000,-25.412000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,3.600000000,195.200000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -107,"S--","74-82-8","ion",107,"S--",32.080000000,1.100000000,100.050000000,89.370000000,0.100000000,-59.650000000,34.080000000,98.500000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",-6.956260000,1.196950000,-3.126140000,2.994480000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,3.500000000,195.200000000,0.000000000,2,-7.811000000,3140.000000000,0.000000000,0.000000000,-394000.000000000,2.000000000,0.000000000,0.000000000,0.000000000,0.000000000,-2,"solute",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.232000000,187.660000000,187.660000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.100000000,0.825200000,0.251500000,-1.703900000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,4.436810000,-829.439000000,-25.412000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,3.500000000,195.200000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -108,"ethanol","64-17-5","alcohol",108,"CH4O",46.069220000,0.797000000,240.770000000,61.400000000,0.644000000,64.550000000,32.042000000,99.000000000,"Classic",20891.500000000,36.548344000,0.005221192,0.000461094,-0.000000583,2.232309e-10,"pow10",5.336750000,1648.220000000,230.918000000,0.000000000,0.000000000,1.700000000,0.215000000,0.000000000,0.000000000,3.626000000,481.800000000,0.000000000,3,-39.350000000,4826.000000000,0.109100000,-0.000113000,57900.000000000,-19.290500000,29814.500000000,-0.019678000,0.013189000,0.031144000,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,-0.384000000,0.005250000,-0.000006370,0.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.797000000,1.437100000,-0.799420000,0.327800000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2,"2B",0.000000000,0.000000000,0.008000000,21532.010000000,86716.090000000,4.908000000,0.736900000,47052.000000000,3.300000000,0.903700000,0.044900000,1,17.387107060,-7582.406220000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",2.382700000,3.177100000,198.240000000,0.032380000,22060.367600000,3.626000000,481.800000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000 -109,"DEA","74-82-8","amine",109,"DEA",119.163200000,1.038000000,240.750000000,61.400000000,0.644000000,140.000000000,119.160000000,99.000000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",-8.547960000,0.769820000,-3.108500000,1.544810000,0.000000000,1.700000000,0.000000000,0.000000000,0.000000000,4.500000000,481.800000000,0.000000000,3,-75.190000000,12680.000000000,0.157300000,-0.000122500,57900.000000000,-5.950000000,9276.380000000,-0.000006210,0.000000000,0.000000000,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.075980000,-1.355500000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.797000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,4,"0",0.000000000,0.000000000,0.054120713,12000.000000000,258457.097700000,10.751008890,1.364219207,376276.884000000,10.783585850,1.258298307,0.000000000,1,17.387107060,1.762745870,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,4.500000000,481.800000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -110,"DEA+","74-82-8","ion",110,"CH4O",120.163200000,1.038000000,403.850000000,38.760000000,1.242000000,64.550000000,119.160000000,99.000000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",-8.547960000,0.769820000,-3.108500000,1.544810000,0.000000000,1.700000000,0.000000000,0.000000000,0.000000000,4.400000000,481.800000000,0.000000000,3,-39.350000000,4826.000000000,0.109100000,-0.000113000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,"solute",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.797000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,4.400000000,481.800000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -111,"DEACOO-","74-82-8","ion",111,"PiperazineCarbamate",121.000000000,1.038000000,364.850000000,68.700000000,0.800000000,140.000000000,119.160000000,99.000000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",-8.547960000,0.769820000,-3.108500000,1.544810000,0.000000000,1.700000000,0.000000000,0.000000000,0.000000000,6.000000000,481.800000000,0.000000000,3,-75.190000000,12680.000000000,0.157300000,-0.000122500,57900.000000000,8.169760000,8989.300000000,0.000000000,0.000000000,0.000000000,-1,"solute",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.797000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,4,"0",0.000000000,0.000000000,0.054120713,12000.000000000,258457.097700000,10.751008890,1.364219207,376276.884000000,10.783585850,1.258298307,0.000000000,1,17.387107060,1.762745870,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,6.000000000,481.800000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -112,"Piperazine++","74-82-8","ion",112,"Piperazine++",88.137000000,1.038000000,364.850000000,68.700000000,0.800000000,140.000000000,119.160000000,99.000000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",-8.547960000,0.769820000,-3.108500000,1.544810000,0.000000000,1.700000000,0.000000000,0.000000000,0.000000000,3.000000000,481.800000000,0.000000000,3,-75.190000000,12680.000000000,0.157300000,-0.000122500,57900.000000000,8.169760000,8989.300000000,0.000000000,0.000000000,0.000000000,2,"solute",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.797000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,4,"0",0.000000000,0.000000000,0.054120713,12000.000000000,258457.097700000,10.751008890,1.364219207,376276.884000000,10.783585850,1.258298307,0.000000000,1,17.387107060,1.762745870,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,3.000000000,481.800000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -113,"CaCO3","74-82-8","other",113,"CaCO3",124.000000000,0.797000000,400.000000000,220.000000000,0.300000000,64.550000000,32.042000000,99.000000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",-8.547960000,0.769820000,-3.108500000,1.544810000,0.000000000,1.700000000,0.000000000,0.000000000,0.000000000,6.200000000,481.800000000,0.000000000,3,-39.350000000,4826.000000000,0.109100000,-0.000113000,-587000.000000000,2.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"solute",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.797000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,6.200000000,481.800000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -114,"water","7732-18-5","water",114,"H2O",18.015000000,0.999000000,374.150000000,220.890000000,0.344000000,100.000000000,18.015000000,56.000000000,"Classic",1374.600000000,36.540030000,-0.034802404,0.000116811,-0.000000130,5.254448e-11,"pow10",5.115640000,1687.537000000,230.170000000,0.000000000,0.000000000,1.800000000,0.076000000,0.235662374,0.000000000,2.520000000,809.100000000,0.000000000,3,-27.952757828,4665.225929930,0.052323342,-0.000038356,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.054783425,0.094678512,-2.267329403,-0.384000000,0.005250000,-0.000006370,52.878622600,6010.000000000,1000.000000000,0.006110000,273.160000000,273.150000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,5.459000000,0.305420000,647.130000000,0.081000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,1.087000000,-0.638000000,0.635000000,0.000000000,0.000000000,0.000000000,0.168272437,0.908482584,5.240427372,4,"4C",0.296941807,0.000718744,0.069200000,16655.000000000,12277.000000000,1.451500000,0.673590000,13855.596960000,1.456360879,0.664155324,0.046473789,1,17.387107060,-6141.762746000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",1.065600000,3.000700000,366.510000000,0.034868000,20790.819800000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,-262.490000000,140.520000000,0.000000000,0.000000000,0.000000000,276370.000000000,-2090.100000000,8.125000000,-0.014116000,0.000009370,0.923656000,-0.379370000,0.442429000,52.419867266 -115,"F-","74-82-8","ion",115,"F-",19.000000000,1.000000000,444.150000000,290.890000000,0.344000000,64.550000000,19.000000000,99.000000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",-8.547960000,0.769820000,-3.108500000,1.544810000,0.000000000,1.700000000,0.215000000,0.000000000,0.000000000,2.720000000,481.800000000,0.000000000,3,-39.350000000,4826.000000000,0.109100000,-0.000113000,-157000.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,-1,"solute",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.797000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2.720000000,481.800000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -116,"Fe++","74-82-8","ion",116,"Fe++",55.850000000,0.797000000,444.150000000,290.890000000,0.344000000,55.850000000,40.080000000,99.000000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",-8.547960000,0.769820000,-3.108500000,1.544810000,0.000000000,1.700000000,0.215000000,0.000000000,0.000000000,6.000000000,481.800000000,0.000000000,3,-39.350000000,4826.000000000,0.109100000,-0.000113000,-587000.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2,"solute",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.797000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,6.000000000,481.800000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -117,"Rb+","74-82-8","ion",117,"Rb+",85.470000000,0.797000000,444.150000000,290.890000000,0.344000000,64.550000000,85.470000000,99.000000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",-8.547960000,0.769820000,-3.108500000,1.544810000,0.000000000,1.700000000,0.215000000,0.000000000,0.000000000,2.360000000,481.800000000,0.000000000,3,-39.350000000,4826.000000000,0.109100000,-0.000113000,-587000.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,"solute",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,1.038000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2.360000000,481.800000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -118,"Pb++","74-82-8","ion",118,"Pb++",207.200000000,0.797000000,444.150000000,290.890000000,0.344000000,64.550000000,207.200000000,99.000000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",-8.547960000,0.769820000,-3.108500000,1.544810000,0.000000000,1.700000000,0.215000000,0.000000000,0.000000000,5.660000000,481.800000000,0.000000000,3,-39.350000000,4826.000000000,0.109100000,-0.000113000,-587000.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2,"solute",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,1.038000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,5.660000000,481.800000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -119,"NO3-","74-82-8","ion",119,"NO3-",62.000000000,0.797000000,444.150000000,290.890000000,0.344000000,62.000000000,126.900000000,99.000000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",-8.547960000,0.769820000,-3.108500000,1.544810000,0.000000000,1.700000000,0.215000000,0.000000000,0.000000000,3.120000000,481.800000000,0.000000000,3,-39.350000000,4826.000000000,0.109100000,-0.000113000,-587000.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,-1,"solute",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.797000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,3.120000000,481.800000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -120,"ClO4-","74-82-8","ion",120,"ClO4-",99.450000000,0.797000000,444.150000000,290.890000000,0.344000000,62.000000000,99.450000000,99.000000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",-8.547960000,0.769820000,-3.108500000,1.544810000,0.000000000,1.700000000,0.215000000,0.000000000,0.000000000,3.640000000,481.800000000,0.000000000,3,-39.350000000,4826.000000000,0.109100000,-0.000113000,-587000.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,-1,"solute",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.797000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,3.640000000,481.800000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -121,"SO4--","74-82-8","ion",121,"SO4--",96.070000000,0.797000000,444.150000000,290.890000000,0.344000000,62.000000000,96.070000000,99.000000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",-8.547960000,0.769820000,-3.108500000,1.544810000,0.000000000,1.700000000,0.215000000,0.000000000,0.000000000,3.410000000,481.800000000,0.000000000,3,-39.350000000,4826.000000000,0.109100000,-0.000113000,-587000.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,-2,"solute",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.797000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,3.410000000,481.800000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -123,"helium","7440-59-7","inert",123,"helium",4.003000000,0.000000000,-267.959999942,2.270000000,-0.390031993,-268.940009975,4.003000000,65.000000914,"Classic",0.000000000,20.785000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -124,"c-C7","291-64-5","HC",124,"C7H14",98.189000000,0.813000000,331.150000000,38.402000000,0.243000000,118.450000000,98.189000000,353.000000000,"Classic",57151.100000000,-76.200000000,0.786800000,-0.000420400,0.000000075,0.000000000,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,289.100000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",2.663700000,3.999300000,283.330000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.738330000,-0.220550000,0.876880000,289.100000000 -125,"c-C8","292-64-8","HC",125,"C8H16",112.216000000,0.837000000,366.850000000,34.800000000,0.290400000,148.850000000,112.216000000,410.000000000,"Classic",66909.600000000,35.218104000,0.109071366,0.001356262,-0.000001751,6.6403918e-10,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,321.900000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",2.825600000,4.103900000,294.040000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.809160000,-0.144450000,0.526580000,321.900000000 -126,"CO","630-08-0","inert",126,"CO",28.011000000,1.100000000,-140.200994873,34.987500000,0.093000002,-191.450399780,44.010000000,94.000000000,"Classic",0.000000000,32.524368000,-0.032532682,0.000098271,-0.000000108,4.28171e-11,"log",140.540000000,-4735.000000000,-21.268000000,0.040909000,1.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2.340000000,168.770000000,0.680500000,2,-7.811000000,3140.000000000,0.000000000,0.000000000,-394000.000000000,2.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"solute",94.491400000,-6789.040000000,-11.451900000,-0.010454000,0.000000000,0.000000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,5.204412066,216.580000000,216.592000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.100000000,0.881738930,-0.856255022,3.094939327,0.000000000,0.000000000,0.000000000,1.413601068,-0.605965449,1.101814948,1,"1A",0.000000000,0.000000000,0.300000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,6.812280000,-1301.679000000,-3.494000000,26100,0.000037687,4.856e-11,7196.900000000,0.098620000,2343.900000000,0.000060820,3417.900000000,0.168300000,2317.900000000,"yes",1.309700000,3.250700000,92.150000000,0.000000000,0.000000000,2.340000000,168.770000000,0.680500000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -127,"methanolPVTsim","74-82-8","alcohol",127,"CH4O",32.042000000,0.797000000,239.450000000,80.960000000,0.559000000,64.550000000,32.042000000,99.000000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",-8.547960000,0.769820000,-3.108500000,1.544810000,0.000000000,1.700000000,0.215000000,0.200000000,0.000000000,3.626000000,481.800000000,0.000000000,3,-39.350000000,4826.000000000,0.109100000,-0.000113000,57900.000000000,-19.290500000,29814.500000000,-0.019678000,0.013189000,0.031144000,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,-0.384000000,0.005250000,-0.000006370,0.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.797000000,1.437100000,-0.799420000,0.327800000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2,"2B",0.000000000,0.000000000,0.016100000,24591.000000000,40531.000000000,3.097800000,0.431020000,47052.000000000,3.300000000,0.903700000,0.044900000,1,17.387107060,-7582.406220000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",1.525500000,3.230000000,188.900000000,0.035176000,24106.443000000,3.626000000,481.800000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000 -128,"MEGPVTsim18","74-82-8","glycol",128,"C2H6O2",62.069000000,1.117000000,446.850000000,90.000000000,0.534700000,197.350000000,62.069000000,186.000000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"exp",13.629900000,6022.180000000,-28.250000000,0.000000000,0.000000000,2.308200000,0.215000000,0.248800000,0.000000000,3.626000000,481.800000000,0.000000000,2,-7.811000000,3140.000000000,0.000000000,0.000000000,57900.000000000,-19.290500000,29814.500000000,-0.019678000,0.013189000,0.031144000,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.654009012,-3.955117195,3.671191916,0.517338954,-0.000798169,0.000000064,0.000000000,9960.000000000,904.000000000,0.000002420,260.000000000,260.000000000,-388000.000000000,324.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,82900000.0000000,0.427000000,0.000000000,0.000000000,0.000000000,1.117000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,4,"4C",0.000000000,0.000000000,0.014100000,19752.000000000,108190.000000000,5.140000000,0.674400000,108190.000000000,5.140000000,0.674400000,0.051400000,1,17.090887000,-7800.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,3.626000000,481.800000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000 -129,"MEGPVTsim19","74-82-8","glycol",129,"C2H6O2",62.069000000,1.117000000,446.850000000,90.000000000,0.534700000,197.350000000,62.069000000,186.000000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"exp",13.629900000,6022.180000000,-28.250000000,0.000000000,0.000000000,2.308200000,0.215000000,0.248800000,0.000000000,3.626000000,481.800000000,0.000000000,2,-7.811000000,3140.000000000,0.000000000,0.000000000,57900.000000000,-19.290500000,29814.500000000,-0.019678000,0.013189000,0.031144000,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.654009012,-3.955117195,3.671191916,0.517338954,-0.000798169,0.000000064,0.000000000,9960.000000000,904.000000000,0.000002420,260.000000000,260.000000000,-388000.000000000,324.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,82900000.0000000,0.427000000,0.000000000,0.000000000,0.000000000,1.117000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,4,"4C",0.000000000,0.000000000,0.014100000,19752.000000000,108190.000000000,5.140000000,0.674400000,108190.000000000,5.140000000,0.674400000,0.051400000,1,17.090887000,-7800.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,3.626000000,481.800000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000 -130,"propanePVTsim","74-82-8","HC",130,"CH4O",44.097000000,0.000000000,96.650000000,42.460000000,0.152000000,-42.050000000,44.097000000,203.000000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",59.078000000,-3492.600000000,-6.066900000,0.000010919,2.000000000,0.000000000,0.000000000,0.000000000,0.000000000,3.320577362,205.885946142,0.662379685,3,-7.764000000,722.000000000,0.023800000,-0.000046700,-24400.000000000,2.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"solute",0.000000000,0.000000000,0.000000000,0.000000000,-0.015069991,-4.344143673,4.007325591,-0.384000000,0.005250000,-0.000006370,151.900000000,6000.000000000,1000.000000000,0.000000001,85.470000000,85.500000000,-103840.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.100000000,0.721211486,-0.099216642,0.181829227,0.000000000,0.000000000,0.000000000,0.435825883,0.866132179,1.395432818,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,5.248690000,1,1.000000000,-11.125400000,0.000000000,28500,0.000024973,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.008264000,4521.000000000,"yes",2.002000000,3.618400000,208.110000000,0.000000000,0.000000000,3.320577362,205.885946142,0.662379685,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,151.900000000 -131,"ethanolPVTsim","74-82-8","alcohol",131,"CH4O",46.069220000,0.797000000,240.750000000,61.400000000,0.644000000,64.550000000,32.042000000,99.000000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",-8.547960000,0.769820000,-3.108500000,1.544810000,0.000000000,1.700000000,0.215000000,0.000000000,0.000000000,3.626000000,481.800000000,0.000000000,3,-39.350000000,4826.000000000,0.109100000,-0.000113000,57900.000000000,-19.290500000,29814.500000000,-0.019678000,0.013189000,0.031144000,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,-0.384000000,0.005250000,-0.000006370,0.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.797000000,1.437100000,-0.799420000,0.327800000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2,"2B",0.000000000,0.000000000,0.008000000,21500.000000000,85164.000000000,4.910000000,0.750200000,47052.000000000,3.300000000,0.903700000,0.044900000,1,17.387107060,-7582.406220000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",2.382700000,3.177100000,198.240000000,0.032380000,22060.367600000,3.626000000,481.800000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000 -132,"nbutanePVTsim","74-82-8","HC",132,"C4H10",58.124000000,0.000000000,152.050000000,37.996880000,0.193000000,-0.450000000,58.124000000,255.000000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",66.343000000,-4363.200000000,-7.046000000,0.000009450,2.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2.912500000,209.000000000,0.937900000,2,-7.811000000,3140.000000000,0.000000000,0.000000000,-394370.000000000,-19.290500000,29814.500000000,-0.019678000,0.013189000,0.031144000,0,"solute",0.000000000,0.000000000,0.000000000,0.000000000,-0.018486492,-4.921574519,4.858186966,-0.384000000,0.005250000,-0.000006370,191.700000000,6000.000000000,1000.000000000,0.000006762,134.860000000,138.150000000,-126150.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.100000000,0.808063555,-0.212724945,0.362961475,0.000000000,0.000000000,0.000000000,0.331800583,0.854692733,1.865828858,0,"0",0.000000000,0.000000000,0.008000000,21532.010000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,5.764470000,1,1.000000000,-13.438500000,0.000000000,35900,0.000025768,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.001262000,4580.000000000,"yes",2.331600000,3.708600000,222.860000000,0.000000000,0.000000000,2.912500000,209.000000000,0.937900000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,191.700000000 -133,"mercury","7439-97-6","other",133,"Hg",200.600000000,13.500000000,1462.000000000,1608.000000000,-0.164500000,356.600000000,200.600000000,56.350000000,"Classic",0.000000000,20.800000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",-6.000000000,1.000000000,-0.300000000,-1.223000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1.200000000,132.000000000,0.383400000,3,-24.000000000,1122.000000000,0.200000000,0.000000000,-50000.000000000,2.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"solute",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2295.000000000,1000.000000000,0.000039662,234.300000000,234.300000000,0.000000000,0.000000000,0.069794107,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.990000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.092450000,0.978400000,2.244000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,8.046000000,-4600.000000000,-144.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1.200000000,132.000000000,0.383400000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.149100000,-0.165200000,0.144700000,0.000000000 -134,"propylbenzene","103-65-1","HC",134,"C9H12",106.168000000,0.871000000,365.230000000,36.090000000,0.304000000,58.050000000,86.178000000,358.000000000,"Classic",0.000000000,39.566326000,0.199170184,0.000985957,-0.000001446,5.8730096e-10,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.000000001,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,348210.000000000,12.685000000,0.911700000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",3.079900000,3.797400000,287.350000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -136,"NaCl","0-0-0-0","NaCl",136,"H2O",58.442768096,0.999000000,375.150000000,220.890000000,0.344000000,100.000000000,58.443000000,56.000000000,"Classic",29500.000000000,-2290.000000000,12.780000000,-0.021440000,0.000000000,0.000000000,"log10",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.235662374,0.000000000,2.520000000,809.100000000,0.000000000,3,-57.710000000,7647.000000000,0.144200000,-0.000135700,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solute",0.000000000,0.000000000,0.000000000,0.000000000,0.054783425,0.094678512,-2.267329403,-0.384000000,0.005250000,-0.000006370,207.000000000,6010.000000000,1000.000000000,0.006110000,273.160000000,273.150000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,1.087000000,-0.638000000,0.635000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,4,"4C",0.000000000,0.000000000,0.069200000,166550.000000000,12277.000000000,1.451500000,0.673590000,13855.596960000,1.456360879,0.664155324,0.046473789,1,17.387107060,-6141.762746000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",1.065600000,3.000700000,366.510000000,0.034868000,20790.819800000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -137,"CaCl2","74-82-8","CaCl2",137,"H2O",110.984800000,0.999000000,375.150000000,220.890000000,0.344000000,100.000000000,110.984800000,56.000000000,"Classic",66053.900000000,-1550.000000000,7.220000000,-0.001958000,0.000000000,0.000000000,"log10",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.235662374,0.000000000,2.520000000,809.100000000,0.000000000,3,-57.710000000,7647.000000000,0.144200000,-0.000135700,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solute",0.000000000,0.000000000,0.000000000,0.000000000,0.054783425,0.094678512,-2.267329403,-0.384000000,0.005250000,-0.000006370,207.000000000,6010.000000000,1000.000000000,0.006110000,273.160000000,273.150000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,1.087000000,-0.638000000,0.635000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,4,"4C",0.000000000,0.000000000,0.069200000,166550.000000000,12277.000000000,1.451500000,0.673590000,13855.596960000,1.456360879,0.664155324,0.046473789,1,17.387107060,-6141.762746000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",1.065600000,3.000700000,366.510000000,0.034868000,20790.819800000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -139,"SF6","74-82-8","inert",139,"SF6",146.000000000,1.100000000,45.850000000,37.600000000,0.210000000,-68.250000000,34.080000000,98.500000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",-6.956260000,1.196950000,-3.126140000,2.994480000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,3.620000000,195.200000000,0.000000000,2,-7.811000000,3140.000000000,0.000000000,0.000000000,-394000.000000000,2.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"solute",0.000000000,0.000000000,0.000000000,0.059565000,0.018570000,0.000000000,-2.078000000,-0.384000000,0.005250000,-0.000006370,80.100000000,6000.000000000,1000.000000000,0.232000000,187.660000000,187.660000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.100000000,0.825200000,0.251500000,-1.703900000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2,"2A",0.000000000,0.000000000,0.001160489,5000.000000000,44505.000000000,2.850000000,0.602650000,0.000000000,0.000000000,0.000000000,0.000000000,1,4.436810000,-829.439000000,-25.412000000,0,0.000000000,0.009928000,2999.000000000,0.016130000,3737.000000000,0.000268400,4242.000000000,0.855300000,2325.000000000,"yes",1.694100000,3.021400000,226.790000000,0.000000000,0.000000000,3.941000000,195.200000000,0.000000000,1.000000000,0,4119.560000000,0.004000000,3141.600000000,0.295855000,2936.130000000,0.001244960,2778.000000000,0.339898000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,80.100000000 -140,"R12","74-82-8","inert",140,"SF6",121.000000000,1.100000000,111.850000000,41.400000000,0.176000000,-30.150000000,34.080000000,98.500000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",-6.956260000,1.196950000,-3.126140000,2.994480000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,3.620000000,195.200000000,0.000000000,2,-7.811000000,3140.000000000,0.000000000,0.000000000,-394000.000000000,2.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"solute",0.000000000,0.000000000,0.000000000,0.059565000,0.018570000,0.000000000,-2.078000000,-0.384000000,0.005250000,-0.000006370,80.100000000,6000.000000000,1000.000000000,0.232000000,187.660000000,187.660000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.100000000,0.825200000,0.251500000,-1.703900000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2,"2A",0.000000000,0.000000000,0.001160489,5000.000000000,44505.000000000,2.850000000,0.602650000,0.000000000,0.000000000,0.000000000,0.000000000,1,4.436810000,-829.439000000,-25.412000000,0,0.000000000,0.009928000,2999.000000000,0.016130000,3737.000000000,0.000268400,4242.000000000,0.855300000,2325.000000000,"yes",1.694100000,3.021400000,226.790000000,0.000000000,0.000000000,3.941000000,195.200000000,0.000000000,1.000000000,0,4119.560000000,0.004000000,3141.600000000,0.295855000,2936.130000000,0.001244960,2778.000000000,0.339898000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,80.100000000 -141,"R134a","74-82-8","inert",141,"SF6",102.000000000,1.100000000,100.850000000,40.700000000,0.332000000,-26.550000000,34.080000000,98.500000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",-6.956260000,1.196950000,-3.126140000,2.994480000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,3.620000000,195.200000000,0.000000000,2,-7.811000000,3140.000000000,0.000000000,0.000000000,-394000.000000000,2.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"solute",0.000000000,0.000000000,0.000000000,0.059565000,0.018570000,0.000000000,-2.078000000,-0.384000000,0.005250000,-0.000006370,80.100000000,6000.000000000,1000.000000000,0.232000000,187.660000000,187.660000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.100000000,0.825200000,0.251500000,-1.703900000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2,"2A",0.000000000,0.000000000,0.001160489,5000.000000000,44505.000000000,2.850000000,0.602650000,0.000000000,0.000000000,0.000000000,0.000000000,1,4.436810000,-829.439000000,-25.412000000,0,0.000000000,0.009928000,2999.000000000,0.016130000,3737.000000000,0.000268400,4242.000000000,0.855300000,2325.000000000,"yes",1.694100000,3.021400000,226.790000000,0.000000000,0.000000000,3.941000000,195.200000000,0.000000000,1.000000000,0,4119.560000000,0.004000000,3141.600000000,0.295855000,2936.130000000,0.001244960,2778.000000000,0.339898000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,80.100000000 -142,"COS","74-82-8","inert",142,"COS",60.075100000,1.100000000,105.650000000,63.490000000,0.097011900,-191.500000000,44.010000000,94.000000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",140.540000000,-4735.000000000,-21.268000000,0.040909000,1.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2.340000000,168.770000000,0.680500000,2,-7.811000000,3140.000000000,0.000000000,0.000000000,-394000.000000000,2.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"solute",94.491400000,-6789.040000000,-11.451900000,-0.010454000,0.000000000,0.000000000,0.000000000,-0.384000000,0.005250000,-0.000006370,78.000000000,9018.969300000,1000.000000000,5.185000000,216.580000000,216.592000000,-393500.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.100000000,0.881738930,-0.856255022,3.094939327,0.000000000,0.000000000,0.000000000,1.413601068,-0.605965449,1.101814948,2,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,6.812280000,-1301.679000000,-3.494000000,26100,0.000037687,4.856e-11,7470.000000000,0.098620000,2617.000000000,0.000060820,3691.000000000,0.168300000,2591.000000000,"yes",1.309700000,3.250700000,92.150000000,0.000000000,0.000000000,3.037207160,170.162382832,0.684633880,1.000000000,0,2119.560000000,0.000758596,2500.000000000,0.231198000,2419.560000000,0.007244960,2330.000000000,0.139898000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,78.000000000 -143,"2-M-C7","592-27-8","HC",143,"C8H18",114.230000000,0.422182073,286.490000000,24.845000000,0.376900000,117.700000000,16.043000000,99.000000000,"Classic",68310.700000000,43.706698000,0.342437032,0.000809700,-0.000001304,5.462298e-10,"log",39.205000000,-1324.400000000,-3.436600000,0.000031019,2.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2.520000000,155.809006022,0.406998625,3,-26.870000000,1150.000000000,0.187000000,-0.000521000,-50500.000000000,2.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"solute",900.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.303000000,-0.000605000,-0.000003200,77.300000000,941.000000000,452.000000000,0.116656057,90.690000000,90.650000000,-74520.000000000,186.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,10200000.0000000,0.261000000,-0.147000000,0.222000000,0.000000000,0.100000000,0.585700000,-0.720600000,1.289900000,0.000000000,0.000000000,0.000000000,0.122841598,0.914470789,2.741978611,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,4.186260000,1,1.000000000,-6.680820000,0.000000000,9700,0.000015293,0.047920000,1594.000000000,0.012440000,2952.000000000,0.002317000,2777.000000000,1.076000000,1323.000000000,"yes",1.000000000,3.703900119,150.029998779,0.000000000,0.000000000,3.190710941,155.809006022,0.406998625,1.000000000,0,900.000000000,0.000621000,2760.000000000,0.421000000,1963.100000000,0.004048680,2636.750000000,0.295270000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.932700000,-0.215400000,0.774700000,77.300000000 -144,"M-cy-C6","108-87-2","HC",144,"C7H14",98.190000000,0.422182073,299.040000000,34.714000000,0.235000000,100.900000000,16.043000000,99.000000000,"Classic",57151.100000000,26.172472000,0.153293532,0.001132699,-0.000001562,6.1224296e-10,"log",39.205000000,-1324.400000000,-3.436600000,0.000031019,2.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2.520000000,155.809006022,0.406998625,3,-26.870000000,1150.000000000,0.187000000,-0.000521000,-50500.000000000,2.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"solute",900.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.303000000,-0.000605000,-0.000003200,77.300000000,941.000000000,452.000000000,0.116656057,90.690000000,90.650000000,-74520.000000000,186.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,10200000.0000000,0.261000000,-0.147000000,0.222000000,0.000000000,0.100000000,0.585700000,-0.720600000,1.289900000,0.000000000,0.000000000,0.000000000,0.122841598,0.914470789,2.741978611,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,4.186260000,1,1.000000000,-6.680820000,0.000000000,9700,0.000015293,0.047920000,1594.000000000,0.012440000,2952.000000000,0.002317000,2777.000000000,1.076000000,1323.000000000,"yes",1.000000000,3.703900119,150.029998779,0.000000000,0.000000000,3.190710941,155.809006022,0.406998625,1.000000000,0,900.000000000,0.000621000,2760.000000000,0.421000000,1963.100000000,0.004048680,2636.750000000,0.295270000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.716190000,-0.020430000,0.339640000,77.300000000 -145,"i-p-cy-C5","3875-51-2","HC",145,"C8H16",112.220000000,0.422182073,320.100000000,30.408000000,0.302900000,126.400000000,16.043000000,99.000000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",39.205000000,-1324.400000000,-3.436600000,0.000031019,2.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2.520000000,155.809006022,0.406998625,3,-26.870000000,1150.000000000,0.187000000,-0.000521000,-50500.000000000,2.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"solute",900.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.303000000,-0.000605000,-0.000003200,77.300000000,941.000000000,452.000000000,0.116656057,90.690000000,90.650000000,-74520.000000000,186.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,10200000.0000000,0.261000000,-0.147000000,0.222000000,0.000000000,0.100000000,0.585700000,-0.720600000,1.289900000,0.000000000,0.000000000,0.000000000,0.122841598,0.914470789,2.741978611,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,4.186260000,1,1.000000000,-6.680820000,0.000000000,9700,0.000015293,0.047920000,1594.000000000,0.012440000,2952.000000000,0.002317000,2777.000000000,1.076000000,1323.000000000,"yes",1.000000000,3.703900119,150.029998779,0.000000000,0.000000000,3.190710941,155.809006022,0.406998625,1.000000000,0,900.000000000,0.000621000,2760.000000000,0.421000000,1963.100000000,0.004048680,2636.750000000,0.295270000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.617780000,0.843540000,-1.066370000,77.300000000 -146,"cis-12-DM-cy-C6","2207-01-4","HC",146,"C",112.220000000,0.422182073,333.000000000,29.384000000,0.232400000,129.700000000,16.043000000,99.000000000,"Classic",66909.600000000,-68.400000000,0.897300000,-0.000513700,0.000000109,0.000000000,"log",39.205000000,-1324.400000000,-3.436600000,0.000031019,2.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2.520000000,155.809006022,0.406998625,3,-26.870000000,1150.000000000,0.187000000,-0.000521000,-50500.000000000,2.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"solute",900.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.303000000,-0.000605000,-0.000003200,77.300000000,941.000000000,452.000000000,0.116656057,90.690000000,90.650000000,-74520.000000000,186.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,10200000.0000000,0.261000000,-0.147000000,0.222000000,0.000000000,0.100000000,0.585700000,-0.720600000,1.289900000,0.000000000,0.000000000,0.000000000,0.122841598,0.914470789,2.741978611,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,4.186260000,1,1.000000000,-6.680820000,0.000000000,9700,0.000015293,0.047920000,1594.000000000,0.012440000,2952.000000000,0.002317000,2777.000000000,1.076000000,1323.000000000,"yes",1.000000000,3.703900119,150.029998779,0.000000000,0.000000000,3.190710941,155.809006022,0.406998625,1.000000000,0,900.000000000,0.000621000,2760.000000000,0.421000000,1963.100000000,0.004048680,2636.750000000,0.295270000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.628820000,0.701140000,-0.784370000,77.300000000 -147,"234-TM-C5","565-75-3","HC",147,"C8H18",114.230000000,0.422182073,293.150000000,27.300000000,0.316100000,113.500000000,16.043000000,99.000000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",39.205000000,-1324.400000000,-3.436600000,0.000031019,2.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2.520000000,155.809006022,0.406998625,3,-26.870000000,1150.000000000,0.187000000,-0.000521000,-50500.000000000,2.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"solute",900.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.303000000,-0.000605000,-0.000003200,77.300000000,941.000000000,452.000000000,0.116656057,90.690000000,90.650000000,-74520.000000000,186.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,10200000.0000000,0.261000000,-0.147000000,0.222000000,0.000000000,0.100000000,0.585700000,-0.720600000,1.289900000,0.000000000,0.000000000,0.000000000,0.122841598,0.914470789,2.741978611,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,4.186260000,1,1.000000000,-6.680820000,0.000000000,9700,0.000015293,0.047920000,1594.000000000,0.012440000,2952.000000000,0.002317000,2777.000000000,1.076000000,1323.000000000,"yes",1.000000000,3.703900119,150.029998779,0.000000000,0.000000000,3.190710941,155.809006022,0.406998625,1.000000000,0,900.000000000,0.000621000,2760.000000000,0.421000000,1963.100000000,0.004048680,2636.750000000,0.295270000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.851190000,-0.242120000,0.782340000,77.300000000 -148,"1,2-DM-cyC5","74-82-8","HC",148,"C",98.000000000,0.871000000,280.000000000,34.450000000,0.269800000,58.050000000,86.178000000,358.000000000,"Classic",57150.400000000,-54.500000000,0.759200000,-0.000448000,0.000000101,0.000000000,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,348210.000000000,12.685000000,0.911700000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",3.079900000,3.797400000,287.350000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.795360000,-0.299230000,0.780210000,207.000000000 -149,"1,3-dDM-cyC5","74-82-8","HC",149,"C",98.000000000,0.871000000,283.320000000,34.370000000,0.271000000,58.050000000,86.178000000,358.000000000,"Classic",57150.400000000,-5.750000000,0.553000000,-0.000222000,0.000000000,0.000000000,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,348210.000000000,12.685000000,0.911700000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",3.079900000,3.797400000,287.350000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.798170000,-0.320050000,0.805530000,207.000000000 -150,"1,cis-2,trans-4-TMcyC5","4850-28-6","HC",150,"C",112.000000000,0.871000000,309.060000000,28.540000000,0.265000000,116.700000000,86.178000000,358.000000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,348210.000000000,12.685000000,0.911700000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",3.079900000,3.797400000,287.350000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.634030000,0.761470000,-0.912740000,207.000000000 -151,"2,3-DM-C6","584-94-1","HC",151,"C",114.230000000,0.871000000,290.250000000,26.300000000,0.347200000,115.600000000,86.178000000,358.000000000,"Classic",0.000000000,-29.880516000,0.839572662,-0.000405723,-0.000000028,6.559746e-11,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,348210.000000000,12.685000000,0.911700000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",3.079900000,3.797400000,287.350000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.896210000,-0.274640000,0.890890000,207.000000000 -152,"3-M-C8","2216-33-3","HC",152,"C",106.168000000,0.871000000,365.230000000,36.090000000,0.304000000,144.200000000,86.178000000,358.000000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,348210.000000000,12.685000000,0.911700000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",3.079900000,3.797400000,287.350000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -153,"2,2-DM-C7","1071-26-7","HC",153,"C",128.260000000,0.871000000,303.650000000,23.500000000,0.389900000,132.700000000,86.178000000,358.000000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,348210.000000000,12.685000000,0.911700000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",3.079900000,3.797400000,287.350000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -154,"2,6-DM-C7","1072-05-5","HC",154,"C",128.260000000,0.871000000,305.850000000,23.000000000,0.392700000,135.200000000,86.178000000,358.000000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,348210.000000000,12.685000000,0.911700000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",3.079900000,3.797400000,287.350000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -155,"1,1,3-TM-cy-C6","3073-66-3","HC",155,"C",126.240000000,0.871000000,338.910000000,28.750000000,0.267000000,136.600000000,86.178000000,358.000000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,348210.000000000,12.685000000,0.911700000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",3.079900000,3.797400000,287.350000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -156,"1,2,3-TMcyC6","2","HC",156,"C",126.000000000,0.871000000,348.160000000,27.400000000,0.290000000,142.000000000,86.178000000,358.000000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,348210.000000000,12.685000000,0.911700000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",3.079900000,3.797400000,287.350000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -157,"4-M-C8","2216-34-4","HC",157,"C",128.260000000,0.871000000,314.500000000,23.406000000,0.413000000,142.400000000,86.178000000,358.000000000,"Classic",78069.200000000,12.300000000,0.755100000,-0.000290000,0.000000000,0.000000000,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,348210.000000000,12.685000000,0.911700000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",3.079900000,3.797400000,287.350000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -158,"o-E-toluene","74-82-8","HC",158,"C",120.000000000,0.871000000,378.000000000,30.397000000,0.293200000,58.050000000,86.178000000,358.000000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,348210.000000000,12.685000000,0.911700000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",3.079900000,3.797400000,287.350000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -159,"1,2,3-TM-Benzene","526-73-8","HC",159,"CH4",120.190000000,0.871000000,391.380000000,34.540000000,0.366400000,176.100000000,86.178000000,358.000000000,"Classic",72460.500000000,33.605188000,0.258997728,0.000846780,-0.000001352,5.7549508e-10,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,348210.000000000,12.685000000,0.911700000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",3.079900000,3.797400000,287.350000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.916460000,-0.128040000,0.269930000,207.000000000 -160,"cy-C9","293-55-0","HC",160,"C",126.240000000,0.871000000,408.890000000,33.440000000,0.268000000,178.400000000,86.178000000,358.000000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,348210.000000000,12.685000000,0.911700000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",3.079900000,3.797400000,287.350000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -161,"2-E-p-xylene","1758-88-9","HC",161,"C",134.000000000,0.871000000,389.850000000,28.800000000,0.411400000,186.800000000,86.178000000,358.000000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,348210.000000000,12.685000000,0.911700000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",3.079900000,3.797400000,287.350000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -162,"nC5-Benzene","74-82-8","HC",162,"C",148.250000000,0.871000000,406.800000000,26.060000000,0.437600000,478.610000000,86.178000000,358.000000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,348210.000000000,12.685000000,0.911700000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",3.079900000,3.797400000,287.350000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -163,"nC6-Benzene","74-82-8","HC",163,"C",162.000000000,0.871000000,424.350000000,23.800000000,0.480000000,58.050000000,86.178000000,358.000000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,348210.000000000,12.685000000,0.911700000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",3.079900000,3.797400000,287.350000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -164,"nC7-Benzene","74-82-8","HC",164,"C",176.000000000,0.871000000,440.850000000,21.800000000,0.528700000,58.050000000,86.178000000,358.000000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,348210.000000000,12.685000000,0.911700000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",3.079900000,3.797400000,287.350000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -165,"nC10-cy-C5","74-82-8","HC",165,"C",210.400000000,0.871000000,459.230000000,17.090000000,0.631400000,58.050000000,86.178000000,358.000000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,348210.000000000,12.685000000,0.911700000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",3.079900000,3.797400000,287.350000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1.301270000,-0.291030000,1.099920000,207.000000000 -166,"nC8-Benzene","74-82-8","HC",166,"C",190.000000000,0.871000000,455.000000000,20.340000000,0.590900000,58.050000000,86.178000000,358.000000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,348210.000000000,12.685000000,0.911700000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",3.079900000,3.797400000,287.350000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -167,"nC9-Benzene","74-82-8","HC",167,"C",204.000000000,0.871000000,467.700000000,18.960000000,0.652300000,58.050000000,86.178000000,358.000000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,348210.000000000,12.685000000,0.911700000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",3.079900000,3.797400000,287.350000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -168,"3-M-4,4-DE-heptane","3","HC",168,"C",170.300000000,0.871000000,380.360000000,18.220000000,0.461000000,204.000000000,86.178000000,358.000000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,348210.000000000,12.685000000,0.911700000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",3.079900000,3.797400000,287.350000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -169,"nC12-cy-C5","74-82-8","HC",169,"C",238.460000000,0.871000000,485.740000000,15.198000000,0.716300000,58.050000000,86.178000000,358.000000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,348210.000000000,12.685000000,0.911700000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",3.079900000,3.797400000,287.350000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -170,"nC10-Benzene","74-82-8","HC",170,"C",218.000000000,0.871000000,479.850000000,17.700000000,0.681200000,58.050000000,86.178000000,358.000000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,348210.000000000,12.685000000,0.911700000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",3.079900000,3.797400000,287.350000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -171,"nC14-cy-C5","74-82-8","HC",171,"C",266.510000000,0.871000000,509.190000000,13.685000000,0.794900000,58.050000000,86.178000000,358.000000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,348210.000000000,12.685000000,0.911700000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",3.079900000,3.797400000,287.350000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -172,"nC17-cy-C5","74-82-8","HC",172,"C",308.590000000,0.871000000,538.010000000,11.906000000,0.906000000,58.050000000,86.178000000,358.000000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,348210.000000000,12.685000000,0.911700000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",3.079900000,3.797400000,287.350000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -173,"nC27","593-49-7","HC",173,"C",380.000000000,0.871000000,563.150000000,9.750000000,0.881300000,422.100000000,86.178000000,358.000000000,"Classic",253722.100000000,-22.400000000,2.570000000,-0.001448000,0.000000316,0.000000000,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,2.151136109,-1.467770498,1.172942447,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,348210.000000000,12.685000000,0.911700000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",3.079900000,3.797400000,287.350000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -174,"nC34","1","HC",174,"C",478.000000000,0.871000000,587.500000000,5.430000000,1.435000000,482.000000000,86.178000000,358.000000000,"Classic",322031.500000000,-28.400000000,3.233000000,-0.001827000,0.000000400,0.000000000,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,2.675042510,-2.391792157,1.403453500,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,348210.000000000,12.685000000,0.911700000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",3.079900000,3.797400000,287.350000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -175,"nC39","74-82-8","HC",175,"C",548.000000000,0.871000000,638.850000000,8.210000000,1.088900000,58.050000000,86.178000000,358.000000000,"Classic",370824.000000000,-32.700000000,3.706000000,-0.002098000,0.000000460,0.000000000,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,2.806629230,-2.653605683,1.459756561,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,348210.000000000,12.685000000,0.911700000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",3.079900000,3.797400000,287.350000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -176,"1,2,4-TMcyC6","74-82-8","HC",176,"C",126.000000000,0.871000000,340.600000000,26.750000000,0.261900000,58.050000000,86.178000000,358.000000000,"Classic",0.000000000,32.239000000,0.001910000,0.000010600,-0.000000003,0.000000000,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,348210.000000000,12.685000000,0.911700000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",3.079900000,3.797400000,287.350000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -177,"nC30","638-68-6","HC",177,"C30H62",422.800000000,0.871000000,589.900000000,8.680000000,1.307000000,449.700000000,86.178000000,358.000000000,"Classic",282997.500000000,-25.000000000,2.854000000,-0.001610000,0.000000352,0.000000000,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,2.434590893,-1.943459444,1.298957460,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,348210.000000000,12.685000000,0.911700000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",3.079900000,3.797400000,287.350000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -178,"1-propanol","71-23-8","alcohol",178,"CH4O",60.096000000,0.803000000,263.630000000,51.749700000,0.621800000,64.550000000,60.096000000,99.000000000,"Classic",20891.500000000,36.548344000,0.005221192,0.000461094,-0.000000583,2.232309e-10,"log",-8.547960000,0.769820000,-3.108500000,1.544810000,0.000000000,1.700000000,0.215000000,0.000000000,0.000000000,3.626000000,481.800000000,0.000000000,3,-39.350000000,4826.000000000,0.109100000,-0.000113000,57900.000000000,-19.290500000,29814.500000000,-0.019678000,0.013189000,0.031144000,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,-0.384000000,0.005250000,-0.000006370,0.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.797000000,1.437100000,-0.799420000,0.327800000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2,"2B",0.000000000,0.000000000,0.008100000,21000.000040000,119102.004700000,6.411000000,0.917090000,47052.000000000,3.300000000,0.903700000,0.044900000,1,17.387107060,-7582.406220000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",2.382700000,3.177100000,198.240000000,0.032380000,22060.367600000,3.626000000,481.800000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000 -179,"i-propanol","67-63-0","alcohol",179,"CH4O",60.096000000,0.797000000,235.150000000,47.619700000,0.667700000,64.550000000,32.042000000,99.000000000,"Classic",20891.500000000,36.548344000,0.005221192,0.000461094,-0.000000583,2.232309e-10,"log",-8.547960000,0.769820000,-3.108500000,1.544810000,0.000000000,1.700000000,0.215000000,0.000000000,0.000000000,3.626000000,481.800000000,0.000000000,3,-39.350000000,4826.000000000,0.109100000,-0.000113000,57900.000000000,-19.290500000,29814.500000000,-0.019678000,0.013189000,0.031144000,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,-0.384000000,0.005250000,-0.000006370,0.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.797000000,1.437100000,-0.799420000,0.327800000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2,"2B",0.000000000,0.000000000,0.009100000,21000.000040000,106018.994500000,6.411000000,0.946800000,47052.000000000,3.300000000,0.903700000,0.044900000,1,17.387107060,-7582.406220000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",2.382700000,3.177100000,198.240000000,0.032380000,22060.367600000,3.626000000,481.800000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000 -180,"c-C4","287-23-0","HC",180,"C4H8",56.108000000,0.669000000,186.750000000,49.850000000,0.209000000,12.550000000,56.108000000,210.000000000,"Classic",27875.600000000,-50.300000000,0.502400000,0.502400000,-0.000001803,6.829951e-10,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,203.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.011610000,5479.000000000,"no",2.365500000,3.711400000,265.830000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.654610000,0.025740000,0.192520000,203.000000000 -181,"33-DM-C6","563-16-6","HC",181,"C8H18",114.232002258,0.712800000,288.870019531,26.536201171,0.326000005,111.972009277,114.232002258,443.000000000,"Classic",58553.600000000,-3.990720000,0.610372310,-0.000061523,-0.000000296,1.5148108e-10,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -182,"n-Bcychexane","1678-93-9","HC",182,"C10H20",140.268005371,0.801400000,393.889001464,31.508701171,0.361990004,180.981011962,140.268005371,534.100000000,"Classic",58553.600000000,-3.990720000,0.610372310,-0.000061523,-0.000000296,1.5148108e-10,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -183,"Pent-CC6","4292-92-6","HC",183,"C11H22",154.300003051,0.806800000,400.850000000,23.300000000,0.412999004,203.748010253,154.300003051,584.500000000,"Classic",58553.600000000,-3.990720000,0.610372310,-0.000061523,-0.000000296,1.5148108e-10,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -184,"nC25","629-99-2","HC",184,"C25H52",352.680000000,0.871000000,583.850000000,9.500000000,1.105300000,402.000000000,86.178000000,358.000000000,"Classic",0.000000000,-46.500000000,0.309000000,0.002870000,-0.000000709,0.000000000,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,2.102220000,-1.391760000,1.150870000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,348210.000000000,12.685000000,0.911700000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",3.079900000,3.797400000,287.350000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -185,"nC26","630-01-3","HC",185,"C26H54",366.707000000,0.871000000,545.850000000,9.100000000,1.154400000,412.000000000,86.178000000,358.000000000,"Classic",0.000000000,-49.600000000,0.315000000,0.002870000,-0.000000710,0.000000000,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,2.185710000,-1.522600000,1.188490000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,348210.000000000,12.685000000,0.911700000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",3.079900000,3.797400000,287.350000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -186,"nC28","630-02-4","HC",186,"C28H58",394.769000000,0.871000000,558.850000000,8.500000000,1.237500000,431.000000000,86.178000000,358.000000000,"Classic",0.000000000,-55.000000000,0.324000000,0.002870000,-0.000000711,0.000000000,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,2.328469312,-1.758470734,1.252148750,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,348210.000000000,12.685000000,0.911700000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",3.079900000,3.797400000,287.350000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -187,"nC29","630-03-5","HC",187,"C29H60",408.800000000,0.871000000,562.550000000,6.918000000,1.200500000,431.000000000,86.178000000,358.000000000,"Classic",0.000000000,-55.000000000,0.324000000,0.002870000,-0.000000711,0.000000000,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,2.264748174,-1.651320047,1.223831870,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,348210.000000000,12.685000000,0.911700000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",3.079900000,3.797400000,287.350000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -1116,"Hg++","74-82-8","ion",116,"Hg++",55.850000000,0.797000000,444.150000000,290.890000000,0.344000000,55.850000000,40.080000000,99.000000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",-8.547960000,0.769820000,-3.108500000,1.544810000,0.000000000,1.700000000,0.215000000,0.000000000,0.000000000,6.000000000,481.800000000,0.000000000,3,-39.350000000,4826.000000000,0.109100000,-0.000113000,-587000.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2,"solute",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.797000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,6.000000000,481.800000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,207.000000000 -1143,"glycerol","112-27-6","glycol",14,"C6H14O4",150.175000000,1.127000000,492.950000000,33.130000000,1.287400000,278.300000000,150.175000000,450.000000000,"Classic",93317.400000000,86.400000000,0.600800000,-0.000362200,0.000000072,0.000000000,"log",6.756800000,3715.222000000,-1.299000000,0.000000000,0.000000000,2.200000000,0.215000000,0.242773578,0.000000000,3.626000000,481.800000000,0.000000000,3,-53.925230000,9741.992000000,0.106066000,-0.000075802,-394370.000000000,-19.290500000,29814.500000000,-0.019678000,0.013189000,0.031144000,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.394142583,-0.000547836,0.000000000,358.332712000,15900.000000000,1000.000000000,0.006110000,268.250000000,268.250000000,-242000.000000000,189.000000000,8.890000000,-0.007840000,0.000000000,0.000000000,0.000000000,0.596600000,0.262270000,769.500000000,0.245500000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,1.127000000,1.376906087,1.788921526,-4.378737499,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,4,"4C",0.284542457,-0.004423604,0.025000000,14036.000000000,228000.000000000,7.060000000,1.180000000,391260.000000000,13.210000000,1.169200000,0.018800000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,3.626000000,481.800000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,153800.000000000,587.000000000,0.000000000,0.000000000,0.000000000,153800.000000000,587.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,358.332712000 -1151,"sulfur(S8)","74-82-8","other",101,"sulfur(S8)",256.480000000,0.990000000,885.000000000,63.000000000,0.205900000,444.600000000,256.480000000,449.500000000,"Classic",68312.100000000,89.990736000,0.041428662,0.001475818,-0.000001923,7.465972e-10,"log",5.201200000,1936.281000000,-20.143000000,1000.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,6.000000000,454.000000000,0.383400000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-50000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solute",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,-0.384000000,0.005250000,-0.000006370,351.000000000,12860.000000000,1000.000000000,0.000039662,392.750000000,392.750000000,0.000000000,0.000000000,12.000000000,1.000000000,1.000000000,1.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.990000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,8.046000000,-4600.000000000,-144.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1.200000000,132.000000000,0.383400000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,351.000000000 -1152,"seawater","7732-18-5","seawater",114,"H2O",18.015000000,0.999000000,374.150000000,220.890000000,0.344000000,100.000000000,18.015000000,56.000000000,"Classic",1374.600000000,28.686314623,-0.052108449,0.000091158,-0.000000101,0.000000000,"pow10",5.115640000,1687.537000000,230.170000000,0.000000000,0.000000000,1.800000000,0.076000000,0.231323566,0.000000000,2.520000000,809.100000000,0.000000000,3,-27.952757828,4665.225929930,0.052323342,-0.000038356,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.054783425,0.094678512,-2.267329403,-0.384000000,0.005250000,-0.000006370,52.878622600,6010.000000000,1000.000000000,0.006110000,273.160000000,273.150000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,5.459000000,0.305420000,647.130000000,0.081000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,1.087000000,-0.638000000,0.635000000,0.000000000,0.000000000,0.000000000,0.168272437,0.908482584,5.240427372,4,"4C",0.000000000,0.000000000,0.069200000,16655.000000000,12277.000000000,1.451500000,0.673590000,13855.596960000,1.456360879,0.664155324,0.046473789,1,17.387107060,-6141.762746000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",1.065600000,3.000700000,366.510000000,0.034868000,20790.819800000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,-262.490000000,140.520000000,0.000000000,0.000000000,0.000000000,276370.000000000,-2090.100000000,8.125000000,-0.014116000,0.000009370,0.923656000,-0.379370000,0.442429000,52.419867266 -1181,"naphthalene","91-20-3","HC",179,"C10H8",128.174000000,0.669000000,475.250000000,40.500000000,0.302000000,217.950000000,128.174000000,413.000000000,"Classic",27875.600000000,-50.300000000,0.502400000,0.502400000,-0.000001803,6.829951e-10,"log",-7.764510000,1.458380000,-2.775800000,-1.233030000,0.000000000,1.800000000,0.076000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,3,-24.710000000,4210.000000000,0.045300000,-0.000033800,-229000.000000000,-19.290500000,29814.500000000,-0.019678000,0.000132000,-0.000000311,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.078900000,-1.160000000,0.000000000,-0.384000000,0.005250000,-0.000006370,203.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.999000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,1,0.000000000,0.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.011610000,5479.000000000,"no",2.365500000,3.711400000,265.830000000,0.000000000,0.000000000,2.520000000,809.100000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.654610000,0.025740000,0.192520000,0.000000000 -1182,"MEA","141-43-5","amine",182,"MEA",61.083100000,1.038000000,364.850000000,68.700000000,0.796600000,170.850000000,61.083100000,99.000000000,"Classic",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"log",-8.547960000,0.769820000,-3.108500000,1.544810000,0.000000000,1.700000000,0.215000000,0.260355682,0.000000000,4.500000000,481.800000000,0.000000000,3,-75.190000000,12680.000000000,0.157300000,-0.000122500,57900.000000000,8.169760000,8989.300000000,0.000000000,0.000000000,0.000000000,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.521291873,-1.152080748,-0.013889882,-0.384000000,0.005250000,-0.000006370,207.000000000,6000.000000000,1000.000000000,0.006110000,273.000000000,273.000000000,-242000.000000000,189.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.797000000,2.298601539,-2.159763177,1.537096461,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,4,"4C",0.000000000,0.000000000,0.018008483,12276.382600000,342400.600100000,10.828737539,1.032854790,376276.884000000,10.783585850,1.258298307,0.000000000,1,17.387107060,1.762745870,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,4.500000000,481.800000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000 -1183,"trans-12-DM-cy-C6","6876-23-9","HC",147,"C",112.220000000,0.422182073,322.777001953,29.640000000,0.330400000,123.428000000,16.043000000,99.000000000,"Classic",66909.600000000,-68.400000000,0.897300000,-0.000513700,0.000000109,0.000000000,"log",39.205000000,-1324.400000000,-3.436600000,0.000031019,2.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2.520000000,155.809006022,0.406998625,3,-26.870000000,1150.000000000,0.187000000,-0.000521000,-50500.000000000,2.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"solute",900.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.303000000,-0.000605000,-0.000003200,77.300000000,941.000000000,452.000000000,0.116656057,90.690000000,90.650000000,-74520.000000000,186.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,10200000.0000000,0.261000000,-0.147000000,0.222000000,0.000000000,0.100000000,0.585700000,-0.720600000,1.289900000,0.000000000,0.000000000,0.000000000,0.122841598,0.914470789,2.741978611,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,4.186260000,1,1.000000000,-6.680820000,0.000000000,9700,0.000015293,0.047920000,1594.000000000,0.012440000,2952.000000000,0.002317000,2777.000000000,1.076000000,1323.000000000,"yes",1.000000000,3.703900119,150.029998779,0.000000000,0.000000000,3.190710941,155.809006022,0.406998625,1.000000000,0,900.000000000,0.000621000,2760.000000000,0.421000000,1963.100000000,0.004048680,2636.750000000,0.295270000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.628820000,0.701140000,-0.784370000,0.000000000 -1184,"cis-14-DM-cy-C6","624-29-3","HC",147,"C",112.220000000,0.422182073,325.000000000,29.640000000,0.233980000,124.326013183,16.043000000,99.000000000,"Classic",66909.600000000,-68.400000000,0.897300000,-0.000513700,0.000000109,0.000000000,"log",39.205000000,-1324.400000000,-3.436600000,0.000031019,2.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2.520000000,155.809006022,0.406998625,3,-26.870000000,1150.000000000,0.187000000,-0.000521000,-50500.000000000,2.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"solute",900.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.303000000,-0.000605000,-0.000003200,77.300000000,941.000000000,452.000000000,0.116656057,90.690000000,90.650000000,-74520.000000000,186.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,10200000.0000000,0.261000000,-0.147000000,0.222000000,0.000000000,0.100000000,0.585700000,-0.720600000,1.289900000,0.000000000,0.000000000,0.000000000,0.122841598,0.914470789,2.741978611,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,4.186260000,1,1.000000000,-6.680820000,0.000000000,9700,0.000015293,0.047920000,1594.000000000,0.012440000,2952.000000000,0.002317000,2777.000000000,1.076000000,1323.000000000,"yes",1.000000000,3.703900119,150.029998779,0.000000000,0.000000000,3.190710941,155.809006022,0.406998625,1.000000000,0,900.000000000,0.000621000,2760.000000000,0.421000000,1963.100000000,0.004048680,2636.750000000,0.295270000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.628820000,0.701140000,-0.784370000,0.000000000 -1185,"trans-14-DM-cy-C6","2207-04-7","HC",147,"C",112.220000000,0.422182073,316.667016601,29.640000000,0.233980000,119.356011962,16.043000000,99.000000000,"Classic",66909.600000000,-68.400000000,0.897300000,-0.000513700,0.000000109,0.000000000,"log",39.205000000,-1324.400000000,-3.436600000,0.000031019,2.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2.520000000,155.809006022,0.406998625,3,-26.870000000,1150.000000000,0.187000000,-0.000521000,-50500.000000000,2.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0,"solute",900.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.303000000,-0.000605000,-0.000003200,77.300000000,941.000000000,452.000000000,0.116656057,90.690000000,90.650000000,-74520.000000000,186.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,10200000.0000000,0.261000000,-0.147000000,0.222000000,0.000000000,0.100000000,0.585700000,-0.720600000,1.289900000,0.000000000,0.000000000,0.000000000,0.122841598,0.914470789,2.741978611,0,"0",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,4.186260000,1,1.000000000,-6.680820000,0.000000000,9700,0.000015293,0.047920000,1594.000000000,0.012440000,2952.000000000,0.002317000,2777.000000000,1.076000000,1323.000000000,"yes",1.000000000,3.703900119,150.029998779,0.000000000,0.000000000,3.190710941,155.809006022,0.406998625,1.000000000,0,900.000000000,0.000621000,2760.000000000,0.421000000,1963.100000000,0.004048680,2636.750000000,0.295270000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.628820000,0.701140000,-0.784370000,0.000000000 -1186,"PG","57-55-6","glycol",1186,"propyleneglycol",76.095000000,1.036000000,352.850000000,61.000000000,1.102000000,188.200000000,76.095000000,239.000000000,"Classic",32022.600000000,35.700000000,0.248400000,-0.000149700,0.000000030,0.000000000,"exp",13.629900000,6022.180000000,-28.250000000,0.000000000,0.000000000,2.308200000,0.215000000,0.248800000,0.000000000,3.626000000,481.800000000,0.000000000,3,-23.155244944,5694.484212533,0.023081509,0.000000000,57900.000000000,-19.290540000,29814.530000000,-0.019678500,0.013189000,0.031144000,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.654009012,-3.955117195,3.671191916,0.517338954,-0.000798169,0.000000064,133.328650000,9958.000000000,904.000000000,0.000002420,260.150000000,260.150000000,-388000.000000000,324.000000000,21.400000000,0.000000000,0.000000000,0.000000000,0.000000000,1.315100000,0.251250000,719.700000000,0.218700000,0.000000000,82900000.0000000,0.427000000,0.000000000,0.000000000,0.000000000,1.117000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,4,"4C",0.000000000,0.000000000,0.019000000,17442.000000000,138360.000000000,6.750000000,0.937200000,108190.000000000,5.140000000,0.674400000,0.051400000,1,17.090887000,-7800.000000000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,3.626000000,481.800000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,35540.000000000,436.780000000,-0.184860000,0.000000000,0.000000000,35540.000000000,436.780000000,-0.184860000,0.000000000,0.000000000,0.910030000,1.349960000,-1.890020000,151.817427819 -1187,"ammonia","7664-41-7","other",1187,"NH3",17.031,0.73,132.25,113.0,0.250,-33.35,17.031,99.000000000,"Classic",11133.000000000,39.192196000,-0.058081604,0.000350102,-0.000000369,1.276199e-10,"pow10",5.202770000,1580.080000000,239.500000000,0.000000000,0.000000000,1.700000000,0.215000000,0.200000000,0.000000000,3.626000000,481.800000000,0.000000000,3,-39.350000000,4826.000000000,0.109100000,-0.000113000,57900.000000000,-19.290500000,29814.500000000,-0.019678000,0.013189000,0.031144000,0,"solvent",0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,-0.384000000,0.005250000,-0.000006370,73.069489067,3177.000000000,1000.000000000,0.006110000,175.500000000,175.500000000,-242000.000000000,189.000000000,30.585000000,0.000000000,0.000000000,0.000000000,0.000000000,2.288000000,0.268500000,512.640000000,0.245300000,0.000000000,52100000.0000000,0.320000000,-0.212000000,0.258000000,0.000000000,0.797000000,1.437100000,-0.799420000,0.327800000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,2,"2B",0.000000000,0.000000000,0.016100000,24591.000000000,40531.000000000,3.097800000,0.431020000,47052.000000000,3.300000000,0.903700000,0.044900000,1,17.387107060,-7582.406220000,0.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,"no",1.525500000,3.230000000,188.900000000,0.035176000,24106.443000000,3.626000000,481.800000000,0.000000000,1.000000000,0,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,0.000000000,-12706.000000000,958.780000000,-5.233200000,0.013152000,0.000000000,105800.000000000,-362.230000000,0.937900000,0.000000000,0.000000000,1.224003000,-0.273500000,-0.398230000,87.543852818 -1188,"chlorine",7782-50-5,chlorine,195,Cl2,70.906,1.5326431958562459,143.71540000000005,76.424,0.07,-33.952362112999964,70.906,124.069478908,Classic,0.0,25.4089891488,0.04465530069384,-6.73304954604e-05,4.73342196414e-08,-1.268453987088e-11,pow10KPa,9.0628,861.34,-26.82,0.0,0.0,0.0,0.215,0.2767,0.0,4.217,316.0,0.5203667,1,0.0,0.0,0.0,0.0,0.0,8.16976,0.0,0.0,0.0,0.0,0,solute,900.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,207.0,6400.0,1532.643195856246,0.013808478434799999,172.17,172.15,0.0,223.1,2.92,0.0,0.0,0.0,0.0,2.92,0.0,0.0,0.0,0.0,20280.90073241057,0.0,0.0,0.0,0.0,1.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0,1A,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,1,0.0,0.0,0.0,6500.0,1.8927555303529247e-05,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,no,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0 -1189,"ethylene",74-85-1,"ethylene",196,C2H4,28.05316,0.5665875959429861,9.200000000000045,50.418,0.0866,-103.77135156599996,28.05316,130.945481716,Classic,52560.0,35.0953348158,-0.0730175859636,0.00048182294541,-5.59479999942e-07,2.08776085578e-10,pow10KPa,8.91382,596.526,-16.78,0.0,0.0,0.0,0.215,0.2815,0.0,4.04838,169.08,0.7657779,3350.0,0.00121961941966,103.986,566.5875959429861,104.05,52560.0,9.627551137738643e-06,3450.0,13556.576228246833,0.0,0.0,0.0,0.0,2.92,0.0,0.0,0.0,0.0,2.92,0.0,0.0,0.0,0.0,219.3,no,1,207.0,8.16976,solute,900.0,0,1A,1,0,0.0,0.0,0.0,0.0,0.0,1.0 -1190,"propene",115-07-1,"propene",197,C3H6,42.07974,0.6071797165485592,91.06100000000004,45.55,0.146,-47.61912875399997,42.07974,183.250870442,Classic,20370.0,31.8776388732,0.0323681920014,0.00038978187542399996,-4.99948467774e-07,1.89819117234e-10,pow10KPa,8.95606,789.624,-25.57,0.0,0.0,0.36,0.215,0.2779,0.0,4.4902,282.43,1.1051818500000001,3003.0,7.471717723549999e-09,87.953,607.1797165485592,88.075,20370.0,1.0561747100848501e-05,3103.0,18504.676899839127,0.0,0.0,0.0,0.0,2.92,0.0,0.0,0.0,0.0,2.92,0.0,0.0,0.0,0.0,266.71,no,1,207.0,8.16976,solute,900.0,0,1A,1,0,0.0,0.0,0.0,0.0,0.0,1.0 -1191,"cis-butene",590-18-1,"cis-butene",198,C4H8,56.10632,0.6301087082074909,162.60000000000002,42.255,0.202,3.7235553570000093,56.10632,235.626767201,Classic,-7330.0,30.6720422022,0.1595045968032,0.00018541245354,-2.8485339274799996e-07,1.04429615088e-10,pow10KPa,9.00958,967.32,-35.277,0.0,0.0,0.26,0.215,0.2701,0.0,3.82,132.0,1.4164999999999999,7310.0,2.6364927810099997e-06,134.3,630.1087082074908,134.26,-7330.0,1.1258595759827091e-05,7410.0,23322.437236388218,0.0,0.0,0.0,0.0,2.92,0.0,0.0,0.0,0.0,2.92,0.0,0.0,0.0,0.0,301.17,no,1,207.0,8.16976,solute,900.0,0,1A,1,0,0.0,0.0,0.0,0.0,0.0,1.0 -1192,"trans-butene",624-64-6,"trans-butene",199,C4H8,56.10632,0.6247637226336263,155.46000000000004,40.273,0.21,0.8798965720000069,56.10632,237.360550676,Classic,-11180.0,46.42794352319999,-0.040657708422,0.0007593596135339999,-9.1251196305e-07,3.3964568283e-10,pow10KPa,9.00827,967.5,-32.31,0.0,0.0,0.0,0.215,0.272,0.0,3.82,132.0,1.367,9760.0,0.0007481658101809999,167.6,624.7637226336263,167.63,-11180.0,1.0933788266236188e-05,9860.0,22984.99404781112,0.0,0.0,0.0,0.0,2.92,0.0,0.0,0.0,0.0,2.92,0.0,0.0,0.0,0.0,296.48,no,1,207.0,8.16976,solute,900.0,0,1A,1,0,0.0,0.0,0.0,0.0,0.0,1.0 -1193,"iso-butene",115-11-7,"iso-butene",200,C4H8,56.10632,0.6172935303955316,144.94,40.098,0.193,-7.004207835999978,56.10632,239.80815347700002,Classic,-17600.0,26.8640196138,0.1741796183502,0.000192313455174,-3.28338017502e-07,1.30204440468e-10,pow10KPa,8.80956,866.25,-38.51,0.0,0.0,0.5,0.215,0.2728,0.0,3.82,132.0,1.4375,5920.0,6.7618898108400006e-06,132.4,617.2935303955315,132.95,-17600.0,1.0947338969965856e-05,6020.0,22077.0419048734,0.0,0.0,0.0,0.0,2.92,0.0,0.0,0.0,0.0,2.92,0.0,0.0,0.0,0.0,293.59,no,1,207.0,8.16976,solute,900.0,0,1A,1,0,0.0,0.0,0.0,0.0,0.0,1.0 +"1","methane","74-82-8","HC","1","CH4","16.043000000","0.422182073","-82.590000000","45.990000000","0.011500000","-161.550000000","16.043000000","99.000000000","Classic","2.600000000","37.978352000","-0.074618150","0.000301881","-0.000000283","9.070574e-11","pow10","3.768700000","395.744000000","266.682000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2.520000000","155.809006022","0.406998625","3","-26.870000000","1150.000000000","0.187000000","-0.000521000","-50500.000000000","2.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","solute","900.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.303000000","-0.000605000","-0.000003200","77.300000000","941.000000000","452.000000000","0.116656057","90.690000000","90.650000000","-74520.000000000","186.000000000","33.022000000","-0.015870000","-0.000155000","0.000000000","0.000000000","2.920000000","0.290000000","191.000000000","0.289000000","0.000000000","8170.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.100000000","0.585700000","-0.720600000","1.289900000","0.000000000","0.000000000","0.000000000","0.122841598","0.914470789","2.741978611","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","4.186260000","1","1.000000000","-6.680820000","0.000000000","9700","0.000015293","0.047920000","1594.000000000","0.012440000","2952.000000000","0.002317000","2777.000000000","1.076000000","1323.000000000","yes","1.000000000","3.703900119","150.029998779","0.000000000","0.000000000","3.190710941","155.809006022","0.406998625","1.000000000","0","900.000000000","0.000621000","2760.000000000","0.421000000","1963.100000000","0.004048680","2636.750000000","0.295270000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.392340000","0.000000000","0.000000000","77.300000000" +"2","ethane","74-84-0","HC","2","C2H6","30.070000000","0.544459352","32.170000000","48.720000000","0.099500000","-88.550000000","30.070000000","148.000000000","Classic","9761.100000000","34.735892000","-0.036806078","0.000470572","-0.000000552","2.0676918e-10","pow10","3.954050000","663.720000000","256.681000000","0.000000000","0.000000000","1.700000000","0.000000000","0.000000000","0.000000000","3.264673065","176.701997247","0.513842135","3","-10.230000000","668.000000000","0.043900000","-0.000095900","-31900.000000000","2.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","solute","0.000000000","0.000000000","0.000000000","0.000000000","0.002582841","12.538290520","-18.380973790","-0.384000000","0.005250000","-0.000006370","108.900000000","2860.000000000","652.000000000","0.000011402","90.350000000","89.950000000","-84680.000000000","229.000000000","25.263000000","-0.010950000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","14703.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.100000000","0.654848544","-0.184389171","0.260160050","0.000000000","0.000000000","0.000000000","0.299607318","0.876626839","1.679238400","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","6.046090000","1","1.000000000","-3.333550000","0.000000000","20500","0.000021756","0.000000000","0.000000000","0.002999000","3861.000000000","0.000000000","0.000000000","0.007362000","4000.000000000","yes","1.606900000","3.520600000","191.420000000","0.000000000","0.000000000","3.264673065","176.701997247","0.513842135","1.000000000","0","3363.000000000","0.000000000","0.000000000","0.109800000","2854.940000000","0.000000000","0.000000000","0.089386100","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.520050000","0.004300000","0.102920000","108.900000000" +"3","Cl-","0-0-0-0","ion","3","Cl-","35.450000000","0.797000000","444.150000000","290.890000000","0.344000000","64.550000000","99.450000000","99.000000000","Classic","1374.600000000","36.540030000","-0.034802404","0.000116811","-0.000000130","0.000000000","log","-8.547960000","0.769820000","-3.108500000","1.544810000","0.000000000","1.700000000","0.215000000","0.000000000","0.000000000","3.600000000","481.800000000","0.000000000","3","-39.350000000","4826.000000000","0.109100000","-0.000113000","-587000.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","-1","solute","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","-0.384000000","0.005250000","-0.000006370","52.878622600","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.797000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","3.600000000","481.800000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"4","Na+","0-0-0-0","ion","4","Na+","22.990000000","0.797000000","444.150000000","290.890000000","0.344000000","64.550000000","22.990000000","99.000000000","Classic","1374.600000000","36.540030000","-0.034802404","0.000116811","-0.000000130","0.000000000","log","-8.547960000","0.769820000","-3.108500000","1.544810000","0.000000000","1.700000000","0.215000000","0.000000000","0.000000000","5.680000000","481.800000000","0.000000000","3","-39.350000000","4826.000000000","0.109100000","-0.000113000","-587000.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","solute","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","-0.384000000","0.005250000","-0.000006370","52.878622600","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1.038000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","3.680000000","481.800000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"5","Mg++","0-0-0-0","ion","5","Mg++","24.310000000","0.797000000","444.150000000","290.890000000","0.344000000","64.550000000","24.310000000","99.000000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","-8.547960000","0.769820000","-3.108500000","1.544810000","0.000000000","1.700000000","0.215000000","0.000000000","0.000000000","6.940000000","481.800000000","0.000000000","3","-39.350000000","4826.000000000","0.109100000","-0.000113000","-587000.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2","solute","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1.038000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","6.940000000","481.800000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"6","MDEA","74-82-8","amine","6","MDEA","119.163200000","1.038000000","403.850000000","38.760000000","1.242000000","140.000000000","119.160000000","99.000000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","-8.547960000","0.769820000","-3.108500000","1.544810000","0.000000000","1.700000000","0.215000000","0.260355682","0.000000000","4.500000000","481.800000000","0.000000000","3","-75.190000000","12680.000000000","0.157300000","-0.000122500","57900.000000000","8.169760000","8989.300000000","0.000000000","0.000000000","0.000000000","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.521291873","-1.152080748","-0.013889882","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.797000000","2.298601539","-2.159763177","1.537096461","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","4","4C","0.000000000","0.000000000","0.018008483","12276.382600000","342400.600100000","10.828737539","1.032854790","376276.884000000","10.783585850","1.258298307","0.000000000","1","17.387107060","1.762745870","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","4.500000000","481.800000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"7","MDEA+","74-82-8","ion","7","CH4O","120.163200000","1.038000000","403.850000000","38.760000000","1.242000000","64.550000000","120.160000000","99.000000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","-8.547960000","0.769820000","-3.108500000","1.544810000","0.000000000","1.700000000","0.215000000","0.000000000","0.000000000","4.500000000","481.800000000","0.000000000","3","-39.350000000","4826.000000000","0.109100000","-0.000113000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","solute","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.797000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","4.500000000","481.800000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"8","H3O+","74-82-8","ion","8","H3O","19.020000000","0.797000000","444.150000000","290.890000000","0.344000000","64.550000000","19.020000000","99.000000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","-8.547960000","0.769820000","-3.108500000","1.544810000","0.000000000","1.700000000","0.215000000","0.000000000","0.000000000","4.060000000","481.800000000","0.000000000","3","-39.350000000","4826.000000000","0.109100000","-0.000113000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","solute","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.797000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","4.060000000","481.800000000","0.000000000","9.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"9","propane","74-98-6","HC","9","CH4O","44.097000000","0.000000000","96.680000000","42.480000000","0.152300000","-42.050000000","44.097000000","203.000000000","Classic","19519.600000000","31.983958000","0.042659134","0.000499754","-0.000000656","2.5598806e-10","pow10","3.928280000","803.997000000","247.040000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","3.320577362","205.885946142","0.662379685","3","-7.764000000","722.000000000","0.023800000","-0.000046700","-24400.000000000","2.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","solute","0.000000000","0.000000000","0.000000000","0.000000000","-0.015069991","-4.344143673","4.007325591","-0.384000000","0.005250000","-0.000006370","151.900000000","6000.000000000","1000.000000000","0.000000001","85.470000000","85.500000000","-103840.000000000","189.000000000","18.861000000","-0.020332000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","15700.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.100000000","0.721211486","-0.099216642","0.181829227","0.000000000","0.000000000","0.000000000","0.435825883","0.866132179","1.395432818","0","0","0.000000000","0.000000000","0.000000000","0.000000000","91187.500000000","5.783400000","0.630700000","0.000000000","0.000000000","0.000000000","5.248690000","1","1.000000000","-11.125400000","0.000000000","28500","0.000024973","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.008264000","4521.000000000","yes","2.002000000","3.618400000","208.110000000","0.000000000","0.000000000","3.320577362","205.885946142","0.662379685","1.000000000","0","3885.270000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.079900000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.618380000","-0.160710000","0.487850000","151.900000000" +"10","CO2","124-38-9","inert","10","CO2","44.010000000","1.100000000","31.040000000","73.815000000","0.227600000","-78.500000000","44.010000000","94.000000000","Classic","19459.100000000","18.583021051740495","0.08237963451147419","-7.930390038368174e-05","4.222181385638e-08","-9.577100164048891e-12","pow10","7.532200000","835.060000000","268.223000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2.340000000","168.770000000","0.680500000","2","-7.811000000","3140.000000000","0.000000000","0.000000000","-394000.000000000","2.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","solute","94.491400000","-6789.040000000","-11.451900000","-0.010454000","0.000000000","0.000000000","0.000000000","-0.384000000","0.005250000","-0.000006370","78.000000000","9018.969300000","1000.000000000","5.185000000","216.580000000","216.592000000","-393500.000000000","189.000000000","32.939000000","0.068420000","-0.000284700","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","14490.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.100000000","0.881738930","-0.856255022","3.094939327","0.000000000","0.000000000","0.000000000","1.413601068","-0.605965449","1.101814948","2","2A","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","6.812280000","-1301.679000000","-3.494000000","26100","0.000037687","4.856e-11","7470.000000000","0.098620000","2617.000000000","0.000060820","3691.000000000","0.168300000","2591.000000000","yes","1.309700000","3.250700000","92.150000000","0.000000000","0.000000000","3.037207160","170.162382832","0.684633880","1.000000000","0","2119.560000000","0.000758596","2500.000000000","0.231198000","2419.560000000","0.007244960","2330.000000000","0.139898000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.713690000","-0.447640000","2.437520000","78.000000000" +"11","methanol","67-56-1","alcohol","11","CH4O","32.042000000","0.797000000","239.490000000","80.960000000","0.559000000","64.550000000","32.042000000","99.000000000","Classic","11133.000000000","39.192196000","-0.058081604","0.000350102","-0.000000369","1.276199e-10","pow10","5.202770000","1580.080000000","239.500000000","0.000000000","0.000000000","1.700000000","0.215000000","0.200000000","0.000000000","3.626000000","481.800000000","0.000000000","3","-39.350000000","4826.000000000","0.109100000","-0.000113000","57900.000000000","-19.290500000","29814.500000000","-0.019678000","0.013189000","0.031144000","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","-0.384000000","0.005250000","-0.000006370","73.069489067","3177.000000000","1000.000000000","0.006110000","175.500000000","175.500000000","-242000.000000000","189.000000000","30.585000000","0.000000000","0.000000000","0.000000000","0.000000000","2.288000000","0.268500000","512.640000000","0.245300000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.797000000","1.437100000","-0.799420000","0.327800000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2","2B","0.000000000","0.000000000","0.016100000","24591.000000000","40531.000000000","3.097800000","0.431020000","47052.000000000","3.300000000","0.903700000","0.044900000","1","17.387107060","-7582.406220000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","1.525500000","3.230000000","188.900000000","0.035176000","24106.443000000","3.626000000","481.800000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","-12706.000000000","958.780000000","-5.233200000","0.013152000","0.000000000","105800.000000000","-362.230000000","0.937900000","0.000000000","0.000000000","1.224003000","-0.273500000","-0.398230000","87.543852818" +"12","MEG","107-21-1","glycol","12","C2H6O2","62.069000000","1.117000000","446.850000000","90.000000000","0.534700000","197.350000000","62.069000000","186.000000000","Classic","32022.600000000","35.700000000","0.248400000","-0.000149700","0.000000030","0.000000000","exp","13.629900000","6022.180000000","-28.250000000","0.000000000","0.000000000","2.308200000","0.215000000","0.248800000","0.000000000","3.626000000","481.800000000","0.000000000","3","-23.155244944","5694.484212533","0.023081509","0.000000000","57900.000000000","-19.290540000","29814.530000000","-0.019678500","0.013189000","0.031144000","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.654009012","-3.955117195","3.671191916","0.517338954","-0.000798169","0.000000064","133.328650000","9958.000000000","904.000000000","0.000002420","260.150000000","260.150000000","-388000.000000000","324.000000000","21.400000000","0.000000000","0.000000000","0.000000000","0.000000000","1.315100000","0.251250000","719.700000000","0.218700000","0.000000000","82900000.0000000","0.427000000","0.000000000","0.000000000","0.000000000","1.117000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","4","4C","0.288384169","0.000389127","0.014100000","19752.000000000","108190.000000000","5.140000000","0.674400000","108190.000000000","5.140000000","0.674400000","0.051400000","1","17.090887000","-7800.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","3.626000000","481.800000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","35540.000000000","436.780000000","-0.184860000","0.000000000","0.000000000","35540.000000000","436.780000000","-0.184860000","0.000000000","0.000000000","0.910030000","1.349960000","-1.890020000","151.817427819" +"13","oxygen","7782-44-7","inert","13","O2","31.999000000","0.000000000","-118.550000000","50.460000000","0.021000000","-182.950000000","31.999000000","73.400000000","Classic","11103.100000000","30.17982","-0.014915316","5.4706e-05","-4.89e-08","1.488206e-11","log","-6.282750000","1.736190000","-1.813490000","-0.025400000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","3.467000000","106.700000000","0.000000000","3","-4.771000000","215.000000000","0.013900000","-0.000062600","57900.000000000","-19.290500000","29814.500000000","-0.019678000","0.013189000","0.031144000","0","solute","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","-0.384000000","0.005250000","-0.000006370","0.000000000","6000.000000000","1000.000000000","0.001463300","56.360000000","273.000000000","-242000.000000000","189.000000000","53.000000000","-0.007840000","0.000000000","0.000000000","0.000000000","5.460000000","0.305000000","647.000000000","0.081000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.100000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.017170000","2016.200000000","0.056960000","1662.300000000","0.097990000","1045.900000000","0.002681000","2563.900000000","yes","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","3.467000000","106.700000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000" +"14","TEG","112-27-6","glycol","14","C6H14O4","150.175000000","1.127000000","496.350000000","33.130000000","1.287400000","278.300000000","150.175000000","450.000000000","Classic","93317.400000000","86.400000000","0.600800000","-0.000362200","0.000000072","0.000000000","exp","6.756800000","3715.222000000","-1.299000000","0.000000000","0.000000000","2.200000000","0.215000000","0.242773578","0.000000000","3.626000000","481.800000000","0.000000000","3","-53.925230000","9741.992000000","0.106066000","-0.000075802","-394370.000000000","-19.290500000","29814.500000000","-0.019678000","0.013189000","0.031144000","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.394142583","-0.000547836","0.000000000","358.332712000","15900.000000000","1000.000000000","0.006110000","268.250000000","268.250000000","-242000.000000000","189.000000000","8.890000000","-0.007840000","0.000000000","0.000000000","0.000000000","0.596600000","0.262270000","769.500000000","0.245500000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","1.127000000","1.376906087","1.788921526","-4.378737499","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","4","4C","0.284542458","-0.004423613","0.018800000","14337.000000000","391260.000000000","13.210000000","1.169200000","391260.000000000","13.210000000","1.169200000","0.018800000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","3.626000000","481.800000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","153800.000000000","587.000000000","0.000000000","0.000000000","0.000000000","153800.000000000","587.000000000","0.000000000","0.000000000","0.000000000","1.550750000","-0.777800000","0.317790000","349.636060455" +"15","DEG","111-46-6","glycol","15","C4H10O3","106.122000000","1.119000000","471.450000000","46.610000000","1.201100000","245.850000000","106.122000000","316.000000000","Classic","62670.000000000","73.100000000","0.346200000","-0.000146800","0.000000018","0.000000000","exp","10.412400000","4122.520000000","-122.500000000","0.000000000","0.000000000","2.200000000","0.215000000","0.248900000","0.000000000","3.626000000","481.800000000","0.000000000","4","1385.090000000","495.540000000","0.000000000","0.000000000","-394370.000000000","-19.290500000","29814.500000000","-0.019678000","0.013189000","0.031144000","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","-0.384000000","0.005250000","-0.000006370","0.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","12.600000000","-0.007840000","0.000000000","0.000000000","0.000000000","0.836920000","0.261120000","744.600000000","0.242200000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","1.119000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","4","4C","0.000000000","0.000000000","0.006400000","19684.000000000","264080.000000000","9.210000000","0.799100000","264080.000000000","9.210000000","0.799100000","0.006400000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","3.626000000","481.800000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","177000.000000000","0.000000000","0.000000000","0.000000000","0.000000000","125410.000000000","400.580000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000" +"16","nitrogen","7727-37-9","inert","16","N2","28.013500000","0.807964860","-147.050000000","33.944000000","0.040300000","-195.750000000","28.014000000","89.800000000","Classic","8330.800000000","29.3824747474747","-0.0030260473322971763","5.771148989898619e-06","4.686124061124461e-09","-4.086538461538615e-12","pow10","5.739210000","167.930000000","254.481000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","3.132506748","126.578386713","0.359188902","2","-7.811000000","3140.000000000","0.000000000","0.000000000","-394370.000000000","-19.290500000","29814.500000000","-0.019678000","0.013189000","0.031144000","0","solute","0.000000000","0.000000000","0.000000000","0.000000000","0.055118857","-2.346353896","1.568121600","-0.384000000","0.005250000","-0.000006370","41.000000000","720.000000000","870.000000000","0.125080000","63.150000000","63.300000000","0.000000000","192.000000000","37.870000000","-0.060272000","0.000000000","0.000000000","0.000000000","3.210000000","0.286000000","126.000000000","0.297000000","0.000000000","7490000.00000000","0.404000000","-0.317000000","0.273000000","0.000000000","0.100000000","0.574258329","-0.322594876","0.590654497","0.000000000","0.000000000","0.000000000","0.112629607","0.902199715","2.874960678","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2.601899073","1","1.000000000","-21.245480450","0.000000000","0","0.000017417","0.052800000","932.300000000","0.034150000","2240.000000000","0.007507000","2004.000000000","0.094770000","1596.000000000","yes","1.205300000","3.313000000","90.960000000","0.000000000","0.000000000","3.132506748","126.578386713","0.359188902","1.000000000","0","1150.000000000","0.011645000","2159.000000000","0.400100000","1037.180000000","0.007180000","2090.000000000","0.300000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.436354704","0.000000000","0.000000000","41.000000000" +"17","n-butane","106-97-8","HC","17","C4H10","58.123000000","0.000000000","151.970000000","37.960000000","0.200200000","-0.450000000","58.124000000","255.000000000","Classic","29278.100000000","46.117758000","0.046026304","0.000669858","-0.000000878","3.4370076e-10","pow10","3.932660000","935.773000000","238.789000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2.912500000","209.000000000","0.937900000","2","-7.811000000","3140.000000000","0.000000000","0.000000000","-394370.000000000","-19.290500000","29814.500000000","-0.019678000","0.013189000","0.031144000","0","solute","0.000000000","0.000000000","0.000000000","0.000000000","-0.018486492","-4.921574519","4.858186966","-0.384000000","0.005250000","-0.000006370","191.700000000","6000.000000000","1000.000000000","0.000006762","134.860000000","138.150000000","-126150.000000000","189.000000000","15.194000000","-0.006886000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.100000000","0.808063555","-0.212724945","0.362961475","0.000000000","0.000000000","0.000000000","0.331800583","0.854692733","1.865828858","0","0","0.000000000","0.000000000","0.000000000","0.000000000","131427.400000000","7.208100000","0.707710000","0.000000000","0.000000000","0.000000000","5.764470000","1","1.000000000","-13.438500000","0.000000000","35900","0.000025768","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.001262000","4580.000000000","yes","2.331600000","3.708600000","222.860000000","0.000000000","0.000000000","2.912500000","209.000000000","0.937900000","1.000000000","0","2691.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1.052980000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.671230000","-0.038030000","0.218860000","191.700000000" +"18","HCO3-","74-82-8","ion","18","HCO3","61.000000000","0.797000000","444.150000000","290.890000000","0.344000000","64.550000000","61.000000000","99.000000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","-8.547960000","0.769820000","-3.108500000","1.544810000","0.000000000","1.700000000","0.215000000","0.000000000","0.000000000","3.120000000","481.800000000","0.000000000","3","-39.350000000","4826.000000000","0.109100000","-0.000113000","-587000.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","-1","solute","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.797000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","3.120000000","481.800000000","0.000000000","4.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"19","Li+","0-0-0-0","ion","19","Li","6.941000000","0.797000000","444.150000000","290.890000000","0.344000000","64.550000000","6.941000000","99.000000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","-8.547960000","0.769820000","-3.108500000","1.544810000","0.000000000","1.700000000","0.215000000","0.000000000","0.000000000","4.760000000","481.800000000","0.000000000","3","-39.350000000","4826.000000000","0.109100000","-0.000113000","-587000.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","solute","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.797000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","4.760000000","481.800000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"20","K+","0-0-0-0","ion","20","K","39.100000000","0.797000000","444.150000000","290.890000000","0.344000000","64.550000000","39.100000000","99.000000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","-8.547960000","0.769820000","-3.108500000","1.544810000","0.000000000","1.700000000","0.215000000","0.000000000","0.000000000","2.500000000","481.800000000","0.000000000","3","-39.350000000","4826.000000000","0.109100000","-0.000113000","-587000.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","solute","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.797000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2.500000000","481.800000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"21","Ca++","0-0-0-0","ion","21","Ca2","40.080000000","0.797000000","444.150000000","290.890000000","0.344000000","64.550000000","40.080000000","99.000000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","-8.547960000","0.769820000","-3.108500000","1.544810000","0.000000000","1.700000000","0.215000000","0.000000000","0.000000000","6.200000000","481.800000000","0.000000000","3","-39.350000000","4826.000000000","0.109100000","-0.000113000","-587000.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2","solute","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","-0.384000000","0.005250000","-0.000006370","52.878622600","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.797000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","6.200000000","481.800000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"22","I-","0-0-0-0","ion","22","I","126.900000000","0.797000000","444.150000000","290.890000000","0.344000000","64.550000000","126.900000000","99.000000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","-8.547960000","0.769820000","-3.108500000","1.544810000","0.000000000","1.700000000","0.215000000","0.000000000","0.000000000","4.320000000","481.800000000","0.000000000","3","-39.350000000","4826.000000000","0.109100000","-0.000113000","-587000.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","-1","solute","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.797000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","4.320000000","481.800000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"23","Sr++","0-0-0-0","ion","23","Sr","87.620000000","0.797000000","444.150000000","290.890000000","0.344000000","64.550000000","32.042000000","99.000000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","-8.547960000","0.769820000","-3.108500000","1.544810000","0.000000000","1.700000000","0.215000000","0.000000000","0.000000000","6.200000000","481.800000000","0.000000000","3","-39.350000000","4826.000000000","0.109100000","-0.000113000","-587000.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2","solute","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.797000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","6.200000000","481.800000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"24","Ba++","0-0-0-0","ion","24","Ba","137.300000000","0.797000000","444.150000000","290.890000000","0.344000000","64.550000000","137.300000000","99.000000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","-8.547960000","0.769820000","-3.108500000","1.544810000","0.000000000","1.700000000","0.215000000","0.000000000","0.000000000","5.800000000","481.800000000","0.000000000","3","-39.350000000","4826.000000000","0.109100000","-0.000113000","-587000.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2","solute","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.797000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","5.800000000","481.800000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"25","OH-","0-0-0-0","ion","25","OH","17.001000000","0.797000000","444.150000000","290.890000000","0.344000000","64.550000000","17.001000000","99.000000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","-8.547960000","0.769820000","-3.108500000","1.544810000","0.000000000","1.700000000","0.215000000","0.000000000","0.000000000","3.520000000","481.800000000","0.000000000","3","-39.350000000","4826.000000000","0.109100000","-0.000113000","-157000.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","-1","solute","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.797000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","3.520000000","481.800000000","0.000000000","3.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"26","CO3--","0-0-0-0","ion","26","CO3minus2","59.982000000","0.797000000","444.150000000","290.890000000","0.344000000","64.550000000","59.982000000","99.000000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","-8.547960000","0.769820000","-3.108500000","1.544810000","0.000000000","1.700000000","0.215000000","0.000000000","0.000000000","3.700000000","481.800000000","0.000000000","3","-39.350000000","4826.000000000","0.109100000","-0.000113000","-587000.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","-2","solute","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.797000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","3.700000000","481.800000000","0.000000000","5.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"27","NH4+","0-0-0-0","ion","27","NH4","18.010000000","0.797000000","444.150000000","290.890000000","0.344000000","64.550000000","18.010000000","99.000000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","loglog","-8.547960000","0.769820000","-3.108500000","1.544810000","0.000000000","1.700000000","0.215000000","0.000000000","0.000000000","2.500000000","481.800000000","0.000000000","3","-39.350000000","4826.000000000","0.109100000","-0.000113000","-587000.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","solute","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.797000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2.500000000","481.800000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"28","Br-","0-0-0-0","ion","28","Br","79.900000000","0.797000000","444.150000000","290.890000000","0.344000000","64.550000000","79.900000000","99.000000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","-8.547960000","0.769820000","-3.108500000","1.544810000","0.000000000","1.700000000","0.215000000","0.000000000","0.000000000","3.900000000","481.800000000","0.000000000","3","-39.350000000","4826.000000000","0.109100000","-0.000113000","-587000.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","-1","solute","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.797000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","3.900000000","481.800000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"29","n-pentane","109-66-0","HC","29","nC5","72.150000000","0.626200000","196.550000000","33.700000000","0.251500000","36.050000000","72.151000000","304.000000000","Classic","39036.600000000","62.803956000","-0.003059552","0.000984876","-0.000001242","4.7830442e-10","pow10","6.852960000","1064.840000000","232.012000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","5.784000000","341.100000000","0.000000000","2","-7.811000000","3140.000000000","0.000000000","0.000000000","-394370.000000000","-19.290500000","29814.500000000","-0.019678000","0.013189000","0.031144000","0","solute","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.340000000","0.043000000","-0.384000000","0.005250000","-0.000006370","233.900000000","8401.500000000","1000.000000000","0.000000686","143.420000000","143.420000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.903861134","-0.358553152","0.663885221","0.000000000","0.000000000","0.000000000","0.319903000","0.847895000","2.102010000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","181980.000000000","9.100800000","0.798580000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","42000","0.000025865","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","2.689600000","3.772900000","231.200000000","0.000000000","0.000000000","5.784000000","341.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.750630000","-0.107340000","0.387070000","233.900000000" +"30","n-hexane","110-54-3","HC","30","C6H14","86.177000000","0.664000000","234.450000000","30.250000000","0.301300000","68.750000000","86.178000000","370.000000000","Classic","48795.100000000","73.420934000","-0.001380124","0.001189068","-0.000001522","5.9228936e-10","log","3.456040000","1044.038000000","-53.893000000","1000.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","5.949000000","399.300000000","0.000000000","2","-7.811000000","3140.000000000","0.000000000","0.000000000","-394370.000000000","-19.290500000","29814.500000000","-0.019678000","0.013189000","0.031144000","0","solute","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.340000000","0.043000000","-0.384000000","0.005250000","-0.000006370","271.000000000","13080.000000000","1000.000000000","0.000011707","177.830000000","177.830000000","-167190.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","1.106100000","-1.441100000","2.917300000","0.000000000","0.000000000","0.000000000","0.175874000","0.865924000","3.536480000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","236810.000000000","10.789000000","0.831300000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000025784","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","3.057600000","3.798300000","236.770000000","0.000000000","0.000000000","5.949000000","399.300000000","0.000000000","1.000000000","1","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.834700000","-0.318030000","1.020850000","271.000000000" +"31","benzene","71-43-2","HC","31","C6H6","78.114000000","0.886000000","289.010000000","48.980000000","0.210800000","80.150000000","78.114000000","259.000000000","Classic","43185.000000000","29.523014000","-0.051413776","0.001194306","-0.000001646","6.8457476e-10","pow10","3.985230000","1184.240000000","217.572000000","0.000000000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","205.900000000","9200.000000000","1000.000000000","0.048379070","278.500000000","278.500000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.835600000","-0.375000000","0.971500000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","1A","0.000000000","0.000000000","0.113470000","0.000000000","178760.000000000","7.499000000","0.757600000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","45000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000262800","5951.000000000","no","2.465300000","3.647800000","287.350000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.683090000","-0.105190000","0.667110000","205.900000000" +"32","toluene","108-88-3","HC","32","C7H8","92.141000000","0.871000000","318.640000000","41.086000000","0.264100000","110.650000000","92.141000000","316.000000000","Classic","52943.500000000","32.141924000","0.029581212","0.001110417","-0.000001551","6.393466e-10","pow10","6.950870000","1342.310000000","219.187000000","0.000000000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.946900000","-0.589600000","1.213200000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","1A","0.000000000","0.000000000","0.125100000","0.000000000","233750.000000000","9.214000000","0.803700000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","2.814900000","3.716900000","285.690000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.764650000","-0.097370000","0.425650000","207.000000000" +"33","n-heptane","142-82-5","HC","33","C7H16","100.205000000","0.690000000","267.050000000","27.400000000","0.349500000","98.450000000","100.205000000","432.000000000","Classic","58553.600000000","80.097076000","0.034552984","0.001288171","-0.000001668","6.459978e-10","pow10","6.896770000","1264.900000000","216.544000000","0.000000000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","2.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","311.000000000","14100.000000000","1000.000000000","0.006110000","182.570000000","182.570000000","-187800.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","1.160500000","-1.260600000","2.551700000","0.000000000","0.000000000","0.000000000","0.423359000","0.835150000","1.982920000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","291780.000000000","12.535000000","0.913700000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","3.483100000","3.804900000","238.400000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","1","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.864790000","0.071560000","0.066920000","311.000000000" +"34","n-octane","111-65-9","HC","34","C8H18","114.232000000","0.708000000","295.550000000","24.900000000","0.399600000","125.650000000","114.232000000","492.000000000","Classic","68312.100000000","89.990736000","0.041428662","0.001475818","-0.000001923","7.465972e-10","pow10","6.918680000","1351.990000000","209.155000000","0.000000000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","351.000000000","6000.000000000","1000.000000000","0.006110000","216.370000000","216.370000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.997500000","0.580400000","-1.207500000","0.000000000","0.000000000","0.000000000","0.367046000","0.833616000","2.365850000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","348750.000000000","14.244000000","0.994150000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","3.817600000","3.837300000","242.780000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.963310000","-0.256300000","0.886400000","351.000000000" +"35","nC10","124-18-5","HC","35","C10H22","142.285000000","0.734000000","344.550000000","21.100000000","0.492300000","174.150000000","142.285000000","603.000000000","Classic","87828.400000000","111.964638000","0.034411646","0.001922778","-0.000002533","9.951858e-10","pow10","6.943630000","1495.170000000","193.858000000","0.000000000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","431.000000000","9300.000000000","1000.000000000","0.006110000","243.450000000","243.450000000","-249700.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","1.140600000","0.586700000","-1.361000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","473890.000000000","17.865000000","1.132430000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","4.662700000","3.838400000","243.870000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1.068180000","-0.072450000","0.436410000","431.000000000" +"36","n-nonane","111-84-2","HC","36","C9H20","128.258000000","0.722000000","322.500000000","23.056000000","0.437700000","150.850000000","128.258000000","548.000000000","Classic","78069.900000000","101.031728000","0.038036550","0.001697386","-0.000002226","8.700601e-10","pow10","6.938930000","1431.820000000","202.110000000","0.000000000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","391.000000000","6000.000000000","1000.000000000","0.006110000","219.600000000","219.600000000","-228300.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","412506.100000000","16.035000000","1.046280000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000025792","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","4.207900000","3.844800000","244.510000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1.041220000","-0.229190000","0.647520000","391.000000000" +"37","hydrogen","1333-74-0","HC","37","hydrogen","2.016000000","0.000000000","-239.950000000","12.970000000","-0.220000000","-252.750000000","2.016000000","65.000000000","Classic","-9755.849721806","23.969262000","0.030603834","-0.000064184","0.000000057","-1.770882e-11","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"38","argon","7440-37-1","HC","38","argon","39.948000000","0.000000000","-122.350000000","48.740000000","-0.004000000","-185.850000000","39.948000000","74.900000000","Classic","16633.200000000","20.785000000","0.000000000","0.000000000","0.000000000","0.000000000","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.689500000","83.800000000","83.800000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"39","i-butane","75-28-5","HC","39","C4H10","58.123000000","0.000000000","134.990000000","36.480000000","0.177000000","-11.750000000","58.124000000","263.000000000","Classic","29278.100000000","27.860214000","0.148679262","0.000455357","-0.000000673","2.6962302e-10","pow10","4.002720000","947.540000000","248.870000000","0.000000000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","3.081016220","225.150443898","0.870818654","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","181.500000000","6000.000000000","1000.000000000","0.000000140","113.540000000","273.000000000","-134510.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.780388360","-0.273389543","0.659787119","0.000000000","0.000000000","0.000000000","0.217971280","0.848891073","2.284036968","0","0","0.000000000","0.000000000","0.000000000","0.000000000","129094.000000000","7.470000000","0.702100000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","24540","0.000027115","0.000000000","0.000000000","0.081890000","4013.000000000","0.000000000","0.000000000","0.081890000","4013.000000000","yes","2.261600000","3.757400000","216.530000000","0.000000000","0.000000000","3.081016220","225.150443898","0.870818654","1.000000000","0","4000.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.081640000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.656170000","-0.138700000","0.503920000","181.500000000" +"40","c-propane","74-98-6","HC","40","C3H6","42.081000000","0.000000000","124.650000000","54.920000000","0.264000000","-32.750000000","42.081000000","170.000000000","Classic","18117.100000000","37.354802000","-0.150458458","0.001059536","-0.000001334","5.3425764e-10","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","132.500000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","132.500000000" +"41","Cs+","74-82-8","ion","41","Cs+","32.042000000","0.797000000","444.150000000","290.890000000","0.344000000","64.550000000","32.042000000","99.000000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","-8.547960000","0.769820000","-3.108500000","1.544810000","0.000000000","1.700000000","0.215000000","0.000000000","0.000000000","2.380000000","481.800000000","0.000000000","3","-39.350000000","4826.000000000","0.109100000","-0.000113000","-587000.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","solute","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.797000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2.380000000","481.800000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"42","Rb+","74-82-8","ion","42","Rb+","32.042000000","0.797000000","444.150000000","290.890000000","0.344000000","64.550000000","32.042000000","99.000000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","-8.547960000","0.769820000","-3.108500000","1.544810000","0.000000000","1.700000000","0.215000000","0.000000000","0.000000000","2.360000000","481.800000000","0.000000000","3","-39.350000000","4826.000000000","0.109100000","-0.000113000","-587000.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","solute","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.797000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2.360000000","481.800000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"43","ice","74-82-8","ice","43","H2O","18.015000000","0.999000000","374.150000000","220.890000000","0.344000000","100.000000000","18.015000000","56.000000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-57.710000000","7647.000000000","0.144200000","-0.000135700","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.082928410","-1.243257568","-0.253919105","-0.384000000","0.005250000","-0.000006370","207.000000000","2700.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","1.090000000","-0.638000000","0.635000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","4","0","0.000000000","0.000000000","0.070118289","16201.000000000","11253.994270000","1.629710202","1.170113583","13855.596960000","1.456360879","0.664155324","0.046473789","1","17.387107060","-6141.762746000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"44","nC11","1120-21-4","HC","44","C11H24","156.300000000","0.743200000","365.850000000","19.500000000","0.530300000","195.950000000","156.300000000","660.000000000","Classic","97578.500000000","-8.390000000","1.053000000","-0.000579900","0.000000123","0.000000000","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","471.000000000","22180.000000000","6860.000000000","0.006110000","247.580000000","247.580000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","1.155900000","-0.306210000","0.941190000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","552201.000000000","19.790900000","1.143700000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","4.908200000","3.889300000","248.820000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","1","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1.155900000","-0.306210000","0.941190000","471.000000000" +"45","nC12","112-40-3","HC","45","C12H26","170.300000000","0.751300000","384.850000000","18.200000000","0.576400000","216.350000000","170.300000000","713.000020790","Classic","107318.200000000","143.241906000","-0.060209988","0.002653995","-0.000003518","0.000000001","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","511.000000000","36820.000000000","1000.000000000","0.006110000","263.570000000","263.570000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","1.205870000","-0.323610000","1.076340000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","624030.000000000","21.624000000","1.195310000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","5.306000000","3.895900000","249.210000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","1","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1.205870000","-0.323610000","1.076340000","511.000000000" +"46","nC13","629-50-5","HC","46","C13H28","184.400000000","0.758000000","401.850000000","16.800000000","0.617400000","235.450000000","184.400000000","780.000000000","Classic","117127.500000000","154.191444000","-0.063485704","0.002876976","-0.000003822","0.000000001","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","554.300000000","28501.000000000","1000.000000000","0.006110000","267.790000000","267.790000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","1.291160000","-0.533470000","1.483180000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","766180.000000000","25.053000000","1.290570000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","5.687700000","3.914300000","249.780000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","1","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1.291160000","-0.533470000","1.483180000","554.300000000" +"47","nC14","629-59-4","HC","47","C14H30","198.400000000","0.763900000","419.850000000","15.700000000","0.643000000","253.550000000","198.400000000","830.000000000","Classic","126867.200000000","152.769750000","0.054747690","0.002686003","-0.000003547","0.000000001","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","594.600000000","45070.000000000","1000.000000000","0.006110000","279.020000000","279.020000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","1.294260000","0.020290000","0.104280000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","5.900200000","3.939600000","254.210000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","1","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1.294260000","0.020290000","0.104280000","594.600000000" +"48","nC15","629-62-9","HC","48","C15H32","212.400000000","0.769100000","434.850000000","14.800000000","0.686300000","270.650000000","212.400000000","880.000000000","Classic","136606.900000000","176.090520000","-0.070037136","0.003323022","-0.000004430","0.000000001","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","556.300000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","1.414720000","-0.638900000","1.603140000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","6.285500000","3.953100000","254.140000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","1","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1.414720000","-0.638900000","1.603140000","556.300000000" +"49","nC16","544-76-3","HC","49","C16H34","226.400000000","0.773800000","443.850000000","14.190000000","0.742000000","286.850000000","226.400000000","920.000000000","Classic","146346.600000000","330.456558000","-1.713947728","0.009545635","-0.000012932","0.000000005","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","675.200000000","47545.000000000","1000.000000000","0.006110000","291.300000000","291.300000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","1.430760000","-0.454150000","1.195570000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","6.648500000","3.955200000","254.700000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","1","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","675.200000000" +"50","nC17","629-78-7","HC","50","C17H36","240.470000000","0.778000000","462.350000000","13.630000000","0.657200000","302.050000000","240.500000000","1000.000000000","Classic","156155.900000000","197.981282000","-0.076571940","0.003768985","-0.000005038","0.000000002","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","715.500000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","1.463920000","-0.450710000","1.658120000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","6.980900000","3.967500000","255.650000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","1","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1.463920000","-0.450710000","1.658120000","715.500000000" +"51","nC18","593-45-3","HC","51","C18H38","254.500000000","0.781900000","473.850000000","12.700000000","0.811000000","316.350000000","254.500000000","1030.000000000","Classic","165895.600000000","208.930820000","-0.079839342","0.003991967","-0.000005342","0.000000002","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","755.800000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","1.543890000","-0.705930000","1.694580000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","7.327100000","3.966800000","256.200000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","1","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1.543890000","-0.705930000","1.694580000","755.800000000" +"52","nC19","629-92-5","HC","52","C19H40","268.000000000","0.785400000","486.950000000","12.470000000","0.707300000","329.950000000","268.500000000","1085.000000000","Classic","175635.300000000","219.880358000","-0.083123372","0.004214948","-0.000005646","0.000000002","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","796.100000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","1.467200000","-0.058400000","1.406340000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","7.717500000","3.972100000","256.000000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","1","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1.467200000","-0.058400000","1.406340000","796.100000000" +"53","nC20","112-95-8","HC","53","C20H42","282.600000000","0.788100000","493.850000000","11.150000000","0.907000000","343.850000000","282.600000000","1140.000000000","Classic","185444.600000000","230.829896000","-0.086374146","0.004437930","-0.000005950","0.000000002","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","836.400000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","1.781740000","-1.488860000","3.122780000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","7.984900000","3.986900000","257.750000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","1","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","836.400000000" +"54","nC21","629-94-7","HC","54","C21H44","296.582000000","0.791100000","506.450000000","10.740000000","0.861000000","357.550000000","296.582000000","1195.000000000","Classic","195171.800000000","230.829896000","-0.086374146","0.004437930","95.008038000","0.040390996","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","876.700000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","1.829097302","-1.002129722","1.025766200","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","1","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","876.700000000" +"55","nC22","629-97-0","HC","55","C22H46","310.000000000","0.793700000","519.050000000","11.160000000","0.777000000","369.550000000","310.609000000","1250.000000000","Classic","204930.300000000","230.829896000","-0.086374146","0.004437930","95.008038000","0.040390996","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","917.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","1.880405836","-1.070711658","1.049515300","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","1","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","917.000000000" +"56","nC23","638-67-5","HC","56","C23H48","324.636000000","0.796100000","528.750000000","10.820000000","0.799000000","381.050000000","324.636000000","1305.000000000","Classic","214688.800000000","230.829896000","-0.086374146","0.004437930","95.008038000","0.040390996","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","957.300000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","1.969047395","-1.194287269","1.090271820","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","1","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","957.300000000" +"57","nC24","646-31-1","HC","57","C24H50","338.662000000","0.798400000","533.150000000","9.320000000","0.950000000","391.950000000","338.662000000","1360.000000000","Classic","224446.600000000","230.829896000","-0.086374146","0.004437930","95.008038000","0.040390996","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","997.600000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","2.044270695","-1.304114220","1.124593100","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","1","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","997.600000000" +"58","22-dim-C3","463-82-1","HC","58","C5H12","72.151000000","0.653999900","160.630000000","31.992000000","0.196400000","49.750000000","72.151000000","303.000000000","Classic","39036.600000000","-95.012392000","1.297291618","-0.002775462","0.000003336","-0.000000001","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","225.900000000","10810.000000000","1000.000000000","0.006110000","256.760000000","256.760000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","33200","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","2.354300000","3.955000000","225.690000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.672670000","-0.179150000","0.814600000","225.900000000" +"59","22-dim-C4","75-83-2","HC","59","C6H14","86.178000000","0.654000000","215.630000000","30.800000000","0.233900000","49.750000000","86.178000000","359.000000000","Classic","48795.100000000","25.000198000","0.324736526","0.000403312","-0.000000685","2.7993238e-10","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","265.900000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","2.600800000","4.004200000","243.510000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.698860000","0.111900000","-0.063550000","265.900000000" +"60","23-dim-C4","79-29-8","HC","60","C6H14","86.178000000","0.667000000","226.830000000","31.268000000","0.247500000","58.050000000","86.178000000","358.000000000","Classic","48795.100000000","-18.407196000","0.618162528","-0.000307368","0.000000022","2.560712e-11","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","266.600000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","2.685300000","3.954500000","246.070000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.729270000","0.013220000","0.188750000","266.600000000" +"61","2-m-C5","107-83-5","HC","61","C6H14","86.178000000","0.658000000","224.350000000","30.102000000","0.278100000","60.250000000","86.178000000","367.000000000","Classic","48795.100000000","17.426144000","0.385927566","0.000259729","-0.000000567","2.4127228e-10","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","268.800000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","2.931700000","3.853500000","235.580000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.767140000","0.070530000","0.053360000","268.800000000" +"62","3-m-C5","96-14-0","HC","62","C6H14","86.178000000","0.669000000","231.280000000","31.240000000","0.273700000","63.250000000","86.178000000","367.000000000","Classic","48795.100000000","3.599962000","0.092642902","0.000060692","-0.000000134","5.73666e-11","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","267.400000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","2.885200000","3.860500000","240.480000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.811810000","-0.426930000","1.213850000","267.400000000" +"63","c-C5","287-92-3","HC","63","C5H8","70.135000000","0.669000000","238.610000000","45.023000000","0.194300000","49.250000000","70.135000000","260.000000000","Classic","37634.100000000","41.727966000","-0.164068476","0.001489619","-0.000001803","6.829951e-10","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","203.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.011610000","5479.000000000","no","2.365500000","3.711400000","265.830000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.654610000","0.025740000","0.192520000","203.000000000" +"64","default","0-0-0-0","HC","64","default","16.043000000","0.422182073","-82.586000000","45.389000000","0.008000000","-161.550000000","16.043000000","99.000000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","-6.004350000","1.188500000","-0.834080000","-1.228330000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","3.165000000","154.540000000","0.383400000","3","-26.870000000","1150.000000000","0.187000000","-0.000521000","-50500.000000000","2.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","solute","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.303000000","-0.000605000","-0.000003200","207.000000000","941.000000000","452.000000000","0.117000000","849.150000000","849.150000000","-74500.000000000","186.000000000","1.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1.000000000","0.000000000","0.000000000","0.000000000","0.000000000","10200000.0000000","0.261000000","-0.147000000","0.222000000","0.000000000","0.100000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","2.562000000","3.829600000","230.750000000","0.000000000","0.000000000","3.165000000","154.540000000","0.383400000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"65","Piperazine","74-82-8","amine","65","Piperazine","86.137000000","1.038000000","364.850000000","55.300000000","0.414000000","146.000000000","119.160000000","99.000000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","172.780000000","-13492.000000000","-21.910000000","0.000013780","2.000000000","1.700000000","0.000000000","0.000000000","0.000000000","3.960000000","481.800000000","0.000000000","3","-75.190000000","12680.000000000","0.157300000","-0.000122500","57900.000000000","148.900000000","0.000000000","-0.624910000","0.000771000","0.000000000","0","solute","0.000000000","0.000000000","0.000000000","0.000000000","-0.198420000","-2.857000000","2.037300000","0.000000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.797000000","1.074477592","0.229022552","-0.421330787","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","17.387107060","1.762745870","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","3.960000000","481.800000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"66","Piperazine+","74-82-8","ion","66","Piperazine+","87.137000000","1.038000000","364.840000000","55.300000000","0.414000000","146.000000000","119.160000000","99.000000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","172.780000000","-13492.000000000","-21.910000000","0.000013780","2.000000000","1.700000000","0.000000000","0.000000000","0.000000000","7.000000000","481.800000000","0.000000000","3","-75.190000000","12680.000000000","0.157300000","-0.000122500","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","solute","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.797000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","7.000000000","481.800000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"67","PZCOO-","74-82-8","ion","67","PiperazineCarbamate","129.147000000","1.038000000","364.840000000","55.300000000","0.414000000","146.000000000","119.160000000","99.000000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","172.780000000","-13492.000000000","-21.910000000","0.000013780","2.000000000","1.700000000","0.000000000","0.000000000","0.000000000","5.500000000","481.800000000","0.000000000","3","-75.190000000","12680.000000000","0.157300000","-0.000122500","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","-1","solute","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.797000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","5.500000000","481.800000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"68","H+PZCOO-","74-82-8","ion","68","PiperazineCarbamate","130.147000000","1.038000000","729.680000000","110.600000000","0.414000000","292.000000000","119.160000000","99.000000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","172.780000000","-13492.000000000","-21.910000000","0.000013780","2.000000000","1.700000000","0.000000000","0.000000000","0.000000000","5.400000000","481.800000000","0.000000000","3","-75.190000000","12680.000000000","0.157300000","-0.000122500","57900.000000000","148.900000000","0.000000000","-0.624910000","0.000771000","0.000000000","0","solute","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.797000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","5.400000000","481.800000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"69","-OOCPZCOO-","74-82-8","ion","69","PiperazineCarbamate","172.157000000","1.038000000","364.840000000","55.300000000","0.414000000","146.000000000","119.160000000","99.000000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","172.780000000","-13492.000000000","-21.910000000","0.000013780","2.000000000","1.700000000","0.000000000","0.000000000","0.000000000","7.000000000","481.800000000","0.000000000","3","-75.190000000","12680.000000000","0.157300000","-0.000122500","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","-2","solute","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.797000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","7.000000000","481.800000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"70","c-hexane","110-82-7","HC","70","C6H8","84.161000000","0.783000000","280.390000000","40.748000000","0.211800000","80.750000000","84.161000000","260.000000000","Classic","47392.600000000","33.546990000","-0.036855962","0.001399578","-0.000001727","6.4400244e-10","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","240.800000000","6000.000000000","1000.000000000","0.053397292","279.700000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","212570.000000000","9.083800000","0.742650000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","43200","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000436500","5951.000000000","no","2.530300000","3.849900000","278.110000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.680540000","-0.068980000","0.576480000","240.800000000" +"71","22-DM-C5","590-35-2","HC","71","C7H16","100.204000000","0.667000000","247.250000000","27.700000000","0.287000000","58.050000000","86.178000000","358.000000000","Classic","0.000000000","10.932910000","0.502681068","0.000233872","-0.000000633","2.8550276e-10","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"72","M-cy-C5","96-37-7","HC","72","C7H16","84.161000000","0.667000000","259.640000000","37.845000000","0.230200000","100.900000000","86.178000000","358.000000000","Classic","47392.600000000","44.721006000","-0.068657012","0.001437740","-0.000001799","6.8698582e-10","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","258.500000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.749520000","-0.390120000","1.166130000","258.500000000" +"73","24-DM-C5","74-82-8","HC","73","C7H16","100.204000000","0.667000000","246.640000000","27.368000000","0.301800000","58.050000000","86.178000000","358.000000000","Classic","0.000000000","-26.047762000","0.814131822","-0.000574663","0.000000201","-2.0785e-11","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.826810000","-0.184800000","0.710800000","207.000000000" +"74","223-TM-C4","594-82-1","HC","74","C8H18","100.204000000","0.667000000","257.950000000","29.500000000","0.250000000","58.050000000","86.178000000","358.000000000","Classic","58553.600000000","-5.911254000","0.611594468","-0.000083721","-0.000000250","1.3161062e-10","loglog","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"75","33-DM-C5","74-82-8","HC","75","C7H16","100.204000000","0.667000000","263.150000000","29.500000000","0.269000000","58.050000000","86.178000000","358.000000000","Classic","58553.600000000","-3.990720000","0.610372310","-0.000061523","-0.000000296","1.5148108e-10","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"76","2-M-C6","591-76-4","HC","76","C7H16","100.204000000","0.667000000","257.220000000","27.338000000","0.328200000","58.050000000","86.178000000","358.000000000","Classic","58552.200000000","28.699928000","0.385545122","0.000452780","-0.000000821","3.3995946e-10","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.868400000","-0.213840000","0.728400000","207.000000000" +"77","23-DM-C5","74-82-8","HC","77","C7H16","100.204000000","0.667000000","264.150000000","29.100000000","0.297000000","58.050000000","86.178000000","358.000000000","Classic","0.000000000","-35.866596000","0.804030312","-0.000536585","0.000000185","-2.602282e-11","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000",,,,"207.000000000" +"78","11-DM-cy-C5","74-82-8","HC","78","C7H16","100.204000000","0.667000000","226.750000000","31.310000000","0.247000000","58.050000000","86.178000000","358.000000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"79","3-M-C6","589-34-4","HC","79","C7H16","100.204000000","0.667000000","262.100000000","28.138000000","0.321600000","58.050000000","86.178000000","358.000000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","loglog","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","293.800000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.861240000","-0.239030000","0.782780000","293.800000000" +"80","cis-13-DM-cy-C5","74-82-8","HC","80","C7H16","98.188000000","0.667000000","277.850000000","34.000000000","0.276000000","58.050000000","86.178000000","358.000000000","Classic","57150.400000000","-20.967908000","0.503312932","0.000224727","-0.000000629","2.7943354e-10","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"81","trans-13-DM-cy-C5","74-82-8","HC","81","C7H16","98.188000000","0.667000000","279.850000000","34.000000000","0.253000000","58.050000000","86.178000000","358.000000000","Classic","57150.400000000","-20.967908000","0.503312932","0.000224727","-0.000000629","2.7943354e-10","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"82","trans-12-DM-cy-C5","74-82-8","HC","82","C7H16","98.188000000","0.667000000","279.850000000","34.000000000","0.253000000","58.050000000","86.178000000","358.000000000","Classic","57150.400000000","-54.500000000","0.759200000","-0.000448000","0.000000101","0.000000000","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"83","224-TM-C5","74-82-8","HC","83","C7H16","114.231000000","0.667000000","270.130000000","25.700000000","0.304000000","58.050000000","86.178000000","358.000000000","Classic","0.000000000","3.192576000","0.640668526","0.000055288","-0.000000462","2.1774366e-10","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"84","113-TM-cy-C5","74-82-8","HC","84","C7H16","114.231000000","0.667000000","270.130000000","25.700000000","0.304000000","58.050000000","86.178000000","358.000000000","Classic","66908.200000000","-7.490000000","0.630100000","-0.000254000","0.000000000","0.000000000","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"85","22-DM-C6","74-82-8","HC","85","C7H16","114.231000000","0.667000000","276.650000000","25.300000000","0.339000000","58.050000000","86.178000000","358.000000000","Classic","0.000000000","28.699928000","0.459115708","0.000504327","-0.000000937","3.6348808e-10","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"86","E-cy-C5","74-82-8","HC","86","C7H16","98.188000000","0.667000000","296.370000000","33.977000000","0.271500000","58.050000000","86.178000000","358.000000000","Classic","57151.100000000","48.611958000","-0.000399072","0.001455531","-0.000001870","7.1965984e-10","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","289.100000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.764250000","-0.013170000","0.287760000","289.100000000" +"87","25-DM-C6","74-82-8","HC","87","C7H16","114.231000000","0.667000000","280.350000000","25.600000000","0.344000000","58.050000000","86.178000000","358.000000000","Classic","0.000000000","-11.365238000","0.725687490","-0.000149568","-0.000000277","1.5439098e-10","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"88","24-DM-C6","74-82-8","HC","88","C7H16","114.231000000","0.667000000","280.350000000","25.600000000","0.343600000","58.050000000","86.178000000","358.000000000","Classic","0.000000000","-28.034808000","0.903274530","-0.000604178","0.000000180","-8.56342e-12","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.882520000","-0.209990000","0.804150000","207.000000000" +"89","cis-13-DM-cy-C6","74-82-8","HC","89","C7H16","114.231000000","0.667000000","318.000000000","29.384000000","0.236600000","58.050000000","86.178000000","358.000000000","Classic","66908.200000000","-65.200000000","0.883900000","-0.000493200","0.000000102","0.000000000","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.631300000","0.682390000","-0.768230000","207.000000000" +"90","3-M-C7","589-81-1","HC","90","C7H16","114.231000000","0.667000000","290.520000000","25.463000000","0.371600000","58.050000000","86.178000000","358.000000000","Classic","68310.700000000","-9.220000000","0.786000000","-0.000440000","0.000000096","0.000000000","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","326.600000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.927720000","-0.276050000","0.942950000","326.600000000" +"91","3-E-C6","74-82-8","HC","91","C7H16","114.231000000","0.667000000","292.250000000","26.100000000","0.362000000","58.050000000","86.178000000","358.000000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"92","ethylbenzene","100-41-4","HC","92","C7H16","106.168000000","0.871000000","344.020000000","36.094000000","0.303600000","58.050000000","86.178000000","358.000000000","Classic","62702.000000000","37.778816000","0.087945492","0.001134362","-0.000001602","6.555589e-10","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","285.900000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","288600.000000000","10.872000000","0.853900000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","3.079900000","3.797400000","287.350000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.828530000","-0.182090000","0.651570000","285.900000000" +"93","m-Xylene","108-38-3","HC","93","C7H16","106.170000000","0.868000000","343.900000000","35.412000000","0.326000000","139.120000000","106.167000000","358.000000000","Classic","62702.000000000","33.272628000","0.145802618","0.000880452","-0.000001250","4.9950512e-10","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","301.400000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","1A","0.000000000","0.000000000","0.120000000","0.000000000","290860.000000000","10.872000000","0.868100000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","3.186100000","3.756300000","283.980000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.866530000","-0.187400000","0.494120000","301.400000000" +"94","p-Xylene","106-42-3","HC","94","C7H16","106.170000000","0.667000000","343.080000000","35.108000000","0.325900000","138.360000000","106.167000000","358.000000000","Classic","62702.000000000","34.195482000","0.123953426","0.000981883","-0.000001390","5.6003104e-10","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","301.400000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","1A","0.000000000","0.000000000","0.120000000","0.000000000","293166.300000000","10.980000000","0.862560000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.872230000","-0.317790000","0.808790000","301.400000000" +"95","o-Xylene","95-47-6","HC","95","C7H16","106.167000000","0.667000000","357.220000000","37.342000000","0.312700000","139.150000000","106.167000000","358.000000000","Classic","62702.000000000","27.344746000","0.283873216","0.000414785","-0.000000692","2.7752132e-10","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","301.400000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","1A","0.000000000","0.000000000","0.120000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.844520000","-0.205100000","0.611540000","301.400000000" +"97","2-M-C8","3221-61-2","HC","97","C7H16","100.204000000","0.667000000","313.600000000","22.900000000","0.421700000","58.050000000","86.178000000","358.000000000","Classic","78069.200000000","49.168996000","0.391082246","0.000863575","-0.000001387","5.6967528e-10","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","359.400000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","359.400000000" +"98","ethylcyclohexane","1678-91-7","HC","98","C8H16","100.204000000","0.667000000","336.000000000","30.398000000","0.245500000","58.050000000","86.178000000","358.000000000","Classic","66908.200000000","-63.900000000","0.889400000","-0.000510800","0.000000110","0.000000000","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.636370000","0.727510000","-0.813160000","207.000000000" +"99","i-pentane","78-78-4","HC","99","iC5","72.151000000","0.626000000","187.280000000","33.812000000","0.227500000","27.800000000","72.151000000","306.000000000","Classic","39036.600000000","16.287126000","0.317519974","0.000202362","-0.000000430","1.799981e-10","log","72.350000000","-5010.900000000","-7.883000000","0.000008979","2.000000000","0.000000000","0.000000000","0.000000000","0.000000000","5.784000000","341.100000000","0.000000000","2","-7.811000000","3140.000000000","0.000000000","0.000000000","-394370.000000000","-19.290500000","29814.500000000","-0.019678000","0.013189000","0.031144000","0","solute","0.000000000","0.000000000","0.000000000","0.000000000","-0.030486678","-4.461903736","4.285718649","-0.384000000","0.005250000","-0.000006370","225.000000000","6000.000000000","1000.000000000","0.000000001","113.250000000","113.450000000","-242000.000000000","189.000000000","12.700000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.857887409","-0.267638226","0.458642756","0.000000000","0.000000000","0.000000000","0.342669912","0.851893781","1.921875279","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","5.347550000","1","1.000000000","-17.085200000","0.000000000","0","0.000027507","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","5.784000000","341.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.715820000","-0.100580000","0.383140000","225.000000000" +"100","H2S","7783-06-4","inert","100","H2S","34.080000000","1.100000000","100.380000000","89.607000000","0.094200000","-59.650000000","34.080000000","98.500000000","Classic","12550.900000000","35.467524000","-0.028583532","0.000109661","-0.000000110","4.057232e-11","log","-6.956260000","1.196950000","-3.126140000","2.994480000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","3.620000000","195.200000000","0.000000000","2","-7.811000000","3140.000000000","0.000000000","0.000000000","-394000.000000000","2.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","solute","0.000000000","0.000000000","0.000000000","0.059565000","0.018570000","0.000000000","-2.078000000","-0.384000000","0.005250000","-0.000006370","80.100000000","6000.000000000","1000.000000000","0.232000000","187.660000000","187.660000000","-242000.000000000","189.000000000","53.000000000","-0.007840000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.100000000","0.550700000","0.453400000","-0.584100000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2","2A","0.000000000","0.000000000","0.001160489","5000.000000000","44505.000000000","2.850000000","0.602650000","0.000000000","0.000000000","0.000000000","0.000000000","1","4.436810000","-829.439000000","-25.412000000","0","0.000000000","0.009928000","2999.000000000","0.016130000","3737.000000000","0.000268400","4242.000000000","0.855300000","2325.000000000","yes","1.694100000","3.021400000","226.790000000","0.000000000","0.000000000","3.941000000","195.200000000","0.000000000","1.000000000","0","4119.560000000","0.004000000","3141.600000000","0.295855000","2936.130000000","0.001244960","2778.000000000","0.339898000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.509090000","-0.002814000","0.362150000","80.100000000" +"101","S8","74-82-8","other","101","S8","256.480000000","0.990000000","885.000000000","63.000000000","0.205900000","444.600000000","256.480000000","449.500000000","Classic","68312.100000000","89.990736000","0.041428662","0.001475818","-0.000001923","7.465972e-10","log","5.201200000","1936.281000000","-20.143000000","1000.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","6.000000000","454.000000000","0.383400000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-50000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solute","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","-0.384000000","0.005250000","-0.000006370","351.000000000","12860.000000000","1000.000000000","0.000039662","392.750000000","392.750000000","0.000000000","0.000000000","12.000000000","1.000000000","1.000000000","1.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.990000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","8.046000000","-4600.000000000","-144.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1.200000000","132.000000000","0.383400000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","351.000000000" +"102","AceticAcid","74-82-8","acid","102","Hac","60.053000000","0.990000000","318.8","57.860000000","0.462000000","117.890000000","60.050000000","171.000000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","4.682060000","1642.540000000","-39.764000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","3.820000000","132.000000000","0.383400000","3","-24.000000000","1122.000000000","0.200000000","0.000000000","-50000.000000000","6.200000000","0.000000000","0.000000000","0.000000000","0.000000000","0","solute","0.000000000","0.000000000","0.000000000","0.000000000","0.103200000","0.003650000","-2.064000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1000.000000000","0.000039662","250.000000000","250.000000000","0.000000000","0.000000000","12.000000000","1.000000000","1.000000000","1.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.990000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","1A","0.000000000","0.000000000","0.00452","40323","91195.7","4.6818","0.4644","0.000000000","0.000000000","0.000000000","0.000000000","1","8.046000000","-4600.000000000","-144.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","3.820000000","132.000000000","0.383400000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000" +"103","Ac-","74-82-8","ion","103","Ac-","59.053000000","0.990000000","319.550000000","57.860000000","0.462000000","117.890000000","59.053000000","171.000000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","4.682060000","1642.540000000","-39.764000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","3.820000000","132.000000000","0.383400000","3","-24.000000000","1122.000000000","0.200000000","0.000000000","-50000.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","-1","solute","0.000000000","0.000000000","0.000000000","0.000000000","0.103200000","0.003650000","-2.064000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1000.000000000","0.000039662","250.000000000","250.000000000","0.000000000","0.000000000","12.000000000","1.000000000","1.000000000","1.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.990000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","8.046000000","-4600.000000000","-144.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","3.820000000","132.000000000","0.383400000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000" +"104","neon","74-82-8","inert","104","Ne","20.180000000","0.650000000","-228.750000000","26.652000000","-0.376000000","-248.700000000","18.050000000","25.000000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","29.755000000","-271.060000000","-2.608100000","0.000527000","2.000000000","1.800000000","0.076000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","solute","0.000000000","0.000000000","0.000000000","0.000000000","0.004662711","-207.888073200","167.156497400","0.000000000","0.000000000","0.000000000","207.000000000","6000.000000000","1000.000000000","0.438000000","24.560000000","24.450000000","-242000.000000000","189.000000000","74.691000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.484453999","-0.508813922","0.722394513","0.000000000","0.000000000","0.000000000","0.088380472","0.940022294","3.401190177","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","3.756410000","1","1.000000000","-1.503000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"105","acetone","67-64-1","other","105","Acetone","58.080000000","0.900000000","234.950000000","48.000000000","0.559000000","64.550000000","32.042000000","99.000000000","Classic","0.000000000","42.617564000","0.012562454","0.000476475","-0.000000596","2.2680592e-10","pow10","7.631300000","1566.690000000","273.419000000","0.000000000","0.000000000","1.700000000","0.215000000","0.000000000","0.000000000","3.626000000","481.800000000","0.000000000","3","-39.350000000","4826.000000000","0.109100000","-0.000113000","57900.000000000","-19.290500000","29814.500000000","-0.019678000","0.013189000","0.031144000","0","solvent",,,,,"0.000000000","0.000000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.797000000","1.437100000","-0.799420000","0.327800000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2","2B","0.000000000","0.000000000","0.015400000","24476.000000000","40220.000000000","3.120000000","0.462300000","47052.000000000","3.300000000","0.903700000","0.044900000","1","17.387107060","-7582.406220000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","3.626000000","481.800000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"106","HS-","74-82-8","ion","106","HS-","33.080000000","1.100000000","100.050000000","89.370000000","0.100000000","-59.650000000","34.080000000","98.500000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","-6.956260000","1.196950000","-3.126140000","2.994480000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","3.600000000","195.200000000","0.000000000","2","-7.811000000","3140.000000000","0.000000000","0.000000000","-394000.000000000","2.000000000","0.000000000","0.000000000","0.000000000","0.000000000","-1","solute","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.232000000","187.660000000","187.660000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.100000000","0.825200000","0.251500000","-1.703900000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.001160489","5000.000000000","34369.093554000","2.706357876","0.804782959","0.000000000","0.000000000","0.000000000","0.000000000","1","4.436810000","-829.439000000","-25.412000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","3.600000000","195.200000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"107","S--","74-82-8","ion","107","S--","32.080000000","1.100000000","100.050000000","89.370000000","0.100000000","-59.650000000","34.080000000","98.500000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","-6.956260000","1.196950000","-3.126140000","2.994480000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","3.500000000","195.200000000","0.000000000","2","-7.811000000","3140.000000000","0.000000000","0.000000000","-394000.000000000","2.000000000","0.000000000","0.000000000","0.000000000","0.000000000","-2","solute","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.232000000","187.660000000","187.660000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.100000000","0.825200000","0.251500000","-1.703900000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","4.436810000","-829.439000000","-25.412000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","3.500000000","195.200000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"108","ethanol","64-17-5","alcohol","108","CH4O","46.069220000","0.797000000","240.770000000","61.400000000","0.644000000","64.550000000","32.042000000","99.000000000","Classic","20891.500000000","36.548344000","0.005221192","0.000461094","-0.000000583","2.232309e-10","pow10","5.336750000","1648.220000000","230.918000000","0.000000000","0.000000000","1.700000000","0.215000000","0.000000000","0.000000000","3.626000000","481.800000000","0.000000000","3","-39.350000000","4826.000000000","0.109100000","-0.000113000","57900.000000000","-19.290500000","29814.500000000","-0.019678000","0.013189000","0.031144000","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","-0.384000000","0.005250000","-0.000006370","0.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.797000000","1.437100000","-0.799420000","0.327800000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2","2B","0.000000000","0.000000000","0.008000000","21532.010000000","86716.090000000","4.908000000","0.736900000","47052.000000000","3.300000000","0.903700000","0.044900000","1","17.387107060","-7582.406220000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","2.382700000","3.177100000","198.240000000","0.032380000","22060.367600000","3.626000000","481.800000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000" +"109","DEA","74-82-8","amine","109","DEA","119.163200000","1.038000000","240.750000000","61.400000000","0.644000000","140.000000000","119.160000000","99.000000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","-8.547960000","0.769820000","-3.108500000","1.544810000","0.000000000","1.700000000","0.000000000","0.000000000","0.000000000","4.500000000","481.800000000","0.000000000","3","-75.190000000","12680.000000000","0.157300000","-0.000122500","57900.000000000","-5.950000000","9276.380000000","-0.000006210","0.000000000","0.000000000","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.075980000","-1.355500000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.797000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","4","0","0.000000000","0.000000000","0.054120713","12000.000000000","258457.097700000","10.751008890","1.364219207","376276.884000000","10.783585850","1.258298307","0.000000000","1","17.387107060","1.762745870","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","4.500000000","481.800000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"110","DEA+","74-82-8","ion","110","CH4O","120.163200000","1.038000000","403.850000000","38.760000000","1.242000000","64.550000000","119.160000000","99.000000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","-8.547960000","0.769820000","-3.108500000","1.544810000","0.000000000","1.700000000","0.000000000","0.000000000","0.000000000","4.400000000","481.800000000","0.000000000","3","-39.350000000","4826.000000000","0.109100000","-0.000113000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","solute","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.797000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","4.400000000","481.800000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"111","DEACOO-","74-82-8","ion","111","PiperazineCarbamate","121.000000000","1.038000000","364.850000000","68.700000000","0.800000000","140.000000000","119.160000000","99.000000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","-8.547960000","0.769820000","-3.108500000","1.544810000","0.000000000","1.700000000","0.000000000","0.000000000","0.000000000","6.000000000","481.800000000","0.000000000","3","-75.190000000","12680.000000000","0.157300000","-0.000122500","57900.000000000","8.169760000","8989.300000000","0.000000000","0.000000000","0.000000000","-1","solute","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.797000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","4","0","0.000000000","0.000000000","0.054120713","12000.000000000","258457.097700000","10.751008890","1.364219207","376276.884000000","10.783585850","1.258298307","0.000000000","1","17.387107060","1.762745870","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","6.000000000","481.800000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"112","Piperazine++","74-82-8","ion","112","Piperazine++","88.137000000","1.038000000","364.850000000","68.700000000","0.800000000","140.000000000","119.160000000","99.000000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","-8.547960000","0.769820000","-3.108500000","1.544810000","0.000000000","1.700000000","0.000000000","0.000000000","0.000000000","3.000000000","481.800000000","0.000000000","3","-75.190000000","12680.000000000","0.157300000","-0.000122500","57900.000000000","8.169760000","8989.300000000","0.000000000","0.000000000","0.000000000","2","solute","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.797000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","4","0","0.000000000","0.000000000","0.054120713","12000.000000000","258457.097700000","10.751008890","1.364219207","376276.884000000","10.783585850","1.258298307","0.000000000","1","17.387107060","1.762745870","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","3.000000000","481.800000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"113","CaCO3","74-82-8","other","113","CaCO3","124.000000000","0.797000000","400.000000000","220.000000000","0.300000000","64.550000000","32.042000000","99.000000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","-8.547960000","0.769820000","-3.108500000","1.544810000","0.000000000","1.700000000","0.000000000","0.000000000","0.000000000","6.200000000","481.800000000","0.000000000","3","-39.350000000","4826.000000000","0.109100000","-0.000113000","-587000.000000000","2.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","solute","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.797000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","6.200000000","481.800000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"114","water","7732-18-5","water","114","H2O","18.015000000","0.999000000","374.150000000","220.890000000","0.344000000","100.000000000","18.015000000","56.000000000","Classic","1374.600000000","36.540030000","-0.034802404","0.000116811","-0.000000130","5.254448e-11","pow10","5.115640000","1687.537000000","230.170000000","0.000000000","0.000000000","1.800000000","0.076000000","0.235662374","0.000000000","2.520000000","809.100000000","0.000000000","3","-27.952757828","4665.225929930","0.052323342","-0.000038356","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.054783425","0.094678512","-2.267329403","-0.384000000","0.005250000","-0.000006370","52.878622600","6010.000000000","1000.000000000","0.006110000","273.160000000","273.150000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","5.459000000","0.305420000","647.130000000","0.081000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","1.087000000","-0.638000000","0.635000000","0.000000000","0.000000000","0.000000000","0.168272437","0.908482584","5.240427372","4","4C","0.296941807","0.000718744","0.069200000","16655.000000000","12277.000000000","1.451500000","0.673590000","13855.596960000","1.456360879","0.664155324","0.046473789","1","17.387107060","-6141.762746000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","1.065600000","3.000700000","366.510000000","0.034868000","20790.819800000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","-262.490000000","140.520000000","0.000000000","0.000000000","0.000000000","276370.000000000","-2090.100000000","8.125000000","-0.014116000","0.000009370","0.923656000","-0.379370000","0.442429000","52.419867266" +"115","F-","74-82-8","ion","115","F-","19.000000000","1.000000000","444.150000000","290.890000000","0.344000000","64.550000000","19.000000000","99.000000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","-8.547960000","0.769820000","-3.108500000","1.544810000","0.000000000","1.700000000","0.215000000","0.000000000","0.000000000","2.720000000","481.800000000","0.000000000","3","-39.350000000","4826.000000000","0.109100000","-0.000113000","-157000.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","-1","solute","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.797000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2.720000000","481.800000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"116","Fe++","74-82-8","ion","116","Fe++","55.850000000","0.797000000","444.150000000","290.890000000","0.344000000","55.850000000","40.080000000","99.000000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","-8.547960000","0.769820000","-3.108500000","1.544810000","0.000000000","1.700000000","0.215000000","0.000000000","0.000000000","6.000000000","481.800000000","0.000000000","3","-39.350000000","4826.000000000","0.109100000","-0.000113000","-587000.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2","solute","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.797000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","6.000000000","481.800000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"117","Rb+","74-82-8","ion","117","Rb+","85.470000000","0.797000000","444.150000000","290.890000000","0.344000000","64.550000000","85.470000000","99.000000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","-8.547960000","0.769820000","-3.108500000","1.544810000","0.000000000","1.700000000","0.215000000","0.000000000","0.000000000","2.360000000","481.800000000","0.000000000","3","-39.350000000","4826.000000000","0.109100000","-0.000113000","-587000.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","solute","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","1.038000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2.360000000","481.800000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"118","Pb++","74-82-8","ion","118","Pb++","207.200000000","0.797000000","444.150000000","290.890000000","0.344000000","64.550000000","207.200000000","99.000000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","-8.547960000","0.769820000","-3.108500000","1.544810000","0.000000000","1.700000000","0.215000000","0.000000000","0.000000000","5.660000000","481.800000000","0.000000000","3","-39.350000000","4826.000000000","0.109100000","-0.000113000","-587000.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2","solute","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","1.038000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","5.660000000","481.800000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"119","NO3-","74-82-8","ion","119","NO3-","62.000000000","0.797000000","444.150000000","290.890000000","0.344000000","62.000000000","126.900000000","99.000000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","-8.547960000","0.769820000","-3.108500000","1.544810000","0.000000000","1.700000000","0.215000000","0.000000000","0.000000000","3.120000000","481.800000000","0.000000000","3","-39.350000000","4826.000000000","0.109100000","-0.000113000","-587000.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","-1","solute","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.797000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","3.120000000","481.800000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"120","ClO4-","74-82-8","ion","120","ClO4-","99.450000000","0.797000000","444.150000000","290.890000000","0.344000000","62.000000000","99.450000000","99.000000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","-8.547960000","0.769820000","-3.108500000","1.544810000","0.000000000","1.700000000","0.215000000","0.000000000","0.000000000","3.640000000","481.800000000","0.000000000","3","-39.350000000","4826.000000000","0.109100000","-0.000113000","-587000.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","-1","solute","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.797000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","3.640000000","481.800000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"121","SO4--","74-82-8","ion","121","SO4--","96.070000000","0.797000000","444.150000000","290.890000000","0.344000000","62.000000000","96.070000000","99.000000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","-8.547960000","0.769820000","-3.108500000","1.544810000","0.000000000","1.700000000","0.215000000","0.000000000","0.000000000","3.410000000","481.800000000","0.000000000","3","-39.350000000","4826.000000000","0.109100000","-0.000113000","-587000.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","-2","solute","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.797000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","3.410000000","481.800000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"123","helium","7440-59-7","inert","123","helium","4.003000000","0.000000000","-267.959999942","2.270000000","-0.390031993","-268.940009975","4.003000000","65.000000914","Classic","0.000000000","20.785000000","0.000000000","0.000000000","0.000000000","0.000000000","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"124","c-C7","291-64-5","HC","124","C7H14","98.189000000","0.813000000","331.150000000","38.402000000","0.243000000","118.450000000","98.189000000","353.000000000","Classic","57151.100000000","-76.200000000","0.786800000","-0.000420400","0.000000075","0.000000000","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","289.100000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","2.663700000","3.999300000","283.330000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.738330000","-0.220550000","0.876880000","289.100000000" +"125","c-C8","292-64-8","HC","125","C8H16","112.216000000","0.837000000","366.850000000","34.800000000","0.290400000","148.850000000","112.216000000","410.000000000","Classic","66909.600000000","35.218104000","0.109071366","0.001356262","-0.000001751","6.6403918e-10","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","321.900000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","2.825600000","4.103900000","294.040000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.809160000","-0.144450000","0.526580000","321.900000000" +"126","CO","630-08-0","inert","126","CO","28.011000000","1.100000000","-140.200994873","34.987500000","0.093000002","-191.450399780","44.010000000","94.000000000","Classic","0.000000000","32.524368000","-0.032532682","0.000098271","-0.000000108","4.28171e-11","log","140.540000000","-4735.000000000","-21.268000000","0.040909000","1.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2.340000000","168.770000000","0.680500000","2","-7.811000000","3140.000000000","0.000000000","0.000000000","-394000.000000000","2.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","solute","94.491400000","-6789.040000000","-11.451900000","-0.010454000","0.000000000","0.000000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","5.204412066","216.580000000","216.592000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.100000000","0.881738930","-0.856255022","3.094939327","0.000000000","0.000000000","0.000000000","1.413601068","-0.605965449","1.101814948","1","1A","0.000000000","0.000000000","0.300000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","6.812280000","-1301.679000000","-3.494000000","26100","0.000037687","4.856e-11","7196.900000000","0.098620000","2343.900000000","0.000060820","3417.900000000","0.168300000","2317.900000000","yes","1.309700000","3.250700000","92.150000000","0.000000000","0.000000000","2.340000000","168.770000000","0.680500000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"127","methanolPVTsim","74-82-8","alcohol","127","CH4O","32.042000000","0.797000000","239.450000000","80.960000000","0.559000000","64.550000000","32.042000000","99.000000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","-8.547960000","0.769820000","-3.108500000","1.544810000","0.000000000","1.700000000","0.215000000","0.200000000","0.000000000","3.626000000","481.800000000","0.000000000","3","-39.350000000","4826.000000000","0.109100000","-0.000113000","57900.000000000","-19.290500000","29814.500000000","-0.019678000","0.013189000","0.031144000","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","-0.384000000","0.005250000","-0.000006370","0.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.797000000","1.437100000","-0.799420000","0.327800000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2","2B","0.000000000","0.000000000","0.016100000","24591.000000000","40531.000000000","3.097800000","0.431020000","47052.000000000","3.300000000","0.903700000","0.044900000","1","17.387107060","-7582.406220000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","1.525500000","3.230000000","188.900000000","0.035176000","24106.443000000","3.626000000","481.800000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000" +"128","MEGPVTsim18","74-82-8","glycol","128","C2H6O2","62.069000000","1.117000000","446.850000000","90.000000000","0.534700000","197.350000000","62.069000000","186.000000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","exp","13.629900000","6022.180000000","-28.250000000","0.000000000","0.000000000","2.308200000","0.215000000","0.248800000","0.000000000","3.626000000","481.800000000","0.000000000","2","-7.811000000","3140.000000000","0.000000000","0.000000000","57900.000000000","-19.290500000","29814.500000000","-0.019678000","0.013189000","0.031144000","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.654009012","-3.955117195","3.671191916","0.517338954","-0.000798169","0.000000064","0.000000000","9960.000000000","904.000000000","0.000002420","260.000000000","260.000000000","-388000.000000000","324.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","82900000.0000000","0.427000000","0.000000000","0.000000000","0.000000000","1.117000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","4","4C","0.000000000","0.000000000","0.014100000","19752.000000000","108190.000000000","5.140000000","0.674400000","108190.000000000","5.140000000","0.674400000","0.051400000","1","17.090887000","-7800.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","3.626000000","481.800000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000" +"129","MEGPVTsim19","74-82-8","glycol","129","C2H6O2","62.069000000","1.117000000","446.850000000","90.000000000","0.534700000","197.350000000","62.069000000","186.000000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","exp","13.629900000","6022.180000000","-28.250000000","0.000000000","0.000000000","2.308200000","0.215000000","0.248800000","0.000000000","3.626000000","481.800000000","0.000000000","2","-7.811000000","3140.000000000","0.000000000","0.000000000","57900.000000000","-19.290500000","29814.500000000","-0.019678000","0.013189000","0.031144000","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.654009012","-3.955117195","3.671191916","0.517338954","-0.000798169","0.000000064","0.000000000","9960.000000000","904.000000000","0.000002420","260.000000000","260.000000000","-388000.000000000","324.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","82900000.0000000","0.427000000","0.000000000","0.000000000","0.000000000","1.117000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","4","4C","0.000000000","0.000000000","0.014100000","19752.000000000","108190.000000000","5.140000000","0.674400000","108190.000000000","5.140000000","0.674400000","0.051400000","1","17.090887000","-7800.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","3.626000000","481.800000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000" +"130","propanePVTsim","74-82-8","HC","130","CH4O","44.097000000","0.000000000","96.650000000","42.460000000","0.152000000","-42.050000000","44.097000000","203.000000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","59.078000000","-3492.600000000","-6.066900000","0.000010919","2.000000000","0.000000000","0.000000000","0.000000000","0.000000000","3.320577362","205.885946142","0.662379685","3","-7.764000000","722.000000000","0.023800000","-0.000046700","-24400.000000000","2.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","solute","0.000000000","0.000000000","0.000000000","0.000000000","-0.015069991","-4.344143673","4.007325591","-0.384000000","0.005250000","-0.000006370","151.900000000","6000.000000000","1000.000000000","0.000000001","85.470000000","85.500000000","-103840.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.100000000","0.721211486","-0.099216642","0.181829227","0.000000000","0.000000000","0.000000000","0.435825883","0.866132179","1.395432818","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","5.248690000","1","1.000000000","-11.125400000","0.000000000","28500","0.000024973","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.008264000","4521.000000000","yes","2.002000000","3.618400000","208.110000000","0.000000000","0.000000000","3.320577362","205.885946142","0.662379685","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","151.900000000" +"131","ethanolPVTsim","74-82-8","alcohol","131","CH4O","46.069220000","0.797000000","240.750000000","61.400000000","0.644000000","64.550000000","32.042000000","99.000000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","-8.547960000","0.769820000","-3.108500000","1.544810000","0.000000000","1.700000000","0.215000000","0.000000000","0.000000000","3.626000000","481.800000000","0.000000000","3","-39.350000000","4826.000000000","0.109100000","-0.000113000","57900.000000000","-19.290500000","29814.500000000","-0.019678000","0.013189000","0.031144000","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","-0.384000000","0.005250000","-0.000006370","0.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.797000000","1.437100000","-0.799420000","0.327800000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2","2B","0.000000000","0.000000000","0.008000000","21500.000000000","85164.000000000","4.910000000","0.750200000","47052.000000000","3.300000000","0.903700000","0.044900000","1","17.387107060","-7582.406220000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","2.382700000","3.177100000","198.240000000","0.032380000","22060.367600000","3.626000000","481.800000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000" +"132","nbutanePVTsim","74-82-8","HC","132","C4H10","58.124000000","0.000000000","152.050000000","37.996880000","0.193000000","-0.450000000","58.124000000","255.000000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","66.343000000","-4363.200000000","-7.046000000","0.000009450","2.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2.912500000","209.000000000","0.937900000","2","-7.811000000","3140.000000000","0.000000000","0.000000000","-394370.000000000","-19.290500000","29814.500000000","-0.019678000","0.013189000","0.031144000","0","solute","0.000000000","0.000000000","0.000000000","0.000000000","-0.018486492","-4.921574519","4.858186966","-0.384000000","0.005250000","-0.000006370","191.700000000","6000.000000000","1000.000000000","0.000006762","134.860000000","138.150000000","-126150.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.100000000","0.808063555","-0.212724945","0.362961475","0.000000000","0.000000000","0.000000000","0.331800583","0.854692733","1.865828858","0","0","0.000000000","0.000000000","0.008000000","21532.010000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","5.764470000","1","1.000000000","-13.438500000","0.000000000","35900","0.000025768","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.001262000","4580.000000000","yes","2.331600000","3.708600000","222.860000000","0.000000000","0.000000000","2.912500000","209.000000000","0.937900000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","191.700000000" +"133","mercury","7439-97-6","other","133","Hg","200.600000000","13.500000000","1462.000000000","1608.000000000","-0.164500000","356.600000000","200.600000000","56.350000000","Classic","0.000000000","20.800000000","0.000000000","0.000000000","0.000000000","0.000000000","log","-6.000000000","1.000000000","-0.300000000","-1.223000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1.200000000","132.000000000","0.383400000","3","-24.000000000","1122.000000000","0.200000000","0.000000000","-50000.000000000","2.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","solute","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2295.000000000","1000.000000000","0.000039662","234.300000000","234.300000000","0.000000000","0.000000000","0.069794107","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.990000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.092450000","0.978400000","2.244000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","8.046000000","-4600.000000000","-144.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1.200000000","132.000000000","0.383400000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.149100000","-0.165200000","0.144700000","0.000000000" +"134","propylbenzene","103-65-1","HC","134","C9H12","106.168000000","0.871000000","365.230000000","36.090000000","0.304000000","58.050000000","86.178000000","358.000000000","Classic","0.000000000","39.566326000","0.199170184","0.000985957","-0.000001446","5.8730096e-10","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.000000001","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","348210.000000000","12.685000000","0.911700000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","3.079900000","3.797400000","287.350000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"136","NaCl","0-0-0-0","NaCl","136","H2O","58.442768096","0.999000000","375.150000000","220.890000000","0.344000000","100.000000000","58.443000000","56.000000000","Classic","29500.000000000","-2290.000000000","12.780000000","-0.021440000","0.000000000","0.000000000","log10","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.235662374","0.000000000","2.520000000","809.100000000","0.000000000","3","-57.710000000","7647.000000000","0.144200000","-0.000135700","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solute","0.000000000","0.000000000","0.000000000","0.000000000","0.054783425","0.094678512","-2.267329403","-0.384000000","0.005250000","-0.000006370","207.000000000","6010.000000000","1000.000000000","0.006110000","273.160000000","273.150000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","1.087000000","-0.638000000","0.635000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","4","4C","0.000000000","0.000000000","0.069200000","166550.000000000","12277.000000000","1.451500000","0.673590000","13855.596960000","1.456360879","0.664155324","0.046473789","1","17.387107060","-6141.762746000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","1.065600000","3.000700000","366.510000000","0.034868000","20790.819800000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"137","CaCl2","74-82-8","CaCl2","137","H2O","110.984800000","0.999000000","375.150000000","220.890000000","0.344000000","100.000000000","110.984800000","56.000000000","Classic","66053.900000000","-1550.000000000","7.220000000","-0.001958000","0.000000000","0.000000000","log10","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.235662374","0.000000000","2.520000000","809.100000000","0.000000000","3","-57.710000000","7647.000000000","0.144200000","-0.000135700","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solute","0.000000000","0.000000000","0.000000000","0.000000000","0.054783425","0.094678512","-2.267329403","-0.384000000","0.005250000","-0.000006370","207.000000000","6010.000000000","1000.000000000","0.006110000","273.160000000","273.150000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","1.087000000","-0.638000000","0.635000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","4","4C","0.000000000","0.000000000","0.069200000","166550.000000000","12277.000000000","1.451500000","0.673590000","13855.596960000","1.456360879","0.664155324","0.046473789","1","17.387107060","-6141.762746000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","1.065600000","3.000700000","366.510000000","0.034868000","20790.819800000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"139","SF6","74-82-8","inert","139","SF6","146.000000000","1.100000000","45.850000000","37.600000000","0.210000000","-68.250000000","34.080000000","98.500000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","-6.956260000","1.196950000","-3.126140000","2.994480000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","3.620000000","195.200000000","0.000000000","2","-7.811000000","3140.000000000","0.000000000","0.000000000","-394000.000000000","2.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","solute","0.000000000","0.000000000","0.000000000","0.059565000","0.018570000","0.000000000","-2.078000000","-0.384000000","0.005250000","-0.000006370","80.100000000","6000.000000000","1000.000000000","0.232000000","187.660000000","187.660000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.100000000","0.825200000","0.251500000","-1.703900000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2","2A","0.000000000","0.000000000","0.001160489","5000.000000000","44505.000000000","2.850000000","0.602650000","0.000000000","0.000000000","0.000000000","0.000000000","1","4.436810000","-829.439000000","-25.412000000","0","0.000000000","0.009928000","2999.000000000","0.016130000","3737.000000000","0.000268400","4242.000000000","0.855300000","2325.000000000","yes","1.694100000","3.021400000","226.790000000","0.000000000","0.000000000","3.941000000","195.200000000","0.000000000","1.000000000","0","4119.560000000","0.004000000","3141.600000000","0.295855000","2936.130000000","0.001244960","2778.000000000","0.339898000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","80.100000000" +"140","R12","74-82-8","inert","140","SF6","121.000000000","1.100000000","111.850000000","41.400000000","0.176000000","-30.150000000","34.080000000","98.500000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","-6.956260000","1.196950000","-3.126140000","2.994480000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","3.620000000","195.200000000","0.000000000","2","-7.811000000","3140.000000000","0.000000000","0.000000000","-394000.000000000","2.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","solute","0.000000000","0.000000000","0.000000000","0.059565000","0.018570000","0.000000000","-2.078000000","-0.384000000","0.005250000","-0.000006370","80.100000000","6000.000000000","1000.000000000","0.232000000","187.660000000","187.660000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.100000000","0.825200000","0.251500000","-1.703900000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2","2A","0.000000000","0.000000000","0.001160489","5000.000000000","44505.000000000","2.850000000","0.602650000","0.000000000","0.000000000","0.000000000","0.000000000","1","4.436810000","-829.439000000","-25.412000000","0","0.000000000","0.009928000","2999.000000000","0.016130000","3737.000000000","0.000268400","4242.000000000","0.855300000","2325.000000000","yes","1.694100000","3.021400000","226.790000000","0.000000000","0.000000000","3.941000000","195.200000000","0.000000000","1.000000000","0","4119.560000000","0.004000000","3141.600000000","0.295855000","2936.130000000","0.001244960","2778.000000000","0.339898000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","80.100000000" +"141","R134a","74-82-8","inert","141","SF6","102.000000000","1.100000000","100.850000000","40.700000000","0.332000000","-26.550000000","34.080000000","98.500000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","-6.956260000","1.196950000","-3.126140000","2.994480000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","3.620000000","195.200000000","0.000000000","2","-7.811000000","3140.000000000","0.000000000","0.000000000","-394000.000000000","2.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","solute","0.000000000","0.000000000","0.000000000","0.059565000","0.018570000","0.000000000","-2.078000000","-0.384000000","0.005250000","-0.000006370","80.100000000","6000.000000000","1000.000000000","0.232000000","187.660000000","187.660000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.100000000","0.825200000","0.251500000","-1.703900000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2","2A","0.000000000","0.000000000","0.001160489","5000.000000000","44505.000000000","2.850000000","0.602650000","0.000000000","0.000000000","0.000000000","0.000000000","1","4.436810000","-829.439000000","-25.412000000","0","0.000000000","0.009928000","2999.000000000","0.016130000","3737.000000000","0.000268400","4242.000000000","0.855300000","2325.000000000","yes","1.694100000","3.021400000","226.790000000","0.000000000","0.000000000","3.941000000","195.200000000","0.000000000","1.000000000","0","4119.560000000","0.004000000","3141.600000000","0.295855000","2936.130000000","0.001244960","2778.000000000","0.339898000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","80.100000000" +"142","COS","74-82-8","inert","142","COS","60.075100000","1.100000000","105.650000000","63.490000000","0.097011900","-191.500000000","44.010000000","94.000000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","140.540000000","-4735.000000000","-21.268000000","0.040909000","1.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2.340000000","168.770000000","0.680500000","2","-7.811000000","3140.000000000","0.000000000","0.000000000","-394000.000000000","2.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","solute","94.491400000","-6789.040000000","-11.451900000","-0.010454000","0.000000000","0.000000000","0.000000000","-0.384000000","0.005250000","-0.000006370","78.000000000","9018.969300000","1000.000000000","5.185000000","216.580000000","216.592000000","-393500.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.100000000","0.881738930","-0.856255022","3.094939327","0.000000000","0.000000000","0.000000000","1.413601068","-0.605965449","1.101814948","2","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","6.812280000","-1301.679000000","-3.494000000","26100","0.000037687","4.856e-11","7470.000000000","0.098620000","2617.000000000","0.000060820","3691.000000000","0.168300000","2591.000000000","yes","1.309700000","3.250700000","92.150000000","0.000000000","0.000000000","3.037207160","170.162382832","0.684633880","1.000000000","0","2119.560000000","0.000758596","2500.000000000","0.231198000","2419.560000000","0.007244960","2330.000000000","0.139898000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","78.000000000" +"143","2-M-C7","592-27-8","HC","143","C8H18","114.230000000","0.422182073","286.490000000","24.845000000","0.376900000","117.700000000","16.043000000","99.000000000","Classic","68310.700000000","43.706698000","0.342437032","0.000809700","-0.000001304","5.462298e-10","log","39.205000000","-1324.400000000","-3.436600000","0.000031019","2.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2.520000000","155.809006022","0.406998625","3","-26.870000000","1150.000000000","0.187000000","-0.000521000","-50500.000000000","2.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","solute","900.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.303000000","-0.000605000","-0.000003200","77.300000000","941.000000000","452.000000000","0.116656057","90.690000000","90.650000000","-74520.000000000","186.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","10200000.0000000","0.261000000","-0.147000000","0.222000000","0.000000000","0.100000000","0.585700000","-0.720600000","1.289900000","0.000000000","0.000000000","0.000000000","0.122841598","0.914470789","2.741978611","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","4.186260000","1","1.000000000","-6.680820000","0.000000000","9700","0.000015293","0.047920000","1594.000000000","0.012440000","2952.000000000","0.002317000","2777.000000000","1.076000000","1323.000000000","yes","1.000000000","3.703900119","150.029998779","0.000000000","0.000000000","3.190710941","155.809006022","0.406998625","1.000000000","0","900.000000000","0.000621000","2760.000000000","0.421000000","1963.100000000","0.004048680","2636.750000000","0.295270000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.932700000","-0.215400000","0.774700000","77.300000000" +"144","M-cy-C6","108-87-2","HC","144","C7H14","98.190000000","0.422182073","299.040000000","34.714000000","0.235000000","100.900000000","16.043000000","99.000000000","Classic","57151.100000000","26.172472000","0.153293532","0.001132699","-0.000001562","6.1224296e-10","log","39.205000000","-1324.400000000","-3.436600000","0.000031019","2.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2.520000000","155.809006022","0.406998625","3","-26.870000000","1150.000000000","0.187000000","-0.000521000","-50500.000000000","2.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","solute","900.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.303000000","-0.000605000","-0.000003200","77.300000000","941.000000000","452.000000000","0.116656057","90.690000000","90.650000000","-74520.000000000","186.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","10200000.0000000","0.261000000","-0.147000000","0.222000000","0.000000000","0.100000000","0.585700000","-0.720600000","1.289900000","0.000000000","0.000000000","0.000000000","0.122841598","0.914470789","2.741978611","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","4.186260000","1","1.000000000","-6.680820000","0.000000000","9700","0.000015293","0.047920000","1594.000000000","0.012440000","2952.000000000","0.002317000","2777.000000000","1.076000000","1323.000000000","yes","1.000000000","3.703900119","150.029998779","0.000000000","0.000000000","3.190710941","155.809006022","0.406998625","1.000000000","0","900.000000000","0.000621000","2760.000000000","0.421000000","1963.100000000","0.004048680","2636.750000000","0.295270000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.716190000","-0.020430000","0.339640000","77.300000000" +"145","i-p-cy-C5","3875-51-2","HC","145","C8H16","112.220000000","0.422182073","320.100000000","30.408000000","0.302900000","126.400000000","16.043000000","99.000000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","39.205000000","-1324.400000000","-3.436600000","0.000031019","2.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2.520000000","155.809006022","0.406998625","3","-26.870000000","1150.000000000","0.187000000","-0.000521000","-50500.000000000","2.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","solute","900.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.303000000","-0.000605000","-0.000003200","77.300000000","941.000000000","452.000000000","0.116656057","90.690000000","90.650000000","-74520.000000000","186.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","10200000.0000000","0.261000000","-0.147000000","0.222000000","0.000000000","0.100000000","0.585700000","-0.720600000","1.289900000","0.000000000","0.000000000","0.000000000","0.122841598","0.914470789","2.741978611","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","4.186260000","1","1.000000000","-6.680820000","0.000000000","9700","0.000015293","0.047920000","1594.000000000","0.012440000","2952.000000000","0.002317000","2777.000000000","1.076000000","1323.000000000","yes","1.000000000","3.703900119","150.029998779","0.000000000","0.000000000","3.190710941","155.809006022","0.406998625","1.000000000","0","900.000000000","0.000621000","2760.000000000","0.421000000","1963.100000000","0.004048680","2636.750000000","0.295270000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.617780000","0.843540000","-1.066370000","77.300000000" +"146","cis-12-DM-cy-C6","2207-01-4","HC","146","C","112.220000000","0.422182073","333.000000000","29.384000000","0.232400000","129.700000000","16.043000000","99.000000000","Classic","66909.600000000","-68.400000000","0.897300000","-0.000513700","0.000000109","0.000000000","log","39.205000000","-1324.400000000","-3.436600000","0.000031019","2.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2.520000000","155.809006022","0.406998625","3","-26.870000000","1150.000000000","0.187000000","-0.000521000","-50500.000000000","2.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","solute","900.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.303000000","-0.000605000","-0.000003200","77.300000000","941.000000000","452.000000000","0.116656057","90.690000000","90.650000000","-74520.000000000","186.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","10200000.0000000","0.261000000","-0.147000000","0.222000000","0.000000000","0.100000000","0.585700000","-0.720600000","1.289900000","0.000000000","0.000000000","0.000000000","0.122841598","0.914470789","2.741978611","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","4.186260000","1","1.000000000","-6.680820000","0.000000000","9700","0.000015293","0.047920000","1594.000000000","0.012440000","2952.000000000","0.002317000","2777.000000000","1.076000000","1323.000000000","yes","1.000000000","3.703900119","150.029998779","0.000000000","0.000000000","3.190710941","155.809006022","0.406998625","1.000000000","0","900.000000000","0.000621000","2760.000000000","0.421000000","1963.100000000","0.004048680","2636.750000000","0.295270000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.628820000","0.701140000","-0.784370000","77.300000000" +"147","234-TM-C5","565-75-3","HC","147","C8H18","114.230000000","0.422182073","293.150000000","27.300000000","0.316100000","113.500000000","16.043000000","99.000000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","39.205000000","-1324.400000000","-3.436600000","0.000031019","2.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2.520000000","155.809006022","0.406998625","3","-26.870000000","1150.000000000","0.187000000","-0.000521000","-50500.000000000","2.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","solute","900.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.303000000","-0.000605000","-0.000003200","77.300000000","941.000000000","452.000000000","0.116656057","90.690000000","90.650000000","-74520.000000000","186.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","10200000.0000000","0.261000000","-0.147000000","0.222000000","0.000000000","0.100000000","0.585700000","-0.720600000","1.289900000","0.000000000","0.000000000","0.000000000","0.122841598","0.914470789","2.741978611","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","4.186260000","1","1.000000000","-6.680820000","0.000000000","9700","0.000015293","0.047920000","1594.000000000","0.012440000","2952.000000000","0.002317000","2777.000000000","1.076000000","1323.000000000","yes","1.000000000","3.703900119","150.029998779","0.000000000","0.000000000","3.190710941","155.809006022","0.406998625","1.000000000","0","900.000000000","0.000621000","2760.000000000","0.421000000","1963.100000000","0.004048680","2636.750000000","0.295270000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.851190000","-0.242120000","0.782340000","77.300000000" +"148","1,2-DM-cyC5","74-82-8","HC","148","C","98.000000000","0.871000000","280.000000000","34.450000000","0.269800000","58.050000000","86.178000000","358.000000000","Classic","57150.400000000","-54.500000000","0.759200000","-0.000448000","0.000000101","0.000000000","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","348210.000000000","12.685000000","0.911700000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","3.079900000","3.797400000","287.350000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.795360000","-0.299230000","0.780210000","207.000000000" +"149","1,3-dDM-cyC5","74-82-8","HC","149","C","98.000000000","0.871000000","283.320000000","34.370000000","0.271000000","58.050000000","86.178000000","358.000000000","Classic","57150.400000000","-5.750000000","0.553000000","-0.000222000","0.000000000","0.000000000","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","348210.000000000","12.685000000","0.911700000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","3.079900000","3.797400000","287.350000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.798170000","-0.320050000","0.805530000","207.000000000" +"150","1,cis-2,trans-4-TMcyC5","4850-28-6","HC","150","C","112.000000000","0.871000000","309.060000000","28.540000000","0.265000000","116.700000000","86.178000000","358.000000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","348210.000000000","12.685000000","0.911700000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","3.079900000","3.797400000","287.350000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.634030000","0.761470000","-0.912740000","207.000000000" +"151","2,3-DM-C6","584-94-1","HC","151","C","114.230000000","0.871000000","290.250000000","26.300000000","0.347200000","115.600000000","86.178000000","358.000000000","Classic","0.000000000","-29.880516000","0.839572662","-0.000405723","-0.000000028","6.559746e-11","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","348210.000000000","12.685000000","0.911700000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","3.079900000","3.797400000","287.350000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.896210000","-0.274640000","0.890890000","207.000000000" +"152","3-M-C8","2216-33-3","HC","152","C","106.168000000","0.871000000","365.230000000","36.090000000","0.304000000","144.200000000","86.178000000","358.000000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","348210.000000000","12.685000000","0.911700000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","3.079900000","3.797400000","287.350000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"153","2,2-DM-C7","1071-26-7","HC","153","C","128.260000000","0.871000000","303.650000000","23.500000000","0.389900000","132.700000000","86.178000000","358.000000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","348210.000000000","12.685000000","0.911700000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","3.079900000","3.797400000","287.350000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"154","2,6-DM-C7","1072-05-5","HC","154","C","128.260000000","0.871000000","305.850000000","23.000000000","0.392700000","135.200000000","86.178000000","358.000000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","348210.000000000","12.685000000","0.911700000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","3.079900000","3.797400000","287.350000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"155","1,1,3-TM-cy-C6","3073-66-3","HC","155","C","126.240000000","0.871000000","338.910000000","28.750000000","0.267000000","136.600000000","86.178000000","358.000000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","348210.000000000","12.685000000","0.911700000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","3.079900000","3.797400000","287.350000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"156","1,2,3-TMcyC6","2","HC","156","C","126.000000000","0.871000000","348.160000000","27.400000000","0.290000000","142.000000000","86.178000000","358.000000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","348210.000000000","12.685000000","0.911700000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","3.079900000","3.797400000","287.350000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"157","4-M-C8","2216-34-4","HC","157","C","128.260000000","0.871000000","314.500000000","23.406000000","0.413000000","142.400000000","86.178000000","358.000000000","Classic","78069.200000000","12.300000000","0.755100000","-0.000290000","0.000000000","0.000000000","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","348210.000000000","12.685000000","0.911700000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","3.079900000","3.797400000","287.350000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"158","o-E-toluene","74-82-8","HC","158","C","120.000000000","0.871000000","378.000000000","30.397000000","0.293200000","58.050000000","86.178000000","358.000000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","348210.000000000","12.685000000","0.911700000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","3.079900000","3.797400000","287.350000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"159","1,2,3-TM-Benzene","526-73-8","HC","159","CH4","120.190000000","0.871000000","391.380000000","34.540000000","0.366400000","176.100000000","86.178000000","358.000000000","Classic","72460.500000000","33.605188000","0.258997728","0.000846780","-0.000001352","5.7549508e-10","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","348210.000000000","12.685000000","0.911700000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","3.079900000","3.797400000","287.350000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.916460000","-0.128040000","0.269930000","207.000000000" +"160","cy-C9","293-55-0","HC","160","C","126.240000000","0.871000000","408.890000000","33.440000000","0.268000000","178.400000000","86.178000000","358.000000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","348210.000000000","12.685000000","0.911700000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","3.079900000","3.797400000","287.350000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"161","2-E-p-xylene","1758-88-9","HC","161","C","134.000000000","0.871000000","389.850000000","28.800000000","0.411400000","186.800000000","86.178000000","358.000000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","348210.000000000","12.685000000","0.911700000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","3.079900000","3.797400000","287.350000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"162","nC5-Benzene","74-82-8","HC","162","C","148.250000000","0.871000000","406.800000000","26.060000000","0.437600000","478.610000000","86.178000000","358.000000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","348210.000000000","12.685000000","0.911700000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","3.079900000","3.797400000","287.350000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"163","nC6-Benzene","74-82-8","HC","163","C","162.000000000","0.871000000","424.350000000","23.800000000","0.480000000","58.050000000","86.178000000","358.000000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","348210.000000000","12.685000000","0.911700000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","3.079900000","3.797400000","287.350000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"164","nC7-Benzene","74-82-8","HC","164","C","176.000000000","0.871000000","440.850000000","21.800000000","0.528700000","58.050000000","86.178000000","358.000000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","348210.000000000","12.685000000","0.911700000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","3.079900000","3.797400000","287.350000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"165","nC10-cy-C5","74-82-8","HC","165","C","210.400000000","0.871000000","459.230000000","17.090000000","0.631400000","58.050000000","86.178000000","358.000000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","348210.000000000","12.685000000","0.911700000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","3.079900000","3.797400000","287.350000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1.301270000","-0.291030000","1.099920000","207.000000000" +"166","nC8-Benzene","74-82-8","HC","166","C","190.000000000","0.871000000","455.000000000","20.340000000","0.590900000","58.050000000","86.178000000","358.000000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","348210.000000000","12.685000000","0.911700000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","3.079900000","3.797400000","287.350000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"167","nC9-Benzene","74-82-8","HC","167","C","204.000000000","0.871000000","467.700000000","18.960000000","0.652300000","58.050000000","86.178000000","358.000000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","348210.000000000","12.685000000","0.911700000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","3.079900000","3.797400000","287.350000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"168","3-M-4,4-DE-heptane","3","HC","168","C","170.300000000","0.871000000","380.360000000","18.220000000","0.461000000","204.000000000","86.178000000","358.000000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","348210.000000000","12.685000000","0.911700000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","3.079900000","3.797400000","287.350000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"169","nC12-cy-C5","74-82-8","HC","169","C","238.460000000","0.871000000","485.740000000","15.198000000","0.716300000","58.050000000","86.178000000","358.000000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","348210.000000000","12.685000000","0.911700000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","3.079900000","3.797400000","287.350000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"170","nC10-Benzene","74-82-8","HC","170","C","218.000000000","0.871000000","479.850000000","17.700000000","0.681200000","58.050000000","86.178000000","358.000000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","348210.000000000","12.685000000","0.911700000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","3.079900000","3.797400000","287.350000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"171","nC14-cy-C5","74-82-8","HC","171","C","266.510000000","0.871000000","509.190000000","13.685000000","0.794900000","58.050000000","86.178000000","358.000000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","348210.000000000","12.685000000","0.911700000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","3.079900000","3.797400000","287.350000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"172","nC17-cy-C5","74-82-8","HC","172","C","308.590000000","0.871000000","538.010000000","11.906000000","0.906000000","58.050000000","86.178000000","358.000000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","348210.000000000","12.685000000","0.911700000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","3.079900000","3.797400000","287.350000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"173","nC27","593-49-7","HC","173","C","380.000000000","0.871000000","563.150000000","9.750000000","0.881300000","422.100000000","86.178000000","358.000000000","Classic","253722.100000000","-22.400000000","2.570000000","-0.001448000","0.000000316","0.000000000","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","2.151136109","-1.467770498","1.172942447","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","348210.000000000","12.685000000","0.911700000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","3.079900000","3.797400000","287.350000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"174","nC34","1","HC","174","C","478.000000000","0.871000000","587.500000000","5.430000000","1.435000000","482.000000000","86.178000000","358.000000000","Classic","322031.500000000","-28.400000000","3.233000000","-0.001827000","0.000000400","0.000000000","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","2.675042510","-2.391792157","1.403453500","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","348210.000000000","12.685000000","0.911700000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","3.079900000","3.797400000","287.350000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"175","nC39","74-82-8","HC","175","C","548.000000000","0.871000000","638.850000000","8.210000000","1.088900000","58.050000000","86.178000000","358.000000000","Classic","370824.000000000","-32.700000000","3.706000000","-0.002098000","0.000000460","0.000000000","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","2.806629230","-2.653605683","1.459756561","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","348210.000000000","12.685000000","0.911700000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","3.079900000","3.797400000","287.350000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"176","1,2,4-TMcyC6","74-82-8","HC","176","C","126.000000000","0.871000000","340.600000000","26.750000000","0.261900000","58.050000000","86.178000000","358.000000000","Classic","0.000000000","32.239000000","0.001910000","0.000010600","-0.000000003","0.000000000","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","348210.000000000","12.685000000","0.911700000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","3.079900000","3.797400000","287.350000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"177","nC30","638-68-6","HC","177","C30H62","422.800000000","0.871000000","589.900000000","8.680000000","1.307000000","449.700000000","86.178000000","358.000000000","Classic","282997.500000000","-25.000000000","2.854000000","-0.001610000","0.000000352","0.000000000","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","2.434590893","-1.943459444","1.298957460","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","348210.000000000","12.685000000","0.911700000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","3.079900000","3.797400000","287.350000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"178","1-propanol","71-23-8","alcohol","178","CH4O","60.096000000","0.803000000","263.630000000","51.749700000","0.621800000","64.550000000","60.096000000","99.000000000","Classic","20891.500000000","36.548344000","0.005221192","0.000461094","-0.000000583","2.232309e-10","log","-8.547960000","0.769820000","-3.108500000","1.544810000","0.000000000","1.700000000","0.215000000","0.000000000","0.000000000","3.626000000","481.800000000","0.000000000","3","-39.350000000","4826.000000000","0.109100000","-0.000113000","57900.000000000","-19.290500000","29814.500000000","-0.019678000","0.013189000","0.031144000","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","-0.384000000","0.005250000","-0.000006370","0.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.797000000","1.437100000","-0.799420000","0.327800000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2","2B","0.000000000","0.000000000","0.008100000","21000.000040000","119102.004700000","6.411000000","0.917090000","47052.000000000","3.300000000","0.903700000","0.044900000","1","17.387107060","-7582.406220000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","2.382700000","3.177100000","198.240000000","0.032380000","22060.367600000","3.626000000","481.800000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000" +"179","i-propanol","67-63-0","alcohol","179","CH4O","60.096000000","0.797000000","235.150000000","47.619700000","0.667700000","64.550000000","32.042000000","99.000000000","Classic","20891.500000000","36.548344000","0.005221192","0.000461094","-0.000000583","2.232309e-10","log","-8.547960000","0.769820000","-3.108500000","1.544810000","0.000000000","1.700000000","0.215000000","0.000000000","0.000000000","3.626000000","481.800000000","0.000000000","3","-39.350000000","4826.000000000","0.109100000","-0.000113000","57900.000000000","-19.290500000","29814.500000000","-0.019678000","0.013189000","0.031144000","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","-0.384000000","0.005250000","-0.000006370","0.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.797000000","1.437100000","-0.799420000","0.327800000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2","2B","0.000000000","0.000000000","0.009100000","21000.000040000","106018.994500000","6.411000000","0.946800000","47052.000000000","3.300000000","0.903700000","0.044900000","1","17.387107060","-7582.406220000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","2.382700000","3.177100000","198.240000000","0.032380000","22060.367600000","3.626000000","481.800000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000" +"180","c-C4","287-23-0","HC","180","C4H8","56.108000000","0.669000000","186.750000000","49.850000000","0.209000000","12.550000000","56.108000000","210.000000000","Classic","27875.600000000","-50.300000000","0.502400000","0.502400000","-0.000001803","6.829951e-10","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","203.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.011610000","5479.000000000","no","2.365500000","3.711400000","265.830000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.654610000","0.025740000","0.192520000","203.000000000" +"181","33-DM-C6","563-16-6","HC","181","C8H18","114.232002258","0.712800000","288.870019531","26.536201171","0.326000005","111.972009277","114.232002258","443.000000000","Classic","58553.600000000","-3.990720000","0.610372310","-0.000061523","-0.000000296","1.5148108e-10","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"182","n-Bcychexane","1678-93-9","HC","182","C10H20","140.268005371","0.801400000","393.889001464","31.508701171","0.361990004","180.981011962","140.268005371","534.100000000","Classic","58553.600000000","-3.990720000","0.610372310","-0.000061523","-0.000000296","1.5148108e-10","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"183","Pent-CC6","4292-92-6","HC","183","C11H22","154.300003051","0.806800000","400.850000000","23.300000000","0.412999004","203.748010253","154.300003051","584.500000000","Classic","58553.600000000","-3.990720000","0.610372310","-0.000061523","-0.000000296","1.5148108e-10","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"184","nC25","629-99-2","HC","184","C25H52","352.680000000","0.871000000","583.850000000","9.500000000","1.105300000","402.000000000","86.178000000","358.000000000","Classic","0.000000000","-46.500000000","0.309000000","0.002870000","-0.000000709","0.000000000","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","2.102220000","-1.391760000","1.150870000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","348210.000000000","12.685000000","0.911700000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","3.079900000","3.797400000","287.350000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"185","nC26","630-01-3","HC","185","C26H54","366.707000000","0.871000000","545.850000000","9.100000000","1.154400000","412.000000000","86.178000000","358.000000000","Classic","0.000000000","-49.600000000","0.315000000","0.002870000","-0.000000710","0.000000000","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","2.185710000","-1.522600000","1.188490000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","348210.000000000","12.685000000","0.911700000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","3.079900000","3.797400000","287.350000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"186","nC28","630-02-4","HC","186","C28H58","394.769000000","0.871000000","558.850000000","8.500000000","1.237500000","431.000000000","86.178000000","358.000000000","Classic","0.000000000","-55.000000000","0.324000000","0.002870000","-0.000000711","0.000000000","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","2.328469312","-1.758470734","1.252148750","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","348210.000000000","12.685000000","0.911700000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","3.079900000","3.797400000","287.350000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"187","nC29","630-03-5","HC","187","C29H60","408.800000000","0.871000000","562.550000000","6.918000000","1.200500000","431.000000000","86.178000000","358.000000000","Classic","0.000000000","-55.000000000","0.324000000","0.002870000","-0.000000711","0.000000000","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","2.264748174","-1.651320047","1.223831870","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","348210.000000000","12.685000000","0.911700000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","3.079900000","3.797400000","287.350000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"1116","Hg++","74-82-8","ion","116","Hg++","55.850000000","0.797000000","444.150000000","290.890000000","0.344000000","55.850000000","40.080000000","99.000000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","-8.547960000","0.769820000","-3.108500000","1.544810000","0.000000000","1.700000000","0.215000000","0.000000000","0.000000000","6.000000000","481.800000000","0.000000000","3","-39.350000000","4826.000000000","0.109100000","-0.000113000","-587000.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2","solute","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.797000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","6.000000000","481.800000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","207.000000000" +"1143","glycerol","112-27-6","glycol","14","C6H14O4","150.175000000","1.127000000","492.950000000","33.130000000","1.287400000","278.300000000","150.175000000","450.000000000","Classic","93317.400000000","86.400000000","0.600800000","-0.000362200","0.000000072","0.000000000","log","6.756800000","3715.222000000","-1.299000000","0.000000000","0.000000000","2.200000000","0.215000000","0.242773578","0.000000000","3.626000000","481.800000000","0.000000000","3","-53.925230000","9741.992000000","0.106066000","-0.000075802","-394370.000000000","-19.290500000","29814.500000000","-0.019678000","0.013189000","0.031144000","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.394142583","-0.000547836","0.000000000","358.332712000","15900.000000000","1000.000000000","0.006110000","268.250000000","268.250000000","-242000.000000000","189.000000000","8.890000000","-0.007840000","0.000000000","0.000000000","0.000000000","0.596600000","0.262270000","769.500000000","0.245500000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","1.127000000","1.376906087","1.788921526","-4.378737499","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","4","4C","0.284542457","-0.004423604","0.025000000","14036.000000000","228000.000000000","7.060000000","1.180000000","391260.000000000","13.210000000","1.169200000","0.018800000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","3.626000000","481.800000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","153800.000000000","587.000000000","0.000000000","0.000000000","0.000000000","153800.000000000","587.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","358.332712000" +"1151","sulfur(S8)","74-82-8","other","101","sulfur(S8)","256.480000000","0.990000000","885.000000000","63.000000000","0.205900000","444.600000000","256.480000000","449.500000000","Classic","68312.100000000","89.990736000","0.041428662","0.001475818","-0.000001923","7.465972e-10","log","5.201200000","1936.281000000","-20.143000000","1000.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","6.000000000","454.000000000","0.383400000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-50000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solute","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","-0.384000000","0.005250000","-0.000006370","351.000000000","12860.000000000","1000.000000000","0.000039662","392.750000000","392.750000000","0.000000000","0.000000000","12.000000000","1.000000000","1.000000000","1.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.990000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","8.046000000","-4600.000000000","-144.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1.200000000","132.000000000","0.383400000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","351.000000000" +"1152","seawater","7732-18-5","seawater","114","H2O","18.015000000","0.999000000","374.150000000","220.890000000","0.344000000","100.000000000","18.015000000","56.000000000","Classic","1374.600000000","28.686314623","-0.052108449","0.000091158","-0.000000101","0.000000000","pow10","5.115640000","1687.537000000","230.170000000","0.000000000","0.000000000","1.800000000","0.076000000","0.231323566","0.000000000","2.520000000","809.100000000","0.000000000","3","-27.952757828","4665.225929930","0.052323342","-0.000038356","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.054783425","0.094678512","-2.267329403","-0.384000000","0.005250000","-0.000006370","52.878622600","6010.000000000","1000.000000000","0.006110000","273.160000000","273.150000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","5.459000000","0.305420000","647.130000000","0.081000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","1.087000000","-0.638000000","0.635000000","0.000000000","0.000000000","0.000000000","0.168272437","0.908482584","5.240427372","4","4C","0.000000000","0.000000000","0.069200000","16655.000000000","12277.000000000","1.451500000","0.673590000","13855.596960000","1.456360879","0.664155324","0.046473789","1","17.387107060","-6141.762746000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","1.065600000","3.000700000","366.510000000","0.034868000","20790.819800000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","-262.490000000","140.520000000","0.000000000","0.000000000","0.000000000","276370.000000000","-2090.100000000","8.125000000","-0.014116000","0.000009370","0.923656000","-0.379370000","0.442429000","52.419867266" +"1181","naphthalene","91-20-3","HC","179","C10H8","128.174000000","0.669000000","475.250000000","40.500000000","0.302000000","217.950000000","128.174000000","413.000000000","Classic","27875.600000000","-50.300000000","0.502400000","0.502400000","-0.000001803","6.829951e-10","log","-7.764510000","1.458380000","-2.775800000","-1.233030000","0.000000000","1.800000000","0.076000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","3","-24.710000000","4210.000000000","0.045300000","-0.000033800","-229000.000000000","-19.290500000","29814.500000000","-0.019678000","0.000132000","-0.000000311","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.078900000","-1.160000000","0.000000000","-0.384000000","0.005250000","-0.000006370","203.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.999000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","1","0.000000000","0.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.011610000","5479.000000000","no","2.365500000","3.711400000","265.830000000","0.000000000","0.000000000","2.520000000","809.100000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.654610000","0.025740000","0.192520000","0.000000000" +"1182","MEA","141-43-5","amine","182","MEA","61.083100000","1.038000000","364.850000000","68.700000000","0.796600000","170.850000000","61.083100000","99.000000000","Classic","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","log","-8.547960000","0.769820000","-3.108500000","1.544810000","0.000000000","1.700000000","0.215000000","0.260355682","0.000000000","4.500000000","481.800000000","0.000000000","3","-75.190000000","12680.000000000","0.157300000","-0.000122500","57900.000000000","8.169760000","8989.300000000","0.000000000","0.000000000","0.000000000","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.521291873","-1.152080748","-0.013889882","-0.384000000","0.005250000","-0.000006370","207.000000000","6000.000000000","1000.000000000","0.006110000","273.000000000","273.000000000","-242000.000000000","189.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.797000000","2.298601539","-2.159763177","1.537096461","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","4","4C","0.000000000","0.000000000","0.018008483","12276.382600000","342400.600100000","10.828737539","1.032854790","376276.884000000","10.783585850","1.258298307","0.000000000","1","17.387107060","1.762745870","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","4.500000000","481.800000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000" +"1183","trans-12-DM-cy-C6","6876-23-9","HC","147","C","112.220000000","0.422182073","322.777001953","29.640000000","0.330400000","123.428000000","16.043000000","99.000000000","Classic","66909.600000000","-68.400000000","0.897300000","-0.000513700","0.000000109","0.000000000","log","39.205000000","-1324.400000000","-3.436600000","0.000031019","2.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2.520000000","155.809006022","0.406998625","3","-26.870000000","1150.000000000","0.187000000","-0.000521000","-50500.000000000","2.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","solute","900.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.303000000","-0.000605000","-0.000003200","77.300000000","941.000000000","452.000000000","0.116656057","90.690000000","90.650000000","-74520.000000000","186.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","10200000.0000000","0.261000000","-0.147000000","0.222000000","0.000000000","0.100000000","0.585700000","-0.720600000","1.289900000","0.000000000","0.000000000","0.000000000","0.122841598","0.914470789","2.741978611","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","4.186260000","1","1.000000000","-6.680820000","0.000000000","9700","0.000015293","0.047920000","1594.000000000","0.012440000","2952.000000000","0.002317000","2777.000000000","1.076000000","1323.000000000","yes","1.000000000","3.703900119","150.029998779","0.000000000","0.000000000","3.190710941","155.809006022","0.406998625","1.000000000","0","900.000000000","0.000621000","2760.000000000","0.421000000","1963.100000000","0.004048680","2636.750000000","0.295270000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.628820000","0.701140000","-0.784370000","0.000000000" +"1184","cis-14-DM-cy-C6","624-29-3","HC","147","C","112.220000000","0.422182073","325.000000000","29.640000000","0.233980000","124.326013183","16.043000000","99.000000000","Classic","66909.600000000","-68.400000000","0.897300000","-0.000513700","0.000000109","0.000000000","log","39.205000000","-1324.400000000","-3.436600000","0.000031019","2.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2.520000000","155.809006022","0.406998625","3","-26.870000000","1150.000000000","0.187000000","-0.000521000","-50500.000000000","2.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","solute","900.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.303000000","-0.000605000","-0.000003200","77.300000000","941.000000000","452.000000000","0.116656057","90.690000000","90.650000000","-74520.000000000","186.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","10200000.0000000","0.261000000","-0.147000000","0.222000000","0.000000000","0.100000000","0.585700000","-0.720600000","1.289900000","0.000000000","0.000000000","0.000000000","0.122841598","0.914470789","2.741978611","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","4.186260000","1","1.000000000","-6.680820000","0.000000000","9700","0.000015293","0.047920000","1594.000000000","0.012440000","2952.000000000","0.002317000","2777.000000000","1.076000000","1323.000000000","yes","1.000000000","3.703900119","150.029998779","0.000000000","0.000000000","3.190710941","155.809006022","0.406998625","1.000000000","0","900.000000000","0.000621000","2760.000000000","0.421000000","1963.100000000","0.004048680","2636.750000000","0.295270000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.628820000","0.701140000","-0.784370000","0.000000000" +"1185","trans-14-DM-cy-C6","2207-04-7","HC","147","C","112.220000000","0.422182073","316.667016601","29.640000000","0.233980000","119.356011962","16.043000000","99.000000000","Classic","66909.600000000","-68.400000000","0.897300000","-0.000513700","0.000000109","0.000000000","log","39.205000000","-1324.400000000","-3.436600000","0.000031019","2.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2.520000000","155.809006022","0.406998625","3","-26.870000000","1150.000000000","0.187000000","-0.000521000","-50500.000000000","2.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0","solute","900.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.303000000","-0.000605000","-0.000003200","77.300000000","941.000000000","452.000000000","0.116656057","90.690000000","90.650000000","-74520.000000000","186.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","10200000.0000000","0.261000000","-0.147000000","0.222000000","0.000000000","0.100000000","0.585700000","-0.720600000","1.289900000","0.000000000","0.000000000","0.000000000","0.122841598","0.914470789","2.741978611","0","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","4.186260000","1","1.000000000","-6.680820000","0.000000000","9700","0.000015293","0.047920000","1594.000000000","0.012440000","2952.000000000","0.002317000","2777.000000000","1.076000000","1323.000000000","yes","1.000000000","3.703900119","150.029998779","0.000000000","0.000000000","3.190710941","155.809006022","0.406998625","1.000000000","0","900.000000000","0.000621000","2760.000000000","0.421000000","1963.100000000","0.004048680","2636.750000000","0.295270000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.628820000","0.701140000","-0.784370000","0.000000000" +"1186","PG","57-55-6","glycol","1186","propyleneglycol","76.095000000","1.036000000","352.850000000","61.000000000","1.102000000","188.200000000","76.095000000","239.000000000","Classic","32022.600000000","35.700000000","0.248400000","-0.000149700","0.000000030","0.000000000","exp","13.629900000","6022.180000000","-28.250000000","0.000000000","0.000000000","2.308200000","0.215000000","0.248800000","0.000000000","3.626000000","481.800000000","0.000000000","3","-23.155244944","5694.484212533","0.023081509","0.000000000","57900.000000000","-19.290540000","29814.530000000","-0.019678500","0.013189000","0.031144000","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.654009012","-3.955117195","3.671191916","0.517338954","-0.000798169","0.000000064","133.328650000","9958.000000000","904.000000000","0.000002420","260.150000000","260.150000000","-388000.000000000","324.000000000","21.400000000","0.000000000","0.000000000","0.000000000","0.000000000","1.315100000","0.251250000","719.700000000","0.218700000","0.000000000","82900000.0000000","0.427000000","0.000000000","0.000000000","0.000000000","1.117000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","4","4C","0.000000000","0.000000000","0.019000000","17442.000000000","138360.000000000","6.750000000","0.937200000","108190.000000000","5.140000000","0.674400000","0.051400000","1","17.090887000","-7800.000000000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","3.626000000","481.800000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","35540.000000000","436.780000000","-0.184860000","0.000000000","0.000000000","35540.000000000","436.780000000","-0.184860000","0.000000000","0.000000000","0.910030000","1.349960000","-1.890020000","151.817427819" +"1187","ammonia","7664-41-7","other","1187","NH3","17.031","0.73","132.25","113.0","0.250","-33.35","17.031","99.000000000","Classic","11133.000000000","39.192196000","-0.058081604","0.000350102","-0.000000369","1.276199e-10","pow10","5.202770000","1580.080000000","239.500000000","0.000000000","0.000000000","1.700000000","0.215000000","0.200000000","0.000000000","3.626000000","481.800000000","0.000000000","3","-39.350000000","4826.000000000","0.109100000","-0.000113000","57900.000000000","-19.290500000","29814.500000000","-0.019678000","0.013189000","0.031144000","0","solvent","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","-0.384000000","0.005250000","-0.000006370","73.069489067","3177.000000000","1000.000000000","0.006110000","175.500000000","175.500000000","-242000.000000000","189.000000000","30.585000000","0.000000000","0.000000000","0.000000000","0.000000000","2.288000000","0.268500000","512.640000000","0.245300000","0.000000000","52100000.0000000","0.320000000","-0.212000000","0.258000000","0.000000000","0.797000000","1.437100000","-0.799420000","0.327800000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","2","2B","0.000000000","0.000000000","0.016100000","24591.000000000","40531.000000000","3.097800000","0.431020000","47052.000000000","3.300000000","0.903700000","0.044900000","1","17.387107060","-7582.406220000","0.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","no","1.525500000","3.230000000","188.900000000","0.035176000","24106.443000000","3.626000000","481.800000000","0.000000000","1.000000000","0","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","0.000000000","-12706.000000000","958.780000000","-5.233200000","0.013152000","0.000000000","105800.000000000","-362.230000000","0.937900000","0.000000000","0.000000000","1.224003000","-0.273500000","-0.398230000","87.543852818" +"1188","chlorine","7782-50-5","chlorine","195","Cl2","70.906","1.5326431958562459","143.71540000000005","76.424","0.07","-33.952362112999964","70.906","124.069478908","Classic","0.0","25.4089891488","0.04465530069384","-6.73304954604e-05","4.73342196414e-08","-1.268453987088e-11","pow10KPa","9.0628","861.34","-26.82","0.0","0.0","0.0","0.215","0.2767","0.0","4.217","316.0","0.5203667","1","0.0","0.0","0.0","0.0","0.0","8.16976","0.0","0.0","0.0","0.0","0","solute","900.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","207.0","6400.0","1532.643195856246","0.013808478434799999","172.17","172.15","0.0","223.1","2.92","0.0","0.0","0.0","0.0","2.92","0.0","0.0","0.0","0.0","20280.90073241057","0.0","0.0","0.0","0.0","1.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0","1A","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","1","0.0","0.0","0.0","6500.0","1.8927555303529247e-05","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","no","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0" +"1189","ethylene","74-85-1","ethylene","196","C2H4","28.05316","0.5665875959429861","9.200000000000045","50.418","0.0866","-103.77135156599996","28.05316","130.945481716","Classic","52560.0","35.0953348158","-0.0730175859636","0.00048182294541","-5.59479999942e-07","2.08776085578e-10","pow10KPa","8.91382","596.526","-16.78","0.0","0.0","0.0","0.215","0.2815","0.0","4.04838","169.08","0.7657779","3350.0","0.00121961941966","103.986","566.5875959429861","104.05","52560.0","9.627551137738643e-06","3450.0","13556.576228246833","0.0","0.0","0.0","0.0","2.92","0.0","0.0","0.0","0.0","2.92","0.0","0.0","0.0","0.0","219.3","no","1","207.0","8.16976","solute","900.0","0","1A","1","0","0.0","0.0","0.0","0.0","0.0","1.0",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"1190","propene","115-07-1","propene","197","C3H6","42.07974","0.6071797165485592","91.06100000000004","45.55","0.146","-47.61912875399997","42.07974","183.250870442","Classic","20370.0","31.8776388732","0.0323681920014","0.00038978187542399996","-4.99948467774e-07","1.89819117234e-10","pow10KPa","8.95606","789.624","-25.57","0.0","0.0","0.36","0.215","0.2779","0.0","4.4902","282.43","1.1051818500000001","3003.0","7.471717723549999e-09","87.953","607.1797165485592","88.075","20370.0","1.0561747100848501e-05","3103.0","18504.676899839127","0.0","0.0","0.0","0.0","2.92","0.0","0.0","0.0","0.0","2.92","0.0","0.0","0.0","0.0","266.71","no","1","207.0","8.16976","solute","900.0","0","1A","1","0","0.0","0.0","0.0","0.0","0.0","1.0",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"1191","cis-butene","590-18-1","cis-butene","198","C4H8","56.10632","0.6301087082074909","162.60000000000002","42.255","0.202","3.7235553570000093","56.10632","235.626767201","Classic","-7330.0","30.6720422022","0.1595045968032","0.00018541245354","-2.8485339274799996e-07","1.04429615088e-10","pow10KPa","9.00958","967.32","-35.277","0.0","0.0","0.26","0.215","0.2701","0.0","3.82","132.0","1.4164999999999999","7310.0","2.6364927810099997e-06","134.3","630.1087082074908","134.26","-7330.0","1.1258595759827091e-05","7410.0","23322.437236388218","0.0","0.0","0.0","0.0","2.92","0.0","0.0","0.0","0.0","2.92","0.0","0.0","0.0","0.0","301.17","no","1","207.0","8.16976","solute","900.0","0","1A","1","0","0.0","0.0","0.0","0.0","0.0","1.0",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"1192","trans-butene","624-64-6","trans-butene","199","C4H8","56.10632","0.6247637226336263","155.46000000000004","40.273","0.21","0.8798965720000069","56.10632","237.360550676","Classic","-11180.0","46.42794352319999","-0.040657708422","0.0007593596135339999","-9.1251196305e-07","3.3964568283e-10","pow10KPa","9.00827","967.5","-32.31","0.0","0.0","0.0","0.215","0.272","0.0","3.82","132.0","1.367","9760.0","0.0007481658101809999","167.6","624.7637226336263","167.63","-11180.0","1.0933788266236188e-05","9860.0","22984.99404781112","0.0","0.0","0.0","0.0","2.92","0.0","0.0","0.0","0.0","2.92","0.0","0.0","0.0","0.0","296.48","no","1","207.0","8.16976","solute","900.0","0","1A","1","0","0.0","0.0","0.0","0.0","0.0","1.0",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"1193","iso-butene","115-11-7","iso-butene","200","C4H8","56.10632","0.6172935303955316","144.94","40.098","0.193","-7.004207835999978","56.10632","239.80815347700002","Classic","-17600.0","26.8640196138","0.1741796183502","0.000192313455174","-3.28338017502e-07","1.30204440468e-10","pow10KPa","8.80956","866.25","-38.51","0.0","0.0","0.5","0.215","0.2728","0.0","3.82","132.0","1.4375","5920.0","6.7618898108400006e-06","132.4","617.2935303955315","132.95","-17600.0","1.0947338969965856e-05","6020.0","22077.0419048734","0.0","0.0","0.0","0.0","2.92","0.0","0.0","0.0","0.0","2.92","0.0","0.0","0.0","0.0","293.59","no","1","207.0","8.16976","solute","900.0","0","1A","1","0","0.0","0.0","0.0","0.0","0.0","1.0",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +"1194","formic acid","64-18-6","acid","1194","CH2O2","46.02538","1.0798472538295498","314.85","58.1","0.3222","101.0","46.02538","115.89999999999999","Classic","-378700.0","31.6697773782","0.0130370729664","0.000298239673026","-3.6666767718e-07","1.39017767856e-10","log","-8.54","0.76","-3.1","1.54","0.0","1.0","0.215","0.0","0.0","3.82","132.0","0.9398892","3","0.0","0.0","0.0","0.0","0.0","8.16976","0.0","0.0","0.0","0.0","0","0.0","900.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","207.0","0.0","1079.8472538295498","0.0236","281.44968","281.45","-378700.0","248.7","2.92","0.0","0.0","0.0","0.0","2.92","0.0","0.0","0.0","0.0","35301.34509746398","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0","1A","0.0","0.0","0.0155","41917.0","53663.0","3.0","0.3338","0.0","0.0","0.0",,"1","0.0","0.0","0.0","12780.0","1.199459866355532e-05","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","no","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0" +"1195","hydrochloric acid","7647-01-0","acid","1195","ClH","36.46094","1.172170470366168","51.53000000000003","83.135","0.129","-84.97739239499998","36.46094","84.2459983151","Classic","-92173.0","31.819437654599998","-0.024411253972799998","7.3084101642e-05","-8.5722080538e-08","3.6500478522e-11","pow10KPa","9.2949","745.78","-14.27","0.0","0.0","1.0","0.215","0.2653","0.0","3.339","344.7","0.11206604","3","0.0","0.0","0.0","0.0","0.0","8.16976","0.0","0.0","0.0","0.0","0","0.0","900.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","207.0","0.0","1172.170470366168","0.138284046785","159.07","203.55","-92173.0","186.9","2.92","0.0","0.0","0.0","0.0","2.92","0.0","0.0","0.0","0.0","16627.718180817672","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0","1A","0.0","0.0","0.0155","41917","56336","3","0.3338","0.0","0.0","0.0",,"1","0.0","0.0","0.0","2100.0","1.496671323296127e-05","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","no","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0","0.0" \ No newline at end of file diff --git a/src/test/java/neqsim/thermo/characterization/PlusFractionModelTest.java b/src/test/java/neqsim/thermo/characterization/PlusFractionModelTest.java index eb92f2ae9..0e6f3b395 100644 --- a/src/test/java/neqsim/thermo/characterization/PlusFractionModelTest.java +++ b/src/test/java/neqsim/thermo/characterization/PlusFractionModelTest.java @@ -100,7 +100,7 @@ void testPedersenHeavyOilPlusModelCharacterization() { ThermodynamicOperations ops = new ThermodynamicOperations(thermoSystem); ops.TPflash(); // thermoSystem.prettyPrint(); - assertEquals(0.767272255056255, thermoSystem.getBeta(), 1e-4); + assertEquals(0.779829948507504, thermoSystem.getBeta(), 1e-4); } @Test diff --git a/src/test/java/neqsim/thermo/system/AcidTest.java b/src/test/java/neqsim/thermo/system/AcidTest.java new file mode 100644 index 000000000..aaee9cc4d --- /dev/null +++ b/src/test/java/neqsim/thermo/system/AcidTest.java @@ -0,0 +1,217 @@ +package neqsim.thermo.system; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import neqsim.thermo.component.ComponentSrkCPA; +import neqsim.thermo.phase.PhaseType; +import neqsim.thermodynamicoperations.ThermodynamicOperations; + +public class AcidTest extends neqsim.NeqSimTest { + + /** + *

+ * testAcid. + *

+ */ + @Test + @DisplayName("test equilibrium of formic acid") + public void testAcid() { + neqsim.thermo.system.SystemSrkCPAstatoil testSystem = + new neqsim.thermo.system.SystemSrkCPAstatoil(298.0, 10.0); + testSystem.addComponent("methane", 1.0, "kg/sec"); + testSystem.addComponent("formic acid", 25.0, "kg/sec"); + testSystem.addComponent("water", 100.0, "kg/sec"); + testSystem.setMixingRule(10); + ThermodynamicOperations testOps = new ThermodynamicOperations(testSystem); + testOps.TPflash(); + testSystem.prettyPrint(); + } + + /** + *

+ * testtestBubpAcid. + *

+ */ + @Test + @DisplayName("test bublepoint of formic acid") + public void testtestBubpAcid() { + neqsim.thermo.system.SystemSrkCPAstatoil testSystem = + new neqsim.thermo.system.SystemSrkCPAstatoil(373.0, 1.3501325); + testSystem.addComponent("formic acid", 25.0, "kg/sec"); + testSystem.setMixingRule(10); + ThermodynamicOperations testOps = new ThermodynamicOperations(testSystem); + try { + testOps.bubblePointPressureFlash(false); + testSystem.initProperties(); + } catch (Exception e) { + e.printStackTrace(); + } + + 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; + + // assertEquals(1002.54762, dens, 0.001); + + String scheme = + testSystem.getPhase(PhaseType.AQUEOUS).getComponent("formic acid").getAssociationScheme(); + double aCPA = + ((ComponentSrkCPA) testSystem.getPhase(PhaseType.AQUEOUS).getComponent("formic acid")) + .geta(); + double bCPA = + ((ComponentSrkCPA) testSystem.getPhase(PhaseType.AQUEOUS).getComponent("formic acid")) + .getb(); + double boundvol = + ((ComponentSrkCPA) testSystem.getPhase(PhaseType.AQUEOUS).getComponent("formic acid")) + .getAssociationVolume(); + double assenergy = + ((ComponentSrkCPA) testSystem.getPhase(PhaseType.AQUEOUS).getComponent("formic acid")) + .getAssociationEnergy(); + double m = + ((ComponentSrkCPA) testSystem.getPhase(PhaseType.AQUEOUS).getComponent("formic acid")) + .getAttractiveTerm().getm(); + assertEquals("1A", scheme); + assertEquals(53663.0, aCPA); + assertEquals(3.0, bCPA); + assertEquals(0.0155, boundvol); + assertEquals(41917.0, assenergy); + assertEquals(0.3338, m); + testSystem.prettyPrint(); + } + + + /** + *

+ * testtestBubpAcid. + *

+ */ + @Test + @DisplayName("test bublepoint of acetic acid") + public void testtestBubpAceticAcid() { + neqsim.thermo.system.SystemSrkCPAstatoil testSystem = + new neqsim.thermo.system.SystemSrkCPAstatoil(273.15 + 117.9, 1.01325); + testSystem.addComponent("AceticAcid", 25.0, "kg/sec"); + testSystem.setMixingRule(10); + ThermodynamicOperations testOps = new ThermodynamicOperations(testSystem); + try { + testOps.bubblePointPressureFlash(); + testSystem.initProperties(); + } catch (Exception e) { + e.printStackTrace(); + } + + 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; + + // assertEquals(1002.54762, dens, 0.001); + + String scheme = testSystem.getPhase(PhaseType.AQUEOUS).getComponent(0).getAssociationScheme(); + double aCPA = ((ComponentSrkCPA) testSystem.getPhase(PhaseType.AQUEOUS).getComponent(0)).geta(); + double bCPA = ((ComponentSrkCPA) testSystem.getPhase(PhaseType.AQUEOUS).getComponent(0)).getb(); + double boundvol = ((ComponentSrkCPA) testSystem.getPhase(PhaseType.AQUEOUS).getComponent(0)) + .getAssociationVolume(); + double assenergy = ((ComponentSrkCPA) testSystem.getPhase(PhaseType.AQUEOUS).getComponent(0)) + .getAssociationEnergy(); + double m = ((ComponentSrkCPA) testSystem.getPhase(PhaseType.AQUEOUS).getComponent(0)) + .getAttractiveTerm().getm(); + assertEquals("1A", scheme); + assertEquals(91195.7, aCPA); + assertEquals(4.6818, bCPA); + assertEquals(0.00452, boundvol); + assertEquals(40323.0, assenergy); + assertEquals(0.4644000000000, m, 0.0001); + testSystem.prettyPrint(); + } + + /** + *

+ * testtestBubpAcid. + *

+ */ + @Test + @DisplayName("test bublepoint of water") + public void testtestWater() { + neqsim.thermo.system.SystemSrkCPAstatoil testSystem = + new neqsim.thermo.system.SystemSrkCPAstatoil(398.0, 1.01325); + testSystem.addComponent("water", 25.0, "kg/sec"); + testSystem.setMixingRule(10); + ThermodynamicOperations testOps = new ThermodynamicOperations(testSystem); + try { + testOps.bubblePointTemperatureFlash(); + } catch (Exception e) { + e.printStackTrace(); + } + + String scheme = testSystem.getPhase(PhaseType.AQUEOUS).getComponent(0).getAssociationScheme(); + double aCPA = ((ComponentSrkCPA) testSystem.getPhase(PhaseType.AQUEOUS).getComponent(0)).geta(); + double bCPA = ((ComponentSrkCPA) testSystem.getPhase(PhaseType.AQUEOUS).getComponent(0)).getb(); + double boundvol = ((ComponentSrkCPA) testSystem.getPhase(PhaseType.AQUEOUS).getComponent(0)) + .getAssociationVolume(); + double assenergy = ((ComponentSrkCPA) testSystem.getPhase(PhaseType.AQUEOUS).getComponent(0)) + .getAssociationEnergy(); + double m = ((ComponentSrkCPA) testSystem.getPhase(PhaseType.AQUEOUS).getComponent(0)) + .getAttractiveTerm().getm(); + assertEquals("4C", scheme); + assertEquals(12277.0, aCPA); + assertEquals(1.4515, bCPA); + assertEquals(0.0692, boundvol); + assertEquals(16655.0, assenergy); + assertEquals(.6735900000000007, m, 0.00001); + testSystem.prettyPrint(); + } + + /** + *

+ * testtestBubpAcid. + *

+ */ + @Test + @DisplayName("test bublepoint of MEG") + public void testtestMEG() { + neqsim.thermo.system.SystemSrkCPAstatoil testSystem = + new neqsim.thermo.system.SystemSrkCPAstatoil(398.0, 1.01325); + testSystem.addComponent("MEG", 25.0, "kg/sec"); + testSystem.setMixingRule(10); + ThermodynamicOperations testOps = new ThermodynamicOperations(testSystem); + try { + testOps.bubblePointTemperatureFlash(); + } catch (Exception e) { + e.printStackTrace(); + } + + String scheme = testSystem.getPhase(PhaseType.AQUEOUS).getComponent(0).getAssociationScheme(); + double aCPA = ((ComponentSrkCPA) testSystem.getPhase(PhaseType.AQUEOUS).getComponent(0)).geta(); + double bCPA = ((ComponentSrkCPA) testSystem.getPhase(PhaseType.AQUEOUS).getComponent(0)).getb(); + double boundvol = ((ComponentSrkCPA) testSystem.getPhase(PhaseType.AQUEOUS).getComponent(0)) + .getAssociationVolume(); + double assenergy = ((ComponentSrkCPA) testSystem.getPhase(PhaseType.AQUEOUS).getComponent(0)) + .getAssociationEnergy(); + double m = ((ComponentSrkCPA) testSystem.getPhase(PhaseType.AQUEOUS).getComponent(0)) + .getAttractiveTerm().getm(); + assertEquals("4C", scheme); + assertEquals(108190.0, aCPA); + assertEquals(5.14, bCPA); + assertEquals(0.0141, boundvol); + assertEquals(19752.0, assenergy); + assertEquals(0.6743999999999983, m); + testSystem.prettyPrint(); + } +} From b3b051ddb7e66b9d600d263baf08319a520ac0db Mon Sep 17 00:00:00 2001 From: Even Solbraa <41290109+EvenSol@users.noreply.github.com> Date: Tue, 12 Nov 2024 20:18:09 +0100 Subject: [PATCH 14/21] update version (#1177) * update version * update version * update --- pom.xml | 2 +- pomJava21.xml | 2 +- pomJava8.xml | 2 +- .../process/equipment/util/Calculator.java | 24 ++++++------------- .../attractiveeosterm/AttractiveTermSrk.java | 2 +- .../java/neqsim/thermo/system/AcidTest.java | 5 ---- 6 files changed, 11 insertions(+), 26 deletions(-) diff --git a/pom.xml b/pom.xml index d19a354a0..b26166068 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 04e7304b6..1b16c25e5 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 1798e46bd..08187a8dd 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 130cc6020..a64952a59 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 6748b9250..04b398fc3 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 aaee9cc4d..548e25457 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(); } } From bcfed4059207a06f8ac5e9642a84ad6caf8bbb5f Mon Sep 17 00:00:00 2001 From: akselrs Date: Wed, 13 Nov 2024 16:31:57 +0100 Subject: [PATCH 15/21] Fix bug, remove output (#1178) --- .../viscosity/PFCTViscosityMethodMod86.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/viscosity/PFCTViscosityMethodMod86.java b/src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/viscosity/PFCTViscosityMethodMod86.java index 516eb19ae..58e2b462e 100644 --- a/src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/viscosity/PFCTViscosityMethodMod86.java +++ b/src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/viscosity/PFCTViscosityMethodMod86.java @@ -182,8 +182,8 @@ public double getRefComponentViscosity(double temp, double pres) { visRefG = (1.0 - HTAN) / 2.0; double viscRef3 = visRefG * Math.exp(viscRefK[0] + viscRefK[3] / temp) * (temp6 - 1.0); - System.out.println("ref visc2 " + viscRef2); - System.out.println("ref visc3 " + viscRef3); + // System.out.println("ref visc2 " + viscRef2); + // System.out.println("ref visc3 " + viscRef3); double refVisc = (viscRefO + viscRef1 + viscRef2 + viscRef3) / 1.0e7; // System.out.println("ref visc " + refVisc); return refVisc; From 1165af26e7e2271faf9cbfb0bfd05cb43c18310b Mon Sep 17 00:00:00 2001 From: Even Solbraa <41290109+EvenSol@users.noreply.github.com> Date: Sat, 16 Nov 2024 10:33:16 +0100 Subject: [PATCH 16/21] update gradient flash (#1179) * update gradient flash * update * update test * fix for Java 8 * update --- .../flashops/TPgradientFlash.java | 203 ++++++++++-------- .../flashops/TPgradientFlashTest.java | 75 +++++++ 2 files changed, 185 insertions(+), 93 deletions(-) create mode 100644 src/test/java/neqsim/thermodynamicoperations/flashops/TPgradientFlashTest.java diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/TPgradientFlash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/TPgradientFlash.java index 3695d4b08..9c72f4e17 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/TPgradientFlash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/TPgradientFlash.java @@ -7,153 +7,175 @@ package neqsim.thermodynamicoperations.flashops; import Jama.Matrix; +import neqsim.thermo.component.ComponentInterface; import neqsim.thermo.system.SystemInterface; /** - *

- * TPgradientFlash class. - *

- * - * @author even solbraa - * @version $Id: $Id + * TPgradientFlash class handles thermodynamic calculations with temperature and pressure gradients. */ public class TPgradientFlash extends Flash { private static final long serialVersionUID = 1000; - - SystemInterface localSystem = null; - SystemInterface tempSystem = null; - double temperature = 0.0; - double height = 0.0; - double deltaHeight = 0.0; - double deltaT = 0.0; - Matrix Jac; - Matrix fvec; - Matrix u; - Matrix dx; - Matrix uold; + private SystemInterface system; + private double temperature; + private double height; + private Matrix Jac; + private Matrix fvec; + private Matrix dx; + private SystemInterface localSystem; + private SystemInterface tempSystem; + private double deltaHeight; + private double deltaT; /** - *

- * Constructor for TPgradientFlash. - *

+ * Default constructor for TPgradientFlash. */ public TPgradientFlash() {} /** - *

- * Constructor for TPgradientFlash. - *

+ * Constructor for TPgradientFlash with system, height, and temperature. * * @param system a {@link neqsim.thermo.system.SystemInterface} object - * @param height a double - * @param temperature a double + * @param height a double representing the height + * @param temperature a double representing the temperature */ public TPgradientFlash(SystemInterface system, double height, double temperature) { this.system = system; this.temperature = temperature; this.height = height; - Jac = new Matrix(system.getPhase(0).getNumberOfComponents(), - system.getPhase(0).getNumberOfComponents()); - fvec = new Matrix(system.getPhase(0).getNumberOfComponents(), 1); + int numComponents = system.getPhase(0).getNumberOfComponents(); + Jac = new Matrix(numComponents + 1, numComponents + 1); + fvec = new Matrix(numComponents + 1, 1); } /** - *

- * Setter for the field fvec. - *

+ * Sets the fvec matrix values based on the thermodynamic calculations. */ public void setfvec() { - for (int i = 0; i < system.getPhase(0).getNumberOfComponents(); i++) { + double sumx = 0.0; + int numComponents = system.getPhase(0).getNumberOfComponents(); + double gravity = neqsim.thermo.ThermodynamicConstantsInterface.gravity; + double gasConstant = neqsim.thermo.ThermodynamicConstantsInterface.R; + + for (int i = 0; i < numComponents; i++) { + ComponentInterface component = (ComponentInterface) localSystem.getPhase(0).getComponent(i); + double fugacityCoeff = component.getFugacityCoefficient(); + double componentX = component.getx(); + double pressure = localSystem.getPressure(); + + // Breakdown of terms for readability + double logTerm = Math.log(fugacityCoeff * componentX * pressure); + double molarMassTerm = component.getMolarMass() * gravity * deltaHeight + / (gasConstant * tempSystem.getPhase(0).getTemperature()); + fvec.set(i, 0, - Math.log(localSystem.getPhases()[0].getComponents()[i].getFugacityCoefficient() - * localSystem.getPhases()[0].getComponents()[i].getx() * localSystem.getPressure()) + logTerm - Math.log(tempSystem.getPhases()[0].getComponents()[i].getFugacityCoefficient() * tempSystem.getPhases()[0].getComponents()[i].getx() * tempSystem.getPressure()) - - tempSystem.getPhases()[0].getComponents()[i].getMolarMass() - * neqsim.thermo.ThermodynamicConstantsInterface.gravity * deltaHeight - / neqsim.thermo.ThermodynamicConstantsInterface.R - / tempSystem.getPhase(0).getTemperature() - + tempSystem.getPhases()[0].getComponents()[i].getMolarMass() - * (tempSystem.getPhases()[0].getEnthalpy() - / tempSystem.getPhases()[0].getNumberOfMolesInPhase() - / tempSystem.getPhase(0).getMolarMass() - - tempSystem.getPhases()[0].getComponents()[i] - .getEnthalpy(tempSystem.getPhase(0).getTemperature()) - / tempSystem.getPhases()[0].getComponent(i).getNumberOfMolesInPhase() - / tempSystem.getPhase(0).getComponent(i).getMolarMass()) - * deltaT / tempSystem.getPhase(0).getTemperature() - / neqsim.thermo.ThermodynamicConstantsInterface.R - / tempSystem.getPhase(0).getTemperature()); + - molarMassTerm); + sumx += componentX; } + + fvec.set(numComponents, 0, sumx - 1.0); } /** - *

- * setJac. - *

+ * Sets the Jacobian (Jac) matrix values based on the thermodynamic calculations. */ public void setJac() { Jac.timesEquals(0.0); - double dij = 0.0; - - double tempJ = 0.0; - - for (int i = 0; i < system.getPhase(0).getNumberOfComponents(); i++) { - for (int j = 0; j < system.getPhase(0).getNumberOfComponents(); j++) { - dij = i == j ? 1.0 : 0.0; // Kroneckers delta - tempJ = 1.0 - / (localSystem.getPhases()[0].getComponents()[i].getFugacityCoefficient() - * localSystem.getPhases()[0].getComponents()[i].getx() * localSystem.getPressure()) - * (localSystem.getPhases()[0].getComponents()[i].getFugacityCoefficient() * dij - * localSystem.getPressure() - + localSystem.getPhases()[0].getComponents()[i].getdfugdx(j) - * localSystem.getPhases()[0].getComponents()[i].getx() - * localSystem.getPressure()); + int numComponents = system.getPhase(0).getNumberOfComponents(); + + for (int i = 0; i < numComponents; i++) { + for (int j = 0; j < numComponents; j++) { + double dij = (i == j) ? 1.0 : 0.0; // Kronecker delta + double fugacityCoeff = + localSystem.getPhases()[0].getComponents()[i].getFugacityCoefficient(); + double componentX = localSystem.getPhases()[0].getComponents()[i].getx(); + double pressure = localSystem.getPressure(); + + double tempJ = 1.0 / (fugacityCoeff * componentX * pressure) + * (fugacityCoeff * dij * pressure + + localSystem.getPhases()[0].getComponents()[i].getdfugdx(j) * componentX + * pressure); Jac.set(i, j, tempJ); } } + + // Set the last row of Jac + for (int j = 0; j < numComponents; j++) { + Jac.set(numComponents, j, 1.0); + } + + for (int i = 0; i < numComponents; i++) { + double fugacityCoeff = localSystem.getPhases()[0].getComponents()[i].getFugacityCoefficient(); + double componentX = localSystem.getPhases()[0].getComponents()[i].getx(); + double pressure = localSystem.getPressure(); + + double tempJ = 1.0 / (fugacityCoeff * componentX * pressure) + * (localSystem.getPhases()[0].getComponents()[i].getdfugdp() * componentX * pressure + + fugacityCoeff * componentX); + Jac.set(i, numComponents, tempJ); + } + + Jac.set(numComponents, numComponents, 0.0); } /** - *

- * setNewX. - *

+ * Updates the composition and pressure in the local system based on calculated adjustments. */ public void setNewX() { - for (int i = 0; i < system.getPhase(0).getNumberOfComponents(); i++) { - localSystem.getPhase(0).getComponent(i) - .setx(localSystem.getPhase(0).getComponent(i).getx() - 0.5 * dx.get(i, 0)); + int numComponents = system.getPhase(0).getNumberOfComponents(); + double relaxationFactor = 0.8; // Relaxation factor for numerical stability + + for (int i = 0; i < numComponents; i++) { + ComponentInterface component = (ComponentInterface) localSystem.getPhase(0).getComponent(i); + double newX = component.getx() - relaxationFactor * dx.get(i, 0); + component.setx(newX); } - localSystem.getPhase(0).normalize(); + + // Update system pressure + double newPressure = localSystem.getPressure() - relaxationFactor * dx.get(numComponents, 0); + localSystem.setPressure(newPressure); + + // Optional: Normalize phase composition + // localSystem.getPhase(0).normalize(); } /** {@inheritDoc} */ @Override public void run() { + // Clone the system for temporary calculations tempSystem = system.clone(); tempSystem.init(0); tempSystem.init(3); + // Clone the system for local calculations localSystem = system.clone(); - // localSystem.setPressure(height*9.81*height); + // Initialize delta values for temperature and height deltaT = (temperature - system.getTemperature()) / 20.0; deltaHeight = height / 20.0; - for (int i = 0; i < 20; i++) { + for (int step = 0; step < 20; step++) { + // Incrementally adjust the temperature in the local system localSystem.setTemperature(localSystem.getTemperature() + deltaT); - for (int o = 0; o < 15; o++) { - localSystem.init(3); - setfvec(); - setJac(); - dx = Jac.solve(fvec); - dx.print(10, 10); - setNewX(); - } - // localSystem.display(); + int iter = 0; + double tolerance = 1e-10; // Convergence criterion + int maxIterations = 50; // Maximum allowable iterations + + do { + iter++; + localSystem.init(3); // Initialize system properties + setfvec(); // Calculate the function vector + setJac(); // Calculate the Jacobian matrix + dx = Jac.solve(fvec); // Solve for updates (dx) + setNewX(); // Update composition and pressure + } while (dx.norm2() > tolerance && iter < maxIterations); + + // Clone the updated local system into tempSystem tempSystem = localSystem.clone(); - tempSystem.init(3); + tempSystem.init(3); // Re-initialize tempSystem for the next step } } @@ -162,10 +184,5 @@ public void run() { public SystemInterface getThermoSystem() { return localSystem; } - - /** {@inheritDoc} */ - @Override - public org.jfree.chart.JFreeChart getJFreeChart(String name) { - return null; - } } + diff --git a/src/test/java/neqsim/thermodynamicoperations/flashops/TPgradientFlashTest.java b/src/test/java/neqsim/thermodynamicoperations/flashops/TPgradientFlashTest.java new file mode 100644 index 000000000..b35334569 --- /dev/null +++ b/src/test/java/neqsim/thermodynamicoperations/flashops/TPgradientFlashTest.java @@ -0,0 +1,75 @@ +package neqsim.thermodynamicoperations.flashops; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import java.util.ArrayList; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Test; +import neqsim.thermo.system.SystemInterface; +import neqsim.thermo.system.SystemSrkEos; +import neqsim.thermodynamicoperations.ThermodynamicOperations; + +public class TPgradientFlashTest { + static Logger logger = LogManager.getLogger(TPgradientFlashTest.class); + + @Test + void testRun() { + SystemInterface testSystem = new SystemSrkEos(345, 80.0); + + ThermodynamicOperations testOps = new ThermodynamicOperations(testSystem); + testSystem.addComponent("hydrogen", 1.0); + testSystem.addComponent("methane", 8.0); + testSystem.addComponent("propane", 1.0); + + testSystem.createDatabase(true); + testSystem.setMixingRule(2); + + SystemInterface newSystem = null; + try { + newSystem = testOps.TPgradientFlash(1000, 355).phaseToSystem(0); + // newSystem.prettyPrint(); + } catch (Exception ex) { + logger.error(ex.getMessage(), ex); + } + + assertEquals(0.095513700959, newSystem.getComponent("hydrogen").getx(), 1e-4); + } + + @Test + void testGradient() { + + double depth = 1000.0; + double temperature = 273.15 + 70; + double pressure = 80.0; + + ArrayList x_h2 = new ArrayList<>(); + ArrayList p_depth = new ArrayList<>(); + + SystemInterface testSystem = new SystemSrkEos(temperature, pressure); + testSystem.addComponent("hydrogen", 1.0); + testSystem.addComponent("methane", 8.0); + testSystem.addComponent("propane", 1.0); + + testSystem.createDatabase(true); + testSystem.setMixingRule(2); + + ThermodynamicOperations testOps = new ThermodynamicOperations(testSystem); + SystemInterface newSystem = null; + double deltaHeight = 100.0; + double deltaT = 0.5; + for (int i = 0; i < 10; i++) { + try { + newSystem = testOps.TPgradientFlash(i * deltaHeight, temperature + i * deltaT); + } catch (Exception ex) { + logger.error(ex.getMessage(), ex); + } + x_h2.add(newSystem.getComponent("hydrogen").getx()); + p_depth.add(newSystem.getPressure()); + // System.out + // .println(newSystem.getComponent("hydrogen").getx() + " " + newSystem.getPressure()); + } + assertEquals(0.0964169380341, x_h2.get(6), 1e-4); + + } + +} From 3ec0c55e5302f5b945421860fac13daed9d56ee0 Mon Sep 17 00:00:00 2001 From: Even Solbraa <41290109+EvenSol@users.noreply.github.com> Date: Sun, 17 Nov 2024 14:27:08 +0100 Subject: [PATCH 17/21] compcurve (#1180) * compcurve * update * update model * add octane * update * update * update compressorchart method --- .../equipment/compressor/Compressor.java | 46 +++++++--- .../equipment/compressor/CompressorChart.java | 41 +++++++-- .../compressor/CompressorInterface.java | 46 ++++++++-- .../compressor/CompressorChartTest.java | 90 ++++++++++++++++++- 4 files changed, 198 insertions(+), 25 deletions(-) diff --git a/src/main/java/neqsim/process/equipment/compressor/Compressor.java b/src/main/java/neqsim/process/equipment/compressor/Compressor.java index d97bc3cf8..8da288cc0 100644 --- a/src/main/java/neqsim/process/equipment/compressor/Compressor.java +++ b/src/main/java/neqsim/process/equipment/compressor/Compressor.java @@ -80,8 +80,7 @@ public Compressor(String name) { *

* * @param name a {@link java.lang.String} object - * @param inletStream a {@link neqsim.process.equipment.stream.StreamInterface} - * object + * @param inletStream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public Compressor(String name, StreamInterface inletStream) { this(name); @@ -926,8 +925,7 @@ public SystemInterface getThermoSystem() { * Getter for the field compressorChart. *

* - * @return a {@link neqsim.process.equipment.compressor.CompressorChartInterface} - * object + * @return a {@link neqsim.process.equipment.compressor.CompressorChartInterface} object */ public CompressorChartInterface getCompressorChart() { return compressorChart; @@ -938,8 +936,7 @@ public CompressorChartInterface getCompressorChart() { * Setter for the field compressorChart. *

* - * @param compressorChart a - * {@link neqsim.process.equipment.compressor.CompressorChart} object + * @param compressorChart a {@link neqsim.process.equipment.compressor.CompressorChart} object */ public void setCompressorChart(CompressorChart compressorChart) { this.compressorChart = compressorChart; @@ -972,6 +969,19 @@ public double getDistanceToSurge() { / getCompressorChart().getSurgeCurve().getSurgeFlow(getPolytropicFluidHead()) - 1; } + /** {@inheritDoc} */ + @Override + public double getSurgeFlowRateMargin() { + return getInletStream().getFlowRate("m3/hr") + - getCompressorChart().getSurgeCurve().getSurgeFlow(getPolytropicFluidHead()); + } + + /** {@inheritDoc} */ + @Override + public double getSurgeFlowRate() { + return getCompressorChart().getSurgeCurve().getSurgeFlow(getPolytropicFluidHead()); + } + /** *

* isStoneWall. @@ -990,8 +1000,7 @@ public boolean isStoneWall(double flow, double head) { * Setter for the field antiSurge. *

* - * @param antiSurge a {@link neqsim.process.equipment.compressor.AntiSurge} - * object + * @param antiSurge a {@link neqsim.process.equipment.compressor.AntiSurge} object */ public void setAntiSurge(AntiSurge antiSurge) { this.antiSurge = antiSurge; @@ -1252,9 +1261,7 @@ public void setUseGERG2008(boolean useGERG2008) { * Getter for the field propertyProfile. *

* - * @return a - * {@link neqsim.process.equipment.compressor.CompressorPropertyProfile} - * object + * @return a {@link neqsim.process.equipment.compressor.CompressorPropertyProfile} object */ public CompressorPropertyProfile getPropertyProfile() { return propertyProfile; @@ -1265,8 +1272,7 @@ public CompressorPropertyProfile getPropertyProfile() { * Setter for the field propertyProfile. *

* - * @param propertyProfile a - * {@link neqsim.process.equipment.compressor.CompressorPropertyProfile} + * @param propertyProfile a {@link neqsim.process.equipment.compressor.CompressorPropertyProfile} * object */ public void setPropertyProfile(CompressorPropertyProfile propertyProfile) { @@ -1459,4 +1465,18 @@ public void setIsSetMaxOutletPressure(boolean isSetMaxOutletPressure) { public double getActualCompressionRatio() { return actualCompressionRatio; } + + /** + *

+ * Set CompressorChartType + *

+ * + */ + public void setCompressorChartType(String type) { + if (type.equals("simple")) { + compressorChart = new CompressorChart(); + } else { + compressorChart = new CompressorChartAlternativeMapLookup(); + } + } } diff --git a/src/main/java/neqsim/process/equipment/compressor/CompressorChart.java b/src/main/java/neqsim/process/equipment/compressor/CompressorChart.java index 925c0c350..2dfa7dfa6 100644 --- a/src/main/java/neqsim/process/equipment/compressor/CompressorChart.java +++ b/src/main/java/neqsim/process/equipment/compressor/CompressorChart.java @@ -66,7 +66,23 @@ public void addCurve(double speed, double[] flow, double[] head, double[] polytr chartValues.add(curve); } - /** {@inheritDoc} */ + /** + * {@inheritDoc} + * + * This method initializes the compressor performance curves, including speed, flow, head, and + * polytropic efficiency. + * + *

+ * The method takes chart conditions and initializes internal variables for different performance + * parameters based on input arrays for speed, flow, head, and polytropic efficiency. It also + * normalizes these parameters by calculating reduced values based on speed. + * + * @param chartConditions An array of conditions used for the compressor chart. (Currently unused) + * @param speed An array representing the compressor speed values. + * @param flow A 2D array representing the flow rates at different speeds. + * @param head A 2D array representing the head values at different speeds. + * @param polyEff A 2D array representing the polytropic efficiency values at different speeds. + */ @Override public void setCurves(double[] chartConditions, double[] speed, double[][] flow, double[][] head, double[][] polyEff) { @@ -75,9 +91,16 @@ public void setCurves(double[] chartConditions, double[] speed, double[][] flow, this.polytropicEfficiency = polyEff; this.flow = flow; - this.redhead = new double[head.length][head[0].length]; - this.redpolytropicEfficiency = new double[polyEff.length][polyEff[0].length]; - this.redflow = new double[flow.length][flow[0].length]; + // Dynamically initialize arrays based on the maximum length of flow, head, and polyEff + int maxLength = 0; + for (double[] f : flow) { + if (f.length > maxLength) + maxLength = f.length; + } + + this.redhead = new double[head.length][maxLength]; + this.redpolytropicEfficiency = new double[polyEff.length][maxLength]; + this.redflow = new double[flow.length][maxLength]; for (int i = 0; i < speed.length; i++) { if (speed[i] > maxSpeedCurve) { @@ -88,7 +111,8 @@ public void setCurves(double[] chartConditions, double[] speed, double[][] flow, } CompressorCurve curve = new CompressorCurve(speed[i], flow[i], head[i], polyEff[i]); chartValues.add(curve); - for (int j = 0; j < flow[i].length; j++) { + + for (int j = 0; j < flow[i].length; j++) { // Handle differing lengths for each speed redflow[i][j] = flow[i][j] / speed[i]; redpolytropicEfficiency[i][j] = polyEff[i][j]; redhead[i][j] = head[i][j] / speed[i] / speed[i]; @@ -98,6 +122,13 @@ public void setCurves(double[] chartConditions, double[] speed, double[][] flow, // TODO: MLLU: not correct. speed[0] should be the requested speed fanLawCorrectionFitter.add(speed[i] / speed[0], flow[i][j] / flowFanLaw); } + + // Fill remaining slots with default values (e.g., 0) if arrays are shorter + for (int j = flow[i].length; j < maxLength; j++) { + redflow[i][j] = 0; + redpolytropicEfficiency[i][j] = 0; + redhead[i][j] = 0; + } } referenceSpeed = (maxSpeedCurve + minSpeedCurve) / 2.0; diff --git a/src/main/java/neqsim/process/equipment/compressor/CompressorInterface.java b/src/main/java/neqsim/process/equipment/compressor/CompressorInterface.java index d9bfdf543..184862452 100644 --- a/src/main/java/neqsim/process/equipment/compressor/CompressorInterface.java +++ b/src/main/java/neqsim/process/equipment/compressor/CompressorInterface.java @@ -73,37 +73,73 @@ public interface CompressorInterface extends ProcessEquipmentInterface, TwoPortI public AntiSurge getAntiSurge(); /** - *

getDistanceToSurge.

+ *

+ * getDistanceToSurge. + *

* * @return a double */ public double getDistanceToSurge(); /** - *

setMaximumSpeed.

+ *

+ * setMaximumSpeed. + *

* * @param maxSpeed a double */ public void setMaximumSpeed(double maxSpeed); /** - *

setMinimumSpeed.

+ *

+ * setMinimumSpeed. + *

* * @param minspeed a double */ public void setMinimumSpeed(double minspeed); /** - *

getMaximumSpeed.

+ *

+ * getMaximumSpeed. + *

* * @return a double */ public double getMaximumSpeed(); /** - *

getMinimumSpeed.

+ *

+ * getMinimumSpeed. + *

* * @return a double */ public double getMinimumSpeed(); + + /** + *

+ * getSurgeFlowRateMargin. + *

+ * + * @return a double + */ + public double getSurgeFlowRateMargin(); + + /** + *

+ * getSurgeFlowRate. + *

+ * + * @return a double + */ + public double getSurgeFlowRate(); + + /** + *

+ * Set CompressorChartType + *

+ * + */ + public void setCompressorChartType(String type); } diff --git a/src/test/java/neqsim/process/equipment/compressor/CompressorChartTest.java b/src/test/java/neqsim/process/equipment/compressor/CompressorChartTest.java index d8e0229cc..e0c0b8c9b 100644 --- a/src/test/java/neqsim/process/equipment/compressor/CompressorChartTest.java +++ b/src/test/java/neqsim/process/equipment/compressor/CompressorChartTest.java @@ -4,10 +4,9 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import neqsim.process.equipment.compressor.Compressor; -import neqsim.process.equipment.compressor.CompressorChart; import neqsim.process.equipment.stream.Stream; import neqsim.thermo.system.SystemInterface; +import neqsim.thermo.system.SystemPrEos; import neqsim.thermo.system.SystemSrkEos; public class CompressorChartTest { @@ -178,4 +177,91 @@ void testSetHeadUnit() { "neqsim.util.exception.InvalidInputException: CompressorChart:setHeadUnit - Input headUnit does not support value doesNotExist", thrown.getMessage()); } + + @Test + public void runCurveTest() { + SystemInterface testFluid = new SystemPrEos(273.15 + 29.96, 75.73); + + testFluid.addComponent("nitrogen", 0.7823); + testFluid.addComponent("CO2", 1.245); + testFluid.addComponent("methane", 88.4681); + testFluid.addComponent("ethane", 4.7652); + testFluid.addComponent("propane", 2.3669); + testFluid.addComponent("i-butane", 0.3848); + testFluid.addComponent("n-butane", 0.873); + testFluid.addComponent("i-pentane", 0.243); + testFluid.addComponent("n-pentane", 0.2947); + testFluid.addComponent("n-hexane", 0.2455); + testFluid.addComponent("n-heptane", 0.1735); + testFluid.addComponent("n-octane", 0.064); + testFluid.addComponent("water", 0.076); + testFluid.setMixingRule("classic"); + + testFluid.setTemperature(29.96, "C"); + testFluid.setPressure(75.73, "bara"); + testFluid.setTotalFlowRate(559401.418270102, "kg/hr"); + + Stream stream_1 = new Stream("Stream1", testFluid); + stream_1.run(); + + stream_1.getFluid().prettyPrint(); + + Compressor comp1 = new Compressor("compressor 1", stream_1); + //comp1.setCompressorChartType("interpolate"); + comp1.setUsePolytropicCalc(true); + comp1.setSpeed(8765); + + double[] chartConditions = new double[] {0.3, 1.0, 1.0, 1.0}; + + double[] speed = new double[] {7000, 7500, 8000, 8500, 9000, 9500, 9659, 10000, 10500}; + + double[][] flow = new double[][] {{4512.7, 5120.8, 5760.9, 6401, 6868.27}, + {4862.47, 5486.57, 6172.39, 6858.21, 7550.89}, + {5237.84, 5852.34, 6583.88, 7315.43, 8046.97, 8266.43}, + {5642.94, 6218.11, 6995.38, 7772.64, 8549.9, 9000.72}, + {6221.77, 6583.88, 7406.87, 8229.85, 9052.84, 9768.84}, + {6888.85, 6949.65, 7818.36, 8687.07, 9555.77, 10424.5, 10546.1}, + {7109.83, 7948.87, 8832.08, 9715.29, 10598.5, 10801.6}, + {7598.9, 8229.85, 9144.28, 10058.7, 10973.1, 11338.9}, + {8334.1, 8641.35, 9601.5, 10561.6, 11521.8, 11963.5}}; + + double[][] head = new double[][] {{61.885, 59.639, 56.433, 52.481, 49.132}, + {71.416, 69.079, 65.589, 61.216, 55.858}, {81.621, 79.311, 75.545, 70.727, 64.867, 62.879,}, + {92.493, 90.312, 86.3, 81.079, 74.658, 70.216}, + {103.512, 102.073, 97.83, 92.254, 85.292, 77.638}, + {114.891, 114.632, 110.169, 104.221, 96.727, 87.002, 85.262}, + {118.595, 114.252, 108.203, 100.55, 90.532, 87.54}, + {126.747, 123.376, 117.113, 109.056, 98.369, 92.632}, + {139.082, 137.398, 130.867, 122.264, 110.548, 103.247},}; + double[][] polyEff = new double[][] {{78.3, 78.2, 77.2, 75.4, 73.4}, + + {78.3, 78.3, 77.5, 75.8, 73}, {78.2, 78.4, 77.7, 76.1, 73.5, 72.5}, + {78.2, 78.4, 77.9, 76.4, 74, 71.9}, {78.3, 78.4, 78, 76.7, 74.5, 71.2}, + {78.3, 78.4, 78.1, 77, 74.9, 71.3, 70.5}, {78.4, 78.1, 77.1, 75, 71.4, 70.2}, + {78.3, 78.2, 77.2, 75.2, 71.7, 69.5}, {78.2, 78.2, 77.3, 75.5, 72.2, 69.6}}; + + comp1.getCompressorChart().setCurves(chartConditions, speed, flow, head, polyEff); + comp1.getCompressorChart().setHeadUnit("kJ/kg"); + + double[] surgeflow = + new double[] {4512.7, 4862.47, 5237.84, 5642.94, 6221.77, 6888.85, 7109.83, 7598.9}; + double[] surgehead = + new double[] {61.885, 71.416, 81.621, 92.493, 103.512, 114.891, 118.595, 126.747}; + comp1.getCompressorChart().getSurgeCurve().setCurve(chartConditions, surgeflow, surgehead); + // comp1.getAntiSurge().setActive(true); + comp1.getAntiSurge().setSurgeControlFactor(1.0); + comp1.run(); + + System.out.println("speed " + comp1.getSpeed()); + System.out.println("out pres " + comp1.getOutletPressure()); + System.out.println("out temp " + (comp1.getOutTemperature() - 273.15)); + System.out.println("feed flow " + (comp1.getInletStream().getFlowRate("m3/hr"))); + System.out.println("polytropic head " + comp1.getPolytropicFluidHead()); + System.out.println("polytropic efficiency " + comp1.getPolytropicEfficiency()); + System.out.println("dist to surge " + comp1.getDistanceToSurge()); + System.out.println("surge flow rate margin " + comp1.getSurgeFlowRateMargin()); + System.out.println("surge flow rate " + comp1.getSurgeFlowRate()); + System.out.println("duty " + comp1.getPower("MW")); + } + } From 2170cec06145903d2857e64431245bcdc58c2822 Mon Sep 17 00:00:00 2001 From: Even Solbraa <41290109+EvenSol@users.noreply.github.com> Date: Sun, 17 Nov 2024 21:38:26 +0100 Subject: [PATCH 18/21] add extrapolate curve (#1181) * add extrapolate curve * update test --- .../equipment/compressor/Compressor.java | 6 +- .../CompressorChartAlternativeMapLookup.java | 146 +++++++++++- ...rChartAlternativeMapLookupExtrapolate.java | 217 ++++++++++++++++++ .../compressor/CompressorInterface.java | 15 ++ .../compressor/CompressorChartTest.java | 26 ++- 5 files changed, 397 insertions(+), 13 deletions(-) create mode 100644 src/main/java/neqsim/process/equipment/compressor/CompressorChartAlternativeMapLookupExtrapolate.java diff --git a/src/main/java/neqsim/process/equipment/compressor/Compressor.java b/src/main/java/neqsim/process/equipment/compressor/Compressor.java index 8da288cc0..ac78022d0 100644 --- a/src/main/java/neqsim/process/equipment/compressor/Compressor.java +++ b/src/main/java/neqsim/process/equipment/compressor/Compressor.java @@ -1475,8 +1475,12 @@ public double getActualCompressionRatio() { public void setCompressorChartType(String type) { if (type.equals("simple")) { compressorChart = new CompressorChart(); - } else { + } else if (type.equals("interpolate")) { compressorChart = new CompressorChartAlternativeMapLookup(); + } else if (type.equals("interpolate and extrapolate")) { + compressorChart = new CompressorChartAlternativeMapLookupExtrapolate(); + } else { + compressorChart = new CompressorChart(); } } } diff --git a/src/main/java/neqsim/process/equipment/compressor/CompressorChartAlternativeMapLookup.java b/src/main/java/neqsim/process/equipment/compressor/CompressorChartAlternativeMapLookup.java index 7e4895eb5..8aa221c57 100644 --- a/src/main/java/neqsim/process/equipment/compressor/CompressorChartAlternativeMapLookup.java +++ b/src/main/java/neqsim/process/equipment/compressor/CompressorChartAlternativeMapLookup.java @@ -16,7 +16,112 @@ * This class is an implementation of the compressor chart class that uses Fan laws and "double" * interpolation to navigate the compressor map (as opposed to the standard class using reduced * variables according to Fan laws). - * + * + *

+ * The class provides methods to add compressor curves, set reference conditions, and calculate + * polytropic head and efficiency based on flow and speed. It also includes methods to check surge + * and stone wall conditions. + *

+ * + *

+ * The main method demonstrates the usage of the class by creating a test fluid, setting up a + * compressor, and running a process system. + *

+ * + *

+ * The class implements the CompressorChartInterface and is Serializable. + *

+ * + *

+ * Fields: + *

+ *
    + *
  • serialVersionUID: A unique identifier for serialization.
    • + *
  • logger: Logger instance for logging.
    • + *
  • chartValues: List of compressor curves.
    • + *
  • chartSpeeds: List of chart speeds.
    • + *
  • surgeCurve: Surge curve instance.
    • + *
  • stoneWallCurve: Stone wall curve instance.
    • + *
  • isSurge: Flag indicating if the compressor is in surge condition.
    • + *
  • isStoneWall: Flag indicating if the compressor is in stone wall condition.
    • + *
  • refMW: Reference molecular weight.
    • + *
  • headUnit: Unit of the head (default is "meter").
    • + *
  • useCompressorChart: Flag indicating if the compressor chart is used.
    • + *
  • refTemperature: Reference temperature.
    • + *
  • refPressure: Reference pressure.
    • + *
  • referenceSpeed: Reference speed (default is 1000.0).
    • + *
  • refZ: Reference compressibility factor.
    • + *
  • useRealKappa: Flag indicating if real kappa is used.
    • + *
  • chartConditions: Array of chart conditions.
    • + *
  • reducedHeadFitter: Weighted observed points for reduced head fitting.
    • + *
  • reducedFlowFitter: Weighted observed points for reduced flow fitting.
    • + *
  • fanLawCorrectionFitter: Weighted observed points for fan law correction fitting.
    • + *
  • reducedPolytropicEfficiencyFitter: Weighted observed points for reduced polytropic efficiency + * fitting.
    • + *
  • reducedHeadFitterFunc: Polynomial function for reduced head fitting.
    • + *
  • reducedPolytropicEfficiencyFunc: Polynomial function for reduced polytropic efficiency + * fitting.
    • + *
  • fanLawCorrectionFunc: Polynomial function for fan law correction fitting.
    • + *
  • gearRatio: Gear ratio (default is 1.0).
    • + *
+ * + *

+ * Methods: + *

+ *
    + *
  • addCurve: Adds a compressor curve.
    • + *
  • setCurves: Sets multiple compressor curves.
    • + *
  • getClosestRefSpeeds: Gets the closest reference speeds to a given speed.
    • + *
  • getPolytropicHead: Calculates the polytropic head based on flow and speed.
    • + *
  • getPolytropicEfficiency: Calculates the polytropic efficiency based on flow and speed.
    • + *
  • addSurgeCurve: Adds a surge curve.
    • + *
  • getCurveAtRefSpeed: Gets the compressor curve at a given reference speed.
    • + *
  • getGearRatio: Gets the gear ratio.
    • + *
  • setGearRatio: Sets the gear ratio.
    • + *
  • polytropicEfficiency: Calculates the polytropic efficiency (returns a constant value of + * 100.0).
    • + *
  • getSpeed: Calculates the speed based on flow and head.
    • + *
  • checkSurge1: Checks if the compressor is in surge condition (method 1).
    • + *
  • checkSurge2: Checks if the compressor is in surge condition (method 2).
    • + *
  • checkStoneWall: Checks if the compressor is in stone wall condition.
    • + *
  • setReferenceConditions: Sets the reference conditions.
    • + *
  • getSurgeCurve: Gets the surge curve.
    • + *
  • setSurgeCurve: Sets the surge curve.
    • + *
  • getStoneWallCurve: Gets the stone wall curve.
    • + *
  • setStoneWallCurve: Sets the stone wall curve.
    • + *
  • main: Main method demonstrating the usage of the class.
    • + *
  • isUseCompressorChart: Checks if the compressor chart is used.
    • + *
  • setUseCompressorChart: Sets the flag indicating if the compressor chart is used.
    • + *
  • getHeadUnit: Gets the unit of the head.
    • + *
  • setHeadUnit: Sets the unit of the head.
    • + *
  • useRealKappa: Checks if real kappa is used.
    • + *
  • setUseRealKappa: Sets the flag indicating if real kappa is used.
    • + *
  • bisect_left: Helper method for binary search (overloaded).
    • + *
  • plot: Placeholder method for plotting (not implemented).
    • + *
  • getFlow: Placeholder method for getting flow (not implemented).
    • + *
+ * + *

+ * Exceptions: + *

+ *
    + *
  • RuntimeException: Thrown for invalid input or unsupported head unit value.
    • + *
+ * + * @see neqsim.process.equipment.compressor.CompressorChartInterface + * @see java.io.Serializable + * @see org.apache.commons.math3.analysis.interpolation.SplineInterpolator + * @see org.apache.commons.math3.analysis.polynomials.PolynomialFunction + * @see org.apache.commons.math3.analysis.polynomials.PolynomialSplineFunction + * @see org.apache.commons.math3.fitting.WeightedObservedPoints + * @see org.apache.logging.log4j.LogManager + * @see org.apache.logging.log4j.Logger + * @see neqsim.process.equipment.stream.Stream + * @see neqsim.thermo.system.SystemInterface + * @see neqsim.thermo.system.SystemSrkEos + */ + +/** * @author asmund * @version $Id: $Id */ @@ -65,6 +170,16 @@ public void addCurve(double speed, double[] flow, double[] head, double[] polytr } /** {@inheritDoc} */ + /** + * Sets the compressor curves based on the provided chart conditions, speed, flow, head, and + * polytropic efficiency values. + * + * @param chartConditions an array of chart conditions (not used in this method) + * @param speed an array of speed values for the compressor + * @param flow a 2D array of flow values corresponding to each speed + * @param head a 2D array of head values corresponding to each speed + * @param polyEff a 2D array of polytropic efficiency values corresponding to each speed + */ @Override public void setCurves(double[] chartConditions, double[] speed, double[][] flow, double[][] head, double[][] polyEff) { @@ -85,6 +200,16 @@ public void setCurves(double[] chartConditions, double[] speed, double[][] flow, * @param speed a double * @return a {@link java.util.ArrayList} object */ + /** + * Returns a list of the closest reference speeds to the given speed. If the given speed matches a + * reference speed, only that speed is returned. If the given speed is between two reference + * speeds, both are returned. If the given speed is lower than the lowest reference speed, the + * lowest reference speed is returned. If the given speed is higher than the highest reference + * speed, the highest reference speed is returned. + * + * @param speed the speed to find the closest reference speeds for + * @return an ArrayList of the closest reference speeds + */ public ArrayList getClosestRefSpeeds(double speed) { ArrayList closestRefSpeeds = new ArrayList(); Double[] speedArray = new Double[chartSpeeds.size()]; @@ -116,6 +241,16 @@ public ArrayList getClosestRefSpeeds(double speed) { } /** {@inheritDoc} */ + /** + * Calculates the polytropic head for a given flow and speed. + * + * This method interpolates the polytropic head values from reference speeds closest to the given + * speed and averages them to estimate the polytropic head at the specified flow and speed. + * + * @param flow the flow rate for which the polytropic head is to be calculated + * @param speed the speed at which the polytropic head is to be calculated + * @return the calculated polytropic head + */ @Override public double getPolytropicHead(double flow, double speed) { ArrayList closestRefSpeeds = new ArrayList(); @@ -141,6 +276,15 @@ public double getPolytropicHead(double flow, double speed) { } /** {@inheritDoc} */ + /** + * Calculates the polytropic efficiency of the compressor for a given flow and speed. The method + * interpolates the efficiency values from reference speed curves and averages them to estimate + * the efficiency at the specified conditions. + * + * @param flow the flow rate through the compressor + * @param speed the rotational speed of the compressor + * @return the polytropic efficiency at the specified flow and speed + */ @Override public double getPolytropicEfficiency(double flow, double speed) { ArrayList closestRefSpeeds = new ArrayList(); diff --git a/src/main/java/neqsim/process/equipment/compressor/CompressorChartAlternativeMapLookupExtrapolate.java b/src/main/java/neqsim/process/equipment/compressor/CompressorChartAlternativeMapLookupExtrapolate.java new file mode 100644 index 000000000..01ab16f5d --- /dev/null +++ b/src/main/java/neqsim/process/equipment/compressor/CompressorChartAlternativeMapLookupExtrapolate.java @@ -0,0 +1,217 @@ +package neqsim.process.equipment.compressor; + +import java.util.ArrayList; +import org.apache.commons.math3.analysis.interpolation.SplineInterpolator; +import org.apache.commons.math3.analysis.polynomials.PolynomialSplineFunction; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +public class CompressorChartAlternativeMapLookupExtrapolate + extends CompressorChartAlternativeMapLookup { + private static final long serialVersionUID = 1000; + static Logger logger = LogManager.getLogger(CompressorChartAlternativeMapLookupExtrapolate.class); + + + /** + * 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. + * + * @param speed the speed to find the closest reference speeds for. + * @return a list of the closest reference speeds. + * @throws IllegalStateException if no reference speeds are available in the chart values. + */ + @Override + public ArrayList getClosestRefSpeeds(double speed) { + ArrayList closestSpeeds = new ArrayList<>(); + for (CompressorCurve curve : chartValues) { + closestSpeeds.add(curve.speed); + } + + if (closestSpeeds.isEmpty()) { + throw new IllegalStateException( + "No reference speeds available. Ensure chartValues is populated."); + } + + closestSpeeds.sort(Double::compareTo); + + ArrayList result = new ArrayList<>(); + for (int i = 0; i < closestSpeeds.size(); i++) { + if (speed == closestSpeeds.get(i)) { + result.add(speed); + return result; + } + if (speed < closestSpeeds.get(i)) { + if (i > 0) { + result.add(closestSpeeds.get(i - 1)); + } + result.add(closestSpeeds.get(i)); + return result; + } + } + + // Speed is greater than the highest reference speed + result.add(closestSpeeds.get(closestSpeeds.size() - 1)); + return result; + } + + /** + * Calculates the polytropic head for a given flow and speed by interpolating or extrapolating + * between reference compressor curves. + * + * @param flow the flow rate for which the polytropic head is to be calculated + * @param speed the speed at which the compressor is operating + * @return the polytropic head corresponding to the given flow and speed + */ + @Override + public double getPolytropicHead(double flow, double speed) { + ArrayList closestRefSpeeds = getClosestRefSpeeds(speed); + SplineInterpolator interpolator = new SplineInterpolator(); + ArrayList interpolatedHeads = new ArrayList<>(); + ArrayList speeds = new ArrayList<>(); + + for (double refSpeed : closestRefSpeeds) { + CompressorCurve curve = getCurveAtRefSpeed(refSpeed); + PolynomialSplineFunction spline = interpolator.interpolate(curve.flow, curve.head); + + double headValue = extrapolateOrInterpolate(flow, curve.flow, curve.head, spline); + interpolatedHeads.add(headValue); + speeds.add(refSpeed); + } + + if (interpolatedHeads.size() == 1) { + return interpolatedHeads.get(0); + } + + double speed1 = speeds.get(0); + double speed2 = speeds.get(1); + double head1 = interpolatedHeads.get(0); + double head2 = interpolatedHeads.get(1); + + return extrapolateOrInterpolateSpeed(speed, speed1, speed2, head1, head2); + } + + /** + * Calculates the polytropic efficiency for a given flow and speed by interpolating or + * extrapolating between reference compressor curves. + * + * @param flow the flow rate for which the polytropic efficiency is to be calculated + * @param speed the speed at which the compressor is operating + * @return the polytropic efficiency at the given flow and speed + * @throws IllegalArgumentException if no valid reference speeds are found for the given speed or + * if the curve data for a reference speed is invalid + */ + @Override + public double getPolytropicEfficiency(double flow, double speed) { + ArrayList closestRefSpeeds = getClosestRefSpeeds(speed); + + if (closestRefSpeeds.isEmpty()) { + throw new IllegalArgumentException( + "No valid reference speeds found for the given speed: " + speed); + } + + SplineInterpolator interpolator = new SplineInterpolator(); + ArrayList interpolatedEfficiencies = new ArrayList<>(); + ArrayList speeds = new ArrayList<>(); + + for (double refSpeed : closestRefSpeeds) { + CompressorCurve curve = getCurveAtRefSpeed(refSpeed); + + if (curve.flow.length == 0 || curve.polytropicEfficiency.length == 0) { + throw new IllegalArgumentException("Invalid curve data for speed: " + refSpeed); + } + + PolynomialSplineFunction spline = + interpolator.interpolate(curve.flow, curve.polytropicEfficiency); + double efficiencyValue = + extrapolateOrInterpolate(flow, curve.flow, curve.polytropicEfficiency, spline); + interpolatedEfficiencies.add(efficiencyValue); + speeds.add(refSpeed); + } + + if (interpolatedEfficiencies.size() == 1) { + return interpolatedEfficiencies.get(0); + } + + double speed1 = speeds.get(0); + double speed2 = speeds.get(1); + double eff1 = interpolatedEfficiencies.get(0); + double eff2 = interpolatedEfficiencies.get(1); + + return extrapolateOrInterpolateSpeed(speed, speed1, speed2, eff1, eff2); + } + + /** + * Extrapolates or interpolates a value based on the given flow using the provided flow data, + * value data, and polynomial spline function. + * + * @param flow the flow value for which the corresponding value needs to be determined + * @param flowData an array of flow data points + * @param valueData an array of value data points corresponding to the flow data points + * @param spline a polynomial spline function created from the flow and value data points + * @return the extrapolated or interpolated value corresponding to the given flow + */ + private double extrapolateOrInterpolate(double flow, double[] flowData, double[] valueData, + PolynomialSplineFunction spline) { + double[] knots = spline.getKnots(); + + if (flow < knots[0]) { + logger.debug("Extrapolating below range: flow={}, knots[0]={}", flow, knots[0]); + double slope = (valueData[1] - valueData[0]) / (flowData[1] - flowData[0]); + return valueData[0] + slope * (flow - flowData[0]); + } else if (flow > knots[knots.length - 1]) { + logger.debug("Extrapolating above range: flow={}, knots[last]={}", flow, + knots[knots.length - 1]); + int last = flowData.length - 1; + double slope = + (valueData[last] - valueData[last - 1]) / (flowData[last] - flowData[last - 1]); + return valueData[last] + slope * (flow - flowData[last]); + } + + logger.debug("Interpolating within range: flow={}", flow); + return spline.value(flow); + } + + /** + * Extrapolates or interpolates a value based on the given speed and two reference speeds with + * their corresponding values. + * + * @param speed the speed at which to extrapolate or interpolate the value + * @param speed1 the first reference speed + * @param speed2 the second reference speed + * @param value1 the value corresponding to the first reference speed + * @param value2 the value corresponding to the second reference speed + * @return the extrapolated or interpolated value at the given speed + */ + private double extrapolateOrInterpolateSpeed(double speed, double speed1, double speed2, + double value1, double value2) { + if (speed < speed1) { + // Extrapolate below the range + double slope = (value2 - value1) / (speed2 - speed1); + return value1 + slope * (speed - speed1); + } else if (speed > speed2) { + // Extrapolate above the range + double slope = (value2 - value1) / (speed2 - speed1); + return value2 + slope * (speed - speed2); + } + return linearInterpolate(speed, speed1, speed2, value1, value2); // Interpolate within the range + } + + /** + * Performs linear interpolation to estimate the value of y at a given x, based on two known + * points (x1, y1) and (x2, y2). + * + * @param x the x-value at which to interpolate + * @param x1 the x-value of the first known point + * @param x2 the x-value of the second known point + * @param y1 the y-value of the first known point + * @param y2 the y-value of the second known point + * @return the interpolated y-value at the given x + */ + private double linearInterpolate(double x, double x1, double x2, double y1, double y2) { + return y1 + (y2 - y1) * (x - x1) / (x2 - x1); + } +} diff --git a/src/main/java/neqsim/process/equipment/compressor/CompressorInterface.java b/src/main/java/neqsim/process/equipment/compressor/CompressorInterface.java index 184862452..103bd51e2 100644 --- a/src/main/java/neqsim/process/equipment/compressor/CompressorInterface.java +++ b/src/main/java/neqsim/process/equipment/compressor/CompressorInterface.java @@ -142,4 +142,19 @@ public interface CompressorInterface extends ProcessEquipmentInterface, TwoPortI * */ public void setCompressorChartType(String type); + + /** + *

+ * isSurge. + *

+ * + * @return a boolean + */ + default boolean isSurge() { + if (getDistanceToSurge() < 0) { + return true; + } else { + return false; + } + } } diff --git a/src/test/java/neqsim/process/equipment/compressor/CompressorChartTest.java b/src/test/java/neqsim/process/equipment/compressor/CompressorChartTest.java index e0c0b8c9b..0896e75de 100644 --- a/src/test/java/neqsim/process/equipment/compressor/CompressorChartTest.java +++ b/src/test/java/neqsim/process/equipment/compressor/CompressorChartTest.java @@ -207,9 +207,10 @@ public void runCurveTest() { stream_1.getFluid().prettyPrint(); Compressor comp1 = new Compressor("compressor 1", stream_1); - //comp1.setCompressorChartType("interpolate"); + comp1.setCompressorChartType("interpolate and extrapolate"); comp1.setUsePolytropicCalc(true); comp1.setSpeed(8765); + comp1.setUseGERG2008(false); double[] chartConditions = new double[] {0.3, 1.0, 1.0, 1.0}; @@ -252,16 +253,19 @@ public void runCurveTest() { comp1.getAntiSurge().setSurgeControlFactor(1.0); comp1.run(); - System.out.println("speed " + comp1.getSpeed()); - System.out.println("out pres " + comp1.getOutletPressure()); - System.out.println("out temp " + (comp1.getOutTemperature() - 273.15)); - System.out.println("feed flow " + (comp1.getInletStream().getFlowRate("m3/hr"))); - System.out.println("polytropic head " + comp1.getPolytropicFluidHead()); - System.out.println("polytropic efficiency " + comp1.getPolytropicEfficiency()); - System.out.println("dist to surge " + comp1.getDistanceToSurge()); - System.out.println("surge flow rate margin " + comp1.getSurgeFlowRateMargin()); - System.out.println("surge flow rate " + comp1.getSurgeFlowRate()); - System.out.println("duty " + comp1.getPower("MW")); + org.apache.logging.log4j.LogManager.getLogger(CompressorChartTest.class).debug("speed " + comp1.getSpeed()); + org.apache.logging.log4j.LogManager.getLogger(CompressorChartTest.class).debug("out pres " + comp1.getOutletPressure()); + org.apache.logging.log4j.LogManager.getLogger(CompressorChartTest.class).debug("out temp " + (comp1.getOutTemperature() - 273.15)); + org.apache.logging.log4j.LogManager.getLogger(CompressorChartTest.class).debug("feed flow " + (comp1.getInletStream().getFlowRate("m3/hr"))); + org.apache.logging.log4j.LogManager.getLogger(CompressorChartTest.class).debug("polytropic head " + comp1.getPolytropicFluidHead()); + org.apache.logging.log4j.LogManager.getLogger(CompressorChartTest.class).debug("polytropic efficiency " + comp1.getPolytropicEfficiency()); + org.apache.logging.log4j.LogManager.getLogger(CompressorChartTest.class).debug("dist to surge " + comp1.getDistanceToSurge()); + org.apache.logging.log4j.LogManager.getLogger(CompressorChartTest.class).debug("surge flow rate margin " + comp1.getSurgeFlowRateMargin()); + org.apache.logging.log4j.LogManager.getLogger(CompressorChartTest.class).debug("surge flow rate " + comp1.getSurgeFlowRate()); + org.apache.logging.log4j.LogManager.getLogger(CompressorChartTest.class).debug("duty " + comp1.getPower("MW")); + org.apache.logging.log4j.LogManager.getLogger(CompressorChartTest.class).debug("surge " + comp1.isSurge()); + Assertions.assertTrue(comp1.isSurge() == false); + Assertions.assertEquals(158.7732888, comp1.getOutletPressure(), 1e-3); } } From 3e77e18de639e4dab400d45dde9a559077977bb9 Mon Sep 17 00:00:00 2001 From: Even Solbraa <41290109+EvenSol@users.noreply.github.com> Date: Sun, 17 Nov 2024 23:00:18 +0100 Subject: [PATCH 19/21] improve compressor chart generator (#1182) --- .../compressor/CompressorChartGenerator.java | 159 ++++++++++++------ 1 file changed, 104 insertions(+), 55 deletions(-) diff --git a/src/main/java/neqsim/process/equipment/compressor/CompressorChartGenerator.java b/src/main/java/neqsim/process/equipment/compressor/CompressorChartGenerator.java index 55d11a90f..da9621590 100644 --- a/src/main/java/neqsim/process/equipment/compressor/CompressorChartGenerator.java +++ b/src/main/java/neqsim/process/equipment/compressor/CompressorChartGenerator.java @@ -1,85 +1,134 @@ package neqsim.process.equipment.compressor; -import neqsim.physicalproperties.PhysicalPropertyType; - /** * Compressor chart generator. - * + * + * This class generates a compressor chart based on the provided compressor and the specified + * generation option. + * + * Supports generating normal curves and alternative curves. + * * @author Even Solbraa */ public class CompressorChartGenerator { - Compressor compressor = null; + private final Compressor compressor; /** - *

* Constructor for CompressorChartGenerator. - *

* - * @param inpcompressor a {@link neqsim.process.equipment.compressor.Compressor} - * object + * @param inpCompressor The compressor for which the chart is generated. */ - public CompressorChartGenerator(Compressor inpcompressor) { - this.compressor = inpcompressor; + public CompressorChartGenerator(Compressor inpCompressor) { + this.compressor = inpCompressor; } /** - *

- * generateCompressorChart. - *

+ * Generates a compressor chart. * - * @param generationOption string to specify how to generate the compressor chart - * @return a {@link neqsim.process.equipment.compressor.CompressorChart} object + * @param generationOption Specifies how to generate the compressor chart. Options: "normal + * curves" or other types. + * @return A {@link neqsim.process.equipment.compressor.CompressorChart} object. */ public CompressorChart generateCompressorChart(String generationOption) { - // Generation compressor chart - double[] chartConditions = new double[3]; - chartConditions[0] = compressor.getOutletStream().getFluid().getMolarMass("kg/mol"); - - double refspeed = compressor.getSpeed(); - double[] speed = new double[1]; - speed[0] = refspeed; - double minSpeed = refspeed / 2.0; - double maxSpeed = refspeed * 2.0; - - compressor.getInletStream().getFluid() - .initPhysicalProperties(PhysicalPropertyType.MASS_DENSITY); - double refflow = compressor.getInletStream().getFlowRate("m3/hr"); - double[][] flow = new double[1][3]; - flow[0][0] = refflow * 0.7; - flow[0][1] = refflow * 1.0; - flow[0][2] = refflow * 1.43; - double minFlow = refflow / 2.0; - double maxFlow = refflow * 2.0; + CompressorChart compChart = new CompressorChart(); + boolean isNormalCurves = "normal curves".equalsIgnoreCase(generationOption); - double refhead = compressor.getPolytropicFluidHead(); - double[][] head = new double[1][3]; - head[0][0] = refhead * 1.5; - head[0][1] = refhead; - head[0][2] = refhead * 0.5; + // Initialize chart conditions + double[] chartConditions = {compressor.getOutletStream().getFluid().getMolarMass("kg/mol")}; - double[][] polyEff = new double[1][3]; - polyEff[0][0] = compressor.getPolytropicEfficiency() * 100.0 * 0.9; - polyEff[0][1] = compressor.getPolytropicEfficiency() * 100.0; - polyEff[0][2] = compressor.getPolytropicEfficiency() * 100.0 * 0.85; - CompressorChart compChart = new CompressorChart(); + // Initialize speed parameters + double refSpeed = compressor.getSpeed(); + double[] speed = {refSpeed}; + double minSpeed = isNormalCurves ? refSpeed * 0.75 : refSpeed / 2.0; + double maxSpeed = isNormalCurves ? refSpeed * 1.05 : refSpeed * 2.0; + + // Initialize flow parameters + double refFlow = compressor.getInletStream().getFlowRate("m3/hr"); + double[][] flow = generateFlowData(refFlow, isNormalCurves); + double minFlow = refFlow / 2.0; + double maxFlow = refFlow * 2.0; + + // Initialize head parameters + double refHead = compressor.getPolytropicFluidHead(); + double[][] head = generateHeadData(refHead, isNormalCurves); + + // Initialize efficiency parameters + double[][] polyEff = generateEfficiencyData(compressor.getPolytropicEfficiency()); + + // Configure the compressor chart compChart.setUseCompressorChart(true); compChart.setHeadUnit("kJ/kg"); compChart.setCurves(chartConditions, speed, flow, head, polyEff); - // Generating surge curve - double minFlowSurgeFlow = 0.7 * refflow; - double refSurgeFlow = 0.8 * refflow; - double maxSurgeFlow = 0.9 * refflow; - double headSurgeRef = compChart.getPolytropicHead(refSurgeFlow, refspeed); + // Generate and set the surge curve + SurgeCurve surgeCurve = generateSurgeCurve(compChart, refFlow, refSpeed, minFlow, maxFlow, + minSpeed, maxSpeed, isNormalCurves); + compChart.setSurgeCurve(surgeCurve); + + return compChart; + } + + /** + * Generates flow data based on the reference flow and the generation option. + */ + private double[][] generateFlowData(double refFlow, boolean isNormalCurves) { + double[][] flow = new double[1][3]; + if (isNormalCurves) { + flow[0][0] = refFlow / 1.3; + flow[0][1] = refFlow; + flow[0][2] = refFlow * 2.5 / 1.3; + } else { + flow[0][0] = refFlow * 0.7; + flow[0][1] = refFlow; + flow[0][2] = refFlow * 1.43; + } + return flow; + } + + /** + * Generates head data based on the reference head and the generation option. + */ + private double[][] generateHeadData(double refHead, boolean isNormalCurves) { + double[][] head = new double[1][3]; + if (isNormalCurves) { + head[0][0] = refHead * 1.2; + head[0][1] = refHead; + head[0][2] = refHead * 1.2 * 0.4; + } else { + head[0][0] = refHead * 1.5; + head[0][1] = refHead; + head[0][2] = refHead * 0.5; + } + return head; + } + + /** + * Generates efficiency data based on the reference efficiency. + */ + private double[][] generateEfficiencyData(double refEfficiency) { + double[][] polyEff = new double[1][3]; + polyEff[0][0] = refEfficiency * 100.0 * 0.9; + polyEff[0][1] = refEfficiency * 100.0; + polyEff[0][2] = refEfficiency * 100.0 * 0.85; + return polyEff; + } + + /** + * Generates the surge curve based on the provided parameters. + */ + private SurgeCurve generateSurgeCurve(CompressorChart compChart, double refFlow, double refSpeed, + double minFlow, double maxFlow, double minSpeed, double maxSpeed, boolean isNormalCurves) { + double minSurgeFlow = 0.7 * refFlow; + double refSurgeFlow = isNormalCurves ? refFlow / 1.3 : 0.8 * refFlow; + double maxSurgeFlow = 0.9 * refFlow; + double headSurgeMin = compChart.getPolytropicHead(minFlow, minSpeed); + double headSurgeRef = compChart.getPolytropicHead(refSurgeFlow, refSpeed); double headSurgeMax = compChart.getPolytropicHead(maxSurgeFlow, maxSpeed); - SurgeCurve surgecurve = new SurgeCurve(); - - surgecurve.setCurve(new double[3], new double[] {minFlowSurgeFlow, refSurgeFlow, maxSurgeFlow}, + SurgeCurve surgeCurve = new SurgeCurve(); + surgeCurve.setCurve(new double[3], new double[] {minSurgeFlow, refSurgeFlow, maxSurgeFlow}, new double[] {headSurgeMin, headSurgeRef, headSurgeMax}); - - compChart.setSurgeCurve(surgecurve); - return compChart; + return surgeCurve; } } From 2fed0aa7e7d2adb6c74d8ceb227d7b0e6b9c239b Mon Sep 17 00:00:00 2001 From: Even Solbraa <41290109+EvenSol@users.noreply.github.com> Date: Mon, 18 Nov 2024 16:23:18 +0100 Subject: [PATCH 20/21] Update Compressor.java --- .../java/neqsim/process/equipment/compressor/Compressor.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/neqsim/process/equipment/compressor/Compressor.java b/src/main/java/neqsim/process/equipment/compressor/Compressor.java index ac78022d0..3c8b2a676 100644 --- a/src/main/java/neqsim/process/equipment/compressor/Compressor.java +++ b/src/main/java/neqsim/process/equipment/compressor/Compressor.java @@ -1473,9 +1473,10 @@ public double getActualCompressionRatio() { * */ public void setCompressorChartType(String type) { - if (type.equals("simple")) { + if (type.equals("simple") || type.equals("fan law")) { compressorChart = new CompressorChart(); - } else if (type.equals("interpolate")) { + } + else if (type.equals("interpolate")) { compressorChart = new CompressorChartAlternativeMapLookup(); } else if (type.equals("interpolate and extrapolate")) { compressorChart = new CompressorChartAlternativeMapLookupExtrapolate(); From a87a4573e88ace5c1c96307b6ebd55f0370fc38c Mon Sep 17 00:00:00 2001 From: Even Solbraa <41290109+EvenSol@users.noreply.github.com> Date: Tue, 19 Nov 2024 14:03:10 +0100 Subject: [PATCH 21/21] fix possible to read kij from database whn using __ in component name (#1184) * fix possible to read kij from database whn using __ in component name * added test * update * update * update --- .../thermo/mixingrule/EosMixingRules.java | 92 +++++++++-------- .../compressor/CompressorChartTest.java | 35 ++++--- .../thermo/mixingrule/EosMixingRulesTest.java | 99 +++++++++++++++++++ 3 files changed, 172 insertions(+), 54 deletions(-) create mode 100644 src/test/java/neqsim/thermo/mixingrule/EosMixingRulesTest.java diff --git a/src/main/java/neqsim/thermo/mixingrule/EosMixingRules.java b/src/main/java/neqsim/thermo/mixingrule/EosMixingRules.java index 0a4309b64..7b286a42f 100644 --- a/src/main/java/neqsim/thermo/mixingrule/EosMixingRules.java +++ b/src/main/java/neqsim/thermo/mixingrule/EosMixingRules.java @@ -1467,7 +1467,8 @@ public double calcAi(int compNumb, PhaseInterface phase, double temperature, dou // pressure, numbcomp) * R * temperature * alpha_mix; A = getB() * R * temperature * compArray[compNumb].getAder() + phase.getNumberOfMolesInPhase() * compArray[compNumb].getBi() * R * temperature * alpha_mix; - // calcBi(compNumb, phase, temperature, pressure, numbcomp) * R * temperature * alpha_mix; + // calcBi(compNumb, phase, temperature, pressure, numbcomp) * R * temperature * + // alpha_mix; // System.out.println("Ai: " + A); return A; @@ -2130,9 +2131,10 @@ public EosMixingRulesInterface getMixingRule(int i, PhaseInterface phase) { wijCalcOrFitted = new int[phase.getNumberOfComponents()][phase.getNumberOfComponents()]; try (neqsim.util.database.NeqSimDataBase database = new neqsim.util.database.NeqSimDataBase()) { for (int k = 0; k < phase.getNumberOfComponents(); k++) { - String component_name = phase.getComponents()[k].getComponentName(); + String component_name = phase.getComponent(k).getComponentName(); for (int l = k; l < phase.getNumberOfComponents(); l++) { + String component_name2 = phase.getComponents()[l].getComponentName(); if (k == l) { classicOrHV[k][l] = "Classic"; classicOrWS[k][l] = "Classic"; @@ -2141,26 +2143,32 @@ public EosMixingRulesInterface getMixingRule(int i, PhaseInterface phase) { } else { java.sql.ResultSet dataSet = null; try { + int underscoreIndex = component_name.indexOf("__"); // double underscore + if (underscoreIndex != -1) { + component_name = component_name.substring(0, underscoreIndex); + } + int underscoreIndex2 = component_name2.indexOf("__"); + if (underscoreIndex2 != -1) { + component_name2 = component_name2.substring(0, underscoreIndex2); + } if (phase.getComponent(k).isIsTBPfraction() || phase.getComponent(l).isIsTBPfraction()) { throw new Exception("no interaction coefficient for TBP fractions"); } int templ = l; int tempk = k; + if (NeqSimDataBase.createTemporaryTables()) { dataSet = database.getResultSet("SELECT * FROM intertemp WHERE (comp1='" - + component_name + "' AND comp2='" + phase.getComponents()[l].getComponentName() - + "') OR (comp1='" + phase.getComponents()[l].getComponentName() - + "' AND comp2='" + component_name + "')"); + + component_name + "' AND comp2='" + component_name2 + "') OR (comp1='" + + component_name2 + "' AND comp2='" + component_name + "')"); } else { dataSet = database.getResultSet("SELECT * FROM inter WHERE (comp1='" - + component_name + "' AND comp2='" + phase.getComponents()[l].getComponentName() - + "') OR (comp1='" + phase.getComponents()[l].getComponentName() - + "' AND comp2='" + component_name + "')"); + + component_name + "' AND comp2='" + component_name2 + "') OR (comp1='" + + component_name2 + "' AND comp2='" + component_name + "')"); } dataSet.next(); - if (dataSet.getString("comp1").trim() - .equals(phase.getComponents()[l].getComponentName())) { + if (dataSet.getString("comp1").trim().equals(component_name2)) { templ = k; tempk = l; } @@ -2277,22 +2285,22 @@ public EosMixingRulesInterface getMixingRule(int i, PhaseInterface phase) { nEOSkij); // System.out.println("intparam not defined .... CALCULATING intparam // between " - // +phase.getComponents()[l].getComponentName() + " and " + - // phase.getComponents()[k].getComponentName()+ " to " + + // +component_name2 + " and " + + // component_name+ " to " + // intparam[k][l]); - } else if ((phase.getComponents()[k].getComponentName().equals("CO2") + } else if ((component_name.equals("CO2") && phase.getComponents()[l].isIsTBPfraction()) - || (phase.getComponents()[l].getComponentName().equals("CO2") + || (component_name2.equals("CO2") && phase.getComponents()[k].isIsTBPfraction())) { intparam[k][l] = 0.1; - } else if ((phase.getComponents()[k].getComponentName().equals("nitrogen") + } else if ((component_name.equals("nitrogen") && phase.getComponents()[l].isIsTBPfraction()) - || (phase.getComponents()[l].getComponentName().equals("nitrogen") + || (component_name2.equals("nitrogen") && phase.getComponents()[k].isIsTBPfraction())) { intparam[k][l] = 0.08; - } else if ((phase.getComponents()[k].getComponentName().equals("water") + } else if ((component_name.equals("water") && phase.getComponents()[l].isIsTBPfraction()) - || (phase.getComponents()[l].getComponentName().equals("water") + || (component_name2.equals("water") && phase.getComponents()[k].isIsTBPfraction())) { intparam[k][l] = 0.2; @@ -2312,9 +2320,9 @@ public EosMixingRulesInterface getMixingRule(int i, PhaseInterface phase) { intparamT[k][l] = 0.0; } - } else if ((phase.getComponents()[k].getComponentName().equals("MEG") + } else if ((component_name.equals("MEG") && phase.getComponents()[l].isIsTBPfraction()) - || (phase.getComponents()[l].getComponentName().equals("MEG") + || (component_name2.equals("MEG") && phase.getComponents()[k].isIsTBPfraction())) { intparam[k][l] = 0.2; if (phase.getClass().getName().equals("neqsim.thermo.phase.PhaseSrkCPA") @@ -2331,9 +2339,9 @@ public EosMixingRulesInterface getMixingRule(int i, PhaseInterface phase) { // intparam[k][l] = 0.01; intparamT[k][l] = 0.0; } - } else if ((phase.getComponents()[k].getComponentName().equals("ethanol") + } else if ((component_name.equals("ethanol") && phase.getComponents()[l].isIsTBPfraction()) - || (phase.getComponents()[l].getComponentName().equals("ethanol") + || (component_name2.equals("ethanol") && phase.getComponents()[k].isIsTBPfraction())) { intparam[k][l] = 0.0; if (phase.getClass().getName().equals("neqsim.thermo.phase.PhaseSrkCPA") @@ -2347,9 +2355,9 @@ public EosMixingRulesInterface getMixingRule(int i, PhaseInterface phase) { intparam[k][l] = -0.1; } } - } else if ((phase.getComponents()[k].getComponentName().equals("methanol") + } else if ((component_name.equals("methanol") && phase.getComponents()[l].isIsTBPfraction()) - || (phase.getComponents()[l].getComponentName().equals("methanol") + || (component_name2.equals("methanol") && phase.getComponents()[k].isIsTBPfraction())) { intparam[k][l] = 0.0; if (phase.getClass().getName().equals("neqsim.thermo.phase.PhaseSrkCPA") @@ -2363,9 +2371,9 @@ public EosMixingRulesInterface getMixingRule(int i, PhaseInterface phase) { intparam[k][l] = -0.2; } } - } else if ((phase.getComponents()[k].getComponentName().equals("TEG") + } else if ((component_name.equals("TEG") && phase.getComponents()[l].isIsTBPfraction()) - || (phase.getComponents()[l].getComponentName().equals("TEG") + || (component_name2.equals("TEG") && phase.getComponents()[k].isIsTBPfraction())) { intparam[k][l] = 0.12; if (phase.getClass().getName().equals("neqsim.thermo.phase.PhaseSrkCPA") @@ -2375,27 +2383,25 @@ public EosMixingRulesInterface getMixingRule(int i, PhaseInterface phase) { intparam[k][l] = 0.12; intparamT[k][l] = 0.0; } - } else if ((phase.getComponents()[k].getComponentName().equals("S8") - && phase.getComponents()[l].isIsTBPfraction()) - || (phase.getComponents()[l].getComponentName().equals("S8") - && phase.getComponents()[k].isIsTBPfraction())) { + } else if ((component_name.equals("S8") && phase.getComponents()[l].isIsTBPfraction()) + || (component_name2.equals("S8") && phase.getComponents()[k].isIsTBPfraction())) { intparam[k][l] = 0.05; } else { - // if((phase.getComponents()[l].getComponentName().equals("CO2") || - // phase.getComponents()[k].getComponentName().equals("CO2")) && k!=l) + // if((component_name2.equals("CO2") || + // component_name.equals("CO2")) && k!=l) // intparam[k][l] = 0.1; - // else if((phase.getComponents()[l].getComponentName().equals("H2S") || - // phase.getComponents()[k].getComponentName().equals("H2S")) && k!=l) + // else if((component_name2.equals("H2S") || + // component_name.equals("H2S")) && k!=l) // intparam[k][l] = 0.2; - // else if((phase.getComponents()[l].getComponentName().equals("water") + // else if((component_name2.equals("water") // || - // phase.getComponents()[k].getComponentName().equals("water")) && k!=l) + // component_name.equals("water")) && k!=l) // intparam[k][l] = 0.5; // else intparam[k][l] = 0.0; // System.out.println("intparam not defined .... setting intparam // between " + - // phase.getComponents()[l].getComponentName() + " and " + - // phase.getComponents()[k].getComponentName() + " to " + + // component_name2 + " and " + + // component_name + " to " + // intparam[k][l]); } @@ -2406,8 +2412,8 @@ public EosMixingRulesInterface getMixingRule(int i, PhaseInterface phase) { intparamji[k][l] = intparam[k][l]; intparamji[l][k] = intparam[k][l]; // System.out.println("kij set to " + intparam[l][k] + " " + - // phase.getComponents()[l].getComponentName() + " " + - // phase.getComponents()[k].getComponentName()); + // component_name2 + " " + + // component_name); classicOrHV[k][l] = "Classic"; classicOrHV[l][k] = classicOrHV[k][l]; @@ -2458,7 +2464,8 @@ public EosMixingRulesInterface getMixingRule(int i, PhaseInterface phase) { mixingRuleName = "classic-CPA_T"; return new ClassicSRKT2(); } else if (i == 10) { - // return new ElectrolyteMixRule(phase, HValpha, HVgij, HVgii, classicOrHV,wij);} + // return new ElectrolyteMixRule(phase, HValpha, HVgij, HVgii, + // classicOrHV,wij);} org.ejml.simple.SimpleMatrix mat1 = new org.ejml.simple.SimpleMatrix(intparamij); org.ejml.simple.SimpleMatrix mat2 = new org.ejml.simple.SimpleMatrix(intparamji); org.ejml.simple.SimpleMatrix mat3 = new org.ejml.simple.SimpleMatrix(intparamT); @@ -2517,7 +2524,8 @@ public EosMixingRulesInterface resetMixingRule(int i, PhaseInterface phase) { mixingRuleName = "classic-CPA_T"; return new ClassicSRKT2(); } else if (i == 10) { - // return new ElectrolyteMixRule(phase, HValpha, HVgij, HVgii, classicOrHV,wij);} + // return new ElectrolyteMixRule(phase, HValpha, HVgij, HVgii, + // classicOrHV,wij);} org.ejml.simple.SimpleMatrix mat1 = new org.ejml.simple.SimpleMatrix(intparamij); org.ejml.simple.SimpleMatrix mat2 = new org.ejml.simple.SimpleMatrix(intparamji); org.ejml.simple.SimpleMatrix mat3 = new org.ejml.simple.SimpleMatrix(intparamT); diff --git a/src/test/java/neqsim/process/equipment/compressor/CompressorChartTest.java b/src/test/java/neqsim/process/equipment/compressor/CompressorChartTest.java index 0896e75de..553252a69 100644 --- a/src/test/java/neqsim/process/equipment/compressor/CompressorChartTest.java +++ b/src/test/java/neqsim/process/equipment/compressor/CompressorChartTest.java @@ -204,7 +204,7 @@ public void runCurveTest() { Stream stream_1 = new Stream("Stream1", testFluid); stream_1.run(); - stream_1.getFluid().prettyPrint(); + // stream_1.getFluid().prettyPrint(); Compressor comp1 = new Compressor("compressor 1", stream_1); comp1.setCompressorChartType("interpolate and extrapolate"); @@ -253,17 +253,28 @@ public void runCurveTest() { comp1.getAntiSurge().setSurgeControlFactor(1.0); comp1.run(); - org.apache.logging.log4j.LogManager.getLogger(CompressorChartTest.class).debug("speed " + comp1.getSpeed()); - org.apache.logging.log4j.LogManager.getLogger(CompressorChartTest.class).debug("out pres " + comp1.getOutletPressure()); - org.apache.logging.log4j.LogManager.getLogger(CompressorChartTest.class).debug("out temp " + (comp1.getOutTemperature() - 273.15)); - org.apache.logging.log4j.LogManager.getLogger(CompressorChartTest.class).debug("feed flow " + (comp1.getInletStream().getFlowRate("m3/hr"))); - org.apache.logging.log4j.LogManager.getLogger(CompressorChartTest.class).debug("polytropic head " + comp1.getPolytropicFluidHead()); - org.apache.logging.log4j.LogManager.getLogger(CompressorChartTest.class).debug("polytropic efficiency " + comp1.getPolytropicEfficiency()); - org.apache.logging.log4j.LogManager.getLogger(CompressorChartTest.class).debug("dist to surge " + comp1.getDistanceToSurge()); - org.apache.logging.log4j.LogManager.getLogger(CompressorChartTest.class).debug("surge flow rate margin " + comp1.getSurgeFlowRateMargin()); - org.apache.logging.log4j.LogManager.getLogger(CompressorChartTest.class).debug("surge flow rate " + comp1.getSurgeFlowRate()); - org.apache.logging.log4j.LogManager.getLogger(CompressorChartTest.class).debug("duty " + comp1.getPower("MW")); - org.apache.logging.log4j.LogManager.getLogger(CompressorChartTest.class).debug("surge " + comp1.isSurge()); + org.apache.logging.log4j.LogManager.getLogger(CompressorChartTest.class) + .debug("speed " + comp1.getSpeed()); + org.apache.logging.log4j.LogManager.getLogger(CompressorChartTest.class) + .debug("out pres " + comp1.getOutletPressure()); + org.apache.logging.log4j.LogManager.getLogger(CompressorChartTest.class) + .debug("out temp " + (comp1.getOutTemperature() - 273.15)); + org.apache.logging.log4j.LogManager.getLogger(CompressorChartTest.class) + .debug("feed flow " + (comp1.getInletStream().getFlowRate("m3/hr"))); + org.apache.logging.log4j.LogManager.getLogger(CompressorChartTest.class) + .debug("polytropic head " + comp1.getPolytropicFluidHead()); + org.apache.logging.log4j.LogManager.getLogger(CompressorChartTest.class) + .debug("polytropic efficiency " + comp1.getPolytropicEfficiency()); + org.apache.logging.log4j.LogManager.getLogger(CompressorChartTest.class) + .debug("dist to surge " + comp1.getDistanceToSurge()); + org.apache.logging.log4j.LogManager.getLogger(CompressorChartTest.class) + .debug("surge flow rate margin " + comp1.getSurgeFlowRateMargin()); + org.apache.logging.log4j.LogManager.getLogger(CompressorChartTest.class) + .debug("surge flow rate " + comp1.getSurgeFlowRate()); + org.apache.logging.log4j.LogManager.getLogger(CompressorChartTest.class) + .debug("duty " + comp1.getPower("MW")); + org.apache.logging.log4j.LogManager.getLogger(CompressorChartTest.class) + .debug("surge " + comp1.isSurge()); Assertions.assertTrue(comp1.isSurge() == false); Assertions.assertEquals(158.7732888, comp1.getOutletPressure(), 1e-3); } diff --git a/src/test/java/neqsim/thermo/mixingrule/EosMixingRulesTest.java b/src/test/java/neqsim/thermo/mixingrule/EosMixingRulesTest.java new file mode 100644 index 000000000..4dc78ffd4 --- /dev/null +++ b/src/test/java/neqsim/thermo/mixingrule/EosMixingRulesTest.java @@ -0,0 +1,99 @@ +package neqsim.thermo.mixingrule; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import org.junit.jupiter.api.Test; +import neqsim.thermo.phase.PhaseEos; + +/** + * 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); + testSystem.changeComponentName(testSystem.getComponent(0).getName(), + (testSystem.getComponent(0).getName() + "__well1")); + 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(), + (testSystem.getComponent(2).getName() + "__well2")); + testSystem.changeComponentName(testSystem.getComponent(3).getName(), + (testSystem.getComponent(3).getName() + "__well2")); + + + testSystem.setMixingRule("classic"); + + double kij = + ((PhaseEos) testSystem.getPhase(0)).getMixingRule().getBinaryInteractionParameter(0, 1); + double kij2 = + ((PhaseEos) testSystem.getPhase(0)).getMixingRule().getBinaryInteractionParameter(3, 0); + + // 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); + testSystem.addComponent("ethanol", 0.01); + + testSystem.setMixingRule("classic"); + + double kij = + ((PhaseEos) testSystem.getPhase(0)).getMixingRule().getBinaryInteractionParameter(0, 1); + + // 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); + testSystem.changeComponentName(testSystem.getComponent(0).getName(), + (testSystem.getComponent(0).getName() + "__well1")); + 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(), + (testSystem.getComponent(2).getName() + "__well2")); + testSystem.changeComponentName(testSystem.getComponent(3).getName(), + (testSystem.getComponent(3).getName() + "__well2")); + + testSystem.setMixingRule("classic"); + + double kij = + ((PhaseEos) testSystem.getPhase(0)).getMixingRule().getBinaryInteractionParameter(0, 1); + double kij2 = + ((PhaseEos) testSystem.getPhase(0)).getMixingRule().getBinaryInteractionParameter(3, 0); + + // Print kij + assertEquals(0.1, kij, 1e-5); + assertTrue(kij == kij2); + } +}