From 1a9b5e5808c9372aaf8f0bd2b5c9326e5399bd9b Mon Sep 17 00:00:00 2001 From: Even Solbraa <41290109+EvenSol@users.noreply.github.com> Date: Sun, 6 Oct 2024 16:51:27 -0300 Subject: [PATCH] remove capital letters in package names (#1128) * remove capital letters in package names * further fixes * further updates * updates * further updates * update * update * update --- .../MathLib/generalMath/filesystem.attributes | Bin 239 -> 0 bytes .../nonLinearSolver/filesystem.attributes | Bin 290 -> 0 bytes .../ChemicalReactionOperations.java | 24 +-- .../chemicalequilibrium}/ChemEq.java | 2 +- .../ChemicalEquilibrium.java | 2 +- .../LinearProgrammingChemicalEquilibrium.java | 6 +- .../ReferencePotComparator.java | 2 +- .../chemicalreaction}/ChemicalReaction.java | 2 +- .../ChemicalReactionFactory.java | 4 +- .../ChemicalReactionList.java | 6 +- .../kinetics/Kinetics.java | 8 +- .../dataPresentation/filesystem.attributes | Bin 243 -> 0 bytes .../DataHandeling.java} | 9 +- .../SampleXYDataSource.java | 2 +- .../createtextfile}/TextFile.java | 2 +- .../jfreechart/Graph2b.java} | 17 +- .../jfreechart}/graph2b.form | 0 .../flowLeg/filesystem.attributes | Bin 896 -> 0 bytes .../flowNode/filesystem.attributes | Bin 1446 -> 0 bytes .../equilibriumFluidBoundary/olgamodel.txt | 0 .../flowSolver/filesystem.attributes | Bin 908 -> 0 bytes .../onePhaseFlowSolver/filesystem.attributes | Bin 248 -> 0 bytes .../filesystem.attributes | Bin 252 -> 0 bytes .../flowSystem/filesystem.attributes | Bin 867 -> 0 bytes .../geometryDefinitions/filesystem.attributes | Bin 941 -> 0 bytes .../FluidMech.java} | 4 +- .../flowleg}/FlowLeg.java | 8 +- .../flowleg}/FlowLegInterface.java | 14 +- .../flowleg/pipeleg}/PipeLeg.java | 6 +- .../flowleg/pipeleg}/filesystem.attributes | Bin .../flownode}/FlowNode.java | 30 +-- .../flownode}/FlowNodeInterface.java | 22 +-- .../flownode}/FlowNodeSelector.java | 10 +- .../heatmasstransfercalc}/FluidBoundary.java | 16 +- .../FluidBoundaryInterface.java | 12 +- .../EquilibriumFluidBoundary.java | 14 +- .../fluidboundarynode}/FluidBoundaryNode.java | 2 +- .../FluidBoundaryNodeInterface.java | 2 +- .../FluidBoundaryNodeNonReactive.java | 4 +- .../FluidBoundaryNodeReactive.java | 4 +- .../FluidBoundarySolver.java | 10 +- .../FluidBoundarySolverInterface.java | 2 +- .../FluidBoundaryReactiveSolver.java | 4 +- .../FluidBoundarySystem.java | 12 +- .../FluidBoundarySystemInterface.java | 12 +- .../FluidBoundarySystemNonReactive.java | 16 +- .../FluidBoundarySystemReactive.java | 16 +- .../NonEquilibriumFluidBoundary.java | 13 +- .../KrishnaStandartFilmModel.java | 14 +- .../ReactiveFluidBoundary.java | 8 +- .../ReactiveKrishnaStandartFilmModel.java | 12 +- .../enhancementfactor}/EnhancementFactor.java | 8 +- .../EnhancementFactorAlg.java | 6 +- .../EnhancementFactorInterface.java | 2 +- .../EnhancementFactorNumeric.java | 10 +- ...terphaseTransportCoefficientBaseClass.java | 6 +- ...terphaseTransportCoefficientInterface.java | 20 +- .../InterphaseOnePhase.java | 8 +- .../InterphasePipeFlow.java | 8 +- .../InterphaseTwoPhase.java | 8 +- .../InterphasePackedBed.java | 6 +- .../InterphaseReactorFlow.java | 8 +- .../InterphaseAnnularFlow.java | 6 +- .../InterphaseDropletFlow.java | 6 +- .../InterphaseStratifiedFlow.java | 6 +- .../InterphaseTwoPhasePipeFlow.java | 8 +- .../InterphaseStirredCellFlow.java | 8 +- .../multiphasenode}/MultiPhaseFlowNode.java | 10 +- .../waxnode}/WaxDepositionFlowNode.java | 24 +-- .../onephasenode}/onePhaseFlowNode.java | 8 +- .../onePhasePipeFlowNode.java | 16 +- .../twophasenode}/TwoPhaseFlowNode.java | 8 +- .../twophasepipeflownode}/AnnularFlow.java | 28 +-- .../twophasepipeflownode}/BubbleFlowNode.java | 22 +-- .../DropletFlowNode.java | 22 +-- .../StratifiedFlowNode.java | 22 +-- .../TwoPhasePackedBedFlowNode.java | 22 +-- .../TwoPhaseTrayTowerFlowNode.java | 22 +-- .../StirredCellNode.java | 22 +-- .../flowsolver}/FlowSolver.java | 2 +- .../flowsolver}/FlowSolverInterface.java | 2 +- .../OnePhaseFlowSolver.java | 4 +- .../OnePhaseFixedStaggeredGrid.java | 8 +- .../OnePhasePipeFlowSolver.java | 8 +- .../stirredcellsolver}/StirredCellSolver.java | 14 +- .../TwoPhaseFixedStaggeredGridSolver.java | 10 +- .../TwoPhasePipeFlowSolver.java | 8 +- .../flowsystem}/FlowSystem.java | 16 +- .../flowsystem}/FlowSystemInterface.java | 24 +-- .../OnePhaseFlowSystem.java | 6 +- .../pipeflowsystem}/PipeFlowSystem.java | 16 +- .../TwoPhaseFlowSystem.java | 6 +- .../shipsystem}/LNGship.java | 35 ++-- .../stirredcellsystem}/StirredCellSystem.java | 24 +-- .../TwoPhasePipeFlowSystem.java | 32 ++-- .../TwoPhasePipeFlowSystemReac.java | 12 +- .../TwoPhaseReactorFlowSystem.java | 28 +-- .../GeometryDefinition.java | 10 +- .../GeometryDefinitionInterface.java | 16 +- .../packings/BerlSaddlePacking.java | 2 +- .../internalgeometry}/packings/Packing.java | 2 +- .../packings/PackingInterface.java | 2 +- .../packings/PallRingPacking.java | 2 +- .../packings/RachigRingPacking.java | 2 +- .../internalgeometry}/wall/MaterialLayer.java | 2 +- .../internalgeometry}/wall/PipeWall.java | 2 +- .../internalgeometry}/wall/Wall.java | 2 +- .../internalgeometry}/wall/WallInterface.java | 6 +- .../geometrydefinitions}/pipe/PipeData.java | 6 +- .../reactor/ReactorData.java | 20 +- .../stirredcell}/StirredCell.java | 4 +- .../PipeSurroundingEnvironment.java | 2 +- .../surrounding/SurroundingEnvironment.java | 2 +- .../SurroundingEnvironmentBaseClass.java | 2 +- .../FlowNodeVisualization.java | 4 +- .../FlowNodeVisualizationInterface.java | 6 +- .../OnePhaseFlowNodeVisualization.java | 4 +- .../OnePhasePipeFlowNodeVisualization.java | 6 +- .../TwoPhaseFlowNodeVisualization.java | 6 +- .../FlowSystemVisualization.java | 8 +- .../FlowSystemVisualizationInterface.java | 8 +- .../OnePhaseFlowVisualization.java | 4 +- .../PipeFlowVisualization.java | 10 +- .../TwoPhaseFlowVisualization.java | 4 +- .../TwoPhasePipeFlowVisualization.java | 8 +- .../util/timeseries}/TimeSeries.java | 6 +- .../generalmath}/TDMAsolve.java | 2 +- .../nonlinearsolver/NewtonRhapson.java} | 8 +- .../nonlinearsolver}/NumericalDerivative.java | 2 +- .../NumericalIntegration.java | 2 +- .../nonlinearsolver/SysNewtonRhapson.java} | 12 +- .../PhysicalPropertyHandler.java | 26 +-- .../InterfaceProperties.java | 18 +- .../InterphasePropertiesInterface.java | 16 +- .../solidadsorption}/AdsorptionInterface.java | 2 +- .../PotentialTheoryAdsorption.java | 2 +- .../FirozabadiRamleyInterfaceTension.java | 2 +- .../surfacetension}/GTSurfaceTension.java | 2 +- .../GTSurfaceTensionFullGT.java | 6 +- .../surfacetension}/GTSurfaceTensionODE.java | 2 +- .../GTSurfaceTensionSimple.java | 2 +- .../GTSurfaceTensionUtils.java | 2 +- .../surfacetension}/LGTSurfaceTension.java | 2 +- .../ParachorSurfaceTension.java | 2 +- .../surfacetension}/SurfaceTension.java | 4 +- .../SurfaceTensionInterface.java | 2 +- .../PhysicalPropertyMixingRule.java | 4 +- .../PhysicalPropertyMixingRuleInterface.java | 4 +- .../PhysicalPropertyMethod.java | 4 +- .../PhysicalPropertyMethodInterface.java | 8 +- .../CommonPhysicalPropertyMethod.java | 12 +- .../conductivity/Conductivity.java | 10 +- .../PFCTConductivityMethodMod86.java | 6 +- .../CorrespondingStatesDiffusivity.java | 6 +- .../diffusivity/Diffusivity.java | 10 +- .../FrictionTheoryViscosityMethod.java | 6 +- .../viscosity/LBCViscosityMethod.java | 6 +- .../viscosity/PFCTViscosityMethod.java | 6 +- .../PFCTViscosityMethodHeavyOil.java | 6 +- .../viscosity/PFCTViscosityMethodMod86.java | 6 +- .../viscosity/Viscosity.java | 10 +- .../GasPhysicalPropertyMethod.java | 12 +- .../conductivity/ChungConductivityMethod.java | 6 +- .../conductivity/Conductivity.java | 10 +- .../density/Density.java | 10 +- .../diffusivity/Diffusivity.java | 10 +- .../diffusivity/WilkeLeeDiffusivity.java | 6 +- .../viscosity/ChungViscosityMethod.java | 6 +- .../viscosity/Viscosity.java | 10 +- .../LiquidPhysicalPropertyMethod.java | 12 +- .../conductivity/Conductivity.java | 10 +- .../density/Costald.java | 10 +- .../density/Density.java | 10 +- .../liquidphysicalproperties}/density/temp | 0 .../diffusivity/AmineDiffusivity.java | 6 +- .../diffusivity/CO2water.java | 6 +- .../diffusivity/Diffusivity.java | 10 +- .../diffusivity/SiddiqiLucasMethod.java | 6 +- .../viscosity/AmineViscosity.java | 6 +- .../viscosity/Viscosity.java | 10 +- .../ConductivityInterface.java | 4 +- .../methodinterface}/DensityInterface.java | 4 +- .../DiffusivityInterface.java | 4 +- .../methodinterface}/ViscosityInterface.java | 4 +- .../SolidPhysicalPropertyMethod.java | 12 +- .../conductivity/Conductivity.java | 10 +- .../density/Density.java | 10 +- .../diffusivity/Diffusivity.java | 10 +- .../viscosity/Viscosity.java | 10 +- .../PhysicalProperties.java | 48 ++--- .../PhysicalPropertiesInterface.java | 20 +- .../DefaultPhysicalProperties.java | 12 +- .../AirPhysicalProperties.java | 10 +- .../GasPhysicalProperties.java | 12 +- .../NaturalGasPhysicalProperties.java | 10 +- .../AminePhysicalProperties.java | 10 +- .../CO2waterPhysicalProperties.java | 12 +- .../GlycolPhysicalProperties.java | 10 +- .../LiquidPhysicalProperties.java | 12 +- .../WaterPhysicalProperties.java | 10 +- .../SolidPhysicalProperties.java | 12 +- .../ParachorFunction.java | 4 +- .../TestParachorFit.java | 8 +- .../chungMethod/ChungFunction.java | 4 +- .../chungMethod/TestChungFit.java | 8 +- .../linearLiquidModel/TestViscosityFit.java | 8 +- .../linearLiquidModel/ViscosityFunction.java | 4 +- .../SimulationBaseClass.java | 2 +- .../SimulationInterface.java | 2 +- .../conditionmonitor}/ConditionMonitor.java | 16 +- .../ConditionMonitorSpecifications.java | 2 +- .../ControllerDeviceBaseClass.java | 4 +- .../ControllerDeviceInterface.java | 6 +- .../CostEstimateBaseClass.java | 10 +- .../UnitCostEstimateBaseClass.java | 6 +- .../compressor/CompressorCostEstimate.java | 8 +- .../separator/SeparatorCostEstimate.java | 8 +- .../valve/ValveCostEstimate.java | 8 +- .../CombustionEmissionsCalculator.java | 8 +- .../measurementdevice}/CompressorMonitor.java | 8 +- .../CricondenbarAnalyser.java | 14 +- .../FlowInducedVibrationAnalyser.java | 8 +- ...HydrateEquilibriumTemperatureAnalyser.java | 10 +- .../measurementdevice}/LevelTransmitter.java | 8 +- .../MeasurementDeviceBaseClass.java | 4 +- .../MeasurementDeviceInterface.java | 6 +- .../measurementdevice}/MolarMassAnalyser.java | 8 +- .../measurementdevice}/MultiPhaseMeter.java | 10 +- .../measurementdevice}/NMVOCAnalyser.java | 8 +- .../PressureTransmitter.java | 8 +- .../StreamMeasurementDeviceBaseClass.java | 4 +- .../TemperatureTransmitter.java | 8 +- .../VolumeFlowTransmitter.java | 8 +- .../WaterContentAnalyser.java | 8 +- .../WaterDewPointAnalyser.java | 10 +- .../measurementdevice}/WellAllocator.java | 12 +- .../online/OnlineSignal.java | 2 +- .../measurementdevice}/pHProbe.java | 10 +- .../simpleflowregime}/FluidSevereSlug.java | 4 +- .../simpleflowregime}/Pipe.java | 2 +- .../simpleflowregime}/SevereSlugAnalyser.java | 68 +++---- .../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 +- .../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 +- .../ProcessEquipmentBaseClass.java | 18 +- .../ProcessEquipmentInterface.java | 16 +- .../processequipment}/TwoPortEquipment.java | 4 +- .../processequipment}/TwoPortInterface.java | 6 +- .../absorber/AbsorberInterface.java | 4 +- .../absorber/SimpleAbsorber.java | 20 +- .../absorber/SimpleTEGAbsorber.java | 24 +-- .../absorber/WaterStripperColumn.java | 20 +- .../adsorber/SimpleAdsorber.java | 14 +- .../compressor/AntiSurge.java | 2 +- .../compressor/Compressor.java | 24 +-- .../compressor/CompressorChart.java | 18 +- .../CompressorChartAlternativeMapLookup.java | 10 +- .../compressor/CompressorChartGenerator.java | 6 +- .../compressor/CompressorChartInterface.java | 10 +- .../compressor/CompressorCurve.java | 2 +- .../compressor/CompressorInterface.java | 8 +- .../compressor/CompressorPropertyProfile.java | 2 +- .../compressor/StoneWallCurve.java | 2 +- .../compressor/SurgeCurve.java | 2 +- .../distillation/Condenser.java | 12 +- .../distillation/DistillationColumn.java | 34 ++-- .../distillation/DistillationInterface.java | 4 +- .../distillation/Reboiler.java | 6 +- .../distillation/SimpleTray.java | 14 +- .../distillation/TrayInterface.java | 8 +- .../distillation/VLSolidTray.java | 8 +- .../processequipment}/expander/Expander.java | 10 +- .../expander/ExpanderInterface.java | 6 +- .../expander/ExpanderOld.java | 10 +- .../filter/CharCoalFilter.java | 4 +- .../processequipment}/filter/Filter.java | 12 +- .../heatExchanger/Cooler.java | 8 +- .../heatExchanger/HeatExchanger.java | 20 +- .../heatExchanger/HeatExchangerInterface.java | 6 +- .../heatExchanger/Heater.java | 14 +- .../heatExchanger/HeaterInterface.java | 4 +- .../heatExchanger/NeqHeater.java | 4 +- .../heatExchanger/ReBoiler.java | 10 +- .../processequipment}/manifold/Manifold.java | 16 +- .../processequipment}/mixer/Mixer.java | 10 +- .../mixer/MixerInterface.java | 14 +- .../processequipment}/mixer/StaticMixer.java | 4 +- .../mixer/StaticNeqMixer.java | 4 +- .../mixer/StaticPhaseMixer.java | 2 +- .../pipeline/AdiabaticPipe.java | 14 +- .../pipeline/AdiabaticTwoPhasePipe.java | 8 +- .../processequipment}/pipeline/Fittings.java | 2 +- .../pipeline/IncompressiblePipeFlow.java | 12 +- .../pipeline/OnePhasePipeLine.java | 8 +- .../pipeline/PipeBeggsAndBrills.java | 6 +- .../pipeline/PipeLineInterface.java | 10 +- .../processequipment}/pipeline/Pipeline.java | 16 +- .../pipeline/SimpleTPoutPipeline.java | 8 +- .../pipeline/TwoPhasePipeLine.java | 8 +- .../powerGeneration/GasTurbine.java | 20 +- .../processequipment}/pump/Pump.java | 14 +- .../processequipment}/pump/PumpChart.java | 24 +-- .../pump/PumpChartInterface.java | 2 +- .../processequipment}/pump/PumpCurve.java | 2 +- .../processequipment}/pump/PumpInterface.java | 6 +- .../reservoir/ReservoirCVDsim.java | 4 +- .../reservoir/ReservoirDiffLibsim.java | 4 +- .../reservoir/ReservoirTPsim.java | 12 +- .../reservoir/SimpleReservoir.java | 38 ++-- .../processequipment}/reservoir/Well.java | 10 +- .../processequipment}/reservoir/WellFlow.java | 6 +- .../separator/GasScrubber.java | 8 +- .../separator/GasScrubberSimple.java | 12 +- .../separator/Hydrocyclone.java | 14 +- .../separator/NeqGasScrubber.java | 12 +- .../separator/Separator.java | 46 ++--- .../separator/SeparatorInterface.java | 4 +- .../separator/ThreePhaseSeparator.java | 16 +- .../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 | 16 +- .../processequipment}/splitter/Splitter.java | 14 +- .../splitter/SplitterInterface.java | 10 +- .../stream/EnergyStream.java | 2 +- .../stream/EquilibriumStream.java | 4 +- .../stream/IronIonSaturationStream.java | 4 +- .../processequipment}/stream/NeqStream.java | 2 +- .../stream/ScalePotentialCheckStream.java | 4 +- .../processequipment}/stream/Stream.java | 14 +- .../stream/StreamInterface.java | 10 +- .../stream/VirtualStream.java | 10 +- .../subsea/SimpleFlowLine.java | 12 +- .../processequipment}/subsea/SubseaWell.java | 20 +- .../processequipment}/tank/Tank.java | 26 +-- .../processequipment}/util/Adjuster.java | 22 +-- .../processequipment}/util/Calculator.java | 18 +- .../util/FlowRateAdjuster.java | 18 +- .../processequipment}/util/FlowSetter.java | 26 +-- .../processequipment}/util/GORfitter.java | 10 +- .../processequipment}/util/MPFMfitter.java | 12 +- .../util/MoleFractionControllerUtil.java | 12 +- .../processequipment}/util/NeqSimUnit.java | 20 +- .../processequipment}/util/PressureDrop.java | 10 +- .../processequipment}/util/Recycle.java | 16 +- .../util/RecycleController.java | 8 +- .../processequipment}/util/SetPoint.java | 28 +-- .../util/StreamSaturatorUtil.java | 10 +- .../util/StreamTransition.java | 17 +- .../processequipment}/valve/SafetyValve.java | 6 +- .../valve/ThrottlingValve.java | 14 +- .../valve/ValveInterface.java | 6 +- .../processsystem}/ModuleInterface.java | 14 +- .../processsystem}/ProcessModule.java | 12 +- .../ProcessModuleBaseClass.java | 18 +- .../processsystem}/ProcessSystem.java | 50 ++--- .../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 +- .../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 | 8 +- .../monitor/ThreePhaseSeparatorResponse.java | 10 +- .../util/monitor/Value.java | 2 +- .../util/monitor/ValveResponse.java | 6 +- .../util/monitor/WellAllocatorResponse.java | 6 +- .../util/report/Report.java | 20 +- .../modeltuning}/BaseTuningClass.java | 6 +- .../modeltuning}/TuneToSaturation.java | 6 +- .../modeltuning}/TuningInterface.java | 6 +- .../CompositionEstimation.java | 2 +- .../simulation/BasePVTsimulation.java | 6 +- .../simulation/ConstantMassExpansion.java | 10 +- .../simulation/ConstantVolumeDepletion.java | 10 +- .../simulation/DensitySim.java | 10 +- .../simulation/DifferentialLiberation.java | 2 +- .../simulation/GOR.java | 2 +- .../simulation/SaturationPressure.java | 2 +- .../simulation/SaturationTemperature.java | 2 +- .../simulation/SeparatorTest.java | 2 +- .../simulation/SimulationInterface.java | 6 +- .../simulation/SlimTubeSim.java | 4 +- .../simulation/SwellingTest.java | 2 +- .../simulation/ViscositySim.java | 10 +- .../simulation/ViscosityWaxOilSim.java | 10 +- .../simulation/WaxFractionSim.java | 8 +- .../util/parameterfitting/CMEFunction.java | 4 +- .../util/parameterfitting/CVDFunction.java | 4 +- .../parameterfitting/DensityFunction.java | 4 +- .../FunctionJohanSverderup.java | 6 +- .../SaturationPressureFunction.java | 6 +- .../TestFitToOilFieldFluid.java | 8 +- .../TestSaturationPresFunction.java | 8 +- .../util/parameterfitting/TestWaxTuning.java | 8 +- .../parameterfitting/ViscosityFunction.java | 6 +- .../util/parameterfitting/WaxFunction.java | 4 +- src/main/java/neqsim/standards/Standard.java | 6 +- .../neqsim/standards/StandardInterface.java | 6 +- .../BestPracticeHydrocarbonDewPoint.java | 4 +- .../Draft_GERG2004.java | 4 +- .../Draft_ISO18453.java | 4 +- .../GasChromotograpyhBase.java | 2 +- .../Standard_ISO15403.java | 2 +- .../Standard_ISO6578.java | 2 +- .../Standard_ISO6974.java | 2 +- .../Standard_ISO6976.java | 2 +- .../Standard_ISO6976_2016.java | 2 +- .../SulfurSpecificationMethod.java | 2 +- .../UKspecifications_ICF_SI.java | 2 +- .../Standard_ASTM_D6377.java | 4 +- .../BaseContract.java | 18 +- .../ContractInterface.java | 2 +- .../ContractSpecification.java | 2 +- .../ExperimentalEquipmentData.java | 2 +- .../WettedWallColumnData.java | 4 +- .../readdatafromfile}/DataObject.java | 2 +- .../DataObjectInterface.java | 2 +- .../readdatafromfile}/DataReader.java | 4 +- .../DataReaderInterface.java | 2 +- .../WettedWallColumnDataObject.java | 4 +- .../WettedWallDataReader.java | 4 +- .../samplecreator}/SampleCreator.java | 10 +- .../WettedWallColumnSampleCreator.java | 12 +- .../neqsim/statistics/filesystem.attributes | Bin 1120 -> 0 bytes .../filesystem.attributes | Bin 250 -> 0 bytes .../MonteCarloSimulation.java | 10 +- .../BaseFunction.java | 4 +- .../FunctionInterface.java | 4 +- .../NumericalDerivative.java | 4 +- .../SampleSet.java | 12 +- .../SampleValue.java | 8 +- .../StatisticsBaseClass.java | 26 +-- .../StatisticsInterface.java | 6 +- .../LevenbergMarquardt.java | 4 +- .../LevenbergMarquardtAbsDev.java | 2 +- .../LevenbergMarquardtBiasDev.java | 2 +- .../LevenbergMarquardtFunction.java | 4 +- .../{atomElement => atomelement}/Element.java | 2 +- .../UNIFACgroup.java | 2 +- .../neqsim/thermo/component/Component.java | 4 +- .../neqsim/thermo/component/ComponentEos.java | 46 ++--- .../thermo/component/ComponentGEUnifac.java | 14 +- .../component/ComponentGEUnifacUMRPRU.java | 2 +- .../thermo/component/ComponentInterface.java | 8 +- .../ComponentModifiedFurstElectrolyteEos.java | 2 +- ...entModifiedFurstElectrolyteEosMod2004.java | 2 +- .../neqsim/thermo/component/ComponentPR.java | 2 +- .../neqsim/thermo/component/ComponentRK.java | 2 +- .../neqsim/thermo/component/ComponentSrk.java | 2 +- .../component/ComponentSrkPeneloux.java | 2 +- .../neqsim/thermo/component/ComponentTST.java | 2 +- .../AtractiveTermMatCopPRUMRNew.java | 2 +- .../AttractiveTermBaseClass.java | 2 +- .../AttractiveTermCPAstatoil.java | 2 +- .../AttractiveTermGERG.java | 2 +- .../AttractiveTermInterface.java | 4 +- .../AttractiveTermMatCop.java | 2 +- .../AttractiveTermMatCopPR.java | 2 +- .../AttractiveTermMatCopPRUMR.java | 2 +- .../AttractiveTermMollerup.java | 2 +- .../AttractiveTermPr.java | 6 +- .../AttractiveTermPr1978.java | 6 +- .../AttractiveTermPrDanesh.java | 2 +- .../AttractiveTermPrDelft1998.java | 2 +- .../AttractiveTermPrGassem2001.java | 2 +- .../AttractiveTermRk.java | 2 +- .../AttractiveTermSchwartzentruber.java | 2 +- .../AttractiveTermSrk.java | 6 +- .../AttractiveTermTwu.java | 2 +- .../AttractiveTermTwuCoon.java | 2 +- .../AttractiveTermTwuCoonParam.java | 2 +- .../AttractiveTermTwuCoonStatoil.java | 2 +- .../AttractiveTermUMRPRU.java | 2 +- .../thermo/component/filesystem.attributes | Bin 5517 -> 0 bytes .../RepulsiveTermInterface.java | 2 +- .../thermo/mixingRule/filesystem.attributes | Bin 2841 -> 0 bytes .../{mixingRule => mixingrule}/CPAMixing.java | 8 +- .../CPAMixingInterface.java | 2 +- .../ElectrolyteMixingRulesInterface.java | 2 +- .../EosMixingRules.java | 10 +- .../EosMixingRulesInterface.java | 2 +- .../HVmixingRuleInterface.java | 2 +- src/main/java/neqsim/thermo/phase/Phase.java | 14 +- .../thermo/phase/PhaseCPAInterface.java | 4 +- .../thermo/phase/PhaseElectrolyteCPA.java | 4 +- .../thermo/phase/PhaseElectrolyteCPAOld.java | 4 +- .../java/neqsim/thermo/phase/PhaseEos.java | 4 +- .../thermo/phase/PhaseEosInterface.java | 4 +- .../java/neqsim/thermo/phase/PhaseGE.java | 4 +- .../neqsim/thermo/phase/PhaseGERG2004Eos.java | 2 +- .../neqsim/thermo/phase/PhaseGEUnifac.java | 6 +- .../neqsim/thermo/phase/PhaseInterface.java | 4 +- .../PhaseModifiedFurstElectrolyteEos.java | 6 +- ...aseModifiedFurstElectrolyteEosMod2004.java | 6 +- .../neqsim/thermo/phase/PhasePCSAFTa.java | 4 +- .../java/neqsim/thermo/phase/PhasePrCPA.java | 4 +- .../java/neqsim/thermo/phase/PhaseSrkCPA.java | 4 +- .../phase/PhaseSrkCPA_proceduralMatrices.java | 4 +- .../java/neqsim/thermo/phase/PhaseUMRCPA.java | 4 +- .../neqsim/thermo/phase/filesystem.attributes | Bin 3888 -> 0 bytes .../neqsim/thermo/system/SystemInterface.java | 8 +- .../neqsim/thermo/system/SystemThermo.java | 22 +-- .../util/benchmark/TPflash_benchmark.java | 2 +- .../util/benchmark/TPflash_benchmark_UMR.java | 2 +- .../benchmark/TPflash_benchmark_fullcomp.java | 2 +- .../neqsim/thermo/util/empiric/DuanSun.java | 2 +- .../thermo/util/{GERG => gerg}/DETAIL.java | 2 +- .../thermo/util/{GERG => gerg}/GERG2008.java | 2 +- .../util/{GERG => gerg}/NeqSimAGA8Detail.java | 4 +- .../util/{GERG => gerg}/NeqSimGERG2008.java | 4 +- .../thermo/util/{JNI => jni}/GERG2004EOS.h | 0 .../thermo/util/{JNI => jni}/GERG2004EOS.java | 2 +- .../neqsim_thermo_util_JNI_GERG2004EOS.h | 0 .../methaneBWR32.java | 2 +- .../filesystem.attributes | Bin 1663 -> 0 bytes .../saturationOps/filesystem.attributes | Bin 1330 -> 0 bytes .../BaseOperation.java | 2 +- .../OperationInterface.java | 2 +- .../ThermodynamicOperations.java | 171 +++++++++--------- .../ChemicalEquilibrium.java | 4 +- .../flashops}/CalcIonicComposition.java | 2 +- .../flashops}/CriticalPointFlash.java | 2 +- .../flashops}/Flash.java | 6 +- .../flashops}/PHflash.java | 6 +- .../flashops}/PHflashGERG2008.java | 2 +- .../flashops}/PHflashSingleComp.java | 6 +- .../flashops}/PHsolidFlash.java | 2 +- .../flashops}/PSFlash.java | 6 +- .../flashops}/PSFlashGERG2008.java | 2 +- .../flashops}/PSflashSingleComp.java | 6 +- .../flashops}/PUflash.java | 2 +- .../flashops}/PVrefluxflash.java | 2 +- .../flashops}/QfuncFlash.java | 4 +- .../flashops}/RachfordRice.java | 2 +- .../flashops}/SaturateWithWater.java | 4 +- .../flashops}/SolidFlash.java | 2 +- .../flashops}/SolidFlash1.java | 4 +- .../flashops}/SolidFlash12.java | 4 +- .../flashops/SysNewtonRhapsonPHflash.java} | 16 +- .../flashops/SysNewtonRhapsonTPflash.java} | 6 +- .../flashops/SysNewtonRhapsonTPflashNew.java} | 12 +- .../flashops}/TPflash.java | 6 +- .../flashops}/TPgradientFlash.java | 2 +- .../flashops}/TPmultiflash.java | 2 +- .../flashops}/TPmultiflashWAX.java | 2 +- .../flashops}/TPmultiflash_1.java | 2 +- .../flashops}/TSFlash.java | 4 +- .../flashops}/TVflash.java | 2 +- .../flashops}/TVfractionFlash.java | 2 +- .../flashops}/VHflash.java | 2 +- .../flashops}/VHflashQfunc.java | 4 +- .../flashops}/VSflash.java | 4 +- .../flashops}/VUflash.java | 2 +- .../flashops}/VUflashQfunc.java | 4 +- .../flashops}/dTPflash.java | 2 +- .../AddIonToScaleSaturation.java} | 10 +- .../BubblePointPressureFlash.java} | 8 +- .../BubblePointPressureFlashDer.java} | 8 +- .../BubblePointTemperatureFlash.java} | 16 +- .../BubblePointTemperatureNoDer.java} | 8 +- .../saturationops/CalcSaltSatauration.java} | 8 +- .../saturationops/CheckScalePotential.java} | 8 +- .../saturationops/ConstantDutyFlash.java} | 10 +- .../ConstantDutyFlashInterface.java | 4 +- .../ConstantDutyPressureFlash.java} | 6 +- .../ConstantDutyTemperatureFlash.java} | 8 +- .../saturationops/CricondebarFlash.java} | 10 +- .../saturationops/CricondenBarTemp.java} | 6 +- .../saturationops/CricondenBarTemp1.java} | 6 +- .../saturationops/DewPointPressureFlash.java} | 6 +- .../DewPointTemperatureFlash.java} | 6 +- .../DewPointTemperatureFlashDer.java} | 6 +- .../flashops/saturationops}/FreezeOut.java | 6 +- .../FreezingPointTemperatureFlash.java} | 12 +- .../FreezingPointTemperatureFlashOld.java} | 10 +- .../FreezingPointTemperatureFlashTR.java} | 14 +- .../saturationops}/FugTestConstP.java | 12 +- .../HCdewPointPressureFlash.java | 4 +- .../HydrateEquilibriumLine.java | 6 +- .../HydrateFormationPressureFlash.java | 6 +- .../HydrateFormationTemperatureFlash.java | 6 +- .../HydrateInhibitorConcentrationFlash.java | 6 +- .../HydrateInhibitorwtFlash.java | 6 +- .../SolidComplexTemperatureCalc.java | 6 +- .../flashops/saturationops}/WATcalc.java | 6 +- .../WaterDewPointEquilibriumLine.java | 6 +- .../WaterDewPointTemperatureFlash.java} | 8 +- ...erDewPointTemperatureMultiphaseFlash.java} | 10 +- .../CricondenBarFlash.java | 4 +- .../CricondenThermFlash.java | 4 +- .../HPTphaseEnvelope.java | 6 +- .../PTphaseEnvelope.java} | 32 ++-- .../PTphaseEnvelope1.java} | 30 +-- .../PTphaseEnvelopeMay.java} | 30 +-- .../PTphaseEnvelopeNew.java} | 28 +-- .../PTphaseEnvelopeNew2.java} | 18 +- .../SysNewtonRhapsonPhaseEnvelope.java} | 16 +- .../SysNewtonRhapsonPhaseEnvelope2.java} | 16 +- .../reactivecurves/PloadingCurve.java} | 18 +- .../reactivecurves/PloadingCurve2.java} | 18 +- .../OLGApropertyTableGenerator.java | 6 +- ...GApropertyTableGeneratorKeywordFormat.java | 6 +- .../OLGApropertyTableGeneratorWater.java | 6 +- .../OLGApropertyTableGeneratorWaterEven.java | 6 +- ...pertyTableGeneratorWaterKeywordFormat.java | 6 +- ...GApropertyTableGeneratorWaterStudents.java | 6 +- ...propertyTableGeneratorWaterStudentsPH.java | 6 +- .../util/generator/PropertyGenerator.java | 2 +- .../java/neqsim/util/python/Copy of init.py | 35 ---- .../simulation/ConstantMassExpansionTest.java | 1 + .../ConstantVolumeDepletionTest.java | 4 +- .../simulation/DensitySimTest.java | 1 + .../DifferentialLiberationTest.java | 3 + .../simulation/SaturationPressureTest.java | 2 + .../simulation/SaturationTemperatureTest.java | 6 +- .../simulation/SeparatorTestTest.java | 1 + .../simulation/SlimTubeSimTest.java | 1 + .../simulation/ViscositySimTest.java | 1 + .../simulation/WaxFractionSimTest.java | 1 + .../ChemicalReactionFactoryTest.java | 1 + .../ChemicalReactionListTest.java | 1 + .../util/example/NaturalGasCombustion.java | 2 +- .../StratifiedFlowNodeTest.java | 5 +- .../StirredCellNodeTest.java | 3 +- .../pipeFlowSystem/PipeFlowSystemTest.java | 9 +- .../shipSystem/LNGshipTest.java | 1 + .../packings/PallRingPackingTest.java | 1 + .../packings/RachigRingPackingTest.java | 1 + .../util/example/WettedWall_CO2_water.java | 10 +- .../FrictionTheoryViscosityMethodTest.java | 2 +- .../viscosity/PFCTViscosityMethodTest.java | 2 +- .../density/CostaldTest.java | 2 +- .../util/examples/TPflashTest.java | 2 +- .../util/examples/TPflashWater.java | 2 +- .../util/examples/TPflash_1.java | 2 +- .../util/examples/TestCondensate.java | 2 +- .../examples/TestDiffusionCoefficient.java | 2 +- .../util/examples/TestSolidAdsorption.java | 2 +- .../util/examples/TestSurfaceTenison.java | 2 +- .../util/examples/TestSurfaceTension2.java | 2 +- .../util/examples/TestSurfaceTensionOde.java | 2 +- .../ControllerDeviceBaseClassTest.java | 1 + .../CombustionEmissionsCalculatorTest.java | 3 +- .../FLowInducedVibrationTest.java | 15 +- .../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 | 25 +-- .../heatExchanger/HeaterTest.java | 5 +- .../manifold/ManifoldTest.java | 5 +- .../processEquipment/mixer/MixerTest.java | 9 +- .../pipeline/AdiabaticTwoPhasePipeTest.java | 7 +- .../pipeline/BeggsAndBrillsPipeTest.java | 29 +-- .../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 +- .../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 | 74 ++++---- .../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 | 16 +- .../util/example/LNGtankfilling.java | 22 +-- .../util/example/MEGinjection.java | 24 +-- .../util/example/MasstransferMeOH.java | 18 +- .../util/example/OffshoreProcess.java | 22 +-- .../util/example/OffshoreProcess2.java | 16 +- .../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 | 18 +- .../util/example/compressorTest12.java | 4 +- .../util/example/compressorTest_1.java | 8 +- .../util/example/destillation1.java | 14 +- .../util/example/destillation2.java | 8 +- .../util/example/expander1.java | 10 +- .../util/example/gasPipeline.java | 12 +- .../util/example/multiThreadTest.java | 26 +-- .../util/example/oxygenRemovalWater.java | 14 +- .../util/example/process1.java | 12 +- .../util/example/process1Test.java | 10 +- .../util/example/process2.java | 22 +-- .../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 | 12 +- .../util/example/simpleGasScrubber.java | 10 +- .../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 | 10 +- .../util/monitor/SeparatorResponseTest.java | 12 +- .../util/report/FluidReportTest.java | 2 +- .../util/report/ReportTest.java | 13 +- .../gasQuality/Draft_GERG2004Test.java | 1 + .../gasQuality/Draft_ISO18453Test.java | 1 + .../gasQuality/Standard_ISO15403Test.java | 3 +- .../gasQuality/Standard_ISO6578Test.java | 1 + .../gasQuality/Standard_ISO6976Test.java | 9 +- .../Standard_ISO6976_2016_Test.java | 9 +- .../oilQuality/Standard_ASTM_D6377Test.java | 1 + .../salesContract/BaseContractTest.java | 2 + .../util/example/TestFunction.java | 2 +- .../TestLevenbergMarquardt_MonteCarlo.java | 6 +- .../util/example/TestFunction.java | 2 +- .../util/example/TestLevenbergMarquardt.java | 6 +- .../thermo/atomElement/ElementTest.java | 1 + .../characterization/CharacteriseTest.java | 2 +- .../PlusFractionModelTest.java | 2 +- .../neqsim/thermo/component/AmmoniaTest.java | 2 +- .../component/ComponentHydrateGFTest.java | 2 +- .../system/SystemElectrolyteCPATest.java | 2 +- .../system/SystemFurstElectrolyteEosTest.java | 2 +- .../thermo/system/SystemPCSAFTTest.java | 2 +- .../neqsim/thermo/system/SystemPrEoSTest.java | 2 +- .../system/SystemSrkCPAstatoilTest.java | 2 +- .../thermo/system/SystemThermoTest.java | 2 +- .../thermo/system/SystemUMRCPAEoStest.java | 2 +- .../system/SystemUMRPRUMCEosNewTest.java | 4 +- .../thermo/util/example/ActivityCalc.java | 2 +- .../thermo/util/example/AmineFlash.java | 2 +- .../thermo/util/example/BubbleFlash.java | 2 +- .../thermo/util/example/BubbleFlashCPA.java | 2 +- .../thermo/util/example/CricondenbarTest.java | 2 +- .../thermo/util/example/DewPointCurve.java | 2 +- .../thermo/util/example/FlashGasTest.java | 2 +- .../thermo/util/example/FlashOilTest.java | 2 +- .../thermo/util/example/FlashWaterTest.java | 2 +- .../thermo/util/example/FreezeMEGwater.java | 2 +- .../thermo/util/example/FreezingPoint.java | 2 +- .../thermo/util/example/H2Sdistribution.java | 2 +- .../util/example/HeatOfVaporization.java | 2 +- .../util/example/HenryConstantCalc.java | 2 +- .../thermo/util/example/HydrateFlash.java | 2 +- .../thermo/util/example/HydrateFlash2.java | 2 +- .../thermo/util/example/KlabFlashBugTest.java | 2 +- .../neqsim/thermo/util/example/LNGFlash.java | 2 +- .../thermo/util/example/LNGfilling.java | 2 +- .../thermo/util/example/LNGfreezing.java | 2 +- .../util/example/LNGfreezingTestSolid1.java | 2 +- .../neqsim/thermo/util/example/ModelTest.java | 2 +- .../util/example/OsmoticCoefficient_1.java | 2 +- .../thermo/util/example/PS_PH_flash.java | 2 +- .../thermo/util/example/PhaseEnvelope.java | 6 +- .../thermo/util/example/PhaseEnvelope2.java | 2 +- .../util/example/PressureLoadingCurve.java | 2 +- .../util/example/ReactiveDesmukhMather.java | 2 +- .../util/example/ReactiveKentEisenberg.java | 2 +- .../thermo/util/example/ReactiveTPflash.java | 2 +- .../thermo/util/example/ReactiveTPflash2.java | 2 +- .../thermo/util/example/ReadFluidData.java | 2 +- .../thermo/util/example/ReadFluidData2.java | 6 +- .../util/example/ScalePotentialCheck.java | 2 +- .../thermo/util/example/SolidFlash.java | 2 +- .../thermo/util/example/SrkEoSTest.java | 2 +- .../example/SrkOilCharacterizationTest.java | 2 +- .../util/example/SulfureDeposition.java | 2 +- .../thermo/util/example/TPMultiFlash.java | 2 +- .../neqsim/thermo/util/example/TPflash.java | 2 +- .../neqsim/thermo/util/example/TPflash1.java | 2 +- .../neqsim/thermo/util/example/TPflash2.java | 2 +- .../thermo/util/example/TPflashCAPEOPEN.java | 2 +- .../thermo/util/example/TPflashDehyd.java | 2 +- .../neqsim/thermo/util/example/TPflashGR.java | 2 +- .../thermo/util/example/TPflashMembrane.java | 2 +- .../example/TPflashMethanolWaterPropane.java | 2 +- .../thermo/util/example/TPflashTestPablo.java | 2 +- .../thermo/util/example/TVPexample.java | 2 +- .../thermo/util/example/TestCSPsrk.java | 2 +- .../util/example/TestCharacterizationCPA.java | 2 +- .../TestCharacterizationCondensate.java | 2 +- .../TestCharacterizationCondensate1.java | 2 +- .../example/TestElectrolyteCPAstatoil.java | 2 +- .../neqsim/thermo/util/example/TestFlash.java | 2 +- .../thermo/util/example/TestFluidIssues.java | 2 +- .../thermo/util/example/TestGEHenry.java | 2 +- .../thermo/util/example/TestGERG2004EOS.java | 2 +- .../thermo/util/example/TestGERGwater.java | 2 +- .../thermo/util/example/TestISO1982.java | 2 +- .../thermo/util/example/TestMBWR32.java | 2 +- .../thermo/util/example/TestMEGFlash.java | 2 +- .../thermo/util/example/TestNeqSimBug.java | 2 +- .../thermo/util/example/TestPCSAFT.java | 2 +- .../thermo/util/example/TestPCSAFT1.java | 2 +- .../thermo/util/example/TestPCSAFT1_1.java | 2 +- .../neqsim/thermo/util/example/TestPSRK.java | 2 +- .../neqsim/thermo/util/example/TestSRKWS.java | 2 +- .../util/example/TestSurfaceTenison.java | 2 +- .../thermo/util/example/TestUMRPRU.java | 2 +- .../thermo/util/example/TestUMRPRUMC.java | 2 +- .../thermo/util/example/TestUNIFAC.java | 2 +- .../thermo/util/example/TestUNIFAC_1.java | 2 +- .../thermo/util/example/TestUniSimsFlash.java | 2 +- .../thermo/util/example/TestVHflash.java | 2 +- .../util/example/TestmercuryTPflash.java | 2 +- .../util/example/VapourPressureTTest.java | 2 +- .../neqsim/thermo/util/example/WaxFlash.java | 2 +- .../longman/Problem15102009LNGfreezing.java | 2 +- .../longman/Problem280809LNGfreezing.java | 2 +- .../Problem280809LNGphaseEnvelope.java | 2 +- .../readwrite/EclipseFluidReadWriteTest.java | 2 +- .../ThermodynamicOperationsTest.java | 23 +-- .../flashOps/Degasser.java | 18 +- .../flashOps/PHFlashCPATest.java | 2 +- .../flashOps/PHFlashGERG2008Test.java | 2 +- .../flashOps/PHFlashTest.java | 2 +- .../flashOps/PSFlashGERG2008Test.java | 4 +- .../flashOps/RachfordRiceTest.java | 1 + .../flashOps/SaturateWithWaterTest.java | 2 +- .../flashOps/SolidFlash1Test.java | 2 +- .../flashOps/TPFlashTest.java | 2 +- .../flashOps/TPFlashTestHighTemp.java | 2 +- .../flashOps/TPFlashTestWellFluid.java | 2 +- .../flashOps/TPsolidFlash.java | 2 +- .../flashOps/TVFlashTest.java | 2 +- .../flashOps/VUFlashTest.java | 2 +- .../flashOps/WaxFlashTest.java | 4 +- .../HydrateInhibitorwtFlashTest.java | 2 +- .../bubblePointPressureFlashTest.java | 2 +- .../bubblePointTemperatureFlashTest.java | 2 +- .../dewPointPressureFlashTest.java | 2 +- .../dewPointTemperatureFlashTest.java | 2 +- .../PTPhaseEnvelopeTest.java | 4 +- .../util/example/CompGradientFlash.java | 2 +- .../util/example/CriticalPointFlash.java | 2 +- .../util/example/MEGwaterComplexFlash.java | 2 +- .../util/example/OLGApropGenerator.java | 2 +- .../util/example/OLGApropGeneratorPH.java | 2 +- .../util/example/PhaseEnvelope.java | 2 +- .../util/example/SolidFlash.java | 2 +- .../util/example/TVflash.java | 2 +- .../util/example/VLSolidTPFLash.java | 2 +- .../util/example/VUflash.java | 2 +- .../neqsim/util/unit/PressureUnitTest.java | 2 +- .../neqsim/util/unit/TemperatureUnitTest.java | 2 +- src/test/java/neqsim/util/unit/UnitsTest.java | 2 +- 933 files changed, 3980 insertions(+), 3919 deletions(-) delete mode 100644 src/main/java/neqsim/MathLib/generalMath/filesystem.attributes delete mode 100644 src/main/java/neqsim/MathLib/nonLinearSolver/filesystem.attributes rename src/main/java/neqsim/{chemicalReactions => chemicalreactions}/ChemicalReactionOperations.java (96%) rename src/main/java/neqsim/{chemicalReactions/chemicalEquilibriaum => chemicalreactions/chemicalequilibrium}/ChemEq.java (99%) rename src/main/java/neqsim/{chemicalReactions/chemicalEquilibriaum => chemicalreactions/chemicalequilibrium}/ChemicalEquilibrium.java (99%) rename src/main/java/neqsim/{chemicalReactions/chemicalEquilibriaum => chemicalreactions/chemicalequilibrium}/LinearProgrammingChemicalEquilibrium.java (98%) rename src/main/java/neqsim/{chemicalReactions/chemicalEquilibriaum => chemicalreactions/chemicalequilibrium}/ReferencePotComparator.java (92%) rename src/main/java/neqsim/{chemicalReactions/chemicalReaction => chemicalreactions/chemicalreaction}/ChemicalReaction.java (99%) rename src/main/java/neqsim/{chemicalReactions/chemicalReaction => chemicalreactions/chemicalreaction}/ChemicalReactionFactory.java (97%) rename src/main/java/neqsim/{chemicalReactions/chemicalReaction => chemicalreactions/chemicalreaction}/ChemicalReactionList.java (98%) rename src/main/java/neqsim/{chemicalReactions => chemicalreactions}/kinetics/Kinetics.java (95%) delete mode 100644 src/main/java/neqsim/dataPresentation/filesystem.attributes rename src/main/java/neqsim/{dataPresentation/dataHandeling.java => datapresentation/DataHandeling.java} (95%) rename src/main/java/neqsim/{dataPresentation => datapresentation}/SampleXYDataSource.java (99%) rename src/main/java/neqsim/{dataPresentation/fileHandeling/createTextFile => datapresentation/filehandeling/createtextfile}/TextFile.java (97%) rename src/main/java/neqsim/{dataPresentation/JFreeChart/graph2b.java => datapresentation/jfreechart/Graph2b.java} (96%) rename src/main/java/neqsim/{dataPresentation/JFreeChart => datapresentation/jfreechart}/graph2b.form (100%) delete mode 100644 src/main/java/neqsim/fluidMechanics/flowLeg/filesystem.attributes delete mode 100644 src/main/java/neqsim/fluidMechanics/flowNode/filesystem.attributes delete mode 100644 src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/equilibriumFluidBoundary/olgamodel.txt delete mode 100644 src/main/java/neqsim/fluidMechanics/flowSolver/filesystem.attributes delete mode 100644 src/main/java/neqsim/fluidMechanics/flowSolver/onePhaseFlowSolver/filesystem.attributes delete mode 100644 src/main/java/neqsim/fluidMechanics/flowSolver/onePhaseFlowSolver/onePhasePipeFlowSolver/filesystem.attributes delete mode 100644 src/main/java/neqsim/fluidMechanics/flowSystem/filesystem.attributes delete mode 100644 src/main/java/neqsim/fluidMechanics/geometryDefinitions/filesystem.attributes rename src/main/java/neqsim/{fluidMechanics/fluidMech.java => fluidmechanics/FluidMech.java} (60%) rename src/main/java/neqsim/{fluidMechanics/flowLeg => fluidmechanics/flowleg}/FlowLeg.java (97%) rename src/main/java/neqsim/{fluidMechanics/flowLeg => fluidmechanics/flowleg}/FlowLegInterface.java (87%) rename src/main/java/neqsim/{fluidMechanics/flowLeg/pipeLeg => fluidmechanics/flowleg/pipeleg}/PipeLeg.java (90%) rename src/main/java/neqsim/{fluidMechanics/flowLeg/pipeLeg => fluidmechanics/flowleg/pipeleg}/filesystem.attributes (100%) rename src/main/java/neqsim/{fluidMechanics/flowNode => fluidmechanics/flownode}/FlowNode.java (94%) rename src/main/java/neqsim/{fluidMechanics/flowNode => fluidmechanics/flownode}/FlowNodeInterface.java (93%) rename src/main/java/neqsim/{fluidMechanics/flowNode => fluidmechanics/flownode}/FlowNodeSelector.java (81%) rename src/main/java/neqsim/{fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc => fluidmechanics/flownode/fluidboundary/heatmasstransfercalc}/FluidBoundary.java (96%) rename src/main/java/neqsim/{fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc => fluidmechanics/flownode/fluidboundary/heatmasstransfercalc}/FluidBoundaryInterface.java (87%) rename src/main/java/neqsim/{fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/equilibriumFluidBoundary => fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/equilibriumfluidboundary}/EquilibriumFluidBoundary.java (79%) rename src/main/java/neqsim/{fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/finiteVolumeBoundary/fluidBoundaryNode => fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/finitevolumeboundary/fluidboundarynode}/FluidBoundaryNode.java (87%) rename src/main/java/neqsim/{fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/finiteVolumeBoundary/fluidBoundaryNode => fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/finitevolumeboundary/fluidboundarynode}/FluidBoundaryNodeInterface.java (79%) rename src/main/java/neqsim/{fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/finiteVolumeBoundary/fluidBoundaryNode/fluidBoundaryNonReactiveNode => fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/finitevolumeboundary/fluidboundarynode/fluidboundarynonreactivenode}/FluidBoundaryNodeNonReactive.java (68%) rename src/main/java/neqsim/{fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/finiteVolumeBoundary/fluidBoundaryNode/fluidBoundaryReactiveNode => fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/finitevolumeboundary/fluidboundarynode/fluidboundaryreactivenode}/FluidBoundaryNodeReactive.java (71%) rename src/main/java/neqsim/{fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/finiteVolumeBoundary/fluidBoundarySolver => fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/finitevolumeboundary/fluidboundarysolver}/FluidBoundarySolver.java (94%) rename src/main/java/neqsim/{fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/finiteVolumeBoundary/fluidBoundarySolver => fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/finitevolumeboundary/fluidboundarysolver}/FluidBoundarySolverInterface.java (80%) rename src/main/java/neqsim/{fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/finiteVolumeBoundary/fluidBoundarySolver/fluidBoundaryReactiveSolver => fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/finitevolumeboundary/fluidboundarysolver/fluidboundaryreactivesolver}/FluidBoundaryReactiveSolver.java (58%) rename src/main/java/neqsim/{fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/finiteVolumeBoundary/fluidBoundarySystem => fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/finitevolumeboundary/fluidboundarysystem}/FluidBoundarySystem.java (73%) rename src/main/java/neqsim/{fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/finiteVolumeBoundary/fluidBoundarySystem => fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/finitevolumeboundary/fluidboundarysystem}/FluidBoundarySystemInterface.java (67%) rename src/main/java/neqsim/{fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/finiteVolumeBoundary/fluidBoundarySystem/fluidBoundaryNonReactive => fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/finitevolumeboundary/fluidboundarysystem/fluidboundarynonreactive}/FluidBoundarySystemNonReactive.java (71%) rename src/main/java/neqsim/{fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/finiteVolumeBoundary/fluidBoundarySystem/fluidBoundarySystemReactive => fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/finitevolumeboundary/fluidboundarysystem/fluidboundarysystemreactive}/FluidBoundarySystemReactive.java (72%) rename src/main/java/neqsim/{fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/nonEquilibriumFluidBoundary => fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/nonequilibriumfluidboundary}/NonEquilibriumFluidBoundary.java (98%) rename src/main/java/neqsim/{fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/nonEquilibriumFluidBoundary/filmModelBoundary => fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/nonequilibriumfluidboundary/filmmodelboundary}/KrishnaStandartFilmModel.java (95%) rename src/main/java/neqsim/{fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/nonEquilibriumFluidBoundary/filmModelBoundary/reactiveFilmModel => fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/nonequilibriumfluidboundary/filmmodelboundary/reactivefilmmodel}/ReactiveFluidBoundary.java (98%) rename src/main/java/neqsim/{fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/nonEquilibriumFluidBoundary/filmModelBoundary/reactiveFilmModel => fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/nonequilibriumfluidboundary/filmmodelboundary/reactivefilmmodel}/ReactiveKrishnaStandartFilmModel.java (76%) rename src/main/java/neqsim/{fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/nonEquilibriumFluidBoundary/filmModelBoundary/reactiveFilmModel/enhancementFactor => fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/nonequilibriumfluidboundary/filmmodelboundary/reactivefilmmodel/enhancementfactor}/EnhancementFactor.java (86%) rename src/main/java/neqsim/{fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/nonEquilibriumFluidBoundary/filmModelBoundary/reactiveFilmModel/enhancementFactor => fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/nonequilibriumfluidboundary/filmmodelboundary/reactivefilmmodel/enhancementfactor}/EnhancementFactorAlg.java (93%) rename src/main/java/neqsim/{fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/nonEquilibriumFluidBoundary/filmModelBoundary/reactiveFilmModel/enhancementFactor => fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/nonequilibriumfluidboundary/filmmodelboundary/reactivefilmmodel/enhancementfactor}/EnhancementFactorInterface.java (80%) rename src/main/java/neqsim/{fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/nonEquilibriumFluidBoundary/filmModelBoundary/reactiveFilmModel/enhancementFactor => fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/nonequilibriumfluidboundary/filmmodelboundary/reactivefilmmodel/enhancementfactor}/EnhancementFactorNumeric.java (66%) rename src/main/java/neqsim/{fluidMechanics/flowNode/fluidBoundary/interphaseTransportCoefficient => fluidmechanics/flownode/fluidboundary/interphasetransportcoefficient}/InterphaseTransportCoefficientBaseClass.java (91%) rename src/main/java/neqsim/{fluidMechanics/flowNode/fluidBoundary/interphaseTransportCoefficient => fluidmechanics/flownode/fluidboundary/interphasetransportcoefficient}/InterphaseTransportCoefficientInterface.java (76%) rename src/main/java/neqsim/{fluidMechanics/flowNode/fluidBoundary/interphaseTransportCoefficient/interphaseOnePhase => fluidmechanics/flownode/fluidboundary/interphasetransportcoefficient/interphaseonephase}/InterphaseOnePhase.java (56%) rename src/main/java/neqsim/{fluidMechanics/flowNode/fluidBoundary/interphaseTransportCoefficient/interphaseOnePhase/interphasePipeFlow => fluidmechanics/flownode/fluidboundary/interphasetransportcoefficient/interphaseonephase/interphasepipeflow}/InterphasePipeFlow.java (86%) rename src/main/java/neqsim/{fluidMechanics/flowNode/fluidBoundary/interphaseTransportCoefficient/interphaseTwoPhase => fluidmechanics/flownode/fluidboundary/interphasetransportcoefficient/interphasetwophase}/InterphaseTwoPhase.java (56%) rename src/main/java/neqsim/{fluidMechanics/flowNode/fluidBoundary/interphaseTransportCoefficient/interphaseTwoPhase => fluidmechanics/flownode/fluidboundary/interphasetransportcoefficient/interphasetwophase}/interphaseReactorFlow/InterphasePackedBed.java (92%) rename src/main/java/neqsim/{fluidMechanics/flowNode/fluidBoundary/interphaseTransportCoefficient/interphaseTwoPhase => fluidmechanics/flownode/fluidboundary/interphasetransportcoefficient/interphasetwophase}/interphaseReactorFlow/InterphaseReactorFlow.java (55%) rename src/main/java/neqsim/{fluidMechanics/flowNode/fluidBoundary/interphaseTransportCoefficient/interphaseTwoPhase/interphasePipeFlow => fluidmechanics/flownode/fluidboundary/interphasetransportcoefficient/interphasetwophase/interphasepipeflow}/InterphaseAnnularFlow.java (68%) rename src/main/java/neqsim/{fluidMechanics/flowNode/fluidBoundary/interphaseTransportCoefficient/interphaseTwoPhase/interphasePipeFlow => fluidmechanics/flownode/fluidboundary/interphasetransportcoefficient/interphasetwophase/interphasepipeflow}/InterphaseDropletFlow.java (96%) rename src/main/java/neqsim/{fluidMechanics/flowNode/fluidBoundary/interphaseTransportCoefficient/interphaseTwoPhase/interphasePipeFlow => fluidmechanics/flownode/fluidboundary/interphasetransportcoefficient/interphasetwophase/interphasepipeflow}/InterphaseStratifiedFlow.java (96%) rename src/main/java/neqsim/{fluidMechanics/flowNode/fluidBoundary/interphaseTransportCoefficient/interphaseTwoPhase/interphasePipeFlow => fluidmechanics/flownode/fluidboundary/interphasetransportcoefficient/interphasetwophase/interphasepipeflow}/InterphaseTwoPhasePipeFlow.java (57%) rename src/main/java/neqsim/{fluidMechanics/flowNode/fluidBoundary/interphaseTransportCoefficient/interphaseTwoPhase/stirredCell => fluidmechanics/flownode/fluidboundary/interphasetransportcoefficient/interphasetwophase/stirredcell}/InterphaseStirredCellFlow.java (91%) rename src/main/java/neqsim/{fluidMechanics/flowNode/multiPhaseNode => fluidmechanics/flownode/multiphasenode}/MultiPhaseFlowNode.java (97%) rename src/main/java/neqsim/{fluidMechanics/flowNode/multiPhaseNode/waxNode => fluidmechanics/flownode/multiphasenode/waxnode}/WaxDepositionFlowNode.java (86%) rename src/main/java/neqsim/{fluidMechanics/flowNode/onePhaseNode => fluidmechanics/flownode/onephasenode}/onePhaseFlowNode.java (94%) rename src/main/java/neqsim/{fluidMechanics/flowNode/onePhaseNode/onePhasePipeFlowNode => fluidmechanics/flownode/onephasenode/onephasepipeflownode}/onePhasePipeFlowNode.java (80%) rename src/main/java/neqsim/{fluidMechanics/flowNode/twoPhaseNode => fluidmechanics/flownode/twophasenode}/TwoPhaseFlowNode.java (98%) rename src/main/java/neqsim/{fluidMechanics/flowNode/twoPhaseNode/twoPhasePipeFlowNode => fluidmechanics/flownode/twophasenode/twophasepipeflownode}/AnnularFlow.java (89%) rename src/main/java/neqsim/{fluidMechanics/flowNode/twoPhaseNode/twoPhasePipeFlowNode => fluidmechanics/flownode/twophasenode/twophasepipeflownode}/BubbleFlowNode.java (88%) rename src/main/java/neqsim/{fluidMechanics/flowNode/twoPhaseNode/twoPhasePipeFlowNode => fluidmechanics/flownode/twophasenode/twophasepipeflownode}/DropletFlowNode.java (91%) rename src/main/java/neqsim/{fluidMechanics/flowNode/twoPhaseNode/twoPhasePipeFlowNode => fluidmechanics/flownode/twophasenode/twophasepipeflownode}/StratifiedFlowNode.java (88%) rename src/main/java/neqsim/{fluidMechanics/flowNode/twoPhaseNode/twoPhaseReactorFlowNode => fluidmechanics/flownode/twophasenode/twophasereactorflownode}/TwoPhasePackedBedFlowNode.java (90%) rename src/main/java/neqsim/{fluidMechanics/flowNode/twoPhaseNode/twoPhaseReactorFlowNode => fluidmechanics/flownode/twophasenode/twophasereactorflownode}/TwoPhaseTrayTowerFlowNode.java (84%) rename src/main/java/neqsim/{fluidMechanics/flowNode/twoPhaseNode/twoPhaseStirredCellNode => fluidmechanics/flownode/twophasenode/twophasestirredcellnode}/StirredCellNode.java (89%) rename src/main/java/neqsim/{fluidMechanics/flowSolver => fluidmechanics/flowsolver}/FlowSolver.java (96%) rename src/main/java/neqsim/{fluidMechanics/flowSolver => fluidmechanics/flowsolver}/FlowSolverInterface.java (95%) rename src/main/java/neqsim/{fluidMechanics/flowSolver/onePhaseFlowSolver => fluidmechanics/flowsolver/onephaseflowsolver}/OnePhaseFlowSolver.java (68%) rename src/main/java/neqsim/{fluidMechanics/flowSolver/onePhaseFlowSolver/onePhasePipeFlowSolver => fluidmechanics/flowsolver/onephaseflowsolver/onephasepipeflowsolver}/OnePhaseFixedStaggeredGrid.java (98%) rename src/main/java/neqsim/{fluidMechanics/flowSolver/onePhaseFlowSolver/onePhasePipeFlowSolver => fluidmechanics/flowsolver/onephaseflowsolver/onephasepipeflowsolver}/OnePhasePipeFlowSolver.java (85%) rename src/main/java/neqsim/{fluidMechanics/flowSolver/twoPhaseFlowSolver/stirredCellSolver => fluidmechanics/flowsolver/twophaseflowsolver/stirredcellsolver}/StirredCellSolver.java (95%) rename src/main/java/neqsim/{fluidMechanics/flowSolver/twoPhaseFlowSolver/twoPhasePipeFlowSolver => fluidmechanics/flowsolver/twophaseflowsolver/twophasepipeflowsolver}/TwoPhaseFixedStaggeredGridSolver.java (99%) rename src/main/java/neqsim/{fluidMechanics/flowSolver/twoPhaseFlowSolver/twoPhasePipeFlowSolver => fluidmechanics/flowsolver/twophaseflowsolver/twophasepipeflowsolver}/TwoPhasePipeFlowSolver.java (89%) rename src/main/java/neqsim/{fluidMechanics/flowSystem => fluidmechanics/flowsystem}/FlowSystem.java (95%) rename src/main/java/neqsim/{fluidMechanics/flowSystem => fluidmechanics/flowsystem}/FlowSystemInterface.java (87%) rename src/main/java/neqsim/{fluidMechanics/flowSystem/onePhaseFlowSystem => fluidmechanics/flowsystem/onephaseflowsystem}/OnePhaseFlowSystem.java (78%) rename src/main/java/neqsim/{fluidMechanics/flowSystem/onePhaseFlowSystem/pipeFlowSystem => fluidmechanics/flowsystem/onephaseflowsystem/pipeflowsystem}/PipeFlowSystem.java (82%) rename src/main/java/neqsim/{fluidMechanics/flowSystem/twoPhaseFlowSystem => fluidmechanics/flowsystem/twophaseflowsystem}/TwoPhaseFlowSystem.java (79%) rename src/main/java/neqsim/{fluidMechanics/flowSystem/twoPhaseFlowSystem/shipSystem => fluidmechanics/flowsystem/twophaseflowsystem/shipsystem}/LNGship.java (95%) rename src/main/java/neqsim/{fluidMechanics/flowSystem/twoPhaseFlowSystem/stirredCellSystem => fluidmechanics/flowsystem/twophaseflowsystem/stirredcellsystem}/StirredCellSystem.java (83%) rename src/main/java/neqsim/{fluidMechanics/flowSystem/twoPhaseFlowSystem/twoPhasePipeFlowSystem => fluidmechanics/flowsystem/twophaseflowsystem/twophasepipeflowsystem}/TwoPhasePipeFlowSystem.java (80%) rename src/main/java/neqsim/{fluidMechanics/flowSystem/twoPhaseFlowSystem/twoPhasePipeFlowSystem => fluidmechanics/flowsystem/twophaseflowsystem/twophasepipeflowsystem}/TwoPhasePipeFlowSystemReac.java (88%) rename src/main/java/neqsim/{fluidMechanics/flowSystem/twoPhaseFlowSystem/twoPhaseReactorFlowSystem => fluidmechanics/flowsystem/twophaseflowsystem/twophasereactorflowsystem}/TwoPhaseReactorFlowSystem.java (83%) rename src/main/java/neqsim/{fluidMechanics/geometryDefinitions => fluidmechanics/geometrydefinitions}/GeometryDefinition.java (94%) rename src/main/java/neqsim/{fluidMechanics/geometryDefinitions => fluidmechanics/geometrydefinitions}/GeometryDefinitionInterface.java (87%) rename src/main/java/neqsim/{fluidMechanics/geometryDefinitions/internalGeometry => fluidmechanics/geometrydefinitions/internalgeometry}/packings/BerlSaddlePacking.java (84%) rename src/main/java/neqsim/{fluidMechanics/geometryDefinitions/internalGeometry => fluidmechanics/geometrydefinitions/internalgeometry}/packings/Packing.java (97%) rename src/main/java/neqsim/{fluidMechanics/geometryDefinitions/internalGeometry => fluidmechanics/geometrydefinitions/internalgeometry}/packings/PackingInterface.java (92%) rename src/main/java/neqsim/{fluidMechanics/geometryDefinitions/internalGeometry => fluidmechanics/geometrydefinitions/internalgeometry}/packings/PallRingPacking.java (91%) rename src/main/java/neqsim/{fluidMechanics/geometryDefinitions/internalGeometry => fluidmechanics/geometrydefinitions/internalgeometry}/packings/RachigRingPacking.java (90%) rename src/main/java/neqsim/{fluidMechanics/geometryDefinitions/internalGeometry => fluidmechanics/geometrydefinitions/internalgeometry}/wall/MaterialLayer.java (98%) rename src/main/java/neqsim/{fluidMechanics/geometryDefinitions/internalGeometry => fluidmechanics/geometrydefinitions/internalgeometry}/wall/PipeWall.java (75%) rename src/main/java/neqsim/{fluidMechanics/geometryDefinitions/internalGeometry => fluidmechanics/geometrydefinitions/internalgeometry}/wall/Wall.java (95%) rename src/main/java/neqsim/{fluidMechanics/geometryDefinitions/internalGeometry => fluidmechanics/geometrydefinitions/internalgeometry}/wall/WallInterface.java (62%) rename src/main/java/neqsim/{fluidMechanics/geometryDefinitions => fluidmechanics/geometrydefinitions}/pipe/PipeData.java (84%) rename src/main/java/neqsim/{fluidMechanics/geometryDefinitions => fluidmechanics/geometrydefinitions}/reactor/ReactorData.java (72%) rename src/main/java/neqsim/{fluidMechanics/geometryDefinitions/stirredCell => fluidmechanics/geometrydefinitions/stirredcell}/StirredCell.java (88%) rename src/main/java/neqsim/{fluidMechanics/geometryDefinitions => fluidmechanics/geometrydefinitions}/surrounding/PipeSurroundingEnvironment.java (88%) rename src/main/java/neqsim/{fluidMechanics/geometryDefinitions => fluidmechanics/geometrydefinitions}/surrounding/SurroundingEnvironment.java (92%) rename src/main/java/neqsim/{fluidMechanics/geometryDefinitions => fluidmechanics/geometrydefinitions}/surrounding/SurroundingEnvironmentBaseClass.java (93%) rename src/main/java/neqsim/{fluidMechanics/util/fluidMechanicsVisualization/flowNodeVisualization => fluidmechanics/util/fluidmechanicsvisualization/flownodevisualization}/FlowNodeVisualization.java (96%) rename src/main/java/neqsim/{fluidMechanics/util/fluidMechanicsVisualization/flowNodeVisualization => fluidmechanics/util/fluidmechanicsvisualization/flownodevisualization}/FlowNodeVisualizationInterface.java (93%) rename src/main/java/neqsim/{fluidMechanics/util/fluidMechanicsVisualization/flowNodeVisualization/onePhaseFlowNodeVisualization => fluidmechanics/util/fluidmechanicsvisualization/flownodevisualization/onephaseflownodevisualization}/OnePhaseFlowNodeVisualization.java (63%) rename src/main/java/neqsim/{fluidMechanics/util/fluidMechanicsVisualization/flowNodeVisualization/onePhaseFlowNodeVisualization/onePhasePipeFlowNodeVisualization => fluidmechanics/util/fluidmechanicsvisualization/flownodevisualization/onephaseflownodevisualization/onephasepipeflownodevisualization}/OnePhasePipeFlowNodeVisualization.java (71%) rename src/main/java/neqsim/{fluidMechanics/util/fluidMechanicsVisualization/flowNodeVisualization/twoPhaseFlowNodeVisualization => fluidmechanics/util/fluidmechanicsvisualization/flownodevisualization/twophaseflownodevisualization}/TwoPhaseFlowNodeVisualization.java (90%) rename src/main/java/neqsim/{fluidMechanics/util/fluidMechanicsVisualization/flowSystemVisualization => fluidmechanics/util/fluidmechanicsvisualization/flowsystemvisualization}/FlowSystemVisualization.java (84%) rename src/main/java/neqsim/{fluidMechanics/util/fluidMechanicsVisualization/flowSystemVisualization => fluidmechanics/util/fluidmechanicsvisualization/flowsystemvisualization}/FlowSystemVisualizationInterface.java (71%) rename src/main/java/neqsim/{fluidMechanics/util/fluidMechanicsVisualization/flowSystemVisualization/onePhaseFlowVisualization => fluidmechanics/util/fluidmechanicsvisualization/flowsystemvisualization/onephaseflowvisualization}/OnePhaseFlowVisualization.java (72%) rename src/main/java/neqsim/{fluidMechanics/util/fluidMechanicsVisualization/flowSystemVisualization/onePhaseFlowVisualization/pipeFlowVisualization => fluidmechanics/util/fluidmechanicsvisualization/flowsystemvisualization/onephaseflowvisualization/pipeflowvisualization}/PipeFlowVisualization.java (89%) rename src/main/java/neqsim/{fluidMechanics/util/fluidMechanicsVisualization/flowSystemVisualization/twoPhaseFlowVisualization => fluidmechanics/util/fluidmechanicsvisualization/flowsystemvisualization/twophaseflowvisualization}/TwoPhaseFlowVisualization.java (69%) rename src/main/java/neqsim/{fluidMechanics/util/fluidMechanicsVisualization/flowSystemVisualization/twoPhaseFlowVisualization/twoPhasePipeFlowVisualization => fluidmechanics/util/fluidmechanicsvisualization/flowsystemvisualization/twophaseflowvisualization/twophasepipeflowvisualization}/TwoPhasePipeFlowVisualization.java (95%) rename src/main/java/neqsim/{fluidMechanics/util/timeSeries => fluidmechanics/util/timeseries}/TimeSeries.java (95%) rename src/main/java/neqsim/{MathLib/generalMath => mathlib/generalmath}/TDMAsolve.java (96%) rename src/main/java/neqsim/{MathLib/nonLinearSolver/newtonRhapson.java => mathlib/nonlinearsolver/NewtonRhapson.java} (96%) rename src/main/java/neqsim/{MathLib/nonLinearSolver => mathlib/nonlinearsolver}/NumericalDerivative.java (99%) rename src/main/java/neqsim/{MathLib/nonLinearSolver => mathlib/nonlinearsolver}/NumericalIntegration.java (88%) rename src/main/java/neqsim/{MathLib/nonLinearSolver/sysNewtonRhapson.java => mathlib/nonlinearsolver/SysNewtonRhapson.java} (98%) rename src/main/java/neqsim/{physicalProperties => physicalproperties}/PhysicalPropertyHandler.java (80%) rename src/main/java/neqsim/{physicalProperties/interfaceProperties => physicalproperties/interfaceproperties}/InterfaceProperties.java (93%) rename src/main/java/neqsim/{physicalProperties/interfaceProperties => physicalproperties/interfaceproperties}/InterphasePropertiesInterface.java (82%) rename src/main/java/neqsim/{physicalProperties/interfaceProperties/solidAdsorption => physicalproperties/interfaceproperties/solidadsorption}/AdsorptionInterface.java (92%) rename src/main/java/neqsim/{physicalProperties/interfaceProperties/solidAdsorption => physicalproperties/interfaceproperties/solidadsorption}/PotentialTheoryAdsorption.java (99%) rename src/main/java/neqsim/{physicalProperties/interfaceProperties/surfaceTension => physicalproperties/interfaceproperties/surfacetension}/FirozabadiRamleyInterfaceTension.java (97%) rename src/main/java/neqsim/{physicalProperties/interfaceProperties/surfaceTension => physicalproperties/interfaceproperties/surfacetension}/GTSurfaceTension.java (99%) rename src/main/java/neqsim/{physicalProperties/interfaceProperties/surfaceTension => physicalproperties/interfaceproperties/surfacetension}/GTSurfaceTensionFullGT.java (99%) rename src/main/java/neqsim/{physicalProperties/interfaceProperties/surfaceTension => physicalproperties/interfaceproperties/surfacetension}/GTSurfaceTensionODE.java (99%) rename src/main/java/neqsim/{physicalProperties/interfaceProperties/surfaceTension => physicalproperties/interfaceproperties/surfacetension}/GTSurfaceTensionSimple.java (99%) rename src/main/java/neqsim/{physicalProperties/interfaceProperties/surfaceTension => physicalproperties/interfaceproperties/surfacetension}/GTSurfaceTensionUtils.java (97%) rename src/main/java/neqsim/{physicalProperties/interfaceProperties/surfaceTension => physicalproperties/interfaceproperties/surfacetension}/LGTSurfaceTension.java (99%) rename src/main/java/neqsim/{physicalProperties/interfaceProperties/surfaceTension => physicalproperties/interfaceproperties/surfacetension}/ParachorSurfaceTension.java (97%) rename src/main/java/neqsim/{physicalProperties/interfaceProperties/surfaceTension => physicalproperties/interfaceproperties/surfacetension}/SurfaceTension.java (92%) rename src/main/java/neqsim/{physicalProperties/interfaceProperties/surfaceTension => physicalproperties/interfaceproperties/surfacetension}/SurfaceTensionInterface.java (88%) rename src/main/java/neqsim/{physicalProperties/mixingRule => physicalproperties/mixingrule}/PhysicalPropertyMixingRule.java (96%) rename src/main/java/neqsim/{physicalProperties/mixingRule => physicalproperties/mixingrule}/PhysicalPropertyMixingRuleInterface.java (90%) rename src/main/java/neqsim/{physicalProperties/physicalPropertyMethods => physicalproperties/physicalpropertymethods}/PhysicalPropertyMethod.java (90%) rename src/main/java/neqsim/{physicalProperties/physicalPropertyMethods => physicalproperties/physicalpropertymethods}/PhysicalPropertyMethodInterface.java (77%) rename src/main/java/neqsim/{physicalProperties/physicalPropertyMethods/commonPhasePhysicalProperties => physicalproperties/physicalpropertymethods/commonphasephysicalproperties}/CommonPhysicalPropertyMethod.java (60%) rename src/main/java/neqsim/{physicalProperties/physicalPropertyMethods/commonPhasePhysicalProperties => physicalproperties/physicalpropertymethods/commonphasephysicalproperties}/conductivity/Conductivity.java (68%) rename src/main/java/neqsim/{physicalProperties/physicalPropertyMethods/commonPhasePhysicalProperties => physicalproperties/physicalpropertymethods/commonphasephysicalproperties}/conductivity/PFCTConductivityMethodMod86.java (98%) rename src/main/java/neqsim/{physicalProperties/physicalPropertyMethods/commonPhasePhysicalProperties => physicalproperties/physicalpropertymethods/commonphasephysicalproperties}/diffusivity/CorrespondingStatesDiffusivity.java (88%) rename src/main/java/neqsim/{physicalProperties/physicalPropertyMethods/commonPhasePhysicalProperties => physicalproperties/physicalpropertymethods/commonphasephysicalproperties}/diffusivity/Diffusivity.java (90%) rename src/main/java/neqsim/{physicalProperties/physicalPropertyMethods/commonPhasePhysicalProperties => physicalproperties/physicalpropertymethods/commonphasephysicalproperties}/viscosity/FrictionTheoryViscosityMethod.java (97%) rename src/main/java/neqsim/{physicalProperties/physicalPropertyMethods/commonPhasePhysicalProperties => physicalproperties/physicalpropertymethods/commonphasephysicalproperties}/viscosity/LBCViscosityMethod.java (93%) rename src/main/java/neqsim/{physicalProperties/physicalPropertyMethods/commonPhasePhysicalProperties => physicalproperties/physicalpropertymethods/commonphasephysicalproperties}/viscosity/PFCTViscosityMethod.java (96%) rename src/main/java/neqsim/{physicalProperties/physicalPropertyMethods/commonPhasePhysicalProperties => physicalproperties/physicalpropertymethods/commonphasephysicalproperties}/viscosity/PFCTViscosityMethodHeavyOil.java (97%) rename src/main/java/neqsim/{physicalProperties/physicalPropertyMethods/commonPhasePhysicalProperties => physicalproperties/physicalpropertymethods/commonphasephysicalproperties}/viscosity/PFCTViscosityMethodMod86.java (97%) rename src/main/java/neqsim/{physicalProperties/physicalPropertyMethods/commonPhasePhysicalProperties => physicalproperties/physicalpropertymethods/commonphasephysicalproperties}/viscosity/Viscosity.java (92%) rename src/main/java/neqsim/{physicalProperties/physicalPropertyMethods/gasPhysicalProperties => physicalproperties/physicalpropertymethods/gasphysicalproperties}/GasPhysicalPropertyMethod.java (84%) rename src/main/java/neqsim/{physicalProperties/physicalPropertyMethods/gasPhysicalProperties => physicalproperties/physicalpropertymethods/gasphysicalproperties}/conductivity/ChungConductivityMethod.java (93%) rename src/main/java/neqsim/{physicalProperties/physicalPropertyMethods/gasPhysicalProperties => physicalproperties/physicalpropertymethods/gasphysicalproperties}/conductivity/Conductivity.java (71%) rename src/main/java/neqsim/{physicalProperties/physicalPropertyMethods/gasPhysicalProperties => physicalproperties/physicalpropertymethods/gasphysicalproperties}/density/Density.java (79%) rename src/main/java/neqsim/{physicalProperties/physicalPropertyMethods/gasPhysicalProperties => physicalproperties/physicalpropertymethods/gasphysicalproperties}/diffusivity/Diffusivity.java (92%) rename src/main/java/neqsim/{physicalProperties/physicalPropertyMethods/gasPhysicalProperties => physicalproperties/physicalpropertymethods/gasphysicalproperties}/diffusivity/WilkeLeeDiffusivity.java (89%) rename src/main/java/neqsim/{physicalProperties/physicalPropertyMethods/gasPhysicalProperties => physicalproperties/physicalpropertymethods/gasphysicalproperties}/viscosity/ChungViscosityMethod.java (96%) rename src/main/java/neqsim/{physicalProperties/physicalPropertyMethods/gasPhysicalProperties => physicalproperties/physicalpropertymethods/gasphysicalproperties}/viscosity/Viscosity.java (68%) rename src/main/java/neqsim/{physicalProperties/physicalPropertyMethods/liquidPhysicalProperties => physicalproperties/physicalpropertymethods/liquidphysicalproperties}/LiquidPhysicalPropertyMethod.java (66%) rename src/main/java/neqsim/{physicalProperties/physicalPropertyMethods/liquidPhysicalProperties => physicalproperties/physicalpropertymethods/liquidphysicalproperties}/conductivity/Conductivity.java (88%) rename src/main/java/neqsim/{physicalProperties/physicalPropertyMethods/liquidPhysicalProperties => physicalproperties/physicalpropertymethods/liquidphysicalproperties}/density/Costald.java (92%) rename src/main/java/neqsim/{physicalProperties/physicalPropertyMethods/liquidPhysicalProperties => physicalproperties/physicalpropertymethods/liquidphysicalproperties}/density/Density.java (79%) rename src/main/java/neqsim/{physicalProperties/physicalPropertyMethods/liquidPhysicalProperties => physicalproperties/physicalpropertymethods/liquidphysicalproperties}/density/temp (100%) rename src/main/java/neqsim/{physicalProperties/physicalPropertyMethods/liquidPhysicalProperties => physicalproperties/physicalpropertymethods/liquidphysicalproperties}/diffusivity/AmineDiffusivity.java (94%) rename src/main/java/neqsim/{physicalProperties/physicalPropertyMethods/liquidPhysicalProperties => physicalproperties/physicalpropertymethods/liquidphysicalproperties}/diffusivity/CO2water.java (77%) rename src/main/java/neqsim/{physicalProperties/physicalPropertyMethods/liquidPhysicalProperties => physicalproperties/physicalpropertymethods/liquidphysicalproperties}/diffusivity/Diffusivity.java (91%) rename src/main/java/neqsim/{physicalProperties/physicalPropertyMethods/liquidPhysicalProperties => physicalproperties/physicalpropertymethods/liquidphysicalproperties}/diffusivity/SiddiqiLucasMethod.java (90%) rename src/main/java/neqsim/{physicalProperties/physicalPropertyMethods/liquidPhysicalProperties => physicalproperties/physicalpropertymethods/liquidphysicalproperties}/viscosity/AmineViscosity.java (85%) rename src/main/java/neqsim/{physicalProperties/physicalPropertyMethods/liquidPhysicalProperties => physicalproperties/physicalpropertymethods/liquidphysicalproperties}/viscosity/Viscosity.java (94%) rename src/main/java/neqsim/{physicalProperties/physicalPropertyMethods/methodInterface => physicalproperties/physicalpropertymethods/methodinterface}/ConductivityInterface.java (76%) rename src/main/java/neqsim/{physicalProperties/physicalPropertyMethods/methodInterface => physicalproperties/physicalpropertymethods/methodinterface}/DensityInterface.java (75%) rename src/main/java/neqsim/{physicalProperties/physicalPropertyMethods/methodInterface => physicalproperties/physicalpropertymethods/methodinterface}/DiffusivityInterface.java (92%) rename src/main/java/neqsim/{physicalProperties/physicalPropertyMethods/methodInterface => physicalproperties/physicalpropertymethods/methodinterface}/ViscosityInterface.java (78%) rename src/main/java/neqsim/{physicalProperties/physicalPropertyMethods/solidPhysicalProperties => physicalproperties/physicalpropertymethods/solidphysicalproperties}/SolidPhysicalPropertyMethod.java (66%) rename src/main/java/neqsim/{physicalProperties/physicalPropertyMethods/solidPhysicalProperties => physicalproperties/physicalpropertymethods/solidphysicalproperties}/conductivity/Conductivity.java (76%) rename src/main/java/neqsim/{physicalProperties/physicalPropertyMethods/solidPhysicalProperties => physicalproperties/physicalpropertymethods/solidphysicalproperties}/density/Density.java (79%) rename src/main/java/neqsim/{physicalProperties/physicalPropertyMethods/solidPhysicalProperties => physicalproperties/physicalpropertymethods/solidphysicalproperties}/diffusivity/Diffusivity.java (87%) rename src/main/java/neqsim/{physicalProperties/physicalPropertyMethods/solidPhysicalProperties => physicalproperties/physicalpropertymethods/solidphysicalproperties}/viscosity/Viscosity.java (79%) rename src/main/java/neqsim/{physicalProperties/physicalPropertySystem => physicalproperties/physicalpropertysystem}/PhysicalProperties.java (80%) rename src/main/java/neqsim/{physicalProperties/physicalPropertySystem => physicalproperties/physicalpropertysystem}/PhysicalPropertiesInterface.java (84%) rename src/main/java/neqsim/{physicalProperties/physicalPropertySystem/commonPhasePhysicalProperties => physicalproperties/physicalpropertysystem/commonphasephysicalproperties}/DefaultPhysicalProperties.java (64%) rename src/main/java/neqsim/{physicalProperties/physicalPropertySystem/gasPhysicalProperties => physicalproperties/physicalpropertysystem/gasphysicalproperties}/AirPhysicalProperties.java (67%) rename src/main/java/neqsim/{physicalProperties/physicalPropertySystem/gasPhysicalProperties => physicalproperties/physicalpropertysystem/gasphysicalproperties}/GasPhysicalProperties.java (75%) rename src/main/java/neqsim/{physicalProperties/physicalPropertySystem/gasPhysicalProperties => physicalproperties/physicalpropertysystem/gasphysicalproperties}/NaturalGasPhysicalProperties.java (69%) rename src/main/java/neqsim/{physicalProperties/physicalPropertySystem/liquidPhysicalProperties => physicalproperties/physicalpropertysystem/liquidphysicalproperties}/AminePhysicalProperties.java (66%) rename src/main/java/neqsim/{physicalProperties/physicalPropertySystem/liquidPhysicalProperties => physicalproperties/physicalpropertysystem/liquidphysicalproperties}/CO2waterPhysicalProperties.java (71%) rename src/main/java/neqsim/{physicalProperties/physicalPropertySystem/liquidPhysicalProperties => physicalproperties/physicalpropertysystem/liquidphysicalproperties}/GlycolPhysicalProperties.java (66%) rename src/main/java/neqsim/{physicalProperties/physicalPropertySystem/liquidPhysicalProperties => physicalproperties/physicalpropertysystem/liquidphysicalproperties}/LiquidPhysicalProperties.java (74%) rename src/main/java/neqsim/{physicalProperties/physicalPropertySystem/liquidPhysicalProperties => physicalproperties/physicalpropertysystem/liquidphysicalproperties}/WaterPhysicalProperties.java (66%) rename src/main/java/neqsim/{physicalProperties/physicalPropertySystem/solidPhysicalProperties => physicalproperties/physicalpropertysystem/solidphysicalproperties}/SolidPhysicalProperties.java (54%) rename src/main/java/neqsim/{physicalProperties/util/parameterFitting/pureComponentParameterFitting/pureCompInterfaceTension => physicalproperties/util/parameterFitting/pureComponentParameterFitting/purecompinterfacetension}/ParachorFunction.java (86%) rename src/main/java/neqsim/{physicalProperties/util/parameterFitting/pureComponentParameterFitting/pureCompInterfaceTension => physicalproperties/util/parameterFitting/pureComponentParameterFitting/purecompinterfacetension}/TestParachorFit.java (90%) rename src/main/java/neqsim/{physicalProperties/util/parameterFitting/pureComponentParameterFitting/pureCompViscosity => physicalproperties/util/parameterFitting/pureComponentParameterFitting/purecompviscosity}/chungMethod/ChungFunction.java (82%) rename src/main/java/neqsim/{physicalProperties/util/parameterFitting/pureComponentParameterFitting/pureCompViscosity => physicalproperties/util/parameterFitting/pureComponentParameterFitting/purecompviscosity}/chungMethod/TestChungFit.java (88%) rename src/main/java/neqsim/{physicalProperties/util/parameterFitting/pureComponentParameterFitting/pureCompViscosity => physicalproperties/util/parameterFitting/pureComponentParameterFitting/purecompviscosity}/linearLiquidModel/TestViscosityFit.java (91%) rename src/main/java/neqsim/{physicalProperties/util/parameterFitting/pureComponentParameterFitting/pureCompViscosity => physicalproperties/util/parameterFitting/pureComponentParameterFitting/purecompviscosity}/linearLiquidModel/ViscosityFunction.java (82%) rename src/main/java/neqsim/{processSimulation => processsimulation}/SimulationBaseClass.java (98%) rename src/main/java/neqsim/{processSimulation => processsimulation}/SimulationInterface.java (99%) rename src/main/java/neqsim/{processSimulation/conditionMonitor => processsimulation/conditionmonitor}/ConditionMonitor.java (76%) rename src/main/java/neqsim/{processSimulation/conditionMonitor => processsimulation/conditionmonitor}/ConditionMonitorSpecifications.java (90%) rename src/main/java/neqsim/{processSimulation/controllerDevice => processsimulation/controllerdevice}/ControllerDeviceBaseClass.java (97%) rename src/main/java/neqsim/{processSimulation/controllerDevice => processsimulation/controllerdevice}/ControllerDeviceInterface.java (92%) rename src/main/java/neqsim/{processSimulation/costEstimation => processsimulation/costestimation}/CostEstimateBaseClass.java (86%) rename src/main/java/neqsim/{processSimulation/costEstimation => processsimulation/costestimation}/UnitCostEstimateBaseClass.java (87%) rename src/main/java/neqsim/{processSimulation/costEstimation => processsimulation/costestimation}/compressor/CompressorCostEstimate.java (77%) rename src/main/java/neqsim/{processSimulation/costEstimation => processsimulation/costestimation}/separator/SeparatorCostEstimate.java (76%) rename src/main/java/neqsim/{processSimulation/costEstimation => processsimulation/costestimation}/valve/ValveCostEstimate.java (76%) rename src/main/java/neqsim/{processSimulation/measurementDevice => processsimulation/measurementdevice}/CombustionEmissionsCalculator.java (93%) rename src/main/java/neqsim/{processSimulation/measurementDevice => processsimulation/measurementdevice}/CompressorMonitor.java (78%) rename src/main/java/neqsim/{processSimulation/measurementDevice => processsimulation/measurementdevice}/CricondenbarAnalyser.java (85%) rename src/main/java/neqsim/{processSimulation/measurementDevice => processsimulation/measurementdevice}/FlowInducedVibrationAnalyser.java (95%) rename src/main/java/neqsim/{processSimulation/measurementDevice => processsimulation/measurementdevice}/HydrateEquilibriumTemperatureAnalyser.java (90%) rename src/main/java/neqsim/{processSimulation/measurementDevice => processsimulation/measurementdevice}/LevelTransmitter.java (83%) rename src/main/java/neqsim/{processSimulation/measurementDevice => processsimulation/measurementdevice}/MeasurementDeviceBaseClass.java (97%) rename src/main/java/neqsim/{processSimulation/measurementDevice => processsimulation/measurementdevice}/MeasurementDeviceInterface.java (93%) rename src/main/java/neqsim/{processSimulation/measurementDevice => processsimulation/measurementdevice}/MolarMassAnalyser.java (83%) rename src/main/java/neqsim/{processSimulation/measurementDevice => processsimulation/measurementdevice}/MultiPhaseMeter.java (96%) rename src/main/java/neqsim/{processSimulation/measurementDevice => processsimulation/measurementdevice}/NMVOCAnalyser.java (87%) rename src/main/java/neqsim/{processSimulation/measurementDevice => processsimulation/measurementdevice}/PressureTransmitter.java (80%) rename src/main/java/neqsim/{processSimulation/measurementDevice => processsimulation/measurementdevice}/StreamMeasurementDeviceBaseClass.java (89%) rename src/main/java/neqsim/{processSimulation/measurementDevice => processsimulation/measurementdevice}/TemperatureTransmitter.java (81%) rename src/main/java/neqsim/{processSimulation/measurementDevice => processsimulation/measurementdevice}/VolumeFlowTransmitter.java (92%) rename src/main/java/neqsim/{processSimulation/measurementDevice => processsimulation/measurementdevice}/WaterContentAnalyser.java (86%) rename src/main/java/neqsim/{processSimulation/measurementDevice => processsimulation/measurementdevice}/WaterDewPointAnalyser.java (92%) rename src/main/java/neqsim/{processSimulation/measurementDevice => processsimulation/measurementdevice}/WellAllocator.java (87%) rename src/main/java/neqsim/{processSimulation/measurementDevice => processsimulation/measurementdevice}/online/OnlineSignal.java (97%) rename src/main/java/neqsim/{processSimulation/measurementDevice => processsimulation/measurementdevice}/pHProbe.java (92%) rename src/main/java/neqsim/{processSimulation/measurementDevice/simpleFlowRegime => processsimulation/measurementdevice/simpleflowregime}/FluidSevereSlug.java (96%) rename src/main/java/neqsim/{processSimulation/measurementDevice/simpleFlowRegime => processsimulation/measurementdevice/simpleflowregime}/Pipe.java (98%) rename src/main/java/neqsim/{processSimulation/measurementDevice/simpleFlowRegime => processsimulation/measurementdevice/simpleflowregime}/SevereSlugAnalyser.java (89%) rename src/main/java/neqsim/{processSimulation/mechanicalDesign => processsimulation/mechanicaldesign}/MechanicalDesign.java (97%) rename src/main/java/neqsim/{processSimulation/mechanicalDesign => processsimulation/mechanicaldesign}/SystemMechanicalDesign.java (93%) rename src/main/java/neqsim/{processSimulation/mechanicalDesign => processsimulation/mechanicaldesign}/absorber/AbsorberMechanicalDesign.java (91%) rename src/main/java/neqsim/{processSimulation/mechanicalDesign => processsimulation/mechanicaldesign}/adsorber/AdsorberMechanicalDesign.java (91%) rename src/main/java/neqsim/{processSimulation/mechanicalDesign => processsimulation/mechanicaldesign}/compressor/CompressorMechanicalDesign.java (93%) rename src/main/java/neqsim/{processSimulation/mechanicalDesign/designStandards => processsimulation/mechanicaldesign/designstandards}/AbsorptionColumnDesignStandard.java (89%) rename src/main/java/neqsim/{processSimulation/mechanicalDesign/designStandards => processsimulation/mechanicaldesign/designstandards}/AdsorptionDehydrationDesignStandard.java (91%) rename src/main/java/neqsim/{processSimulation/mechanicalDesign/designStandards => processsimulation/mechanicaldesign/designstandards}/CompressorDesignStandard.java (89%) rename src/main/java/neqsim/{processSimulation/mechanicalDesign/designStandards => processsimulation/mechanicaldesign/designstandards}/DesignStandard.java (90%) rename src/main/java/neqsim/{processSimulation/mechanicalDesign/designStandards => processsimulation/mechanicaldesign/designstandards}/GasScrubberDesignStandard.java (92%) rename src/main/java/neqsim/{processSimulation/mechanicalDesign/designStandards => processsimulation/mechanicaldesign/designstandards}/JointEfficiencyPipelineStandard.java (84%) rename src/main/java/neqsim/{processSimulation/mechanicalDesign/designStandards => processsimulation/mechanicaldesign/designstandards}/JointEfficiencyPlateStandard.java (85%) rename src/main/java/neqsim/{processSimulation/mechanicalDesign/designStandards => processsimulation/mechanicaldesign/designstandards}/MaterialPipeDesignStandard.java (94%) rename src/main/java/neqsim/{processSimulation/mechanicalDesign/designStandards => processsimulation/mechanicaldesign/designstandards}/MaterialPlateDesignStandard.java (93%) rename src/main/java/neqsim/{processSimulation/mechanicalDesign/designStandards => processsimulation/mechanicaldesign/designstandards}/PipelineDesignStandard.java (89%) rename src/main/java/neqsim/{processSimulation/mechanicalDesign/designStandards => processsimulation/mechanicaldesign/designstandards}/PipingDesignStandard.java (66%) rename src/main/java/neqsim/{processSimulation/mechanicalDesign/designStandards => processsimulation/mechanicaldesign/designstandards}/PressureVesselDesignStandard.java (89%) rename src/main/java/neqsim/{processSimulation/mechanicalDesign/designStandards => processsimulation/mechanicaldesign/designstandards}/SeparatorDesignStandard.java (91%) rename src/main/java/neqsim/{processSimulation/mechanicalDesign/designStandards => processsimulation/mechanicaldesign/designstandards}/ValveDesignStandard.java (74%) rename src/main/java/neqsim/{processSimulation/mechanicalDesign => processsimulation/mechanicaldesign}/pipeline/PipelineMechanicalDesign.java (87%) rename src/main/java/neqsim/{processSimulation/mechanicalDesign => processsimulation/mechanicaldesign}/separator/GasScrubberMechanicalDesign.java (91%) rename src/main/java/neqsim/{processSimulation/mechanicalDesign => processsimulation/mechanicaldesign}/separator/SeparatorMechanicalDesign.java (93%) rename src/main/java/neqsim/{processSimulation/mechanicalDesign => processsimulation/mechanicaldesign}/separator/sectionType/DistillationTraySection.java (90%) rename src/main/java/neqsim/{processSimulation/mechanicalDesign => processsimulation/mechanicaldesign}/separator/sectionType/MecMeshSection.java (90%) rename src/main/java/neqsim/{processSimulation/mechanicalDesign => processsimulation/mechanicaldesign}/separator/sectionType/MechManwaySection.java (84%) rename src/main/java/neqsim/{processSimulation/mechanicalDesign => processsimulation/mechanicaldesign}/separator/sectionType/MechNozzleSection.java (89%) rename src/main/java/neqsim/{processSimulation/mechanicalDesign => processsimulation/mechanicaldesign}/separator/sectionType/MechVaneSection.java (90%) rename src/main/java/neqsim/{processSimulation/mechanicalDesign => processsimulation/mechanicaldesign}/separator/sectionType/SepDesignSection.java (92%) rename src/main/java/neqsim/{processSimulation/mechanicalDesign => processsimulation/mechanicaldesign}/valve/ValveMechanicalDesign.java (87%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/ProcessEquipmentBaseClass.java (91%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/ProcessEquipmentInterface.java (89%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/TwoPortEquipment.java (95%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/TwoPortInterface.java (93%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/absorber/AbsorberInterface.java (72%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/absorber/SimpleAbsorber.java (93%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/absorber/SimpleTEGAbsorber.java (96%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/absorber/WaterStripperColumn.java (96%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/adsorber/SimpleAdsorber.java (94%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/compressor/AntiSurge.java (97%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/compressor/Compressor.java (98%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/compressor/CompressorChart.java (96%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/compressor/CompressorChartAlternativeMapLookup.java (98%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/compressor/CompressorChartGenerator.java (92%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/compressor/CompressorChartInterface.java (91%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/compressor/CompressorCurve.java (96%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/compressor/CompressorInterface.java (86%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/compressor/CompressorPropertyProfile.java (96%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/compressor/StoneWallCurve.java (98%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/compressor/SurgeCurve.java (98%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/distillation/Condenser.java (91%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/distillation/DistillationColumn.java (95%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/distillation/DistillationInterface.java (71%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/distillation/Reboiler.java (92%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/distillation/SimpleTray.java (92%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/distillation/TrayInterface.java (64%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/distillation/VLSolidTray.java (93%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/expander/Expander.java (90%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/expander/ExpanderInterface.java (61%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/expander/ExpanderOld.java (95%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/filter/CharCoalFilter.java (77%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/filter/Filter.java (86%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/heatExchanger/Cooler.java (83%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/heatExchanger/HeatExchanger.java (97%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/heatExchanger/HeatExchangerInterface.java (61%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/heatExchanger/Heater.java (95%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/heatExchanger/HeaterInterface.java (87%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/heatExchanger/NeqHeater.java (92%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/heatExchanger/ReBoiler.java (86%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/manifold/Manifold.java (80%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/mixer/Mixer.java (98%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/mixer/MixerInterface.java (74%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/mixer/StaticMixer.java (97%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/mixer/StaticNeqMixer.java (97%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/mixer/StaticPhaseMixer.java (98%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/pipeline/AdiabaticPipe.java (95%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/pipeline/AdiabaticTwoPhasePipe.java (98%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/pipeline/Fittings.java (97%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/pipeline/IncompressiblePipeFlow.java (93%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/pipeline/OnePhasePipeLine.java (83%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/pipeline/PipeBeggsAndBrills.java (99%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/pipeline/PipeLineInterface.java (85%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/pipeline/Pipeline.java (94%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/pipeline/SimpleTPoutPipeline.java (90%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/pipeline/TwoPhasePipeLine.java (78%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/powerGeneration/GasTurbine.java (90%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/pump/Pump.java (96%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/pump/PumpChart.java (94%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/pump/PumpChartInterface.java (98%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/pump/PumpCurve.java (94%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/pump/PumpInterface.java (68%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/reservoir/ReservoirCVDsim.java (85%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/reservoir/ReservoirDiffLibsim.java (85%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/reservoir/ReservoirTPsim.java (90%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/reservoir/SimpleReservoir.java (95%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/reservoir/Well.java (90%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/reservoir/WellFlow.java (94%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/separator/GasScrubber.java (75%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/separator/GasScrubberSimple.java (89%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/separator/Hydrocyclone.java (88%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/separator/NeqGasScrubber.java (88%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/separator/Separator.java (94%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/separator/SeparatorInterface.java (86%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/separator/ThreePhaseSeparator.java (93%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/separator/TwoPhaseSeparator.java (89%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/separator/sectionType/ManwaySection.java (74%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/separator/sectionType/MeshSection.java (77%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/separator/sectionType/NozzleSection.java (74%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/separator/sectionType/PackedSection.java (79%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/separator/sectionType/SeparatorSection.java (93%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/separator/sectionType/ValveSection.java (78%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/separator/sectionType/VaneSection.java (77%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/splitter/ComponentSplitter.java (84%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/splitter/Splitter.java (93%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/splitter/SplitterInterface.java (62%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/stream/EnergyStream.java (96%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/stream/EquilibriumStream.java (94%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/stream/IronIonSaturationStream.java (96%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/stream/NeqStream.java (97%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/stream/ScalePotentialCheckStream.java (96%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/stream/Stream.java (97%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/stream/StreamInterface.java (95%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/stream/VirtualStream.java (91%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/subsea/SimpleFlowLine.java (86%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/subsea/SubseaWell.java (90%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/tank/Tank.java (93%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/util/Adjuster.java (94%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/util/Calculator.java (86%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/util/FlowRateAdjuster.java (90%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/util/FlowSetter.java (93%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/util/GORfitter.java (95%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/util/MPFMfitter.java (95%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/util/MoleFractionControllerUtil.java (90%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/util/NeqSimUnit.java (92%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/util/PressureDrop.java (85%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/util/Recycle.java (96%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/util/RecycleController.java (94%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/util/SetPoint.java (87%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/util/StreamSaturatorUtil.java (90%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/util/StreamTransition.java (83%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/valve/SafetyValve.java (87%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/valve/ThrottlingValve.java (98%) rename src/main/java/neqsim/{processSimulation/processEquipment => processsimulation/processequipment}/valve/ValveInterface.java (89%) rename src/main/java/neqsim/{processSimulation/processSystem => processsimulation/processsystem}/ModuleInterface.java (82%) rename src/main/java/neqsim/{processSimulation/processSystem => processsimulation/processsystem}/ProcessModule.java (95%) rename src/main/java/neqsim/{processSimulation/processSystem => processsimulation/processsystem}/ProcessModuleBaseClass.java (90%) rename src/main/java/neqsim/{processSimulation/processSystem => processsimulation/processsystem}/ProcessSystem.java (94%) rename src/main/java/neqsim/{processSimulation/processSystem/processModules => processsimulation/processsystem/processmodules}/AdsorptionDehydrationlModule.java (92%) rename src/main/java/neqsim/{processSimulation/processSystem/processModules => processsimulation/processsystem/processmodules}/CO2RemovalModule.java (91%) rename src/main/java/neqsim/{processSimulation/processSystem/processModules => processsimulation/processsystem/processmodules}/DPCUModule.java (90%) rename src/main/java/neqsim/{processSimulation/processSystem/processModules => processsimulation/processsystem/processmodules}/GlycolDehydrationlModule.java (95%) rename src/main/java/neqsim/{processSimulation/processSystem/processModules => processsimulation/processsystem/processmodules}/MEGReclaimerModule.java (90%) rename src/main/java/neqsim/{processSimulation/processSystem/processModules => processsimulation/processsystem/processmodules}/MixerGasProcessingModule.java (91%) rename src/main/java/neqsim/{processSimulation/processSystem/processModules => processsimulation/processsystem/processmodules}/PropaneCoolingModule.java (92%) rename src/main/java/neqsim/{processSimulation/processSystem/processModules => processsimulation/processsystem/processmodules}/SeparationTrainModule.java (93%) rename src/main/java/neqsim/{processSimulation/processSystem/processModules => processsimulation/processsystem/processmodules}/SeparationTrainModuleSimple.java (93%) rename src/main/java/neqsim/{processSimulation/processSystem/processModules => processsimulation/processsystem/processmodules}/WellFluidModule.java (91%) rename src/main/java/neqsim/{processSimulation => processsimulation}/util/monitor/CompressorResponse.java (92%) rename src/main/java/neqsim/{processSimulation => processsimulation}/util/monitor/FluidComponentResponse.java (98%) rename src/main/java/neqsim/{processSimulation => processsimulation}/util/monitor/FluidResponse.java (99%) rename src/main/java/neqsim/{processSimulation => processsimulation}/util/monitor/HXResponse.java (88%) rename src/main/java/neqsim/{processSimulation => processsimulation}/util/monitor/HeaterResponse.java (73%) rename src/main/java/neqsim/{processSimulation => processsimulation}/util/monitor/MPMResponse.java (77%) rename src/main/java/neqsim/{processSimulation => processsimulation}/util/monitor/PumpResponse.java (92%) rename src/main/java/neqsim/{processSimulation => processsimulation}/util/monitor/SeparatorResponse.java (83%) rename src/main/java/neqsim/{processSimulation => processsimulation}/util/monitor/StreamResponse.java (97%) rename src/main/java/neqsim/{processSimulation => processsimulation}/util/monitor/ThreePhaseSeparatorResponse.java (75%) rename src/main/java/neqsim/{processSimulation => processsimulation}/util/monitor/Value.java (89%) rename src/main/java/neqsim/{processSimulation => processsimulation}/util/monitor/ValveResponse.java (84%) rename src/main/java/neqsim/{processSimulation => processsimulation}/util/monitor/WellAllocatorResponse.java (75%) rename src/main/java/neqsim/{processSimulation => processsimulation}/util/report/Report.java (79%) rename src/main/java/neqsim/{PVTsimulation/modelTuning => pvtsimulation/modeltuning}/BaseTuningClass.java (91%) rename src/main/java/neqsim/{PVTsimulation/modelTuning => pvtsimulation/modeltuning}/TuneToSaturation.java (95%) rename src/main/java/neqsim/{PVTsimulation/modelTuning => pvtsimulation/modeltuning}/TuningInterface.java (75%) rename src/main/java/neqsim/{PVTsimulation/reservoirProperties => pvtsimulation/reservoirproperties}/CompositionEstimation.java (95%) rename src/main/java/neqsim/{PVTsimulation => pvtsimulation}/simulation/BasePVTsimulation.java (95%) rename src/main/java/neqsim/{PVTsimulation => pvtsimulation}/simulation/ConstantMassExpansion.java (97%) rename src/main/java/neqsim/{PVTsimulation => pvtsimulation}/simulation/ConstantVolumeDepletion.java (97%) rename src/main/java/neqsim/{PVTsimulation => pvtsimulation}/simulation/DensitySim.java (94%) rename src/main/java/neqsim/{PVTsimulation => pvtsimulation}/simulation/DifferentialLiberation.java (99%) rename src/main/java/neqsim/{PVTsimulation => pvtsimulation}/simulation/GOR.java (99%) rename src/main/java/neqsim/{PVTsimulation => pvtsimulation}/simulation/SaturationPressure.java (99%) rename src/main/java/neqsim/{PVTsimulation => pvtsimulation}/simulation/SaturationTemperature.java (98%) rename src/main/java/neqsim/{PVTsimulation => pvtsimulation}/simulation/SeparatorTest.java (99%) rename src/main/java/neqsim/{PVTsimulation => pvtsimulation}/simulation/SimulationInterface.java (85%) rename src/main/java/neqsim/{PVTsimulation => pvtsimulation}/simulation/SlimTubeSim.java (99%) rename src/main/java/neqsim/{PVTsimulation => pvtsimulation}/simulation/SwellingTest.java (99%) rename src/main/java/neqsim/{PVTsimulation => pvtsimulation}/simulation/ViscositySim.java (94%) rename src/main/java/neqsim/{PVTsimulation => pvtsimulation}/simulation/ViscosityWaxOilSim.java (95%) rename src/main/java/neqsim/{PVTsimulation => pvtsimulation}/simulation/WaxFractionSim.java (96%) rename src/main/java/neqsim/{PVTsimulation => pvtsimulation}/util/parameterfitting/CMEFunction.java (96%) rename src/main/java/neqsim/{PVTsimulation => pvtsimulation}/util/parameterfitting/CVDFunction.java (96%) rename src/main/java/neqsim/{PVTsimulation => pvtsimulation}/util/parameterfitting/DensityFunction.java (86%) rename src/main/java/neqsim/{PVTsimulation => pvtsimulation}/util/parameterfitting/FunctionJohanSverderup.java (84%) rename src/main/java/neqsim/{PVTsimulation => pvtsimulation}/util/parameterfitting/SaturationPressureFunction.java (90%) rename src/main/java/neqsim/{PVTsimulation => pvtsimulation}/util/parameterfitting/TestFitToOilFieldFluid.java (92%) rename src/main/java/neqsim/{PVTsimulation => pvtsimulation}/util/parameterfitting/TestSaturationPresFunction.java (92%) rename src/main/java/neqsim/{PVTsimulation => pvtsimulation}/util/parameterfitting/TestWaxTuning.java (90%) rename src/main/java/neqsim/{PVTsimulation => pvtsimulation}/util/parameterfitting/ViscosityFunction.java (85%) rename src/main/java/neqsim/{PVTsimulation => pvtsimulation}/util/parameterfitting/WaxFunction.java (91%) rename src/main/java/neqsim/standards/{gasQuality => gasquality}/BestPracticeHydrocarbonDewPoint.java (97%) rename src/main/java/neqsim/standards/{gasQuality => gasquality}/Draft_GERG2004.java (98%) rename src/main/java/neqsim/standards/{gasQuality => gasquality}/Draft_ISO18453.java (96%) rename src/main/java/neqsim/standards/{gasQuality => gasquality}/GasChromotograpyhBase.java (97%) rename src/main/java/neqsim/standards/{gasQuality => gasquality}/Standard_ISO15403.java (98%) rename src/main/java/neqsim/standards/{gasQuality => gasquality}/Standard_ISO6578.java (99%) rename src/main/java/neqsim/standards/{gasQuality => gasquality}/Standard_ISO6974.java (93%) rename src/main/java/neqsim/standards/{gasQuality => gasquality}/Standard_ISO6976.java (99%) rename src/main/java/neqsim/standards/{gasQuality => gasquality}/Standard_ISO6976_2016.java (99%) rename src/main/java/neqsim/standards/{gasQuality => gasquality}/SulfurSpecificationMethod.java (98%) rename src/main/java/neqsim/standards/{gasQuality => gasquality}/UKspecifications_ICF_SI.java (99%) rename src/main/java/neqsim/standards/{oilQuality => oilquality}/Standard_ASTM_D6377.java (98%) rename src/main/java/neqsim/standards/{salesContract => salescontract}/BaseContract.java (95%) rename src/main/java/neqsim/standards/{salesContract => salescontract}/ContractInterface.java (98%) rename src/main/java/neqsim/standards/{salesContract => salescontract}/ContractSpecification.java (99%) rename src/main/java/neqsim/statistics/{experimentalEquipmentData => experimentalequipmentdata}/ExperimentalEquipmentData.java (90%) rename src/main/java/neqsim/statistics/{experimentalEquipmentData/wettedWallColumnData => experimentalequipmentdata/wettedwallcolumndata}/WettedWallColumnData.java (91%) rename src/main/java/neqsim/statistics/{experimentalSampleCreation/readDataFromFile => experimentalsamplecreation/readdatafromfile}/DataObject.java (77%) rename src/main/java/neqsim/statistics/{experimentalSampleCreation/readDataFromFile => experimentalsamplecreation/readdatafromfile}/DataObjectInterface.java (75%) rename src/main/java/neqsim/statistics/{experimentalSampleCreation/readDataFromFile => experimentalsamplecreation/readdatafromfile}/DataReader.java (92%) rename src/main/java/neqsim/statistics/{experimentalSampleCreation/readDataFromFile => experimentalsamplecreation/readdatafromfile}/DataReaderInterface.java (80%) rename src/main/java/neqsim/statistics/{experimentalSampleCreation/readDataFromFile/wettedWallColumnReader => experimentalsamplecreation/readdatafromfile/wettedwallcolumnreader}/WettedWallColumnDataObject.java (96%) rename src/main/java/neqsim/statistics/{experimentalSampleCreation/readDataFromFile/wettedWallColumnReader => experimentalsamplecreation/readdatafromfile/wettedwallcolumnreader}/WettedWallDataReader.java (95%) rename src/main/java/neqsim/statistics/{experimentalSampleCreation/sampleCreator => experimentalsamplecreation/samplecreator}/SampleCreator.java (79%) rename src/main/java/neqsim/statistics/{experimentalSampleCreation/sampleCreator/wettedWallColumnSampleCreator => experimentalsamplecreation/samplecreator/wettedwallcolumnsamplecreator}/WettedWallColumnSampleCreator.java (93%) delete mode 100644 src/main/java/neqsim/statistics/filesystem.attributes delete mode 100644 src/main/java/neqsim/statistics/monteCarloSimulation/filesystem.attributes rename src/main/java/neqsim/statistics/{monteCarloSimulation => montecarlosimulation}/MonteCarloSimulation.java (87%) rename src/main/java/neqsim/statistics/{parameterFitting => parameterfitting}/BaseFunction.java (95%) rename src/main/java/neqsim/statistics/{parameterFitting => parameterfitting}/FunctionInterface.java (95%) rename src/main/java/neqsim/statistics/{parameterFitting => parameterfitting}/NumericalDerivative.java (97%) rename src/main/java/neqsim/statistics/{parameterFitting => parameterfitting}/SampleSet.java (90%) rename src/main/java/neqsim/statistics/{parameterFitting => parameterfitting}/SampleValue.java (95%) rename src/main/java/neqsim/statistics/{parameterFitting => parameterfitting}/StatisticsBaseClass.java (96%) rename src/main/java/neqsim/statistics/{parameterFitting => parameterfitting}/StatisticsInterface.java (89%) rename src/main/java/neqsim/statistics/{parameterFitting/nonLinearParameterFitting => parameterfitting/nonlinearparameterfitting}/LevenbergMarquardt.java (97%) rename src/main/java/neqsim/statistics/{parameterFitting/nonLinearParameterFitting => parameterfitting/nonlinearparameterfitting}/LevenbergMarquardtAbsDev.java (97%) rename src/main/java/neqsim/statistics/{parameterFitting/nonLinearParameterFitting => parameterfitting/nonlinearparameterfitting}/LevenbergMarquardtBiasDev.java (97%) rename src/main/java/neqsim/statistics/{parameterFitting/nonLinearParameterFitting => parameterfitting/nonlinearparameterfitting}/LevenbergMarquardtFunction.java (92%) rename src/main/java/neqsim/thermo/{atomElement => atomelement}/Element.java (98%) rename src/main/java/neqsim/thermo/{atomElement => atomelement}/UNIFACgroup.java (99%) rename src/main/java/neqsim/thermo/component/{attractiveEosTerm => attractiveeosterm}/AtractiveTermMatCopPRUMRNew.java (99%) rename src/main/java/neqsim/thermo/component/{attractiveEosTerm => attractiveeosterm}/AttractiveTermBaseClass.java (98%) rename src/main/java/neqsim/thermo/component/{attractiveEosTerm => attractiveeosterm}/AttractiveTermCPAstatoil.java (98%) rename src/main/java/neqsim/thermo/component/{attractiveEosTerm => attractiveeosterm}/AttractiveTermGERG.java (99%) rename src/main/java/neqsim/thermo/component/{attractiveEosTerm => attractiveeosterm}/AttractiveTermInterface.java (93%) rename src/main/java/neqsim/thermo/component/{attractiveEosTerm => attractiveeosterm}/AttractiveTermMatCop.java (98%) rename src/main/java/neqsim/thermo/component/{attractiveEosTerm => attractiveeosterm}/AttractiveTermMatCopPR.java (99%) rename src/main/java/neqsim/thermo/component/{attractiveEosTerm => attractiveeosterm}/AttractiveTermMatCopPRUMR.java (99%) rename src/main/java/neqsim/thermo/component/{attractiveEosTerm => attractiveeosterm}/AttractiveTermMollerup.java (98%) rename src/main/java/neqsim/thermo/component/{attractiveEosTerm => attractiveeosterm}/AttractiveTermPr.java (94%) rename src/main/java/neqsim/thermo/component/{attractiveEosTerm => attractiveeosterm}/AttractiveTermPr1978.java (92%) rename src/main/java/neqsim/thermo/component/{attractiveEosTerm => attractiveeosterm}/AttractiveTermPrDanesh.java (98%) rename src/main/java/neqsim/thermo/component/{attractiveEosTerm => attractiveeosterm}/AttractiveTermPrDelft1998.java (98%) rename src/main/java/neqsim/thermo/component/{attractiveEosTerm => attractiveeosterm}/AttractiveTermPrGassem2001.java (98%) rename src/main/java/neqsim/thermo/component/{attractiveEosTerm => attractiveeosterm}/AttractiveTermRk.java (97%) rename src/main/java/neqsim/thermo/component/{attractiveEosTerm => attractiveeosterm}/AttractiveTermSchwartzentruber.java (99%) rename src/main/java/neqsim/thermo/component/{attractiveEosTerm => attractiveeosterm}/AttractiveTermSrk.java (94%) rename src/main/java/neqsim/thermo/component/{attractiveEosTerm => attractiveeosterm}/AttractiveTermTwu.java (97%) rename src/main/java/neqsim/thermo/component/{attractiveEosTerm => attractiveeosterm}/AttractiveTermTwuCoon.java (99%) rename src/main/java/neqsim/thermo/component/{attractiveEosTerm => attractiveeosterm}/AttractiveTermTwuCoonParam.java (99%) rename src/main/java/neqsim/thermo/component/{attractiveEosTerm => attractiveeosterm}/AttractiveTermTwuCoonStatoil.java (99%) rename src/main/java/neqsim/thermo/component/{attractiveEosTerm => attractiveeosterm}/AttractiveTermUMRPRU.java (96%) delete mode 100644 src/main/java/neqsim/thermo/component/filesystem.attributes rename src/main/java/neqsim/thermo/component/{repulsiveEosTerm => repulsiveeosterm}/RepulsiveTermInterface.java (74%) delete mode 100644 src/main/java/neqsim/thermo/mixingRule/filesystem.attributes rename src/main/java/neqsim/thermo/{mixingRule => mixingrule}/CPAMixing.java (99%) rename src/main/java/neqsim/thermo/{mixingRule => mixingrule}/CPAMixingInterface.java (99%) rename src/main/java/neqsim/thermo/{mixingRule => mixingrule}/ElectrolyteMixingRulesInterface.java (99%) rename src/main/java/neqsim/thermo/{mixingRule => mixingrule}/EosMixingRules.java (99%) rename src/main/java/neqsim/thermo/{mixingRule => mixingrule}/EosMixingRulesInterface.java (99%) rename src/main/java/neqsim/thermo/{mixingRule => mixingrule}/HVmixingRuleInterface.java (98%) delete mode 100644 src/main/java/neqsim/thermo/phase/filesystem.attributes rename src/main/java/neqsim/thermo/util/{GERG => gerg}/DETAIL.java (99%) rename src/main/java/neqsim/thermo/util/{GERG => gerg}/GERG2008.java (99%) rename src/main/java/neqsim/thermo/util/{GERG => gerg}/NeqSimAGA8Detail.java (99%) rename src/main/java/neqsim/thermo/util/{GERG => gerg}/NeqSimGERG2008.java (99%) rename src/main/java/neqsim/thermo/util/{JNI => jni}/GERG2004EOS.h (100%) rename src/main/java/neqsim/thermo/util/{JNI => jni}/GERG2004EOS.java (99%) rename src/main/java/neqsim/thermo/util/{JNI => jni}/neqsim_thermo_util_JNI_GERG2004EOS.h (100%) rename src/main/java/neqsim/thermo/util/{referenceEquations => referenceequations}/methaneBWR32.java (98%) delete mode 100644 src/main/java/neqsim/thermodynamicOperations/filesystem.attributes delete mode 100644 src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/filesystem.attributes rename src/main/java/neqsim/{thermodynamicOperations => thermodynamicoperations}/BaseOperation.java (96%) rename src/main/java/neqsim/{thermodynamicOperations => thermodynamicoperations}/OperationInterface.java (97%) rename src/main/java/neqsim/{thermodynamicOperations => thermodynamicoperations}/ThermodynamicOperations.java (91%) rename src/main/java/neqsim/{thermodynamicOperations/chemicalEquilibrium => thermodynamicoperations/chemicalequilibrium}/ChemicalEquilibrium.java (95%) rename src/main/java/neqsim/{thermodynamicOperations/flashOps => thermodynamicoperations/flashops}/CalcIonicComposition.java (98%) rename src/main/java/neqsim/{thermodynamicOperations/flashOps => thermodynamicoperations/flashops}/CriticalPointFlash.java (99%) rename src/main/java/neqsim/{thermodynamicOperations/flashOps => thermodynamicoperations/flashops}/Flash.java (99%) rename src/main/java/neqsim/{thermodynamicOperations/flashOps => thermodynamicoperations/flashops}/PHflash.java (97%) rename src/main/java/neqsim/{thermodynamicOperations/flashOps => thermodynamicoperations/flashops}/PHflashGERG2008.java (99%) rename src/main/java/neqsim/{thermodynamicOperations/flashOps => thermodynamicoperations/flashops}/PHflashSingleComp.java (93%) rename src/main/java/neqsim/{thermodynamicOperations/flashOps => thermodynamicoperations/flashops}/PHsolidFlash.java (97%) rename src/main/java/neqsim/{thermodynamicOperations/flashOps => thermodynamicoperations/flashops}/PSFlash.java (95%) rename src/main/java/neqsim/{thermodynamicOperations/flashOps => thermodynamicoperations/flashops}/PSFlashGERG2008.java (98%) rename src/main/java/neqsim/{thermodynamicOperations/flashOps => thermodynamicoperations/flashops}/PSflashSingleComp.java (91%) rename src/main/java/neqsim/{thermodynamicOperations/flashOps => thermodynamicoperations/flashops}/PUflash.java (98%) rename src/main/java/neqsim/{thermodynamicOperations/flashOps => thermodynamicoperations/flashops}/PVrefluxflash.java (97%) rename src/main/java/neqsim/{thermodynamicOperations/flashOps => thermodynamicoperations/flashops}/QfuncFlash.java (95%) rename src/main/java/neqsim/{thermodynamicOperations/flashOps => thermodynamicoperations/flashops}/RachfordRice.java (99%) rename src/main/java/neqsim/{thermodynamicOperations/flashOps => thermodynamicoperations/flashops}/SaturateWithWater.java (97%) rename src/main/java/neqsim/{thermodynamicOperations/flashOps => thermodynamicoperations/flashops}/SolidFlash.java (99%) rename src/main/java/neqsim/{thermodynamicOperations/flashOps => thermodynamicoperations/flashops}/SolidFlash1.java (99%) rename src/main/java/neqsim/{thermodynamicOperations/flashOps => thermodynamicoperations/flashops}/SolidFlash12.java (99%) rename src/main/java/neqsim/{thermodynamicOperations/flashOps/sysNewtonRhapsonPHflash.java => thermodynamicoperations/flashops/SysNewtonRhapsonPHflash.java} (94%) rename src/main/java/neqsim/{thermodynamicOperations/flashOps/sysNewtonRhapsonTPflash.java => thermodynamicoperations/flashops/SysNewtonRhapsonTPflash.java} (95%) rename src/main/java/neqsim/{thermodynamicOperations/flashOps/sysNewtonRhapsonTPflashNew.java => thermodynamicoperations/flashops/SysNewtonRhapsonTPflashNew.java} (94%) rename src/main/java/neqsim/{thermodynamicOperations/flashOps => thermodynamicoperations/flashops}/TPflash.java (99%) rename src/main/java/neqsim/{thermodynamicOperations/flashOps => thermodynamicoperations/flashops}/TPgradientFlash.java (99%) rename src/main/java/neqsim/{thermodynamicOperations/flashOps => thermodynamicoperations/flashops}/TPmultiflash.java (99%) rename src/main/java/neqsim/{thermodynamicOperations/flashOps => thermodynamicoperations/flashops}/TPmultiflashWAX.java (99%) rename src/main/java/neqsim/{thermodynamicOperations/flashOps => thermodynamicoperations/flashops}/TPmultiflash_1.java (99%) rename src/main/java/neqsim/{thermodynamicOperations/flashOps => thermodynamicoperations/flashops}/TSFlash.java (96%) rename src/main/java/neqsim/{thermodynamicOperations/flashOps => thermodynamicoperations/flashops}/TVflash.java (98%) rename src/main/java/neqsim/{thermodynamicOperations/flashOps => thermodynamicoperations/flashops}/TVfractionFlash.java (98%) rename src/main/java/neqsim/{thermodynamicOperations/flashOps => thermodynamicoperations/flashops}/VHflash.java (98%) rename src/main/java/neqsim/{thermodynamicOperations/flashOps => thermodynamicoperations/flashops}/VHflashQfunc.java (97%) rename src/main/java/neqsim/{thermodynamicOperations/flashOps => thermodynamicoperations/flashops}/VSflash.java (97%) rename src/main/java/neqsim/{thermodynamicOperations/flashOps => thermodynamicoperations/flashops}/VUflash.java (98%) rename src/main/java/neqsim/{thermodynamicOperations/flashOps => thermodynamicoperations/flashops}/VUflashQfunc.java (97%) rename src/main/java/neqsim/{thermodynamicOperations/flashOps => thermodynamicoperations/flashops}/dTPflash.java (98%) rename src/main/java/neqsim/{thermodynamicOperations/flashOps/saturationOps/addIonToScaleSaturation.java => thermodynamicoperations/flashops/saturationops/AddIonToScaleSaturation.java} (95%) rename src/main/java/neqsim/{thermodynamicOperations/flashOps/saturationOps/bubblePointPressureFlash.java => thermodynamicoperations/flashops/saturationops/BubblePointPressureFlash.java} (96%) rename src/main/java/neqsim/{thermodynamicOperations/flashOps/saturationOps/bubblePointPressureFlashDer.java => thermodynamicoperations/flashops/saturationops/BubblePointPressureFlashDer.java} (96%) rename src/main/java/neqsim/{thermodynamicOperations/flashOps/saturationOps/bubblePointTemperatureFlash.java => thermodynamicoperations/flashops/saturationops/BubblePointTemperatureFlash.java} (89%) rename src/main/java/neqsim/{thermodynamicOperations/flashOps/saturationOps/bubblePointTemperatureNoDer.java => thermodynamicoperations/flashops/saturationops/BubblePointTemperatureNoDer.java} (95%) rename src/main/java/neqsim/{thermodynamicOperations/flashOps/saturationOps/calcSaltSatauration.java => thermodynamicoperations/flashops/saturationops/CalcSaltSatauration.java} (94%) rename src/main/java/neqsim/{thermodynamicOperations/flashOps/saturationOps/checkScalePotential.java => thermodynamicoperations/flashops/saturationops/CheckScalePotential.java} (97%) rename src/main/java/neqsim/{thermodynamicOperations/flashOps/saturationOps/constantDutyFlash.java => thermodynamicoperations/flashops/saturationops/ConstantDutyFlash.java} (93%) rename src/main/java/neqsim/{thermodynamicOperations/flashOps/saturationOps => thermodynamicoperations/flashops/saturationops}/ConstantDutyFlashInterface.java (71%) rename src/main/java/neqsim/{thermodynamicOperations/flashOps/saturationOps/constantDutyPressureFlash.java => thermodynamicoperations/flashops/saturationops/ConstantDutyPressureFlash.java} (93%) rename src/main/java/neqsim/{thermodynamicOperations/flashOps/saturationOps/constantDutyTemperatureFlash.java => thermodynamicoperations/flashops/saturationops/ConstantDutyTemperatureFlash.java} (92%) rename src/main/java/neqsim/{thermodynamicOperations/flashOps/saturationOps/cricondebarFlash.java => thermodynamicoperations/flashops/saturationops/CricondebarFlash.java} (96%) rename src/main/java/neqsim/{thermodynamicOperations/flashOps/saturationOps/cricondenBarTemp.java => thermodynamicoperations/flashops/saturationops/CricondenBarTemp.java} (95%) rename src/main/java/neqsim/{thermodynamicOperations/flashOps/saturationOps/cricondenBarTemp1.java => thermodynamicoperations/flashops/saturationops/CricondenBarTemp1.java} (96%) rename src/main/java/neqsim/{thermodynamicOperations/flashOps/saturationOps/dewPointPressureFlash.java => thermodynamicoperations/flashops/saturationops/DewPointPressureFlash.java} (95%) rename src/main/java/neqsim/{thermodynamicOperations/flashOps/saturationOps/dewPointTemperatureFlash.java => thermodynamicoperations/flashops/saturationops/DewPointTemperatureFlash.java} (96%) rename src/main/java/neqsim/{thermodynamicOperations/flashOps/saturationOps/dewPointTemperatureFlashDer.java => thermodynamicoperations/flashops/saturationops/DewPointTemperatureFlashDer.java} (96%) rename src/main/java/neqsim/{thermodynamicOperations/flashOps/saturationOps => thermodynamicoperations/flashops/saturationops}/FreezeOut.java (97%) rename src/main/java/neqsim/{thermodynamicOperations/flashOps/saturationOps/freezingPointTemperatureFlash.java => thermodynamicoperations/flashops/saturationops/FreezingPointTemperatureFlash.java} (94%) rename src/main/java/neqsim/{thermodynamicOperations/flashOps/saturationOps/freezingPointTemperatureFlashOld.java => thermodynamicoperations/flashops/saturationops/FreezingPointTemperatureFlashOld.java} (92%) rename src/main/java/neqsim/{thermodynamicOperations/flashOps/saturationOps/freezingPointTemperatureFlashTR.java => thermodynamicoperations/flashops/saturationops/FreezingPointTemperatureFlashTR.java} (95%) rename src/main/java/neqsim/{thermodynamicOperations/flashOps/saturationOps => thermodynamicoperations/flashops/saturationops}/FugTestConstP.java (94%) rename src/main/java/neqsim/{thermodynamicOperations/flashOps/saturationOps => thermodynamicoperations/flashops/saturationops}/HCdewPointPressureFlash.java (97%) rename src/main/java/neqsim/{thermodynamicOperations/flashOps/saturationOps => thermodynamicoperations/flashops/saturationops}/HydrateEquilibriumLine.java (89%) rename src/main/java/neqsim/{thermodynamicOperations/flashOps/saturationOps => thermodynamicoperations/flashops/saturationops}/HydrateFormationPressureFlash.java (92%) rename src/main/java/neqsim/{thermodynamicOperations/flashOps/saturationOps => thermodynamicoperations/flashops/saturationops}/HydrateFormationTemperatureFlash.java (96%) rename src/main/java/neqsim/{thermodynamicOperations/flashOps/saturationOps => thermodynamicoperations/flashops/saturationops}/HydrateInhibitorConcentrationFlash.java (95%) rename src/main/java/neqsim/{thermodynamicOperations/flashOps/saturationOps => thermodynamicoperations/flashops/saturationops}/HydrateInhibitorwtFlash.java (95%) rename src/main/java/neqsim/{thermodynamicOperations/flashOps/saturationOps => thermodynamicoperations/flashops/saturationops}/SolidComplexTemperatureCalc.java (97%) rename src/main/java/neqsim/{thermodynamicOperations/flashOps/saturationOps => thermodynamicoperations/flashops/saturationops}/WATcalc.java (92%) rename src/main/java/neqsim/{thermodynamicOperations/flashOps/saturationOps => thermodynamicoperations/flashops/saturationops}/WaterDewPointEquilibriumLine.java (89%) rename src/main/java/neqsim/{thermodynamicOperations/flashOps/saturationOps/waterDewPointTemperatureFlash.java => thermodynamicoperations/flashops/saturationops/WaterDewPointTemperatureFlash.java} (93%) rename src/main/java/neqsim/{thermodynamicOperations/flashOps/saturationOps/waterDewPointTemperatureMultiphaseFlash.java => thermodynamicoperations/flashops/saturationops/WaterDewPointTemperatureMultiphaseFlash.java} (84%) rename src/main/java/neqsim/{thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps => thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops}/CricondenBarFlash.java (98%) rename src/main/java/neqsim/{thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps => thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops}/CricondenThermFlash.java (98%) rename src/main/java/neqsim/{thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps => thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops}/HPTphaseEnvelope.java (93%) rename src/main/java/neqsim/{thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/pTphaseEnvelope.java => thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/PTphaseEnvelope.java} (96%) rename src/main/java/neqsim/{thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/pTphaseEnvelope1.java => thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/PTphaseEnvelope1.java} (94%) rename src/main/java/neqsim/{thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/pTphaseEnvelopeMay.java => thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/PTphaseEnvelopeMay.java} (96%) rename src/main/java/neqsim/{thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/pTphaseEnvelopeNew.java => thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/PTphaseEnvelopeNew.java} (93%) rename src/main/java/neqsim/{thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/pTphaseEnvelopeNew2.java => thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/PTphaseEnvelopeNew2.java} (97%) rename src/main/java/neqsim/{thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/sysNewtonRhapsonPhaseEnvelope.java => thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/SysNewtonRhapsonPhaseEnvelope.java} (97%) rename src/main/java/neqsim/{thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/sysNewtonRhapsonPhaseEnvelope2.java => thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/SysNewtonRhapsonPhaseEnvelope2.java} (97%) rename src/main/java/neqsim/{thermodynamicOperations/phaseEnvelopeOps/reactiveCurves/pLoadingCurve.java => thermodynamicoperations/phaseenvelopeops/reactivecurves/PloadingCurve.java} (89%) rename src/main/java/neqsim/{thermodynamicOperations/phaseEnvelopeOps/reactiveCurves/pLoadingCurve2.java => thermodynamicoperations/phaseenvelopeops/reactivecurves/PloadingCurve2.java} (90%) rename src/main/java/neqsim/{thermodynamicOperations/propertyGenerator => thermodynamicoperations/propertygenerator}/OLGApropertyTableGenerator.java (98%) rename src/main/java/neqsim/{thermodynamicOperations/propertyGenerator => thermodynamicoperations/propertygenerator}/OLGApropertyTableGeneratorKeywordFormat.java (99%) rename src/main/java/neqsim/{thermodynamicOperations/propertyGenerator => thermodynamicoperations/propertygenerator}/OLGApropertyTableGeneratorWater.java (99%) rename src/main/java/neqsim/{thermodynamicOperations/propertyGenerator => thermodynamicoperations/propertygenerator}/OLGApropertyTableGeneratorWaterEven.java (99%) rename src/main/java/neqsim/{thermodynamicOperations/propertyGenerator => thermodynamicoperations/propertygenerator}/OLGApropertyTableGeneratorWaterKeywordFormat.java (99%) rename src/main/java/neqsim/{thermodynamicOperations/propertyGenerator => thermodynamicoperations/propertygenerator}/OLGApropertyTableGeneratorWaterStudents.java (99%) rename src/main/java/neqsim/{thermodynamicOperations/propertyGenerator => thermodynamicoperations/propertygenerator}/OLGApropertyTableGeneratorWaterStudentsPH.java (99%) delete mode 100644 src/main/java/neqsim/util/python/Copy of init.py diff --git a/src/main/java/neqsim/MathLib/generalMath/filesystem.attributes b/src/main/java/neqsim/MathLib/generalMath/filesystem.attributes deleted file mode 100644 index 372373de5aacf2c5e13cef9ee4c7923bf0d9e655..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 239 zcmYk$p-uxq5P;#ym4+)JBsB;Wf>a=uXK2%0s5mfnHJ$BE*}V+xW@oOsJ_!$iYQjT6 zuowh}cfcUf94KDk`~SyJ=u3i&kZw$fbmuEFYtJNGQMwf~r8PFJW7XtsqaT>GvA_TE{Bpc}>p@n)0SBxKTxm!%7^q7mE^yUGg`@ej z982I0nO{R8@2Zip3ndu+pZe2%Fjuz3Bo3LWy0$f~l;2-Z9`2vMGRS7I=emIfIX;e*pT)Q}6%) diff --git a/src/main/java/neqsim/MathLib/nonLinearSolver/filesystem.attributes b/src/main/java/neqsim/MathLib/nonLinearSolver/filesystem.attributes deleted file mode 100644 index 62222ff35f96ee2df00e9d524d37379683e6966f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 290 zcmaLRAx;B96vpwFEgKesDG3M^f*=sX8ED9cik5`nYIxIqWoGl(8D`$X)^H6DfNH`a zAXp3n!yPaPGy@nE{>%UO-M>Q~1MItSuAHaFR-|T@DbAzNMO240!zZ67Ct37hw1Aw;#khHP#~x(I7Kb$GWDe@ayx|-R;9i2H6mn iO!_f_!s&W2PZfb|GUz-2^nGI2n}5wqxPkn4>$@)wA!S(r diff --git a/src/main/java/neqsim/chemicalReactions/ChemicalReactionOperations.java b/src/main/java/neqsim/chemicalreactions/ChemicalReactionOperations.java similarity index 96% rename from src/main/java/neqsim/chemicalReactions/ChemicalReactionOperations.java rename to src/main/java/neqsim/chemicalreactions/ChemicalReactionOperations.java index ce4e5bf703..27e85b0b4b 100644 --- a/src/main/java/neqsim/chemicalReactions/ChemicalReactionOperations.java +++ b/src/main/java/neqsim/chemicalreactions/ChemicalReactionOperations.java @@ -4,20 +4,22 @@ * Created on 4. februar 2001, 20:06 */ -package neqsim.chemicalReactions; +package neqsim.chemicalreactions; + +import neqsim.chemicalreactions.chemicalequilibrium.ChemicalEquilibrium; +import neqsim.chemicalreactions.chemicalequilibrium.LinearProgrammingChemicalEquilibrium; +import neqsim.chemicalreactions.chemicalreaction.ChemicalReactionList; +import neqsim.chemicalreactions.kinetics.Kinetics; +import neqsim.thermo.component.ComponentInterface; +import neqsim.thermo.phase.PhaseInterface; +import neqsim.thermo.system.SystemInterface; import java.util.HashSet; import java.util.Iterator; + +import Jama.Matrix; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import Jama.Matrix; -import neqsim.chemicalReactions.chemicalEquilibriaum.ChemicalEquilibrium; -import neqsim.chemicalReactions.chemicalEquilibriaum.LinearProgrammingChemicalEquilibrium; -import neqsim.chemicalReactions.chemicalReaction.ChemicalReactionList; -import neqsim.chemicalReactions.kinetics.Kinetics; -import neqsim.thermo.component.ComponentInterface; -import neqsim.thermo.phase.PhaseInterface; -import neqsim.thermo.system.SystemInterface; /** *

@@ -465,7 +467,7 @@ public double solveKinetics(int phase, PhaseInterface interPhase, int component) * getKinetics. *

* - * @return a {@link neqsim.chemicalReactions.kinetics.Kinetics} object + * @return a {@link neqsim.chemicalreactions.kinetics.Kinetics} object */ public Kinetics getKinetics() { return kineticsSolver; @@ -476,7 +478,7 @@ public Kinetics getKinetics() { * Getter for the field reactionList. *

* - * @return a {@link neqsim.chemicalReactions.chemicalReaction.ChemicalReactionList} object + * @return a {@link neqsim.chemicalreactions.chemicalreaction.ChemicalReactionList} object */ public ChemicalReactionList getReactionList() { return reactionList; diff --git a/src/main/java/neqsim/chemicalReactions/chemicalEquilibriaum/ChemEq.java b/src/main/java/neqsim/chemicalreactions/chemicalequilibrium/ChemEq.java similarity index 99% rename from src/main/java/neqsim/chemicalReactions/chemicalEquilibriaum/ChemEq.java rename to src/main/java/neqsim/chemicalreactions/chemicalequilibrium/ChemEq.java index b2acd76b87..7a2474d224 100644 --- a/src/main/java/neqsim/chemicalReactions/chemicalEquilibriaum/ChemEq.java +++ b/src/main/java/neqsim/chemicalreactions/chemicalequilibrium/ChemEq.java @@ -1,4 +1,4 @@ -package neqsim.chemicalReactions.chemicalEquilibriaum; +package neqsim.chemicalreactions.chemicalequilibrium; import Jama.Matrix; import neqsim.thermo.ThermodynamicConstantsInterface; diff --git a/src/main/java/neqsim/chemicalReactions/chemicalEquilibriaum/ChemicalEquilibrium.java b/src/main/java/neqsim/chemicalreactions/chemicalequilibrium/ChemicalEquilibrium.java similarity index 99% rename from src/main/java/neqsim/chemicalReactions/chemicalEquilibriaum/ChemicalEquilibrium.java rename to src/main/java/neqsim/chemicalreactions/chemicalequilibrium/ChemicalEquilibrium.java index f9f212c962..3f562ebbf1 100644 --- a/src/main/java/neqsim/chemicalReactions/chemicalEquilibriaum/ChemicalEquilibrium.java +++ b/src/main/java/neqsim/chemicalreactions/chemicalequilibrium/ChemicalEquilibrium.java @@ -1,4 +1,4 @@ -package neqsim.chemicalReactions.chemicalEquilibriaum; +package neqsim.chemicalreactions.chemicalequilibrium; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/neqsim/chemicalReactions/chemicalEquilibriaum/LinearProgrammingChemicalEquilibrium.java b/src/main/java/neqsim/chemicalreactions/chemicalequilibrium/LinearProgrammingChemicalEquilibrium.java similarity index 98% rename from src/main/java/neqsim/chemicalReactions/chemicalEquilibriaum/LinearProgrammingChemicalEquilibrium.java rename to src/main/java/neqsim/chemicalreactions/chemicalequilibrium/LinearProgrammingChemicalEquilibrium.java index e9270e1a93..df60e5f47f 100644 --- a/src/main/java/neqsim/chemicalReactions/chemicalEquilibriaum/LinearProgrammingChemicalEquilibrium.java +++ b/src/main/java/neqsim/chemicalreactions/chemicalequilibrium/LinearProgrammingChemicalEquilibrium.java @@ -4,7 +4,7 @@ * Created on 11. april 2001, 10:04 */ -package neqsim.chemicalReactions.chemicalEquilibriaum; +package neqsim.chemicalreactions.chemicalequilibrium; import java.util.ArrayList; import java.util.Arrays; @@ -22,7 +22,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import Jama.Matrix; -import neqsim.chemicalReactions.ChemicalReactionOperations; +import neqsim.chemicalreactions.ChemicalReactionOperations; import neqsim.thermo.component.ComponentInterface; import neqsim.thermo.system.SystemInterface; @@ -59,7 +59,7 @@ public class LinearProgrammingChemicalEquilibrium * @param chemRefPot an array of type double * @param components an array of {@link neqsim.thermo.component.ComponentInterface} objects * @param elements an array of {@link java.lang.String} objects - * @param operations a {@link neqsim.chemicalReactions.ChemicalReactionOperations} object + * @param operations a {@link neqsim.chemicalreactions.ChemicalReactionOperations} object * @param phase a int */ public LinearProgrammingChemicalEquilibrium(double[] chemRefPot, ComponentInterface[] components, diff --git a/src/main/java/neqsim/chemicalReactions/chemicalEquilibriaum/ReferencePotComparator.java b/src/main/java/neqsim/chemicalreactions/chemicalequilibrium/ReferencePotComparator.java similarity index 92% rename from src/main/java/neqsim/chemicalReactions/chemicalEquilibriaum/ReferencePotComparator.java rename to src/main/java/neqsim/chemicalreactions/chemicalequilibrium/ReferencePotComparator.java index 8fad021378..112d73dba5 100644 --- a/src/main/java/neqsim/chemicalReactions/chemicalEquilibriaum/ReferencePotComparator.java +++ b/src/main/java/neqsim/chemicalreactions/chemicalequilibrium/ReferencePotComparator.java @@ -4,7 +4,7 @@ * Created on 11. april 2001, 20:21 */ -package neqsim.chemicalReactions.chemicalEquilibriaum; +package neqsim.chemicalreactions.chemicalequilibrium; import java.util.Comparator; import neqsim.thermo.component.ComponentInterface; diff --git a/src/main/java/neqsim/chemicalReactions/chemicalReaction/ChemicalReaction.java b/src/main/java/neqsim/chemicalreactions/chemicalreaction/ChemicalReaction.java similarity index 99% rename from src/main/java/neqsim/chemicalReactions/chemicalReaction/ChemicalReaction.java rename to src/main/java/neqsim/chemicalreactions/chemicalreaction/ChemicalReaction.java index 7b4616a892..7994fbba68 100644 --- a/src/main/java/neqsim/chemicalReactions/chemicalReaction/ChemicalReaction.java +++ b/src/main/java/neqsim/chemicalreactions/chemicalreaction/ChemicalReaction.java @@ -4,7 +4,7 @@ * Created on 4. februar 2001, 15:32 */ -package neqsim.chemicalReactions.chemicalReaction; +package neqsim.chemicalreactions.chemicalreaction; import Jama.Matrix; import neqsim.thermo.component.ComponentInterface; diff --git a/src/main/java/neqsim/chemicalReactions/chemicalReaction/ChemicalReactionFactory.java b/src/main/java/neqsim/chemicalreactions/chemicalreaction/ChemicalReactionFactory.java similarity index 97% rename from src/main/java/neqsim/chemicalReactions/chemicalReaction/ChemicalReactionFactory.java rename to src/main/java/neqsim/chemicalreactions/chemicalreaction/ChemicalReactionFactory.java index 3cd8401ff9..c716881ab0 100644 --- a/src/main/java/neqsim/chemicalReactions/chemicalReaction/ChemicalReactionFactory.java +++ b/src/main/java/neqsim/chemicalreactions/chemicalreaction/ChemicalReactionFactory.java @@ -4,7 +4,7 @@ * Created on 20. september 2004, 22:40 */ -package neqsim.chemicalReactions.chemicalReaction; +package neqsim.chemicalreactions.chemicalreaction; import java.util.ArrayList; import org.apache.logging.log4j.LogManager; @@ -32,7 +32,7 @@ private ChemicalReactionFactory() {} *

* * @param name a {@link java.lang.String} object - * @return a {@link neqsim.chemicalReactions.chemicalReaction.ChemicalReaction} object + * @return a {@link neqsim.chemicalreactions.chemicalreaction.ChemicalReaction} object */ public static ChemicalReaction getChemicalReaction(String name) { ArrayList names = new ArrayList(); diff --git a/src/main/java/neqsim/chemicalReactions/chemicalReaction/ChemicalReactionList.java b/src/main/java/neqsim/chemicalreactions/chemicalreaction/ChemicalReactionList.java similarity index 98% rename from src/main/java/neqsim/chemicalReactions/chemicalReaction/ChemicalReactionList.java rename to src/main/java/neqsim/chemicalreactions/chemicalreaction/ChemicalReactionList.java index 136df62f9e..049e782be4 100644 --- a/src/main/java/neqsim/chemicalReactions/chemicalReaction/ChemicalReactionList.java +++ b/src/main/java/neqsim/chemicalreactions/chemicalreaction/ChemicalReactionList.java @@ -4,7 +4,7 @@ * Created on 4. februar 2001, 15:32 */ -package neqsim.chemicalReactions.chemicalReaction; +package neqsim.chemicalreactions.chemicalreaction; import java.util.ArrayList; import java.util.Arrays; @@ -122,7 +122,7 @@ public void readReactions(SystemInterface system) { *

* * @param i a int - * @return a {@link neqsim.chemicalReactions.chemicalReaction.ChemicalReaction} object + * @return a {@link neqsim.chemicalreactions.chemicalreaction.ChemicalReaction} object */ public ChemicalReaction getReaction(int i) { return chemicalReactionList.get(i); @@ -134,7 +134,7 @@ public ChemicalReaction getReaction(int i) { *

* * @param name a {@link java.lang.String} object - * @return a {@link neqsim.chemicalReactions.chemicalReaction.ChemicalReaction} object + * @return a {@link neqsim.chemicalreactions.chemicalreaction.ChemicalReaction} object */ public ChemicalReaction getReaction(String name) { for (int i = 0; i < chemicalReactionList.size(); i++) { diff --git a/src/main/java/neqsim/chemicalReactions/kinetics/Kinetics.java b/src/main/java/neqsim/chemicalreactions/kinetics/Kinetics.java similarity index 95% rename from src/main/java/neqsim/chemicalReactions/kinetics/Kinetics.java rename to src/main/java/neqsim/chemicalreactions/kinetics/Kinetics.java index 80b922cf48..f1bf25c21e 100644 --- a/src/main/java/neqsim/chemicalReactions/kinetics/Kinetics.java +++ b/src/main/java/neqsim/chemicalreactions/kinetics/Kinetics.java @@ -4,11 +4,11 @@ * Created on 3. august 2001, 23:05 */ -package neqsim.chemicalReactions.kinetics; +package neqsim.chemicalreactions.kinetics; import java.util.Iterator; -import neqsim.chemicalReactions.ChemicalReactionOperations; -import neqsim.chemicalReactions.chemicalReaction.ChemicalReaction; +import neqsim.chemicalreactions.ChemicalReactionOperations; +import neqsim.chemicalreactions.chemicalreaction.ChemicalReaction; import neqsim.thermo.phase.PhaseInterface; /** @@ -30,7 +30,7 @@ public class Kinetics implements java.io.Serializable { * Constructor for Kinetics. *

* - * @param operations a {@link neqsim.chemicalReactions.ChemicalReactionOperations} object + * @param operations a {@link neqsim.chemicalreactions.ChemicalReactionOperations} object */ public Kinetics(ChemicalReactionOperations operations) { this.operations = operations; diff --git a/src/main/java/neqsim/dataPresentation/filesystem.attributes b/src/main/java/neqsim/dataPresentation/filesystem.attributes deleted file mode 100644 index b64f19c62cd14f15548f9df4715acfe19bf00496..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 243 zcmYk$F;2rk5J1t9Lxe#zp`b`bfhZ`JGY}yQ7lDQ@4YT%`U2Dj$X2-}m2?wBx#36`i zX((v80}TZ=hKdXP_n$stoCHpT+?o(+>1#5LXG*K2beGIIHQ2G9sfxFqQaZXu%XGLt zDc1Sudk>%&n6!A0rc=-60+X9#9B+SYUJh>FMvxV-%K_^GD-BY@jyj>_0@r<1*zXca zxm1z{D>A diff --git a/src/main/java/neqsim/dataPresentation/dataHandeling.java b/src/main/java/neqsim/datapresentation/DataHandeling.java similarity index 95% rename from src/main/java/neqsim/dataPresentation/dataHandeling.java rename to src/main/java/neqsim/datapresentation/DataHandeling.java index 5da9caccbc..4fae51de35 100644 --- a/src/main/java/neqsim/dataPresentation/dataHandeling.java +++ b/src/main/java/neqsim/datapresentation/DataHandeling.java @@ -1,10 +1,11 @@ -package neqsim.dataPresentation; +package neqsim.datapresentation; import java.io.BufferedOutputStream; import java.io.DataOutputStream; import java.io.File; import java.io.FileOutputStream; import java.text.DecimalFormat; + import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -16,15 +17,15 @@ * @author Even Solbraa * @version $Id: $Id */ -public class dataHandeling { - static Logger logger = LogManager.getLogger(dataHandeling.class); +public class DataHandeling { + static Logger logger = LogManager.getLogger(DataHandeling.class); /** *

* Constructor for dataHandeling. *

*/ - public dataHandeling() {} + public DataHandeling() {} /** * Returns the number of items in the specified series. diff --git a/src/main/java/neqsim/dataPresentation/SampleXYDataSource.java b/src/main/java/neqsim/datapresentation/SampleXYDataSource.java similarity index 99% rename from src/main/java/neqsim/dataPresentation/SampleXYDataSource.java rename to src/main/java/neqsim/datapresentation/SampleXYDataSource.java index 8ffd67aedd..1c47e908a3 100644 --- a/src/main/java/neqsim/dataPresentation/SampleXYDataSource.java +++ b/src/main/java/neqsim/datapresentation/SampleXYDataSource.java @@ -15,7 +15,7 @@ * 02111-1307, USA. */ -package neqsim.dataPresentation; +package neqsim.datapresentation; /** * A dummy data source for an XY plot. diff --git a/src/main/java/neqsim/dataPresentation/fileHandeling/createTextFile/TextFile.java b/src/main/java/neqsim/datapresentation/filehandeling/createtextfile/TextFile.java similarity index 97% rename from src/main/java/neqsim/dataPresentation/fileHandeling/createTextFile/TextFile.java rename to src/main/java/neqsim/datapresentation/filehandeling/createtextfile/TextFile.java index 2431ca49f0..51219916ff 100644 --- a/src/main/java/neqsim/dataPresentation/fileHandeling/createTextFile/TextFile.java +++ b/src/main/java/neqsim/datapresentation/filehandeling/createtextfile/TextFile.java @@ -1,4 +1,4 @@ -package neqsim.dataPresentation.fileHandeling.createTextFile; +package neqsim.datapresentation.filehandeling.createtextfile; import java.io.File; import java.io.FileWriter; diff --git a/src/main/java/neqsim/dataPresentation/JFreeChart/graph2b.java b/src/main/java/neqsim/datapresentation/jfreechart/Graph2b.java similarity index 96% rename from src/main/java/neqsim/dataPresentation/JFreeChart/graph2b.java rename to src/main/java/neqsim/datapresentation/jfreechart/Graph2b.java index 7aa6ca33fb..9fd12c094a 100644 --- a/src/main/java/neqsim/dataPresentation/JFreeChart/graph2b.java +++ b/src/main/java/neqsim/datapresentation/jfreechart/Graph2b.java @@ -4,11 +4,12 @@ * Created on 17. juni 2000, 17:16 */ -package neqsim.dataPresentation.JFreeChart; +package neqsim.datapresentation.jfreechart; import java.awt.Color; import java.awt.image.BufferedImage; import javax.swing.BorderFactory; + import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.jfree.chart.ChartFactory; @@ -27,9 +28,9 @@ * @author Even Solbraa * @version $Id: $Id */ -public class graph2b extends javax.swing.JFrame { +public class Graph2b extends javax.swing.JFrame { private static final long serialVersionUID = 1000; - static Logger logger = LogManager.getLogger(graph2b.class); + static Logger logger = LogManager.getLogger(Graph2b.class); XYDataset xyData; String titl; @@ -41,7 +42,7 @@ public class graph2b extends javax.swing.JFrame { * Constructor for graph2b. *

*/ - public graph2b() { + public Graph2b() { initComponents(); pack(); } @@ -53,7 +54,7 @@ public graph2b() { * * @param points an array of type double */ - public graph2b(double[][] points) { + public Graph2b(double[][] points) { String[] seriesNames = new String[points.length]; for (int i = 0; i < points.length; i++) { seriesNames[i] = ""; @@ -103,7 +104,7 @@ public graph2b(double[][] points) { * @param xaxis a {@link java.lang.String} object * @param yaxis a {@link java.lang.String} object */ - public graph2b(double[][] points, String[] seriesNames, String tit, String xaxis, String yaxis) { + public Graph2b(double[][] points, String[] seriesNames, String tit, String xaxis, String yaxis) { XYSeriesCollection seriesCol = new XYSeriesCollection(); for (int serLen = 0; serLen < points.length / 2; serLen++) { @@ -146,7 +147,7 @@ public graph2b(double[][] points, String[] seriesNames, String tit, String xaxis * @param xaxis a {@link java.lang.String} object * @param yaxis a {@link java.lang.String} object */ - public graph2b(double[][] xpoints, double[][] points, String[] seriesNames, String tit, + public Graph2b(double[][] xpoints, double[][] points, String[] seriesNames, String tit, String xaxis, String yaxis) { XYSeriesCollection seriesCol = new XYSeriesCollection(); @@ -307,7 +308,7 @@ public ChartPanel getChartPanel() { * @param args the command line arguments */ public static void main(String[] args) { - new graph2b().setVisible(true); + new Graph2b().setVisible(true); } /** diff --git a/src/main/java/neqsim/dataPresentation/JFreeChart/graph2b.form b/src/main/java/neqsim/datapresentation/jfreechart/graph2b.form similarity index 100% rename from src/main/java/neqsim/dataPresentation/JFreeChart/graph2b.form rename to src/main/java/neqsim/datapresentation/jfreechart/graph2b.form diff --git a/src/main/java/neqsim/fluidMechanics/flowLeg/filesystem.attributes b/src/main/java/neqsim/fluidMechanics/flowLeg/filesystem.attributes deleted file mode 100644 index a28e29d24efcc6aec54460a4edca6adacb5c1825..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 896 zcmZuwziSjh6n?jti>F*+#9s)4KMo-YnH5WeMUu;r3!5L9!@?lR?C#v{By%(C%xrSk z2zKf}U@2l_Af4D*D7F@{5X8#DRuF}d(l>X(yGXj_?R($*zVCgr`x6RAgRgXxsFX<_ zGt%IKnU1lnWk`iJXeR8GwVH>SWu{!Gp2+R&6>1KH)zC&gTngk)Wj0f zsa0ktW|WjHvRp|ddSj4icOzG1FNh-yV217)p@TDil?? zG2KB47QEHzcKXJ2?q%A2@BX=PFkGyE_fSm=;EnJ0Tshm<6>z!9;(!}l8eMrXzy9P} z-ZgIz0YDCUjScd0dYLw)&wM3IQ>ATrnQ~oNd$#{;e)21F3t-50Qf6U1z!_hdUoGQ^RQ%!Z6gLs}}%@St61$vh79 zVey)X`1;P?>D+d4;OEZFMa0m(hSOiKMdw!9xqmI`_4MQ mo-o}~Yunr=Yp&3?P{fCVJTO=ew1B>iqzGI(ig0XK+Wrd`9yM$L diff --git a/src/main/java/neqsim/fluidMechanics/flowNode/filesystem.attributes b/src/main/java/neqsim/fluidMechanics/flowNode/filesystem.attributes deleted file mode 100644 index fb2cff821e7cff274652fd5f4b94a303780a59a6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1446 zcmeHGziSjh6n?jN7f(r{VxkCw$|)q0S+Np>MUu;r3!5K!R~aOk-JQ!$GB>l%%qEvc zuv7m5OA#9bSJ>EDD7F@{5X8#DRuF}d(l?jronm93W*KJQ_ult?@7vB-C>jmE(yK(J zO!AnKCKt?X8OvIRR9KT{!cJJLd6-#d$_*L{c7A)bx?Rfe4g$0_oLHk9lw_6*GDA%= zN7LewPjB81ue{HLSA}Cj(YQ(@t8@*H+C(#xC=s_)3&T~RHs@8$YSJ>@q!A;omxZC} ziLnLbQ>#pmO(`i^WVw>a^m0Gb?nti4d^kt7NvIGkUI^E)SbTVQ_Sxgt-#zeZP)Lx~ z5|mW9Ho1iwEO<+k?X>e^<$9*wx%1=n-ax7G*+V%gfH&6Jx8+n%Sit2vivw=#;7I+> z?8<|Sc~`ty0Dv6w8tv!h1T$?&k9j>yQ>ATrk#b#Jezf~-cKjo93!q@PQfA>wfO!94 z1Ae5`I%mf3;itMc4z!CHXm8<@~?(uetWQZdpnGG40hO|_i;YPd8 zl34`w+TuE~`-P+3gQ)j4*1zXzLBf0zM z2kF7)#jyRR4mj^x|Gd6RG7%c9F-1K@`4&qBX6B)K`s&Ne z3s1U+mK3RPxC9&4WbxzoL1N$TO82 zzBA8nBuux|@+P;*vb%6ihJF>-nZWcZ-37TB1>?TOZr0qXbQrJ0c;TP(AMr}tKLM^< B_cs6l diff --git a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/equilibriumFluidBoundary/olgamodel.txt b/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/equilibriumFluidBoundary/olgamodel.txt deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/src/main/java/neqsim/fluidMechanics/flowSolver/filesystem.attributes b/src/main/java/neqsim/fluidMechanics/flowSolver/filesystem.attributes deleted file mode 100644 index 69731a877774ec73b3c850579b92198896ade230..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 908 zcmZvbziSjh6vyA~<>Dy;jrb!7g32Kzl37h@ut;(_a$$1`-c<%kW_RbZlg!PmGqaaV zBigC|fTf6yfwXoOilr8@5X8#DRuF}d(zlzCJ%6+_@B6;*edaqm-=SnQxJs`P6*I|0 zM%r93vt=yn7*b_zng}~(t>%7WnW?m>FW9B+vD$XIxHkmQ(=fbFyOboB3o=Jdv_Rw1 zu`h4mom>4_1g8ckgrZ@M23F}h9Ji5XCQ>5o#THK1gxYK>(Pf&XO)QkrHWn0}G+gbU zDr?UbY4{6Nn}`a*!bN|b1y+3eaN)(%H$NS4>M#)D1j|rX{`&M5cCp|rPxoQ~7>?0! zBsZ)}%XFIt>>uZQa34yU!ou0vsqsYwQ?JgB&nPL;k1J`ilJ^f96Nyd@c7C1TA1t@N zI>-aPoEtj_T+ifWJT5m_=y79*Mw@r%S07y|rp22BXjH&u$NHB|i7{u0i)N(+l8Jt%dlNKkd!O9ylX zm22(+%*kGi!;o|s$*j+)G^C@#1S64gBJ(K7+hQKDO3)o}z{Pnk2m!D-o%c-V8JAdJ6;t!B($ZoK0(%UovLurOb t+alrN0t+H4d0^c3QKa2GY=;>esor!`fNm>dx}#P$xs6uRgI*l>eglXxI^X~R diff --git a/src/main/java/neqsim/fluidMechanics/flowSolver/onePhaseFlowSolver/filesystem.attributes b/src/main/java/neqsim/fluidMechanics/flowSolver/onePhaseFlowSolver/filesystem.attributes deleted file mode 100644 index 64a95506fb70d667d51c0f2906b81f9b807ba428..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 248 zcmYk$p-uxq5P;#ym4++9)IfqlkP5`|3^e3IMJWk&HO%&=>|TcMW_GSzpM(cMHQ^y3 zSPTNgJ75rK4iqo&fB)krbd$hIkQ);sEqzI5;hEApDcvS>MhmQ2PgTX+S}7e((J~!w zj*Cs+`Q8O+1o{=O(A4VLoMUohjNR>z=a;?fw+>_l>~O%cz_|t)K~J4fa)HYxD(p{| zbm=fr!Qt*I@QTFz#uW0FkBqG-F!+D>$M|3_>=-3EWTtXrE1E06zaBi?KYeA8jbN*- Xx*6obR>O5$QOIV)CIUb|#@PG-P4ZXJ diff --git a/src/main/java/neqsim/fluidMechanics/flowSolver/onePhaseFlowSolver/onePhasePipeFlowSolver/filesystem.attributes b/src/main/java/neqsim/fluidMechanics/flowSolver/onePhaseFlowSolver/onePhasePipeFlowSolver/filesystem.attributes deleted file mode 100644 index 23bdc46b9dd4becc04aff4a78eaeba75740b925d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 252 zcmYk$p-uxq5P;#ym4<_0Y7k%$1c6wdfrebDC~X3+hS}bf-OJF~?9P?zlkfnjCOkwN zECzw$9WV$q2Z|T?{{Q(Cx+%h$#5*H_=Ds8|^Gs=(l`$S}7ghpk+E* zoffOS^SuYqMCetxKvSz{bBW0fF?6>-HZS|PZym@A*k!@8z^O_cz>c~|$qAQDP&gdT zY3wl3*as?D91$84!VL%}ZZPE>b``TY@qj)Bn)x`m+3bkGD?W#$~Op`{8WYZj+n=4N) zBT=m~H#w`MWRc@aBI~t5*4|RC$WpjSjZLT!EM5*buvmQlc=5&4x4%5_YA}=_*D4fM zxG}SXDjayLGaWtkYT`p`vghva3kSo+#y1ZIX#nqL_t2QLeQ5!gn=B5vbtB{TdkgE2 zuI97i?I8fjA=ktpS04G?_fF?-w4DdJ8Vq9q@D`a5u!6J3|0k?M9bHl}D;;i~r!p37b?<=W9$q4- z>n;=`p(G0+kES~){UvW8Vty6lc8m_VZ)$MgKqV=M))~xEzoT@AX@Qw}te(I5{`$(Z zo}tC8XNk7|v8Rp^mM!#dxM{Pm_u&DIWFZ`Hij>ETEJ~>4k@cI$ne_YdJWAzQ<(8ir i=recxyIClrhZSLqf}F_S!G zq{#&{U1M3>kSc4^MA)*mn)``mrqrOmU}HNIwVh)AU5zrg}4zI+;e{o?(;15OOMdfc)x;Vvx zvs&rI05FUJF3pxFmvHZTb#`(_Nr`IAU>?C^D2(3NZzei@zWaORaIo0;?%=wpbSk?? zwO#Bj?s2)vLXR6eG`{k1e*Nk7eEN8M0F81OeWE{lS_spI^c+``I9A%0mMPbTwdV)F z=BK}6d=Ca}H)a-Yd8l`fFXRSFZE|MZo_;3#QflDiX%7lpR3xan;H3dwL1oK5s%E+q zV;GW#k<9vxN<-QzOz`4a-((&Iy|H+1ocQMM-uc|^wsjy^he5;xFO)U7jI+l7wOEx} zx~M`{I&z((G8Ale?~vr4TqU^I11JPSN#;Qw?_!~JV!b{9-5SF9H#(r-oqoT*m!#|) ztC6yvqI91jIRSg7UcLMA_S(y=&|<1tq)6R~dR7o{*~0DynoK2!n6Vnioj>3DNLc^? diff --git a/src/main/java/neqsim/fluidMechanics/fluidMech.java b/src/main/java/neqsim/fluidmechanics/FluidMech.java similarity index 60% rename from src/main/java/neqsim/fluidMechanics/fluidMech.java rename to src/main/java/neqsim/fluidmechanics/FluidMech.java index 1bef2a9fa7..efbd580720 100644 --- a/src/main/java/neqsim/fluidMechanics/fluidMech.java +++ b/src/main/java/neqsim/fluidmechanics/FluidMech.java @@ -1,4 +1,4 @@ -package neqsim.fluidMechanics; +package neqsim.fluidmechanics; /** *

@@ -8,5 +8,5 @@ * @author esol * @version $Id: $Id */ -public class fluidMech { +public class FluidMech { } diff --git a/src/main/java/neqsim/fluidMechanics/flowLeg/FlowLeg.java b/src/main/java/neqsim/fluidmechanics/flowleg/FlowLeg.java similarity index 97% rename from src/main/java/neqsim/fluidMechanics/flowLeg/FlowLeg.java rename to src/main/java/neqsim/fluidmechanics/flowleg/FlowLeg.java index bd2fefb4ef..b15fc78410 100644 --- a/src/main/java/neqsim/fluidMechanics/flowLeg/FlowLeg.java +++ b/src/main/java/neqsim/fluidmechanics/flowleg/FlowLeg.java @@ -4,11 +4,11 @@ * Created on 8. desember 2000, 19:30 */ -package neqsim.fluidMechanics.flowLeg; +package neqsim.fluidmechanics.flowleg; -import neqsim.fluidMechanics.flowNode.FlowNodeInterface; -import neqsim.fluidMechanics.flowNode.FlowNodeSelector; -import neqsim.fluidMechanics.geometryDefinitions.GeometryDefinitionInterface; +import neqsim.fluidmechanics.flownode.FlowNodeInterface; +import neqsim.fluidmechanics.flownode.FlowNodeSelector; +import neqsim.fluidmechanics.geometrydefinitions.GeometryDefinitionInterface; import neqsim.thermo.system.SystemInterface; /** diff --git a/src/main/java/neqsim/fluidMechanics/flowLeg/FlowLegInterface.java b/src/main/java/neqsim/fluidmechanics/flowleg/FlowLegInterface.java similarity index 87% rename from src/main/java/neqsim/fluidMechanics/flowLeg/FlowLegInterface.java rename to src/main/java/neqsim/fluidmechanics/flowleg/FlowLegInterface.java index 9fa1d19ad5..b0698cbcc8 100644 --- a/src/main/java/neqsim/fluidMechanics/flowLeg/FlowLegInterface.java +++ b/src/main/java/neqsim/fluidmechanics/flowleg/FlowLegInterface.java @@ -4,10 +4,10 @@ * Created on 11. desember 2000, 17:47 */ -package neqsim.fluidMechanics.flowLeg; +package neqsim.fluidmechanics.flowleg; -import neqsim.fluidMechanics.flowNode.FlowNodeInterface; -import neqsim.fluidMechanics.geometryDefinitions.GeometryDefinitionInterface; +import neqsim.fluidmechanics.flownode.FlowNodeInterface; +import neqsim.fluidmechanics.geometrydefinitions.GeometryDefinitionInterface; import neqsim.thermo.system.SystemInterface; /** @@ -34,7 +34,7 @@ public interface FlowLegInterface { *

* * @param equipmentGeometry a - * {@link neqsim.fluidMechanics.geometryDefinitions.GeometryDefinitionInterface} object + * {@link neqsim.fluidmechanics.geometrydefinitions.GeometryDefinitionInterface} object */ public void setEquipmentGeometry(GeometryDefinitionInterface equipmentGeometry); @@ -83,7 +83,7 @@ public void setLongitudionalCoordinates(double startLongitudionalCoordinate, * createFlowNodes. *

* - * @param node a {@link neqsim.fluidMechanics.flowNode.FlowNodeInterface} object + * @param node a {@link neqsim.fluidmechanics.flownode.FlowNodeInterface} object */ public void createFlowNodes(FlowNodeInterface node); @@ -109,7 +109,7 @@ public void setLongitudionalCoordinates(double startLongitudionalCoordinate, *

* * @param i a int - * @return a {@link neqsim.fluidMechanics.flowNode.FlowNodeInterface} object + * @return a {@link neqsim.fluidmechanics.flownode.FlowNodeInterface} object */ public FlowNodeInterface getNode(int i); @@ -118,7 +118,7 @@ public void setLongitudionalCoordinates(double startLongitudionalCoordinate, * getFlowNodes. *

* - * @return an array of {@link neqsim.fluidMechanics.flowNode.FlowNodeInterface} objects + * @return an array of {@link neqsim.fluidmechanics.flownode.FlowNodeInterface} objects */ public FlowNodeInterface[] getFlowNodes(); diff --git a/src/main/java/neqsim/fluidMechanics/flowLeg/pipeLeg/PipeLeg.java b/src/main/java/neqsim/fluidmechanics/flowleg/pipeleg/PipeLeg.java similarity index 90% rename from src/main/java/neqsim/fluidMechanics/flowLeg/pipeLeg/PipeLeg.java rename to src/main/java/neqsim/fluidmechanics/flowleg/pipeleg/PipeLeg.java index 93679a482c..262d920008 100644 --- a/src/main/java/neqsim/fluidMechanics/flowLeg/pipeLeg/PipeLeg.java +++ b/src/main/java/neqsim/fluidmechanics/flowleg/pipeleg/PipeLeg.java @@ -4,10 +4,10 @@ * Created on 8. desember 2000, 19:32 */ -package neqsim.fluidMechanics.flowLeg.pipeLeg; +package neqsim.fluidmechanics.flowleg.pipeleg; -import neqsim.fluidMechanics.flowLeg.FlowLeg; -import neqsim.fluidMechanics.flowNode.FlowNodeInterface; +import neqsim.fluidmechanics.flowleg.FlowLeg; +import neqsim.fluidmechanics.flownode.FlowNodeInterface; /** *

diff --git a/src/main/java/neqsim/fluidMechanics/flowLeg/pipeLeg/filesystem.attributes b/src/main/java/neqsim/fluidmechanics/flowleg/pipeleg/filesystem.attributes similarity index 100% rename from src/main/java/neqsim/fluidMechanics/flowLeg/pipeLeg/filesystem.attributes rename to src/main/java/neqsim/fluidmechanics/flowleg/pipeleg/filesystem.attributes diff --git a/src/main/java/neqsim/fluidMechanics/flowNode/FlowNode.java b/src/main/java/neqsim/fluidmechanics/flownode/FlowNode.java similarity index 94% rename from src/main/java/neqsim/fluidMechanics/flowNode/FlowNode.java rename to src/main/java/neqsim/fluidmechanics/flownode/FlowNode.java index 0bedd2fd53..10b53543f9 100644 --- a/src/main/java/neqsim/fluidMechanics/flowNode/FlowNode.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/FlowNode.java @@ -1,4 +1,4 @@ -package neqsim.fluidMechanics.flowNode; +package neqsim.fluidmechanics.flownode; import java.awt.BorderLayout; import java.awt.Container; @@ -11,13 +11,13 @@ import javax.swing.JFrame; import javax.swing.JScrollPane; import javax.swing.JTable; -import neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.FluidBoundaryInterface; -import neqsim.fluidMechanics.flowNode.fluidBoundary.interphaseTransportCoefficient.InterphaseTransportCoefficientBaseClass; -import neqsim.fluidMechanics.flowNode.fluidBoundary.interphaseTransportCoefficient.InterphaseTransportCoefficientInterface; -import neqsim.fluidMechanics.geometryDefinitions.GeometryDefinitionInterface; +import neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.FluidBoundaryInterface; +import neqsim.fluidmechanics.flownode.fluidboundary.interphasetransportcoefficient.InterphaseTransportCoefficientBaseClass; +import neqsim.fluidmechanics.flownode.fluidboundary.interphasetransportcoefficient.InterphaseTransportCoefficientInterface; +import neqsim.fluidmechanics.geometrydefinitions.GeometryDefinitionInterface; import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; import neqsim.util.util.DoubleCloneable; /** @@ -121,7 +121,7 @@ public FlowNode(SystemInterface system) { *

* * @param system a {@link neqsim.thermo.system.SystemInterface} object - * @param pipe a {@link neqsim.fluidMechanics.geometryDefinitions.GeometryDefinitionInterface} + * @param pipe a {@link neqsim.fluidmechanics.geometrydefinitions.GeometryDefinitionInterface} * object */ public FlowNode(SystemInterface system, GeometryDefinitionInterface pipe) { @@ -135,7 +135,7 @@ public FlowNode(SystemInterface system, GeometryDefinitionInterface pipe) { *

* * @param system a {@link neqsim.thermo.system.SystemInterface} object - * @param pipe a {@link neqsim.fluidMechanics.geometryDefinitions.GeometryDefinitionInterface} + * @param pipe a {@link neqsim.fluidmechanics.geometrydefinitions.GeometryDefinitionInterface} * object * @param lengthOfNode a double * @param distanceToCenterOfNode a double @@ -416,17 +416,17 @@ public void setInterphaseModelType(int i) { if (i == 0) { // System.out.println("set equilibrium"); this.fluidBoundary = - new neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.equilibriumFluidBoundary.EquilibriumFluidBoundary( + new neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.equilibriumfluidboundary.EquilibriumFluidBoundary( this); } else { // System.out.println("set non equilibrium"); if (bulkSystem.isChemicalSystem()) { this.fluidBoundary = - new neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.nonEquilibriumFluidBoundary.filmModelBoundary.reactiveFilmModel.ReactiveKrishnaStandartFilmModel( + new neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.nonequilibriumfluidboundary.filmmodelboundary.reactivefilmmodel.ReactiveKrishnaStandartFilmModel( this); } else { this.fluidBoundary = - new neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.nonEquilibriumFluidBoundary.filmModelBoundary.KrishnaStandartFilmModel( + new neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.nonequilibriumfluidboundary.filmmodelboundary.KrishnaStandartFilmModel( this); } } @@ -605,7 +605,7 @@ public void update() {} /** {@inheritDoc} */ @Override - public neqsim.thermodynamicOperations.ThermodynamicOperations getOperations() { + public neqsim.thermodynamicoperations.ThermodynamicOperations getOperations() { return operations; } @@ -614,7 +614,7 @@ public neqsim.thermodynamicOperations.ThermodynamicOperations getOperations() { * * @param operations New value of property operations. */ - public void setOperations(neqsim.thermodynamicOperations.ThermodynamicOperations operations) { + public void setOperations(neqsim.thermodynamicoperations.ThermodynamicOperations operations) { this.operations = operations; } @@ -756,8 +756,8 @@ public String[][] createTable(String name) { @Override public void write(String name, String filename, boolean newfile) { String[][] table = createTable(name); - neqsim.dataPresentation.fileHandeling.createTextFile.TextFile file = - new neqsim.dataPresentation.fileHandeling.createTextFile.TextFile(); + neqsim.datapresentation.filehandeling.createtextfile.TextFile file = + new neqsim.datapresentation.filehandeling.createtextfile.TextFile(); if (newfile) { file.newFile(filename); } diff --git a/src/main/java/neqsim/fluidMechanics/flowNode/FlowNodeInterface.java b/src/main/java/neqsim/fluidmechanics/flownode/FlowNodeInterface.java similarity index 93% rename from src/main/java/neqsim/fluidMechanics/flowNode/FlowNodeInterface.java rename to src/main/java/neqsim/fluidmechanics/flownode/FlowNodeInterface.java index 62beeb5ba0..505f6684b3 100644 --- a/src/main/java/neqsim/fluidMechanics/flowNode/FlowNodeInterface.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/FlowNodeInterface.java @@ -1,8 +1,8 @@ -package neqsim.fluidMechanics.flowNode; +package neqsim.fluidmechanics.flownode; -import neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.FluidBoundaryInterface; -import neqsim.fluidMechanics.flowNode.fluidBoundary.interphaseTransportCoefficient.InterphaseTransportCoefficientInterface; -import neqsim.fluidMechanics.geometryDefinitions.GeometryDefinitionInterface; +import neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.FluidBoundaryInterface; +import neqsim.fluidmechanics.flownode.fluidboundary.interphasetransportcoefficient.InterphaseTransportCoefficientInterface; +import neqsim.fluidmechanics.geometrydefinitions.GeometryDefinitionInterface; import neqsim.thermo.system.SystemInterface; import neqsim.util.util.DoubleCloneable; @@ -30,7 +30,7 @@ public interface FlowNodeInterface extends Cloneable { *

* * @return a - * {@link neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.FluidBoundaryInterface} + * {@link neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.FluidBoundaryInterface} * object */ public FluidBoundaryInterface getFluidBoundary(); @@ -255,7 +255,7 @@ public default double getReynoldsNumber() { * getNextNode. *

* - * @return a {@link neqsim.fluidMechanics.flowNode.FlowNodeInterface} object + * @return a {@link neqsim.fluidmechanics.flownode.FlowNodeInterface} object */ public FlowNodeInterface getNextNode(); @@ -264,9 +264,9 @@ public default double getReynoldsNumber() { * Getter for property operations. *

* - * @return a {@link neqsim.thermodynamicOperations.ThermodynamicOperations} object + * @return a {@link neqsim.thermodynamicoperations.ThermodynamicOperations} object */ - public neqsim.thermodynamicOperations.ThermodynamicOperations getOperations(); + public neqsim.thermodynamicoperations.ThermodynamicOperations getOperations(); /** *

@@ -351,7 +351,7 @@ public default void setVelocityOut(DoubleCloneable vel) { *

* * @return a - * {@link neqsim.fluidMechanics.flowNode.fluidBoundary.interphaseTransportCoefficient.InterphaseTransportCoefficientInterface} + * {@link neqsim.fluidmechanics.flownode.fluidboundary.interphasetransportcoefficient.InterphaseTransportCoefficientInterface} * object */ public InterphaseTransportCoefficientInterface getInterphaseTransportCoefficient(); @@ -589,7 +589,7 @@ public default void setVelocityIn(DoubleCloneable vel) { * getGeometry. *

* - * @return a {@link neqsim.fluidMechanics.geometryDefinitions.GeometryDefinitionInterface} object + * @return a {@link neqsim.fluidmechanics.geometrydefinitions.GeometryDefinitionInterface} object */ public GeometryDefinitionInterface getGeometry(); @@ -598,7 +598,7 @@ public default void setVelocityIn(DoubleCloneable vel) { * setGeometryDefinitionInterface. *

* - * @param pipe a {@link neqsim.fluidMechanics.geometryDefinitions.GeometryDefinitionInterface} + * @param pipe a {@link neqsim.fluidmechanics.geometrydefinitions.GeometryDefinitionInterface} * object */ public void setGeometryDefinitionInterface(GeometryDefinitionInterface pipe); diff --git a/src/main/java/neqsim/fluidMechanics/flowNode/FlowNodeSelector.java b/src/main/java/neqsim/fluidmechanics/flownode/FlowNodeSelector.java similarity index 81% rename from src/main/java/neqsim/fluidMechanics/flowNode/FlowNodeSelector.java rename to src/main/java/neqsim/fluidmechanics/flownode/FlowNodeSelector.java index c8f0a46e96..dc79a74c37 100644 --- a/src/main/java/neqsim/fluidMechanics/flowNode/FlowNodeSelector.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/FlowNodeSelector.java @@ -1,7 +1,7 @@ -package neqsim.fluidMechanics.flowNode; +package neqsim.fluidmechanics.flownode; -import neqsim.fluidMechanics.flowNode.twoPhaseNode.twoPhasePipeFlowNode.AnnularFlow; -import neqsim.fluidMechanics.flowNode.twoPhaseNode.twoPhasePipeFlowNode.StratifiedFlowNode; +import neqsim.fluidmechanics.flownode.twophasenode.twophasepipeflownode.AnnularFlow; +import neqsim.fluidmechanics.flownode.twophasenode.twophasepipeflownode.StratifiedFlowNode; /** *

@@ -24,7 +24,7 @@ public FlowNodeSelector() {} * getFlowNodeType. *

* - * @param flowNode an array of {@link neqsim.fluidMechanics.flowNode.FlowNodeInterface} objects + * @param flowNode an array of {@link neqsim.fluidmechanics.flownode.FlowNodeInterface} objects */ public void getFlowNodeType(FlowNodeInterface[] flowNode) { System.out.println("forskjell: " + Math.abs(flowNode[0].getVerticalPositionOfNode() @@ -49,7 +49,7 @@ public void getFlowNodeType(FlowNodeInterface[] flowNode) { * setFlowPattern. *

* - * @param flowNode an array of {@link neqsim.fluidMechanics.flowNode.FlowNodeInterface} objects + * @param flowNode an array of {@link neqsim.fluidmechanics.flownode.FlowNodeInterface} objects * @param flowPattern a {@link java.lang.String} object */ public void setFlowPattern(FlowNodeInterface[] flowNode, String flowPattern) { diff --git a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/FluidBoundary.java b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/FluidBoundary.java similarity index 96% rename from src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/FluidBoundary.java rename to src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/FluidBoundary.java index 32464155f3..ccbdfb5303 100644 --- a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/FluidBoundary.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/FluidBoundary.java @@ -1,4 +1,4 @@ -package neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc; +package neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc; import java.awt.BorderLayout; import java.awt.Container; @@ -14,10 +14,10 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import Jama.Matrix; -import neqsim.fluidMechanics.flowNode.FlowNodeInterface; -import neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.nonEquilibriumFluidBoundary.filmModelBoundary.reactiveFilmModel.enhancementFactor.EnhancementFactor; +import neqsim.fluidmechanics.flownode.FlowNodeInterface; +import neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.nonequilibriumfluidboundary.filmmodelboundary.reactivefilmmodel.enhancementfactor.EnhancementFactor; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

@@ -122,7 +122,7 @@ public void initInterphaseSystem() { * Constructor for FluidBoundary. *

* - * @param flowNode a {@link neqsim.fluidMechanics.flowNode.FlowNodeInterface} object + * @param flowNode a {@link neqsim.fluidmechanics.flownode.FlowNodeInterface} object */ public FluidBoundary(FlowNodeInterface flowNode) { this(flowNode.getBulkSystem()); @@ -219,7 +219,7 @@ public void setInterphaseSystem(SystemInterface interphaseSystem) { * getInterphaseOpertions. *

* - * @return a {@link neqsim.thermodynamicOperations.ThermodynamicOperations} object + * @return a {@link neqsim.thermodynamicoperations.ThermodynamicOperations} object */ public ThermodynamicOperations getInterphaseOpertions() { return interphaseOps; @@ -504,8 +504,8 @@ public void display(String name) { @Override public void write(String name, String filename, boolean newfile) { String[][] table = createTable(name); - neqsim.dataPresentation.fileHandeling.createTextFile.TextFile file = - new neqsim.dataPresentation.fileHandeling.createTextFile.TextFile(); + neqsim.datapresentation.filehandeling.createtextfile.TextFile file = + new neqsim.datapresentation.filehandeling.createtextfile.TextFile(); if (newfile) { file.newFile(filename); } diff --git a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/FluidBoundaryInterface.java b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/FluidBoundaryInterface.java similarity index 87% rename from src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/FluidBoundaryInterface.java rename to src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/FluidBoundaryInterface.java index ba885c5ce2..5a4ae1f143 100644 --- a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/FluidBoundaryInterface.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/FluidBoundaryInterface.java @@ -4,12 +4,12 @@ * Created on 11. desember 2000, 17:17 */ -package neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc; +package neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc; import Jama.Matrix; -import neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.nonEquilibriumFluidBoundary.filmModelBoundary.reactiveFilmModel.enhancementFactor.EnhancementFactor; +import neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.nonequilibriumfluidboundary.filmmodelboundary.reactivefilmmodel.enhancementfactor.EnhancementFactor; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

@@ -94,7 +94,7 @@ public interface FluidBoundaryInterface extends Cloneable { *

* * @return a - * {@link neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.nonEquilibriumFluidBoundary.filmModelBoundary.reactiveFilmModel.enhancementFactor.EnhancementFactor} + * {@link neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.nonequilibriumfluidboundary.filmmodelboundary.reactivefilmmodel.enhancementfactor.EnhancementFactor} * object */ public EnhancementFactor getEnhancementFactor(); @@ -114,7 +114,7 @@ public interface FluidBoundaryInterface extends Cloneable { * getBulkSystemOpertions. *

* - * @return a {@link neqsim.thermodynamicOperations.ThermodynamicOperations} object + * @return a {@link neqsim.thermodynamicoperations.ThermodynamicOperations} object */ public ThermodynamicOperations getBulkSystemOpertions(); @@ -211,7 +211,7 @@ public interface FluidBoundaryInterface extends Cloneable { *

* * @return a - * {@link neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.FluidBoundaryInterface} + * {@link neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.FluidBoundaryInterface} * object */ public FluidBoundaryInterface clone(); diff --git a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/equilibriumFluidBoundary/EquilibriumFluidBoundary.java b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/equilibriumfluidboundary/EquilibriumFluidBoundary.java similarity index 79% rename from src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/equilibriumFluidBoundary/EquilibriumFluidBoundary.java rename to src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/equilibriumfluidboundary/EquilibriumFluidBoundary.java index bdba405441..1436b1b187 100644 --- a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/equilibriumFluidBoundary/EquilibriumFluidBoundary.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/equilibriumfluidboundary/EquilibriumFluidBoundary.java @@ -1,11 +1,11 @@ -package neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.equilibriumFluidBoundary; +package neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.equilibriumfluidboundary; -import neqsim.fluidMechanics.flowNode.FlowNodeInterface; -import neqsim.fluidMechanics.flowNode.twoPhaseNode.twoPhasePipeFlowNode.AnnularFlow; -import neqsim.fluidMechanics.geometryDefinitions.pipe.PipeData; +import neqsim.fluidmechanics.flownode.FlowNodeInterface; +import neqsim.fluidmechanics.flownode.twophasenode.twophasepipeflownode.AnnularFlow; +import neqsim.fluidmechanics.geometrydefinitions.pipe.PipeData; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

@@ -16,7 +16,7 @@ * @version $Id: $Id */ public class EquilibriumFluidBoundary - extends neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.FluidBoundary { + extends neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.FluidBoundary { private static final long serialVersionUID = 1000; /** @@ -37,7 +37,7 @@ public EquilibriumFluidBoundary(SystemInterface system) { * Constructor for EquilibriumFluidBoundary. *

* - * @param flowNode a {@link neqsim.fluidMechanics.flowNode.FlowNodeInterface} object + * @param flowNode a {@link neqsim.fluidmechanics.flownode.FlowNodeInterface} object */ public EquilibriumFluidBoundary(FlowNodeInterface flowNode) { super(flowNode); diff --git a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/finiteVolumeBoundary/fluidBoundaryNode/FluidBoundaryNode.java b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/finitevolumeboundary/fluidboundarynode/FluidBoundaryNode.java similarity index 87% rename from src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/finiteVolumeBoundary/fluidBoundaryNode/FluidBoundaryNode.java rename to src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/finitevolumeboundary/fluidboundarynode/FluidBoundaryNode.java index ee83c6a868..d275b85b9c 100644 --- a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/finiteVolumeBoundary/fluidBoundaryNode/FluidBoundaryNode.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/finitevolumeboundary/fluidboundarynode/FluidBoundaryNode.java @@ -4,7 +4,7 @@ * Created on 8. august 2001, 14:49 */ -package neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.finiteVolumeBoundary.fluidBoundaryNode; +package neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.finitevolumeboundary.fluidboundarynode; import neqsim.thermo.system.SystemInterface; diff --git a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/finiteVolumeBoundary/fluidBoundaryNode/FluidBoundaryNodeInterface.java b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/finitevolumeboundary/fluidboundarynode/FluidBoundaryNodeInterface.java similarity index 79% rename from src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/finiteVolumeBoundary/fluidBoundaryNode/FluidBoundaryNodeInterface.java rename to src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/finitevolumeboundary/fluidboundarynode/FluidBoundaryNodeInterface.java index 94fec6beda..e8cfb0d4f1 100644 --- a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/finiteVolumeBoundary/fluidBoundaryNode/FluidBoundaryNodeInterface.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/finitevolumeboundary/fluidboundarynode/FluidBoundaryNodeInterface.java @@ -4,7 +4,7 @@ * Created on 8. august 2001, 14:49 */ -package neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.finiteVolumeBoundary.fluidBoundaryNode; +package neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.finitevolumeboundary.fluidboundarynode; import neqsim.thermo.system.SystemInterface; diff --git a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/finiteVolumeBoundary/fluidBoundaryNode/fluidBoundaryNonReactiveNode/FluidBoundaryNodeNonReactive.java b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/finitevolumeboundary/fluidboundarynode/fluidboundarynonreactivenode/FluidBoundaryNodeNonReactive.java similarity index 68% rename from src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/finiteVolumeBoundary/fluidBoundaryNode/fluidBoundaryNonReactiveNode/FluidBoundaryNodeNonReactive.java rename to src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/finitevolumeboundary/fluidboundarynode/fluidboundarynonreactivenode/FluidBoundaryNodeNonReactive.java index 41401a23f9..21ff7df0f2 100644 --- a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/finiteVolumeBoundary/fluidBoundaryNode/fluidBoundaryNonReactiveNode/FluidBoundaryNodeNonReactive.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/finitevolumeboundary/fluidboundarynode/fluidboundarynonreactivenode/FluidBoundaryNodeNonReactive.java @@ -1,6 +1,6 @@ -package neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.finiteVolumeBoundary.fluidBoundaryNode.fluidBoundaryNonReactiveNode; +package neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.finitevolumeboundary.fluidboundarynode.fluidboundarynonreactivenode; -import neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.finiteVolumeBoundary.fluidBoundaryNode.FluidBoundaryNode; +import neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.finitevolumeboundary.fluidboundarynode.FluidBoundaryNode; import neqsim.thermo.system.SystemInterface; /** diff --git a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/finiteVolumeBoundary/fluidBoundaryNode/fluidBoundaryReactiveNode/FluidBoundaryNodeReactive.java b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/finitevolumeboundary/fluidboundarynode/fluidboundaryreactivenode/FluidBoundaryNodeReactive.java similarity index 71% rename from src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/finiteVolumeBoundary/fluidBoundaryNode/fluidBoundaryReactiveNode/FluidBoundaryNodeReactive.java rename to src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/finitevolumeboundary/fluidboundarynode/fluidboundaryreactivenode/FluidBoundaryNodeReactive.java index e85e79ef57..c27d8d97e6 100644 --- a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/finiteVolumeBoundary/fluidBoundaryNode/fluidBoundaryReactiveNode/FluidBoundaryNodeReactive.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/finitevolumeboundary/fluidboundarynode/fluidboundaryreactivenode/FluidBoundaryNodeReactive.java @@ -4,9 +4,9 @@ * Created on 8. august 2001, 14:50 */ -package neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.finiteVolumeBoundary.fluidBoundaryNode.fluidBoundaryReactiveNode; +package neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.finitevolumeboundary.fluidboundarynode.fluidboundaryreactivenode; -import neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.finiteVolumeBoundary.fluidBoundaryNode.FluidBoundaryNode; +import neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.finitevolumeboundary.fluidboundarynode.FluidBoundaryNode; import neqsim.thermo.system.SystemInterface; /** diff --git a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/finiteVolumeBoundary/fluidBoundarySolver/FluidBoundarySolver.java b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/finitevolumeboundary/fluidboundarysolver/FluidBoundarySolver.java similarity index 94% rename from src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/finiteVolumeBoundary/fluidBoundarySolver/FluidBoundarySolver.java rename to src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/finitevolumeboundary/fluidboundarysolver/FluidBoundarySolver.java index 21b584da3e..a581b86f24 100644 --- a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/finiteVolumeBoundary/fluidBoundarySolver/FluidBoundarySolver.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/finitevolumeboundary/fluidboundarysolver/FluidBoundarySolver.java @@ -4,11 +4,11 @@ * Created on 8. august 2001, 14:51 */ -package neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.finiteVolumeBoundary.fluidBoundarySolver; +package neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.finitevolumeboundary.fluidboundarysolver; import Jama.Matrix; -import neqsim.MathLib.generalMath.TDMAsolve; -import neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.finiteVolumeBoundary.fluidBoundarySystem.FluidBoundarySystemInterface; +import neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.finitevolumeboundary.fluidboundarysystem.FluidBoundarySystemInterface; +import neqsim.mathlib.generalmath.TDMAsolve; /** *

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

* * @param boundary a - * {@link neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.finiteVolumeBoundary.fluidBoundarySystem.FluidBoundarySystemInterface} + * {@link neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.finitevolumeboundary.fluidboundarysystem.FluidBoundarySystemInterface} * object */ public FluidBoundarySolver(FluidBoundarySystemInterface boundary) { @@ -70,7 +70,7 @@ public FluidBoundarySolver(FluidBoundarySystemInterface boundary) { *

* * @param boundary a - * {@link neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.finiteVolumeBoundary.fluidBoundarySystem.FluidBoundarySystemInterface} + * {@link neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.finitevolumeboundary.fluidboundarysystem.FluidBoundarySystemInterface} * * object * @param reactive a boolean */ diff --git a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/finiteVolumeBoundary/fluidBoundarySolver/FluidBoundarySolverInterface.java b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/finitevolumeboundary/fluidboundarysolver/FluidBoundarySolverInterface.java similarity index 80% rename from src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/finiteVolumeBoundary/fluidBoundarySolver/FluidBoundarySolverInterface.java rename to src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/finitevolumeboundary/fluidboundarysolver/FluidBoundarySolverInterface.java index c4810afa10..19c05a6392 100644 --- a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/finiteVolumeBoundary/fluidBoundarySolver/FluidBoundarySolverInterface.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/finitevolumeboundary/fluidboundarysolver/FluidBoundarySolverInterface.java @@ -4,7 +4,7 @@ * Created on 8. august 2001, 14:51 */ -package neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.finiteVolumeBoundary.fluidBoundarySolver; +package neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.finitevolumeboundary.fluidboundarysolver; /** *

diff --git a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/finiteVolumeBoundary/fluidBoundarySolver/fluidBoundaryReactiveSolver/FluidBoundaryReactiveSolver.java b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/finitevolumeboundary/fluidboundarysolver/fluidboundaryreactivesolver/FluidBoundaryReactiveSolver.java similarity index 58% rename from src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/finiteVolumeBoundary/fluidBoundarySolver/fluidBoundaryReactiveSolver/FluidBoundaryReactiveSolver.java rename to src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/finitevolumeboundary/fluidboundarysolver/fluidboundaryreactivesolver/FluidBoundaryReactiveSolver.java index 475be6bca1..04a2ff83cb 100644 --- a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/finiteVolumeBoundary/fluidBoundarySolver/fluidBoundaryReactiveSolver/FluidBoundaryReactiveSolver.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/finitevolumeboundary/fluidboundarysolver/fluidboundaryreactivesolver/FluidBoundaryReactiveSolver.java @@ -4,9 +4,9 @@ * Created on 8. august 2001, 14:52 */ -package neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.finiteVolumeBoundary.fluidBoundarySolver.fluidBoundaryReactiveSolver; +package neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.finitevolumeboundary.fluidboundarysolver.fluidboundaryreactivesolver; -import neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.finiteVolumeBoundary.fluidBoundarySolver.FluidBoundarySolver; +import neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.finitevolumeboundary.fluidboundarysolver.FluidBoundarySolver; /** *

diff --git a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/finiteVolumeBoundary/fluidBoundarySystem/FluidBoundarySystem.java b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/finitevolumeboundary/fluidboundarysystem/FluidBoundarySystem.java similarity index 73% rename from src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/finiteVolumeBoundary/fluidBoundarySystem/FluidBoundarySystem.java rename to src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/finitevolumeboundary/fluidboundarysystem/FluidBoundarySystem.java index 5f9de1e3cd..2c3e0d26f3 100644 --- a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/finiteVolumeBoundary/fluidBoundarySystem/FluidBoundarySystem.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/finitevolumeboundary/fluidboundarysystem/FluidBoundarySystem.java @@ -1,9 +1,9 @@ -package neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.finiteVolumeBoundary.fluidBoundarySystem; +package neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.finitevolumeboundary.fluidboundarysystem; -import neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.FluidBoundaryInterface; -import neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.finiteVolumeBoundary.fluidBoundaryNode.FluidBoundaryNodeInterface; -import neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.finiteVolumeBoundary.fluidBoundarySolver.FluidBoundarySolver; -import neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.finiteVolumeBoundary.fluidBoundarySolver.FluidBoundarySolverInterface; +import neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.FluidBoundaryInterface; +import neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.finitevolumeboundary.fluidboundarynode.FluidBoundaryNodeInterface; +import neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.finitevolumeboundary.fluidboundarysolver.FluidBoundarySolver; +import neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.finitevolumeboundary.fluidboundarysolver.FluidBoundarySolverInterface; /** *

@@ -34,7 +34,7 @@ public FluidBoundarySystem() {} *

* * @param boundary a - * {@link neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.FluidBoundaryInterface} + * {@link neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.FluidBoundaryInterface} * object */ public FluidBoundarySystem(FluidBoundaryInterface boundary) { diff --git a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/finiteVolumeBoundary/fluidBoundarySystem/FluidBoundarySystemInterface.java b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/finitevolumeboundary/fluidboundarysystem/FluidBoundarySystemInterface.java similarity index 67% rename from src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/finiteVolumeBoundary/fluidBoundarySystem/FluidBoundarySystemInterface.java rename to src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/finitevolumeboundary/fluidboundarysystem/FluidBoundarySystemInterface.java index 246bf61a3c..4cc14ee25a 100644 --- a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/finiteVolumeBoundary/fluidBoundarySystem/FluidBoundarySystemInterface.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/finitevolumeboundary/fluidboundarysystem/FluidBoundarySystemInterface.java @@ -1,7 +1,7 @@ -package neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.finiteVolumeBoundary.fluidBoundarySystem; +package neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.finitevolumeboundary.fluidboundarysystem; -import neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.FluidBoundaryInterface; -import neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.finiteVolumeBoundary.fluidBoundaryNode.FluidBoundaryNodeInterface; +import neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.FluidBoundaryInterface; +import neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.finitevolumeboundary.fluidboundarynode.FluidBoundaryNodeInterface; /** *

@@ -18,7 +18,7 @@ public interface FluidBoundarySystemInterface { *

* * @param boundary a - * {@link neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.FluidBoundaryInterface} + * {@link neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.FluidBoundaryInterface} * object */ public void addBoundary(FluidBoundaryInterface boundary); @@ -73,7 +73,7 @@ public interface FluidBoundarySystemInterface { * * @param i a int * @return a - * {@link neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.finiteVolumeBoundary.fluidBoundaryNode.FluidBoundaryNodeInterface} + * {@link neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.finitevolumeboundary.fluidboundarynode.FluidBoundaryNodeInterface} * object */ public FluidBoundaryNodeInterface getNode(int i); @@ -84,7 +84,7 @@ public interface FluidBoundarySystemInterface { *

* * @return a - * {@link neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.FluidBoundaryInterface} + * {@link neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.FluidBoundaryInterface} * object */ public FluidBoundaryInterface getFluidBoundary(); diff --git a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/finiteVolumeBoundary/fluidBoundarySystem/fluidBoundaryNonReactive/FluidBoundarySystemNonReactive.java b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/finitevolumeboundary/fluidboundarysystem/fluidboundarynonreactive/FluidBoundarySystemNonReactive.java similarity index 71% rename from src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/finiteVolumeBoundary/fluidBoundarySystem/fluidBoundaryNonReactive/FluidBoundarySystemNonReactive.java rename to src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/finitevolumeboundary/fluidboundarysystem/fluidboundarynonreactive/FluidBoundarySystemNonReactive.java index c73f6edbdf..197789d2e1 100644 --- a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/finiteVolumeBoundary/fluidBoundarySystem/fluidBoundaryNonReactive/FluidBoundarySystemNonReactive.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/finitevolumeboundary/fluidboundarysystem/fluidboundarynonreactive/FluidBoundarySystemNonReactive.java @@ -1,11 +1,11 @@ -package neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.finiteVolumeBoundary.fluidBoundarySystem.fluidBoundaryNonReactive; +package neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.finitevolumeboundary.fluidboundarysystem.fluidboundarynonreactive; -import neqsim.fluidMechanics.flowNode.FlowNodeInterface; -import neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.FluidBoundaryInterface; -import neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.finiteVolumeBoundary.fluidBoundaryNode.fluidBoundaryNonReactiveNode.FluidBoundaryNodeNonReactive; -import neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.finiteVolumeBoundary.fluidBoundarySystem.FluidBoundarySystem; -import neqsim.fluidMechanics.flowNode.twoPhaseNode.twoPhasePipeFlowNode.StratifiedFlowNode; -import neqsim.fluidMechanics.geometryDefinitions.pipe.PipeData; +import neqsim.fluidmechanics.flownode.FlowNodeInterface; +import neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.FluidBoundaryInterface; +import neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.finitevolumeboundary.fluidboundarynode.fluidboundarynonreactivenode.FluidBoundaryNodeNonReactive; +import neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.finitevolumeboundary.fluidboundarysystem.FluidBoundarySystem; +import neqsim.fluidmechanics.flownode.twophasenode.twophasepipeflownode.StratifiedFlowNode; +import neqsim.fluidmechanics.geometrydefinitions.pipe.PipeData; import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.system.SystemFurstElectrolyteEos; import neqsim.thermo.system.SystemInterface; @@ -32,7 +32,7 @@ public FluidBoundarySystemNonReactive() {} *

* * @param boundary a - * {@link neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.FluidBoundaryInterface} + * {@link neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.FluidBoundaryInterface} * object */ public FluidBoundarySystemNonReactive(FluidBoundaryInterface boundary) { diff --git a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/finiteVolumeBoundary/fluidBoundarySystem/fluidBoundarySystemReactive/FluidBoundarySystemReactive.java b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/finitevolumeboundary/fluidboundarysystem/fluidboundarysystemreactive/FluidBoundarySystemReactive.java similarity index 72% rename from src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/finiteVolumeBoundary/fluidBoundarySystem/fluidBoundarySystemReactive/FluidBoundarySystemReactive.java rename to src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/finitevolumeboundary/fluidboundarysystem/fluidboundarysystemreactive/FluidBoundarySystemReactive.java index 85e97dc80e..ad7983910e 100644 --- a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/finiteVolumeBoundary/fluidBoundarySystem/fluidBoundarySystemReactive/FluidBoundarySystemReactive.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/finitevolumeboundary/fluidboundarysystem/fluidboundarysystemreactive/FluidBoundarySystemReactive.java @@ -4,14 +4,14 @@ * Created on 8. august 2001, 13:56 */ -package neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.finiteVolumeBoundary.fluidBoundarySystem.fluidBoundarySystemReactive; +package neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.finitevolumeboundary.fluidboundarysystem.fluidboundarysystemreactive; -import neqsim.fluidMechanics.flowNode.FlowNodeInterface; -import neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.FluidBoundaryInterface; -import neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.finiteVolumeBoundary.fluidBoundaryNode.fluidBoundaryReactiveNode.FluidBoundaryNodeReactive; -import neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.finiteVolumeBoundary.fluidBoundarySystem.FluidBoundarySystem; -import neqsim.fluidMechanics.flowNode.twoPhaseNode.twoPhasePipeFlowNode.StratifiedFlowNode; -import neqsim.fluidMechanics.geometryDefinitions.pipe.PipeData; +import neqsim.fluidmechanics.flownode.FlowNodeInterface; +import neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.FluidBoundaryInterface; +import neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.finitevolumeboundary.fluidboundarynode.fluidboundaryreactivenode.FluidBoundaryNodeReactive; +import neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.finitevolumeboundary.fluidboundarysystem.FluidBoundarySystem; +import neqsim.fluidmechanics.flownode.twophasenode.twophasepipeflownode.StratifiedFlowNode; +import neqsim.fluidmechanics.geometrydefinitions.pipe.PipeData; import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.system.SystemFurstElectrolyteEos; import neqsim.thermo.system.SystemInterface; @@ -38,7 +38,7 @@ public FluidBoundarySystemReactive() {} *

* * @param boundary a - * {@link neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.FluidBoundaryInterface} + * {@link neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.FluidBoundaryInterface} * object */ public FluidBoundarySystemReactive(FluidBoundaryInterface boundary) { diff --git a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/nonEquilibriumFluidBoundary/NonEquilibriumFluidBoundary.java b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/nonequilibriumfluidboundary/NonEquilibriumFluidBoundary.java similarity index 98% rename from src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/nonEquilibriumFluidBoundary/NonEquilibriumFluidBoundary.java rename to src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/nonequilibriumfluidboundary/NonEquilibriumFluidBoundary.java index 4458546fc0..0d14a3f1f1 100644 --- a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/nonEquilibriumFluidBoundary/NonEquilibriumFluidBoundary.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/nonequilibriumfluidboundary/NonEquilibriumFluidBoundary.java @@ -1,9 +1,12 @@ -package neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.nonEquilibriumFluidBoundary; +package neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.nonequilibriumfluidboundary; -import Jama.Matrix; -import neqsim.fluidMechanics.flowNode.FlowNodeInterface; +import neqsim.fluidmechanics.flownode.FlowNodeInterface; import neqsim.thermo.system.SystemInterface; +import Jama.Matrix; + + + /** *

* Abstract NonEquilibriumFluidBoundary class. @@ -13,7 +16,7 @@ * @version $Id: $Id */ public abstract class NonEquilibriumFluidBoundary - extends neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.FluidBoundary { + extends neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.FluidBoundary { private static final long serialVersionUID = 1000; protected int neq = 0; @@ -63,7 +66,7 @@ public NonEquilibriumFluidBoundary(SystemInterface system) { * Constructor for NonEquilibriumFluidBoundary. *

* - * @param flowNode a {@link neqsim.fluidMechanics.flowNode.FlowNodeInterface} object + * @param flowNode a {@link neqsim.fluidmechanics.flownode.FlowNodeInterface} object */ public NonEquilibriumFluidBoundary(FlowNodeInterface flowNode) { super(flowNode); diff --git a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/nonEquilibriumFluidBoundary/filmModelBoundary/KrishnaStandartFilmModel.java b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/nonequilibriumfluidboundary/filmmodelboundary/KrishnaStandartFilmModel.java similarity index 95% rename from src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/nonEquilibriumFluidBoundary/filmModelBoundary/KrishnaStandartFilmModel.java rename to src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/nonequilibriumfluidboundary/filmmodelboundary/KrishnaStandartFilmModel.java index bc527dfac1..20aae3ed9e 100644 --- a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/nonEquilibriumFluidBoundary/filmModelBoundary/KrishnaStandartFilmModel.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/nonequilibriumfluidboundary/filmmodelboundary/KrishnaStandartFilmModel.java @@ -1,13 +1,13 @@ -package neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.nonEquilibriumFluidBoundary.filmModelBoundary; +package neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.nonequilibriumfluidboundary.filmmodelboundary; import Jama.Matrix; -import neqsim.fluidMechanics.flowNode.FlowNodeInterface; -import neqsim.fluidMechanics.flowNode.twoPhaseNode.twoPhasePipeFlowNode.AnnularFlow; -import neqsim.fluidMechanics.geometryDefinitions.pipe.PipeData; +import neqsim.fluidmechanics.flownode.FlowNodeInterface; +import neqsim.fluidmechanics.flownode.twophasenode.twophasepipeflownode.AnnularFlow; +import neqsim.fluidmechanics.geometrydefinitions.pipe.PipeData; import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

@@ -18,7 +18,7 @@ * @version $Id: $Id */ public class KrishnaStandartFilmModel extends - neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.nonEquilibriumFluidBoundary.NonEquilibriumFluidBoundary + neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.nonequilibriumfluidboundary.NonEquilibriumFluidBoundary implements ThermodynamicConstantsInterface { private static final long serialVersionUID = 1000; @@ -51,7 +51,7 @@ public KrishnaStandartFilmModel(SystemInterface system) { * Constructor for KrishnaStandartFilmModel. *

* - * @param flowNode a {@link neqsim.fluidMechanics.flowNode.FlowNodeInterface} object + * @param flowNode a {@link neqsim.fluidmechanics.flownode.FlowNodeInterface} object */ public KrishnaStandartFilmModel(FlowNodeInterface flowNode) { super(flowNode); diff --git a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/nonEquilibriumFluidBoundary/filmModelBoundary/reactiveFilmModel/ReactiveFluidBoundary.java b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/nonequilibriumfluidboundary/filmmodelboundary/reactivefilmmodel/ReactiveFluidBoundary.java similarity index 98% rename from src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/nonEquilibriumFluidBoundary/filmModelBoundary/reactiveFilmModel/ReactiveFluidBoundary.java rename to src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/nonequilibriumfluidboundary/filmmodelboundary/reactivefilmmodel/ReactiveFluidBoundary.java index 773c0d3d62..fba1e17e3e 100644 --- a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/nonEquilibriumFluidBoundary/filmModelBoundary/reactiveFilmModel/ReactiveFluidBoundary.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/nonequilibriumfluidboundary/filmmodelboundary/reactivefilmmodel/ReactiveFluidBoundary.java @@ -1,8 +1,8 @@ -package neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.nonEquilibriumFluidBoundary.filmModelBoundary.reactiveFilmModel; +package neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.nonequilibriumfluidboundary.filmmodelboundary.reactivefilmmodel; import Jama.Matrix; -import neqsim.fluidMechanics.flowNode.FlowNodeInterface; -import neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.nonEquilibriumFluidBoundary.filmModelBoundary.KrishnaStandartFilmModel; +import neqsim.fluidmechanics.flownode.FlowNodeInterface; +import neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.nonequilibriumfluidboundary.filmmodelboundary.KrishnaStandartFilmModel; import neqsim.thermo.system.SystemInterface; /** @@ -56,7 +56,7 @@ public ReactiveFluidBoundary(SystemInterface system) { * Constructor for ReactiveFluidBoundary. *

* - * @param flowNode a {@link neqsim.fluidMechanics.flowNode.FlowNodeInterface} object + * @param flowNode a {@link neqsim.fluidmechanics.flownode.FlowNodeInterface} object */ public ReactiveFluidBoundary(FlowNodeInterface flowNode) { super(flowNode); diff --git a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/nonEquilibriumFluidBoundary/filmModelBoundary/reactiveFilmModel/ReactiveKrishnaStandartFilmModel.java b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/nonequilibriumfluidboundary/filmmodelboundary/reactivefilmmodel/ReactiveKrishnaStandartFilmModel.java similarity index 76% rename from src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/nonEquilibriumFluidBoundary/filmModelBoundary/reactiveFilmModel/ReactiveKrishnaStandartFilmModel.java rename to src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/nonequilibriumfluidboundary/filmmodelboundary/reactivefilmmodel/ReactiveKrishnaStandartFilmModel.java index eee40422b8..e96eee9569 100644 --- a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/nonEquilibriumFluidBoundary/filmModelBoundary/reactiveFilmModel/ReactiveKrishnaStandartFilmModel.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/nonequilibriumfluidboundary/filmmodelboundary/reactivefilmmodel/ReactiveKrishnaStandartFilmModel.java @@ -4,13 +4,13 @@ * Created on 3. august 2001, 12:15 */ -package neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.nonEquilibriumFluidBoundary.filmModelBoundary.reactiveFilmModel; +package neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.nonequilibriumfluidboundary.filmmodelboundary.reactivefilmmodel; import Jama.Matrix; -import neqsim.fluidMechanics.flowNode.FlowNodeInterface; -import neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.nonEquilibriumFluidBoundary.filmModelBoundary.KrishnaStandartFilmModel; -import neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.nonEquilibriumFluidBoundary.filmModelBoundary.reactiveFilmModel.enhancementFactor.EnhancementFactorAlg; -import neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.nonEquilibriumFluidBoundary.filmModelBoundary.reactiveFilmModel.enhancementFactor.EnhancementFactorNumeric; +import neqsim.fluidmechanics.flownode.FlowNodeInterface; +import neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.nonequilibriumfluidboundary.filmmodelboundary.KrishnaStandartFilmModel; +import neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.nonequilibriumfluidboundary.filmmodelboundary.reactivefilmmodel.enhancementfactor.EnhancementFactorAlg; +import neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.nonequilibriumfluidboundary.filmmodelboundary.reactivefilmmodel.enhancementfactor.EnhancementFactorNumeric; import neqsim.thermo.system.SystemInterface; /** @@ -43,7 +43,7 @@ public ReactiveKrishnaStandartFilmModel(SystemInterface system) { * Constructor for ReactiveKrishnaStandartFilmModel. *

* - * @param flowNode a {@link neqsim.fluidMechanics.flowNode.FlowNodeInterface} object + * @param flowNode a {@link neqsim.fluidmechanics.flownode.FlowNodeInterface} object */ public ReactiveKrishnaStandartFilmModel(FlowNodeInterface flowNode) { super(flowNode); diff --git a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/nonEquilibriumFluidBoundary/filmModelBoundary/reactiveFilmModel/enhancementFactor/EnhancementFactor.java b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/nonequilibriumfluidboundary/filmmodelboundary/reactivefilmmodel/enhancementfactor/EnhancementFactor.java similarity index 86% rename from src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/nonEquilibriumFluidBoundary/filmModelBoundary/reactiveFilmModel/enhancementFactor/EnhancementFactor.java rename to src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/nonequilibriumfluidboundary/filmmodelboundary/reactivefilmmodel/enhancementfactor/EnhancementFactor.java index d749d47b11..c00d4f0554 100644 --- a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/nonEquilibriumFluidBoundary/filmModelBoundary/reactiveFilmModel/enhancementFactor/EnhancementFactor.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/nonequilibriumfluidboundary/filmmodelboundary/reactivefilmmodel/enhancementfactor/EnhancementFactor.java @@ -4,10 +4,10 @@ * Created on 3. august 2001, 08:45 */ -package neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.nonEquilibriumFluidBoundary.filmModelBoundary.reactiveFilmModel.enhancementFactor; +package neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.nonequilibriumfluidboundary.filmmodelboundary.reactivefilmmodel.enhancementfactor; -import neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.FluidBoundaryInterface; -import neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.finiteVolumeBoundary.fluidBoundarySystem.FluidBoundarySystemInterface; +import neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.FluidBoundaryInterface; +import neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.finitevolumeboundary.fluidboundarysystem.FluidBoundarySystemInterface; /** *

@@ -36,7 +36,7 @@ public EnhancementFactor() {} *

* * @param fluidBoundary a - * {@link neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.FluidBoundaryInterface} + * {@link neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.FluidBoundaryInterface} * object */ public EnhancementFactor(FluidBoundaryInterface fluidBoundary) { diff --git a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/nonEquilibriumFluidBoundary/filmModelBoundary/reactiveFilmModel/enhancementFactor/EnhancementFactorAlg.java b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/nonequilibriumfluidboundary/filmmodelboundary/reactivefilmmodel/enhancementfactor/EnhancementFactorAlg.java similarity index 93% rename from src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/nonEquilibriumFluidBoundary/filmModelBoundary/reactiveFilmModel/enhancementFactor/EnhancementFactorAlg.java rename to src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/nonequilibriumfluidboundary/filmmodelboundary/reactivefilmmodel/enhancementfactor/EnhancementFactorAlg.java index adaa38ec3c..ac87c055ff 100644 --- a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/nonEquilibriumFluidBoundary/filmModelBoundary/reactiveFilmModel/enhancementFactor/EnhancementFactorAlg.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/nonequilibriumfluidboundary/filmmodelboundary/reactivefilmmodel/enhancementfactor/EnhancementFactorAlg.java @@ -1,6 +1,6 @@ -package neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.nonEquilibriumFluidBoundary.filmModelBoundary.reactiveFilmModel.enhancementFactor; +package neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.nonequilibriumfluidboundary.filmmodelboundary.reactivefilmmodel.enhancementfactor; -import neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.FluidBoundaryInterface; +import neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.FluidBoundaryInterface; /** *

@@ -18,7 +18,7 @@ public class EnhancementFactorAlg extends EnhancementFactor { *

* * @param fluidBoundary a - * {@link neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.FluidBoundaryInterface} + * {@link neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.FluidBoundaryInterface} * object */ public EnhancementFactorAlg(FluidBoundaryInterface fluidBoundary) { diff --git a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/nonEquilibriumFluidBoundary/filmModelBoundary/reactiveFilmModel/enhancementFactor/EnhancementFactorInterface.java b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/nonequilibriumfluidboundary/filmmodelboundary/reactivefilmmodel/enhancementfactor/EnhancementFactorInterface.java similarity index 80% rename from src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/nonEquilibriumFluidBoundary/filmModelBoundary/reactiveFilmModel/enhancementFactor/EnhancementFactorInterface.java rename to src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/nonequilibriumfluidboundary/filmmodelboundary/reactivefilmmodel/enhancementfactor/EnhancementFactorInterface.java index 3af9a0116d..5f93251d01 100644 --- a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/nonEquilibriumFluidBoundary/filmModelBoundary/reactiveFilmModel/enhancementFactor/EnhancementFactorInterface.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/nonequilibriumfluidboundary/filmmodelboundary/reactivefilmmodel/enhancementfactor/EnhancementFactorInterface.java @@ -4,7 +4,7 @@ * Created on 3. august 2001, 11:58 */ -package neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.nonEquilibriumFluidBoundary.filmModelBoundary.reactiveFilmModel.enhancementFactor; +package neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.nonequilibriumfluidboundary.filmmodelboundary.reactivefilmmodel.enhancementfactor; /** *

diff --git a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/nonEquilibriumFluidBoundary/filmModelBoundary/reactiveFilmModel/enhancementFactor/EnhancementFactorNumeric.java b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/nonequilibriumfluidboundary/filmmodelboundary/reactivefilmmodel/enhancementfactor/EnhancementFactorNumeric.java similarity index 66% rename from src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/nonEquilibriumFluidBoundary/filmModelBoundary/reactiveFilmModel/enhancementFactor/EnhancementFactorNumeric.java rename to src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/nonequilibriumfluidboundary/filmmodelboundary/reactivefilmmodel/enhancementfactor/EnhancementFactorNumeric.java index 93d20ad11a..394bd8bbb3 100644 --- a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/nonEquilibriumFluidBoundary/filmModelBoundary/reactiveFilmModel/enhancementFactor/EnhancementFactorNumeric.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/nonequilibriumfluidboundary/filmmodelboundary/reactivefilmmodel/enhancementfactor/EnhancementFactorNumeric.java @@ -1,8 +1,8 @@ -package neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.nonEquilibriumFluidBoundary.filmModelBoundary.reactiveFilmModel.enhancementFactor; +package neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.nonequilibriumfluidboundary.filmmodelboundary.reactivefilmmodel.enhancementfactor; -import neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.FluidBoundaryInterface; -import neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.finiteVolumeBoundary.fluidBoundarySystem.fluidBoundaryNonReactive.FluidBoundarySystemNonReactive; -import neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.finiteVolumeBoundary.fluidBoundarySystem.fluidBoundarySystemReactive.FluidBoundarySystemReactive; +import neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.FluidBoundaryInterface; +import neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.finitevolumeboundary.fluidboundarysystem.fluidboundarynonreactive.FluidBoundarySystemNonReactive; +import neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.finitevolumeboundary.fluidboundarysystem.fluidboundarysystemreactive.FluidBoundarySystemReactive; /** *

@@ -20,7 +20,7 @@ public class EnhancementFactorNumeric extends EnhancementFactor { *

* * @param fluidBoundary a - * {@link neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.FluidBoundaryInterface} + * {@link neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.FluidBoundaryInterface} * object */ public EnhancementFactorNumeric(FluidBoundaryInterface fluidBoundary) { diff --git a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/interphaseTransportCoefficient/InterphaseTransportCoefficientBaseClass.java b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/interphasetransportcoefficient/InterphaseTransportCoefficientBaseClass.java similarity index 91% rename from src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/interphaseTransportCoefficient/InterphaseTransportCoefficientBaseClass.java rename to src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/interphasetransportcoefficient/InterphaseTransportCoefficientBaseClass.java index 07fae81837..e6b3679812 100644 --- a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/interphaseTransportCoefficient/InterphaseTransportCoefficientBaseClass.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/interphasetransportcoefficient/InterphaseTransportCoefficientBaseClass.java @@ -1,6 +1,6 @@ -package neqsim.fluidMechanics.flowNode.fluidBoundary.interphaseTransportCoefficient; +package neqsim.fluidmechanics.flownode.fluidboundary.interphasetransportcoefficient; -import neqsim.fluidMechanics.flowNode.FlowNodeInterface; +import neqsim.fluidmechanics.flownode.FlowNodeInterface; /** *

@@ -22,7 +22,7 @@ public InterphaseTransportCoefficientBaseClass() {} * Constructor for InterphaseTransportCoefficientBaseClass. *

* - * @param node a {@link neqsim.fluidMechanics.flowNode.FlowNodeInterface} object + * @param node a {@link neqsim.fluidmechanics.flownode.FlowNodeInterface} object */ public InterphaseTransportCoefficientBaseClass(FlowNodeInterface node) { // flowNode = node; diff --git a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/interphaseTransportCoefficient/InterphaseTransportCoefficientInterface.java b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/interphasetransportcoefficient/InterphaseTransportCoefficientInterface.java similarity index 76% rename from src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/interphaseTransportCoefficient/InterphaseTransportCoefficientInterface.java rename to src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/interphasetransportcoefficient/InterphaseTransportCoefficientInterface.java index 8263ab3647..7cc844b4a1 100644 --- a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/interphaseTransportCoefficient/InterphaseTransportCoefficientInterface.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/interphasetransportcoefficient/InterphaseTransportCoefficientInterface.java @@ -1,6 +1,6 @@ -package neqsim.fluidMechanics.flowNode.fluidBoundary.interphaseTransportCoefficient; +package neqsim.fluidmechanics.flownode.fluidboundary.interphasetransportcoefficient; -import neqsim.fluidMechanics.flowNode.FlowNodeInterface; +import neqsim.fluidmechanics.flownode.FlowNodeInterface; /** *

@@ -16,7 +16,7 @@ public interface InterphaseTransportCoefficientInterface { * calcWallFrictionFactor. *

* - * @param node a {@link neqsim.fluidMechanics.flowNode.FlowNodeInterface} object + * @param node a {@link neqsim.fluidmechanics.flownode.FlowNodeInterface} object * @return a double */ public double calcWallFrictionFactor(FlowNodeInterface node); @@ -27,7 +27,7 @@ public interface InterphaseTransportCoefficientInterface { *

* * @param phase a int - * @param node a {@link neqsim.fluidMechanics.flowNode.FlowNodeInterface} object + * @param node a {@link neqsim.fluidmechanics.flownode.FlowNodeInterface} object * @return a double */ public double calcWallFrictionFactor(int phase, FlowNodeInterface node); @@ -38,7 +38,7 @@ public interface InterphaseTransportCoefficientInterface { *

* * @param phase a int - * @param node a {@link neqsim.fluidMechanics.flowNode.FlowNodeInterface} object + * @param node a {@link neqsim.fluidmechanics.flownode.FlowNodeInterface} object * @return a double */ public double calcInterPhaseFrictionFactor(int phase, FlowNodeInterface node); @@ -50,7 +50,7 @@ public interface InterphaseTransportCoefficientInterface { * * @param phase a int * @param prandtlNumber a double - * @param node a {@link neqsim.fluidMechanics.flowNode.FlowNodeInterface} object + * @param node a {@link neqsim.fluidmechanics.flownode.FlowNodeInterface} object * @return a double */ public double calcInterphaseHeatTransferCoefficient(int phase, double prandtlNumber, @@ -63,7 +63,7 @@ public double calcInterphaseHeatTransferCoefficient(int phase, double prandtlNum * * @param phase a int * @param schmidt a double - * @param node a {@link neqsim.fluidMechanics.flowNode.FlowNodeInterface} object + * @param node a {@link neqsim.fluidmechanics.flownode.FlowNodeInterface} object * @return a double */ public double calcInterphaseMassTransferCoefficient(int phase, double schmidt, @@ -76,7 +76,7 @@ public double calcInterphaseMassTransferCoefficient(int phase, double schmidt, * * @param phase a int * @param schmidt a double - * @param node a {@link neqsim.fluidMechanics.flowNode.FlowNodeInterface} object + * @param node a {@link neqsim.fluidmechanics.flownode.FlowNodeInterface} object * @return a double */ public double calcWallMassTransferCoefficient(int phase, double schmidt, FlowNodeInterface node); @@ -87,7 +87,7 @@ public double calcInterphaseMassTransferCoefficient(int phase, double schmidt, *

* * @param phase a int - * @param node a {@link neqsim.fluidMechanics.flowNode.FlowNodeInterface} object + * @param node a {@link neqsim.fluidmechanics.flownode.FlowNodeInterface} object * @return a double */ public double calcWallHeatTransferCoefficient(int phase, FlowNodeInterface node); @@ -99,7 +99,7 @@ public double calcInterphaseMassTransferCoefficient(int phase, double schmidt, * * @param phase a int * @param prandtlNumber a double - * @param node a {@link neqsim.fluidMechanics.flowNode.FlowNodeInterface} object + * @param node a {@link neqsim.fluidmechanics.flownode.FlowNodeInterface} object * @return a double */ public double calcWallHeatTransferCoefficient(int phase, double prandtlNumber, diff --git a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/interphaseTransportCoefficient/interphaseOnePhase/InterphaseOnePhase.java b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/interphasetransportcoefficient/interphaseonephase/InterphaseOnePhase.java similarity index 56% rename from src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/interphaseTransportCoefficient/interphaseOnePhase/InterphaseOnePhase.java rename to src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/interphasetransportcoefficient/interphaseonephase/InterphaseOnePhase.java index b067734938..effe7f2f68 100644 --- a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/interphaseTransportCoefficient/interphaseOnePhase/InterphaseOnePhase.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/interphasetransportcoefficient/interphaseonephase/InterphaseOnePhase.java @@ -1,7 +1,7 @@ -package neqsim.fluidMechanics.flowNode.fluidBoundary.interphaseTransportCoefficient.interphaseOnePhase; +package neqsim.fluidmechanics.flownode.fluidboundary.interphasetransportcoefficient.interphaseonephase; -import neqsim.fluidMechanics.flowNode.FlowNodeInterface; -import neqsim.fluidMechanics.flowNode.fluidBoundary.interphaseTransportCoefficient.InterphaseTransportCoefficientBaseClass; +import neqsim.fluidmechanics.flownode.FlowNodeInterface; +import neqsim.fluidmechanics.flownode.fluidboundary.interphasetransportcoefficient.InterphaseTransportCoefficientBaseClass; /** *

@@ -24,7 +24,7 @@ public InterphaseOnePhase() {} * Constructor for InterphaseOnePhase. *

* - * @param node a {@link neqsim.fluidMechanics.flowNode.FlowNodeInterface} object + * @param node a {@link neqsim.fluidmechanics.flownode.FlowNodeInterface} object */ public InterphaseOnePhase(FlowNodeInterface node) { // flowNode = node; diff --git a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/interphaseTransportCoefficient/interphaseOnePhase/interphasePipeFlow/InterphasePipeFlow.java b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/interphasetransportcoefficient/interphaseonephase/interphasepipeflow/InterphasePipeFlow.java similarity index 86% rename from src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/interphaseTransportCoefficient/interphaseOnePhase/interphasePipeFlow/InterphasePipeFlow.java rename to src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/interphasetransportcoefficient/interphaseonephase/interphasepipeflow/InterphasePipeFlow.java index 2280b24786..3c2349dc04 100644 --- a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/interphaseTransportCoefficient/interphaseOnePhase/interphasePipeFlow/InterphasePipeFlow.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/interphasetransportcoefficient/interphaseonephase/interphasepipeflow/InterphasePipeFlow.java @@ -1,7 +1,7 @@ -package neqsim.fluidMechanics.flowNode.fluidBoundary.interphaseTransportCoefficient.interphaseOnePhase.interphasePipeFlow; +package neqsim.fluidmechanics.flownode.fluidboundary.interphasetransportcoefficient.interphaseonephase.interphasepipeflow; -import neqsim.fluidMechanics.flowNode.FlowNodeInterface; -import neqsim.fluidMechanics.flowNode.fluidBoundary.interphaseTransportCoefficient.interphaseOnePhase.InterphaseOnePhase; +import neqsim.fluidmechanics.flownode.FlowNodeInterface; +import neqsim.fluidmechanics.flownode.fluidboundary.interphasetransportcoefficient.interphaseonephase.InterphaseOnePhase; /** *

@@ -24,7 +24,7 @@ public InterphasePipeFlow() {} * Constructor for InterphasePipeFlow. *

* - * @param node a {@link neqsim.fluidMechanics.flowNode.FlowNodeInterface} object + * @param node a {@link neqsim.fluidmechanics.flownode.FlowNodeInterface} object */ public InterphasePipeFlow(FlowNodeInterface node) { // flowNode = node; diff --git a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/interphaseTransportCoefficient/interphaseTwoPhase/InterphaseTwoPhase.java b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/interphasetransportcoefficient/interphasetwophase/InterphaseTwoPhase.java similarity index 56% rename from src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/interphaseTransportCoefficient/interphaseTwoPhase/InterphaseTwoPhase.java rename to src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/interphasetransportcoefficient/interphasetwophase/InterphaseTwoPhase.java index 09518c0905..c7505ceecd 100644 --- a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/interphaseTransportCoefficient/interphaseTwoPhase/InterphaseTwoPhase.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/interphasetransportcoefficient/interphasetwophase/InterphaseTwoPhase.java @@ -1,7 +1,7 @@ -package neqsim.fluidMechanics.flowNode.fluidBoundary.interphaseTransportCoefficient.interphaseTwoPhase; +package neqsim.fluidmechanics.flownode.fluidboundary.interphasetransportcoefficient.interphasetwophase; -import neqsim.fluidMechanics.flowNode.FlowNodeInterface; -import neqsim.fluidMechanics.flowNode.fluidBoundary.interphaseTransportCoefficient.InterphaseTransportCoefficientBaseClass; +import neqsim.fluidmechanics.flownode.FlowNodeInterface; +import neqsim.fluidmechanics.flownode.fluidboundary.interphasetransportcoefficient.InterphaseTransportCoefficientBaseClass; /** *

@@ -24,7 +24,7 @@ public InterphaseTwoPhase() {} * Constructor for InterphaseTwoPhase. *

* - * @param node a {@link neqsim.fluidMechanics.flowNode.FlowNodeInterface} object + * @param node a {@link neqsim.fluidmechanics.flownode.FlowNodeInterface} object */ public InterphaseTwoPhase(FlowNodeInterface node) { // flowNode = node; diff --git a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/interphaseTransportCoefficient/interphaseTwoPhase/interphaseReactorFlow/InterphasePackedBed.java b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/interphasetransportcoefficient/interphasetwophase/interphaseReactorFlow/InterphasePackedBed.java similarity index 92% rename from src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/interphaseTransportCoefficient/interphaseTwoPhase/interphaseReactorFlow/InterphasePackedBed.java rename to src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/interphasetransportcoefficient/interphasetwophase/interphaseReactorFlow/InterphasePackedBed.java index 07acd6cc4c..3088f2a2b2 100644 --- a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/interphaseTransportCoefficient/interphaseTwoPhase/interphaseReactorFlow/InterphasePackedBed.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/interphasetransportcoefficient/interphasetwophase/interphaseReactorFlow/InterphasePackedBed.java @@ -1,6 +1,6 @@ -package neqsim.fluidMechanics.flowNode.fluidBoundary.interphaseTransportCoefficient.interphaseTwoPhase.interphaseReactorFlow; +package neqsim.fluidmechanics.flownode.fluidboundary.interphasetransportcoefficient.interphasetwophase.interphaseReactorFlow; -import neqsim.fluidMechanics.flowNode.FlowNodeInterface; +import neqsim.fluidmechanics.flownode.FlowNodeInterface; /** *

@@ -26,7 +26,7 @@ public InterphasePackedBed() {} * Constructor for InterphasePackedBed. *

* - * @param node a {@link neqsim.fluidMechanics.flowNode.FlowNodeInterface} object + * @param node a {@link neqsim.fluidmechanics.flownode.FlowNodeInterface} object */ public InterphasePackedBed(FlowNodeInterface node) { // flowNode = node; diff --git a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/interphaseTransportCoefficient/interphaseTwoPhase/interphaseReactorFlow/InterphaseReactorFlow.java b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/interphasetransportcoefficient/interphasetwophase/interphaseReactorFlow/InterphaseReactorFlow.java similarity index 55% rename from src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/interphaseTransportCoefficient/interphaseTwoPhase/interphaseReactorFlow/InterphaseReactorFlow.java rename to src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/interphasetransportcoefficient/interphasetwophase/interphaseReactorFlow/InterphaseReactorFlow.java index 9798f71a1a..60e75eb0a0 100644 --- a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/interphaseTransportCoefficient/interphaseTwoPhase/interphaseReactorFlow/InterphaseReactorFlow.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/interphasetransportcoefficient/interphasetwophase/interphaseReactorFlow/InterphaseReactorFlow.java @@ -1,7 +1,7 @@ -package neqsim.fluidMechanics.flowNode.fluidBoundary.interphaseTransportCoefficient.interphaseTwoPhase.interphaseReactorFlow; +package neqsim.fluidmechanics.flownode.fluidboundary.interphasetransportcoefficient.interphasetwophase.interphaseReactorFlow; -import neqsim.fluidMechanics.flowNode.FlowNodeInterface; -import neqsim.fluidMechanics.flowNode.fluidBoundary.interphaseTransportCoefficient.interphaseTwoPhase.InterphaseTwoPhase; +import neqsim.fluidmechanics.flownode.FlowNodeInterface; +import neqsim.fluidmechanics.flownode.fluidboundary.interphasetransportcoefficient.interphasetwophase.InterphaseTwoPhase; /** *

@@ -24,7 +24,7 @@ public InterphaseReactorFlow() {} * Constructor for InterphaseReactorFlow. *

* - * @param node a {@link neqsim.fluidMechanics.flowNode.FlowNodeInterface} object + * @param node a {@link neqsim.fluidmechanics.flownode.FlowNodeInterface} object */ public InterphaseReactorFlow(FlowNodeInterface node) { // flowNode = node; diff --git a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/interphaseTransportCoefficient/interphaseTwoPhase/interphasePipeFlow/InterphaseAnnularFlow.java b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/interphasetransportcoefficient/interphasetwophase/interphasepipeflow/InterphaseAnnularFlow.java similarity index 68% rename from src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/interphaseTransportCoefficient/interphaseTwoPhase/interphasePipeFlow/InterphaseAnnularFlow.java rename to src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/interphasetransportcoefficient/interphasetwophase/interphasepipeflow/InterphaseAnnularFlow.java index 9e61a4cfed..e628cd1fe1 100644 --- a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/interphaseTransportCoefficient/interphaseTwoPhase/interphasePipeFlow/InterphaseAnnularFlow.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/interphasetransportcoefficient/interphasetwophase/interphasepipeflow/InterphaseAnnularFlow.java @@ -1,6 +1,6 @@ -package neqsim.fluidMechanics.flowNode.fluidBoundary.interphaseTransportCoefficient.interphaseTwoPhase.interphasePipeFlow; +package neqsim.fluidmechanics.flownode.fluidboundary.interphasetransportcoefficient.interphasetwophase.interphasepipeflow; -import neqsim.fluidMechanics.flowNode.FlowNodeInterface; +import neqsim.fluidmechanics.flownode.FlowNodeInterface; /** *

@@ -25,7 +25,7 @@ public InterphaseAnnularFlow() {} * Constructor for InterphaseAnnularFlow. *

* - * @param node a {@link neqsim.fluidMechanics.flowNode.FlowNodeInterface} object + * @param node a {@link neqsim.fluidmechanics.flownode.FlowNodeInterface} object */ public InterphaseAnnularFlow(FlowNodeInterface node) { // flowNode = node; diff --git a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/interphaseTransportCoefficient/interphaseTwoPhase/interphasePipeFlow/InterphaseDropletFlow.java b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/interphasetransportcoefficient/interphasetwophase/interphasepipeflow/InterphaseDropletFlow.java similarity index 96% rename from src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/interphaseTransportCoefficient/interphaseTwoPhase/interphasePipeFlow/InterphaseDropletFlow.java rename to src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/interphasetransportcoefficient/interphasetwophase/interphasepipeflow/InterphaseDropletFlow.java index b4aa12cf86..d0c028e5c7 100644 --- a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/interphaseTransportCoefficient/interphaseTwoPhase/interphasePipeFlow/InterphaseDropletFlow.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/interphasetransportcoefficient/interphasetwophase/interphasepipeflow/InterphaseDropletFlow.java @@ -1,6 +1,6 @@ -package neqsim.fluidMechanics.flowNode.fluidBoundary.interphaseTransportCoefficient.interphaseTwoPhase.interphasePipeFlow; +package neqsim.fluidmechanics.flownode.fluidboundary.interphasetransportcoefficient.interphasetwophase.interphasepipeflow; -import neqsim.fluidMechanics.flowNode.FlowNodeInterface; +import neqsim.fluidmechanics.flownode.FlowNodeInterface; /** *

@@ -24,7 +24,7 @@ public InterphaseDropletFlow() {} * Constructor for InterphaseDropletFlow. *

* - * @param node a {@link neqsim.fluidMechanics.flowNode.FlowNodeInterface} object + * @param node a {@link neqsim.fluidmechanics.flownode.FlowNodeInterface} object */ public InterphaseDropletFlow(FlowNodeInterface node) { // flowNode = node; diff --git a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/interphaseTransportCoefficient/interphaseTwoPhase/interphasePipeFlow/InterphaseStratifiedFlow.java b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/interphasetransportcoefficient/interphasetwophase/interphasepipeflow/InterphaseStratifiedFlow.java similarity index 96% rename from src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/interphaseTransportCoefficient/interphaseTwoPhase/interphasePipeFlow/InterphaseStratifiedFlow.java rename to src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/interphasetransportcoefficient/interphasetwophase/interphasepipeflow/InterphaseStratifiedFlow.java index 49fd4f4cbf..62fb8a21dd 100644 --- a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/interphaseTransportCoefficient/interphaseTwoPhase/interphasePipeFlow/InterphaseStratifiedFlow.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/interphasetransportcoefficient/interphasetwophase/interphasepipeflow/InterphaseStratifiedFlow.java @@ -1,6 +1,6 @@ -package neqsim.fluidMechanics.flowNode.fluidBoundary.interphaseTransportCoefficient.interphaseTwoPhase.interphasePipeFlow; +package neqsim.fluidmechanics.flownode.fluidboundary.interphasetransportcoefficient.interphasetwophase.interphasepipeflow; -import neqsim.fluidMechanics.flowNode.FlowNodeInterface; +import neqsim.fluidmechanics.flownode.FlowNodeInterface; /** *

@@ -24,7 +24,7 @@ public InterphaseStratifiedFlow() {} * Constructor for InterphaseStratifiedFlow. *

* - * @param node a {@link neqsim.fluidMechanics.flowNode.FlowNodeInterface} object + * @param node a {@link neqsim.fluidmechanics.flownode.FlowNodeInterface} object */ public InterphaseStratifiedFlow(FlowNodeInterface node) { // flowNode = node; diff --git a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/interphaseTransportCoefficient/interphaseTwoPhase/interphasePipeFlow/InterphaseTwoPhasePipeFlow.java b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/interphasetransportcoefficient/interphasetwophase/interphasepipeflow/InterphaseTwoPhasePipeFlow.java similarity index 57% rename from src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/interphaseTransportCoefficient/interphaseTwoPhase/interphasePipeFlow/InterphaseTwoPhasePipeFlow.java rename to src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/interphasetransportcoefficient/interphasetwophase/interphasepipeflow/InterphaseTwoPhasePipeFlow.java index f69f5205bf..c28bc291ab 100644 --- a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/interphaseTransportCoefficient/interphaseTwoPhase/interphasePipeFlow/InterphaseTwoPhasePipeFlow.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/interphasetransportcoefficient/interphasetwophase/interphasepipeflow/InterphaseTwoPhasePipeFlow.java @@ -1,7 +1,7 @@ -package neqsim.fluidMechanics.flowNode.fluidBoundary.interphaseTransportCoefficient.interphaseTwoPhase.interphasePipeFlow; +package neqsim.fluidmechanics.flownode.fluidboundary.interphasetransportcoefficient.interphasetwophase.interphasepipeflow; -import neqsim.fluidMechanics.flowNode.FlowNodeInterface; -import neqsim.fluidMechanics.flowNode.fluidBoundary.interphaseTransportCoefficient.interphaseTwoPhase.InterphaseTwoPhase; +import neqsim.fluidmechanics.flownode.FlowNodeInterface; +import neqsim.fluidmechanics.flownode.fluidboundary.interphasetransportcoefficient.interphasetwophase.InterphaseTwoPhase; /** *

@@ -24,7 +24,7 @@ public InterphaseTwoPhasePipeFlow() {} * Constructor for InterphaseTwoPhasePipeFlow. *

* - * @param node a {@link neqsim.fluidMechanics.flowNode.FlowNodeInterface} object + * @param node a {@link neqsim.fluidmechanics.flownode.FlowNodeInterface} object */ public InterphaseTwoPhasePipeFlow(FlowNodeInterface node) { // flowNode = node; diff --git a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/interphaseTransportCoefficient/interphaseTwoPhase/stirredCell/InterphaseStirredCellFlow.java b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/interphasetransportcoefficient/interphasetwophase/stirredcell/InterphaseStirredCellFlow.java similarity index 91% rename from src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/interphaseTransportCoefficient/interphaseTwoPhase/stirredCell/InterphaseStirredCellFlow.java rename to src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/interphasetransportcoefficient/interphasetwophase/stirredcell/InterphaseStirredCellFlow.java index 08a4eab6b7..5151bb2bb4 100644 --- a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/interphaseTransportCoefficient/interphaseTwoPhase/stirredCell/InterphaseStirredCellFlow.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/interphasetransportcoefficient/interphasetwophase/stirredcell/InterphaseStirredCellFlow.java @@ -1,7 +1,7 @@ -package neqsim.fluidMechanics.flowNode.fluidBoundary.interphaseTransportCoefficient.interphaseTwoPhase.stirredCell; +package neqsim.fluidmechanics.flownode.fluidboundary.interphasetransportcoefficient.interphasetwophase.stirredcell; -import neqsim.fluidMechanics.flowNode.FlowNodeInterface; -import neqsim.fluidMechanics.flowNode.fluidBoundary.interphaseTransportCoefficient.interphaseTwoPhase.interphasePipeFlow.InterphaseStratifiedFlow; +import neqsim.fluidmechanics.flownode.FlowNodeInterface; +import neqsim.fluidmechanics.flownode.fluidboundary.interphasetransportcoefficient.interphasetwophase.interphasepipeflow.InterphaseStratifiedFlow; /** *

@@ -26,7 +26,7 @@ public InterphaseStirredCellFlow() {} * Constructor for InterphaseStirredCellFlow. *

* - * @param node a {@link neqsim.fluidMechanics.flowNode.FlowNodeInterface} object + * @param node a {@link neqsim.fluidmechanics.flownode.FlowNodeInterface} object */ public InterphaseStirredCellFlow(FlowNodeInterface node) { // flowNode = node; diff --git a/src/main/java/neqsim/fluidMechanics/flowNode/multiPhaseNode/MultiPhaseFlowNode.java b/src/main/java/neqsim/fluidmechanics/flownode/multiphasenode/MultiPhaseFlowNode.java similarity index 97% rename from src/main/java/neqsim/fluidMechanics/flowNode/multiPhaseNode/MultiPhaseFlowNode.java rename to src/main/java/neqsim/fluidmechanics/flownode/multiphasenode/MultiPhaseFlowNode.java index c7271147e4..ff89d7726d 100644 --- a/src/main/java/neqsim/fluidMechanics/flowNode/multiPhaseNode/MultiPhaseFlowNode.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/multiphasenode/MultiPhaseFlowNode.java @@ -1,8 +1,8 @@ -package neqsim.fluidMechanics.flowNode.multiPhaseNode; +package neqsim.fluidmechanics.flownode.multiphasenode; -import neqsim.fluidMechanics.flowNode.FlowNode; -import neqsim.fluidMechanics.flowNode.twoPhaseNode.TwoPhaseFlowNode; -import neqsim.fluidMechanics.geometryDefinitions.GeometryDefinitionInterface; +import neqsim.fluidmechanics.flownode.FlowNode; +import neqsim.fluidmechanics.flownode.twophasenode.TwoPhaseFlowNode; +import neqsim.fluidmechanics.geometrydefinitions.GeometryDefinitionInterface; import neqsim.thermo.system.SystemInterface; /** @@ -29,7 +29,7 @@ public MultiPhaseFlowNode() {} *

* * @param system a {@link neqsim.thermo.system.SystemInterface} object - * @param pipe a {@link neqsim.fluidMechanics.geometryDefinitions.GeometryDefinitionInterface} + * @param pipe a {@link neqsim.fluidmechanics.geometrydefinitions.GeometryDefinitionInterface} * object */ public MultiPhaseFlowNode(SystemInterface system, GeometryDefinitionInterface pipe) { diff --git a/src/main/java/neqsim/fluidMechanics/flowNode/multiPhaseNode/waxNode/WaxDepositionFlowNode.java b/src/main/java/neqsim/fluidmechanics/flownode/multiphasenode/waxnode/WaxDepositionFlowNode.java similarity index 86% rename from src/main/java/neqsim/fluidMechanics/flowNode/multiPhaseNode/waxNode/WaxDepositionFlowNode.java rename to src/main/java/neqsim/fluidmechanics/flownode/multiphasenode/waxnode/WaxDepositionFlowNode.java index f2d85ec04e..a377e786c7 100644 --- a/src/main/java/neqsim/fluidMechanics/flowNode/multiPhaseNode/waxNode/WaxDepositionFlowNode.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/multiphasenode/waxnode/WaxDepositionFlowNode.java @@ -1,14 +1,14 @@ -package neqsim.fluidMechanics.flowNode.multiPhaseNode.waxNode; - -import neqsim.fluidMechanics.flowNode.FlowNodeInterface; -import neqsim.fluidMechanics.flowNode.fluidBoundary.interphaseTransportCoefficient.interphaseTwoPhase.interphasePipeFlow.InterphaseStratifiedFlow; -import neqsim.fluidMechanics.flowNode.multiPhaseNode.MultiPhaseFlowNode; -import neqsim.fluidMechanics.flowNode.twoPhaseNode.twoPhasePipeFlowNode.StratifiedFlowNode; -import neqsim.fluidMechanics.geometryDefinitions.GeometryDefinitionInterface; -import neqsim.fluidMechanics.geometryDefinitions.pipe.PipeData; +package neqsim.fluidmechanics.flownode.multiphasenode.waxnode; + +import neqsim.fluidmechanics.flownode.FlowNodeInterface; +import neqsim.fluidmechanics.flownode.fluidboundary.interphasetransportcoefficient.interphasetwophase.interphasepipeflow.InterphaseStratifiedFlow; +import neqsim.fluidmechanics.flownode.multiphasenode.MultiPhaseFlowNode; +import neqsim.fluidmechanics.flownode.twophasenode.twophasepipeflownode.StratifiedFlowNode; +import neqsim.fluidmechanics.geometrydefinitions.GeometryDefinitionInterface; +import neqsim.fluidmechanics.geometrydefinitions.pipe.PipeData; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

@@ -36,7 +36,7 @@ public WaxDepositionFlowNode() { *

* * @param system a {@link neqsim.thermo.system.SystemInterface} object - * @param pipe a {@link neqsim.fluidMechanics.geometryDefinitions.GeometryDefinitionInterface} + * @param pipe a {@link neqsim.fluidmechanics.geometrydefinitions.GeometryDefinitionInterface} * object */ public WaxDepositionFlowNode(SystemInterface system, GeometryDefinitionInterface pipe) { @@ -44,7 +44,7 @@ public WaxDepositionFlowNode(SystemInterface system, GeometryDefinitionInterface this.flowNodeType = "wax deposition node"; this.interphaseTransportCoefficient = new InterphaseStratifiedFlow(this); this.fluidBoundary = - new neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.nonEquilibriumFluidBoundary.filmModelBoundary.KrishnaStandartFilmModel( + new neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.nonequilibriumfluidboundary.filmmodelboundary.KrishnaStandartFilmModel( this); } @@ -55,7 +55,7 @@ public WaxDepositionFlowNode(SystemInterface system, GeometryDefinitionInterface * * @param system a {@link neqsim.thermo.system.SystemInterface} object * @param interphaseSystem a {@link neqsim.thermo.system.SystemInterface} object - * @param pipe a {@link neqsim.fluidMechanics.geometryDefinitions.GeometryDefinitionInterface} + * @param pipe a {@link neqsim.fluidmechanics.geometrydefinitions.GeometryDefinitionInterface} * object */ public WaxDepositionFlowNode(SystemInterface system, SystemInterface interphaseSystem, diff --git a/src/main/java/neqsim/fluidMechanics/flowNode/onePhaseNode/onePhaseFlowNode.java b/src/main/java/neqsim/fluidmechanics/flownode/onephasenode/onePhaseFlowNode.java similarity index 94% rename from src/main/java/neqsim/fluidMechanics/flowNode/onePhaseNode/onePhaseFlowNode.java rename to src/main/java/neqsim/fluidmechanics/flownode/onephasenode/onePhaseFlowNode.java index 27e02b15dc..a158d05ad7 100644 --- a/src/main/java/neqsim/fluidMechanics/flowNode/onePhaseNode/onePhaseFlowNode.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/onephasenode/onePhaseFlowNode.java @@ -1,7 +1,7 @@ -package neqsim.fluidMechanics.flowNode.onePhaseNode; +package neqsim.fluidmechanics.flownode.onephasenode; -import neqsim.fluidMechanics.flowNode.FlowNode; -import neqsim.fluidMechanics.geometryDefinitions.GeometryDefinitionInterface; +import neqsim.fluidmechanics.flownode.FlowNode; +import neqsim.fluidmechanics.geometrydefinitions.GeometryDefinitionInterface; import neqsim.thermo.system.SystemInterface; /** @@ -37,7 +37,7 @@ public onePhaseFlowNode(SystemInterface system) {} *

* * @param system a {@link neqsim.thermo.system.SystemInterface} object - * @param pipe a {@link neqsim.fluidMechanics.geometryDefinitions.GeometryDefinitionInterface} + * @param pipe a {@link neqsim.fluidmechanics.geometrydefinitions.GeometryDefinitionInterface} * object */ public onePhaseFlowNode(SystemInterface system, GeometryDefinitionInterface pipe) { diff --git a/src/main/java/neqsim/fluidMechanics/flowNode/onePhaseNode/onePhasePipeFlowNode/onePhasePipeFlowNode.java b/src/main/java/neqsim/fluidmechanics/flownode/onephasenode/onephasepipeflownode/onePhasePipeFlowNode.java similarity index 80% rename from src/main/java/neqsim/fluidMechanics/flowNode/onePhaseNode/onePhasePipeFlowNode/onePhasePipeFlowNode.java rename to src/main/java/neqsim/fluidmechanics/flownode/onephasenode/onephasepipeflownode/onePhasePipeFlowNode.java index 285b71835e..5118c45d96 100644 --- a/src/main/java/neqsim/fluidMechanics/flowNode/onePhaseNode/onePhasePipeFlowNode/onePhasePipeFlowNode.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/onephasenode/onephasepipeflownode/onePhasePipeFlowNode.java @@ -1,13 +1,13 @@ -package neqsim.fluidMechanics.flowNode.onePhaseNode.onePhasePipeFlowNode; +package neqsim.fluidmechanics.flownode.onephasenode.onephasepipeflownode; -import neqsim.fluidMechanics.flowNode.FlowNodeInterface; -import neqsim.fluidMechanics.flowNode.fluidBoundary.interphaseTransportCoefficient.interphaseOnePhase.interphasePipeFlow.InterphasePipeFlow; -import neqsim.fluidMechanics.flowNode.onePhaseNode.onePhaseFlowNode; -import neqsim.fluidMechanics.geometryDefinitions.GeometryDefinitionInterface; -import neqsim.fluidMechanics.geometryDefinitions.pipe.PipeData; +import neqsim.fluidmechanics.flownode.FlowNodeInterface; +import neqsim.fluidmechanics.flownode.fluidboundary.interphasetransportcoefficient.interphaseonephase.interphasepipeflow.InterphasePipeFlow; +import neqsim.fluidmechanics.flownode.onephasenode.onePhaseFlowNode; +import neqsim.fluidmechanics.geometrydefinitions.GeometryDefinitionInterface; +import neqsim.fluidmechanics.geometrydefinitions.pipe.PipeData; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

@@ -33,7 +33,7 @@ public onePhasePipeFlowNode() {} *

* * @param system a {@link neqsim.thermo.system.SystemInterface} object - * @param pipe a {@link neqsim.fluidMechanics.geometryDefinitions.GeometryDefinitionInterface} + * @param pipe a {@link neqsim.fluidmechanics.geometrydefinitions.GeometryDefinitionInterface} * object */ public onePhasePipeFlowNode(SystemInterface system, GeometryDefinitionInterface pipe) { diff --git a/src/main/java/neqsim/fluidMechanics/flowNode/twoPhaseNode/TwoPhaseFlowNode.java b/src/main/java/neqsim/fluidmechanics/flownode/twophasenode/TwoPhaseFlowNode.java similarity index 98% rename from src/main/java/neqsim/fluidMechanics/flowNode/twoPhaseNode/TwoPhaseFlowNode.java rename to src/main/java/neqsim/fluidmechanics/flownode/twophasenode/TwoPhaseFlowNode.java index bf2bb61b58..ee486cf2d6 100644 --- a/src/main/java/neqsim/fluidMechanics/flowNode/twoPhaseNode/TwoPhaseFlowNode.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/twophasenode/TwoPhaseFlowNode.java @@ -1,7 +1,7 @@ -package neqsim.fluidMechanics.flowNode.twoPhaseNode; +package neqsim.fluidmechanics.flownode.twophasenode; -import neqsim.fluidMechanics.flowNode.FlowNode; -import neqsim.fluidMechanics.geometryDefinitions.GeometryDefinitionInterface; +import neqsim.fluidmechanics.flownode.FlowNode; +import neqsim.fluidmechanics.geometrydefinitions.GeometryDefinitionInterface; import neqsim.thermo.system.SystemInterface; /** @@ -31,7 +31,7 @@ public TwoPhaseFlowNode() {} *

* * @param system a {@link neqsim.thermo.system.SystemInterface} object - * @param pipe a {@link neqsim.fluidMechanics.geometryDefinitions.GeometryDefinitionInterface} + * @param pipe a {@link neqsim.fluidmechanics.geometrydefinitions.GeometryDefinitionInterface} * object */ public TwoPhaseFlowNode(SystemInterface system, GeometryDefinitionInterface pipe) { diff --git a/src/main/java/neqsim/fluidMechanics/flowNode/twoPhaseNode/twoPhasePipeFlowNode/AnnularFlow.java b/src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasepipeflownode/AnnularFlow.java similarity index 89% rename from src/main/java/neqsim/fluidMechanics/flowNode/twoPhaseNode/twoPhasePipeFlowNode/AnnularFlow.java rename to src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasepipeflownode/AnnularFlow.java index 267bf483c9..96463403e6 100644 --- a/src/main/java/neqsim/fluidMechanics/flowNode/twoPhaseNode/twoPhasePipeFlowNode/AnnularFlow.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasepipeflownode/AnnularFlow.java @@ -1,16 +1,16 @@ -package neqsim.fluidMechanics.flowNode.twoPhaseNode.twoPhasePipeFlowNode; +package neqsim.fluidmechanics.flownode.twophasenode.twophasepipeflownode; -import neqsim.fluidMechanics.flowNode.FlowNodeInterface; -import neqsim.fluidMechanics.flowNode.fluidBoundary.interphaseTransportCoefficient.interphaseTwoPhase.interphasePipeFlow.InterphaseStratifiedFlow; -import neqsim.fluidMechanics.flowNode.twoPhaseNode.TwoPhaseFlowNode; -import neqsim.fluidMechanics.geometryDefinitions.GeometryDefinitionInterface; -import neqsim.fluidMechanics.geometryDefinitions.internalGeometry.wall.MaterialLayer; -import neqsim.fluidMechanics.geometryDefinitions.pipe.PipeData; -import neqsim.fluidMechanics.geometryDefinitions.surrounding.PipeSurroundingEnvironment; -import neqsim.fluidMechanics.geometryDefinitions.surrounding.SurroundingEnvironment; +import neqsim.fluidmechanics.flownode.FlowNodeInterface; +import neqsim.fluidmechanics.flownode.fluidboundary.interphasetransportcoefficient.interphasetwophase.interphasepipeflow.InterphaseStratifiedFlow; +import neqsim.fluidmechanics.flownode.twophasenode.TwoPhaseFlowNode; +import neqsim.fluidmechanics.geometrydefinitions.GeometryDefinitionInterface; +import neqsim.fluidmechanics.geometrydefinitions.internalgeometry.wall.MaterialLayer; +import neqsim.fluidmechanics.geometrydefinitions.pipe.PipeData; +import neqsim.fluidmechanics.geometrydefinitions.surrounding.PipeSurroundingEnvironment; +import neqsim.fluidmechanics.geometrydefinitions.surrounding.SurroundingEnvironment; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkCPAstatoil; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

@@ -40,7 +40,7 @@ public AnnularFlow() { *

* * @param system a {@link neqsim.thermo.system.SystemInterface} object - * @param pipe a {@link neqsim.fluidMechanics.geometryDefinitions.GeometryDefinitionInterface} + * @param pipe a {@link neqsim.fluidmechanics.geometrydefinitions.GeometryDefinitionInterface} * object */ public AnnularFlow(SystemInterface system, GeometryDefinitionInterface pipe) { @@ -48,7 +48,7 @@ public AnnularFlow(SystemInterface system, GeometryDefinitionInterface pipe) { this.flowNodeType = "annular"; this.interphaseTransportCoefficient = new InterphaseStratifiedFlow(this); this.fluidBoundary = - new neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.nonEquilibriumFluidBoundary.filmModelBoundary.KrishnaStandartFilmModel( + new neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.nonequilibriumfluidboundary.filmmodelboundary.KrishnaStandartFilmModel( this); } @@ -59,7 +59,7 @@ public AnnularFlow(SystemInterface system, GeometryDefinitionInterface pipe) { * * @param system a {@link neqsim.thermo.system.SystemInterface} object * @param interphaseSystem a {@link neqsim.thermo.system.SystemInterface} object - * @param pipe a {@link neqsim.fluidMechanics.geometryDefinitions.GeometryDefinitionInterface} + * @param pipe a {@link neqsim.fluidmechanics.geometrydefinitions.GeometryDefinitionInterface} * object */ public AnnularFlow(SystemInterface system, SystemInterface interphaseSystem, @@ -68,7 +68,7 @@ public AnnularFlow(SystemInterface system, SystemInterface interphaseSystem, this.flowNodeType = "annular"; this.interphaseTransportCoefficient = new InterphaseStratifiedFlow(this); this.fluidBoundary = - new neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.nonEquilibriumFluidBoundary.filmModelBoundary.KrishnaStandartFilmModel( + new neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.nonequilibriumfluidboundary.filmmodelboundary.KrishnaStandartFilmModel( this); } diff --git a/src/main/java/neqsim/fluidMechanics/flowNode/twoPhaseNode/twoPhasePipeFlowNode/BubbleFlowNode.java b/src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasepipeflownode/BubbleFlowNode.java similarity index 88% rename from src/main/java/neqsim/fluidMechanics/flowNode/twoPhaseNode/twoPhasePipeFlowNode/BubbleFlowNode.java rename to src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasepipeflownode/BubbleFlowNode.java index a654e4a4b5..abe935a4d2 100644 --- a/src/main/java/neqsim/fluidMechanics/flowNode/twoPhaseNode/twoPhasePipeFlowNode/BubbleFlowNode.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasepipeflownode/BubbleFlowNode.java @@ -1,12 +1,12 @@ -package neqsim.fluidMechanics.flowNode.twoPhaseNode.twoPhasePipeFlowNode; +package neqsim.fluidmechanics.flownode.twophasenode.twophasepipeflownode; -import neqsim.fluidMechanics.flowNode.FlowNodeInterface; -import neqsim.fluidMechanics.flowNode.fluidBoundary.interphaseTransportCoefficient.interphaseTwoPhase.interphasePipeFlow.InterphaseDropletFlow; -import neqsim.fluidMechanics.flowNode.twoPhaseNode.TwoPhaseFlowNode; -import neqsim.fluidMechanics.geometryDefinitions.GeometryDefinitionInterface; -import neqsim.fluidMechanics.geometryDefinitions.pipe.PipeData; +import neqsim.fluidmechanics.flownode.FlowNodeInterface; +import neqsim.fluidmechanics.flownode.fluidboundary.interphasetransportcoefficient.interphasetwophase.interphasepipeflow.InterphaseDropletFlow; +import neqsim.fluidmechanics.flownode.twophasenode.TwoPhaseFlowNode; +import neqsim.fluidmechanics.geometrydefinitions.GeometryDefinitionInterface; +import neqsim.fluidmechanics.geometrydefinitions.pipe.PipeData; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

@@ -35,7 +35,7 @@ public BubbleFlowNode() { *

* * @param system a {@link neqsim.thermo.system.SystemInterface} object - * @param pipe a {@link neqsim.fluidMechanics.geometryDefinitions.GeometryDefinitionInterface} + * @param pipe a {@link neqsim.fluidmechanics.geometrydefinitions.GeometryDefinitionInterface} * object */ public BubbleFlowNode(SystemInterface system, GeometryDefinitionInterface pipe) { @@ -43,7 +43,7 @@ public BubbleFlowNode(SystemInterface system, GeometryDefinitionInterface pipe) this.flowNodeType = "bubble"; this.interphaseTransportCoefficient = new InterphaseDropletFlow(this); this.fluidBoundary = - new neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.nonEquilibriumFluidBoundary.filmModelBoundary.KrishnaStandartFilmModel( + new neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.nonequilibriumfluidboundary.filmmodelboundary.KrishnaStandartFilmModel( this); } @@ -54,7 +54,7 @@ public BubbleFlowNode(SystemInterface system, GeometryDefinitionInterface pipe) * * @param system a {@link neqsim.thermo.system.SystemInterface} object * @param interphaseSystem a {@link neqsim.thermo.system.SystemInterface} object - * @param pipe a {@link neqsim.fluidMechanics.geometryDefinitions.GeometryDefinitionInterface} + * @param pipe a {@link neqsim.fluidmechanics.geometrydefinitions.GeometryDefinitionInterface} * object */ public BubbleFlowNode(SystemInterface system, SystemInterface interphaseSystem, @@ -63,7 +63,7 @@ public BubbleFlowNode(SystemInterface system, SystemInterface interphaseSystem, this.flowNodeType = "bubble"; this.interphaseTransportCoefficient = new InterphaseDropletFlow(this); this.fluidBoundary = - new neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.nonEquilibriumFluidBoundary.filmModelBoundary.KrishnaStandartFilmModel( + new neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.nonequilibriumfluidboundary.filmmodelboundary.KrishnaStandartFilmModel( this); } diff --git a/src/main/java/neqsim/fluidMechanics/flowNode/twoPhaseNode/twoPhasePipeFlowNode/DropletFlowNode.java b/src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasepipeflownode/DropletFlowNode.java similarity index 91% rename from src/main/java/neqsim/fluidMechanics/flowNode/twoPhaseNode/twoPhasePipeFlowNode/DropletFlowNode.java rename to src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasepipeflownode/DropletFlowNode.java index b091df923e..209e4e4375 100644 --- a/src/main/java/neqsim/fluidMechanics/flowNode/twoPhaseNode/twoPhasePipeFlowNode/DropletFlowNode.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasepipeflownode/DropletFlowNode.java @@ -1,13 +1,13 @@ -package neqsim.fluidMechanics.flowNode.twoPhaseNode.twoPhasePipeFlowNode; +package neqsim.fluidmechanics.flownode.twophasenode.twophasepipeflownode; -import neqsim.fluidMechanics.flowNode.FlowNodeInterface; -import neqsim.fluidMechanics.flowNode.fluidBoundary.interphaseTransportCoefficient.interphaseTwoPhase.interphasePipeFlow.InterphaseDropletFlow; -import neqsim.fluidMechanics.flowNode.twoPhaseNode.TwoPhaseFlowNode; -import neqsim.fluidMechanics.geometryDefinitions.GeometryDefinitionInterface; -import neqsim.fluidMechanics.geometryDefinitions.pipe.PipeData; +import neqsim.fluidmechanics.flownode.FlowNodeInterface; +import neqsim.fluidmechanics.flownode.fluidboundary.interphasetransportcoefficient.interphasetwophase.interphasepipeflow.InterphaseDropletFlow; +import neqsim.fluidmechanics.flownode.twophasenode.TwoPhaseFlowNode; +import neqsim.fluidmechanics.geometrydefinitions.GeometryDefinitionInterface; +import neqsim.fluidmechanics.geometrydefinitions.pipe.PipeData; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkCPAstatoil; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

@@ -36,7 +36,7 @@ public DropletFlowNode() { *

* * @param system a {@link neqsim.thermo.system.SystemInterface} object - * @param pipe a {@link neqsim.fluidMechanics.geometryDefinitions.GeometryDefinitionInterface} + * @param pipe a {@link neqsim.fluidmechanics.geometrydefinitions.GeometryDefinitionInterface} * object */ public DropletFlowNode(SystemInterface system, GeometryDefinitionInterface pipe) { @@ -44,7 +44,7 @@ public DropletFlowNode(SystemInterface system, GeometryDefinitionInterface pipe) this.flowNodeType = "droplet"; this.interphaseTransportCoefficient = new InterphaseDropletFlow(this); this.fluidBoundary = - new neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.nonEquilibriumFluidBoundary.filmModelBoundary.KrishnaStandartFilmModel( + new neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.nonequilibriumfluidboundary.filmmodelboundary.KrishnaStandartFilmModel( this); } @@ -55,7 +55,7 @@ public DropletFlowNode(SystemInterface system, GeometryDefinitionInterface pipe) * * @param system a {@link neqsim.thermo.system.SystemInterface} object * @param interphaseSystem a {@link neqsim.thermo.system.SystemInterface} object - * @param pipe a {@link neqsim.fluidMechanics.geometryDefinitions.GeometryDefinitionInterface} + * @param pipe a {@link neqsim.fluidmechanics.geometrydefinitions.GeometryDefinitionInterface} * object */ public DropletFlowNode(SystemInterface system, SystemInterface interphaseSystem, @@ -64,7 +64,7 @@ public DropletFlowNode(SystemInterface system, SystemInterface interphaseSystem, this.flowNodeType = "stratified"; this.interphaseTransportCoefficient = new InterphaseDropletFlow(this); this.fluidBoundary = - new neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.nonEquilibriumFluidBoundary.filmModelBoundary.KrishnaStandartFilmModel( + new neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.nonequilibriumfluidboundary.filmmodelboundary.KrishnaStandartFilmModel( this); } diff --git a/src/main/java/neqsim/fluidMechanics/flowNode/twoPhaseNode/twoPhasePipeFlowNode/StratifiedFlowNode.java b/src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasepipeflownode/StratifiedFlowNode.java similarity index 88% rename from src/main/java/neqsim/fluidMechanics/flowNode/twoPhaseNode/twoPhasePipeFlowNode/StratifiedFlowNode.java rename to src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasepipeflownode/StratifiedFlowNode.java index 28042f22b2..661abe17c6 100644 --- a/src/main/java/neqsim/fluidMechanics/flowNode/twoPhaseNode/twoPhasePipeFlowNode/StratifiedFlowNode.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasepipeflownode/StratifiedFlowNode.java @@ -1,12 +1,12 @@ -package neqsim.fluidMechanics.flowNode.twoPhaseNode.twoPhasePipeFlowNode; +package neqsim.fluidmechanics.flownode.twophasenode.twophasepipeflownode; -import neqsim.fluidMechanics.flowNode.FlowNodeInterface; -import neqsim.fluidMechanics.flowNode.fluidBoundary.interphaseTransportCoefficient.interphaseTwoPhase.interphasePipeFlow.InterphaseStratifiedFlow; -import neqsim.fluidMechanics.flowNode.twoPhaseNode.TwoPhaseFlowNode; -import neqsim.fluidMechanics.geometryDefinitions.GeometryDefinitionInterface; -import neqsim.fluidMechanics.geometryDefinitions.pipe.PipeData; +import neqsim.fluidmechanics.flownode.FlowNodeInterface; +import neqsim.fluidmechanics.flownode.fluidboundary.interphasetransportcoefficient.interphasetwophase.interphasepipeflow.InterphaseStratifiedFlow; +import neqsim.fluidmechanics.flownode.twophasenode.TwoPhaseFlowNode; +import neqsim.fluidmechanics.geometrydefinitions.GeometryDefinitionInterface; +import neqsim.fluidmechanics.geometrydefinitions.pipe.PipeData; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

@@ -34,7 +34,7 @@ public StratifiedFlowNode() { *

* * @param system a {@link neqsim.thermo.system.SystemInterface} object - * @param pipe a {@link neqsim.fluidMechanics.geometryDefinitions.GeometryDefinitionInterface} + * @param pipe a {@link neqsim.fluidmechanics.geometrydefinitions.GeometryDefinitionInterface} * object */ public StratifiedFlowNode(SystemInterface system, GeometryDefinitionInterface pipe) { @@ -42,7 +42,7 @@ public StratifiedFlowNode(SystemInterface system, GeometryDefinitionInterface pi this.flowNodeType = "stratified"; this.interphaseTransportCoefficient = new InterphaseStratifiedFlow(this); this.fluidBoundary = - new neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.nonEquilibriumFluidBoundary.filmModelBoundary.KrishnaStandartFilmModel( + new neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.nonequilibriumfluidboundary.filmmodelboundary.KrishnaStandartFilmModel( this); } @@ -53,7 +53,7 @@ public StratifiedFlowNode(SystemInterface system, GeometryDefinitionInterface pi * * @param system a {@link neqsim.thermo.system.SystemInterface} object * @param interphaseSystem a {@link neqsim.thermo.system.SystemInterface} object - * @param pipe a {@link neqsim.fluidMechanics.geometryDefinitions.GeometryDefinitionInterface} + * @param pipe a {@link neqsim.fluidmechanics.geometrydefinitions.GeometryDefinitionInterface} * object */ public StratifiedFlowNode(SystemInterface system, SystemInterface interphaseSystem, @@ -62,7 +62,7 @@ public StratifiedFlowNode(SystemInterface system, SystemInterface interphaseSyst this.flowNodeType = "stratified"; this.interphaseTransportCoefficient = new InterphaseStratifiedFlow(this); this.fluidBoundary = - new neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.nonEquilibriumFluidBoundary.filmModelBoundary.KrishnaStandartFilmModel( + new neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.nonequilibriumfluidboundary.filmmodelboundary.KrishnaStandartFilmModel( this); } diff --git a/src/main/java/neqsim/fluidMechanics/flowNode/twoPhaseNode/twoPhaseReactorFlowNode/TwoPhasePackedBedFlowNode.java b/src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasereactorflownode/TwoPhasePackedBedFlowNode.java similarity index 90% rename from src/main/java/neqsim/fluidMechanics/flowNode/twoPhaseNode/twoPhaseReactorFlowNode/TwoPhasePackedBedFlowNode.java rename to src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasereactorflownode/TwoPhasePackedBedFlowNode.java index 47a8e76024..41c92225f5 100644 --- a/src/main/java/neqsim/fluidMechanics/flowNode/twoPhaseNode/twoPhaseReactorFlowNode/TwoPhasePackedBedFlowNode.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasereactorflownode/TwoPhasePackedBedFlowNode.java @@ -1,13 +1,13 @@ -package neqsim.fluidMechanics.flowNode.twoPhaseNode.twoPhaseReactorFlowNode; +package neqsim.fluidmechanics.flownode.twophasenode.twophasereactorflownode; -import neqsim.fluidMechanics.flowNode.FlowNodeInterface; -import neqsim.fluidMechanics.flowNode.fluidBoundary.interphaseTransportCoefficient.interphaseTwoPhase.interphaseReactorFlow.InterphasePackedBed; -import neqsim.fluidMechanics.flowNode.twoPhaseNode.TwoPhaseFlowNode; -import neqsim.fluidMechanics.geometryDefinitions.GeometryDefinitionInterface; -import neqsim.fluidMechanics.geometryDefinitions.reactor.ReactorData; +import neqsim.fluidmechanics.flownode.FlowNodeInterface; +import neqsim.fluidmechanics.flownode.fluidboundary.interphasetransportcoefficient.interphasetwophase.interphaseReactorFlow.InterphasePackedBed; +import neqsim.fluidmechanics.flownode.twophasenode.TwoPhaseFlowNode; +import neqsim.fluidmechanics.geometrydefinitions.GeometryDefinitionInterface; +import neqsim.fluidmechanics.geometrydefinitions.reactor.ReactorData; import neqsim.thermo.system.SystemFurstElectrolyteEos; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

@@ -35,7 +35,7 @@ public TwoPhasePackedBedFlowNode() { *

* * @param system a {@link neqsim.thermo.system.SystemInterface} object - * @param pipe a {@link neqsim.fluidMechanics.geometryDefinitions.GeometryDefinitionInterface} + * @param pipe a {@link neqsim.fluidmechanics.geometrydefinitions.GeometryDefinitionInterface} * object */ public TwoPhasePackedBedFlowNode(SystemInterface system, GeometryDefinitionInterface pipe) { @@ -43,7 +43,7 @@ public TwoPhasePackedBedFlowNode(SystemInterface system, GeometryDefinitionInter this.flowNodeType = "packed bed"; this.interphaseTransportCoefficient = new InterphasePackedBed(this); this.fluidBoundary = - new neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.nonEquilibriumFluidBoundary.filmModelBoundary.KrishnaStandartFilmModel( + new neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.nonequilibriumfluidboundary.filmmodelboundary.KrishnaStandartFilmModel( this); } @@ -54,7 +54,7 @@ public TwoPhasePackedBedFlowNode(SystemInterface system, GeometryDefinitionInter * * @param system a {@link neqsim.thermo.system.SystemInterface} object * @param interphaseSystem a {@link neqsim.thermo.system.SystemInterface} object - * @param pipe a {@link neqsim.fluidMechanics.geometryDefinitions.GeometryDefinitionInterface} + * @param pipe a {@link neqsim.fluidmechanics.geometrydefinitions.GeometryDefinitionInterface} * object */ public TwoPhasePackedBedFlowNode(SystemInterface system, SystemInterface interphaseSystem, @@ -63,7 +63,7 @@ public TwoPhasePackedBedFlowNode(SystemInterface system, SystemInterface interph this.flowNodeType = "packed bed"; this.interphaseTransportCoefficient = new InterphasePackedBed(this); this.fluidBoundary = - new neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.nonEquilibriumFluidBoundary.filmModelBoundary.KrishnaStandartFilmModel( + new neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.nonequilibriumfluidboundary.filmmodelboundary.KrishnaStandartFilmModel( this); } diff --git a/src/main/java/neqsim/fluidMechanics/flowNode/twoPhaseNode/twoPhaseReactorFlowNode/TwoPhaseTrayTowerFlowNode.java b/src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasereactorflownode/TwoPhaseTrayTowerFlowNode.java similarity index 84% rename from src/main/java/neqsim/fluidMechanics/flowNode/twoPhaseNode/twoPhaseReactorFlowNode/TwoPhaseTrayTowerFlowNode.java rename to src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasereactorflownode/TwoPhaseTrayTowerFlowNode.java index 1afffbb19a..e93b2fc50b 100644 --- a/src/main/java/neqsim/fluidMechanics/flowNode/twoPhaseNode/twoPhaseReactorFlowNode/TwoPhaseTrayTowerFlowNode.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasereactorflownode/TwoPhaseTrayTowerFlowNode.java @@ -1,14 +1,14 @@ -package neqsim.fluidMechanics.flowNode.twoPhaseNode.twoPhaseReactorFlowNode; +package neqsim.fluidmechanics.flownode.twophasenode.twophasereactorflownode; -import neqsim.fluidMechanics.flowNode.FlowNodeInterface; -import neqsim.fluidMechanics.flowNode.fluidBoundary.interphaseTransportCoefficient.interphaseTwoPhase.interphasePipeFlow.InterphaseStratifiedFlow; -import neqsim.fluidMechanics.flowNode.twoPhaseNode.TwoPhaseFlowNode; -import neqsim.fluidMechanics.geometryDefinitions.GeometryDefinitionInterface; -import neqsim.fluidMechanics.geometryDefinitions.pipe.PipeData; +import neqsim.fluidmechanics.flownode.FlowNodeInterface; +import neqsim.fluidmechanics.flownode.fluidboundary.interphasetransportcoefficient.interphasetwophase.interphasepipeflow.InterphaseStratifiedFlow; +import neqsim.fluidmechanics.flownode.twophasenode.TwoPhaseFlowNode; +import neqsim.fluidmechanics.geometrydefinitions.GeometryDefinitionInterface; +import neqsim.fluidmechanics.geometrydefinitions.pipe.PipeData; import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.system.SystemFurstElectrolyteEos; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

@@ -36,7 +36,7 @@ public TwoPhaseTrayTowerFlowNode() { *

* * @param system a {@link neqsim.thermo.system.SystemInterface} object - * @param pipe a {@link neqsim.fluidMechanics.geometryDefinitions.GeometryDefinitionInterface} + * @param pipe a {@link neqsim.fluidmechanics.geometrydefinitions.GeometryDefinitionInterface} * object */ public TwoPhaseTrayTowerFlowNode(SystemInterface system, GeometryDefinitionInterface pipe) { @@ -44,7 +44,7 @@ public TwoPhaseTrayTowerFlowNode(SystemInterface system, GeometryDefinitionInter this.flowNodeType = "stratified"; this.interphaseTransportCoefficient = new InterphaseStratifiedFlow(this); this.fluidBoundary = - new neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.nonEquilibriumFluidBoundary.filmModelBoundary.KrishnaStandartFilmModel( + new neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.nonequilibriumfluidboundary.filmmodelboundary.KrishnaStandartFilmModel( this); } @@ -55,7 +55,7 @@ public TwoPhaseTrayTowerFlowNode(SystemInterface system, GeometryDefinitionInter * * @param system a {@link neqsim.thermo.system.SystemInterface} object * @param interphaseSystem a {@link neqsim.thermo.system.SystemInterface} object - * @param pipe a {@link neqsim.fluidMechanics.geometryDefinitions.GeometryDefinitionInterface} + * @param pipe a {@link neqsim.fluidmechanics.geometrydefinitions.GeometryDefinitionInterface} * object */ public TwoPhaseTrayTowerFlowNode(SystemInterface system, SystemInterface interphaseSystem, @@ -64,7 +64,7 @@ public TwoPhaseTrayTowerFlowNode(SystemInterface system, SystemInterface interph this.flowNodeType = "stratified"; this.interphaseTransportCoefficient = new InterphaseStratifiedFlow(this); this.fluidBoundary = - new neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.nonEquilibriumFluidBoundary.filmModelBoundary.KrishnaStandartFilmModel( + new neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.nonequilibriumfluidboundary.filmmodelboundary.KrishnaStandartFilmModel( this); } diff --git a/src/main/java/neqsim/fluidMechanics/flowNode/twoPhaseNode/twoPhaseStirredCellNode/StirredCellNode.java b/src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasestirredcellnode/StirredCellNode.java similarity index 89% rename from src/main/java/neqsim/fluidMechanics/flowNode/twoPhaseNode/twoPhaseStirredCellNode/StirredCellNode.java rename to src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasestirredcellnode/StirredCellNode.java index c28f2ea4f4..7d076f4f82 100644 --- a/src/main/java/neqsim/fluidMechanics/flowNode/twoPhaseNode/twoPhaseStirredCellNode/StirredCellNode.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasestirredcellnode/StirredCellNode.java @@ -1,13 +1,13 @@ -package neqsim.fluidMechanics.flowNode.twoPhaseNode.twoPhaseStirredCellNode; +package neqsim.fluidmechanics.flownode.twophasenode.twophasestirredcellnode; -import neqsim.fluidMechanics.flowNode.FlowNodeInterface; -import neqsim.fluidMechanics.flowNode.fluidBoundary.interphaseTransportCoefficient.interphaseTwoPhase.stirredCell.InterphaseStirredCellFlow; -import neqsim.fluidMechanics.flowNode.twoPhaseNode.TwoPhaseFlowNode; -import neqsim.fluidMechanics.geometryDefinitions.GeometryDefinitionInterface; -import neqsim.fluidMechanics.geometryDefinitions.stirredCell.StirredCell; +import neqsim.fluidmechanics.flownode.FlowNodeInterface; +import neqsim.fluidmechanics.flownode.fluidboundary.interphasetransportcoefficient.interphasetwophase.stirredcell.InterphaseStirredCellFlow; +import neqsim.fluidmechanics.flownode.twophasenode.TwoPhaseFlowNode; +import neqsim.fluidmechanics.geometrydefinitions.GeometryDefinitionInterface; +import neqsim.fluidmechanics.geometrydefinitions.stirredcell.StirredCell; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkCPAstatoil; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

@@ -39,7 +39,7 @@ public StirredCellNode() { *

* * @param system a {@link neqsim.thermo.system.SystemInterface} object - * @param pipe a {@link neqsim.fluidMechanics.geometryDefinitions.GeometryDefinitionInterface} + * @param pipe a {@link neqsim.fluidmechanics.geometrydefinitions.GeometryDefinitionInterface} * object */ public StirredCellNode(SystemInterface system, GeometryDefinitionInterface pipe) { @@ -47,7 +47,7 @@ public StirredCellNode(SystemInterface system, GeometryDefinitionInterface pipe) this.flowNodeType = "stirred cell"; this.interphaseTransportCoefficient = new InterphaseStirredCellFlow(this); this.fluidBoundary = - new neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.nonEquilibriumFluidBoundary.filmModelBoundary.KrishnaStandartFilmModel( + new neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.nonequilibriumfluidboundary.filmmodelboundary.KrishnaStandartFilmModel( this); } @@ -58,7 +58,7 @@ public StirredCellNode(SystemInterface system, GeometryDefinitionInterface pipe) * * @param system a {@link neqsim.thermo.system.SystemInterface} object * @param interphaseSystem a {@link neqsim.thermo.system.SystemInterface} object - * @param pipe a {@link neqsim.fluidMechanics.geometryDefinitions.GeometryDefinitionInterface} + * @param pipe a {@link neqsim.fluidmechanics.geometrydefinitions.GeometryDefinitionInterface} * object */ public StirredCellNode(SystemInterface system, SystemInterface interphaseSystem, @@ -67,7 +67,7 @@ public StirredCellNode(SystemInterface system, SystemInterface interphaseSystem, this.flowNodeType = "stirred cell"; this.interphaseTransportCoefficient = new InterphaseStirredCellFlow(this); this.fluidBoundary = - new neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.nonEquilibriumFluidBoundary.filmModelBoundary.KrishnaStandartFilmModel( + new neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.nonequilibriumfluidboundary.filmmodelboundary.KrishnaStandartFilmModel( this); } diff --git a/src/main/java/neqsim/fluidMechanics/flowSolver/FlowSolver.java b/src/main/java/neqsim/fluidmechanics/flowsolver/FlowSolver.java similarity index 96% rename from src/main/java/neqsim/fluidMechanics/flowSolver/FlowSolver.java rename to src/main/java/neqsim/fluidmechanics/flowsolver/FlowSolver.java index d22fa9d027..ffc123e8d3 100644 --- a/src/main/java/neqsim/fluidMechanics/flowSolver/FlowSolver.java +++ b/src/main/java/neqsim/fluidmechanics/flowsolver/FlowSolver.java @@ -4,7 +4,7 @@ * Created on 17. januar 2001, 20:58 */ -package neqsim.fluidMechanics.flowSolver; +package neqsim.fluidmechanics.flowsolver; /** *

diff --git a/src/main/java/neqsim/fluidMechanics/flowSolver/FlowSolverInterface.java b/src/main/java/neqsim/fluidmechanics/flowsolver/FlowSolverInterface.java similarity index 95% rename from src/main/java/neqsim/fluidMechanics/flowSolver/FlowSolverInterface.java rename to src/main/java/neqsim/fluidmechanics/flowsolver/FlowSolverInterface.java index a9349fc2b4..89cddd6081 100644 --- a/src/main/java/neqsim/fluidMechanics/flowSolver/FlowSolverInterface.java +++ b/src/main/java/neqsim/fluidmechanics/flowsolver/FlowSolverInterface.java @@ -4,7 +4,7 @@ * Created on 17. januar 2001, 20:56 */ -package neqsim.fluidMechanics.flowSolver; +package neqsim.fluidmechanics.flowsolver; /** *

diff --git a/src/main/java/neqsim/fluidMechanics/flowSolver/onePhaseFlowSolver/OnePhaseFlowSolver.java b/src/main/java/neqsim/fluidmechanics/flowsolver/onephaseflowsolver/OnePhaseFlowSolver.java similarity index 68% rename from src/main/java/neqsim/fluidMechanics/flowSolver/onePhaseFlowSolver/OnePhaseFlowSolver.java rename to src/main/java/neqsim/fluidmechanics/flowsolver/onephaseflowsolver/OnePhaseFlowSolver.java index 2fc6936810..7200e3e414 100644 --- a/src/main/java/neqsim/fluidMechanics/flowSolver/onePhaseFlowSolver/OnePhaseFlowSolver.java +++ b/src/main/java/neqsim/fluidmechanics/flowsolver/onephaseflowsolver/OnePhaseFlowSolver.java @@ -4,7 +4,7 @@ * Created on 17. januar 2001, 21:03 */ -package neqsim.fluidMechanics.flowSolver.onePhaseFlowSolver; +package neqsim.fluidmechanics.flowsolver.onephaseflowsolver; /** *

@@ -14,7 +14,7 @@ * @author Even Solbraa * @version $Id: $Id */ -public abstract class OnePhaseFlowSolver extends neqsim.fluidMechanics.flowSolver.FlowSolver { +public abstract class OnePhaseFlowSolver extends neqsim.fluidmechanics.flowsolver.FlowSolver { private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/fluidMechanics/flowSolver/onePhaseFlowSolver/onePhasePipeFlowSolver/OnePhaseFixedStaggeredGrid.java b/src/main/java/neqsim/fluidmechanics/flowsolver/onephaseflowsolver/onephasepipeflowsolver/OnePhaseFixedStaggeredGrid.java similarity index 98% rename from src/main/java/neqsim/fluidMechanics/flowSolver/onePhaseFlowSolver/onePhasePipeFlowSolver/OnePhaseFixedStaggeredGrid.java rename to src/main/java/neqsim/fluidmechanics/flowsolver/onephaseflowsolver/onephasepipeflowsolver/OnePhaseFixedStaggeredGrid.java index e7a8e51d9d..80c256f2e5 100644 --- a/src/main/java/neqsim/fluidMechanics/flowSolver/onePhaseFlowSolver/onePhasePipeFlowSolver/OnePhaseFixedStaggeredGrid.java +++ b/src/main/java/neqsim/fluidmechanics/flowsolver/onephaseflowsolver/onephasepipeflowsolver/OnePhaseFixedStaggeredGrid.java @@ -4,10 +4,10 @@ * Created on 17. januar 2001, 21:10 */ -package neqsim.fluidMechanics.flowSolver.onePhaseFlowSolver.onePhasePipeFlowSolver; +package neqsim.fluidmechanics.flowsolver.onephaseflowsolver.onephasepipeflowsolver; import Jama.Matrix; -import neqsim.MathLib.generalMath.TDMAsolve; +import neqsim.mathlib.generalmath.TDMAsolve; /** *

@@ -47,14 +47,14 @@ public OnePhaseFixedStaggeredGrid() {} *

* * @param pipe a - * {@link neqsim.fluidMechanics.flowSystem.onePhaseFlowSystem.pipeFlowSystem.PipeFlowSystem} + * {@link neqsim.fluidmechanics.flowsystem.onephaseflowsystem.pipeflowsystem.PipeFlowSystem} * object * @param length a double * @param nodes a int * @param dynamic a boolean */ public OnePhaseFixedStaggeredGrid( - neqsim.fluidMechanics.flowSystem.onePhaseFlowSystem.pipeFlowSystem.PipeFlowSystem pipe, + neqsim.fluidmechanics.flowsystem.onephaseflowsystem.pipeflowsystem.PipeFlowSystem pipe, double length, int nodes, boolean dynamic) { super(pipe, length, nodes); this.dynamic = dynamic; diff --git a/src/main/java/neqsim/fluidMechanics/flowSolver/onePhaseFlowSolver/onePhasePipeFlowSolver/OnePhasePipeFlowSolver.java b/src/main/java/neqsim/fluidmechanics/flowsolver/onephaseflowsolver/onephasepipeflowsolver/OnePhasePipeFlowSolver.java similarity index 85% rename from src/main/java/neqsim/fluidMechanics/flowSolver/onePhaseFlowSolver/onePhasePipeFlowSolver/OnePhasePipeFlowSolver.java rename to src/main/java/neqsim/fluidmechanics/flowsolver/onephaseflowsolver/onephasepipeflowsolver/OnePhasePipeFlowSolver.java index e0ac811824..67d2b49e12 100644 --- a/src/main/java/neqsim/fluidMechanics/flowSolver/onePhaseFlowSolver/onePhasePipeFlowSolver/OnePhasePipeFlowSolver.java +++ b/src/main/java/neqsim/fluidmechanics/flowsolver/onephaseflowsolver/onephasepipeflowsolver/OnePhasePipeFlowSolver.java @@ -4,10 +4,10 @@ * Created on 17. januar 2001, 21:05 */ -package neqsim.fluidMechanics.flowSolver.onePhaseFlowSolver.onePhasePipeFlowSolver; +package neqsim.fluidmechanics.flowsolver.onephaseflowsolver.onephasepipeflowsolver; import Jama.Matrix; -import neqsim.fluidMechanics.flowSystem.onePhaseFlowSystem.pipeFlowSystem.PipeFlowSystem; +import neqsim.fluidmechanics.flowsystem.onephaseflowsystem.pipeflowsystem.PipeFlowSystem; /** *

@@ -18,7 +18,7 @@ * @version $Id: $Id */ public class OnePhasePipeFlowSolver - extends neqsim.fluidMechanics.flowSolver.onePhaseFlowSolver.OnePhaseFlowSolver { + extends neqsim.fluidmechanics.flowsolver.onephaseflowsolver.OnePhaseFlowSolver { private static final long serialVersionUID = 1000; protected double[] PbArray; // = new double[100]; @@ -46,7 +46,7 @@ public OnePhasePipeFlowSolver() {} *

* * @param pipe a - * {@link neqsim.fluidMechanics.flowSystem.onePhaseFlowSystem.pipeFlowSystem.PipeFlowSystem} + * {@link neqsim.fluidmechanics.flowsystem.onephaseflowsystem.pipeflowsystem.PipeFlowSystem} * object * @param length a double * @param nodes a int diff --git a/src/main/java/neqsim/fluidMechanics/flowSolver/twoPhaseFlowSolver/stirredCellSolver/StirredCellSolver.java b/src/main/java/neqsim/fluidmechanics/flowsolver/twophaseflowsolver/stirredcellsolver/StirredCellSolver.java similarity index 95% rename from src/main/java/neqsim/fluidMechanics/flowSolver/twoPhaseFlowSolver/stirredCellSolver/StirredCellSolver.java rename to src/main/java/neqsim/fluidmechanics/flowsolver/twophaseflowsolver/stirredcellsolver/StirredCellSolver.java index 247a95fda7..6dbcf74143 100644 --- a/src/main/java/neqsim/fluidMechanics/flowSolver/twoPhaseFlowSolver/stirredCellSolver/StirredCellSolver.java +++ b/src/main/java/neqsim/fluidmechanics/flowsolver/twophaseflowsolver/stirredcellsolver/StirredCellSolver.java @@ -1,11 +1,11 @@ -package neqsim.fluidMechanics.flowSolver.twoPhaseFlowSolver.stirredCellSolver; +package neqsim.fluidmechanics.flowsolver.twophaseflowsolver.stirredcellsolver; import Jama.Matrix; -import neqsim.fluidMechanics.flowSolver.twoPhaseFlowSolver.twoPhasePipeFlowSolver.TwoPhaseFixedStaggeredGridSolver; -import neqsim.fluidMechanics.flowSolver.twoPhaseFlowSolver.twoPhasePipeFlowSolver.TwoPhasePipeFlowSolver; -import neqsim.fluidMechanics.flowSystem.FlowSystemInterface; +import neqsim.fluidmechanics.flowsolver.twophaseflowsolver.twophasepipeflowsolver.TwoPhaseFixedStaggeredGridSolver; +import neqsim.fluidmechanics.flowsolver.twophaseflowsolver.twophasepipeflowsolver.TwoPhasePipeFlowSolver; +import neqsim.fluidmechanics.flowsystem.FlowSystemInterface; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

@@ -44,7 +44,7 @@ public StirredCellSolver() {} * Constructor for StirredCellSolver. *

* - * @param pipe a {@link neqsim.fluidMechanics.flowSystem.FlowSystemInterface} object + * @param pipe a {@link neqsim.fluidmechanics.flowsystem.FlowSystemInterface} object * @param length a double * @param nodes a int */ @@ -57,7 +57,7 @@ public StirredCellSolver(FlowSystemInterface pipe, double length, int nodes) { * Constructor for StirredCellSolver. *

* - * @param pipe a {@link neqsim.fluidMechanics.flowSystem.FlowSystemInterface} object + * @param pipe a {@link neqsim.fluidmechanics.flowsystem.FlowSystemInterface} object * @param length a double * @param nodes a int * @param dynamic a boolean diff --git a/src/main/java/neqsim/fluidMechanics/flowSolver/twoPhaseFlowSolver/twoPhasePipeFlowSolver/TwoPhaseFixedStaggeredGridSolver.java b/src/main/java/neqsim/fluidmechanics/flowsolver/twophaseflowsolver/twophasepipeflowsolver/TwoPhaseFixedStaggeredGridSolver.java similarity index 99% rename from src/main/java/neqsim/fluidMechanics/flowSolver/twoPhaseFlowSolver/twoPhasePipeFlowSolver/TwoPhaseFixedStaggeredGridSolver.java rename to src/main/java/neqsim/fluidmechanics/flowsolver/twophaseflowsolver/twophasepipeflowsolver/TwoPhaseFixedStaggeredGridSolver.java index aeb927ae4f..9bbee4dff9 100644 --- a/src/main/java/neqsim/fluidMechanics/flowSolver/twoPhaseFlowSolver/twoPhasePipeFlowSolver/TwoPhaseFixedStaggeredGridSolver.java +++ b/src/main/java/neqsim/fluidmechanics/flowsolver/twophaseflowsolver/twophasepipeflowsolver/TwoPhaseFixedStaggeredGridSolver.java @@ -1,8 +1,8 @@ -package neqsim.fluidMechanics.flowSolver.twoPhaseFlowSolver.twoPhasePipeFlowSolver; +package neqsim.fluidmechanics.flowsolver.twophaseflowsolver.twophasepipeflowsolver; import Jama.Matrix; -import neqsim.MathLib.generalMath.TDMAsolve; -import neqsim.fluidMechanics.flowSystem.FlowSystemInterface; +import neqsim.fluidmechanics.flowsystem.FlowSystemInterface; +import neqsim.mathlib.generalmath.TDMAsolve; /** *

@@ -41,7 +41,7 @@ public TwoPhaseFixedStaggeredGridSolver() {} * Constructor for TwoPhaseFixedStaggeredGridSolver. *

* - * @param pipe a {@link neqsim.fluidMechanics.flowSystem.FlowSystemInterface} object + * @param pipe a {@link neqsim.fluidmechanics.flowsystem.FlowSystemInterface} object * @param length a double * @param nodes a int */ @@ -54,7 +54,7 @@ public TwoPhaseFixedStaggeredGridSolver(FlowSystemInterface pipe, double length, * Constructor for TwoPhaseFixedStaggeredGridSolver. *

* - * @param pipe a {@link neqsim.fluidMechanics.flowSystem.FlowSystemInterface} object + * @param pipe a {@link neqsim.fluidmechanics.flowsystem.FlowSystemInterface} object * @param length a double * @param nodes a int * @param dynamic a boolean diff --git a/src/main/java/neqsim/fluidMechanics/flowSolver/twoPhaseFlowSolver/twoPhasePipeFlowSolver/TwoPhasePipeFlowSolver.java b/src/main/java/neqsim/fluidmechanics/flowsolver/twophaseflowsolver/twophasepipeflowsolver/TwoPhasePipeFlowSolver.java similarity index 89% rename from src/main/java/neqsim/fluidMechanics/flowSolver/twoPhaseFlowSolver/twoPhasePipeFlowSolver/TwoPhasePipeFlowSolver.java rename to src/main/java/neqsim/fluidmechanics/flowsolver/twophaseflowsolver/twophasepipeflowsolver/TwoPhasePipeFlowSolver.java index 4a8c17a4a3..aca8bd0cbc 100644 --- a/src/main/java/neqsim/fluidMechanics/flowSolver/twoPhaseFlowSolver/twoPhasePipeFlowSolver/TwoPhasePipeFlowSolver.java +++ b/src/main/java/neqsim/fluidmechanics/flowsolver/twophaseflowsolver/twophasepipeflowsolver/TwoPhasePipeFlowSolver.java @@ -1,7 +1,7 @@ -package neqsim.fluidMechanics.flowSolver.twoPhaseFlowSolver.twoPhasePipeFlowSolver; +package neqsim.fluidmechanics.flowsolver.twophaseflowsolver.twophasepipeflowsolver; import Jama.Matrix; -import neqsim.fluidMechanics.flowSystem.FlowSystemInterface; +import neqsim.fluidmechanics.flowsystem.FlowSystemInterface; /** *

@@ -12,7 +12,7 @@ * @version $Id: $Id */ public class TwoPhasePipeFlowSolver - extends neqsim.fluidMechanics.flowSolver.onePhaseFlowSolver.OnePhaseFlowSolver { + extends neqsim.fluidmechanics.flowsolver.onephaseflowsolver.OnePhaseFlowSolver { private static final long serialVersionUID = 1000; protected double[] PbArray; // = new double[100]; @@ -43,7 +43,7 @@ public TwoPhasePipeFlowSolver() {} * Constructor for TwoPhasePipeFlowSolver. *

* - * @param pipe a {@link neqsim.fluidMechanics.flowSystem.FlowSystemInterface} object + * @param pipe a {@link neqsim.fluidmechanics.flowsystem.FlowSystemInterface} object * @param length a double * @param nodes a int */ diff --git a/src/main/java/neqsim/fluidMechanics/flowSystem/FlowSystem.java b/src/main/java/neqsim/fluidmechanics/flowsystem/FlowSystem.java similarity index 95% rename from src/main/java/neqsim/fluidMechanics/flowSystem/FlowSystem.java rename to src/main/java/neqsim/fluidmechanics/flowsystem/FlowSystem.java index e3de8d23c3..9c9fbeee55 100644 --- a/src/main/java/neqsim/fluidMechanics/flowSystem/FlowSystem.java +++ b/src/main/java/neqsim/fluidmechanics/flowsystem/FlowSystem.java @@ -1,14 +1,14 @@ -package neqsim.fluidMechanics.flowSystem; +package neqsim.fluidmechanics.flowsystem; import java.util.UUID; -import neqsim.fluidMechanics.flowLeg.FlowLegInterface; -import neqsim.fluidMechanics.flowNode.FlowNodeInterface; -import neqsim.fluidMechanics.flowSolver.FlowSolverInterface; -import neqsim.fluidMechanics.geometryDefinitions.GeometryDefinitionInterface; -import neqsim.fluidMechanics.util.fluidMechanicsVisualization.flowSystemVisualization.FlowSystemVisualizationInterface; -import neqsim.fluidMechanics.util.timeSeries.TimeSeries; +import neqsim.fluidmechanics.flowleg.FlowLegInterface; +import neqsim.fluidmechanics.flownode.FlowNodeInterface; +import neqsim.fluidmechanics.flowsolver.FlowSolverInterface; +import neqsim.fluidmechanics.geometrydefinitions.GeometryDefinitionInterface; +import neqsim.fluidmechanics.util.fluidmechanicsvisualization.flowsystemvisualization.FlowSystemVisualizationInterface; +import neqsim.fluidmechanics.util.timeseries.TimeSeries; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/main/java/neqsim/fluidMechanics/flowSystem/FlowSystemInterface.java b/src/main/java/neqsim/fluidmechanics/flowsystem/FlowSystemInterface.java similarity index 87% rename from src/main/java/neqsim/fluidMechanics/flowSystem/FlowSystemInterface.java rename to src/main/java/neqsim/fluidmechanics/flowsystem/FlowSystemInterface.java index 5e0b3a7d39..98c0c6fdc7 100644 --- a/src/main/java/neqsim/fluidMechanics/flowSystem/FlowSystemInterface.java +++ b/src/main/java/neqsim/fluidmechanics/flowsystem/FlowSystemInterface.java @@ -4,14 +4,14 @@ * Created on 11. desember 2000, 17:17 */ -package neqsim.fluidMechanics.flowSystem; +package neqsim.fluidmechanics.flowsystem; import java.util.UUID; -import neqsim.fluidMechanics.flowNode.FlowNodeInterface; -import neqsim.fluidMechanics.flowSolver.FlowSolverInterface; -import neqsim.fluidMechanics.geometryDefinitions.GeometryDefinitionInterface; -import neqsim.fluidMechanics.util.fluidMechanicsVisualization.flowSystemVisualization.FlowSystemVisualizationInterface; -import neqsim.fluidMechanics.util.timeSeries.TimeSeries; +import neqsim.fluidmechanics.flownode.FlowNodeInterface; +import neqsim.fluidmechanics.flowsolver.FlowSolverInterface; +import neqsim.fluidmechanics.geometrydefinitions.GeometryDefinitionInterface; +import neqsim.fluidmechanics.util.fluidmechanicsvisualization.flowsystemvisualization.FlowSystemVisualizationInterface; +import neqsim.fluidmechanics.util.timeseries.TimeSeries; import neqsim.thermo.system.SystemInterface; /** @@ -63,7 +63,7 @@ public default void solveTransient(int type) { * getTimeSeries. *

* - * @return a {@link neqsim.fluidMechanics.util.timeSeries.TimeSeries} object + * @return a {@link neqsim.fluidmechanics.util.timeseries.TimeSeries} object */ public TimeSeries getTimeSeries(); @@ -73,7 +73,7 @@ public default void solveTransient(int type) { *

* * @return a - * {@link neqsim.fluidMechanics.util.fluidMechanicsVisualization.flowSystemVisualization.FlowSystemVisualizationInterface} + * {@link neqsim.fluidmechanics.util.fluidmechanicsvisualization.flowsystemvisualization.FlowSystemVisualizationInterface} * object */ public FlowSystemVisualizationInterface getDisplay(); @@ -83,7 +83,7 @@ public default void solveTransient(int type) { * getSolver. *

* - * @return a {@link neqsim.fluidMechanics.flowSolver.FlowSolverInterface} object + * @return a {@link neqsim.fluidmechanics.flowsolver.FlowSolverInterface} object */ public FlowSolverInterface getSolver(); @@ -182,7 +182,7 @@ public default void solveTransient(int type) { *

* * @param i a int - * @return a {@link neqsim.fluidMechanics.flowNode.FlowNodeInterface} object + * @return a {@link neqsim.fluidmechanics.flownode.FlowNodeInterface} object */ public FlowNodeInterface getNode(int i); @@ -219,7 +219,7 @@ public default void solveTransient(int type) { *

* * @param equipmentGeometry an array of - * {@link neqsim.fluidMechanics.geometryDefinitions.GeometryDefinitionInterface} objects + * {@link neqsim.fluidmechanics.geometrydefinitions.GeometryDefinitionInterface} objects */ public void setEquipmentGeometry(GeometryDefinitionInterface[] equipmentGeometry); @@ -285,7 +285,7 @@ public default void solveSteadyState(int type) { * getFlowNodes. *

* - * @return an array of {@link neqsim.fluidMechanics.flowNode.FlowNodeInterface} objects + * @return an array of {@link neqsim.fluidmechanics.flownode.FlowNodeInterface} objects */ public FlowNodeInterface[] getFlowNodes(); diff --git a/src/main/java/neqsim/fluidMechanics/flowSystem/onePhaseFlowSystem/OnePhaseFlowSystem.java b/src/main/java/neqsim/fluidmechanics/flowsystem/onephaseflowsystem/OnePhaseFlowSystem.java similarity index 78% rename from src/main/java/neqsim/fluidMechanics/flowSystem/onePhaseFlowSystem/OnePhaseFlowSystem.java rename to src/main/java/neqsim/fluidmechanics/flowsystem/onephaseflowsystem/OnePhaseFlowSystem.java index abca381dcd..9bc412bcf0 100644 --- a/src/main/java/neqsim/fluidMechanics/flowSystem/onePhaseFlowSystem/OnePhaseFlowSystem.java +++ b/src/main/java/neqsim/fluidmechanics/flowsystem/onephaseflowsystem/OnePhaseFlowSystem.java @@ -1,7 +1,7 @@ -package neqsim.fluidMechanics.flowSystem.onePhaseFlowSystem; +package neqsim.fluidmechanics.flowsystem.onephaseflowsystem; -import neqsim.fluidMechanics.flowSystem.FlowSystem; -import neqsim.fluidMechanics.geometryDefinitions.pipe.PipeData; +import neqsim.fluidmechanics.flowsystem.FlowSystem; +import neqsim.fluidmechanics.geometrydefinitions.pipe.PipeData; import neqsim.thermo.system.SystemInterface; /** diff --git a/src/main/java/neqsim/fluidMechanics/flowSystem/onePhaseFlowSystem/pipeFlowSystem/PipeFlowSystem.java b/src/main/java/neqsim/fluidmechanics/flowsystem/onephaseflowsystem/pipeflowsystem/PipeFlowSystem.java similarity index 82% rename from src/main/java/neqsim/fluidMechanics/flowSystem/onePhaseFlowSystem/pipeFlowSystem/PipeFlowSystem.java rename to src/main/java/neqsim/fluidmechanics/flowsystem/onephaseflowsystem/pipeflowsystem/PipeFlowSystem.java index c54558ced2..ac0fc5c68b 100644 --- a/src/main/java/neqsim/fluidMechanics/flowSystem/onePhaseFlowSystem/pipeFlowSystem/PipeFlowSystem.java +++ b/src/main/java/neqsim/fluidmechanics/flowsystem/onephaseflowsystem/pipeflowsystem/PipeFlowSystem.java @@ -1,7 +1,7 @@ -package neqsim.fluidMechanics.flowSystem.onePhaseFlowSystem.pipeFlowSystem; +package neqsim.fluidmechanics.flowsystem.onephaseflowsystem.pipeflowsystem; import java.util.UUID; -import neqsim.fluidMechanics.util.fluidMechanicsVisualization.flowSystemVisualization.onePhaseFlowVisualization.pipeFlowVisualization.PipeFlowVisualization; +import neqsim.fluidmechanics.util.fluidmechanicsvisualization.flowsystemvisualization.onephaseflowvisualization.pipeflowvisualization.PipeFlowVisualization; import neqsim.thermo.system.SystemInterface; /** @@ -13,7 +13,7 @@ * @version $Id: $Id */ public class PipeFlowSystem - extends neqsim.fluidMechanics.flowSystem.onePhaseFlowSystem.OnePhaseFlowSystem { + extends neqsim.fluidmechanics.flowsystem.onephaseflowsystem.OnePhaseFlowSystem { private static final long serialVersionUID = 1000; /** @@ -28,17 +28,17 @@ public PipeFlowSystem() {} public void createSystem() { thermoSystem.init(0); thermoSystem.init(1); - flowLeg = new neqsim.fluidMechanics.flowLeg.pipeLeg.PipeLeg[this.getNumberOfLegs()]; + flowLeg = new neqsim.fluidmechanics.flowleg.pipeleg.PipeLeg[this.getNumberOfLegs()]; for (int i = 0; i < getNumberOfLegs(); i++) { - flowLeg[i] = new neqsim.fluidMechanics.flowLeg.pipeLeg.PipeLeg(); + flowLeg[i] = new neqsim.fluidmechanics.flowleg.pipeleg.PipeLeg(); } flowNode = - new neqsim.fluidMechanics.flowNode.onePhaseNode.onePhasePipeFlowNode.onePhasePipeFlowNode[totalNumberOfNodes]; + new neqsim.fluidmechanics.flownode.onephasenode.onephasepipeflownode.onePhasePipeFlowNode[totalNumberOfNodes]; // System.out.println("nodes: " + totalNumberOfNodes); flowNode[0] = - new neqsim.fluidMechanics.flowNode.onePhaseNode.onePhasePipeFlowNode.onePhasePipeFlowNode( + new neqsim.fluidmechanics.flownode.onephasenode.onephasepipeflownode.onePhasePipeFlowNode( thermoSystem, this.equipmentGeometry[0]); flowNode[0].initFlowCalc(); super.createSystem(); @@ -73,7 +73,7 @@ public void solveSteadyState(int type, UUID id) { // SteadystateOnePhasePipeFlowSolver(this, getSystemLength(), // getTotalNumberOfNodes()); flowSolver = - new neqsim.fluidMechanics.flowSolver.onePhaseFlowSolver.onePhasePipeFlowSolver.OnePhaseFixedStaggeredGrid( + new neqsim.fluidmechanics.flowsolver.onephaseflowsolver.onephasepipeflowsolver.OnePhaseFixedStaggeredGrid( this, getSystemLength(), getTotalNumberOfNodes(), false); flowSolver.setSolverType(type); flowSolver.solveTDMA(); diff --git a/src/main/java/neqsim/fluidMechanics/flowSystem/twoPhaseFlowSystem/TwoPhaseFlowSystem.java b/src/main/java/neqsim/fluidmechanics/flowsystem/twophaseflowsystem/TwoPhaseFlowSystem.java similarity index 79% rename from src/main/java/neqsim/fluidMechanics/flowSystem/twoPhaseFlowSystem/TwoPhaseFlowSystem.java rename to src/main/java/neqsim/fluidmechanics/flowsystem/twophaseflowsystem/TwoPhaseFlowSystem.java index de4056dab9..10ecc416f9 100644 --- a/src/main/java/neqsim/fluidMechanics/flowSystem/twoPhaseFlowSystem/TwoPhaseFlowSystem.java +++ b/src/main/java/neqsim/fluidmechanics/flowsystem/twophaseflowsystem/TwoPhaseFlowSystem.java @@ -1,7 +1,7 @@ -package neqsim.fluidMechanics.flowSystem.twoPhaseFlowSystem; +package neqsim.fluidmechanics.flowsystem.twophaseflowsystem; -import neqsim.fluidMechanics.flowSystem.FlowSystem; -import neqsim.fluidMechanics.geometryDefinitions.pipe.PipeData; +import neqsim.fluidmechanics.flowsystem.FlowSystem; +import neqsim.fluidmechanics.geometrydefinitions.pipe.PipeData; import neqsim.thermo.system.SystemInterface; /** diff --git a/src/main/java/neqsim/fluidMechanics/flowSystem/twoPhaseFlowSystem/shipSystem/LNGship.java b/src/main/java/neqsim/fluidmechanics/flowsystem/twophaseflowsystem/shipsystem/LNGship.java similarity index 95% rename from src/main/java/neqsim/fluidMechanics/flowSystem/twoPhaseFlowSystem/shipSystem/LNGship.java rename to src/main/java/neqsim/fluidmechanics/flowsystem/twophaseflowsystem/shipsystem/LNGship.java index 649c8ef8c8..56aa0aeff1 100644 --- a/src/main/java/neqsim/fluidMechanics/flowSystem/twoPhaseFlowSystem/shipSystem/LNGship.java +++ b/src/main/java/neqsim/fluidmechanics/flowsystem/twophaseflowsystem/shipsystem/LNGship.java @@ -1,16 +1,16 @@ -package neqsim.fluidMechanics.flowSystem.twoPhaseFlowSystem.shipSystem; +package neqsim.fluidmechanics.flowsystem.twophaseflowsystem.shipsystem; import java.text.DecimalFormat; import java.util.UUID; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import neqsim.standards.StandardInterface; -import neqsim.standards.gasQuality.Standard_ISO6578; -import neqsim.standards.gasQuality.Standard_ISO6976; -import neqsim.standards.gasQuality.Standard_ISO6976_2016; +import neqsim.standards.gasquality.Standard_ISO6578; +import neqsim.standards.gasquality.Standard_ISO6976; +import neqsim.standards.gasquality.Standard_ISO6976_2016; import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

@@ -21,27 +21,27 @@ * @version $Id: $Id */ public class LNGship - extends neqsim.fluidMechanics.flowSystem.twoPhaseFlowSystem.TwoPhaseFlowSystem { + extends neqsim.fluidmechanics.flowsystem.twophaseflowsystem.TwoPhaseFlowSystem { private static final long serialVersionUID = 1000; static Logger logger = LogManager.getLogger(LNGship.class); double[] temperature = null; double dailyBoilOffRatio = 0.005; - double totalTankVolume = 140000; + public double totalTankVolume = 140000; private double liquidDensity = 0.7; - int numberOffTimeSteps = 100; + public int numberOffTimeSteps = 100; private double initialTemperature = 111.0; private boolean setInitialTemperature = false; private neqsim.thermo.system.SystemInterface thermoSystem = null; - double initialNumberOffMoles; + public double initialNumberOffMoles; double molarBoilOffRate = 0.0; - double dailyBoilOffVolume = 0.0; + public double dailyBoilOffVolume = 0.0; private double endTime = 960; // 24.0 * 10; private Standard_ISO6976 standardISO6976 = null; StandardInterface standardDensity = null; double[] WI = null; double[] density = null; - double[] volume = null; + public double[] volume = null; double[] xmethane; double[] xethane; double[] xpropane; @@ -64,11 +64,11 @@ public class LNGship double[] GCVmass; double[] totalEnergy; double[] time; - double[] tankTemperature = null; + public double[] tankTemperature = null; double timeStep = 0; private String[][] resultTable = null; private boolean backCalculate = false; - double endVolume = 0.0; + public double endVolume = 0.0; /** *

@@ -407,9 +407,8 @@ public String[][] getResults(String name) { public static void main(String[] args) { // thermo.system.SystemInterface testSystem = new // thermo.system.SystemGERG2004Eos(273.15 - 161.4, 1.0); - neqsim.thermo.system.SystemInterface testSystem = - new neqsim.thermo.system.SystemSrkEos(273.15 - 161.4, - ThermodynamicConstantsInterface.referencePressure); + neqsim.thermo.system.SystemInterface testSystem = new neqsim.thermo.system.SystemSrkEos( + 273.15 - 161.4, ThermodynamicConstantsInterface.referencePressure); /* * testSystem.addComponent("nitrogen", 0.0136); testSystem.addComponent("methane", 0.9186); * testSystem.addComponent("ethane", 0.0526); testSystem.addComponent("propane", 0.0115); @@ -425,8 +424,8 @@ public static void main(String[] args) { testSystem.createDatabase(true); testSystem.setMixingRule(2); - neqsim.fluidMechanics.flowSystem.twoPhaseFlowSystem.shipSystem.LNGship ship = - new neqsim.fluidMechanics.flowSystem.twoPhaseFlowSystem.shipSystem.LNGship(testSystem, + neqsim.fluidmechanics.flowsystem.twophaseflowsystem.shipsystem.LNGship ship = + new neqsim.fluidmechanics.flowsystem.twophaseflowsystem.shipsystem.LNGship(testSystem, 140000, 0.0015); // ship.setInitialTemperature(111.0); // ship.useStandardVersion("","2016"); diff --git a/src/main/java/neqsim/fluidMechanics/flowSystem/twoPhaseFlowSystem/stirredCellSystem/StirredCellSystem.java b/src/main/java/neqsim/fluidmechanics/flowsystem/twophaseflowsystem/stirredcellsystem/StirredCellSystem.java similarity index 83% rename from src/main/java/neqsim/fluidMechanics/flowSystem/twoPhaseFlowSystem/stirredCellSystem/StirredCellSystem.java rename to src/main/java/neqsim/fluidmechanics/flowsystem/twophaseflowsystem/stirredcellsystem/StirredCellSystem.java index 16145b5823..7375b844ac 100644 --- a/src/main/java/neqsim/fluidMechanics/flowSystem/twoPhaseFlowSystem/stirredCellSystem/StirredCellSystem.java +++ b/src/main/java/neqsim/fluidmechanics/flowsystem/twophaseflowsystem/stirredcellsystem/StirredCellSystem.java @@ -1,4 +1,4 @@ -package neqsim.fluidMechanics.flowSystem.twoPhaseFlowSystem.stirredCellSystem; +package neqsim.fluidmechanics.flowsystem.twophaseflowsystem.stirredcellsystem; import java.util.UUID; import neqsim.thermo.system.SystemInterface; @@ -12,7 +12,7 @@ * @version $Id: $Id */ public class StirredCellSystem - extends neqsim.fluidMechanics.flowSystem.twoPhaseFlowSystem.TwoPhaseFlowSystem { + extends neqsim.fluidmechanics.flowsystem.twophaseflowsystem.TwoPhaseFlowSystem { private static final long serialVersionUID = 1000; /** @@ -25,15 +25,15 @@ public StirredCellSystem() {} /** {@inheritDoc} */ @Override public void createSystem() { - flowLeg = new neqsim.fluidMechanics.flowLeg.pipeLeg.PipeLeg[this.getNumberOfLegs()]; + flowLeg = new neqsim.fluidmechanics.flowleg.pipeleg.PipeLeg[this.getNumberOfLegs()]; for (int i = 0; i < getNumberOfLegs(); i++) { - flowLeg[i] = new neqsim.fluidMechanics.flowLeg.pipeLeg.PipeLeg(); + flowLeg[i] = new neqsim.fluidmechanics.flowleg.pipeleg.PipeLeg(); } - flowNode = new neqsim.fluidMechanics.flowNode.FlowNodeInterface[totalNumberOfNodes]; + flowNode = new neqsim.fluidmechanics.flownode.FlowNodeInterface[totalNumberOfNodes]; flowNode[0] = - new neqsim.fluidMechanics.flowNode.twoPhaseNode.twoPhaseStirredCellNode.StirredCellNode( + new neqsim.fluidmechanics.flownode.twophasenode.twophasestirredcellnode.StirredCellNode( thermoSystem, equipmentGeometry[0]); flowNode[totalNumberOfNodes - 1] = flowNode[0].getNextNode(); @@ -67,7 +67,7 @@ public void init() { public void solveSteadyState(int type, UUID id) { // TODO: double[] times = {0.0}; ? flowSolver = - new neqsim.fluidMechanics.flowSolver.twoPhaseFlowSolver.stirredCellSolver.StirredCellSolver( + new neqsim.fluidmechanics.flowsolver.twophaseflowsolver.stirredcellsolver.StirredCellSolver( this, getSystemLength(), getTotalNumberOfNodes(), false); calcIdentifier = id; // TODO: getTimeSeries().init(this); @@ -78,7 +78,7 @@ public void solveSteadyState(int type, UUID id) { public void solveTransient(int solverType, UUID id) { getTimeSeries().init(this); display = - new neqsim.fluidMechanics.util.fluidMechanicsVisualization.flowSystemVisualization.twoPhaseFlowVisualization.twoPhasePipeFlowVisualization.TwoPhasePipeFlowVisualization( + new neqsim.fluidmechanics.util.fluidmechanicsvisualization.flowsystemvisualization.twophaseflowvisualization.twophasepipeflowvisualization.TwoPhasePipeFlowVisualization( this.getTotalNumberOfNodes(), getTimeSeries().getTime().length); for (int i = 0; i < this.getTimeSeries().getTime().length; i++) { getNode(0).setBulkSystem(this.getTimeSeries().getThermoSystem()[i]); @@ -107,7 +107,7 @@ public void solveTransient(int solverType, UUID id) { */ public static void main(String[] args) { // Initierer et nyt rorsystem - neqsim.fluidMechanics.flowSystem.FlowSystemInterface pipe = new StirredCellSystem(); + neqsim.fluidmechanics.flowsystem.FlowSystemInterface pipe = new StirredCellSystem(); // Definerer termodyanmikken5 neqsim.thermo.system.SystemInterface testSystem = @@ -139,12 +139,12 @@ public static void main(String[] args) { pipe.setLegWallHeatTransferCoefficients(wallHeatTransferCoef); // Deffinerer geometrien for roret - neqsim.fluidMechanics.geometryDefinitions.GeometryDefinitionInterface[] pipeGemometry = - new neqsim.fluidMechanics.geometryDefinitions.pipe.PipeData[6]; + neqsim.fluidmechanics.geometrydefinitions.GeometryDefinitionInterface[] pipeGemometry = + new neqsim.fluidmechanics.geometrydefinitions.pipe.PipeData[6]; double[] pipeDiameter = {0.02588, 0.02588}; for (int i = 0; i < pipeDiameter.length; i++) { pipeGemometry[i] = - new neqsim.fluidMechanics.geometryDefinitions.pipe.PipeData(pipeDiameter[i]); + new neqsim.fluidmechanics.geometrydefinitions.pipe.PipeData(pipeDiameter[i]); } pipe.setEquipmentGeometry(pipeGemometry); // setter inn rorgeometrien for hver leg // utforer beregninger diff --git a/src/main/java/neqsim/fluidMechanics/flowSystem/twoPhaseFlowSystem/twoPhasePipeFlowSystem/TwoPhasePipeFlowSystem.java b/src/main/java/neqsim/fluidmechanics/flowsystem/twophaseflowsystem/twophasepipeflowsystem/TwoPhasePipeFlowSystem.java similarity index 80% rename from src/main/java/neqsim/fluidMechanics/flowSystem/twoPhaseFlowSystem/twoPhasePipeFlowSystem/TwoPhasePipeFlowSystem.java rename to src/main/java/neqsim/fluidmechanics/flowsystem/twophaseflowsystem/twophasepipeflowsystem/TwoPhasePipeFlowSystem.java index 8463d01c1a..5b7949329a 100644 --- a/src/main/java/neqsim/fluidMechanics/flowSystem/twoPhaseFlowSystem/twoPhasePipeFlowSystem/TwoPhasePipeFlowSystem.java +++ b/src/main/java/neqsim/fluidmechanics/flowsystem/twophaseflowsystem/twophasepipeflowsystem/TwoPhasePipeFlowSystem.java @@ -1,4 +1,4 @@ -package neqsim.fluidMechanics.flowSystem.twoPhaseFlowSystem.twoPhasePipeFlowSystem; +package neqsim.fluidmechanics.flowsystem.twophaseflowsystem.twophasepipeflowsystem; import java.util.UUID; @@ -11,7 +11,7 @@ * @version $Id: $Id */ public class TwoPhasePipeFlowSystem - extends neqsim.fluidMechanics.flowSystem.twoPhaseFlowSystem.TwoPhaseFlowSystem { + extends neqsim.fluidmechanics.flowsystem.twophaseflowsystem.TwoPhaseFlowSystem { private static final long serialVersionUID = 1000; /** @@ -25,24 +25,24 @@ public TwoPhasePipeFlowSystem() {} @Override public void createSystem() { // thermoSystem.init(1); - flowLeg = new neqsim.fluidMechanics.flowLeg.pipeLeg.PipeLeg[this.getNumberOfLegs()]; + flowLeg = new neqsim.fluidmechanics.flowleg.pipeleg.PipeLeg[this.getNumberOfLegs()]; for (int i = 0; i < getNumberOfLegs(); i++) { - flowLeg[i] = new neqsim.fluidMechanics.flowLeg.pipeLeg.PipeLeg(); + flowLeg[i] = new neqsim.fluidmechanics.flowleg.pipeleg.PipeLeg(); } - flowNode = new neqsim.fluidMechanics.flowNode.FlowNodeInterface[totalNumberOfNodes]; + flowNode = new neqsim.fluidmechanics.flownode.FlowNodeInterface[totalNumberOfNodes]; if (initFlowPattern.equals("stratified")) { flowNode[0] = - new neqsim.fluidMechanics.flowNode.twoPhaseNode.twoPhasePipeFlowNode.StratifiedFlowNode( + new neqsim.fluidmechanics.flownode.twophasenode.twophasepipeflownode.StratifiedFlowNode( thermoSystem, equipmentGeometry[0]); } else if (initFlowPattern.equals("annular")) { flowNode[0] = - new neqsim.fluidMechanics.flowNode.twoPhaseNode.twoPhasePipeFlowNode.AnnularFlow( + new neqsim.fluidmechanics.flownode.twophasenode.twophasepipeflownode.AnnularFlow( thermoSystem, equipmentGeometry[0]); } else { flowNode[0] = - new neqsim.fluidMechanics.flowNode.twoPhaseNode.twoPhasePipeFlowNode.StratifiedFlowNode( + new neqsim.fluidmechanics.flownode.twophasenode.twophasepipeflownode.StratifiedFlowNode( thermoSystem, equipmentGeometry[0]); } flowNode[totalNumberOfNodes - 1] = flowNode[0].getNextNode(); @@ -77,7 +77,7 @@ public void init() { public void solveSteadyState(int type, UUID id) { double[] times = {0.0}; display = - new neqsim.fluidMechanics.util.fluidMechanicsVisualization.flowSystemVisualization.twoPhaseFlowVisualization.twoPhasePipeFlowVisualization.TwoPhasePipeFlowVisualization( + new neqsim.fluidmechanics.util.fluidmechanicsvisualization.flowsystemvisualization.twophaseflowvisualization.twophasepipeflowvisualization.TwoPhasePipeFlowVisualization( this.getTotalNumberOfNodes(), 1); getTimeSeries().setTimes(times); neqsim.thermo.system.SystemInterface[] systems = {flowNode[0].getBulkSystem()}; @@ -87,7 +87,7 @@ public void solveSteadyState(int type, UUID id) { getTimeSeries().setOutletMolarFlowRate(outletFlowRates); flowSolver = - new neqsim.fluidMechanics.flowSolver.twoPhaseFlowSolver.twoPhasePipeFlowSolver.TwoPhaseFixedStaggeredGridSolver( + new neqsim.fluidmechanics.flowsolver.twophaseflowsolver.twophasepipeflowsolver.TwoPhaseFixedStaggeredGridSolver( this, getSystemLength(), this.getTotalNumberOfNodes(), false); flowSolver.setSolverType(type); flowSolver.solveTDMA(); @@ -116,15 +116,15 @@ public void solveTransient(int type, UUID id) { @SuppressWarnings("unused") public static void main(String[] args) { // Initierer et nyt rorsystem - neqsim.fluidMechanics.flowSystem.FlowSystemInterface pipe = new TwoPhasePipeFlowSystem(); + neqsim.fluidmechanics.flowsystem.FlowSystemInterface pipe = new TwoPhasePipeFlowSystem(); // Definerer termodyanmikken5 - initierer et system som benytter SRK tilstandsligning neqsim.thermo.system.SystemInterface testSystem = new neqsim.thermo.system.SystemSrkEos(295.3, 5.0); // med trykk 305.3 K og 125 bar - // gjor termodynamiske Flash rutiner tilgjengelige - neqsim.thermodynamicOperations.ThermodynamicOperations testOps = - new neqsim.thermodynamicOperations.ThermodynamicOperations(testSystem); + neqsim.thermodynamicoperations.ThermodynamicOperations testOps = + new neqsim.thermodynamicoperations.ThermodynamicOperations(testSystem); testSystem.addComponent("methane", 0.11152181, 0); // testSystem.addComponent("ethane", 0.0011152181, 0); testSystem.addComponent("water", 0.04962204876, 1); @@ -152,12 +152,12 @@ public static void main(String[] args) { pipe.setLegOuterHeatTransferCoefficients(outHeatCoef); // Definerer geometrien for roret - neqsim.fluidMechanics.geometryDefinitions.GeometryDefinitionInterface[] pipeGemometry = - new neqsim.fluidMechanics.geometryDefinitions.pipe.PipeData[6]; + neqsim.fluidmechanics.geometrydefinitions.GeometryDefinitionInterface[] pipeGemometry = + new neqsim.fluidmechanics.geometrydefinitions.pipe.PipeData[6]; double[] pipeDiameter = {0.02588, 0.02588, 0.02588, 0.02588, 0.02588, 0.02588}; for (int i = 0; i < pipeDiameter.length; i++) { pipeGemometry[i] = - new neqsim.fluidMechanics.geometryDefinitions.pipe.PipeData(pipeDiameter[i]); + new neqsim.fluidmechanics.geometrydefinitions.pipe.PipeData(pipeDiameter[i]); } pipe.setEquipmentGeometry(pipeGemometry); // setter inn rorgeometrien for hver leg // utforer beregninger diff --git a/src/main/java/neqsim/fluidMechanics/flowSystem/twoPhaseFlowSystem/twoPhasePipeFlowSystem/TwoPhasePipeFlowSystemReac.java b/src/main/java/neqsim/fluidmechanics/flowsystem/twophaseflowsystem/twophasepipeflowsystem/TwoPhasePipeFlowSystemReac.java similarity index 88% rename from src/main/java/neqsim/fluidMechanics/flowSystem/twoPhaseFlowSystem/twoPhasePipeFlowSystem/TwoPhasePipeFlowSystemReac.java rename to src/main/java/neqsim/fluidmechanics/flowsystem/twophaseflowsystem/twophasepipeflowsystem/TwoPhasePipeFlowSystemReac.java index 31bcc82bb7..492c721ce1 100644 --- a/src/main/java/neqsim/fluidMechanics/flowSystem/twoPhaseFlowSystem/twoPhasePipeFlowSystem/TwoPhasePipeFlowSystemReac.java +++ b/src/main/java/neqsim/fluidmechanics/flowsystem/twophaseflowsystem/twophasepipeflowsystem/TwoPhasePipeFlowSystemReac.java @@ -1,8 +1,8 @@ -package neqsim.fluidMechanics.flowSystem.twoPhaseFlowSystem.twoPhasePipeFlowSystem; +package neqsim.fluidmechanics.flowsystem.twophaseflowsystem.twophasepipeflowsystem; import neqsim.thermo.system.SystemFurstElectrolyteEos; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

@@ -31,7 +31,7 @@ public TwoPhasePipeFlowSystemReac() {} */ public static void main(String[] args) { // Initierer et nyt rorsystem - neqsim.fluidMechanics.flowSystem.FlowSystemInterface pipe = new TwoPhasePipeFlowSystemReac(); + neqsim.fluidmechanics.flowsystem.FlowSystemInterface pipe = new TwoPhasePipeFlowSystemReac(); SystemInterface testSystem = new SystemFurstElectrolyteEos(295.3, 50.01325); testSystem.addComponent("methane", 50.11152187, "Nlitre/min", 0); @@ -63,15 +63,15 @@ public static void main(String[] args) { pipe.setLegPositions(length); // setter avstand til hver leg-ende pipe.setLegOuterTemperatures(outerTemperature); - neqsim.fluidMechanics.geometryDefinitions.GeometryDefinitionInterface[] pipeGemometry = - new neqsim.fluidMechanics.geometryDefinitions.pipe.PipeData[5]; // Deffinerer + neqsim.fluidmechanics.geometrydefinitions.GeometryDefinitionInterface[] pipeGemometry = + new neqsim.fluidmechanics.geometrydefinitions.pipe.PipeData[5]; // Deffinerer // geometrien // for // roret double[] pipeDiameter = {0.025, 0.025, 0.025, 0.025, 0.025}; for (int i = 0; i < pipeDiameter.length; i++) { pipeGemometry[i] = - new neqsim.fluidMechanics.geometryDefinitions.pipe.PipeData(pipeDiameter[i]); + new neqsim.fluidmechanics.geometrydefinitions.pipe.PipeData(pipeDiameter[i]); } pipe.setEquipmentGeometry(pipeGemometry); // setter inn rorgeometrien for hver leg // utforer beregninger diff --git a/src/main/java/neqsim/fluidMechanics/flowSystem/twoPhaseFlowSystem/twoPhaseReactorFlowSystem/TwoPhaseReactorFlowSystem.java b/src/main/java/neqsim/fluidmechanics/flowsystem/twophaseflowsystem/twophasereactorflowsystem/TwoPhaseReactorFlowSystem.java similarity index 83% rename from src/main/java/neqsim/fluidMechanics/flowSystem/twoPhaseFlowSystem/twoPhaseReactorFlowSystem/TwoPhaseReactorFlowSystem.java rename to src/main/java/neqsim/fluidmechanics/flowsystem/twophaseflowsystem/twophasereactorflowsystem/TwoPhaseReactorFlowSystem.java index 05fa5eee90..86f29138b7 100644 --- a/src/main/java/neqsim/fluidMechanics/flowSystem/twoPhaseFlowSystem/twoPhaseReactorFlowSystem/TwoPhaseReactorFlowSystem.java +++ b/src/main/java/neqsim/fluidmechanics/flowsystem/twophaseflowsystem/twophasereactorflowsystem/TwoPhaseReactorFlowSystem.java @@ -1,7 +1,7 @@ -package neqsim.fluidMechanics.flowSystem.twoPhaseFlowSystem.twoPhaseReactorFlowSystem; +package neqsim.fluidmechanics.flowsystem.twophaseflowsystem.twophasereactorflowsystem; import java.util.UUID; -import neqsim.fluidMechanics.util.fluidMechanicsVisualization.flowSystemVisualization.twoPhaseFlowVisualization.twoPhasePipeFlowVisualization.TwoPhasePipeFlowVisualization; +import neqsim.fluidmechanics.util.fluidmechanicsvisualization.flowsystemvisualization.twophaseflowvisualization.twophasepipeflowvisualization.TwoPhasePipeFlowVisualization; /** *

@@ -12,7 +12,7 @@ * @version $Id: $Id */ public class TwoPhaseReactorFlowSystem - extends neqsim.fluidMechanics.flowSystem.twoPhaseFlowSystem.TwoPhaseFlowSystem { + extends neqsim.fluidmechanics.flowsystem.twophaseflowsystem.TwoPhaseFlowSystem { private static final long serialVersionUID = 1000; /** @@ -26,15 +26,15 @@ public TwoPhaseReactorFlowSystem() {} @Override public void createSystem() { // thermoSystem.init(1); - flowLeg = new neqsim.fluidMechanics.flowLeg.pipeLeg.PipeLeg[this.getNumberOfLegs()]; + flowLeg = new neqsim.fluidmechanics.flowleg.pipeleg.PipeLeg[this.getNumberOfLegs()]; for (int i = 0; i < getNumberOfLegs(); i++) { - flowLeg[i] = new neqsim.fluidMechanics.flowLeg.pipeLeg.PipeLeg(); + flowLeg[i] = new neqsim.fluidmechanics.flowleg.pipeleg.PipeLeg(); } - flowNode = new neqsim.fluidMechanics.flowNode.FlowNodeInterface[totalNumberOfNodes]; + flowNode = new neqsim.fluidmechanics.flownode.FlowNodeInterface[totalNumberOfNodes]; flowNode[0] = - new neqsim.fluidMechanics.flowNode.twoPhaseNode.twoPhasePipeFlowNode.StratifiedFlowNode( + new neqsim.fluidmechanics.flownode.twophasenode.twophasepipeflownode.StratifiedFlowNode( thermoSystem, equipmentGeometry[0]); flowNode[totalNumberOfNodes - 1] = flowNode[0].getNextNode(); @@ -78,7 +78,7 @@ public void solveSteadyState(int type, UUID id) { getTimeSeries().setOutletMolarFlowRate(outletFlowRates); flowSolver = - new neqsim.fluidMechanics.flowSolver.twoPhaseFlowSolver.twoPhasePipeFlowSolver.TwoPhaseFixedStaggeredGridSolver( + new neqsim.fluidmechanics.flowsolver.twophaseflowsolver.twophasepipeflowsolver.TwoPhaseFixedStaggeredGridSolver( this, getSystemLength(), this.getTotalNumberOfNodes(), false); flowSolver.setSolverType(type); flowSolver.solveTDMA(); @@ -105,7 +105,7 @@ public void solveTransient(int type, UUID id) { @SuppressWarnings("unused") public static void main(String[] args) { // Initierer et nyt rorsystem - neqsim.fluidMechanics.flowSystem.FlowSystemInterface pipe = new TwoPhaseReactorFlowSystem(); + neqsim.fluidmechanics.flowsystem.FlowSystemInterface pipe = new TwoPhaseReactorFlowSystem(); // Definerer termodyanmikken5 neqsim.thermo.system.SystemInterface testSystem = @@ -117,8 +117,8 @@ public static void main(String[] args) { // SRK // tilstandsligning // med trykk 305.3 K og 125 bar - neqsim.thermodynamicOperations.ThermodynamicOperations testOps = - new neqsim.thermodynamicOperations.ThermodynamicOperations(testSystem); // gjor + neqsim.thermodynamicoperations.ThermodynamicOperations testOps = + new neqsim.thermodynamicoperations.ThermodynamicOperations(testSystem); // gjor // termodyanmiske // Flash // rutiner @@ -143,15 +143,15 @@ public static void main(String[] args) { pipe.setLegPositions(length); // setter avstand til hver leg-ende pipe.setLegOuterTemperatures(outerTemperature); - neqsim.fluidMechanics.geometryDefinitions.GeometryDefinitionInterface[] pipeGemometry = - new neqsim.fluidMechanics.geometryDefinitions.reactor.ReactorData[5]; // Deffinerer + neqsim.fluidmechanics.geometrydefinitions.GeometryDefinitionInterface[] pipeGemometry = + new neqsim.fluidmechanics.geometrydefinitions.reactor.ReactorData[5]; // Deffinerer // geometrien // for // roret double[] pipeDiameter = {0.02588, 0.02588, 0.02588, 0.02588, 0.02588}; for (int i = 0; i < pipeDiameter.length; i++) { pipeGemometry[i] = - new neqsim.fluidMechanics.geometryDefinitions.reactor.ReactorData(pipeDiameter[i], 1); + new neqsim.fluidmechanics.geometrydefinitions.reactor.ReactorData(pipeDiameter[i], 1); } pipe.setEquipmentGeometry(pipeGemometry); // setter inn rorgeometrien for hver leg // utforer beregninger diff --git a/src/main/java/neqsim/fluidMechanics/geometryDefinitions/GeometryDefinition.java b/src/main/java/neqsim/fluidmechanics/geometrydefinitions/GeometryDefinition.java similarity index 94% rename from src/main/java/neqsim/fluidMechanics/geometryDefinitions/GeometryDefinition.java rename to src/main/java/neqsim/fluidmechanics/geometrydefinitions/GeometryDefinition.java index 87463d28f3..6336660825 100644 --- a/src/main/java/neqsim/fluidMechanics/geometryDefinitions/GeometryDefinition.java +++ b/src/main/java/neqsim/fluidmechanics/geometrydefinitions/GeometryDefinition.java @@ -4,12 +4,12 @@ * Created on 10. desember 2000, 18:47 */ -package neqsim.fluidMechanics.geometryDefinitions; +package neqsim.fluidmechanics.geometrydefinitions; -import neqsim.fluidMechanics.geometryDefinitions.internalGeometry.packings.PackingInterface; -import neqsim.fluidMechanics.geometryDefinitions.internalGeometry.wall.Wall; -import neqsim.fluidMechanics.geometryDefinitions.surrounding.SurroundingEnvironment; -import neqsim.fluidMechanics.geometryDefinitions.surrounding.SurroundingEnvironmentBaseClass; +import neqsim.fluidmechanics.geometrydefinitions.internalgeometry.packings.PackingInterface; +import neqsim.fluidmechanics.geometrydefinitions.internalgeometry.wall.Wall; +import neqsim.fluidmechanics.geometrydefinitions.surrounding.SurroundingEnvironment; +import neqsim.fluidmechanics.geometrydefinitions.surrounding.SurroundingEnvironmentBaseClass; /** *

diff --git a/src/main/java/neqsim/fluidMechanics/geometryDefinitions/GeometryDefinitionInterface.java b/src/main/java/neqsim/fluidmechanics/geometrydefinitions/GeometryDefinitionInterface.java similarity index 87% rename from src/main/java/neqsim/fluidMechanics/geometryDefinitions/GeometryDefinitionInterface.java rename to src/main/java/neqsim/fluidmechanics/geometrydefinitions/GeometryDefinitionInterface.java index 84cd409496..c7af1fdc9f 100644 --- a/src/main/java/neqsim/fluidMechanics/geometryDefinitions/GeometryDefinitionInterface.java +++ b/src/main/java/neqsim/fluidmechanics/geometrydefinitions/GeometryDefinitionInterface.java @@ -4,10 +4,10 @@ * Created on 10. desember 2000, 18:56 */ -package neqsim.fluidMechanics.geometryDefinitions; +package neqsim.fluidmechanics.geometrydefinitions; -import neqsim.fluidMechanics.geometryDefinitions.internalGeometry.packings.PackingInterface; -import neqsim.fluidMechanics.geometryDefinitions.surrounding.SurroundingEnvironment; +import neqsim.fluidmechanics.geometrydefinitions.internalgeometry.packings.PackingInterface; +import neqsim.fluidmechanics.geometrydefinitions.surrounding.SurroundingEnvironment; /** *

@@ -169,7 +169,7 @@ public interface GeometryDefinitionInterface extends Cloneable { *

* * @return a - * {@link neqsim.fluidMechanics.geometryDefinitions.internalGeometry.packings.PackingInterface} + * {@link neqsim.fluidmechanics.geometrydefinitions.internalgeometry.packings.PackingInterface} * object */ public PackingInterface getPacking(); @@ -179,7 +179,7 @@ public interface GeometryDefinitionInterface extends Cloneable { * getGeometry. *

* - * @return a {@link neqsim.fluidMechanics.geometryDefinitions.GeometryDefinitionInterface} object + * @return a {@link neqsim.fluidmechanics.geometrydefinitions.GeometryDefinitionInterface} object */ public GeometryDefinitionInterface getGeometry(); @@ -188,7 +188,7 @@ public interface GeometryDefinitionInterface extends Cloneable { * clone. *

* - * @return a {@link neqsim.fluidMechanics.geometryDefinitions.GeometryDefinitionInterface} object + * @return a {@link neqsim.fluidmechanics.geometrydefinitions.GeometryDefinitionInterface} object */ public GeometryDefinitionInterface clone(); @@ -215,7 +215,7 @@ public interface GeometryDefinitionInterface extends Cloneable { * getSurroundingEnvironment. *

* - * @return a {@link neqsim.fluidMechanics.geometryDefinitions.surrounding.SurroundingEnvironment} + * @return a {@link neqsim.fluidmechanics.geometrydefinitions.surrounding.SurroundingEnvironment} * object */ public SurroundingEnvironment getSurroundingEnvironment(); @@ -226,7 +226,7 @@ public interface GeometryDefinitionInterface extends Cloneable { *

* * @param surroundingEnvironment a - * {@link neqsim.fluidMechanics.geometryDefinitions.surrounding.SurroundingEnvironment} + * {@link neqsim.fluidmechanics.geometrydefinitions.surrounding.SurroundingEnvironment} * object */ public void setSurroundingEnvironment(SurroundingEnvironment surroundingEnvironment); diff --git a/src/main/java/neqsim/fluidMechanics/geometryDefinitions/internalGeometry/packings/BerlSaddlePacking.java b/src/main/java/neqsim/fluidmechanics/geometrydefinitions/internalgeometry/packings/BerlSaddlePacking.java similarity index 84% rename from src/main/java/neqsim/fluidMechanics/geometryDefinitions/internalGeometry/packings/BerlSaddlePacking.java rename to src/main/java/neqsim/fluidmechanics/geometrydefinitions/internalgeometry/packings/BerlSaddlePacking.java index 43383807f3..61d8e060a6 100644 --- a/src/main/java/neqsim/fluidMechanics/geometryDefinitions/internalGeometry/packings/BerlSaddlePacking.java +++ b/src/main/java/neqsim/fluidmechanics/geometrydefinitions/internalgeometry/packings/BerlSaddlePacking.java @@ -1,4 +1,4 @@ -package neqsim.fluidMechanics.geometryDefinitions.internalGeometry.packings; +package neqsim.fluidmechanics.geometrydefinitions.internalgeometry.packings; /** *

diff --git a/src/main/java/neqsim/fluidMechanics/geometryDefinitions/internalGeometry/packings/Packing.java b/src/main/java/neqsim/fluidmechanics/geometrydefinitions/internalgeometry/packings/Packing.java similarity index 97% rename from src/main/java/neqsim/fluidMechanics/geometryDefinitions/internalGeometry/packings/Packing.java rename to src/main/java/neqsim/fluidmechanics/geometrydefinitions/internalgeometry/packings/Packing.java index 68328dbe08..fa133c824f 100644 --- a/src/main/java/neqsim/fluidMechanics/geometryDefinitions/internalGeometry/packings/Packing.java +++ b/src/main/java/neqsim/fluidmechanics/geometrydefinitions/internalgeometry/packings/Packing.java @@ -4,7 +4,7 @@ * Created on 25. august 2001, 23:34 */ -package neqsim.fluidMechanics.geometryDefinitions.internalGeometry.packings; +package neqsim.fluidmechanics.geometrydefinitions.internalgeometry.packings; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/neqsim/fluidMechanics/geometryDefinitions/internalGeometry/packings/PackingInterface.java b/src/main/java/neqsim/fluidmechanics/geometrydefinitions/internalgeometry/packings/PackingInterface.java similarity index 92% rename from src/main/java/neqsim/fluidMechanics/geometryDefinitions/internalGeometry/packings/PackingInterface.java rename to src/main/java/neqsim/fluidmechanics/geometrydefinitions/internalgeometry/packings/PackingInterface.java index e93b38dfd8..b41545c6ac 100644 --- a/src/main/java/neqsim/fluidMechanics/geometryDefinitions/internalGeometry/packings/PackingInterface.java +++ b/src/main/java/neqsim/fluidmechanics/geometrydefinitions/internalgeometry/packings/PackingInterface.java @@ -4,7 +4,7 @@ * Created on 25. august 2001, 23:34 */ -package neqsim.fluidMechanics.geometryDefinitions.internalGeometry.packings; +package neqsim.fluidmechanics.geometrydefinitions.internalgeometry.packings; /** *

diff --git a/src/main/java/neqsim/fluidMechanics/geometryDefinitions/internalGeometry/packings/PallRingPacking.java b/src/main/java/neqsim/fluidmechanics/geometrydefinitions/internalgeometry/packings/PallRingPacking.java similarity index 91% rename from src/main/java/neqsim/fluidMechanics/geometryDefinitions/internalGeometry/packings/PallRingPacking.java rename to src/main/java/neqsim/fluidmechanics/geometrydefinitions/internalgeometry/packings/PallRingPacking.java index 9acb04d965..39b950fcb3 100644 --- a/src/main/java/neqsim/fluidMechanics/geometryDefinitions/internalGeometry/packings/PallRingPacking.java +++ b/src/main/java/neqsim/fluidmechanics/geometrydefinitions/internalgeometry/packings/PallRingPacking.java @@ -4,7 +4,7 @@ * Created on 25. august 2001, 23:58 */ -package neqsim.fluidMechanics.geometryDefinitions.internalGeometry.packings; +package neqsim.fluidmechanics.geometrydefinitions.internalgeometry.packings; /** *

diff --git a/src/main/java/neqsim/fluidMechanics/geometryDefinitions/internalGeometry/packings/RachigRingPacking.java b/src/main/java/neqsim/fluidmechanics/geometrydefinitions/internalgeometry/packings/RachigRingPacking.java similarity index 90% rename from src/main/java/neqsim/fluidMechanics/geometryDefinitions/internalGeometry/packings/RachigRingPacking.java rename to src/main/java/neqsim/fluidmechanics/geometrydefinitions/internalgeometry/packings/RachigRingPacking.java index 26928f6463..9a80381090 100644 --- a/src/main/java/neqsim/fluidMechanics/geometryDefinitions/internalGeometry/packings/RachigRingPacking.java +++ b/src/main/java/neqsim/fluidmechanics/geometrydefinitions/internalgeometry/packings/RachigRingPacking.java @@ -1,4 +1,4 @@ -package neqsim.fluidMechanics.geometryDefinitions.internalGeometry.packings; +package neqsim.fluidmechanics.geometrydefinitions.internalgeometry.packings; /** *

diff --git a/src/main/java/neqsim/fluidMechanics/geometryDefinitions/internalGeometry/wall/MaterialLayer.java b/src/main/java/neqsim/fluidmechanics/geometrydefinitions/internalgeometry/wall/MaterialLayer.java similarity index 98% rename from src/main/java/neqsim/fluidMechanics/geometryDefinitions/internalGeometry/wall/MaterialLayer.java rename to src/main/java/neqsim/fluidmechanics/geometrydefinitions/internalgeometry/wall/MaterialLayer.java index 7793f69519..22d15e9121 100644 --- a/src/main/java/neqsim/fluidMechanics/geometryDefinitions/internalGeometry/wall/MaterialLayer.java +++ b/src/main/java/neqsim/fluidmechanics/geometrydefinitions/internalgeometry/wall/MaterialLayer.java @@ -1,4 +1,4 @@ -package neqsim.fluidMechanics.geometryDefinitions.internalGeometry.wall; +package neqsim.fluidmechanics.geometrydefinitions.internalgeometry.wall; /** *

diff --git a/src/main/java/neqsim/fluidMechanics/geometryDefinitions/internalGeometry/wall/PipeWall.java b/src/main/java/neqsim/fluidmechanics/geometrydefinitions/internalgeometry/wall/PipeWall.java similarity index 75% rename from src/main/java/neqsim/fluidMechanics/geometryDefinitions/internalGeometry/wall/PipeWall.java rename to src/main/java/neqsim/fluidmechanics/geometrydefinitions/internalgeometry/wall/PipeWall.java index 21dc6c55bd..3c4ec3cc38 100644 --- a/src/main/java/neqsim/fluidMechanics/geometryDefinitions/internalGeometry/wall/PipeWall.java +++ b/src/main/java/neqsim/fluidmechanics/geometrydefinitions/internalgeometry/wall/PipeWall.java @@ -1,4 +1,4 @@ -package neqsim.fluidMechanics.geometryDefinitions.internalGeometry.wall; +package neqsim.fluidmechanics.geometrydefinitions.internalgeometry.wall; /** *

diff --git a/src/main/java/neqsim/fluidMechanics/geometryDefinitions/internalGeometry/wall/Wall.java b/src/main/java/neqsim/fluidmechanics/geometrydefinitions/internalgeometry/wall/Wall.java similarity index 95% rename from src/main/java/neqsim/fluidMechanics/geometryDefinitions/internalGeometry/wall/Wall.java rename to src/main/java/neqsim/fluidmechanics/geometrydefinitions/internalgeometry/wall/Wall.java index e24c73a9d4..f78a23c19a 100644 --- a/src/main/java/neqsim/fluidMechanics/geometryDefinitions/internalGeometry/wall/Wall.java +++ b/src/main/java/neqsim/fluidmechanics/geometrydefinitions/internalgeometry/wall/Wall.java @@ -1,4 +1,4 @@ -package neqsim.fluidMechanics.geometryDefinitions.internalGeometry.wall; +package neqsim.fluidmechanics.geometrydefinitions.internalgeometry.wall; import java.util.ArrayList; diff --git a/src/main/java/neqsim/fluidMechanics/geometryDefinitions/internalGeometry/wall/WallInterface.java b/src/main/java/neqsim/fluidmechanics/geometrydefinitions/internalgeometry/wall/WallInterface.java similarity index 62% rename from src/main/java/neqsim/fluidMechanics/geometryDefinitions/internalGeometry/wall/WallInterface.java rename to src/main/java/neqsim/fluidmechanics/geometrydefinitions/internalgeometry/wall/WallInterface.java index 0c89714de0..2f41ea16a9 100644 --- a/src/main/java/neqsim/fluidMechanics/geometryDefinitions/internalGeometry/wall/WallInterface.java +++ b/src/main/java/neqsim/fluidmechanics/geometrydefinitions/internalgeometry/wall/WallInterface.java @@ -1,4 +1,4 @@ -package neqsim.fluidMechanics.geometryDefinitions.internalGeometry.wall; +package neqsim.fluidmechanics.geometrydefinitions.internalgeometry.wall; /** *

@@ -15,7 +15,7 @@ public interface WallInterface { *

* * @param layer a - * {@link neqsim.fluidMechanics.geometryDefinitions.internalGeometry.wall.MaterialLayer} + * {@link neqsim.fluidmechanics.geometrydefinitions.internalgeometry.wall.MaterialLayer} * object */ public void addMaterialLayer(MaterialLayer layer); @@ -26,7 +26,7 @@ public interface WallInterface { *

* * @param i a int - * @return a {@link neqsim.fluidMechanics.geometryDefinitions.internalGeometry.wall.MaterialLayer} + * @return a {@link neqsim.fluidmechanics.geometrydefinitions.internalgeometry.wall.MaterialLayer} * object */ public MaterialLayer getWallMaterialLayer(int i); diff --git a/src/main/java/neqsim/fluidMechanics/geometryDefinitions/pipe/PipeData.java b/src/main/java/neqsim/fluidmechanics/geometrydefinitions/pipe/PipeData.java similarity index 84% rename from src/main/java/neqsim/fluidMechanics/geometryDefinitions/pipe/PipeData.java rename to src/main/java/neqsim/fluidmechanics/geometrydefinitions/pipe/PipeData.java index c4453a0c9f..148e47a363 100644 --- a/src/main/java/neqsim/fluidMechanics/geometryDefinitions/pipe/PipeData.java +++ b/src/main/java/neqsim/fluidmechanics/geometrydefinitions/pipe/PipeData.java @@ -1,7 +1,7 @@ -package neqsim.fluidMechanics.geometryDefinitions.pipe; +package neqsim.fluidmechanics.geometrydefinitions.pipe; -import neqsim.fluidMechanics.geometryDefinitions.GeometryDefinition; -import neqsim.fluidMechanics.geometryDefinitions.internalGeometry.wall.PipeWall; +import neqsim.fluidmechanics.geometrydefinitions.GeometryDefinition; +import neqsim.fluidmechanics.geometrydefinitions.internalgeometry.wall.PipeWall; /** *

diff --git a/src/main/java/neqsim/fluidMechanics/geometryDefinitions/reactor/ReactorData.java b/src/main/java/neqsim/fluidmechanics/geometrydefinitions/reactor/ReactorData.java similarity index 72% rename from src/main/java/neqsim/fluidMechanics/geometryDefinitions/reactor/ReactorData.java rename to src/main/java/neqsim/fluidmechanics/geometrydefinitions/reactor/ReactorData.java index 7a55079252..f58c8db45f 100644 --- a/src/main/java/neqsim/fluidMechanics/geometryDefinitions/reactor/ReactorData.java +++ b/src/main/java/neqsim/fluidmechanics/geometrydefinitions/reactor/ReactorData.java @@ -1,6 +1,6 @@ -package neqsim.fluidMechanics.geometryDefinitions.reactor; +package neqsim.fluidmechanics.geometrydefinitions.reactor; -import neqsim.fluidMechanics.geometryDefinitions.GeometryDefinition; +import neqsim.fluidmechanics.geometrydefinitions.GeometryDefinition; /** *

@@ -42,7 +42,7 @@ public ReactorData(double diameter) { public ReactorData(double diameter, double roughness) { super(diameter, roughness); packing = - new neqsim.fluidMechanics.geometryDefinitions.internalGeometry.packings.PallRingPacking(); + new neqsim.fluidmechanics.geometrydefinitions.internalgeometry.packings.PallRingPacking(); } /** @@ -63,7 +63,7 @@ public ReactorData(double diameter, int packingType) { public void setPackingType(int i) { // if(i!=100){ packing = - new neqsim.fluidMechanics.geometryDefinitions.internalGeometry.packings.PallRingPacking(); + new neqsim.fluidmechanics.geometrydefinitions.internalgeometry.packings.PallRingPacking(); // } } @@ -77,14 +77,14 @@ public void setPackingType(int i) { public void setPackingType(String name) { if (name.equals("pallring")) { packing = - new neqsim.fluidMechanics.geometryDefinitions.internalGeometry.packings.PallRingPacking(); + new neqsim.fluidmechanics.geometrydefinitions.internalgeometry.packings.PallRingPacking(); } else if (name.equals("rashigring")) { packing = - new neqsim.fluidMechanics.geometryDefinitions.internalGeometry.packings.RachigRingPacking(); + new neqsim.fluidmechanics.geometrydefinitions.internalgeometry.packings.RachigRingPacking(); } else { System.out.println("packing " + name + " not defined in database - using pallrings"); packing = - new neqsim.fluidMechanics.geometryDefinitions.internalGeometry.packings.PallRingPacking(); + new neqsim.fluidmechanics.geometrydefinitions.internalgeometry.packings.PallRingPacking(); } } @@ -93,16 +93,16 @@ public void setPackingType(String name) { public void setPackingType(String name, String material, int size) { if (name.equals("pallring")) { packing = - new neqsim.fluidMechanics.geometryDefinitions.internalGeometry.packings.PallRingPacking( + new neqsim.fluidmechanics.geometrydefinitions.internalgeometry.packings.PallRingPacking( material, size); } else if (name.equals("rashigring")) { packing = - new neqsim.fluidMechanics.geometryDefinitions.internalGeometry.packings.RachigRingPacking( + new neqsim.fluidmechanics.geometrydefinitions.internalgeometry.packings.RachigRingPacking( material, size); } else { System.out.println("packing " + name + " not defined in database - using pallrings"); packing = - new neqsim.fluidMechanics.geometryDefinitions.internalGeometry.packings.PallRingPacking( + new neqsim.fluidmechanics.geometrydefinitions.internalgeometry.packings.PallRingPacking( material, size); } } diff --git a/src/main/java/neqsim/fluidMechanics/geometryDefinitions/stirredCell/StirredCell.java b/src/main/java/neqsim/fluidmechanics/geometrydefinitions/stirredcell/StirredCell.java similarity index 88% rename from src/main/java/neqsim/fluidMechanics/geometryDefinitions/stirredCell/StirredCell.java rename to src/main/java/neqsim/fluidmechanics/geometrydefinitions/stirredcell/StirredCell.java index a294cc54fd..a1801d2161 100644 --- a/src/main/java/neqsim/fluidMechanics/geometryDefinitions/stirredCell/StirredCell.java +++ b/src/main/java/neqsim/fluidmechanics/geometrydefinitions/stirredcell/StirredCell.java @@ -1,6 +1,6 @@ -package neqsim.fluidMechanics.geometryDefinitions.stirredCell; +package neqsim.fluidmechanics.geometrydefinitions.stirredcell; -import neqsim.fluidMechanics.geometryDefinitions.GeometryDefinition; +import neqsim.fluidmechanics.geometrydefinitions.GeometryDefinition; /** *

diff --git a/src/main/java/neqsim/fluidMechanics/geometryDefinitions/surrounding/PipeSurroundingEnvironment.java b/src/main/java/neqsim/fluidmechanics/geometrydefinitions/surrounding/PipeSurroundingEnvironment.java similarity index 88% rename from src/main/java/neqsim/fluidMechanics/geometryDefinitions/surrounding/PipeSurroundingEnvironment.java rename to src/main/java/neqsim/fluidmechanics/geometrydefinitions/surrounding/PipeSurroundingEnvironment.java index 09b0955c38..a60a2c9647 100644 --- a/src/main/java/neqsim/fluidMechanics/geometryDefinitions/surrounding/PipeSurroundingEnvironment.java +++ b/src/main/java/neqsim/fluidmechanics/geometrydefinitions/surrounding/PipeSurroundingEnvironment.java @@ -1,4 +1,4 @@ -package neqsim.fluidMechanics.geometryDefinitions.surrounding; +package neqsim.fluidmechanics.geometrydefinitions.surrounding; /** *

diff --git a/src/main/java/neqsim/fluidMechanics/geometryDefinitions/surrounding/SurroundingEnvironment.java b/src/main/java/neqsim/fluidmechanics/geometrydefinitions/surrounding/SurroundingEnvironment.java similarity index 92% rename from src/main/java/neqsim/fluidMechanics/geometryDefinitions/surrounding/SurroundingEnvironment.java rename to src/main/java/neqsim/fluidmechanics/geometrydefinitions/surrounding/SurroundingEnvironment.java index 0e3833a949..e9be884c54 100644 --- a/src/main/java/neqsim/fluidMechanics/geometryDefinitions/surrounding/SurroundingEnvironment.java +++ b/src/main/java/neqsim/fluidmechanics/geometrydefinitions/surrounding/SurroundingEnvironment.java @@ -1,4 +1,4 @@ -package neqsim.fluidMechanics.geometryDefinitions.surrounding; +package neqsim.fluidmechanics.geometrydefinitions.surrounding; /** *

diff --git a/src/main/java/neqsim/fluidMechanics/geometryDefinitions/surrounding/SurroundingEnvironmentBaseClass.java b/src/main/java/neqsim/fluidmechanics/geometrydefinitions/surrounding/SurroundingEnvironmentBaseClass.java similarity index 93% rename from src/main/java/neqsim/fluidMechanics/geometryDefinitions/surrounding/SurroundingEnvironmentBaseClass.java rename to src/main/java/neqsim/fluidmechanics/geometrydefinitions/surrounding/SurroundingEnvironmentBaseClass.java index 34cfa0e0e1..908051652d 100644 --- a/src/main/java/neqsim/fluidMechanics/geometryDefinitions/surrounding/SurroundingEnvironmentBaseClass.java +++ b/src/main/java/neqsim/fluidmechanics/geometrydefinitions/surrounding/SurroundingEnvironmentBaseClass.java @@ -1,4 +1,4 @@ -package neqsim.fluidMechanics.geometryDefinitions.surrounding; +package neqsim.fluidmechanics.geometrydefinitions.surrounding; /** *

diff --git a/src/main/java/neqsim/fluidMechanics/util/fluidMechanicsVisualization/flowNodeVisualization/FlowNodeVisualization.java b/src/main/java/neqsim/fluidmechanics/util/fluidmechanicsvisualization/flownodevisualization/FlowNodeVisualization.java similarity index 96% rename from src/main/java/neqsim/fluidMechanics/util/fluidMechanicsVisualization/flowNodeVisualization/FlowNodeVisualization.java rename to src/main/java/neqsim/fluidmechanics/util/fluidmechanicsvisualization/flownodevisualization/FlowNodeVisualization.java index 9e52f38beb..181c90c7d2 100644 --- a/src/main/java/neqsim/fluidMechanics/util/fluidMechanicsVisualization/flowNodeVisualization/FlowNodeVisualization.java +++ b/src/main/java/neqsim/fluidmechanics/util/fluidmechanicsvisualization/flownodevisualization/FlowNodeVisualization.java @@ -4,9 +4,9 @@ * Created on 5. august 2001, 16:27 */ -package neqsim.fluidMechanics.util.fluidMechanicsVisualization.flowNodeVisualization; +package neqsim.fluidmechanics.util.fluidmechanicsvisualization.flownodevisualization; -import neqsim.fluidMechanics.flowNode.FlowNodeInterface; +import neqsim.fluidmechanics.flownode.FlowNodeInterface; /** *

diff --git a/src/main/java/neqsim/fluidMechanics/util/fluidMechanicsVisualization/flowNodeVisualization/FlowNodeVisualizationInterface.java b/src/main/java/neqsim/fluidmechanics/util/fluidmechanicsvisualization/flownodevisualization/FlowNodeVisualizationInterface.java similarity index 93% rename from src/main/java/neqsim/fluidMechanics/util/fluidMechanicsVisualization/flowNodeVisualization/FlowNodeVisualizationInterface.java rename to src/main/java/neqsim/fluidmechanics/util/fluidmechanicsvisualization/flownodevisualization/FlowNodeVisualizationInterface.java index 308b7321fc..16c3a2993a 100644 --- a/src/main/java/neqsim/fluidMechanics/util/fluidMechanicsVisualization/flowNodeVisualization/FlowNodeVisualizationInterface.java +++ b/src/main/java/neqsim/fluidmechanics/util/fluidmechanicsvisualization/flownodevisualization/FlowNodeVisualizationInterface.java @@ -4,9 +4,9 @@ * Created on 5. august 2001, 16:28 */ -package neqsim.fluidMechanics.util.fluidMechanicsVisualization.flowNodeVisualization; +package neqsim.fluidmechanics.util.fluidmechanicsvisualization.flownodevisualization; -import neqsim.fluidMechanics.flowNode.FlowNodeInterface; +import neqsim.fluidmechanics.flownode.FlowNodeInterface; /** *

@@ -22,7 +22,7 @@ public interface FlowNodeVisualizationInterface { * setData. *

* - * @param node a {@link neqsim.fluidMechanics.flowNode.FlowNodeInterface} object + * @param node a {@link neqsim.fluidmechanics.flownode.FlowNodeInterface} object */ public void setData(FlowNodeInterface node); diff --git a/src/main/java/neqsim/fluidMechanics/util/fluidMechanicsVisualization/flowNodeVisualization/onePhaseFlowNodeVisualization/OnePhaseFlowNodeVisualization.java b/src/main/java/neqsim/fluidmechanics/util/fluidmechanicsvisualization/flownodevisualization/onephaseflownodevisualization/OnePhaseFlowNodeVisualization.java similarity index 63% rename from src/main/java/neqsim/fluidMechanics/util/fluidMechanicsVisualization/flowNodeVisualization/onePhaseFlowNodeVisualization/OnePhaseFlowNodeVisualization.java rename to src/main/java/neqsim/fluidmechanics/util/fluidmechanicsvisualization/flownodevisualization/onephaseflownodevisualization/OnePhaseFlowNodeVisualization.java index ca77187ea5..0de7446fac 100644 --- a/src/main/java/neqsim/fluidMechanics/util/fluidMechanicsVisualization/flowNodeVisualization/onePhaseFlowNodeVisualization/OnePhaseFlowNodeVisualization.java +++ b/src/main/java/neqsim/fluidmechanics/util/fluidmechanicsvisualization/flownodevisualization/onephaseflownodevisualization/OnePhaseFlowNodeVisualization.java @@ -4,9 +4,9 @@ * Created on 5. august 2001, 16:29 */ -package neqsim.fluidMechanics.util.fluidMechanicsVisualization.flowNodeVisualization.onePhaseFlowNodeVisualization; +package neqsim.fluidmechanics.util.fluidmechanicsvisualization.flownodevisualization.onephaseflownodevisualization; -import neqsim.fluidMechanics.util.fluidMechanicsVisualization.flowNodeVisualization.FlowNodeVisualization; +import neqsim.fluidmechanics.util.fluidmechanicsvisualization.flownodevisualization.FlowNodeVisualization; /** *

diff --git a/src/main/java/neqsim/fluidMechanics/util/fluidMechanicsVisualization/flowNodeVisualization/onePhaseFlowNodeVisualization/onePhasePipeFlowNodeVisualization/OnePhasePipeFlowNodeVisualization.java b/src/main/java/neqsim/fluidmechanics/util/fluidmechanicsvisualization/flownodevisualization/onephaseflownodevisualization/onephasepipeflownodevisualization/OnePhasePipeFlowNodeVisualization.java similarity index 71% rename from src/main/java/neqsim/fluidMechanics/util/fluidMechanicsVisualization/flowNodeVisualization/onePhaseFlowNodeVisualization/onePhasePipeFlowNodeVisualization/OnePhasePipeFlowNodeVisualization.java rename to src/main/java/neqsim/fluidmechanics/util/fluidmechanicsvisualization/flownodevisualization/onephaseflownodevisualization/onephasepipeflownodevisualization/OnePhasePipeFlowNodeVisualization.java index a274192a8d..5cd56b5941 100644 --- a/src/main/java/neqsim/fluidMechanics/util/fluidMechanicsVisualization/flowNodeVisualization/onePhaseFlowNodeVisualization/onePhasePipeFlowNodeVisualization/OnePhasePipeFlowNodeVisualization.java +++ b/src/main/java/neqsim/fluidmechanics/util/fluidmechanicsvisualization/flownodevisualization/onephaseflownodevisualization/onephasepipeflownodevisualization/OnePhasePipeFlowNodeVisualization.java @@ -4,10 +4,10 @@ * Created on 5. august 2001, 16:29 */ -package neqsim.fluidMechanics.util.fluidMechanicsVisualization.flowNodeVisualization.onePhaseFlowNodeVisualization.onePhasePipeFlowNodeVisualization; +package neqsim.fluidmechanics.util.fluidmechanicsvisualization.flownodevisualization.onephaseflownodevisualization.onephasepipeflownodevisualization; -import neqsim.fluidMechanics.flowNode.FlowNodeInterface; -import neqsim.fluidMechanics.util.fluidMechanicsVisualization.flowNodeVisualization.onePhaseFlowNodeVisualization.OnePhaseFlowNodeVisualization; +import neqsim.fluidmechanics.flownode.FlowNodeInterface; +import neqsim.fluidmechanics.util.fluidmechanicsvisualization.flownodevisualization.onephaseflownodevisualization.OnePhaseFlowNodeVisualization; /** *

diff --git a/src/main/java/neqsim/fluidMechanics/util/fluidMechanicsVisualization/flowNodeVisualization/twoPhaseFlowNodeVisualization/TwoPhaseFlowNodeVisualization.java b/src/main/java/neqsim/fluidmechanics/util/fluidmechanicsvisualization/flownodevisualization/twophaseflownodevisualization/TwoPhaseFlowNodeVisualization.java similarity index 90% rename from src/main/java/neqsim/fluidMechanics/util/fluidMechanicsVisualization/flowNodeVisualization/twoPhaseFlowNodeVisualization/TwoPhaseFlowNodeVisualization.java rename to src/main/java/neqsim/fluidmechanics/util/fluidmechanicsvisualization/flownodevisualization/twophaseflownodevisualization/TwoPhaseFlowNodeVisualization.java index 127c4ebe7c..c58c8eca73 100644 --- a/src/main/java/neqsim/fluidMechanics/util/fluidMechanicsVisualization/flowNodeVisualization/twoPhaseFlowNodeVisualization/TwoPhaseFlowNodeVisualization.java +++ b/src/main/java/neqsim/fluidmechanics/util/fluidmechanicsvisualization/flownodevisualization/twophaseflownodevisualization/TwoPhaseFlowNodeVisualization.java @@ -1,7 +1,7 @@ -package neqsim.fluidMechanics.util.fluidMechanicsVisualization.flowNodeVisualization.twoPhaseFlowNodeVisualization; +package neqsim.fluidmechanics.util.fluidmechanicsvisualization.flownodevisualization.twophaseflownodevisualization; -import neqsim.fluidMechanics.flowNode.FlowNodeInterface; -import neqsim.fluidMechanics.util.fluidMechanicsVisualization.flowNodeVisualization.FlowNodeVisualization; +import neqsim.fluidmechanics.flownode.FlowNodeInterface; +import neqsim.fluidmechanics.util.fluidmechanicsvisualization.flownodevisualization.FlowNodeVisualization; /** *

diff --git a/src/main/java/neqsim/fluidMechanics/util/fluidMechanicsVisualization/flowSystemVisualization/FlowSystemVisualization.java b/src/main/java/neqsim/fluidmechanics/util/fluidmechanicsvisualization/flowsystemvisualization/FlowSystemVisualization.java similarity index 84% rename from src/main/java/neqsim/fluidMechanics/util/fluidMechanicsVisualization/flowSystemVisualization/FlowSystemVisualization.java rename to src/main/java/neqsim/fluidmechanics/util/fluidmechanicsvisualization/flowsystemvisualization/FlowSystemVisualization.java index 104846ebf3..44d475770c 100644 --- a/src/main/java/neqsim/fluidMechanics/util/fluidMechanicsVisualization/flowSystemVisualization/FlowSystemVisualization.java +++ b/src/main/java/neqsim/fluidmechanics/util/fluidmechanicsvisualization/flowsystemvisualization/FlowSystemVisualization.java @@ -1,8 +1,8 @@ -package neqsim.fluidMechanics.util.fluidMechanicsVisualization.flowSystemVisualization; +package neqsim.fluidmechanics.util.fluidmechanicsvisualization.flowsystemvisualization; -import neqsim.fluidMechanics.flowSystem.FlowSystemInterface; -import neqsim.fluidMechanics.util.fluidMechanicsVisualization.flowNodeVisualization.FlowNodeVisualization; -import neqsim.fluidMechanics.util.fluidMechanicsVisualization.flowNodeVisualization.FlowNodeVisualizationInterface; +import neqsim.fluidmechanics.flowsystem.FlowSystemInterface; +import neqsim.fluidmechanics.util.fluidmechanicsvisualization.flownodevisualization.FlowNodeVisualization; +import neqsim.fluidmechanics.util.fluidmechanicsvisualization.flownodevisualization.FlowNodeVisualizationInterface; /** *

diff --git a/src/main/java/neqsim/fluidMechanics/util/fluidMechanicsVisualization/flowSystemVisualization/FlowSystemVisualizationInterface.java b/src/main/java/neqsim/fluidmechanics/util/fluidmechanicsvisualization/flowsystemvisualization/FlowSystemVisualizationInterface.java similarity index 71% rename from src/main/java/neqsim/fluidMechanics/util/fluidMechanicsVisualization/flowSystemVisualization/FlowSystemVisualizationInterface.java rename to src/main/java/neqsim/fluidmechanics/util/fluidmechanicsvisualization/flowsystemvisualization/FlowSystemVisualizationInterface.java index 2a07c2c724..1e3f374599 100644 --- a/src/main/java/neqsim/fluidMechanics/util/fluidMechanicsVisualization/flowSystemVisualization/FlowSystemVisualizationInterface.java +++ b/src/main/java/neqsim/fluidmechanics/util/fluidmechanicsvisualization/flowsystemvisualization/FlowSystemVisualizationInterface.java @@ -1,6 +1,6 @@ -package neqsim.fluidMechanics.util.fluidMechanicsVisualization.flowSystemVisualization; +package neqsim.fluidmechanics.util.fluidmechanicsvisualization.flowsystemvisualization; -import neqsim.fluidMechanics.flowSystem.FlowSystemInterface; +import neqsim.fluidmechanics.flowsystem.FlowSystemInterface; /** *

@@ -32,7 +32,7 @@ public interface FlowSystemVisualizationInterface { * setNextData. *

* - * @param system a {@link neqsim.fluidMechanics.flowSystem.FlowSystemInterface} object + * @param system a {@link neqsim.fluidmechanics.flowsystem.FlowSystemInterface} object */ public void setNextData(FlowSystemInterface system); @@ -41,7 +41,7 @@ public interface FlowSystemVisualizationInterface { * setNextData. *

* - * @param system a {@link neqsim.fluidMechanics.flowSystem.FlowSystemInterface} object + * @param system a {@link neqsim.fluidmechanics.flowsystem.FlowSystemInterface} object * @param abstime a double */ public void setNextData(FlowSystemInterface system, double abstime); diff --git a/src/main/java/neqsim/fluidMechanics/util/fluidMechanicsVisualization/flowSystemVisualization/onePhaseFlowVisualization/OnePhaseFlowVisualization.java b/src/main/java/neqsim/fluidmechanics/util/fluidmechanicsvisualization/flowsystemvisualization/onephaseflowvisualization/OnePhaseFlowVisualization.java similarity index 72% rename from src/main/java/neqsim/fluidMechanics/util/fluidMechanicsVisualization/flowSystemVisualization/onePhaseFlowVisualization/OnePhaseFlowVisualization.java rename to src/main/java/neqsim/fluidmechanics/util/fluidmechanicsvisualization/flowsystemvisualization/onephaseflowvisualization/OnePhaseFlowVisualization.java index 74922d62f8..d2c8c3259e 100644 --- a/src/main/java/neqsim/fluidMechanics/util/fluidMechanicsVisualization/flowSystemVisualization/onePhaseFlowVisualization/OnePhaseFlowVisualization.java +++ b/src/main/java/neqsim/fluidmechanics/util/fluidmechanicsvisualization/flowsystemvisualization/onephaseflowvisualization/OnePhaseFlowVisualization.java @@ -4,7 +4,7 @@ * Created on 26. oktober 2000, 20:08 */ -package neqsim.fluidMechanics.util.fluidMechanicsVisualization.flowSystemVisualization.onePhaseFlowVisualization; +package neqsim.fluidmechanics.util.fluidmechanicsvisualization.flowsystemvisualization.onephaseflowvisualization; /** *

@@ -15,7 +15,7 @@ * @version $Id: $Id */ public class OnePhaseFlowVisualization extends - neqsim.fluidMechanics.util.fluidMechanicsVisualization.flowSystemVisualization.FlowSystemVisualization { + neqsim.fluidmechanics.util.fluidmechanicsvisualization.flowsystemvisualization.FlowSystemVisualization { /** *

* Constructor for OnePhaseFlowVisualization. diff --git a/src/main/java/neqsim/fluidMechanics/util/fluidMechanicsVisualization/flowSystemVisualization/onePhaseFlowVisualization/pipeFlowVisualization/PipeFlowVisualization.java b/src/main/java/neqsim/fluidmechanics/util/fluidmechanicsvisualization/flowsystemvisualization/onephaseflowvisualization/pipeflowvisualization/PipeFlowVisualization.java similarity index 89% rename from src/main/java/neqsim/fluidMechanics/util/fluidMechanicsVisualization/flowSystemVisualization/onePhaseFlowVisualization/pipeFlowVisualization/PipeFlowVisualization.java rename to src/main/java/neqsim/fluidmechanics/util/fluidmechanicsvisualization/flowsystemvisualization/onephaseflowvisualization/pipeflowvisualization/PipeFlowVisualization.java index 40cb106778..85667a4fe0 100644 --- a/src/main/java/neqsim/fluidMechanics/util/fluidMechanicsVisualization/flowSystemVisualization/onePhaseFlowVisualization/pipeFlowVisualization/PipeFlowVisualization.java +++ b/src/main/java/neqsim/fluidmechanics/util/fluidmechanicsvisualization/flowsystemvisualization/onephaseflowvisualization/pipeflowvisualization/PipeFlowVisualization.java @@ -4,7 +4,7 @@ * Created on 26. oktober 2000, 20:09 */ -package neqsim.fluidMechanics.util.fluidMechanicsVisualization.flowSystemVisualization.onePhaseFlowVisualization.pipeFlowVisualization; +package neqsim.fluidmechanics.util.fluidmechanicsvisualization.flowsystemvisualization.onephaseflowvisualization.pipeflowvisualization; /** *

@@ -15,7 +15,7 @@ * @version $Id: $Id */ public class PipeFlowVisualization extends - neqsim.fluidMechanics.util.fluidMechanicsVisualization.flowSystemVisualization.onePhaseFlowVisualization.OnePhaseFlowVisualization { + neqsim.fluidmechanics.util.fluidmechanicsvisualization.flowsystemvisualization.onephaseflowvisualization.OnePhaseFlowVisualization { double[][] pressurePoint = new double[10][10]; double[][] velocityPoint = new double[10][10]; double[][] temperaturePoint = new double[10][10]; @@ -39,14 +39,14 @@ public PipeFlowVisualization() {} * @param timeSteps a int */ public PipeFlowVisualization(int nodes, int timeSteps) { - flowSystem = new neqsim.fluidMechanics.flowSystem.FlowSystemInterface[timeSteps]; + flowSystem = new neqsim.fluidmechanics.flowsystem.FlowSystemInterface[timeSteps]; flowNodes = - new neqsim.fluidMechanics.util.fluidMechanicsVisualization.flowNodeVisualization.onePhaseFlowNodeVisualization.onePhasePipeFlowNodeVisualization.OnePhasePipeFlowNodeVisualization[timeSteps][nodes]; + new neqsim.fluidmechanics.util.fluidmechanicsvisualization.flownodevisualization.onephaseflownodevisualization.onephasepipeflownodevisualization.OnePhasePipeFlowNodeVisualization[timeSteps][nodes]; absTime = new double[timeSteps]; for (int i = 0; i < timeSteps; i++) { for (int j = 0; j < nodes; j++) { flowNodes[i][j] = - new neqsim.fluidMechanics.util.fluidMechanicsVisualization.flowNodeVisualization.onePhaseFlowNodeVisualization.onePhasePipeFlowNodeVisualization.OnePhasePipeFlowNodeVisualization(); + new neqsim.fluidmechanics.util.fluidmechanicsvisualization.flownodevisualization.onephaseflownodevisualization.onephasepipeflownodevisualization.OnePhasePipeFlowNodeVisualization(); } } // System.out.println("nodes " + nodes); diff --git a/src/main/java/neqsim/fluidMechanics/util/fluidMechanicsVisualization/flowSystemVisualization/twoPhaseFlowVisualization/TwoPhaseFlowVisualization.java b/src/main/java/neqsim/fluidmechanics/util/fluidmechanicsvisualization/flowsystemvisualization/twophaseflowvisualization/TwoPhaseFlowVisualization.java similarity index 69% rename from src/main/java/neqsim/fluidMechanics/util/fluidMechanicsVisualization/flowSystemVisualization/twoPhaseFlowVisualization/TwoPhaseFlowVisualization.java rename to src/main/java/neqsim/fluidmechanics/util/fluidmechanicsvisualization/flowsystemvisualization/twophaseflowvisualization/TwoPhaseFlowVisualization.java index 123244bbb3..7f2e06a6b5 100644 --- a/src/main/java/neqsim/fluidMechanics/util/fluidMechanicsVisualization/flowSystemVisualization/twoPhaseFlowVisualization/TwoPhaseFlowVisualization.java +++ b/src/main/java/neqsim/fluidmechanics/util/fluidmechanicsvisualization/flowsystemvisualization/twophaseflowvisualization/TwoPhaseFlowVisualization.java @@ -1,4 +1,4 @@ -package neqsim.fluidMechanics.util.fluidMechanicsVisualization.flowSystemVisualization.twoPhaseFlowVisualization; +package neqsim.fluidmechanics.util.fluidmechanicsvisualization.flowsystemvisualization.twophaseflowvisualization; /** *

@@ -9,7 +9,7 @@ * @version $Id: $Id */ public class TwoPhaseFlowVisualization extends - neqsim.fluidMechanics.util.fluidMechanicsVisualization.flowSystemVisualization.FlowSystemVisualization { + neqsim.fluidmechanics.util.fluidmechanicsvisualization.flowsystemvisualization.FlowSystemVisualization { /** *

* Constructor for TwoPhaseFlowVisualization. diff --git a/src/main/java/neqsim/fluidMechanics/util/fluidMechanicsVisualization/flowSystemVisualization/twoPhaseFlowVisualization/twoPhasePipeFlowVisualization/TwoPhasePipeFlowVisualization.java b/src/main/java/neqsim/fluidmechanics/util/fluidmechanicsvisualization/flowsystemvisualization/twophaseflowvisualization/twophasepipeflowvisualization/TwoPhasePipeFlowVisualization.java similarity index 95% rename from src/main/java/neqsim/fluidMechanics/util/fluidMechanicsVisualization/flowSystemVisualization/twoPhaseFlowVisualization/twoPhasePipeFlowVisualization/TwoPhasePipeFlowVisualization.java rename to src/main/java/neqsim/fluidmechanics/util/fluidmechanicsvisualization/flowsystemvisualization/twophaseflowvisualization/twophasepipeflowvisualization/TwoPhasePipeFlowVisualization.java index b902f8adb5..2b076f802e 100644 --- a/src/main/java/neqsim/fluidMechanics/util/fluidMechanicsVisualization/flowSystemVisualization/twoPhaseFlowVisualization/twoPhasePipeFlowVisualization/TwoPhasePipeFlowVisualization.java +++ b/src/main/java/neqsim/fluidmechanics/util/fluidmechanicsvisualization/flowsystemvisualization/twophaseflowvisualization/twophasepipeflowvisualization/TwoPhasePipeFlowVisualization.java @@ -1,7 +1,7 @@ -package neqsim.fluidMechanics.util.fluidMechanicsVisualization.flowSystemVisualization.twoPhaseFlowVisualization.twoPhasePipeFlowVisualization; +package neqsim.fluidmechanics.util.fluidmechanicsvisualization.flowsystemvisualization.twophaseflowvisualization.twophasepipeflowvisualization; -import neqsim.fluidMechanics.flowSystem.FlowSystem; -import neqsim.fluidMechanics.util.fluidMechanicsVisualization.flowNodeVisualization.twoPhaseFlowNodeVisualization.TwoPhaseFlowNodeVisualization; +import neqsim.fluidmechanics.flowsystem.FlowSystem; +import neqsim.fluidmechanics.util.fluidmechanicsvisualization.flownodevisualization.twophaseflownodevisualization.TwoPhaseFlowNodeVisualization; /** *

@@ -12,7 +12,7 @@ * @version $Id: $Id */ public class TwoPhasePipeFlowVisualization extends - neqsim.fluidMechanics.util.fluidMechanicsVisualization.flowSystemVisualization.twoPhaseFlowVisualization.TwoPhaseFlowVisualization { + neqsim.fluidmechanics.util.fluidmechanicsvisualization.flowsystemvisualization.twophaseflowvisualization.TwoPhaseFlowVisualization { double[][][] pressurePoint = new double[2][10][10]; double[][][] velocityPoint = new double[2][10][10]; double[][][] reynoldsNumber = new double[2][10][10]; diff --git a/src/main/java/neqsim/fluidMechanics/util/timeSeries/TimeSeries.java b/src/main/java/neqsim/fluidmechanics/util/timeseries/TimeSeries.java similarity index 95% rename from src/main/java/neqsim/fluidMechanics/util/timeSeries/TimeSeries.java rename to src/main/java/neqsim/fluidmechanics/util/timeseries/TimeSeries.java index 725bc48986..e509bc20d8 100644 --- a/src/main/java/neqsim/fluidMechanics/util/timeSeries/TimeSeries.java +++ b/src/main/java/neqsim/fluidmechanics/util/timeseries/TimeSeries.java @@ -4,9 +4,9 @@ * Created on 18. juni 2001, 19:24 */ -package neqsim.fluidMechanics.util.timeSeries; +package neqsim.fluidmechanics.util.timeseries; -import neqsim.fluidMechanics.flowSystem.FlowSystemInterface; +import neqsim.fluidmechanics.flowsystem.FlowSystemInterface; import neqsim.thermo.system.SystemInterface; /** @@ -95,7 +95,7 @@ public void setNumberOfTimeStepsInInterval(int numberOfTimeStepsInInterval) { * init. *

* - * @param flowSystem a {@link neqsim.fluidMechanics.flowSystem.FlowSystemInterface} object + * @param flowSystem a {@link neqsim.fluidmechanics.flowsystem.FlowSystemInterface} object */ public void init(FlowSystemInterface flowSystem) { int p = 0; diff --git a/src/main/java/neqsim/MathLib/generalMath/TDMAsolve.java b/src/main/java/neqsim/mathlib/generalmath/TDMAsolve.java similarity index 96% rename from src/main/java/neqsim/MathLib/generalMath/TDMAsolve.java rename to src/main/java/neqsim/mathlib/generalmath/TDMAsolve.java index d501d3c3ad..c68f5d5be6 100644 --- a/src/main/java/neqsim/MathLib/generalMath/TDMAsolve.java +++ b/src/main/java/neqsim/mathlib/generalmath/TDMAsolve.java @@ -4,7 +4,7 @@ * Created on 4. desember 2000, 22:34 */ -package neqsim.MathLib.generalMath; +package neqsim.mathlib.generalmath; /** *

diff --git a/src/main/java/neqsim/MathLib/nonLinearSolver/newtonRhapson.java b/src/main/java/neqsim/mathlib/nonlinearsolver/NewtonRhapson.java similarity index 96% rename from src/main/java/neqsim/MathLib/nonLinearSolver/newtonRhapson.java rename to src/main/java/neqsim/mathlib/nonlinearsolver/NewtonRhapson.java index 1005d3ec9e..2d168c8acb 100644 --- a/src/main/java/neqsim/MathLib/nonLinearSolver/newtonRhapson.java +++ b/src/main/java/neqsim/mathlib/nonlinearsolver/NewtonRhapson.java @@ -4,7 +4,7 @@ * Created on 15. juli 2000, 17:43 */ -package neqsim.MathLib.nonLinearSolver; +package neqsim.mathlib.nonlinearsolver; /** *

@@ -14,7 +14,7 @@ * @author Even Solbraa * @version $Id: $Id */ -public class newtonRhapson implements java.io.Serializable { +public class NewtonRhapson implements java.io.Serializable { private static final long serialVersionUID = 1000; int order; @@ -37,7 +37,7 @@ public class newtonRhapson implements java.io.Serializable { * Constructor for newtonRhapson. *

*/ - public newtonRhapson() {} + public NewtonRhapson() {} /** *

@@ -209,7 +209,7 @@ public double solve1order(double xin) { * @param args an array of {@link java.lang.String} objects */ public static void main(String[] args) { - newtonRhapson test = new newtonRhapson(); + NewtonRhapson test = new NewtonRhapson(); test.setOrder(3); double[] constants = new double[] {-0.003058, -0.01806, -0.266, -0.2999}; diff --git a/src/main/java/neqsim/MathLib/nonLinearSolver/NumericalDerivative.java b/src/main/java/neqsim/mathlib/nonlinearsolver/NumericalDerivative.java similarity index 99% rename from src/main/java/neqsim/MathLib/nonLinearSolver/NumericalDerivative.java rename to src/main/java/neqsim/mathlib/nonlinearsolver/NumericalDerivative.java index 9f5c2d63fb..8cb732b1b2 100644 --- a/src/main/java/neqsim/MathLib/nonLinearSolver/NumericalDerivative.java +++ b/src/main/java/neqsim/mathlib/nonlinearsolver/NumericalDerivative.java @@ -4,7 +4,7 @@ * Created on 28. juli 2000, 15:39 */ -package neqsim.MathLib.nonLinearSolver; +package neqsim.mathlib.nonlinearsolver; import neqsim.thermo.component.ComponentInterface; import neqsim.thermo.phase.PhaseInterface; diff --git a/src/main/java/neqsim/MathLib/nonLinearSolver/NumericalIntegration.java b/src/main/java/neqsim/mathlib/nonlinearsolver/NumericalIntegration.java similarity index 88% rename from src/main/java/neqsim/MathLib/nonLinearSolver/NumericalIntegration.java rename to src/main/java/neqsim/mathlib/nonlinearsolver/NumericalIntegration.java index 886e7430df..f1d03cc5d0 100644 --- a/src/main/java/neqsim/MathLib/nonLinearSolver/NumericalIntegration.java +++ b/src/main/java/neqsim/mathlib/nonlinearsolver/NumericalIntegration.java @@ -4,7 +4,7 @@ * Created on 6. september 2002, 21:49 */ -package neqsim.MathLib.nonLinearSolver; +package neqsim.mathlib.nonlinearsolver; /** *

diff --git a/src/main/java/neqsim/MathLib/nonLinearSolver/sysNewtonRhapson.java b/src/main/java/neqsim/mathlib/nonlinearsolver/SysNewtonRhapson.java similarity index 98% rename from src/main/java/neqsim/MathLib/nonLinearSolver/sysNewtonRhapson.java rename to src/main/java/neqsim/mathlib/nonlinearsolver/SysNewtonRhapson.java index 4d4d563617..45f7f193e3 100644 --- a/src/main/java/neqsim/MathLib/nonLinearSolver/sysNewtonRhapson.java +++ b/src/main/java/neqsim/mathlib/nonlinearsolver/SysNewtonRhapson.java @@ -1,4 +1,4 @@ -package neqsim.MathLib.nonLinearSolver; +package neqsim.mathlib.nonlinearsolver; import Jama.Matrix; import neqsim.thermo.phase.PhaseType; @@ -12,7 +12,7 @@ * @author asmund * @version $Id: $Id */ -public class sysNewtonRhapson implements java.io.Serializable { +public class SysNewtonRhapson implements java.io.Serializable { private static final long serialVersionUID = 1000; int neq = 0; int iter = 0; @@ -41,7 +41,7 @@ public class sysNewtonRhapson implements java.io.Serializable { Matrix s = new Matrix(1, 4); Matrix xg; Matrix xcoef; - newtonRhapson solver; + NewtonRhapson solver; boolean etterCP = false; boolean etterCP2 = false; @@ -50,7 +50,7 @@ public class sysNewtonRhapson implements java.io.Serializable { * Constructor for sysNewtonRhapson. *

*/ - public sysNewtonRhapson() {} + public SysNewtonRhapson() {} /** *

@@ -61,7 +61,7 @@ public sysNewtonRhapson() {} * @param numberOfPhases a int * @param numberOfComponents a int */ - public sysNewtonRhapson(SystemInterface system, int numberOfPhases, int numberOfComponents) { + public SysNewtonRhapson(SystemInterface system, int numberOfPhases, int numberOfComponents) { this.system = system; this.numberOfComponents = numberOfComponents; neq = numberOfComponents + 2; @@ -73,7 +73,7 @@ public sysNewtonRhapson(SystemInterface system, int numberOfPhases, int numberOf uold = u.copy(); findSpecEqInit(); // System.out.println("Spec : " +speceq); - solver = new newtonRhapson(); + solver = new NewtonRhapson(); solver.setOrder(3); } diff --git a/src/main/java/neqsim/physicalProperties/PhysicalPropertyHandler.java b/src/main/java/neqsim/physicalproperties/PhysicalPropertyHandler.java similarity index 80% rename from src/main/java/neqsim/physicalProperties/PhysicalPropertyHandler.java rename to src/main/java/neqsim/physicalproperties/PhysicalPropertyHandler.java index db6fed719f..ea7412f361 100644 --- a/src/main/java/neqsim/physicalProperties/PhysicalPropertyHandler.java +++ b/src/main/java/neqsim/physicalproperties/PhysicalPropertyHandler.java @@ -1,16 +1,16 @@ -package neqsim.physicalProperties; +package neqsim.physicalproperties; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface; -import neqsim.physicalProperties.physicalPropertySystem.commonPhasePhysicalProperties.DefaultPhysicalProperties; -import neqsim.physicalProperties.physicalPropertySystem.gasPhysicalProperties.GasPhysicalProperties; -import neqsim.physicalProperties.physicalPropertySystem.liquidPhysicalProperties.AminePhysicalProperties; -import neqsim.physicalProperties.physicalPropertySystem.liquidPhysicalProperties.CO2waterPhysicalProperties; -import neqsim.physicalProperties.physicalPropertySystem.liquidPhysicalProperties.GlycolPhysicalProperties; -import neqsim.physicalProperties.physicalPropertySystem.liquidPhysicalProperties.LiquidPhysicalProperties; -import neqsim.physicalProperties.physicalPropertySystem.liquidPhysicalProperties.WaterPhysicalProperties; -import neqsim.physicalProperties.physicalPropertySystem.solidPhysicalProperties.SolidPhysicalProperties; +import neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface; +import neqsim.physicalproperties.physicalpropertysystem.commonphasephysicalproperties.DefaultPhysicalProperties; +import neqsim.physicalproperties.physicalpropertysystem.gasphysicalproperties.GasPhysicalProperties; +import neqsim.physicalproperties.physicalpropertysystem.liquidphysicalproperties.AminePhysicalProperties; +import neqsim.physicalproperties.physicalpropertysystem.liquidphysicalproperties.CO2waterPhysicalProperties; +import neqsim.physicalproperties.physicalpropertysystem.liquidphysicalproperties.GlycolPhysicalProperties; +import neqsim.physicalproperties.physicalpropertysystem.liquidphysicalproperties.LiquidPhysicalProperties; +import neqsim.physicalproperties.physicalpropertysystem.liquidphysicalproperties.WaterPhysicalProperties; +import neqsim.physicalproperties.physicalpropertysystem.solidphysicalproperties.SolidPhysicalProperties; import neqsim.thermo.phase.PhaseInterface; /** @@ -29,7 +29,7 @@ public class PhysicalPropertyHandler implements Cloneable, java.io.Serializable private PhysicalPropertiesInterface oilPhysicalProperties = null; private PhysicalPropertiesInterface aqueousPhysicalProperties = null; private PhysicalPropertiesInterface solidPhysicalProperties = null; - private neqsim.physicalProperties.mixingRule.PhysicalPropertyMixingRule mixingRule = null; + private neqsim.physicalproperties.mixingrule.PhysicalPropertyMixingRule mixingRule = null; /** *

@@ -85,7 +85,7 @@ public void setPhysicalProperties(PhaseInterface phase, int type) { break; } solidPhysicalProperties = new SolidPhysicalProperties(phase); - mixingRule = new neqsim.physicalProperties.mixingRule.PhysicalPropertyMixingRule(); + mixingRule = new neqsim.physicalproperties.mixingrule.PhysicalPropertyMixingRule(); mixingRule.initMixingRules(phase); gasPhysicalProperties.setMixingRule(mixingRule); oilPhysicalProperties.setMixingRule(mixingRule); @@ -98,7 +98,7 @@ public void setPhysicalProperties(PhaseInterface phase, int type) { *

* * @param phase a {@link neqsim.thermo.phase.PhaseInterface} object - * @return a {@link neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface} + * @return a {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface} * object */ public PhysicalPropertiesInterface getPhysicalProperty(PhaseInterface phase) { diff --git a/src/main/java/neqsim/physicalProperties/interfaceProperties/InterfaceProperties.java b/src/main/java/neqsim/physicalproperties/interfaceproperties/InterfaceProperties.java similarity index 93% rename from src/main/java/neqsim/physicalProperties/interfaceProperties/InterfaceProperties.java rename to src/main/java/neqsim/physicalproperties/interfaceproperties/InterfaceProperties.java index 1d8c070ff9..72cc63329f 100644 --- a/src/main/java/neqsim/physicalProperties/interfaceProperties/InterfaceProperties.java +++ b/src/main/java/neqsim/physicalproperties/interfaceproperties/InterfaceProperties.java @@ -4,18 +4,18 @@ * Created on 13. august 2001, 13:12 */ -package neqsim.physicalProperties.interfaceProperties; +package neqsim.physicalproperties.interfaceproperties; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.physicalProperties.interfaceProperties.solidAdsorption.AdsorptionInterface; -import neqsim.physicalProperties.interfaceProperties.solidAdsorption.PotentialTheoryAdsorption; -import neqsim.physicalProperties.interfaceProperties.surfaceTension.FirozabadiRamleyInterfaceTension; -import neqsim.physicalProperties.interfaceProperties.surfaceTension.GTSurfaceTension; -import neqsim.physicalProperties.interfaceProperties.surfaceTension.GTSurfaceTensionSimple; -import neqsim.physicalProperties.interfaceProperties.surfaceTension.LGTSurfaceTension; -import neqsim.physicalProperties.interfaceProperties.surfaceTension.ParachorSurfaceTension; -import neqsim.physicalProperties.interfaceProperties.surfaceTension.SurfaceTensionInterface; +import neqsim.physicalproperties.interfaceproperties.solidadsorption.AdsorptionInterface; +import neqsim.physicalproperties.interfaceproperties.solidadsorption.PotentialTheoryAdsorption; +import neqsim.physicalproperties.interfaceproperties.surfacetension.FirozabadiRamleyInterfaceTension; +import neqsim.physicalproperties.interfaceproperties.surfacetension.GTSurfaceTension; +import neqsim.physicalproperties.interfaceproperties.surfacetension.GTSurfaceTensionSimple; +import neqsim.physicalproperties.interfaceproperties.surfacetension.LGTSurfaceTension; +import neqsim.physicalproperties.interfaceproperties.surfacetension.ParachorSurfaceTension; +import neqsim.physicalproperties.interfaceproperties.surfacetension.SurfaceTensionInterface; import neqsim.thermo.phase.PhaseType; import neqsim.thermo.system.SystemInterface; diff --git a/src/main/java/neqsim/physicalProperties/interfaceProperties/InterphasePropertiesInterface.java b/src/main/java/neqsim/physicalproperties/interfaceproperties/InterphasePropertiesInterface.java similarity index 82% rename from src/main/java/neqsim/physicalProperties/interfaceProperties/InterphasePropertiesInterface.java rename to src/main/java/neqsim/physicalproperties/interfaceproperties/InterphasePropertiesInterface.java index 0b8c0b20ca..aacc7966de 100644 --- a/src/main/java/neqsim/physicalProperties/interfaceProperties/InterphasePropertiesInterface.java +++ b/src/main/java/neqsim/physicalproperties/interfaceproperties/InterphasePropertiesInterface.java @@ -4,10 +4,10 @@ * Created on 13. august 2001, 13:13 */ -package neqsim.physicalProperties.interfaceProperties; +package neqsim.physicalproperties.interfaceproperties; -import neqsim.physicalProperties.interfaceProperties.solidAdsorption.AdsorptionInterface; -import neqsim.physicalProperties.interfaceProperties.surfaceTension.SurfaceTensionInterface; +import neqsim.physicalproperties.interfaceproperties.solidadsorption.AdsorptionInterface; +import neqsim.physicalproperties.interfaceproperties.surfacetension.SurfaceTensionInterface; /** *

@@ -62,7 +62,7 @@ public interface InterphasePropertiesInterface extends Cloneable { * clone. *

* - * @return a {@link neqsim.physicalProperties.interfaceProperties.InterphasePropertiesInterface} + * @return a {@link neqsim.physicalproperties.interfaceproperties.InterphasePropertiesInterface} * object */ public InterphasePropertiesInterface clone(); @@ -106,7 +106,7 @@ public interface InterphasePropertiesInterface extends Cloneable { * * @param i a int * @return a - * {@link neqsim.physicalProperties.interfaceProperties.surfaceTension.SurfaceTensionInterface} + * {@link neqsim.physicalproperties.interfaceproperties.surfacetension.SurfaceTensionInterface} * object */ public SurfaceTensionInterface getSurfaceTensionModel(int i); @@ -137,7 +137,7 @@ public interface InterphasePropertiesInterface extends Cloneable { *

* * @return an array of - * {@link neqsim.physicalProperties.interfaceProperties.solidAdsorption.AdsorptionInterface} + * {@link neqsim.physicalproperties.interfaceproperties.solidadsorption.AdsorptionInterface} * objects */ public AdsorptionInterface[] getAdsorptionCalc(); @@ -149,7 +149,7 @@ public interface InterphasePropertiesInterface extends Cloneable { * * @param phaseName a {@link java.lang.String} object * @return a - * {@link neqsim.physicalProperties.interfaceProperties.solidAdsorption.AdsorptionInterface} + * {@link neqsim.physicalproperties.interfaceproperties.solidadsorption.AdsorptionInterface} * object */ public AdsorptionInterface getAdsorptionCalc(String phaseName); @@ -160,7 +160,7 @@ public interface InterphasePropertiesInterface extends Cloneable { *

* * @param adsorptionCalc an array of - * {@link neqsim.physicalProperties.interfaceProperties.solidAdsorption.AdsorptionInterface} + * {@link neqsim.physicalproperties.interfaceproperties.solidadsorption.AdsorptionInterface} * objects */ public void setAdsorptionCalc(AdsorptionInterface[] adsorptionCalc); diff --git a/src/main/java/neqsim/physicalProperties/interfaceProperties/solidAdsorption/AdsorptionInterface.java b/src/main/java/neqsim/physicalproperties/interfaceproperties/solidadsorption/AdsorptionInterface.java similarity index 92% rename from src/main/java/neqsim/physicalProperties/interfaceProperties/solidAdsorption/AdsorptionInterface.java rename to src/main/java/neqsim/physicalproperties/interfaceproperties/solidadsorption/AdsorptionInterface.java index ba9d15bdfa..85b31b961b 100644 --- a/src/main/java/neqsim/physicalProperties/interfaceProperties/solidAdsorption/AdsorptionInterface.java +++ b/src/main/java/neqsim/physicalproperties/interfaceproperties/solidadsorption/AdsorptionInterface.java @@ -1,4 +1,4 @@ -package neqsim.physicalProperties.interfaceProperties.solidAdsorption; +package neqsim.physicalproperties.interfaceproperties.solidadsorption; /** *

diff --git a/src/main/java/neqsim/physicalProperties/interfaceProperties/solidAdsorption/PotentialTheoryAdsorption.java b/src/main/java/neqsim/physicalproperties/interfaceproperties/solidadsorption/PotentialTheoryAdsorption.java similarity index 99% rename from src/main/java/neqsim/physicalProperties/interfaceProperties/solidAdsorption/PotentialTheoryAdsorption.java rename to src/main/java/neqsim/physicalproperties/interfaceproperties/solidadsorption/PotentialTheoryAdsorption.java index 5497040db1..513366112c 100644 --- a/src/main/java/neqsim/physicalProperties/interfaceProperties/solidAdsorption/PotentialTheoryAdsorption.java +++ b/src/main/java/neqsim/physicalproperties/interfaceproperties/solidadsorption/PotentialTheoryAdsorption.java @@ -1,4 +1,4 @@ -package neqsim.physicalProperties.interfaceProperties.solidAdsorption; +package neqsim.physicalproperties.interfaceproperties.solidadsorption; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/neqsim/physicalProperties/interfaceProperties/surfaceTension/FirozabadiRamleyInterfaceTension.java b/src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/FirozabadiRamleyInterfaceTension.java similarity index 97% rename from src/main/java/neqsim/physicalProperties/interfaceProperties/surfaceTension/FirozabadiRamleyInterfaceTension.java rename to src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/FirozabadiRamleyInterfaceTension.java index e3d90b8883..42c5ebdbee 100644 --- a/src/main/java/neqsim/physicalProperties/interfaceProperties/surfaceTension/FirozabadiRamleyInterfaceTension.java +++ b/src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/FirozabadiRamleyInterfaceTension.java @@ -1,4 +1,4 @@ -package neqsim.physicalProperties.interfaceProperties.surfaceTension; +package neqsim.physicalproperties.interfaceproperties.surfacetension; import neqsim.thermo.system.SystemInterface; diff --git a/src/main/java/neqsim/physicalProperties/interfaceProperties/surfaceTension/GTSurfaceTension.java b/src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/GTSurfaceTension.java similarity index 99% rename from src/main/java/neqsim/physicalProperties/interfaceProperties/surfaceTension/GTSurfaceTension.java rename to src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/GTSurfaceTension.java index 708be1322a..426f3de4b7 100644 --- a/src/main/java/neqsim/physicalProperties/interfaceProperties/surfaceTension/GTSurfaceTension.java +++ b/src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/GTSurfaceTension.java @@ -4,7 +4,7 @@ * Created on 13. august 2001, 13:14 */ -package neqsim.physicalProperties.interfaceProperties.surfaceTension; +package neqsim.physicalproperties.interfaceproperties.surfacetension; import org.apache.commons.math3.ode.nonstiff.DormandPrince54Integrator; import neqsim.thermo.system.SystemInterface; diff --git a/src/main/java/neqsim/physicalProperties/interfaceProperties/surfaceTension/GTSurfaceTensionFullGT.java b/src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/GTSurfaceTensionFullGT.java similarity index 99% rename from src/main/java/neqsim/physicalProperties/interfaceProperties/surfaceTension/GTSurfaceTensionFullGT.java rename to src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/GTSurfaceTensionFullGT.java index 36563801b9..0dae58a86a 100644 --- a/src/main/java/neqsim/physicalProperties/interfaceProperties/surfaceTension/GTSurfaceTensionFullGT.java +++ b/src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/GTSurfaceTensionFullGT.java @@ -1,4 +1,4 @@ -package neqsim.physicalProperties.interfaceProperties.surfaceTension; +package neqsim.physicalproperties.interfaceproperties.surfacetension; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -68,8 +68,8 @@ public GTSurfaceTensionFullGT(SystemInterface flashedSystem, int phase1, int pha } } if (hasAddedComp) { - neqsim.thermodynamicOperations.ThermodynamicOperations ops = - new neqsim.thermodynamicOperations.ThermodynamicOperations(this.sys); + neqsim.thermodynamicoperations.ThermodynamicOperations ops = + new neqsim.thermodynamicoperations.ThermodynamicOperations(this.sys); ops.TPflash(); } diff --git a/src/main/java/neqsim/physicalProperties/interfaceProperties/surfaceTension/GTSurfaceTensionODE.java b/src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/GTSurfaceTensionODE.java similarity index 99% rename from src/main/java/neqsim/physicalProperties/interfaceProperties/surfaceTension/GTSurfaceTensionODE.java rename to src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/GTSurfaceTensionODE.java index faf49f6e29..f80990924b 100644 --- a/src/main/java/neqsim/physicalProperties/interfaceProperties/surfaceTension/GTSurfaceTensionODE.java +++ b/src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/GTSurfaceTensionODE.java @@ -1,4 +1,4 @@ -package neqsim.physicalProperties.interfaceProperties.surfaceTension; +package neqsim.physicalproperties.interfaceproperties.surfacetension; import org.apache.commons.math3.ode.FirstOrderDifferentialEquations; import org.apache.logging.log4j.LogManager; diff --git a/src/main/java/neqsim/physicalProperties/interfaceProperties/surfaceTension/GTSurfaceTensionSimple.java b/src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/GTSurfaceTensionSimple.java similarity index 99% rename from src/main/java/neqsim/physicalProperties/interfaceProperties/surfaceTension/GTSurfaceTensionSimple.java rename to src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/GTSurfaceTensionSimple.java index dcf8adf553..f3359f92bb 100644 --- a/src/main/java/neqsim/physicalProperties/interfaceProperties/surfaceTension/GTSurfaceTensionSimple.java +++ b/src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/GTSurfaceTensionSimple.java @@ -1,4 +1,4 @@ -package neqsim.physicalProperties.interfaceProperties.surfaceTension; +package neqsim.physicalproperties.interfaceproperties.surfacetension; import org.apache.commons.math3.linear.Array2DRowRealMatrix; import org.apache.commons.math3.linear.DecompositionSolver; diff --git a/src/main/java/neqsim/physicalProperties/interfaceProperties/surfaceTension/GTSurfaceTensionUtils.java b/src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/GTSurfaceTensionUtils.java similarity index 97% rename from src/main/java/neqsim/physicalProperties/interfaceProperties/surfaceTension/GTSurfaceTensionUtils.java rename to src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/GTSurfaceTensionUtils.java index 9bde4be2f5..d800cd8f37 100644 --- a/src/main/java/neqsim/physicalProperties/interfaceProperties/surfaceTension/GTSurfaceTensionUtils.java +++ b/src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/GTSurfaceTensionUtils.java @@ -1,4 +1,4 @@ -package neqsim.physicalProperties.interfaceProperties.surfaceTension; +package neqsim.physicalproperties.interfaceproperties.surfacetension; import neqsim.thermo.phase.PhaseInterface; import neqsim.thermo.system.SystemInterface; diff --git a/src/main/java/neqsim/physicalProperties/interfaceProperties/surfaceTension/LGTSurfaceTension.java b/src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/LGTSurfaceTension.java similarity index 99% rename from src/main/java/neqsim/physicalProperties/interfaceProperties/surfaceTension/LGTSurfaceTension.java rename to src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/LGTSurfaceTension.java index f9f29ebeac..bb4eb6d737 100644 --- a/src/main/java/neqsim/physicalProperties/interfaceProperties/surfaceTension/LGTSurfaceTension.java +++ b/src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/LGTSurfaceTension.java @@ -1,4 +1,4 @@ -package neqsim.physicalProperties.interfaceProperties.surfaceTension; +package neqsim.physicalproperties.interfaceproperties.surfacetension; import neqsim.thermo.system.SystemInterface; diff --git a/src/main/java/neqsim/physicalProperties/interfaceProperties/surfaceTension/ParachorSurfaceTension.java b/src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/ParachorSurfaceTension.java similarity index 97% rename from src/main/java/neqsim/physicalProperties/interfaceProperties/surfaceTension/ParachorSurfaceTension.java rename to src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/ParachorSurfaceTension.java index 52ab0df440..0e36241e77 100644 --- a/src/main/java/neqsim/physicalProperties/interfaceProperties/surfaceTension/ParachorSurfaceTension.java +++ b/src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/ParachorSurfaceTension.java @@ -1,4 +1,4 @@ -package neqsim.physicalProperties.interfaceProperties.surfaceTension; +package neqsim.physicalproperties.interfaceproperties.surfacetension; import neqsim.thermo.system.SystemInterface; diff --git a/src/main/java/neqsim/physicalProperties/interfaceProperties/surfaceTension/SurfaceTension.java b/src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/SurfaceTension.java similarity index 92% rename from src/main/java/neqsim/physicalProperties/interfaceProperties/surfaceTension/SurfaceTension.java rename to src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/SurfaceTension.java index f255d198cf..dcd19105c1 100644 --- a/src/main/java/neqsim/physicalProperties/interfaceProperties/surfaceTension/SurfaceTension.java +++ b/src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/SurfaceTension.java @@ -4,9 +4,9 @@ * Created on 13. august 2001, 13:14 */ -package neqsim.physicalProperties.interfaceProperties.surfaceTension; +package neqsim.physicalproperties.interfaceproperties.surfacetension; -import neqsim.physicalProperties.interfaceProperties.InterfaceProperties; +import neqsim.physicalproperties.interfaceproperties.InterfaceProperties; import neqsim.thermo.system.SystemInterface; /** diff --git a/src/main/java/neqsim/physicalProperties/interfaceProperties/surfaceTension/SurfaceTensionInterface.java b/src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/SurfaceTensionInterface.java similarity index 88% rename from src/main/java/neqsim/physicalProperties/interfaceProperties/surfaceTension/SurfaceTensionInterface.java rename to src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/SurfaceTensionInterface.java index 2666e3c69b..0808610116 100644 --- a/src/main/java/neqsim/physicalProperties/interfaceProperties/surfaceTension/SurfaceTensionInterface.java +++ b/src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/SurfaceTensionInterface.java @@ -4,7 +4,7 @@ * Created on 13. august 2001, 13:14 */ -package neqsim.physicalProperties.interfaceProperties.surfaceTension; +package neqsim.physicalproperties.interfaceproperties.surfacetension; /** *

diff --git a/src/main/java/neqsim/physicalProperties/mixingRule/PhysicalPropertyMixingRule.java b/src/main/java/neqsim/physicalproperties/mixingrule/PhysicalPropertyMixingRule.java similarity index 96% rename from src/main/java/neqsim/physicalProperties/mixingRule/PhysicalPropertyMixingRule.java rename to src/main/java/neqsim/physicalproperties/mixingrule/PhysicalPropertyMixingRule.java index b2adea9d74..e8a0c76c2e 100644 --- a/src/main/java/neqsim/physicalProperties/mixingRule/PhysicalPropertyMixingRule.java +++ b/src/main/java/neqsim/physicalproperties/mixingrule/PhysicalPropertyMixingRule.java @@ -4,7 +4,7 @@ * Created on 2. august 2001, 13:42 */ -package neqsim.physicalProperties.mixingRule; +package neqsim.physicalproperties.mixingrule; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -69,7 +69,7 @@ public void setViscosityGij(double val, int i, int j) { * getPhysicalPropertyMixingRule. *

* - * @return a {@link neqsim.physicalProperties.mixingRule.PhysicalPropertyMixingRuleInterface} + * @return a {@link neqsim.physicalproperties.mixingrule.PhysicalPropertyMixingRuleInterface} * object */ public PhysicalPropertyMixingRuleInterface getPhysicalPropertyMixingRule() { diff --git a/src/main/java/neqsim/physicalProperties/mixingRule/PhysicalPropertyMixingRuleInterface.java b/src/main/java/neqsim/physicalproperties/mixingrule/PhysicalPropertyMixingRuleInterface.java similarity index 90% rename from src/main/java/neqsim/physicalProperties/mixingRule/PhysicalPropertyMixingRuleInterface.java rename to src/main/java/neqsim/physicalproperties/mixingrule/PhysicalPropertyMixingRuleInterface.java index 1590f88ae4..b1b8b7e11b 100644 --- a/src/main/java/neqsim/physicalProperties/mixingRule/PhysicalPropertyMixingRuleInterface.java +++ b/src/main/java/neqsim/physicalproperties/mixingrule/PhysicalPropertyMixingRuleInterface.java @@ -4,7 +4,7 @@ * Created on 2. august 2001, 13:41 */ -package neqsim.physicalProperties.mixingRule; +package neqsim.physicalproperties.mixingrule; import neqsim.thermo.phase.PhaseInterface; @@ -53,7 +53,7 @@ public interface PhysicalPropertyMixingRuleInterface extends Cloneable { * clone. *

* - * @return a {@link neqsim.physicalProperties.mixingRule.PhysicalPropertyMixingRuleInterface} + * @return a {@link neqsim.physicalproperties.mixingrule.PhysicalPropertyMixingRuleInterface} * object */ public PhysicalPropertyMixingRuleInterface clone(); diff --git a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/PhysicalPropertyMethod.java b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/PhysicalPropertyMethod.java similarity index 90% rename from src/main/java/neqsim/physicalProperties/physicalPropertyMethods/PhysicalPropertyMethod.java rename to src/main/java/neqsim/physicalproperties/physicalpropertymethods/PhysicalPropertyMethod.java index 6f72f4806f..6b4cb13f6e 100644 --- a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/PhysicalPropertyMethod.java +++ b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/PhysicalPropertyMethod.java @@ -4,7 +4,7 @@ * Created on 3. august 2001, 22:49 */ -package neqsim.physicalProperties.physicalPropertyMethods; +package neqsim.physicalproperties.physicalpropertymethods; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -45,7 +45,7 @@ public PhysicalPropertyMethod clone() { /** {@inheritDoc} */ @Override public void setPhase( - neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface phase) {} + neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface phase) {} /** {@inheritDoc} */ @Override diff --git a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/PhysicalPropertyMethodInterface.java b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/PhysicalPropertyMethodInterface.java similarity index 77% rename from src/main/java/neqsim/physicalProperties/physicalPropertyMethods/PhysicalPropertyMethodInterface.java rename to src/main/java/neqsim/physicalproperties/physicalpropertymethods/PhysicalPropertyMethodInterface.java index 28fd7e32dd..b0fae4c89c 100644 --- a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/PhysicalPropertyMethodInterface.java +++ b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/PhysicalPropertyMethodInterface.java @@ -4,7 +4,7 @@ * Created on 21. august 2001, 13:20 */ -package neqsim.physicalProperties.physicalPropertyMethods; +package neqsim.physicalproperties.physicalpropertymethods; /** *

@@ -21,7 +21,7 @@ public interface PhysicalPropertyMethodInterface extends Cloneable, java.io.Seri *

* * @return a - * {@link neqsim.physicalProperties.physicalPropertyMethods.PhysicalPropertyMethodInterface} + * {@link neqsim.physicalproperties.physicalpropertymethods.PhysicalPropertyMethodInterface} * object */ public PhysicalPropertyMethodInterface clone(); @@ -32,11 +32,11 @@ public interface PhysicalPropertyMethodInterface extends Cloneable, java.io.Seri *

* * @param phase a - * {@link neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface} + * {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface} * object */ public void setPhase( - neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface phase); + neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface phase); /** *

diff --git a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/commonPhasePhysicalProperties/CommonPhysicalPropertyMethod.java b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/CommonPhysicalPropertyMethod.java similarity index 60% rename from src/main/java/neqsim/physicalProperties/physicalPropertyMethods/commonPhasePhysicalProperties/CommonPhysicalPropertyMethod.java rename to src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/CommonPhysicalPropertyMethod.java index 5d4be982ab..69af7433fb 100644 --- a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/commonPhasePhysicalProperties/CommonPhysicalPropertyMethod.java +++ b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/CommonPhysicalPropertyMethod.java @@ -1,4 +1,4 @@ -package neqsim.physicalProperties.physicalPropertyMethods.commonPhasePhysicalProperties; +package neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties; /** *

@@ -9,10 +9,10 @@ * @version $Id: $Id */ public class CommonPhysicalPropertyMethod - extends neqsim.physicalProperties.physicalPropertyMethods.PhysicalPropertyMethod { + extends neqsim.physicalproperties.physicalpropertymethods.PhysicalPropertyMethod { private static final long serialVersionUID = 1000; - protected neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface phase; + protected neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface phase; /** *

@@ -20,18 +20,18 @@ public class CommonPhysicalPropertyMethod *

* * @param phase a - * {@link neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface} + * {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface} * object */ public CommonPhysicalPropertyMethod( - neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface phase) { + neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface phase) { this.phase = phase; } /** {@inheritDoc} */ @Override public void setPhase( - neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface phase) { + neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface phase) { this.phase = phase; } } diff --git a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/commonPhasePhysicalProperties/conductivity/Conductivity.java b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/conductivity/Conductivity.java similarity index 68% rename from src/main/java/neqsim/physicalProperties/physicalPropertyMethods/commonPhasePhysicalProperties/conductivity/Conductivity.java rename to src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/conductivity/Conductivity.java index bc68d7950d..64679d1e88 100644 --- a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/commonPhasePhysicalProperties/conductivity/Conductivity.java +++ b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/conductivity/Conductivity.java @@ -1,4 +1,4 @@ -package neqsim.physicalProperties.physicalPropertyMethods.commonPhasePhysicalProperties.conductivity; +package neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties.conductivity; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -9,9 +9,9 @@ * @author Even Solbraa */ abstract class Conductivity extends - neqsim.physicalProperties.physicalPropertyMethods.commonPhasePhysicalProperties.CommonPhysicalPropertyMethod + neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties.CommonPhysicalPropertyMethod implements - neqsim.physicalProperties.physicalPropertyMethods.methodInterface.ConductivityInterface { + neqsim.physicalproperties.physicalpropertymethods.methodinterface.ConductivityInterface { private static final long serialVersionUID = 1000; static Logger logger = LogManager.getLogger(Conductivity.class); @@ -23,11 +23,11 @@ abstract class Conductivity extends *

* * @param phase a - * {@link neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface} + * {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface} * object */ public Conductivity( - neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface phase) { + neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface phase) { super(phase); } diff --git a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/commonPhasePhysicalProperties/conductivity/PFCTConductivityMethodMod86.java b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/conductivity/PFCTConductivityMethodMod86.java similarity index 98% rename from src/main/java/neqsim/physicalProperties/physicalPropertyMethods/commonPhasePhysicalProperties/conductivity/PFCTConductivityMethodMod86.java rename to src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/conductivity/PFCTConductivityMethodMod86.java index 529f5688c5..5ed04e14ae 100644 --- a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/commonPhasePhysicalProperties/conductivity/PFCTConductivityMethodMod86.java +++ b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/conductivity/PFCTConductivityMethodMod86.java @@ -1,4 +1,4 @@ -package neqsim.physicalProperties.physicalPropertyMethods.commonPhasePhysicalProperties.conductivity; +package neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties.conductivity; import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.system.SystemInterface; @@ -40,11 +40,11 @@ public class PFCTConductivityMethodMod86 extends Conductivity { *

* * @param phase a - * {@link neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface} + * {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface} * object */ public PFCTConductivityMethodMod86( - neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface phase) { + neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface phase) { super(phase); if (referenceSystem.getNumberOfMoles() < 1e-10) { referenceSystem.addComponent("methane", 10.0); diff --git a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/commonPhasePhysicalProperties/diffusivity/CorrespondingStatesDiffusivity.java b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/diffusivity/CorrespondingStatesDiffusivity.java similarity index 88% rename from src/main/java/neqsim/physicalProperties/physicalPropertyMethods/commonPhasePhysicalProperties/diffusivity/CorrespondingStatesDiffusivity.java rename to src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/diffusivity/CorrespondingStatesDiffusivity.java index 7671ec67b3..b1da0a37be 100644 --- a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/commonPhasePhysicalProperties/diffusivity/CorrespondingStatesDiffusivity.java +++ b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/diffusivity/CorrespondingStatesDiffusivity.java @@ -1,4 +1,4 @@ -package neqsim.physicalProperties.physicalPropertyMethods.commonPhasePhysicalProperties.diffusivity; +package neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties.diffusivity; import neqsim.thermo.phase.PhaseType; @@ -22,11 +22,11 @@ public class CorrespondingStatesDiffusivity extends Diffusivity { *

* * @param phase a - * {@link neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface} + * {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface} * object */ public CorrespondingStatesDiffusivity( - neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface phase) { + neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface phase) { super(phase); binaryDiffusionCoefficients = new double[phase.getPhase().getNumberOfComponents()][phase .getPhase().getNumberOfComponents()]; diff --git a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/commonPhasePhysicalProperties/diffusivity/Diffusivity.java b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/diffusivity/Diffusivity.java similarity index 90% rename from src/main/java/neqsim/physicalProperties/physicalPropertyMethods/commonPhasePhysicalProperties/diffusivity/Diffusivity.java rename to src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/diffusivity/Diffusivity.java index d66f963a15..f8a608e5b6 100644 --- a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/commonPhasePhysicalProperties/diffusivity/Diffusivity.java +++ b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/diffusivity/Diffusivity.java @@ -1,8 +1,8 @@ -package neqsim.physicalProperties.physicalPropertyMethods.commonPhasePhysicalProperties.diffusivity; +package neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties.diffusivity; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.physicalProperties.physicalPropertyMethods.commonPhasePhysicalProperties.CommonPhysicalPropertyMethod; +import neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties.CommonPhysicalPropertyMethod; /** *

@@ -13,7 +13,7 @@ * @version $Id: $Id */ public class Diffusivity extends CommonPhysicalPropertyMethod implements - neqsim.physicalProperties.physicalPropertyMethods.methodInterface.DiffusivityInterface { + neqsim.physicalproperties.physicalpropertymethods.methodinterface.DiffusivityInterface { private static final long serialVersionUID = 1000; static Logger logger = LogManager.getLogger(Diffusivity.class); @@ -27,11 +27,11 @@ public class Diffusivity extends CommonPhysicalPropertyMethod implements *

* * @param phase a - * {@link neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface} + * {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface} * object */ public Diffusivity( - neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface phase) { + neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface phase) { super(phase); binaryDiffusionCoefficients = new double[phase.getPhase().getNumberOfComponents()][phase .getPhase().getNumberOfComponents()]; diff --git a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/commonPhasePhysicalProperties/viscosity/FrictionTheoryViscosityMethod.java b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/viscosity/FrictionTheoryViscosityMethod.java similarity index 97% rename from src/main/java/neqsim/physicalProperties/physicalPropertyMethods/commonPhasePhysicalProperties/viscosity/FrictionTheoryViscosityMethod.java rename to src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/viscosity/FrictionTheoryViscosityMethod.java index aebebfc4e1..534e3ea2cd 100644 --- a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/commonPhasePhysicalProperties/viscosity/FrictionTheoryViscosityMethod.java +++ b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/viscosity/FrictionTheoryViscosityMethod.java @@ -1,4 +1,4 @@ -package neqsim.physicalProperties.physicalPropertyMethods.commonPhasePhysicalProperties.viscosity; +package neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties.viscosity; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -55,11 +55,11 @@ public class FrictionTheoryViscosityMethod extends Viscosity *

* * @param phase a - * {@link neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface} + * {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface} * object */ public FrictionTheoryViscosityMethod( - neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface phase) { + neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface phase) { super(phase); pureComponentViscosity = new double[phase.getPhase().getNumberOfComponents()]; Fc = new double[phase.getPhase().getNumberOfComponents()]; diff --git a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/commonPhasePhysicalProperties/viscosity/LBCViscosityMethod.java b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/viscosity/LBCViscosityMethod.java similarity index 93% rename from src/main/java/neqsim/physicalProperties/physicalPropertyMethods/commonPhasePhysicalProperties/viscosity/LBCViscosityMethod.java rename to src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/viscosity/LBCViscosityMethod.java index 7aabe2c103..02b94f5bef 100644 --- a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/commonPhasePhysicalProperties/viscosity/LBCViscosityMethod.java +++ b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/viscosity/LBCViscosityMethod.java @@ -1,4 +1,4 @@ -package neqsim.physicalProperties.physicalPropertyMethods.commonPhasePhysicalProperties.viscosity; +package neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties.viscosity; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -23,11 +23,11 @@ public class LBCViscosityMethod extends Viscosity { *

* * @param phase a - * {@link neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface} + * {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface} * object */ public LBCViscosityMethod( - neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface phase) { + neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface phase) { super(phase); } diff --git a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/commonPhasePhysicalProperties/viscosity/PFCTViscosityMethod.java b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/viscosity/PFCTViscosityMethod.java similarity index 96% rename from src/main/java/neqsim/physicalProperties/physicalPropertyMethods/commonPhasePhysicalProperties/viscosity/PFCTViscosityMethod.java rename to src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/viscosity/PFCTViscosityMethod.java index a0d52fabaa..df7da73aa0 100644 --- a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/commonPhasePhysicalProperties/viscosity/PFCTViscosityMethod.java +++ b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/viscosity/PFCTViscosityMethod.java @@ -4,7 +4,7 @@ * Created on 1. august 2001, 12:44 */ -package neqsim.physicalProperties.physicalPropertyMethods.commonPhasePhysicalProperties.viscosity; +package neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties.viscosity; import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.system.SystemInterface; @@ -46,11 +46,11 @@ public class PFCTViscosityMethod extends Viscosity { *

* * @param phase a - * {@link neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface} + * {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface} * object */ public PFCTViscosityMethod( - neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface phase) { + neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface phase) { super(phase); referenceSystem.addComponent("methane", 10.0); referenceSystem.init(0); diff --git a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/commonPhasePhysicalProperties/viscosity/PFCTViscosityMethodHeavyOil.java b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/viscosity/PFCTViscosityMethodHeavyOil.java similarity index 97% rename from src/main/java/neqsim/physicalProperties/physicalPropertyMethods/commonPhasePhysicalProperties/viscosity/PFCTViscosityMethodHeavyOil.java rename to src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/viscosity/PFCTViscosityMethodHeavyOil.java index ba20acc235..b391f5e606 100644 --- a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/commonPhasePhysicalProperties/viscosity/PFCTViscosityMethodHeavyOil.java +++ b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/viscosity/PFCTViscosityMethodHeavyOil.java @@ -1,4 +1,4 @@ -package neqsim.physicalProperties.physicalPropertyMethods.commonPhasePhysicalProperties.viscosity; +package neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties.viscosity; import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.system.SystemInterface; @@ -46,11 +46,11 @@ public class PFCTViscosityMethodHeavyOil extends Viscosity { *

* * @param phase a - * {@link neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface} + * {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface} * object */ public PFCTViscosityMethodHeavyOil( - neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface phase) { + neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface phase) { super(phase); if (referenceSystem.getNumberOfMoles() < 1e-10) { referenceSystem.addComponent("methane", 10.0); diff --git a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/commonPhasePhysicalProperties/viscosity/PFCTViscosityMethodMod86.java b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/viscosity/PFCTViscosityMethodMod86.java similarity index 97% rename from src/main/java/neqsim/physicalProperties/physicalPropertyMethods/commonPhasePhysicalProperties/viscosity/PFCTViscosityMethodMod86.java rename to src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/viscosity/PFCTViscosityMethodMod86.java index 3f28c33bf7..3e3dcb5b57 100644 --- a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/commonPhasePhysicalProperties/viscosity/PFCTViscosityMethodMod86.java +++ b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/viscosity/PFCTViscosityMethodMod86.java @@ -1,4 +1,4 @@ -package neqsim.physicalProperties.physicalPropertyMethods.commonPhasePhysicalProperties.viscosity; +package neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties.viscosity; import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.system.SystemInterface; @@ -41,11 +41,11 @@ public class PFCTViscosityMethodMod86 extends Viscosity { *

* * @param phase a - * {@link neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface} + * {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface} * object */ public PFCTViscosityMethodMod86( - neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface phase) { + neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface phase) { super(phase); if (referenceSystem.getNumberOfMoles() < 1e-10) { referenceSystem.addComponent("methane", 10.0); diff --git a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/commonPhasePhysicalProperties/viscosity/Viscosity.java b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/viscosity/Viscosity.java similarity index 92% rename from src/main/java/neqsim/physicalProperties/physicalPropertyMethods/commonPhasePhysicalProperties/viscosity/Viscosity.java rename to src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/viscosity/Viscosity.java index 87f2b4f55a..b7ea0f9f71 100644 --- a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/commonPhasePhysicalProperties/viscosity/Viscosity.java +++ b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/commonphasephysicalproperties/viscosity/Viscosity.java @@ -1,4 +1,4 @@ -package neqsim.physicalProperties.physicalPropertyMethods.commonPhasePhysicalProperties.viscosity; +package neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties.viscosity; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -9,9 +9,9 @@ * @author Even Solbraa */ abstract class Viscosity extends - neqsim.physicalProperties.physicalPropertyMethods.commonPhasePhysicalProperties.CommonPhysicalPropertyMethod + neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties.CommonPhysicalPropertyMethod implements - neqsim.physicalProperties.physicalPropertyMethods.methodInterface.ViscosityInterface { + neqsim.physicalproperties.physicalpropertymethods.methodinterface.ViscosityInterface { private static final long serialVersionUID = 1000; static Logger logger = LogManager.getLogger(Viscosity.class); @@ -23,11 +23,11 @@ abstract class Viscosity extends *

* * @param phase a - * {@link neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface} + * {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface} * object */ public Viscosity( - neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface phase) { + neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface phase) { super(phase); pureComponentViscosity = new double[phase.getPhase().getNumberOfComponents()]; } diff --git a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/gasPhysicalProperties/GasPhysicalPropertyMethod.java b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/gasphysicalproperties/GasPhysicalPropertyMethod.java similarity index 84% rename from src/main/java/neqsim/physicalProperties/physicalPropertyMethods/gasPhysicalProperties/GasPhysicalPropertyMethod.java rename to src/main/java/neqsim/physicalproperties/physicalpropertymethods/gasphysicalproperties/GasPhysicalPropertyMethod.java index 89edc1b436..5316ee9640 100644 --- a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/gasPhysicalProperties/GasPhysicalPropertyMethod.java +++ b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/gasphysicalproperties/GasPhysicalPropertyMethod.java @@ -1,4 +1,4 @@ -package neqsim.physicalProperties.physicalPropertyMethods.gasPhysicalProperties; +package neqsim.physicalproperties.physicalpropertymethods.gasphysicalproperties; /** *

@@ -9,10 +9,10 @@ * @version $Id: $Id */ public class GasPhysicalPropertyMethod - extends neqsim.physicalProperties.physicalPropertyMethods.PhysicalPropertyMethod { + extends neqsim.physicalproperties.physicalpropertymethods.PhysicalPropertyMethod { private static final long serialVersionUID = 1000; - protected neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface gasPhase; + protected neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface gasPhase; public double[][] binaryMolecularDiameter; public double[][] binaryEnergyParameter; public double[][] binaryMolecularMass; @@ -31,11 +31,11 @@ public GasPhysicalPropertyMethod() { *

* * @param gasPhase a - * {@link neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface} + * {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface} * object */ public GasPhysicalPropertyMethod( - neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface gasPhase) { + neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface gasPhase) { this.gasPhase = gasPhase; binaryMolecularDiameter = new double[gasPhase.getPhase().getNumberOfComponents()][gasPhase .getPhase().getNumberOfComponents()]; @@ -65,7 +65,7 @@ public GasPhysicalPropertyMethod( /** {@inheritDoc} */ @Override public void setPhase( - neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface phase) { + neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface phase) { this.gasPhase = phase; } } diff --git a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/gasPhysicalProperties/conductivity/ChungConductivityMethod.java b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/gasphysicalproperties/conductivity/ChungConductivityMethod.java similarity index 93% rename from src/main/java/neqsim/physicalProperties/physicalPropertyMethods/gasPhysicalProperties/conductivity/ChungConductivityMethod.java rename to src/main/java/neqsim/physicalproperties/physicalpropertymethods/gasphysicalproperties/conductivity/ChungConductivityMethod.java index 7b61bc78a1..3d857a16d3 100644 --- a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/gasPhysicalProperties/conductivity/ChungConductivityMethod.java +++ b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/gasphysicalproperties/conductivity/ChungConductivityMethod.java @@ -1,4 +1,4 @@ -package neqsim.physicalProperties.physicalPropertyMethods.gasPhysicalProperties.conductivity; +package neqsim.physicalproperties.physicalpropertymethods.gasphysicalproperties.conductivity; /** *

@@ -19,11 +19,11 @@ public class ChungConductivityMethod extends Conductivity { *

* * @param gasPhase a - * {@link neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface} + * {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface} * object */ public ChungConductivityMethod( - neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface gasPhase) { + neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface gasPhase) { super(gasPhase); pureComponentConductivity = new double[gasPhase.getPhase().getNumberOfComponents()]; } diff --git a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/gasPhysicalProperties/conductivity/Conductivity.java b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/gasphysicalproperties/conductivity/Conductivity.java similarity index 71% rename from src/main/java/neqsim/physicalProperties/physicalPropertyMethods/gasPhysicalProperties/conductivity/Conductivity.java rename to src/main/java/neqsim/physicalproperties/physicalpropertymethods/gasphysicalproperties/conductivity/Conductivity.java index 7517652550..fdb085571c 100644 --- a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/gasPhysicalProperties/conductivity/Conductivity.java +++ b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/gasphysicalproperties/conductivity/Conductivity.java @@ -4,7 +4,7 @@ * Created on 1. november 2000, 19:00 */ -package neqsim.physicalProperties.physicalPropertyMethods.gasPhysicalProperties.conductivity; +package neqsim.physicalproperties.physicalpropertymethods.gasphysicalproperties.conductivity; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -15,9 +15,9 @@ * @author Even Solbraa */ abstract class Conductivity extends - neqsim.physicalProperties.physicalPropertyMethods.gasPhysicalProperties.GasPhysicalPropertyMethod + neqsim.physicalproperties.physicalpropertymethods.gasphysicalproperties.GasPhysicalPropertyMethod implements - neqsim.physicalProperties.physicalPropertyMethods.methodInterface.ConductivityInterface { + neqsim.physicalproperties.physicalpropertymethods.methodinterface.ConductivityInterface { private static final long serialVersionUID = 1000; static Logger logger = LogManager.getLogger(Conductivity.class); @@ -29,11 +29,11 @@ abstract class Conductivity extends *

* * @param gasPhase a - * {@link neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface} + * {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface} * object */ public Conductivity( - neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface gasPhase) { + neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface gasPhase) { super(gasPhase); } diff --git a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/gasPhysicalProperties/density/Density.java b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/gasphysicalproperties/density/Density.java similarity index 79% rename from src/main/java/neqsim/physicalProperties/physicalPropertyMethods/gasPhysicalProperties/density/Density.java rename to src/main/java/neqsim/physicalproperties/physicalpropertymethods/gasphysicalproperties/density/Density.java index 3b091b6321..ca3036ded1 100644 --- a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/gasPhysicalProperties/density/Density.java +++ b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/gasphysicalproperties/density/Density.java @@ -4,11 +4,11 @@ * Created on 24. januar 2001, 19:49 */ -package neqsim.physicalProperties.physicalPropertyMethods.gasPhysicalProperties.density; +package neqsim.physicalproperties.physicalpropertymethods.gasphysicalproperties.density; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.physicalProperties.physicalPropertyMethods.gasPhysicalProperties.GasPhysicalPropertyMethod; +import neqsim.physicalproperties.physicalpropertymethods.gasphysicalproperties.GasPhysicalPropertyMethod; /** *

@@ -19,7 +19,7 @@ * @version $Id: $Id */ public class Density extends GasPhysicalPropertyMethod - implements neqsim.physicalProperties.physicalPropertyMethods.methodInterface.DensityInterface { + implements neqsim.physicalproperties.physicalpropertymethods.methodinterface.DensityInterface { private static final long serialVersionUID = 1000; static Logger logger = LogManager.getLogger(Density.class); @@ -29,11 +29,11 @@ public class Density extends GasPhysicalPropertyMethod *

* * @param gasPhase a - * {@link neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface} + * {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface} * object */ public Density( - neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface gasPhase) { + neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface gasPhase) { this.gasPhase = gasPhase; } diff --git a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/gasPhysicalProperties/diffusivity/Diffusivity.java b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/gasphysicalproperties/diffusivity/Diffusivity.java similarity index 92% rename from src/main/java/neqsim/physicalProperties/physicalPropertyMethods/gasPhysicalProperties/diffusivity/Diffusivity.java rename to src/main/java/neqsim/physicalproperties/physicalpropertymethods/gasphysicalproperties/diffusivity/Diffusivity.java index 82755618a0..a135d33cbb 100644 --- a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/gasPhysicalProperties/diffusivity/Diffusivity.java +++ b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/gasphysicalproperties/diffusivity/Diffusivity.java @@ -1,4 +1,4 @@ -package neqsim.physicalProperties.physicalPropertyMethods.gasPhysicalProperties.diffusivity; +package neqsim.physicalproperties.physicalpropertymethods.gasphysicalproperties.diffusivity; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -12,9 +12,9 @@ * @version $Id: $Id */ public class Diffusivity extends - neqsim.physicalProperties.physicalPropertyMethods.gasPhysicalProperties.GasPhysicalPropertyMethod + neqsim.physicalproperties.physicalpropertymethods.gasphysicalproperties.GasPhysicalPropertyMethod implements - neqsim.physicalProperties.physicalPropertyMethods.methodInterface.DiffusivityInterface { + neqsim.physicalproperties.physicalpropertymethods.methodinterface.DiffusivityInterface { private static final long serialVersionUID = 1000; static Logger logger = LogManager.getLogger(Diffusivity.class); @@ -28,11 +28,11 @@ public class Diffusivity extends *

* * @param gasPhase a - * {@link neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface} + * {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface} * object */ public Diffusivity( - neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface gasPhase) { + neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface gasPhase) { super(gasPhase); binaryDiffusionCoefficients = new double[gasPhase.getPhase().getNumberOfComponents()][gasPhase .getPhase().getNumberOfComponents()]; diff --git a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/gasPhysicalProperties/diffusivity/WilkeLeeDiffusivity.java b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/gasphysicalproperties/diffusivity/WilkeLeeDiffusivity.java similarity index 89% rename from src/main/java/neqsim/physicalProperties/physicalPropertyMethods/gasPhysicalProperties/diffusivity/WilkeLeeDiffusivity.java rename to src/main/java/neqsim/physicalproperties/physicalpropertymethods/gasphysicalproperties/diffusivity/WilkeLeeDiffusivity.java index b36e8f68af..60241b0d8e 100644 --- a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/gasPhysicalProperties/diffusivity/WilkeLeeDiffusivity.java +++ b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/gasphysicalproperties/diffusivity/WilkeLeeDiffusivity.java @@ -1,4 +1,4 @@ -package neqsim.physicalProperties.physicalPropertyMethods.gasPhysicalProperties.diffusivity; +package neqsim.physicalproperties.physicalpropertymethods.gasphysicalproperties.diffusivity; /** *

@@ -19,11 +19,11 @@ public class WilkeLeeDiffusivity extends Diffusivity { *

* * @param gasPhase a - * {@link neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface} + * {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface} * object */ public WilkeLeeDiffusivity( - neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface gasPhase) { + neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface gasPhase) { super(gasPhase); binaryDiffusionCoefficients = new double[gasPhase.getPhase().getNumberOfComponents()][gasPhase .getPhase().getNumberOfComponents()]; diff --git a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/gasPhysicalProperties/viscosity/ChungViscosityMethod.java b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/gasphysicalproperties/viscosity/ChungViscosityMethod.java similarity index 96% rename from src/main/java/neqsim/physicalProperties/physicalPropertyMethods/gasPhysicalProperties/viscosity/ChungViscosityMethod.java rename to src/main/java/neqsim/physicalproperties/physicalpropertymethods/gasphysicalproperties/viscosity/ChungViscosityMethod.java index b323aab489..817de2eca5 100644 --- a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/gasPhysicalProperties/viscosity/ChungViscosityMethod.java +++ b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/gasphysicalproperties/viscosity/ChungViscosityMethod.java @@ -4,7 +4,7 @@ * Created on 1. august 2001, 12:44 */ -package neqsim.physicalProperties.physicalPropertyMethods.gasPhysicalProperties.viscosity; +package neqsim.physicalproperties.physicalpropertymethods.gasphysicalproperties.viscosity; /** *

@@ -39,11 +39,11 @@ public class ChungViscosityMethod extends Viscosity { *

* * @param gasPhase a - * {@link neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface} + * {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface} * object */ public ChungViscosityMethod( - neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface gasPhase) { + neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface gasPhase) { super(gasPhase); pureComponentViscosity = new double[gasPhase.getPhase().getNumberOfComponents()]; relativeViscosity = new double[gasPhase.getPhase().getNumberOfComponents()]; diff --git a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/gasPhysicalProperties/viscosity/Viscosity.java b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/gasphysicalproperties/viscosity/Viscosity.java similarity index 68% rename from src/main/java/neqsim/physicalProperties/physicalPropertyMethods/gasPhysicalProperties/viscosity/Viscosity.java rename to src/main/java/neqsim/physicalproperties/physicalpropertymethods/gasphysicalproperties/viscosity/Viscosity.java index 8709cbd046..2cd72f0a91 100644 --- a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/gasPhysicalProperties/viscosity/Viscosity.java +++ b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/gasphysicalproperties/viscosity/Viscosity.java @@ -1,4 +1,4 @@ -package neqsim.physicalProperties.physicalPropertyMethods.gasPhysicalProperties.viscosity; +package neqsim.physicalproperties.physicalpropertymethods.gasphysicalproperties.viscosity; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -9,9 +9,9 @@ * @author Even Solbraa */ abstract class Viscosity extends - neqsim.physicalProperties.physicalPropertyMethods.gasPhysicalProperties.GasPhysicalPropertyMethod + neqsim.physicalproperties.physicalpropertymethods.gasphysicalproperties.GasPhysicalPropertyMethod implements - neqsim.physicalProperties.physicalPropertyMethods.methodInterface.ViscosityInterface { + neqsim.physicalproperties.physicalpropertymethods.methodinterface.ViscosityInterface { private static final long serialVersionUID = 1000; static Logger logger = LogManager.getLogger(Viscosity.class); @@ -21,11 +21,11 @@ abstract class Viscosity extends *

* * @param gasPhase a - * {@link neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface} + * {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface} * object */ public Viscosity( - neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface gasPhase) { + neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface gasPhase) { super(gasPhase); } diff --git a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/liquidPhysicalProperties/LiquidPhysicalPropertyMethod.java b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/LiquidPhysicalPropertyMethod.java similarity index 66% rename from src/main/java/neqsim/physicalProperties/physicalPropertyMethods/liquidPhysicalProperties/LiquidPhysicalPropertyMethod.java rename to src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/LiquidPhysicalPropertyMethod.java index 5c95c15795..a88f6ef62e 100644 --- a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/liquidPhysicalProperties/LiquidPhysicalPropertyMethod.java +++ b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/LiquidPhysicalPropertyMethod.java @@ -1,4 +1,4 @@ -package neqsim.physicalProperties.physicalPropertyMethods.liquidPhysicalProperties; +package neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties; /** *

@@ -9,10 +9,10 @@ * @version $Id: $Id */ public class LiquidPhysicalPropertyMethod - extends neqsim.physicalProperties.physicalPropertyMethods.PhysicalPropertyMethod { + extends neqsim.physicalproperties.physicalpropertymethods.PhysicalPropertyMethod { private static final long serialVersionUID = 1000; - protected neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface liquidPhase; + protected neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface liquidPhase; /** *

@@ -28,18 +28,18 @@ public LiquidPhysicalPropertyMethod() { *

* * @param liquidPhase a - * {@link neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface} + * {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface} * object */ public LiquidPhysicalPropertyMethod( - neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface liquidPhase) { + neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface liquidPhase) { this.liquidPhase = liquidPhase; } /** {@inheritDoc} */ @Override public void setPhase( - neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface phase) { + neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface phase) { this.liquidPhase = phase; } } diff --git a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/liquidPhysicalProperties/conductivity/Conductivity.java b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/conductivity/Conductivity.java similarity index 88% rename from src/main/java/neqsim/physicalProperties/physicalPropertyMethods/liquidPhysicalProperties/conductivity/Conductivity.java rename to src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/conductivity/Conductivity.java index 58b08eb240..5bbc006f3e 100644 --- a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/liquidPhysicalProperties/conductivity/Conductivity.java +++ b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/conductivity/Conductivity.java @@ -4,7 +4,7 @@ * Created on 1. november 2000, 19:00 */ -package neqsim.physicalProperties.physicalPropertyMethods.liquidPhysicalProperties.conductivity; +package neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.conductivity; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -18,9 +18,9 @@ * @version $Id: $Id */ public class Conductivity extends - neqsim.physicalProperties.physicalPropertyMethods.liquidPhysicalProperties.LiquidPhysicalPropertyMethod + neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.LiquidPhysicalPropertyMethod implements - neqsim.physicalProperties.physicalPropertyMethods.methodInterface.ConductivityInterface { + neqsim.physicalproperties.physicalpropertymethods.methodinterface.ConductivityInterface { private static final long serialVersionUID = 1000; static Logger logger = LogManager.getLogger(Conductivity.class); @@ -33,11 +33,11 @@ public class Conductivity extends *

* * @param liquidPhase a - * {@link neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface} + * {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface} * object */ public Conductivity( - neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface liquidPhase) { + neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface liquidPhase) { super(liquidPhase); pureComponentConductivity = new double[liquidPhase.getPhase().getNumberOfComponents()]; } diff --git a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/liquidPhysicalProperties/density/Costald.java b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/density/Costald.java similarity index 92% rename from src/main/java/neqsim/physicalProperties/physicalPropertyMethods/liquidPhysicalProperties/density/Costald.java rename to src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/density/Costald.java index c6c712f6d3..697a191e38 100644 --- a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/liquidPhysicalProperties/density/Costald.java +++ b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/density/Costald.java @@ -4,7 +4,7 @@ * Created on 13. July 2022 */ -package neqsim.physicalProperties.physicalPropertyMethods.liquidPhysicalProperties.density; +package neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.density; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -18,8 +18,8 @@ * @version $Id: $Id */ public class Costald extends - neqsim.physicalProperties.physicalPropertyMethods.liquidPhysicalProperties.LiquidPhysicalPropertyMethod - implements neqsim.physicalProperties.physicalPropertyMethods.methodInterface.DensityInterface { + neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.LiquidPhysicalPropertyMethod + implements neqsim.physicalproperties.physicalpropertymethods.methodinterface.DensityInterface { private static final long serialVersionUID = 1000; static Logger logger = LogManager.getLogger(Density.class); @@ -29,11 +29,11 @@ public class Costald extends *

* * @param liquidPhase a - * {@link neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface} + * {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface} * object */ public Costald( - neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface liquidPhase) { + neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface liquidPhase) { this.liquidPhase = liquidPhase; } diff --git a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/liquidPhysicalProperties/density/Density.java b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/density/Density.java similarity index 79% rename from src/main/java/neqsim/physicalProperties/physicalPropertyMethods/liquidPhysicalProperties/density/Density.java rename to src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/density/Density.java index 948744cfd4..dc596dd615 100644 --- a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/liquidPhysicalProperties/density/Density.java +++ b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/density/Density.java @@ -4,7 +4,7 @@ * Created on 24. januar 2001, 19:49 */ -package neqsim.physicalProperties.physicalPropertyMethods.liquidPhysicalProperties.density; +package neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.density; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -18,8 +18,8 @@ * @version $Id: $Id */ public class Density extends - neqsim.physicalProperties.physicalPropertyMethods.liquidPhysicalProperties.LiquidPhysicalPropertyMethod - implements neqsim.physicalProperties.physicalPropertyMethods.methodInterface.DensityInterface { + neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.LiquidPhysicalPropertyMethod + implements neqsim.physicalproperties.physicalpropertymethods.methodinterface.DensityInterface { private static final long serialVersionUID = 1000; static Logger logger = LogManager.getLogger(Density.class); @@ -29,11 +29,11 @@ public class Density extends *

* * @param liquidPhase a - * {@link neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface} + * {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface} * object */ public Density( - neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface liquidPhase) { + neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface liquidPhase) { this.liquidPhase = liquidPhase; } diff --git a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/liquidPhysicalProperties/density/temp b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/density/temp similarity index 100% rename from src/main/java/neqsim/physicalProperties/physicalPropertyMethods/liquidPhysicalProperties/density/temp rename to src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/density/temp diff --git a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/liquidPhysicalProperties/diffusivity/AmineDiffusivity.java b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/diffusivity/AmineDiffusivity.java similarity index 94% rename from src/main/java/neqsim/physicalProperties/physicalPropertyMethods/liquidPhysicalProperties/diffusivity/AmineDiffusivity.java rename to src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/diffusivity/AmineDiffusivity.java index fb490d3b98..0b6dba0470 100644 --- a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/liquidPhysicalProperties/diffusivity/AmineDiffusivity.java +++ b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/diffusivity/AmineDiffusivity.java @@ -1,4 +1,4 @@ -package neqsim.physicalProperties.physicalPropertyMethods.liquidPhysicalProperties.diffusivity; +package neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.diffusivity; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -21,11 +21,11 @@ public class AmineDiffusivity extends SiddiqiLucasMethod { *

* * @param liquidPhase a - * {@link neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface} + * {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface} * object */ public AmineDiffusivity( - neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface liquidPhase) { + neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface liquidPhase) { super(liquidPhase); } diff --git a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/liquidPhysicalProperties/diffusivity/CO2water.java b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/diffusivity/CO2water.java similarity index 77% rename from src/main/java/neqsim/physicalProperties/physicalPropertyMethods/liquidPhysicalProperties/diffusivity/CO2water.java rename to src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/diffusivity/CO2water.java index bb722da797..02808f8cfb 100644 --- a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/liquidPhysicalProperties/diffusivity/CO2water.java +++ b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/diffusivity/CO2water.java @@ -1,4 +1,4 @@ -package neqsim.physicalProperties.physicalPropertyMethods.liquidPhysicalProperties.diffusivity; +package neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.diffusivity; /** *

@@ -17,11 +17,11 @@ public class CO2water extends Diffusivity { *

* * @param liquidPhase a - * {@link neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface} + * {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface} * object */ public CO2water( - neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface liquidPhase) { + neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface liquidPhase) { super(liquidPhase); } diff --git a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/liquidPhysicalProperties/diffusivity/Diffusivity.java b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/diffusivity/Diffusivity.java similarity index 91% rename from src/main/java/neqsim/physicalProperties/physicalPropertyMethods/liquidPhysicalProperties/diffusivity/Diffusivity.java rename to src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/diffusivity/Diffusivity.java index 706aea75e3..3a53137a60 100644 --- a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/liquidPhysicalProperties/diffusivity/Diffusivity.java +++ b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/diffusivity/Diffusivity.java @@ -1,4 +1,4 @@ -package neqsim.physicalProperties.physicalPropertyMethods.liquidPhysicalProperties.diffusivity; +package neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.diffusivity; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -7,9 +7,9 @@ * @author Even Solbraa */ abstract class Diffusivity extends - neqsim.physicalProperties.physicalPropertyMethods.liquidPhysicalProperties.LiquidPhysicalPropertyMethod + neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.LiquidPhysicalPropertyMethod implements - neqsim.physicalProperties.physicalPropertyMethods.methodInterface.DiffusivityInterface { + neqsim.physicalproperties.physicalpropertymethods.methodinterface.DiffusivityInterface { private static final long serialVersionUID = 1000; static Logger logger = LogManager.getLogger(Diffusivity.class); @@ -22,11 +22,11 @@ abstract class Diffusivity extends *

* * @param liquidPhase a - * {@link neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface} + * {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface} * object */ public Diffusivity( - neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface liquidPhase) { + neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface liquidPhase) { super(liquidPhase); binaryDiffusionCoefficients = new double[liquidPhase.getPhase() .getNumberOfComponents()][liquidPhase.getPhase().getNumberOfComponents()]; diff --git a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/liquidPhysicalProperties/diffusivity/SiddiqiLucasMethod.java b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/diffusivity/SiddiqiLucasMethod.java similarity index 90% rename from src/main/java/neqsim/physicalProperties/physicalPropertyMethods/liquidPhysicalProperties/diffusivity/SiddiqiLucasMethod.java rename to src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/diffusivity/SiddiqiLucasMethod.java index 09cbc78722..3c8835b83c 100644 --- a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/liquidPhysicalProperties/diffusivity/SiddiqiLucasMethod.java +++ b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/diffusivity/SiddiqiLucasMethod.java @@ -1,4 +1,4 @@ -package neqsim.physicalProperties.physicalPropertyMethods.liquidPhysicalProperties.diffusivity; +package neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.diffusivity; /** *

@@ -17,11 +17,11 @@ public class SiddiqiLucasMethod extends Diffusivity { *

* * @param liquidPhase a - * {@link neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface} + * {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface} * object */ public SiddiqiLucasMethod( - neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface liquidPhase) { + neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface liquidPhase) { super(liquidPhase); } diff --git a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/liquidPhysicalProperties/viscosity/AmineViscosity.java b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/viscosity/AmineViscosity.java similarity index 85% rename from src/main/java/neqsim/physicalProperties/physicalPropertyMethods/liquidPhysicalProperties/viscosity/AmineViscosity.java rename to src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/viscosity/AmineViscosity.java index b70af1fce9..b50adf31b3 100644 --- a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/liquidPhysicalProperties/viscosity/AmineViscosity.java +++ b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/viscosity/AmineViscosity.java @@ -1,4 +1,4 @@ -package neqsim.physicalProperties.physicalPropertyMethods.liquidPhysicalProperties.viscosity; +package neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.viscosity; /** *

@@ -17,11 +17,11 @@ public class AmineViscosity extends Viscosity { *

* * @param liquidPhase a - * {@link neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface} + * {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface} * object */ public AmineViscosity( - neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface liquidPhase) { + neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface liquidPhase) { super(liquidPhase); } diff --git a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/liquidPhysicalProperties/viscosity/Viscosity.java b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/viscosity/Viscosity.java similarity index 94% rename from src/main/java/neqsim/physicalProperties/physicalPropertyMethods/liquidPhysicalProperties/viscosity/Viscosity.java rename to src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/viscosity/Viscosity.java index 7864760610..1262922079 100644 --- a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/liquidPhysicalProperties/viscosity/Viscosity.java +++ b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/liquidphysicalproperties/viscosity/Viscosity.java @@ -1,4 +1,4 @@ -package neqsim.physicalProperties.physicalPropertyMethods.liquidPhysicalProperties.viscosity; +package neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.viscosity; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -12,9 +12,9 @@ * @version Method was checked on 2.8.2001 - seems to be correct - Even Solbraa */ public class Viscosity extends - neqsim.physicalProperties.physicalPropertyMethods.liquidPhysicalProperties.LiquidPhysicalPropertyMethod + neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.LiquidPhysicalPropertyMethod implements - neqsim.physicalProperties.physicalPropertyMethods.methodInterface.ViscosityInterface { + neqsim.physicalproperties.physicalpropertymethods.methodinterface.ViscosityInterface { private static final long serialVersionUID = 1000; static Logger logger = LogManager.getLogger(Viscosity.class); @@ -26,11 +26,11 @@ public class Viscosity extends *

* * @param liquidPhase a - * {@link neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface} + * {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface} * object */ public Viscosity( - neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface liquidPhase) { + neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface liquidPhase) { super(liquidPhase); pureComponentViscosity = new double[liquidPhase.getPhase().getNumberOfComponents()]; } diff --git a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/methodInterface/ConductivityInterface.java b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/methodinterface/ConductivityInterface.java similarity index 76% rename from src/main/java/neqsim/physicalProperties/physicalPropertyMethods/methodInterface/ConductivityInterface.java rename to src/main/java/neqsim/physicalproperties/physicalpropertymethods/methodinterface/ConductivityInterface.java index d1a17da53f..d12f47a9b5 100644 --- a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/methodInterface/ConductivityInterface.java +++ b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/methodinterface/ConductivityInterface.java @@ -1,4 +1,4 @@ -package neqsim.physicalProperties.physicalPropertyMethods.methodInterface; +package neqsim.physicalproperties.physicalpropertymethods.methodinterface; import neqsim.thermo.ThermodynamicConstantsInterface; @@ -11,7 +11,7 @@ * @version $Id: $Id */ public interface ConductivityInterface extends ThermodynamicConstantsInterface, - neqsim.physicalProperties.physicalPropertyMethods.PhysicalPropertyMethodInterface { + neqsim.physicalproperties.physicalpropertymethods.PhysicalPropertyMethodInterface { /** *

* calcConductivity. diff --git a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/methodInterface/DensityInterface.java b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/methodinterface/DensityInterface.java similarity index 75% rename from src/main/java/neqsim/physicalProperties/physicalPropertyMethods/methodInterface/DensityInterface.java rename to src/main/java/neqsim/physicalproperties/physicalpropertymethods/methodinterface/DensityInterface.java index aa7ec819f7..3a5652e342 100644 --- a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/methodInterface/DensityInterface.java +++ b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/methodinterface/DensityInterface.java @@ -1,4 +1,4 @@ -package neqsim.physicalProperties.physicalPropertyMethods.methodInterface; +package neqsim.physicalproperties.physicalpropertymethods.methodinterface; import neqsim.thermo.ThermodynamicConstantsInterface; @@ -11,7 +11,7 @@ * @version $Id: $Id */ public interface DensityInterface extends ThermodynamicConstantsInterface, - neqsim.physicalProperties.physicalPropertyMethods.PhysicalPropertyMethodInterface { + neqsim.physicalproperties.physicalpropertymethods.PhysicalPropertyMethodInterface { /** *

* calcDensity. diff --git a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/methodInterface/DiffusivityInterface.java b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/methodinterface/DiffusivityInterface.java similarity index 92% rename from src/main/java/neqsim/physicalProperties/physicalPropertyMethods/methodInterface/DiffusivityInterface.java rename to src/main/java/neqsim/physicalproperties/physicalpropertymethods/methodinterface/DiffusivityInterface.java index 7e75bd2b38..93bfb870c9 100644 --- a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/methodInterface/DiffusivityInterface.java +++ b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/methodinterface/DiffusivityInterface.java @@ -1,4 +1,4 @@ -package neqsim.physicalProperties.physicalPropertyMethods.methodInterface; +package neqsim.physicalproperties.physicalpropertymethods.methodinterface; import neqsim.thermo.ThermodynamicConstantsInterface; @@ -11,7 +11,7 @@ * @version $Id: $Id */ public interface DiffusivityInterface extends ThermodynamicConstantsInterface, - neqsim.physicalProperties.physicalPropertyMethods.PhysicalPropertyMethodInterface { + neqsim.physicalproperties.physicalpropertymethods.PhysicalPropertyMethodInterface { /** *

* calcBinaryDiffusionCoefficient. diff --git a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/methodInterface/ViscosityInterface.java b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/methodinterface/ViscosityInterface.java similarity index 78% rename from src/main/java/neqsim/physicalProperties/physicalPropertyMethods/methodInterface/ViscosityInterface.java rename to src/main/java/neqsim/physicalproperties/physicalpropertymethods/methodinterface/ViscosityInterface.java index 766fdbe089..9a55211e5d 100644 --- a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/methodInterface/ViscosityInterface.java +++ b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/methodinterface/ViscosityInterface.java @@ -1,4 +1,4 @@ -package neqsim.physicalProperties.physicalPropertyMethods.methodInterface; +package neqsim.physicalproperties.physicalpropertymethods.methodinterface; /** *

@@ -9,7 +9,7 @@ * @version $Id: $Id */ public interface ViscosityInterface - extends neqsim.physicalProperties.physicalPropertyMethods.PhysicalPropertyMethodInterface { + extends neqsim.physicalproperties.physicalpropertymethods.PhysicalPropertyMethodInterface { /** *

* calcViscosity. diff --git a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/solidPhysicalProperties/SolidPhysicalPropertyMethod.java b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/solidphysicalproperties/SolidPhysicalPropertyMethod.java similarity index 66% rename from src/main/java/neqsim/physicalProperties/physicalPropertyMethods/solidPhysicalProperties/SolidPhysicalPropertyMethod.java rename to src/main/java/neqsim/physicalproperties/physicalpropertymethods/solidphysicalproperties/SolidPhysicalPropertyMethod.java index 3fb9822fc2..715439dd78 100644 --- a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/solidPhysicalProperties/SolidPhysicalPropertyMethod.java +++ b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/solidphysicalproperties/SolidPhysicalPropertyMethod.java @@ -1,4 +1,4 @@ -package neqsim.physicalProperties.physicalPropertyMethods.solidPhysicalProperties; +package neqsim.physicalproperties.physicalpropertymethods.solidphysicalproperties; /** *

@@ -9,10 +9,10 @@ * @version $Id: $Id */ public class SolidPhysicalPropertyMethod - extends neqsim.physicalProperties.physicalPropertyMethods.PhysicalPropertyMethod { + extends neqsim.physicalproperties.physicalpropertymethods.PhysicalPropertyMethod { private static final long serialVersionUID = 1000; - protected neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface solidPhase; + protected neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface solidPhase; /** *

@@ -28,18 +28,18 @@ public SolidPhysicalPropertyMethod() { *

* * @param solidPhase a - * {@link neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface} + * {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface} * object */ public SolidPhysicalPropertyMethod( - neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface solidPhase) { + neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface solidPhase) { this.solidPhase = solidPhase; } /** {@inheritDoc} */ @Override public void setPhase( - neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface solidPhase) { + neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface solidPhase) { this.solidPhase = solidPhase; } } diff --git a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/solidPhysicalProperties/conductivity/Conductivity.java b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/solidphysicalproperties/conductivity/Conductivity.java similarity index 76% rename from src/main/java/neqsim/physicalProperties/physicalPropertyMethods/solidPhysicalProperties/conductivity/Conductivity.java rename to src/main/java/neqsim/physicalproperties/physicalpropertymethods/solidphysicalproperties/conductivity/Conductivity.java index a89ec646c0..c6ffade174 100644 --- a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/solidPhysicalProperties/conductivity/Conductivity.java +++ b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/solidphysicalproperties/conductivity/Conductivity.java @@ -4,7 +4,7 @@ * Created on 1. november 2000, 19:00 */ -package neqsim.physicalProperties.physicalPropertyMethods.solidPhysicalProperties.conductivity; +package neqsim.physicalproperties.physicalpropertymethods.solidphysicalproperties.conductivity; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -19,9 +19,9 @@ * @version $Id: $Id */ public class Conductivity extends - neqsim.physicalProperties.physicalPropertyMethods.solidPhysicalProperties.SolidPhysicalPropertyMethod + neqsim.physicalproperties.physicalpropertymethods.solidphysicalproperties.SolidPhysicalPropertyMethod implements - neqsim.physicalProperties.physicalPropertyMethods.methodInterface.ConductivityInterface { + neqsim.physicalproperties.physicalpropertymethods.methodinterface.ConductivityInterface { private static final long serialVersionUID = 1000; static Logger logger = LogManager.getLogger(Conductivity.class); @@ -33,11 +33,11 @@ public class Conductivity extends *

* * @param solidPhase a - * {@link neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface} + * {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface} * object */ public Conductivity( - neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface solidPhase) { + neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface solidPhase) { super(solidPhase); } diff --git a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/solidPhysicalProperties/density/Density.java b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/solidphysicalproperties/density/Density.java similarity index 79% rename from src/main/java/neqsim/physicalProperties/physicalPropertyMethods/solidPhysicalProperties/density/Density.java rename to src/main/java/neqsim/physicalproperties/physicalpropertymethods/solidphysicalproperties/density/Density.java index 58beccc06c..741d2a6ba3 100644 --- a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/solidPhysicalProperties/density/Density.java +++ b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/solidphysicalproperties/density/Density.java @@ -4,7 +4,7 @@ * Created on 24. januar 2001, 19:49 */ -package neqsim.physicalProperties.physicalPropertyMethods.solidPhysicalProperties.density; +package neqsim.physicalproperties.physicalpropertymethods.solidphysicalproperties.density; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -18,8 +18,8 @@ * @version $Id: $Id */ public class Density extends - neqsim.physicalProperties.physicalPropertyMethods.solidPhysicalProperties.SolidPhysicalPropertyMethod - implements neqsim.physicalProperties.physicalPropertyMethods.methodInterface.DensityInterface { + neqsim.physicalproperties.physicalpropertymethods.solidphysicalproperties.SolidPhysicalPropertyMethod + implements neqsim.physicalproperties.physicalpropertymethods.methodinterface.DensityInterface { private static final long serialVersionUID = 1000; static Logger logger = LogManager.getLogger(Density.class); @@ -29,11 +29,11 @@ public class Density extends *

* * @param liquidPhase a - * {@link neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface} + * {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface} * object */ public Density( - neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface liquidPhase) { + neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface liquidPhase) { this.solidPhase = liquidPhase; } diff --git a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/solidPhysicalProperties/diffusivity/Diffusivity.java b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/solidphysicalproperties/diffusivity/Diffusivity.java similarity index 87% rename from src/main/java/neqsim/physicalProperties/physicalPropertyMethods/solidPhysicalProperties/diffusivity/Diffusivity.java rename to src/main/java/neqsim/physicalproperties/physicalpropertymethods/solidphysicalproperties/diffusivity/Diffusivity.java index 2502ee93cf..5652090482 100644 --- a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/solidPhysicalProperties/diffusivity/Diffusivity.java +++ b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/solidphysicalproperties/diffusivity/Diffusivity.java @@ -1,4 +1,4 @@ -package neqsim.physicalProperties.physicalPropertyMethods.solidPhysicalProperties.diffusivity; +package neqsim.physicalproperties.physicalpropertymethods.solidphysicalproperties.diffusivity; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -12,9 +12,9 @@ * @version $Id: $Id */ public class Diffusivity extends - neqsim.physicalProperties.physicalPropertyMethods.solidPhysicalProperties.SolidPhysicalPropertyMethod + neqsim.physicalproperties.physicalpropertymethods.solidphysicalproperties.SolidPhysicalPropertyMethod implements - neqsim.physicalProperties.physicalPropertyMethods.methodInterface.DiffusivityInterface { + neqsim.physicalproperties.physicalpropertymethods.methodinterface.DiffusivityInterface { private static final long serialVersionUID = 1000; static Logger logger = LogManager.getLogger(Diffusivity.class); @@ -27,11 +27,11 @@ public class Diffusivity extends *

* * @param solidPhase a - * {@link neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface} + * {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface} * object */ public Diffusivity( - neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface solidPhase) { + neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface solidPhase) { super(solidPhase); binaryDiffusionCoefficients = new double[solidPhase.getPhase() .getNumberOfComponents()][solidPhase.getPhase().getNumberOfComponents()]; diff --git a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/solidPhysicalProperties/viscosity/Viscosity.java b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/solidphysicalproperties/viscosity/Viscosity.java similarity index 79% rename from src/main/java/neqsim/physicalProperties/physicalPropertyMethods/solidPhysicalProperties/viscosity/Viscosity.java rename to src/main/java/neqsim/physicalproperties/physicalpropertymethods/solidphysicalproperties/viscosity/Viscosity.java index 93bff59a7c..fa76ffcdfc 100644 --- a/src/main/java/neqsim/physicalProperties/physicalPropertyMethods/solidPhysicalProperties/viscosity/Viscosity.java +++ b/src/main/java/neqsim/physicalproperties/physicalpropertymethods/solidphysicalproperties/viscosity/Viscosity.java @@ -1,4 +1,4 @@ -package neqsim.physicalProperties.physicalPropertyMethods.solidPhysicalProperties.viscosity; +package neqsim.physicalproperties.physicalpropertymethods.solidphysicalproperties.viscosity; import static java.lang.Double.NaN; import org.apache.logging.log4j.LogManager; @@ -13,9 +13,9 @@ * @version Method was checked on 2.8.2001 - seems to be correct - Even Solbraa */ public class Viscosity extends - neqsim.physicalProperties.physicalPropertyMethods.solidPhysicalProperties.SolidPhysicalPropertyMethod + neqsim.physicalproperties.physicalpropertymethods.solidphysicalproperties.SolidPhysicalPropertyMethod implements - neqsim.physicalProperties.physicalPropertyMethods.methodInterface.ViscosityInterface { + neqsim.physicalproperties.physicalpropertymethods.methodinterface.ViscosityInterface { private static final long serialVersionUID = 1000; static Logger logger = LogManager.getLogger(Viscosity.class); @@ -27,11 +27,11 @@ public class Viscosity extends *

* * @param solidPhase a - * {@link neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface} + * {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface} * object */ public Viscosity( - neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface solidPhase) { + neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface solidPhase) { super(solidPhase); } diff --git a/src/main/java/neqsim/physicalProperties/physicalPropertySystem/PhysicalProperties.java b/src/main/java/neqsim/physicalproperties/physicalpropertysystem/PhysicalProperties.java similarity index 80% rename from src/main/java/neqsim/physicalProperties/physicalPropertySystem/PhysicalProperties.java rename to src/main/java/neqsim/physicalproperties/physicalpropertysystem/PhysicalProperties.java index f3a7ae045a..d55ca97f29 100644 --- a/src/main/java/neqsim/physicalProperties/physicalPropertySystem/PhysicalProperties.java +++ b/src/main/java/neqsim/physicalproperties/physicalpropertysystem/PhysicalProperties.java @@ -4,21 +4,21 @@ * Created on 29. oktober 2000, 16:13 */ -package neqsim.physicalProperties.physicalPropertySystem; +package neqsim.physicalproperties.physicalpropertysystem; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.physicalProperties.physicalPropertyMethods.commonPhasePhysicalProperties.conductivity.PFCTConductivityMethodMod86; -import neqsim.physicalProperties.physicalPropertyMethods.commonPhasePhysicalProperties.diffusivity.CorrespondingStatesDiffusivity; -import neqsim.physicalProperties.physicalPropertyMethods.commonPhasePhysicalProperties.viscosity.FrictionTheoryViscosityMethod; -import neqsim.physicalProperties.physicalPropertyMethods.commonPhasePhysicalProperties.viscosity.LBCViscosityMethod; -import neqsim.physicalProperties.physicalPropertyMethods.commonPhasePhysicalProperties.viscosity.PFCTViscosityMethodHeavyOil; -import neqsim.physicalProperties.physicalPropertyMethods.commonPhasePhysicalProperties.viscosity.PFCTViscosityMethodMod86; -import neqsim.physicalProperties.physicalPropertyMethods.gasPhysicalProperties.conductivity.ChungConductivityMethod; -import neqsim.physicalProperties.physicalPropertyMethods.gasPhysicalProperties.diffusivity.WilkeLeeDiffusivity; -import neqsim.physicalProperties.physicalPropertyMethods.liquidPhysicalProperties.diffusivity.AmineDiffusivity; -import neqsim.physicalProperties.physicalPropertyMethods.liquidPhysicalProperties.diffusivity.SiddiqiLucasMethod; -import neqsim.physicalProperties.physicalPropertyMethods.methodInterface.ConductivityInterface; +import neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties.conductivity.PFCTConductivityMethodMod86; +import neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties.diffusivity.CorrespondingStatesDiffusivity; +import neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties.viscosity.FrictionTheoryViscosityMethod; +import neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties.viscosity.LBCViscosityMethod; +import neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties.viscosity.PFCTViscosityMethodHeavyOil; +import neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties.viscosity.PFCTViscosityMethodMod86; +import neqsim.physicalproperties.physicalpropertymethods.gasphysicalproperties.conductivity.ChungConductivityMethod; +import neqsim.physicalproperties.physicalpropertymethods.gasphysicalproperties.diffusivity.WilkeLeeDiffusivity; +import neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.diffusivity.AmineDiffusivity; +import neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.diffusivity.SiddiqiLucasMethod; +import neqsim.physicalproperties.physicalpropertymethods.methodinterface.ConductivityInterface; import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.phase.PhaseInterface; @@ -38,12 +38,12 @@ public abstract class PhysicalProperties public PhaseInterface phase; protected int binaryDiffusionCoefficientMethod; protected int multicomponentDiffusionMethod; - private neqsim.physicalProperties.mixingRule.PhysicalPropertyMixingRuleInterface mixingRule = + private neqsim.physicalproperties.mixingrule.PhysicalPropertyMixingRuleInterface mixingRule = null; - public neqsim.physicalProperties.physicalPropertyMethods.methodInterface.ConductivityInterface conductivityCalc; - public neqsim.physicalProperties.physicalPropertyMethods.methodInterface.ViscosityInterface viscosityCalc; - public neqsim.physicalProperties.physicalPropertyMethods.methodInterface.DiffusivityInterface diffusivityCalc; - public neqsim.physicalProperties.physicalPropertyMethods.methodInterface.DensityInterface densityCalc; + public neqsim.physicalproperties.physicalpropertymethods.methodinterface.ConductivityInterface conductivityCalc; + public neqsim.physicalproperties.physicalpropertymethods.methodinterface.ViscosityInterface viscosityCalc; + public neqsim.physicalproperties.physicalpropertymethods.methodinterface.DiffusivityInterface diffusivityCalc; + public neqsim.physicalproperties.physicalpropertymethods.methodinterface.DensityInterface densityCalc; public double kinematicViscosity = 0; public double density = 0; public double viscosity = 0; @@ -105,14 +105,14 @@ public PhaseInterface getPhase() { /** {@inheritDoc} */ @Override - public neqsim.physicalProperties.mixingRule.PhysicalPropertyMixingRuleInterface getMixingRule() { + public neqsim.physicalproperties.mixingrule.PhysicalPropertyMixingRuleInterface getMixingRule() { return mixingRule; } /** {@inheritDoc} */ @Override public void setMixingRule( - neqsim.physicalProperties.mixingRule.PhysicalPropertyMixingRuleInterface mixingRule) { + neqsim.physicalproperties.mixingrule.PhysicalPropertyMixingRuleInterface mixingRule) { this.mixingRule = mixingRule; } @@ -124,7 +124,7 @@ public void setMixingRuleNull() { /** {@inheritDoc} */ @Override - public neqsim.physicalProperties.physicalPropertyMethods.methodInterface.ViscosityInterface getViscosityModel() { + public neqsim.physicalproperties.physicalpropertymethods.methodinterface.ViscosityInterface getViscosityModel() { return viscosityCalc; } @@ -133,11 +133,11 @@ public neqsim.physicalProperties.physicalPropertyMethods.methodInterface.Viscosi public void setDensityModel(String model) { if ("Peneloux volume shift".equals(model)) { densityCalc = - new neqsim.physicalProperties.physicalPropertyMethods.liquidPhysicalProperties.density.Density( + new neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.density.Density( this); } else if ("Costald".equals(model)) { densityCalc = - new neqsim.physicalProperties.physicalPropertyMethods.liquidPhysicalProperties.density.Costald( + new neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.density.Costald( this); } } @@ -149,7 +149,7 @@ public void setConductivityModel(String model) { conductivityCalc = new PFCTConductivityMethodMod86(this); } else if ("polynom".equals(model)) { conductivityCalc = - new neqsim.physicalProperties.physicalPropertyMethods.liquidPhysicalProperties.conductivity.Conductivity( + new neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.conductivity.Conductivity( this); } else if ("Chung".equals(model)) { conductivityCalc = new ChungConductivityMethod(this); @@ -163,7 +163,7 @@ public void setConductivityModel(String model) { public void setViscosityModel(String model) { if ("polynom".equals(model)) { viscosityCalc = - new neqsim.physicalProperties.physicalPropertyMethods.liquidPhysicalProperties.viscosity.Viscosity( + new neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.viscosity.Viscosity( this); } else if ("friction theory".equals(model)) { viscosityCalc = new FrictionTheoryViscosityMethod(this); diff --git a/src/main/java/neqsim/physicalProperties/physicalPropertySystem/PhysicalPropertiesInterface.java b/src/main/java/neqsim/physicalproperties/physicalpropertysystem/PhysicalPropertiesInterface.java similarity index 84% rename from src/main/java/neqsim/physicalProperties/physicalPropertySystem/PhysicalPropertiesInterface.java rename to src/main/java/neqsim/physicalproperties/physicalpropertysystem/PhysicalPropertiesInterface.java index 7918ba1b21..c1219bda6e 100644 --- a/src/main/java/neqsim/physicalProperties/physicalPropertySystem/PhysicalPropertiesInterface.java +++ b/src/main/java/neqsim/physicalproperties/physicalpropertysystem/PhysicalPropertiesInterface.java @@ -4,7 +4,7 @@ * Created on 29. oktober 2000, 16:14 */ -package neqsim.physicalProperties.physicalPropertySystem; +package neqsim.physicalproperties.physicalpropertysystem; import neqsim.thermo.phase.PhaseInterface; @@ -42,20 +42,20 @@ public interface PhysicalPropertiesInterface extends Cloneable { *

* * @param mixingRule a - * {@link neqsim.physicalProperties.mixingRule.PhysicalPropertyMixingRuleInterface} object + * {@link neqsim.physicalproperties.mixingrule.PhysicalPropertyMixingRuleInterface} object */ public void setMixingRule( - neqsim.physicalProperties.mixingRule.PhysicalPropertyMixingRuleInterface mixingRule); + neqsim.physicalproperties.mixingrule.PhysicalPropertyMixingRuleInterface mixingRule); /** *

* getMixingRule. *

* - * @return a {@link neqsim.physicalProperties.mixingRule.PhysicalPropertyMixingRuleInterface} + * @return a {@link neqsim.physicalproperties.mixingrule.PhysicalPropertyMixingRuleInterface} * object */ - public neqsim.physicalProperties.mixingRule.PhysicalPropertyMixingRuleInterface getMixingRule(); + public neqsim.physicalproperties.mixingrule.PhysicalPropertyMixingRuleInterface getMixingRule(); /** *

@@ -250,7 +250,7 @@ public void setMixingRule( * clone. *

* - * @return a {@link neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface} + * @return a {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface} * object */ public PhysicalPropertiesInterface clone(); @@ -279,10 +279,10 @@ public void setMixingRule( *

* * @return a - * {@link neqsim.physicalProperties.physicalPropertyMethods.methodInterface.ViscosityInterface} + * {@link neqsim.physicalproperties.physicalpropertymethods.methodinterface.ViscosityInterface} * object */ - public neqsim.physicalProperties.physicalPropertyMethods.methodInterface.ViscosityInterface getViscosityModel(); + public neqsim.physicalproperties.physicalpropertymethods.methodinterface.ViscosityInterface getViscosityModel(); /** *

@@ -290,8 +290,8 @@ public void setMixingRule( *

* * @return a - * {@link neqsim.physicalProperties.physicalPropertyMethods.methodInterface.ConductivityInterface} + * {@link neqsim.physicalproperties.physicalpropertymethods.methodinterface.ConductivityInterface} * object */ - public neqsim.physicalProperties.physicalPropertyMethods.methodInterface.ConductivityInterface getConductivityModel(); + public neqsim.physicalproperties.physicalpropertymethods.methodinterface.ConductivityInterface getConductivityModel(); } diff --git a/src/main/java/neqsim/physicalProperties/physicalPropertySystem/commonPhasePhysicalProperties/DefaultPhysicalProperties.java b/src/main/java/neqsim/physicalproperties/physicalpropertysystem/commonphasephysicalproperties/DefaultPhysicalProperties.java similarity index 64% rename from src/main/java/neqsim/physicalProperties/physicalPropertySystem/commonPhasePhysicalProperties/DefaultPhysicalProperties.java rename to src/main/java/neqsim/physicalproperties/physicalpropertysystem/commonphasephysicalproperties/DefaultPhysicalProperties.java index a99c993418..84d22796a1 100644 --- a/src/main/java/neqsim/physicalProperties/physicalPropertySystem/commonPhasePhysicalProperties/DefaultPhysicalProperties.java +++ b/src/main/java/neqsim/physicalproperties/physicalpropertysystem/commonphasephysicalproperties/DefaultPhysicalProperties.java @@ -1,9 +1,9 @@ -package neqsim.physicalProperties.physicalPropertySystem.commonPhasePhysicalProperties; +package neqsim.physicalproperties.physicalpropertysystem.commonphasephysicalproperties; -import neqsim.physicalProperties.physicalPropertyMethods.commonPhasePhysicalProperties.conductivity.PFCTConductivityMethodMod86; -import neqsim.physicalProperties.physicalPropertyMethods.commonPhasePhysicalProperties.diffusivity.CorrespondingStatesDiffusivity; -import neqsim.physicalProperties.physicalPropertyMethods.commonPhasePhysicalProperties.viscosity.FrictionTheoryViscosityMethod; -import neqsim.physicalProperties.physicalPropertySystem.PhysicalProperties; +import neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties.conductivity.PFCTConductivityMethodMod86; +import neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties.diffusivity.CorrespondingStatesDiffusivity; +import neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties.viscosity.FrictionTheoryViscosityMethod; +import neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties; import neqsim.thermo.phase.PhaseInterface; /** @@ -37,7 +37,7 @@ public DefaultPhysicalProperties(PhaseInterface phase, int binaryDiffusionCoeffi viscosityCalc = new FrictionTheoryViscosityMethod(this); diffusivityCalc = new CorrespondingStatesDiffusivity(this); densityCalc = - new neqsim.physicalProperties.physicalPropertyMethods.gasPhysicalProperties.density.Density( + new neqsim.physicalproperties.physicalpropertymethods.gasphysicalproperties.density.Density( this); this.init(phase); } diff --git a/src/main/java/neqsim/physicalProperties/physicalPropertySystem/gasPhysicalProperties/AirPhysicalProperties.java b/src/main/java/neqsim/physicalproperties/physicalpropertysystem/gasphysicalproperties/AirPhysicalProperties.java similarity index 67% rename from src/main/java/neqsim/physicalProperties/physicalPropertySystem/gasPhysicalProperties/AirPhysicalProperties.java rename to src/main/java/neqsim/physicalproperties/physicalpropertysystem/gasphysicalproperties/AirPhysicalProperties.java index a556c69f75..99535368ca 100644 --- a/src/main/java/neqsim/physicalProperties/physicalPropertySystem/gasPhysicalProperties/AirPhysicalProperties.java +++ b/src/main/java/neqsim/physicalproperties/physicalpropertysystem/gasphysicalproperties/AirPhysicalProperties.java @@ -4,10 +4,10 @@ * Created on 13. august 2001, 10:34 */ -package neqsim.physicalProperties.physicalPropertySystem.gasPhysicalProperties; +package neqsim.physicalproperties.physicalpropertysystem.gasphysicalproperties; -import neqsim.physicalProperties.physicalPropertyMethods.gasPhysicalProperties.conductivity.ChungConductivityMethod; -import neqsim.physicalProperties.physicalPropertyMethods.gasPhysicalProperties.viscosity.ChungViscosityMethod; +import neqsim.physicalproperties.physicalpropertymethods.gasphysicalproperties.conductivity.ChungConductivityMethod; +import neqsim.physicalproperties.physicalpropertymethods.gasphysicalproperties.viscosity.ChungViscosityMethod; import neqsim.thermo.phase.PhaseInterface; /** @@ -36,12 +36,12 @@ public AirPhysicalProperties(PhaseInterface phase, int binaryDiffusionCoefficien conductivityCalc = new ChungConductivityMethod(this); viscosityCalc = new ChungViscosityMethod(this); diffusivityCalc = - new neqsim.physicalProperties.physicalPropertyMethods.gasPhysicalProperties.diffusivity.Diffusivity( + new neqsim.physicalproperties.physicalpropertymethods.gasphysicalproperties.diffusivity.Diffusivity( this); // diffusivityCalc = new WilkeLeeDiffusivity(this); densityCalc = - new neqsim.physicalProperties.physicalPropertyMethods.gasPhysicalProperties.density.Density( + new neqsim.physicalproperties.physicalpropertymethods.gasphysicalproperties.density.Density( this); this.init(phase); } diff --git a/src/main/java/neqsim/physicalProperties/physicalPropertySystem/gasPhysicalProperties/GasPhysicalProperties.java b/src/main/java/neqsim/physicalproperties/physicalpropertysystem/gasphysicalproperties/GasPhysicalProperties.java similarity index 75% rename from src/main/java/neqsim/physicalProperties/physicalPropertySystem/gasPhysicalProperties/GasPhysicalProperties.java rename to src/main/java/neqsim/physicalproperties/physicalpropertysystem/gasphysicalproperties/GasPhysicalProperties.java index 8cc3052d4d..3c11c11ed5 100644 --- a/src/main/java/neqsim/physicalProperties/physicalPropertySystem/gasPhysicalProperties/GasPhysicalProperties.java +++ b/src/main/java/neqsim/physicalproperties/physicalpropertysystem/gasphysicalproperties/GasPhysicalProperties.java @@ -4,12 +4,12 @@ * Created on 29. oktober 2000, 16:18 */ -package neqsim.physicalProperties.physicalPropertySystem.gasPhysicalProperties; +package neqsim.physicalproperties.physicalpropertysystem.gasphysicalproperties; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.physicalProperties.physicalPropertyMethods.commonPhasePhysicalProperties.conductivity.PFCTConductivityMethodMod86; -import neqsim.physicalProperties.physicalPropertyMethods.commonPhasePhysicalProperties.viscosity.PFCTViscosityMethodHeavyOil; +import neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties.conductivity.PFCTConductivityMethodMod86; +import neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties.viscosity.PFCTViscosityMethodHeavyOil; import neqsim.thermo.phase.PhaseInterface; /** @@ -21,7 +21,7 @@ * @version $Id: $Id */ public class GasPhysicalProperties - extends neqsim.physicalProperties.physicalPropertySystem.PhysicalProperties { + extends neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties { private static final long serialVersionUID = 1000; static Logger logger = LogManager.getLogger(GasPhysicalProperties.class); @@ -46,11 +46,11 @@ public GasPhysicalProperties(PhaseInterface phase, int binaryDiffusionCoefficien // viscosityCalc = new LBCViscosityMethod(this); diffusivityCalc = - new neqsim.physicalProperties.physicalPropertyMethods.gasPhysicalProperties.diffusivity.Diffusivity( + new neqsim.physicalproperties.physicalpropertymethods.gasphysicalproperties.diffusivity.Diffusivity( this); // diffusivityCalc = new WilkeLeeDiffusivity(this); densityCalc = - new neqsim.physicalProperties.physicalPropertyMethods.gasPhysicalProperties.density.Density( + new neqsim.physicalproperties.physicalpropertymethods.gasphysicalproperties.density.Density( this); // this.init(phase); } diff --git a/src/main/java/neqsim/physicalProperties/physicalPropertySystem/gasPhysicalProperties/NaturalGasPhysicalProperties.java b/src/main/java/neqsim/physicalproperties/physicalpropertysystem/gasphysicalproperties/NaturalGasPhysicalProperties.java similarity index 69% rename from src/main/java/neqsim/physicalProperties/physicalPropertySystem/gasPhysicalProperties/NaturalGasPhysicalProperties.java rename to src/main/java/neqsim/physicalproperties/physicalpropertysystem/gasphysicalproperties/NaturalGasPhysicalProperties.java index d96d5807d4..e6568690ec 100644 --- a/src/main/java/neqsim/physicalProperties/physicalPropertySystem/gasPhysicalProperties/NaturalGasPhysicalProperties.java +++ b/src/main/java/neqsim/physicalproperties/physicalpropertysystem/gasphysicalproperties/NaturalGasPhysicalProperties.java @@ -4,10 +4,10 @@ * Created on 13. august 2001, 10:32 */ -package neqsim.physicalProperties.physicalPropertySystem.gasPhysicalProperties; +package neqsim.physicalproperties.physicalpropertysystem.gasphysicalproperties; -import neqsim.physicalProperties.physicalPropertyMethods.gasPhysicalProperties.conductivity.ChungConductivityMethod; -import neqsim.physicalProperties.physicalPropertyMethods.gasPhysicalProperties.viscosity.ChungViscosityMethod; +import neqsim.physicalproperties.physicalpropertymethods.gasphysicalproperties.conductivity.ChungConductivityMethod; +import neqsim.physicalproperties.physicalpropertymethods.gasphysicalproperties.viscosity.ChungViscosityMethod; import neqsim.thermo.phase.PhaseInterface; /** @@ -37,12 +37,12 @@ public NaturalGasPhysicalProperties(PhaseInterface phase, int binaryDiffusionCoe viscosityCalc = new ChungViscosityMethod(this); // viscosityCalc = new PFCTViscosityMethodMod86(this); diffusivityCalc = - new neqsim.physicalProperties.physicalPropertyMethods.gasPhysicalProperties.diffusivity.Diffusivity( + new neqsim.physicalproperties.physicalpropertymethods.gasphysicalproperties.diffusivity.Diffusivity( this); // diffusivityCalc = new WilkeLeeDiffusivity(this); densityCalc = - new neqsim.physicalProperties.physicalPropertyMethods.gasPhysicalProperties.density.Density( + new neqsim.physicalproperties.physicalpropertymethods.gasphysicalproperties.density.Density( this); this.init(phase); } diff --git a/src/main/java/neqsim/physicalProperties/physicalPropertySystem/liquidPhysicalProperties/AminePhysicalProperties.java b/src/main/java/neqsim/physicalproperties/physicalpropertysystem/liquidphysicalproperties/AminePhysicalProperties.java similarity index 66% rename from src/main/java/neqsim/physicalProperties/physicalPropertySystem/liquidPhysicalProperties/AminePhysicalProperties.java rename to src/main/java/neqsim/physicalproperties/physicalpropertysystem/liquidphysicalproperties/AminePhysicalProperties.java index 635ec2378f..9fcb1c01eb 100644 --- a/src/main/java/neqsim/physicalProperties/physicalPropertySystem/liquidPhysicalProperties/AminePhysicalProperties.java +++ b/src/main/java/neqsim/physicalproperties/physicalpropertysystem/liquidphysicalproperties/AminePhysicalProperties.java @@ -4,12 +4,12 @@ * Created on 13. august 2001, 10:31 */ -package neqsim.physicalProperties.physicalPropertySystem.liquidPhysicalProperties; +package neqsim.physicalproperties.physicalpropertysystem.liquidphysicalproperties; -import neqsim.physicalProperties.physicalPropertyMethods.gasPhysicalProperties.density.Density; -import neqsim.physicalProperties.physicalPropertyMethods.liquidPhysicalProperties.conductivity.Conductivity; -import neqsim.physicalProperties.physicalPropertyMethods.liquidPhysicalProperties.diffusivity.AmineDiffusivity; -import neqsim.physicalProperties.physicalPropertyMethods.liquidPhysicalProperties.viscosity.AmineViscosity; +import neqsim.physicalproperties.physicalpropertymethods.gasphysicalproperties.density.Density; +import neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.conductivity.Conductivity; +import neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.diffusivity.AmineDiffusivity; +import neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.viscosity.AmineViscosity; import neqsim.thermo.phase.PhaseInterface; /** diff --git a/src/main/java/neqsim/physicalProperties/physicalPropertySystem/liquidPhysicalProperties/CO2waterPhysicalProperties.java b/src/main/java/neqsim/physicalproperties/physicalpropertysystem/liquidphysicalproperties/CO2waterPhysicalProperties.java similarity index 71% rename from src/main/java/neqsim/physicalProperties/physicalPropertySystem/liquidPhysicalProperties/CO2waterPhysicalProperties.java rename to src/main/java/neqsim/physicalproperties/physicalpropertysystem/liquidphysicalproperties/CO2waterPhysicalProperties.java index c741a68bf7..d2c30b0087 100644 --- a/src/main/java/neqsim/physicalProperties/physicalPropertySystem/liquidPhysicalProperties/CO2waterPhysicalProperties.java +++ b/src/main/java/neqsim/physicalproperties/physicalpropertysystem/liquidphysicalproperties/CO2waterPhysicalProperties.java @@ -1,11 +1,11 @@ -package neqsim.physicalProperties.physicalPropertySystem.liquidPhysicalProperties; +package neqsim.physicalproperties.physicalpropertysystem.liquidphysicalproperties; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.physicalProperties.physicalPropertyMethods.liquidPhysicalProperties.conductivity.Conductivity; -import neqsim.physicalProperties.physicalPropertyMethods.liquidPhysicalProperties.density.Density; -import neqsim.physicalProperties.physicalPropertyMethods.liquidPhysicalProperties.diffusivity.CO2water; -import neqsim.physicalProperties.physicalPropertyMethods.liquidPhysicalProperties.viscosity.Viscosity; +import neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.conductivity.Conductivity; +import neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.density.Density; +import neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.diffusivity.CO2water; +import neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.viscosity.Viscosity; import neqsim.thermo.phase.PhaseInterface; /** @@ -17,7 +17,7 @@ * @version $Id: $Id */ public class CO2waterPhysicalProperties - extends neqsim.physicalProperties.physicalPropertySystem.PhysicalProperties { + extends neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties { private static final long serialVersionUID = 1000; static Logger logger = LogManager.getLogger(CO2waterPhysicalProperties.class); diff --git a/src/main/java/neqsim/physicalProperties/physicalPropertySystem/liquidPhysicalProperties/GlycolPhysicalProperties.java b/src/main/java/neqsim/physicalproperties/physicalpropertysystem/liquidphysicalproperties/GlycolPhysicalProperties.java similarity index 66% rename from src/main/java/neqsim/physicalProperties/physicalPropertySystem/liquidPhysicalProperties/GlycolPhysicalProperties.java rename to src/main/java/neqsim/physicalproperties/physicalpropertysystem/liquidphysicalproperties/GlycolPhysicalProperties.java index efc3e52c79..fc6fd30b84 100644 --- a/src/main/java/neqsim/physicalProperties/physicalPropertySystem/liquidPhysicalProperties/GlycolPhysicalProperties.java +++ b/src/main/java/neqsim/physicalproperties/physicalpropertysystem/liquidphysicalproperties/GlycolPhysicalProperties.java @@ -4,12 +4,12 @@ * Created on 13. august 2001, 10:31 */ -package neqsim.physicalProperties.physicalPropertySystem.liquidPhysicalProperties; +package neqsim.physicalproperties.physicalpropertysystem.liquidphysicalproperties; -import neqsim.physicalProperties.physicalPropertyMethods.liquidPhysicalProperties.conductivity.Conductivity; -import neqsim.physicalProperties.physicalPropertyMethods.liquidPhysicalProperties.density.Density; -import neqsim.physicalProperties.physicalPropertyMethods.liquidPhysicalProperties.diffusivity.SiddiqiLucasMethod; -import neqsim.physicalProperties.physicalPropertyMethods.liquidPhysicalProperties.viscosity.Viscosity; +import neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.conductivity.Conductivity; +import neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.density.Density; +import neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.diffusivity.SiddiqiLucasMethod; +import neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.viscosity.Viscosity; import neqsim.thermo.phase.PhaseInterface; /** diff --git a/src/main/java/neqsim/physicalProperties/physicalPropertySystem/liquidPhysicalProperties/LiquidPhysicalProperties.java b/src/main/java/neqsim/physicalproperties/physicalpropertysystem/liquidphysicalproperties/LiquidPhysicalProperties.java similarity index 74% rename from src/main/java/neqsim/physicalProperties/physicalPropertySystem/liquidPhysicalProperties/LiquidPhysicalProperties.java rename to src/main/java/neqsim/physicalproperties/physicalpropertysystem/liquidphysicalproperties/LiquidPhysicalProperties.java index 38d6279249..9dc8a20413 100644 --- a/src/main/java/neqsim/physicalProperties/physicalPropertySystem/liquidPhysicalProperties/LiquidPhysicalProperties.java +++ b/src/main/java/neqsim/physicalproperties/physicalpropertysystem/liquidphysicalproperties/LiquidPhysicalProperties.java @@ -4,14 +4,14 @@ * Created on 29. oktober 2000, 16:17 */ -package neqsim.physicalProperties.physicalPropertySystem.liquidPhysicalProperties; +package neqsim.physicalproperties.physicalpropertysystem.liquidphysicalproperties; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.physicalProperties.physicalPropertyMethods.commonPhasePhysicalProperties.conductivity.PFCTConductivityMethodMod86; -import neqsim.physicalProperties.physicalPropertyMethods.commonPhasePhysicalProperties.viscosity.PFCTViscosityMethodHeavyOil; -import neqsim.physicalProperties.physicalPropertyMethods.liquidPhysicalProperties.density.Density; -import neqsim.physicalProperties.physicalPropertyMethods.liquidPhysicalProperties.diffusivity.SiddiqiLucasMethod; +import neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties.conductivity.PFCTConductivityMethodMod86; +import neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties.viscosity.PFCTViscosityMethodHeavyOil; +import neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.density.Density; +import neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.diffusivity.SiddiqiLucasMethod; import neqsim.thermo.phase.PhaseInterface; /** @@ -23,7 +23,7 @@ * @version $Id: $Id */ public class LiquidPhysicalProperties - extends neqsim.physicalProperties.physicalPropertySystem.PhysicalProperties { + extends neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties { private static final long serialVersionUID = 1000; static Logger logger = LogManager.getLogger(LiquidPhysicalProperties.class); diff --git a/src/main/java/neqsim/physicalProperties/physicalPropertySystem/liquidPhysicalProperties/WaterPhysicalProperties.java b/src/main/java/neqsim/physicalproperties/physicalpropertysystem/liquidphysicalproperties/WaterPhysicalProperties.java similarity index 66% rename from src/main/java/neqsim/physicalProperties/physicalPropertySystem/liquidPhysicalProperties/WaterPhysicalProperties.java rename to src/main/java/neqsim/physicalproperties/physicalpropertysystem/liquidphysicalproperties/WaterPhysicalProperties.java index 644907f77c..5a58c55e47 100644 --- a/src/main/java/neqsim/physicalProperties/physicalPropertySystem/liquidPhysicalProperties/WaterPhysicalProperties.java +++ b/src/main/java/neqsim/physicalproperties/physicalpropertysystem/liquidphysicalproperties/WaterPhysicalProperties.java @@ -4,12 +4,12 @@ * Created on 13. august 2001, 10:34 */ -package neqsim.physicalProperties.physicalPropertySystem.liquidPhysicalProperties; +package neqsim.physicalproperties.physicalpropertysystem.liquidphysicalproperties; -import neqsim.physicalProperties.physicalPropertyMethods.liquidPhysicalProperties.conductivity.Conductivity; -import neqsim.physicalProperties.physicalPropertyMethods.liquidPhysicalProperties.density.Density; -import neqsim.physicalProperties.physicalPropertyMethods.liquidPhysicalProperties.diffusivity.SiddiqiLucasMethod; -import neqsim.physicalProperties.physicalPropertyMethods.liquidPhysicalProperties.viscosity.Viscosity; +import neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.conductivity.Conductivity; +import neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.density.Density; +import neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.diffusivity.SiddiqiLucasMethod; +import neqsim.physicalproperties.physicalpropertymethods.liquidphysicalproperties.viscosity.Viscosity; import neqsim.thermo.phase.PhaseInterface; /** diff --git a/src/main/java/neqsim/physicalProperties/physicalPropertySystem/solidPhysicalProperties/SolidPhysicalProperties.java b/src/main/java/neqsim/physicalproperties/physicalpropertysystem/solidphysicalproperties/SolidPhysicalProperties.java similarity index 54% rename from src/main/java/neqsim/physicalProperties/physicalPropertySystem/solidPhysicalProperties/SolidPhysicalProperties.java rename to src/main/java/neqsim/physicalproperties/physicalpropertysystem/solidphysicalproperties/SolidPhysicalProperties.java index b5f66b6c13..f74ae48b9f 100644 --- a/src/main/java/neqsim/physicalProperties/physicalPropertySystem/solidPhysicalProperties/SolidPhysicalProperties.java +++ b/src/main/java/neqsim/physicalproperties/physicalpropertysystem/solidphysicalproperties/SolidPhysicalProperties.java @@ -1,6 +1,6 @@ -package neqsim.physicalProperties.physicalPropertySystem.solidPhysicalProperties; +package neqsim.physicalproperties.physicalpropertysystem.solidphysicalproperties; -import neqsim.physicalProperties.physicalPropertySystem.PhysicalProperties; +import neqsim.physicalproperties.physicalpropertysystem.PhysicalProperties; import neqsim.thermo.phase.PhaseInterface; /** @@ -24,16 +24,16 @@ public class SolidPhysicalProperties extends PhysicalProperties { public SolidPhysicalProperties(PhaseInterface phase) { super(phase); conductivityCalc = - new neqsim.physicalProperties.physicalPropertyMethods.solidPhysicalProperties.conductivity.Conductivity( + new neqsim.physicalproperties.physicalpropertymethods.solidphysicalproperties.conductivity.Conductivity( this); viscosityCalc = - new neqsim.physicalProperties.physicalPropertyMethods.solidPhysicalProperties.viscosity.Viscosity( + new neqsim.physicalproperties.physicalpropertymethods.solidphysicalproperties.viscosity.Viscosity( this); diffusivityCalc = - new neqsim.physicalProperties.physicalPropertyMethods.solidPhysicalProperties.diffusivity.Diffusivity( + new neqsim.physicalproperties.physicalpropertymethods.solidphysicalproperties.diffusivity.Diffusivity( this); densityCalc = - new neqsim.physicalProperties.physicalPropertyMethods.solidPhysicalProperties.density.Density( + new neqsim.physicalproperties.physicalpropertymethods.solidphysicalproperties.density.Density( this); this.init(phase); } diff --git a/src/main/java/neqsim/physicalProperties/util/parameterFitting/pureComponentParameterFitting/pureCompInterfaceTension/ParachorFunction.java b/src/main/java/neqsim/physicalproperties/util/parameterFitting/pureComponentParameterFitting/purecompinterfacetension/ParachorFunction.java similarity index 86% rename from src/main/java/neqsim/physicalProperties/util/parameterFitting/pureComponentParameterFitting/pureCompInterfaceTension/ParachorFunction.java rename to src/main/java/neqsim/physicalproperties/util/parameterFitting/pureComponentParameterFitting/purecompinterfacetension/ParachorFunction.java index d27880ae65..227f5880c4 100644 --- a/src/main/java/neqsim/physicalProperties/util/parameterFitting/pureComponentParameterFitting/pureCompInterfaceTension/ParachorFunction.java +++ b/src/main/java/neqsim/physicalproperties/util/parameterFitting/pureComponentParameterFitting/purecompinterfacetension/ParachorFunction.java @@ -1,8 +1,8 @@ -package neqsim.physicalProperties.util.parameterFitting.pureComponentParameterFitting.pureCompInterfaceTension; +package neqsim.physicalproperties.util.parameterFitting.pureComponentParameterFitting.purecompinterfacetension; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.statistics.parameterFitting.nonLinearParameterFitting.LevenbergMarquardtFunction; +import neqsim.statistics.parameterfitting.nonlinearparameterfitting.LevenbergMarquardtFunction; /** *

diff --git a/src/main/java/neqsim/physicalProperties/util/parameterFitting/pureComponentParameterFitting/pureCompInterfaceTension/TestParachorFit.java b/src/main/java/neqsim/physicalproperties/util/parameterFitting/pureComponentParameterFitting/purecompinterfacetension/TestParachorFit.java similarity index 90% rename from src/main/java/neqsim/physicalProperties/util/parameterFitting/pureComponentParameterFitting/pureCompInterfaceTension/TestParachorFit.java rename to src/main/java/neqsim/physicalproperties/util/parameterFitting/pureComponentParameterFitting/purecompinterfacetension/TestParachorFit.java index 0cc176c2fd..2defe1ca25 100644 --- a/src/main/java/neqsim/physicalProperties/util/parameterFitting/pureComponentParameterFitting/pureCompInterfaceTension/TestParachorFit.java +++ b/src/main/java/neqsim/physicalproperties/util/parameterFitting/pureComponentParameterFitting/purecompinterfacetension/TestParachorFit.java @@ -1,12 +1,12 @@ -package neqsim.physicalProperties.util.parameterFitting.pureComponentParameterFitting.pureCompInterfaceTension; +package neqsim.physicalproperties.util.parameterFitting.pureComponentParameterFitting.purecompinterfacetension; import java.sql.ResultSet; import java.util.ArrayList; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.statistics.parameterFitting.SampleSet; -import neqsim.statistics.parameterFitting.SampleValue; -import neqsim.statistics.parameterFitting.nonLinearParameterFitting.LevenbergMarquardt; +import neqsim.statistics.parameterfitting.SampleSet; +import neqsim.statistics.parameterfitting.SampleValue; +import neqsim.statistics.parameterfitting.nonlinearparameterfitting.LevenbergMarquardt; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkCPAstatoil; import neqsim.util.database.NeqSimDataBase; diff --git a/src/main/java/neqsim/physicalProperties/util/parameterFitting/pureComponentParameterFitting/pureCompViscosity/chungMethod/ChungFunction.java b/src/main/java/neqsim/physicalproperties/util/parameterFitting/pureComponentParameterFitting/purecompviscosity/chungMethod/ChungFunction.java similarity index 82% rename from src/main/java/neqsim/physicalProperties/util/parameterFitting/pureComponentParameterFitting/pureCompViscosity/chungMethod/ChungFunction.java rename to src/main/java/neqsim/physicalproperties/util/parameterFitting/pureComponentParameterFitting/purecompviscosity/chungMethod/ChungFunction.java index a13f208be3..735fc85407 100644 --- a/src/main/java/neqsim/physicalProperties/util/parameterFitting/pureComponentParameterFitting/pureCompViscosity/chungMethod/ChungFunction.java +++ b/src/main/java/neqsim/physicalproperties/util/parameterFitting/pureComponentParameterFitting/purecompviscosity/chungMethod/ChungFunction.java @@ -1,6 +1,6 @@ -package neqsim.physicalProperties.util.parameterFitting.pureComponentParameterFitting.pureCompViscosity.chungMethod; +package neqsim.physicalproperties.util.parameterFitting.pureComponentParameterFitting.purecompviscosity.chungMethod; -import neqsim.statistics.parameterFitting.nonLinearParameterFitting.LevenbergMarquardtFunction; +import neqsim.statistics.parameterfitting.nonlinearparameterfitting.LevenbergMarquardtFunction; /** *

diff --git a/src/main/java/neqsim/physicalProperties/util/parameterFitting/pureComponentParameterFitting/pureCompViscosity/chungMethod/TestChungFit.java b/src/main/java/neqsim/physicalproperties/util/parameterFitting/pureComponentParameterFitting/purecompviscosity/chungMethod/TestChungFit.java similarity index 88% rename from src/main/java/neqsim/physicalProperties/util/parameterFitting/pureComponentParameterFitting/pureCompViscosity/chungMethod/TestChungFit.java rename to src/main/java/neqsim/physicalproperties/util/parameterFitting/pureComponentParameterFitting/purecompviscosity/chungMethod/TestChungFit.java index dce70dbb38..e6d7cf698b 100644 --- a/src/main/java/neqsim/physicalProperties/util/parameterFitting/pureComponentParameterFitting/pureCompViscosity/chungMethod/TestChungFit.java +++ b/src/main/java/neqsim/physicalproperties/util/parameterFitting/pureComponentParameterFitting/purecompviscosity/chungMethod/TestChungFit.java @@ -1,12 +1,12 @@ -package neqsim.physicalProperties.util.parameterFitting.pureComponentParameterFitting.pureCompViscosity.chungMethod; +package neqsim.physicalproperties.util.parameterFitting.pureComponentParameterFitting.purecompviscosity.chungMethod; import java.sql.ResultSet; import java.util.ArrayList; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.statistics.parameterFitting.SampleSet; -import neqsim.statistics.parameterFitting.SampleValue; -import neqsim.statistics.parameterFitting.nonLinearParameterFitting.LevenbergMarquardt; +import neqsim.statistics.parameterfitting.SampleSet; +import neqsim.statistics.parameterfitting.SampleValue; +import neqsim.statistics.parameterfitting.nonlinearparameterfitting.LevenbergMarquardt; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; import neqsim.util.database.NeqSimDataBase; diff --git a/src/main/java/neqsim/physicalProperties/util/parameterFitting/pureComponentParameterFitting/pureCompViscosity/linearLiquidModel/TestViscosityFit.java b/src/main/java/neqsim/physicalproperties/util/parameterFitting/pureComponentParameterFitting/purecompviscosity/linearLiquidModel/TestViscosityFit.java similarity index 91% rename from src/main/java/neqsim/physicalProperties/util/parameterFitting/pureComponentParameterFitting/pureCompViscosity/linearLiquidModel/TestViscosityFit.java rename to src/main/java/neqsim/physicalproperties/util/parameterFitting/pureComponentParameterFitting/purecompviscosity/linearLiquidModel/TestViscosityFit.java index ba2c27eba1..2a56598903 100644 --- a/src/main/java/neqsim/physicalProperties/util/parameterFitting/pureComponentParameterFitting/pureCompViscosity/linearLiquidModel/TestViscosityFit.java +++ b/src/main/java/neqsim/physicalproperties/util/parameterFitting/pureComponentParameterFitting/purecompviscosity/linearLiquidModel/TestViscosityFit.java @@ -1,12 +1,12 @@ -package neqsim.physicalProperties.util.parameterFitting.pureComponentParameterFitting.pureCompViscosity.linearLiquidModel; +package neqsim.physicalproperties.util.parameterFitting.pureComponentParameterFitting.purecompviscosity.linearLiquidModel; import java.sql.ResultSet; import java.util.ArrayList; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.statistics.parameterFitting.SampleSet; -import neqsim.statistics.parameterFitting.SampleValue; -import neqsim.statistics.parameterFitting.nonLinearParameterFitting.LevenbergMarquardt; +import neqsim.statistics.parameterfitting.SampleSet; +import neqsim.statistics.parameterfitting.SampleValue; +import neqsim.statistics.parameterfitting.nonlinearparameterfitting.LevenbergMarquardt; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; import neqsim.util.database.NeqSimExperimentDatabase; diff --git a/src/main/java/neqsim/physicalProperties/util/parameterFitting/pureComponentParameterFitting/pureCompViscosity/linearLiquidModel/ViscosityFunction.java b/src/main/java/neqsim/physicalproperties/util/parameterFitting/pureComponentParameterFitting/purecompviscosity/linearLiquidModel/ViscosityFunction.java similarity index 82% rename from src/main/java/neqsim/physicalProperties/util/parameterFitting/pureComponentParameterFitting/pureCompViscosity/linearLiquidModel/ViscosityFunction.java rename to src/main/java/neqsim/physicalproperties/util/parameterFitting/pureComponentParameterFitting/purecompviscosity/linearLiquidModel/ViscosityFunction.java index 1400d0d81a..997aa61227 100644 --- a/src/main/java/neqsim/physicalProperties/util/parameterFitting/pureComponentParameterFitting/pureCompViscosity/linearLiquidModel/ViscosityFunction.java +++ b/src/main/java/neqsim/physicalproperties/util/parameterFitting/pureComponentParameterFitting/purecompviscosity/linearLiquidModel/ViscosityFunction.java @@ -4,9 +4,9 @@ * Created on 24. januar 2001, 23:30 */ -package neqsim.physicalProperties.util.parameterFitting.pureComponentParameterFitting.pureCompViscosity.linearLiquidModel; +package neqsim.physicalproperties.util.parameterFitting.pureComponentParameterFitting.purecompviscosity.linearLiquidModel; -import neqsim.statistics.parameterFitting.nonLinearParameterFitting.LevenbergMarquardtFunction; +import neqsim.statistics.parameterfitting.nonlinearparameterfitting.LevenbergMarquardtFunction; /** *

diff --git a/src/main/java/neqsim/processSimulation/SimulationBaseClass.java b/src/main/java/neqsim/processsimulation/SimulationBaseClass.java similarity index 98% rename from src/main/java/neqsim/processSimulation/SimulationBaseClass.java rename to src/main/java/neqsim/processsimulation/SimulationBaseClass.java index c572a6c0e1..84494d32a3 100644 --- a/src/main/java/neqsim/processSimulation/SimulationBaseClass.java +++ b/src/main/java/neqsim/processsimulation/SimulationBaseClass.java @@ -1,4 +1,4 @@ -package neqsim.processSimulation; +package neqsim.processsimulation; import java.util.UUID; import neqsim.util.NamedBaseClass; diff --git a/src/main/java/neqsim/processSimulation/SimulationInterface.java b/src/main/java/neqsim/processsimulation/SimulationInterface.java similarity index 99% rename from src/main/java/neqsim/processSimulation/SimulationInterface.java rename to src/main/java/neqsim/processsimulation/SimulationInterface.java index 826896d47b..08d76a2bb0 100644 --- a/src/main/java/neqsim/processSimulation/SimulationInterface.java +++ b/src/main/java/neqsim/processsimulation/SimulationInterface.java @@ -1,4 +1,4 @@ -package neqsim.processSimulation; +package neqsim.processsimulation; import java.io.Serializable; import java.util.UUID; diff --git a/src/main/java/neqsim/processSimulation/conditionMonitor/ConditionMonitor.java b/src/main/java/neqsim/processsimulation/conditionmonitor/ConditionMonitor.java similarity index 76% rename from src/main/java/neqsim/processSimulation/conditionMonitor/ConditionMonitor.java rename to src/main/java/neqsim/processsimulation/conditionmonitor/ConditionMonitor.java index dfb636e939..b29c49c1fa 100644 --- a/src/main/java/neqsim/processSimulation/conditionMonitor/ConditionMonitor.java +++ b/src/main/java/neqsim/processsimulation/conditionmonitor/ConditionMonitor.java @@ -1,7 +1,7 @@ -package neqsim.processSimulation.conditionMonitor; +package neqsim.processsimulation.conditionmonitor; import java.util.ArrayList; -import neqsim.processSimulation.processSystem.ProcessSystem; +import neqsim.processsimulation.processsystem.ProcessSystem; /** *

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

* - * @param refprocess a {@link neqsim.processSimulation.processSystem.ProcessSystem} object + * @param refprocess a {@link neqsim.processsimulation.processsystem.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.processsimulation.processequipment.ProcessEquipmentBaseClass refUn = + (neqsim.processsimulation.processequipment.ProcessEquipmentBaseClass) refprocess .getUnit(unitName); - ((neqsim.processSimulation.processEquipment.ProcessEquipmentInterface) process + ((neqsim.processsimulation.processequipment.ProcessEquipmentInterface) process .getUnit(unitName)).runConditionAnalysis(refUn); - report += ((neqsim.processSimulation.processEquipment.ProcessEquipmentInterface) process + report += ((neqsim.processsimulation.processequipment.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.processsimulation.processsystem.ProcessSystem} object */ public ProcessSystem getProcess() { return process; diff --git a/src/main/java/neqsim/processSimulation/conditionMonitor/ConditionMonitorSpecifications.java b/src/main/java/neqsim/processsimulation/conditionmonitor/ConditionMonitorSpecifications.java similarity index 90% rename from src/main/java/neqsim/processSimulation/conditionMonitor/ConditionMonitorSpecifications.java rename to src/main/java/neqsim/processsimulation/conditionmonitor/ConditionMonitorSpecifications.java index 551cdc90fd..261f5eff69 100644 --- a/src/main/java/neqsim/processSimulation/conditionMonitor/ConditionMonitorSpecifications.java +++ b/src/main/java/neqsim/processsimulation/conditionmonitor/ConditionMonitorSpecifications.java @@ -1,4 +1,4 @@ -package neqsim.processSimulation.conditionMonitor; +package neqsim.processsimulation.conditionmonitor; /** *

diff --git a/src/main/java/neqsim/processSimulation/controllerDevice/ControllerDeviceBaseClass.java b/src/main/java/neqsim/processsimulation/controllerdevice/ControllerDeviceBaseClass.java similarity index 97% rename from src/main/java/neqsim/processSimulation/controllerDevice/ControllerDeviceBaseClass.java rename to src/main/java/neqsim/processsimulation/controllerdevice/ControllerDeviceBaseClass.java index e05e29633a..6f60ac2913 100644 --- a/src/main/java/neqsim/processSimulation/controllerDevice/ControllerDeviceBaseClass.java +++ b/src/main/java/neqsim/processsimulation/controllerdevice/ControllerDeviceBaseClass.java @@ -4,12 +4,12 @@ * Created on 10. oktober 2006, 19:59 */ -package neqsim.processSimulation.controllerDevice; +package neqsim.processsimulation.controllerdevice; import java.util.UUID; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processSimulation.measurementDevice.MeasurementDeviceInterface; +import neqsim.processsimulation.measurementdevice.MeasurementDeviceInterface; import neqsim.util.NamedBaseClass; /** diff --git a/src/main/java/neqsim/processSimulation/controllerDevice/ControllerDeviceInterface.java b/src/main/java/neqsim/processsimulation/controllerdevice/ControllerDeviceInterface.java similarity index 92% rename from src/main/java/neqsim/processSimulation/controllerDevice/ControllerDeviceInterface.java rename to src/main/java/neqsim/processsimulation/controllerdevice/ControllerDeviceInterface.java index 9b7f9fd2b6..ae580c1194 100644 --- a/src/main/java/neqsim/processSimulation/controllerDevice/ControllerDeviceInterface.java +++ b/src/main/java/neqsim/processsimulation/controllerdevice/ControllerDeviceInterface.java @@ -1,7 +1,7 @@ -package neqsim.processSimulation.controllerDevice; +package neqsim.processsimulation.controllerdevice; import java.util.UUID; -import neqsim.processSimulation.measurementDevice.MeasurementDeviceInterface; +import neqsim.processsimulation.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.processsimulation.measurementdevice.MeasurementDeviceInterface} * object */ public void setTransmitter(MeasurementDeviceInterface device); diff --git a/src/main/java/neqsim/processSimulation/costEstimation/CostEstimateBaseClass.java b/src/main/java/neqsim/processsimulation/costestimation/CostEstimateBaseClass.java similarity index 86% rename from src/main/java/neqsim/processSimulation/costEstimation/CostEstimateBaseClass.java rename to src/main/java/neqsim/processsimulation/costestimation/CostEstimateBaseClass.java index 5d93ac38af..e8fb6492d8 100644 --- a/src/main/java/neqsim/processSimulation/costEstimation/CostEstimateBaseClass.java +++ b/src/main/java/neqsim/processsimulation/costestimation/CostEstimateBaseClass.java @@ -1,11 +1,11 @@ -package neqsim.processSimulation.costEstimation; +package neqsim.processsimulation.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.processsimulation.mechanicaldesign.SystemMechanicalDesign; +import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; /** *

@@ -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.processsimulation.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.processsimulation.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/processsimulation/costestimation/UnitCostEstimateBaseClass.java similarity index 87% rename from src/main/java/neqsim/processSimulation/costEstimation/UnitCostEstimateBaseClass.java rename to src/main/java/neqsim/processsimulation/costestimation/UnitCostEstimateBaseClass.java index 3e642e3c64..789433df80 100644 --- a/src/main/java/neqsim/processSimulation/costEstimation/UnitCostEstimateBaseClass.java +++ b/src/main/java/neqsim/processsimulation/costestimation/UnitCostEstimateBaseClass.java @@ -1,7 +1,7 @@ -package neqsim.processSimulation.costEstimation; +package neqsim.processsimulation.costestimation; import java.util.Objects; -import neqsim.processSimulation.mechanicalDesign.MechanicalDesign; +import neqsim.processsimulation.mechanicaldesign.MechanicalDesign; /** *

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

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

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

* * @param mechanicalEquipment a - * {@link neqsim.processSimulation.mechanicalDesign.compressor.CompressorMechanicalDesign} + * {@link neqsim.processsimulation.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/processsimulation/costestimation/separator/SeparatorCostEstimate.java similarity index 76% rename from src/main/java/neqsim/processSimulation/costEstimation/separator/SeparatorCostEstimate.java rename to src/main/java/neqsim/processsimulation/costestimation/separator/SeparatorCostEstimate.java index e6513b59e9..4ebbf8d30a 100644 --- a/src/main/java/neqsim/processSimulation/costEstimation/separator/SeparatorCostEstimate.java +++ b/src/main/java/neqsim/processsimulation/costestimation/separator/SeparatorCostEstimate.java @@ -1,7 +1,7 @@ -package neqsim.processSimulation.costEstimation.separator; +package neqsim.processsimulation.costestimation.separator; -import neqsim.processSimulation.costEstimation.UnitCostEstimateBaseClass; -import neqsim.processSimulation.mechanicalDesign.separator.SeparatorMechanicalDesign; +import neqsim.processsimulation.costestimation.UnitCostEstimateBaseClass; +import neqsim.processsimulation.mechanicaldesign.separator.SeparatorMechanicalDesign; /** *

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

* * @param mechanicalEquipment a - * {@link neqsim.processSimulation.mechanicalDesign.separator.SeparatorMechanicalDesign} + * {@link neqsim.processsimulation.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/processsimulation/costestimation/valve/ValveCostEstimate.java similarity index 76% rename from src/main/java/neqsim/processSimulation/costEstimation/valve/ValveCostEstimate.java rename to src/main/java/neqsim/processsimulation/costestimation/valve/ValveCostEstimate.java index 87dae95aaa..63adc89133 100644 --- a/src/main/java/neqsim/processSimulation/costEstimation/valve/ValveCostEstimate.java +++ b/src/main/java/neqsim/processsimulation/costestimation/valve/ValveCostEstimate.java @@ -1,7 +1,7 @@ -package neqsim.processSimulation.costEstimation.valve; +package neqsim.processsimulation.costestimation.valve; -import neqsim.processSimulation.costEstimation.UnitCostEstimateBaseClass; -import neqsim.processSimulation.mechanicalDesign.valve.ValveMechanicalDesign; +import neqsim.processsimulation.costestimation.UnitCostEstimateBaseClass; +import neqsim.processsimulation.mechanicaldesign.valve.ValveMechanicalDesign; /** *

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

* * @param mechanicalEquipment a - * {@link neqsim.processSimulation.mechanicalDesign.valve.ValveMechanicalDesign} object + * {@link neqsim.processsimulation.mechanicaldesign.valve.ValveMechanicalDesign} object */ public ValveCostEstimate(ValveMechanicalDesign mechanicalEquipment) { super(mechanicalEquipment); diff --git a/src/main/java/neqsim/processSimulation/measurementDevice/CombustionEmissionsCalculator.java b/src/main/java/neqsim/processsimulation/measurementdevice/CombustionEmissionsCalculator.java similarity index 93% rename from src/main/java/neqsim/processSimulation/measurementDevice/CombustionEmissionsCalculator.java rename to src/main/java/neqsim/processsimulation/measurementdevice/CombustionEmissionsCalculator.java index c2882e9e43..7bfea8f8e6 100644 --- a/src/main/java/neqsim/processSimulation/measurementDevice/CombustionEmissionsCalculator.java +++ b/src/main/java/neqsim/processsimulation/measurementdevice/CombustionEmissionsCalculator.java @@ -1,8 +1,8 @@ -package neqsim.processSimulation.measurementDevice; +package neqsim.processsimulation.measurementdevice; import java.util.HashMap; import java.util.Map; -import neqsim.processSimulation.processEquipment.stream.StreamInterface; +import neqsim.processsimulation.processequipment.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.processsimulation.processequipment.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.processsimulation.processequipment.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/processsimulation/measurementdevice/CompressorMonitor.java similarity index 78% rename from src/main/java/neqsim/processSimulation/measurementDevice/CompressorMonitor.java rename to src/main/java/neqsim/processsimulation/measurementdevice/CompressorMonitor.java index cc304c9a69..fd340d4c12 100644 --- a/src/main/java/neqsim/processSimulation/measurementDevice/CompressorMonitor.java +++ b/src/main/java/neqsim/processsimulation/measurementdevice/CompressorMonitor.java @@ -1,6 +1,6 @@ -package neqsim.processSimulation.measurementDevice; +package neqsim.processsimulation.measurementdevice; -import neqsim.processSimulation.processEquipment.compressor.Compressor; +import neqsim.processsimulation.processequipment.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.processsimulation.processequipment.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.processsimulation.processequipment.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/processsimulation/measurementdevice/CricondenbarAnalyser.java similarity index 85% rename from src/main/java/neqsim/processSimulation/measurementDevice/CricondenbarAnalyser.java rename to src/main/java/neqsim/processsimulation/measurementdevice/CricondenbarAnalyser.java index 1c54de544c..4df9fafd75 100644 --- a/src/main/java/neqsim/processSimulation/measurementDevice/CricondenbarAnalyser.java +++ b/src/main/java/neqsim/processsimulation/measurementdevice/CricondenbarAnalyser.java @@ -1,10 +1,10 @@ -package neqsim.processSimulation.measurementDevice; +package neqsim.processsimulation.measurementdevice; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processSimulation.processEquipment.stream.StreamInterface; +import neqsim.processsimulation.processequipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +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.processsimulation.processequipment.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.processsimulation.processequipment.stream.StreamInterface} object */ public CricondenbarAnalyser(String name, StreamInterface stream) { super(name, "K", stream); @@ -86,8 +86,8 @@ public double getMeasuredValue2(String unit, double temp) { if (tempFluid.getPhase(0).hasComponent("water")) { tempFluid.removeComponent("water"); } - neqsim.PVTsimulation.simulation.SaturationPressure thermoOps = - new neqsim.PVTsimulation.simulation.SaturationPressure(tempFluid); + neqsim.pvtsimulation.simulation.SaturationPressure thermoOps = + new neqsim.pvtsimulation.simulation.SaturationPressure(tempFluid); try { thermoOps.run(); } catch (Exception ex) { diff --git a/src/main/java/neqsim/processSimulation/measurementDevice/FlowInducedVibrationAnalyser.java b/src/main/java/neqsim/processsimulation/measurementdevice/FlowInducedVibrationAnalyser.java similarity index 95% rename from src/main/java/neqsim/processSimulation/measurementDevice/FlowInducedVibrationAnalyser.java rename to src/main/java/neqsim/processsimulation/measurementdevice/FlowInducedVibrationAnalyser.java index 346c3ff69e..69dbfc855d 100644 --- a/src/main/java/neqsim/processSimulation/measurementDevice/FlowInducedVibrationAnalyser.java +++ b/src/main/java/neqsim/processsimulation/measurementdevice/FlowInducedVibrationAnalyser.java @@ -1,8 +1,8 @@ -package neqsim.processSimulation.measurementDevice; +package neqsim.processsimulation.measurementdevice; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processSimulation.processEquipment.pipeline.PipeBeggsAndBrills; +import neqsim.processsimulation.processequipment.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.processsimulation.processequipment.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.processsimulation.processequipment.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/processsimulation/measurementdevice/HydrateEquilibriumTemperatureAnalyser.java similarity index 90% rename from src/main/java/neqsim/processSimulation/measurementDevice/HydrateEquilibriumTemperatureAnalyser.java rename to src/main/java/neqsim/processsimulation/measurementdevice/HydrateEquilibriumTemperatureAnalyser.java index 1544530f6f..4dba3085fb 100644 --- a/src/main/java/neqsim/processSimulation/measurementDevice/HydrateEquilibriumTemperatureAnalyser.java +++ b/src/main/java/neqsim/processsimulation/measurementdevice/HydrateEquilibriumTemperatureAnalyser.java @@ -1,10 +1,10 @@ -package neqsim.processSimulation.measurementDevice; +package neqsim.processsimulation.measurementdevice; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processSimulation.processEquipment.stream.StreamInterface; +import neqsim.processsimulation.processequipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

@@ -25,7 +25,7 @@ public class HydrateEquilibriumTemperatureAnalyser extends StreamMeasurementDevi * Constructor for HydrateEquilibriumTemperatureAnalyser. *

* - * @param stream a {@link neqsim.processSimulation.processEquipment.stream.StreamInterface} object + * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object */ public HydrateEquilibriumTemperatureAnalyser(StreamInterface stream) { this("HydrateEquilibriumTemperatureAnalyser", stream); @@ -37,7 +37,7 @@ public HydrateEquilibriumTemperatureAnalyser(StreamInterface stream) { *

* * @param name Name of HydrateEquilibriumTemperatureAnalyser - * @param stream a {@link neqsim.processSimulation.processEquipment.stream.StreamInterface} object + * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object */ public HydrateEquilibriumTemperatureAnalyser(String name, StreamInterface stream) { super("HydrateEquilibriumTemperatureAnalyser", "K", stream); diff --git a/src/main/java/neqsim/processSimulation/measurementDevice/LevelTransmitter.java b/src/main/java/neqsim/processsimulation/measurementdevice/LevelTransmitter.java similarity index 83% rename from src/main/java/neqsim/processSimulation/measurementDevice/LevelTransmitter.java rename to src/main/java/neqsim/processsimulation/measurementdevice/LevelTransmitter.java index c2ee757350..fa9a4072fb 100644 --- a/src/main/java/neqsim/processSimulation/measurementDevice/LevelTransmitter.java +++ b/src/main/java/neqsim/processsimulation/measurementdevice/LevelTransmitter.java @@ -1,6 +1,6 @@ -package neqsim.processSimulation.measurementDevice; +package neqsim.processsimulation.measurementdevice; -import neqsim.processSimulation.processEquipment.separator.Separator; +import neqsim.processsimulation.processequipment.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.processsimulation.processequipment.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.processsimulation.processequipment.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/processsimulation/measurementdevice/MeasurementDeviceBaseClass.java similarity index 97% rename from src/main/java/neqsim/processSimulation/measurementDevice/MeasurementDeviceBaseClass.java rename to src/main/java/neqsim/processsimulation/measurementdevice/MeasurementDeviceBaseClass.java index 5e24780f80..cdd629e97e 100644 --- a/src/main/java/neqsim/processSimulation/measurementDevice/MeasurementDeviceBaseClass.java +++ b/src/main/java/neqsim/processsimulation/measurementdevice/MeasurementDeviceBaseClass.java @@ -1,6 +1,6 @@ -package neqsim.processSimulation.measurementDevice; +package neqsim.processsimulation.measurementdevice; -import neqsim.processSimulation.measurementDevice.online.OnlineSignal; +import neqsim.processsimulation.measurementdevice.online.OnlineSignal; import neqsim.util.NamedBaseClass; /** diff --git a/src/main/java/neqsim/processSimulation/measurementDevice/MeasurementDeviceInterface.java b/src/main/java/neqsim/processsimulation/measurementdevice/MeasurementDeviceInterface.java similarity index 93% rename from src/main/java/neqsim/processSimulation/measurementDevice/MeasurementDeviceInterface.java rename to src/main/java/neqsim/processsimulation/measurementdevice/MeasurementDeviceInterface.java index 4f0e11d220..d96fff2c80 100644 --- a/src/main/java/neqsim/processSimulation/measurementDevice/MeasurementDeviceInterface.java +++ b/src/main/java/neqsim/processsimulation/measurementdevice/MeasurementDeviceInterface.java @@ -1,6 +1,6 @@ -package neqsim.processSimulation.measurementDevice; +package neqsim.processsimulation.measurementdevice; -import neqsim.processSimulation.measurementDevice.online.OnlineSignal; +import neqsim.processsimulation.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.processsimulation.measurementdevice.online.OnlineSignal} object */ public OnlineSignal getOnlineSignal(); diff --git a/src/main/java/neqsim/processSimulation/measurementDevice/MolarMassAnalyser.java b/src/main/java/neqsim/processsimulation/measurementdevice/MolarMassAnalyser.java similarity index 83% rename from src/main/java/neqsim/processSimulation/measurementDevice/MolarMassAnalyser.java rename to src/main/java/neqsim/processsimulation/measurementdevice/MolarMassAnalyser.java index 2af44d4efe..3f2e276dc5 100644 --- a/src/main/java/neqsim/processSimulation/measurementDevice/MolarMassAnalyser.java +++ b/src/main/java/neqsim/processsimulation/measurementdevice/MolarMassAnalyser.java @@ -1,6 +1,6 @@ -package neqsim.processSimulation.measurementDevice; +package neqsim.processsimulation.measurementdevice; -import neqsim.processSimulation.processEquipment.stream.StreamInterface; +import neqsim.processsimulation.processequipment.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.processsimulation.processequipment.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.processsimulation.processequipment.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/processsimulation/measurementdevice/MultiPhaseMeter.java similarity index 96% rename from src/main/java/neqsim/processSimulation/measurementDevice/MultiPhaseMeter.java rename to src/main/java/neqsim/processsimulation/measurementdevice/MultiPhaseMeter.java index d3ef9db123..14cf3f1cf7 100644 --- a/src/main/java/neqsim/processSimulation/measurementDevice/MultiPhaseMeter.java +++ b/src/main/java/neqsim/processsimulation/measurementdevice/MultiPhaseMeter.java @@ -1,11 +1,11 @@ -package neqsim.processSimulation.measurementDevice; +package neqsim.processsimulation.measurementdevice; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processSimulation.processEquipment.stream.StreamInterface; +import neqsim.processsimulation.processequipment.stream.StreamInterface; import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

@@ -29,7 +29,7 @@ public class MultiPhaseMeter extends StreamMeasurementDeviceBaseClass { * Constructor for MultiPhaseMeter. *

* - * @param stream a {@link neqsim.processSimulation.processEquipment.stream.StreamInterface} object + * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object */ public MultiPhaseMeter(StreamInterface stream) { this("Multi Phase Meter", stream); @@ -41,7 +41,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.processsimulation.processequipment.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/processsimulation/measurementdevice/NMVOCAnalyser.java similarity index 87% rename from src/main/java/neqsim/processSimulation/measurementDevice/NMVOCAnalyser.java rename to src/main/java/neqsim/processsimulation/measurementdevice/NMVOCAnalyser.java index ce4f359d6d..a0c49f0388 100644 --- a/src/main/java/neqsim/processSimulation/measurementDevice/NMVOCAnalyser.java +++ b/src/main/java/neqsim/processsimulation/measurementdevice/NMVOCAnalyser.java @@ -1,6 +1,6 @@ -package neqsim.processSimulation.measurementDevice; +package neqsim.processsimulation.measurementdevice; -import neqsim.processSimulation.processEquipment.stream.StreamInterface; +import neqsim.processsimulation.processequipment.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.processsimulation.processequipment.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.processsimulation.processequipment.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/processsimulation/measurementdevice/PressureTransmitter.java similarity index 80% rename from src/main/java/neqsim/processSimulation/measurementDevice/PressureTransmitter.java rename to src/main/java/neqsim/processsimulation/measurementdevice/PressureTransmitter.java index 0e638f3b66..648f16855b 100644 --- a/src/main/java/neqsim/processSimulation/measurementDevice/PressureTransmitter.java +++ b/src/main/java/neqsim/processsimulation/measurementdevice/PressureTransmitter.java @@ -1,6 +1,6 @@ -package neqsim.processSimulation.measurementDevice; +package neqsim.processsimulation.measurementdevice; -import neqsim.processSimulation.processEquipment.stream.StreamInterface; +import neqsim.processsimulation.processequipment.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.processsimulation.processequipment.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.processsimulation.processequipment.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/processsimulation/measurementdevice/StreamMeasurementDeviceBaseClass.java similarity index 89% rename from src/main/java/neqsim/processSimulation/measurementDevice/StreamMeasurementDeviceBaseClass.java rename to src/main/java/neqsim/processsimulation/measurementdevice/StreamMeasurementDeviceBaseClass.java index ae74b3f5b9..2993eb300a 100644 --- a/src/main/java/neqsim/processSimulation/measurementDevice/StreamMeasurementDeviceBaseClass.java +++ b/src/main/java/neqsim/processsimulation/measurementdevice/StreamMeasurementDeviceBaseClass.java @@ -1,6 +1,6 @@ -package neqsim.processSimulation.measurementDevice; +package neqsim.processsimulation.measurementdevice; -import neqsim.processSimulation.processEquipment.stream.StreamInterface; +import neqsim.processsimulation.processequipment.stream.StreamInterface; /** *

diff --git a/src/main/java/neqsim/processSimulation/measurementDevice/TemperatureTransmitter.java b/src/main/java/neqsim/processsimulation/measurementdevice/TemperatureTransmitter.java similarity index 81% rename from src/main/java/neqsim/processSimulation/measurementDevice/TemperatureTransmitter.java rename to src/main/java/neqsim/processsimulation/measurementdevice/TemperatureTransmitter.java index 82570fde1b..ffa9aab88a 100644 --- a/src/main/java/neqsim/processSimulation/measurementDevice/TemperatureTransmitter.java +++ b/src/main/java/neqsim/processsimulation/measurementdevice/TemperatureTransmitter.java @@ -4,9 +4,9 @@ * Created on 6. juni 2006, 15:24 */ -package neqsim.processSimulation.measurementDevice; +package neqsim.processsimulation.measurementdevice; -import neqsim.processSimulation.processEquipment.stream.StreamInterface; +import neqsim.processsimulation.processequipment.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.processsimulation.processequipment.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.processsimulation.processequipment.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/processsimulation/measurementdevice/VolumeFlowTransmitter.java similarity index 92% rename from src/main/java/neqsim/processSimulation/measurementDevice/VolumeFlowTransmitter.java rename to src/main/java/neqsim/processsimulation/measurementdevice/VolumeFlowTransmitter.java index 2a3f952456..5553ce4341 100644 --- a/src/main/java/neqsim/processSimulation/measurementDevice/VolumeFlowTransmitter.java +++ b/src/main/java/neqsim/processsimulation/measurementdevice/VolumeFlowTransmitter.java @@ -1,6 +1,6 @@ -package neqsim.processSimulation.measurementDevice; +package neqsim.processsimulation.measurementdevice; -import neqsim.processSimulation.processEquipment.stream.StreamInterface; +import neqsim.processsimulation.processequipment.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.processsimulation.processequipment.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.processsimulation.processequipment.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/processsimulation/measurementdevice/WaterContentAnalyser.java similarity index 86% rename from src/main/java/neqsim/processSimulation/measurementDevice/WaterContentAnalyser.java rename to src/main/java/neqsim/processsimulation/measurementdevice/WaterContentAnalyser.java index 7d0d28c5a5..0762e9bdfb 100644 --- a/src/main/java/neqsim/processSimulation/measurementDevice/WaterContentAnalyser.java +++ b/src/main/java/neqsim/processsimulation/measurementdevice/WaterContentAnalyser.java @@ -1,6 +1,6 @@ -package neqsim.processSimulation.measurementDevice; +package neqsim.processsimulation.measurementdevice; -import neqsim.processSimulation.processEquipment.stream.StreamInterface; +import neqsim.processsimulation.processequipment.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.processsimulation.processequipment.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.processsimulation.processequipment.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/processsimulation/measurementdevice/WaterDewPointAnalyser.java similarity index 92% rename from src/main/java/neqsim/processSimulation/measurementDevice/WaterDewPointAnalyser.java rename to src/main/java/neqsim/processsimulation/measurementdevice/WaterDewPointAnalyser.java index f18c4629fe..2893b9a68b 100644 --- a/src/main/java/neqsim/processSimulation/measurementDevice/WaterDewPointAnalyser.java +++ b/src/main/java/neqsim/processsimulation/measurementdevice/WaterDewPointAnalyser.java @@ -1,11 +1,11 @@ -package neqsim.processSimulation.measurementDevice; +package neqsim.processsimulation.measurementdevice; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processSimulation.processEquipment.stream.StreamInterface; +import neqsim.processsimulation.processequipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.util.empiric.BukacekWaterInGas; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +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.processsimulation.processequipment.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.processsimulation.processequipment.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/processsimulation/measurementdevice/WellAllocator.java similarity index 87% rename from src/main/java/neqsim/processSimulation/measurementDevice/WellAllocator.java rename to src/main/java/neqsim/processsimulation/measurementdevice/WellAllocator.java index ac2e7e2439..e45ab3969f 100644 --- a/src/main/java/neqsim/processSimulation/measurementDevice/WellAllocator.java +++ b/src/main/java/neqsim/processsimulation/measurementdevice/WellAllocator.java @@ -1,6 +1,6 @@ -package neqsim.processSimulation.measurementDevice; +package neqsim.processsimulation.measurementdevice; -import neqsim.processSimulation.processEquipment.stream.StreamInterface; +import neqsim.processsimulation.processequipment.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.processsimulation.processequipment.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.processsimulation.processequipment.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.processsimulation.processequipment.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.processsimulation.processequipment.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/processsimulation/measurementdevice/online/OnlineSignal.java similarity index 97% rename from src/main/java/neqsim/processSimulation/measurementDevice/online/OnlineSignal.java rename to src/main/java/neqsim/processsimulation/measurementdevice/online/OnlineSignal.java index a7a33301ec..447aad3f47 100644 --- a/src/main/java/neqsim/processSimulation/measurementDevice/online/OnlineSignal.java +++ b/src/main/java/neqsim/processsimulation/measurementdevice/online/OnlineSignal.java @@ -1,4 +1,4 @@ -package neqsim.processSimulation.measurementDevice.online; +package neqsim.processsimulation.measurementdevice.online; import java.util.Date; diff --git a/src/main/java/neqsim/processSimulation/measurementDevice/pHProbe.java b/src/main/java/neqsim/processsimulation/measurementdevice/pHProbe.java similarity index 92% rename from src/main/java/neqsim/processSimulation/measurementDevice/pHProbe.java rename to src/main/java/neqsim/processsimulation/measurementdevice/pHProbe.java index 3c80505a58..7603bb592f 100644 --- a/src/main/java/neqsim/processSimulation/measurementDevice/pHProbe.java +++ b/src/main/java/neqsim/processsimulation/measurementdevice/pHProbe.java @@ -1,8 +1,8 @@ -package neqsim.processSimulation.measurementDevice; +package neqsim.processsimulation.measurementdevice; -import neqsim.processSimulation.processEquipment.stream.StreamInterface; +import neqsim.processsimulation.processequipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +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.processsimulation.processequipment.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.processsimulation.processequipment.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/processsimulation/measurementdevice/simpleflowregime/FluidSevereSlug.java similarity index 96% rename from src/main/java/neqsim/processSimulation/measurementDevice/simpleFlowRegime/FluidSevereSlug.java rename to src/main/java/neqsim/processsimulation/measurementdevice/simpleflowregime/FluidSevereSlug.java index ce60505901..7d54c7df40 100644 --- a/src/main/java/neqsim/processSimulation/measurementDevice/simpleFlowRegime/FluidSevereSlug.java +++ b/src/main/java/neqsim/processsimulation/measurementdevice/simpleflowregime/FluidSevereSlug.java @@ -1,7 +1,7 @@ -package neqsim.processSimulation.measurementDevice.simpleFlowRegime; +package neqsim.processsimulation.measurementdevice.simpleflowregime; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/main/java/neqsim/processSimulation/measurementDevice/simpleFlowRegime/Pipe.java b/src/main/java/neqsim/processsimulation/measurementdevice/simpleflowregime/Pipe.java similarity index 98% rename from src/main/java/neqsim/processSimulation/measurementDevice/simpleFlowRegime/Pipe.java rename to src/main/java/neqsim/processsimulation/measurementdevice/simpleflowregime/Pipe.java index 92b70d5006..5d98257f6d 100644 --- a/src/main/java/neqsim/processSimulation/measurementDevice/simpleFlowRegime/Pipe.java +++ b/src/main/java/neqsim/processsimulation/measurementdevice/simpleflowregime/Pipe.java @@ -1,5 +1,5 @@ // Create a Pipe Object -package neqsim.processSimulation.measurementDevice.simpleFlowRegime; +package neqsim.processsimulation.measurementdevice.simpleflowregime; /** *

diff --git a/src/main/java/neqsim/processSimulation/measurementDevice/simpleFlowRegime/SevereSlugAnalyser.java b/src/main/java/neqsim/processsimulation/measurementdevice/simpleflowregime/SevereSlugAnalyser.java similarity index 89% rename from src/main/java/neqsim/processSimulation/measurementDevice/simpleFlowRegime/SevereSlugAnalyser.java rename to src/main/java/neqsim/processsimulation/measurementdevice/simpleflowregime/SevereSlugAnalyser.java index 986f0e48e0..4d08a79f5d 100644 --- a/src/main/java/neqsim/processSimulation/measurementDevice/simpleFlowRegime/SevereSlugAnalyser.java +++ b/src/main/java/neqsim/processsimulation/measurementdevice/simpleflowregime/SevereSlugAnalyser.java @@ -1,14 +1,14 @@ -package neqsim.processSimulation.measurementDevice.simpleFlowRegime; +package neqsim.processsimulation.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.processsimulation.measurementdevice.MeasurementDeviceBaseClass; +import neqsim.processsimulation.processequipment.stream.Stream; import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

@@ -105,13 +105,13 @@ public class SevereSlugAnalyser extends MeasurementDeviceBaseClass { String flowPattern; // This constructor is used for the "default" values - SevereSlugAnalyser() { + public SevereSlugAnalyser() { super("SevereSlugAnalyser", "m3/sec"); } // This constructor is used for the user input of superficial liquid and gas velocities, // and the rest will be the default values - SevereSlugAnalyser(double usl, double usg) { + public SevereSlugAnalyser(double usl, double usg) { this(); this.setSuperficialLiquidVelocity(usl); this.setSuperficialGasVelocity(usg); @@ -132,8 +132,8 @@ public class SevereSlugAnalyser extends MeasurementDeviceBaseClass { this.setNumberOfTimeSteps(numberOfTimeSteps); } - SevereSlugAnalyser(SystemInterface fluid, Pipe pipe, double outletPressure, double temperature, - double simulationTime, int numberOfTimeSteps) { + public SevereSlugAnalyser(SystemInterface fluid, Pipe pipe, double outletPressure, + double temperature, double simulationTime, int numberOfTimeSteps) { this(); ThermodynamicOperations ops = new ThermodynamicOperations(fluid); ops.TPflash(); @@ -152,9 +152,9 @@ public class SevereSlugAnalyser extends MeasurementDeviceBaseClass { this.setNumberOfTimeSteps(numberOfTimeSteps); } - SevereSlugAnalyser(Stream stream, double internalDiameter, double leftLength, double rightLength, - double angle, double outletPressure, double temperature, double simulationTime, - int numberOfTimeSteps) { + public SevereSlugAnalyser(Stream stream, double internalDiameter, double leftLength, + double rightLength, double angle, double outletPressure, double temperature, + double simulationTime, int numberOfTimeSteps) { this(); pipe = new Pipe(internalDiameter, leftLength, rightLength, angle); streamS = stream; @@ -175,19 +175,19 @@ public class SevereSlugAnalyser extends MeasurementDeviceBaseClass { numberOfTimeSteps); } - SevereSlugAnalyser(Stream stream, double internalDiameter, double leftLength, double rightLength, - double angle, double simulationTime, int numberOfTimeSteps) { + public SevereSlugAnalyser(Stream stream, double internalDiameter, double leftLength, + double rightLength, double angle, double simulationTime, int numberOfTimeSteps) { this(stream, internalDiameter, leftLength, rightLength, angle, stream.getPressure("Pa"), stream.getTemperature("C"), simulationTime, numberOfTimeSteps); } - SevereSlugAnalyser(Stream stream, double internalDiameter, double leftLength, double rightLength, - double angle) { + public SevereSlugAnalyser(Stream stream, double internalDiameter, double leftLength, + double rightLength, double angle) { this(stream, internalDiameter, leftLength, rightLength, angle, stream.getPressure("Pa"), stream.getTemperature("C"), 500.0, 50000); } - SevereSlugAnalyser(double outletPressure, double temperature, double simulationTime, + public SevereSlugAnalyser(double outletPressure, double temperature, double simulationTime, int numberOfTimeSteps) { this(); this.setOutletPressure(outletPressure); @@ -364,7 +364,7 @@ public double getSimulationTime() { *

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

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

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

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

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

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

* * @param fluid a - * {@link neqsim.processSimulation.measurementDevice.simpleFlowRegime.FluidSevereSlug} + * {@link neqsim.processsimulation.measurementdevice.simpleflowregime.FluidSevereSlug} * object - * @param pipe a {@link neqsim.processSimulation.measurementDevice.simpleFlowRegime.Pipe} object + * @param pipe a {@link neqsim.processsimulation.measurementdevice.simpleflowregime.Pipe} object * @param severeSlug a - * {@link neqsim.processSimulation.measurementDevice.simpleFlowRegime.SevereSlugAnalyser} + * {@link neqsim.processsimulation.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/processsimulation/mechanicaldesign/MechanicalDesign.java similarity index 97% rename from src/main/java/neqsim/processSimulation/mechanicalDesign/MechanicalDesign.java rename to src/main/java/neqsim/processsimulation/mechanicaldesign/MechanicalDesign.java index 82e64570ae..38c84be47a 100644 --- a/src/main/java/neqsim/processSimulation/mechanicalDesign/MechanicalDesign.java +++ b/src/main/java/neqsim/processsimulation/mechanicaldesign/MechanicalDesign.java @@ -1,4 +1,4 @@ -package neqsim.processSimulation.mechanicalDesign; +package neqsim.processsimulation.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.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; /** *

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

* * @param processEquipment a - * {@link neqsim.processSimulation.processEquipment.ProcessEquipmentInterface} object + * {@link neqsim.processsimulation.processequipment.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/processsimulation/mechanicaldesign/SystemMechanicalDesign.java similarity index 93% rename from src/main/java/neqsim/processSimulation/mechanicalDesign/SystemMechanicalDesign.java rename to src/main/java/neqsim/processsimulation/mechanicaldesign/SystemMechanicalDesign.java index 04820c240a..3737443941 100644 --- a/src/main/java/neqsim/processSimulation/mechanicalDesign/SystemMechanicalDesign.java +++ b/src/main/java/neqsim/processsimulation/mechanicaldesign/SystemMechanicalDesign.java @@ -1,11 +1,11 @@ -package neqsim.processSimulation.mechanicalDesign; +package neqsim.processsimulation.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.processsimulation.processequipment.ProcessEquipmentInterface; +import neqsim.processsimulation.processsystem.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.processsimulation.processsystem.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.processsimulation.processsystem.ProcessSystem} object */ public ProcessSystem getProcess() { return processSystem; diff --git a/src/main/java/neqsim/processSimulation/mechanicalDesign/absorber/AbsorberMechanicalDesign.java b/src/main/java/neqsim/processsimulation/mechanicaldesign/absorber/AbsorberMechanicalDesign.java similarity index 91% rename from src/main/java/neqsim/processSimulation/mechanicalDesign/absorber/AbsorberMechanicalDesign.java rename to src/main/java/neqsim/processsimulation/mechanicaldesign/absorber/AbsorberMechanicalDesign.java index 4da088ef57..c56e881207 100644 --- a/src/main/java/neqsim/processSimulation/mechanicalDesign/absorber/AbsorberMechanicalDesign.java +++ b/src/main/java/neqsim/processsimulation/mechanicaldesign/absorber/AbsorberMechanicalDesign.java @@ -1,13 +1,13 @@ -package neqsim.processSimulation.mechanicalDesign.absorber; +package neqsim.processsimulation.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.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; /** *

@@ -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.processsimulation.processequipment.ProcessEquipmentInterface} * object */ public AbsorberMechanicalDesign(ProcessEquipmentInterface equipment) { diff --git a/src/main/java/neqsim/processSimulation/mechanicalDesign/adsorber/AdsorberMechanicalDesign.java b/src/main/java/neqsim/processsimulation/mechanicaldesign/adsorber/AdsorberMechanicalDesign.java similarity index 91% rename from src/main/java/neqsim/processSimulation/mechanicalDesign/adsorber/AdsorberMechanicalDesign.java rename to src/main/java/neqsim/processsimulation/mechanicaldesign/adsorber/AdsorberMechanicalDesign.java index 23f4f8d6bb..62d2a2ba04 100644 --- a/src/main/java/neqsim/processSimulation/mechanicalDesign/adsorber/AdsorberMechanicalDesign.java +++ b/src/main/java/neqsim/processsimulation/mechanicaldesign/adsorber/AdsorberMechanicalDesign.java @@ -1,11 +1,11 @@ -package neqsim.processSimulation.mechanicalDesign.adsorber; +package neqsim.processsimulation.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.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; /** *

@@ -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.processsimulation.processequipment.ProcessEquipmentInterface} * object */ public AdsorberMechanicalDesign(ProcessEquipmentInterface equipment) { diff --git a/src/main/java/neqsim/processSimulation/mechanicalDesign/compressor/CompressorMechanicalDesign.java b/src/main/java/neqsim/processsimulation/mechanicaldesign/compressor/CompressorMechanicalDesign.java similarity index 93% rename from src/main/java/neqsim/processSimulation/mechanicalDesign/compressor/CompressorMechanicalDesign.java rename to src/main/java/neqsim/processsimulation/mechanicaldesign/compressor/CompressorMechanicalDesign.java index 227b83b53d..0bbd57b9c2 100644 --- a/src/main/java/neqsim/processSimulation/mechanicalDesign/compressor/CompressorMechanicalDesign.java +++ b/src/main/java/neqsim/processsimulation/mechanicaldesign/compressor/CompressorMechanicalDesign.java @@ -1,17 +1,17 @@ -package neqsim.processSimulation.mechanicalDesign.compressor; +package neqsim.processsimulation.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.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; /** *

@@ -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.processsimulation.processequipment.ProcessEquipmentInterface} * object */ public CompressorMechanicalDesign(ProcessEquipmentInterface equipment) { diff --git a/src/main/java/neqsim/processSimulation/mechanicalDesign/designStandards/AbsorptionColumnDesignStandard.java b/src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/AbsorptionColumnDesignStandard.java similarity index 89% rename from src/main/java/neqsim/processSimulation/mechanicalDesign/designStandards/AbsorptionColumnDesignStandard.java rename to src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/AbsorptionColumnDesignStandard.java index 749290b329..d4d6338250 100644 --- a/src/main/java/neqsim/processSimulation/mechanicalDesign/designStandards/AbsorptionColumnDesignStandard.java +++ b/src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/AbsorptionColumnDesignStandard.java @@ -1,8 +1,8 @@ -package neqsim.processSimulation.mechanicalDesign.designStandards; +package neqsim.processsimulation.mechanicaldesign.designstandards; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processSimulation.mechanicalDesign.MechanicalDesign; +import neqsim.processsimulation.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.processsimulation.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/processsimulation/mechanicaldesign/designstandards/AdsorptionDehydrationDesignStandard.java similarity index 91% rename from src/main/java/neqsim/processSimulation/mechanicalDesign/designStandards/AdsorptionDehydrationDesignStandard.java rename to src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/AdsorptionDehydrationDesignStandard.java index 006048330b..88fd8a1ad3 100644 --- a/src/main/java/neqsim/processSimulation/mechanicalDesign/designStandards/AdsorptionDehydrationDesignStandard.java +++ b/src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/AdsorptionDehydrationDesignStandard.java @@ -1,8 +1,8 @@ -package neqsim.processSimulation.mechanicalDesign.designStandards; +package neqsim.processsimulation.mechanicaldesign.designstandards; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processSimulation.mechanicalDesign.MechanicalDesign; +import neqsim.processsimulation.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.processsimulation.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/processsimulation/mechanicaldesign/designstandards/CompressorDesignStandard.java similarity index 89% rename from src/main/java/neqsim/processSimulation/mechanicalDesign/designStandards/CompressorDesignStandard.java rename to src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/CompressorDesignStandard.java index 29fde9c887..085e1e1064 100644 --- a/src/main/java/neqsim/processSimulation/mechanicalDesign/designStandards/CompressorDesignStandard.java +++ b/src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/CompressorDesignStandard.java @@ -1,8 +1,8 @@ -package neqsim.processSimulation.mechanicalDesign.designStandards; +package neqsim.processsimulation.mechanicaldesign.designstandards; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processSimulation.mechanicalDesign.MechanicalDesign; +import neqsim.processsimulation.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.processsimulation.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/processsimulation/mechanicaldesign/designstandards/DesignStandard.java similarity index 90% rename from src/main/java/neqsim/processSimulation/mechanicalDesign/designStandards/DesignStandard.java rename to src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/DesignStandard.java index e520d87e84..8894c9209c 100644 --- a/src/main/java/neqsim/processSimulation/mechanicalDesign/designStandards/DesignStandard.java +++ b/src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/DesignStandard.java @@ -1,7 +1,7 @@ -package neqsim.processSimulation.mechanicalDesign.designStandards; +package neqsim.processsimulation.mechanicaldesign.designstandards; import java.util.Objects; -import neqsim.processSimulation.mechanicalDesign.MechanicalDesign; +import neqsim.processsimulation.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.processsimulation.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/processsimulation/mechanicaldesign/designstandards/GasScrubberDesignStandard.java similarity index 92% rename from src/main/java/neqsim/processSimulation/mechanicalDesign/designStandards/GasScrubberDesignStandard.java rename to src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/GasScrubberDesignStandard.java index 5b2621ebc7..31d66c6ce4 100644 --- a/src/main/java/neqsim/processSimulation/mechanicalDesign/designStandards/GasScrubberDesignStandard.java +++ b/src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/GasScrubberDesignStandard.java @@ -1,8 +1,8 @@ -package neqsim.processSimulation.mechanicalDesign.designStandards; +package neqsim.processsimulation.mechanicaldesign.designstandards; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processSimulation.mechanicalDesign.MechanicalDesign; +import neqsim.processsimulation.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.processsimulation.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/processsimulation/mechanicaldesign/designstandards/JointEfficiencyPipelineStandard.java similarity index 84% rename from src/main/java/neqsim/processSimulation/mechanicalDesign/designStandards/JointEfficiencyPipelineStandard.java rename to src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/JointEfficiencyPipelineStandard.java index c4666a6afa..2e686f2d2f 100644 --- a/src/main/java/neqsim/processSimulation/mechanicalDesign/designStandards/JointEfficiencyPipelineStandard.java +++ b/src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/JointEfficiencyPipelineStandard.java @@ -1,6 +1,6 @@ -package neqsim.processSimulation.mechanicalDesign.designStandards; +package neqsim.processsimulation.mechanicaldesign.designstandards; -import neqsim.processSimulation.mechanicalDesign.MechanicalDesign; +import neqsim.processsimulation.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.processsimulation.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/processsimulation/mechanicaldesign/designstandards/JointEfficiencyPlateStandard.java similarity index 85% rename from src/main/java/neqsim/processSimulation/mechanicalDesign/designStandards/JointEfficiencyPlateStandard.java rename to src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/JointEfficiencyPlateStandard.java index 5322283281..b124f8abed 100644 --- a/src/main/java/neqsim/processSimulation/mechanicalDesign/designStandards/JointEfficiencyPlateStandard.java +++ b/src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/JointEfficiencyPlateStandard.java @@ -1,6 +1,6 @@ -package neqsim.processSimulation.mechanicalDesign.designStandards; +package neqsim.processsimulation.mechanicaldesign.designstandards; -import neqsim.processSimulation.mechanicalDesign.MechanicalDesign; +import neqsim.processsimulation.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.processsimulation.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/processsimulation/mechanicaldesign/designstandards/MaterialPipeDesignStandard.java similarity index 94% rename from src/main/java/neqsim/processSimulation/mechanicalDesign/designStandards/MaterialPipeDesignStandard.java rename to src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/MaterialPipeDesignStandard.java index af26aad349..a29c88a37c 100644 --- a/src/main/java/neqsim/processSimulation/mechanicalDesign/designStandards/MaterialPipeDesignStandard.java +++ b/src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/MaterialPipeDesignStandard.java @@ -1,8 +1,8 @@ -package neqsim.processSimulation.mechanicalDesign.designStandards; +package neqsim.processsimulation.mechanicaldesign.designstandards; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processSimulation.mechanicalDesign.MechanicalDesign; +import neqsim.processsimulation.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.processsimulation.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/processsimulation/mechanicaldesign/designstandards/MaterialPlateDesignStandard.java similarity index 93% rename from src/main/java/neqsim/processSimulation/mechanicalDesign/designStandards/MaterialPlateDesignStandard.java rename to src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/MaterialPlateDesignStandard.java index aea9e26bb1..9c4b559cc3 100644 --- a/src/main/java/neqsim/processSimulation/mechanicalDesign/designStandards/MaterialPlateDesignStandard.java +++ b/src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/MaterialPlateDesignStandard.java @@ -1,8 +1,8 @@ -package neqsim.processSimulation.mechanicalDesign.designStandards; +package neqsim.processsimulation.mechanicaldesign.designstandards; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processSimulation.mechanicalDesign.MechanicalDesign; +import neqsim.processsimulation.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.processsimulation.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/processsimulation/mechanicaldesign/designstandards/PipelineDesignStandard.java similarity index 89% rename from src/main/java/neqsim/processSimulation/mechanicalDesign/designStandards/PipelineDesignStandard.java rename to src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/PipelineDesignStandard.java index 65110623e0..92e9a633ba 100644 --- a/src/main/java/neqsim/processSimulation/mechanicalDesign/designStandards/PipelineDesignStandard.java +++ b/src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/PipelineDesignStandard.java @@ -1,8 +1,8 @@ -package neqsim.processSimulation.mechanicalDesign.designStandards; +package neqsim.processsimulation.mechanicaldesign.designstandards; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processSimulation.mechanicalDesign.MechanicalDesign; +import neqsim.processsimulation.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.processsimulation.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/processsimulation/mechanicaldesign/designstandards/PipingDesignStandard.java similarity index 66% rename from src/main/java/neqsim/processSimulation/mechanicalDesign/designStandards/PipingDesignStandard.java rename to src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/PipingDesignStandard.java index 79f7bd1ac9..ab1fc3a58e 100644 --- a/src/main/java/neqsim/processSimulation/mechanicalDesign/designStandards/PipingDesignStandard.java +++ b/src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/PipingDesignStandard.java @@ -1,6 +1,6 @@ -package neqsim.processSimulation.mechanicalDesign.designStandards; +package neqsim.processsimulation.mechanicaldesign.designstandards; -import neqsim.processSimulation.mechanicalDesign.MechanicalDesign; +import neqsim.processsimulation.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.processsimulation.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/processsimulation/mechanicaldesign/designstandards/PressureVesselDesignStandard.java similarity index 89% rename from src/main/java/neqsim/processSimulation/mechanicalDesign/designStandards/PressureVesselDesignStandard.java rename to src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/PressureVesselDesignStandard.java index a55df29194..65f50e3b92 100644 --- a/src/main/java/neqsim/processSimulation/mechanicalDesign/designStandards/PressureVesselDesignStandard.java +++ b/src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/PressureVesselDesignStandard.java @@ -1,7 +1,7 @@ -package neqsim.processSimulation.mechanicalDesign.designStandards; +package neqsim.processsimulation.mechanicaldesign.designstandards; -import neqsim.processSimulation.mechanicalDesign.MechanicalDesign; -import neqsim.processSimulation.processEquipment.separator.Separator; +import neqsim.processsimulation.mechanicaldesign.MechanicalDesign; +import neqsim.processsimulation.processequipment.separator.Separator; /** *

@@ -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.processsimulation.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/processsimulation/mechanicaldesign/designstandards/SeparatorDesignStandard.java similarity index 91% rename from src/main/java/neqsim/processSimulation/mechanicalDesign/designStandards/SeparatorDesignStandard.java rename to src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/SeparatorDesignStandard.java index 1fac2ce3ba..42f3012229 100644 --- a/src/main/java/neqsim/processSimulation/mechanicalDesign/designStandards/SeparatorDesignStandard.java +++ b/src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/SeparatorDesignStandard.java @@ -1,9 +1,9 @@ -package neqsim.processSimulation.mechanicalDesign.designStandards; +package neqsim.processsimulation.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.processsimulation.mechanicaldesign.MechanicalDesign; +import neqsim.processsimulation.processequipment.separator.SeparatorInterface; /** *

@@ -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.processsimulation.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.processsimulation.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/processsimulation/mechanicaldesign/designstandards/ValveDesignStandard.java similarity index 74% rename from src/main/java/neqsim/processSimulation/mechanicalDesign/designStandards/ValveDesignStandard.java rename to src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/ValveDesignStandard.java index 5a68a009b4..68b7c88207 100644 --- a/src/main/java/neqsim/processSimulation/mechanicalDesign/designStandards/ValveDesignStandard.java +++ b/src/main/java/neqsim/processsimulation/mechanicaldesign/designstandards/ValveDesignStandard.java @@ -1,6 +1,6 @@ -package neqsim.processSimulation.mechanicalDesign.designStandards; +package neqsim.processsimulation.mechanicaldesign.designstandards; -import neqsim.processSimulation.mechanicalDesign.MechanicalDesign; +import neqsim.processsimulation.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.processsimulation.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/processsimulation/mechanicaldesign/pipeline/PipelineMechanicalDesign.java similarity index 87% rename from src/main/java/neqsim/processSimulation/mechanicalDesign/pipeline/PipelineMechanicalDesign.java rename to src/main/java/neqsim/processsimulation/mechanicaldesign/pipeline/PipelineMechanicalDesign.java index 2d0cb32b20..b6272e7c8e 100644 --- a/src/main/java/neqsim/processSimulation/mechanicalDesign/pipeline/PipelineMechanicalDesign.java +++ b/src/main/java/neqsim/processsimulation/mechanicaldesign/pipeline/PipelineMechanicalDesign.java @@ -1,11 +1,11 @@ -package neqsim.processSimulation.mechanicalDesign.pipeline; +package neqsim.processsimulation.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.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; /** *

@@ -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.processsimulation.processequipment.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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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/processsimulation/mechanicaldesign/separator/GasScrubberMechanicalDesign.java similarity index 91% rename from src/main/java/neqsim/processSimulation/mechanicalDesign/separator/GasScrubberMechanicalDesign.java rename to src/main/java/neqsim/processsimulation/mechanicaldesign/separator/GasScrubberMechanicalDesign.java index cf65eb86b8..3225800253 100644 --- a/src/main/java/neqsim/processSimulation/mechanicalDesign/separator/GasScrubberMechanicalDesign.java +++ b/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/GasScrubberMechanicalDesign.java @@ -1,11 +1,11 @@ -package neqsim.processSimulation.mechanicalDesign.separator; +package neqsim.processsimulation.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.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; /** *

@@ -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.processsimulation.processequipment.ProcessEquipmentInterface} * object */ public GasScrubberMechanicalDesign(ProcessEquipmentInterface equipment) { diff --git a/src/main/java/neqsim/processSimulation/mechanicalDesign/separator/SeparatorMechanicalDesign.java b/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/SeparatorMechanicalDesign.java similarity index 93% rename from src/main/java/neqsim/processSimulation/mechanicalDesign/separator/SeparatorMechanicalDesign.java rename to src/main/java/neqsim/processsimulation/mechanicaldesign/separator/SeparatorMechanicalDesign.java index e718eca581..d138d9dfee 100644 --- a/src/main/java/neqsim/processSimulation/mechanicalDesign/separator/SeparatorMechanicalDesign.java +++ b/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/SeparatorMechanicalDesign.java @@ -1,19 +1,19 @@ -package neqsim.processSimulation.mechanicalDesign.separator; +package neqsim.processsimulation.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.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; /** *

@@ -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.processsimulation.processequipment.ProcessEquipmentInterface} * object */ public SeparatorMechanicalDesign(ProcessEquipmentInterface equipment) { diff --git a/src/main/java/neqsim/processSimulation/mechanicalDesign/separator/sectionType/DistillationTraySection.java b/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectionType/DistillationTraySection.java similarity index 90% rename from src/main/java/neqsim/processSimulation/mechanicalDesign/separator/sectionType/DistillationTraySection.java rename to src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectionType/DistillationTraySection.java index 4cbedcc789..94a65d9af4 100644 --- a/src/main/java/neqsim/processSimulation/mechanicalDesign/separator/sectionType/DistillationTraySection.java +++ b/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectionType/DistillationTraySection.java @@ -1,6 +1,6 @@ -package neqsim.processSimulation.mechanicalDesign.separator.sectionType; +package neqsim.processsimulation.mechanicaldesign.separator.sectionType; -import neqsim.processSimulation.processEquipment.separator.sectionType.SeparatorSection; +import neqsim.processsimulation.processequipment.separator.sectionType.SeparatorSection; /** *

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

* * @param separatorSection a - * {@link neqsim.processSimulation.processEquipment.separator.sectionType.SeparatorSection} + * {@link neqsim.processsimulation.processequipment.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/processsimulation/mechanicaldesign/separator/sectionType/MecMeshSection.java similarity index 90% rename from src/main/java/neqsim/processSimulation/mechanicalDesign/separator/sectionType/MecMeshSection.java rename to src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectionType/MecMeshSection.java index 8ea032ef9e..fde722b1b8 100644 --- a/src/main/java/neqsim/processSimulation/mechanicalDesign/separator/sectionType/MecMeshSection.java +++ b/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectionType/MecMeshSection.java @@ -1,6 +1,6 @@ -package neqsim.processSimulation.mechanicalDesign.separator.sectionType; +package neqsim.processsimulation.mechanicaldesign.separator.sectionType; -import neqsim.processSimulation.processEquipment.separator.sectionType.SeparatorSection; +import neqsim.processsimulation.processequipment.separator.sectionType.SeparatorSection; /** *

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

* * @param separatorSection a - * {@link neqsim.processSimulation.processEquipment.separator.sectionType.SeparatorSection} + * {@link neqsim.processsimulation.processequipment.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/processsimulation/mechanicaldesign/separator/sectionType/MechManwaySection.java similarity index 84% rename from src/main/java/neqsim/processSimulation/mechanicalDesign/separator/sectionType/MechManwaySection.java rename to src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectionType/MechManwaySection.java index 9b44f3e365..c08faf0ecb 100644 --- a/src/main/java/neqsim/processSimulation/mechanicalDesign/separator/sectionType/MechManwaySection.java +++ b/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectionType/MechManwaySection.java @@ -1,6 +1,6 @@ -package neqsim.processSimulation.mechanicalDesign.separator.sectionType; +package neqsim.processsimulation.mechanicaldesign.separator.sectionType; -import neqsim.processSimulation.processEquipment.separator.sectionType.SeparatorSection; +import neqsim.processsimulation.processequipment.separator.sectionType.SeparatorSection; /** *

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

* * @param separatorSection a - * {@link neqsim.processSimulation.processEquipment.separator.sectionType.SeparatorSection} + * {@link neqsim.processsimulation.processequipment.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/processsimulation/mechanicaldesign/separator/sectionType/MechNozzleSection.java similarity index 89% rename from src/main/java/neqsim/processSimulation/mechanicalDesign/separator/sectionType/MechNozzleSection.java rename to src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectionType/MechNozzleSection.java index 19e6c64358..9b96799ed3 100644 --- a/src/main/java/neqsim/processSimulation/mechanicalDesign/separator/sectionType/MechNozzleSection.java +++ b/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectionType/MechNozzleSection.java @@ -1,6 +1,6 @@ -package neqsim.processSimulation.mechanicalDesign.separator.sectionType; +package neqsim.processsimulation.mechanicaldesign.separator.sectionType; -import neqsim.processSimulation.processEquipment.separator.sectionType.SeparatorSection; +import neqsim.processsimulation.processequipment.separator.sectionType.SeparatorSection; /** *

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

* * @param separatorSection a - * {@link neqsim.processSimulation.processEquipment.separator.sectionType.SeparatorSection} + * {@link neqsim.processsimulation.processequipment.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/processsimulation/mechanicaldesign/separator/sectionType/MechVaneSection.java similarity index 90% rename from src/main/java/neqsim/processSimulation/mechanicalDesign/separator/sectionType/MechVaneSection.java rename to src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectionType/MechVaneSection.java index f4620ee716..172c75827b 100644 --- a/src/main/java/neqsim/processSimulation/mechanicalDesign/separator/sectionType/MechVaneSection.java +++ b/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectionType/MechVaneSection.java @@ -1,6 +1,6 @@ -package neqsim.processSimulation.mechanicalDesign.separator.sectionType; +package neqsim.processsimulation.mechanicaldesign.separator.sectionType; -import neqsim.processSimulation.processEquipment.separator.sectionType.SeparatorSection; +import neqsim.processsimulation.processequipment.separator.sectionType.SeparatorSection; /** *

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

* * @param separatorSection a - * {@link neqsim.processSimulation.processEquipment.separator.sectionType.SeparatorSection} + * {@link neqsim.processsimulation.processequipment.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/processsimulation/mechanicaldesign/separator/sectionType/SepDesignSection.java similarity index 92% rename from src/main/java/neqsim/processSimulation/mechanicalDesign/separator/sectionType/SepDesignSection.java rename to src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectionType/SepDesignSection.java index 87c06e5873..b64a92379b 100644 --- a/src/main/java/neqsim/processSimulation/mechanicalDesign/separator/sectionType/SepDesignSection.java +++ b/src/main/java/neqsim/processsimulation/mechanicaldesign/separator/sectionType/SepDesignSection.java @@ -1,6 +1,6 @@ -package neqsim.processSimulation.mechanicalDesign.separator.sectionType; +package neqsim.processsimulation.mechanicaldesign.separator.sectionType; -import neqsim.processSimulation.processEquipment.separator.sectionType.SeparatorSection; +import neqsim.processsimulation.processequipment.separator.sectionType.SeparatorSection; /** *

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

* * @param separatorSection a - * {@link neqsim.processSimulation.processEquipment.separator.sectionType.SeparatorSection} + * {@link neqsim.processsimulation.processequipment.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/processsimulation/mechanicaldesign/valve/ValveMechanicalDesign.java similarity index 87% rename from src/main/java/neqsim/processSimulation/mechanicalDesign/valve/ValveMechanicalDesign.java rename to src/main/java/neqsim/processsimulation/mechanicaldesign/valve/ValveMechanicalDesign.java index 4a53efcec1..0026868561 100644 --- a/src/main/java/neqsim/processSimulation/mechanicalDesign/valve/ValveMechanicalDesign.java +++ b/src/main/java/neqsim/processsimulation/mechanicaldesign/valve/ValveMechanicalDesign.java @@ -1,15 +1,15 @@ -package neqsim.processSimulation.mechanicalDesign.valve; +package neqsim.processsimulation.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.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; /** *

@@ -34,7 +34,7 @@ public class ValveMechanicalDesign extends MechanicalDesign { *

* * @param equipment a - * {@link neqsim.processSimulation.processEquipment.ProcessEquipmentInterface} + * {@link neqsim.processsimulation.processequipment.ProcessEquipmentInterface} * object */ public ValveMechanicalDesign(ProcessEquipmentInterface equipment) { diff --git a/src/main/java/neqsim/processSimulation/processEquipment/ProcessEquipmentBaseClass.java b/src/main/java/neqsim/processsimulation/processequipment/ProcessEquipmentBaseClass.java similarity index 91% rename from src/main/java/neqsim/processSimulation/processEquipment/ProcessEquipmentBaseClass.java rename to src/main/java/neqsim/processsimulation/processequipment/ProcessEquipmentBaseClass.java index a5788c0733..ca367f7473 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/ProcessEquipmentBaseClass.java +++ b/src/main/java/neqsim/processsimulation/processequipment/ProcessEquipmentBaseClass.java @@ -4,18 +4,18 @@ * Created on 6. juni 2006, 15:12 */ -package neqsim.processSimulation.processEquipment; +package neqsim.processsimulation.processequipment; 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.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.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.processsimulation.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.processsimulation.processequipment.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.processsimulation.processequipment.stream.EnergyStream} * object */ public void setEnergyStream(EnergyStream energyStream) { diff --git a/src/main/java/neqsim/processSimulation/processEquipment/ProcessEquipmentInterface.java b/src/main/java/neqsim/processsimulation/processequipment/ProcessEquipmentInterface.java similarity index 89% rename from src/main/java/neqsim/processSimulation/processEquipment/ProcessEquipmentInterface.java rename to src/main/java/neqsim/processsimulation/processequipment/ProcessEquipmentInterface.java index 62f3819b9f..9376782634 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/ProcessEquipmentInterface.java +++ b/src/main/java/neqsim/processsimulation/processequipment/ProcessEquipmentInterface.java @@ -1,8 +1,8 @@ -package neqsim.processSimulation.processEquipment; +package neqsim.processsimulation.processequipment; -import neqsim.processSimulation.SimulationInterface; -import neqsim.processSimulation.controllerDevice.ControllerDeviceInterface; -import neqsim.processSimulation.mechanicalDesign.MechanicalDesign; +import neqsim.processsimulation.SimulationInterface; +import neqsim.processsimulation.controllerdevice.ControllerDeviceInterface; +import neqsim.processsimulation.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.processsimulation.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.processsimulation.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.processsimulation.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.processsimulation.processequipment.ProcessEquipmentInterface} object */ public void runConditionAnalysis(ProcessEquipmentInterface refExchanger); diff --git a/src/main/java/neqsim/processSimulation/processEquipment/TwoPortEquipment.java b/src/main/java/neqsim/processsimulation/processequipment/TwoPortEquipment.java similarity index 95% rename from src/main/java/neqsim/processSimulation/processEquipment/TwoPortEquipment.java rename to src/main/java/neqsim/processsimulation/processequipment/TwoPortEquipment.java index 891c53f67c..b7fff9d05d 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/TwoPortEquipment.java +++ b/src/main/java/neqsim/processsimulation/processequipment/TwoPortEquipment.java @@ -1,6 +1,6 @@ -package neqsim.processSimulation.processEquipment; +package neqsim.processsimulation.processequipment; -import neqsim.processSimulation.processEquipment.stream.StreamInterface; +import neqsim.processsimulation.processequipment.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/processsimulation/processequipment/TwoPortInterface.java similarity index 93% rename from src/main/java/neqsim/processSimulation/processEquipment/TwoPortInterface.java rename to src/main/java/neqsim/processsimulation/processequipment/TwoPortInterface.java index ef665d6702..e7b5dcf5d4 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/TwoPortInterface.java +++ b/src/main/java/neqsim/processsimulation/processequipment/TwoPortInterface.java @@ -1,6 +1,6 @@ -package neqsim.processSimulation.processEquipment; +package neqsim.processsimulation.processequipment; -import neqsim.processSimulation.processEquipment.stream.StreamInterface; +import neqsim.processsimulation.processequipment.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.processsimulation.processequipment.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/processsimulation/processequipment/absorber/AbsorberInterface.java similarity index 72% rename from src/main/java/neqsim/processSimulation/processEquipment/absorber/AbsorberInterface.java rename to src/main/java/neqsim/processsimulation/processequipment/absorber/AbsorberInterface.java index 9546e4212e..e0521ffa14 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/absorber/AbsorberInterface.java +++ b/src/main/java/neqsim/processsimulation/processequipment/absorber/AbsorberInterface.java @@ -1,6 +1,6 @@ -package neqsim.processSimulation.processEquipment.absorber; +package neqsim.processsimulation.processequipment.absorber; -import neqsim.processSimulation.processEquipment.ProcessEquipmentInterface; +import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; /** *

diff --git a/src/main/java/neqsim/processSimulation/processEquipment/absorber/SimpleAbsorber.java b/src/main/java/neqsim/processsimulation/processequipment/absorber/SimpleAbsorber.java similarity index 93% rename from src/main/java/neqsim/processSimulation/processEquipment/absorber/SimpleAbsorber.java rename to src/main/java/neqsim/processsimulation/processequipment/absorber/SimpleAbsorber.java index cef60e70e0..3a26f044e0 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/absorber/SimpleAbsorber.java +++ b/src/main/java/neqsim/processsimulation/processequipment/absorber/SimpleAbsorber.java @@ -1,10 +1,10 @@ -package neqsim.processSimulation.processEquipment.absorber; +package neqsim.processsimulation.processequipment.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.processsimulation.mechanicaldesign.absorber.AbsorberMechanicalDesign; +import neqsim.processsimulation.processequipment.separator.Separator; +import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.processsimulation.processequipment.stream.StreamInterface; 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.processsimulation.processequipment.stream.StreamInterface} * object */ public SimpleAbsorber(String name, StreamInterface inStream1) { @@ -106,7 +106,7 @@ public void setdT(double dT) { * Getter for the field outStream. *

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

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

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

* * @param i a int - * @return a {@link neqsim.processSimulation.processEquipment.stream.Stream} object + * @return a {@link neqsim.processsimulation.processequipment.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/processsimulation/processequipment/absorber/SimpleTEGAbsorber.java similarity index 96% rename from src/main/java/neqsim/processSimulation/processEquipment/absorber/SimpleTEGAbsorber.java rename to src/main/java/neqsim/processsimulation/processequipment/absorber/SimpleTEGAbsorber.java index d07d1bfb6a..8150eb231a 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/absorber/SimpleTEGAbsorber.java +++ b/src/main/java/neqsim/processsimulation/processequipment/absorber/SimpleTEGAbsorber.java @@ -1,4 +1,4 @@ -package neqsim.processSimulation.processEquipment.absorber; +package neqsim.processsimulation.processequipment.absorber; import java.awt.Container; import java.awt.FlowLayout; @@ -12,10 +12,10 @@ 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.processsimulation.processequipment.ProcessEquipmentInterface; +import neqsim.processsimulation.processequipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +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.processsimulation.processequipment.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.processsimulation.processequipment.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.processsimulation.processequipment.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.processsimulation.processequipment.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.processsimulation.processequipment.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.processsimulation.processequipment.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.processsimulation.processequipment.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.processsimulation.processequipment.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/processsimulation/processequipment/absorber/WaterStripperColumn.java similarity index 96% rename from src/main/java/neqsim/processSimulation/processEquipment/absorber/WaterStripperColumn.java rename to src/main/java/neqsim/processsimulation/processequipment/absorber/WaterStripperColumn.java index fefb6fb9ed..8011cb7496 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/absorber/WaterStripperColumn.java +++ b/src/main/java/neqsim/processsimulation/processequipment/absorber/WaterStripperColumn.java @@ -1,4 +1,4 @@ -package neqsim.processSimulation.processEquipment.absorber; +package neqsim.processsimulation.processequipment.absorber; import java.awt.Container; import java.awt.FlowLayout; @@ -12,10 +12,10 @@ import javax.swing.JTable; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.processSimulation.processEquipment.stream.StreamInterface; +import neqsim.processsimulation.processequipment.stream.StreamInterface; import neqsim.thermo.phase.PhaseType; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +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.processsimulation.processequipment.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.processsimulation.processequipment.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.processsimulation.processequipment.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.processsimulation.processequipment.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.processsimulation.processequipment.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.processsimulation.processequipment.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.processsimulation.processequipment.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/processsimulation/processequipment/adsorber/SimpleAdsorber.java similarity index 94% rename from src/main/java/neqsim/processSimulation/processEquipment/adsorber/SimpleAdsorber.java rename to src/main/java/neqsim/processsimulation/processequipment/adsorber/SimpleAdsorber.java index 4c399d13de..7ff47ef22f 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/adsorber/SimpleAdsorber.java +++ b/src/main/java/neqsim/processsimulation/processequipment/adsorber/SimpleAdsorber.java @@ -1,10 +1,10 @@ -package neqsim.processSimulation.processEquipment.adsorber; +package neqsim.processsimulation.processequipment.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.processsimulation.mechanicaldesign.adsorber.AdsorberMechanicalDesign; +import neqsim.processsimulation.processequipment.ProcessEquipmentBaseClass; +import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.processsimulation.processequipment.stream.StreamInterface; 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.processsimulation.processequipment.stream.StreamInterface} * object */ public SimpleAdsorber(String name, StreamInterface inStream1) { @@ -106,7 +106,7 @@ public void setdT(double dT) { *

* * @param i a int - * @return a {@link neqsim.processSimulation.processEquipment.stream.StreamInterface} object + * @return a {@link neqsim.processsimulation.processequipment.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/processsimulation/processequipment/compressor/AntiSurge.java similarity index 97% rename from src/main/java/neqsim/processSimulation/processEquipment/compressor/AntiSurge.java rename to src/main/java/neqsim/processsimulation/processequipment/compressor/AntiSurge.java index e2c3f68e14..51871b9ebd 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/compressor/AntiSurge.java +++ b/src/main/java/neqsim/processsimulation/processequipment/compressor/AntiSurge.java @@ -1,4 +1,4 @@ -package neqsim.processSimulation.processEquipment.compressor; +package neqsim.processsimulation.processequipment.compressor; import java.util.Objects; diff --git a/src/main/java/neqsim/processSimulation/processEquipment/compressor/Compressor.java b/src/main/java/neqsim/processsimulation/processequipment/compressor/Compressor.java similarity index 98% rename from src/main/java/neqsim/processSimulation/processEquipment/compressor/Compressor.java rename to src/main/java/neqsim/processsimulation/processequipment/compressor/Compressor.java index 8f2ccc8eec..aef35317de 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/compressor/Compressor.java +++ b/src/main/java/neqsim/processsimulation/processequipment/compressor/Compressor.java @@ -1,4 +1,4 @@ -package neqsim.processSimulation.processEquipment.compressor; +package neqsim.processsimulation.processequipment.compressor; import java.awt.Container; import java.awt.FlowLayout; @@ -13,13 +13,13 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import com.google.gson.GsonBuilder; -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.processsimulation.mechanicaldesign.compressor.CompressorMechanicalDesign; +import neqsim.processsimulation.processequipment.TwoPortEquipment; +import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.processsimulation.util.monitor.CompressorResponse; import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

@@ -79,7 +79,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.processsimulation.processequipment.stream.StreamInterface} * object */ public Compressor(String name, StreamInterface inletStream) { @@ -925,7 +925,7 @@ public SystemInterface getThermoSystem() { * Getter for the field compressorChart. *

* - * @return a {@link neqsim.processSimulation.processEquipment.compressor.CompressorChartInterface} + * @return a {@link neqsim.processsimulation.processequipment.compressor.CompressorChartInterface} * object */ public CompressorChartInterface getCompressorChart() { @@ -938,7 +938,7 @@ public CompressorChartInterface getCompressorChart() { *

* * @param compressorChart a - * {@link neqsim.processSimulation.processEquipment.compressor.CompressorChart} object + * {@link neqsim.processsimulation.processequipment.compressor.CompressorChart} object */ public void setCompressorChart(CompressorChart compressorChart) { this.compressorChart = compressorChart; @@ -989,7 +989,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.processsimulation.processequipment.compressor.AntiSurge} * object */ public void setAntiSurge(AntiSurge antiSurge) { @@ -1252,7 +1252,7 @@ public void setUseGERG2008(boolean useGERG2008) { *

* * @return a - * {@link neqsim.processSimulation.processEquipment.compressor.CompressorPropertyProfile} + * {@link neqsim.processsimulation.processequipment.compressor.CompressorPropertyProfile} * object */ public CompressorPropertyProfile getPropertyProfile() { @@ -1265,7 +1265,7 @@ public CompressorPropertyProfile getPropertyProfile() { *

* * @param propertyProfile a - * {@link neqsim.processSimulation.processEquipment.compressor.CompressorPropertyProfile} + * {@link neqsim.processsimulation.processequipment.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/processsimulation/processequipment/compressor/CompressorChart.java similarity index 96% rename from src/main/java/neqsim/processSimulation/processEquipment/compressor/CompressorChart.java rename to src/main/java/neqsim/processsimulation/processequipment/compressor/CompressorChart.java index fd48aba400..5e25c53c5b 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/compressor/CompressorChart.java +++ b/src/main/java/neqsim/processsimulation/processequipment/compressor/CompressorChart.java @@ -1,4 +1,4 @@ -package neqsim.processSimulation.processEquipment.compressor; +package neqsim.processsimulation.processequipment.compressor; import java.util.ArrayList; import java.util.Arrays; @@ -331,23 +331,23 @@ public void setUseRealKappa(boolean useRealKappa) { /** {@inheritDoc} */ @Override public void plot() { - neqsim.dataPresentation.JFreeChart.graph2b graph = - new neqsim.dataPresentation.JFreeChart.graph2b(flow, head, + neqsim.datapresentation.jfreechart.Graph2b graph = + new neqsim.datapresentation.jfreechart.Graph2b(flow, head, Arrays.stream(speed).mapToObj(String::valueOf).toArray(String[]::new), "head vs flow", "flow", "head"); graph.setVisible(true); - neqsim.dataPresentation.JFreeChart.graph2b graph2 = - new neqsim.dataPresentation.JFreeChart.graph2b(flow, polytropicEfficiency, + neqsim.datapresentation.jfreechart.Graph2b graph2 = + new neqsim.datapresentation.jfreechart.Graph2b(flow, polytropicEfficiency, Arrays.stream(speed).mapToObj(String::valueOf).toArray(String[]::new), "eff vs flow", "flow", "eff"); graph2.setVisible(true); - neqsim.dataPresentation.JFreeChart.graph2b graph3 = - new neqsim.dataPresentation.JFreeChart.graph2b(redflow, redhead, + neqsim.datapresentation.jfreechart.Graph2b graph3 = + new neqsim.datapresentation.jfreechart.Graph2b(redflow, redhead, Arrays.stream(speed).mapToObj(String::valueOf).toArray(String[]::new), "red head vs red flow", "red flow", "red head"); graph3.setVisible(true); - neqsim.dataPresentation.JFreeChart.graph2b graph4 = - new neqsim.dataPresentation.JFreeChart.graph2b(redflow, polytropicEfficiency, + neqsim.datapresentation.jfreechart.Graph2b graph4 = + new neqsim.datapresentation.jfreechart.Graph2b(redflow, polytropicEfficiency, Arrays.stream(speed).mapToObj(String::valueOf).toArray(String[]::new), "red eff vs red dflow", "red flow", "red eff"); graph4.setVisible(true); diff --git a/src/main/java/neqsim/processSimulation/processEquipment/compressor/CompressorChartAlternativeMapLookup.java b/src/main/java/neqsim/processsimulation/processequipment/compressor/CompressorChartAlternativeMapLookup.java similarity index 98% rename from src/main/java/neqsim/processSimulation/processEquipment/compressor/CompressorChartAlternativeMapLookup.java rename to src/main/java/neqsim/processsimulation/processequipment/compressor/CompressorChartAlternativeMapLookup.java index f4c47b52bb..668ed55b32 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/compressor/CompressorChartAlternativeMapLookup.java +++ b/src/main/java/neqsim/processsimulation/processequipment/compressor/CompressorChartAlternativeMapLookup.java @@ -1,4 +1,4 @@ -package neqsim.processSimulation.processEquipment.compressor; +package neqsim.processsimulation.processequipment.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.processsimulation.processequipment.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.processsimulation.processequipment.compressor.CompressorCurve} object */ public CompressorCurve getCurveAtRefSpeed(double refSpeed) { for (int i = 0; i < chartValues.size(); i++) { @@ -434,8 +434,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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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/processsimulation/processequipment/compressor/CompressorChartGenerator.java similarity index 92% rename from src/main/java/neqsim/processSimulation/processEquipment/compressor/CompressorChartGenerator.java rename to src/main/java/neqsim/processsimulation/processequipment/compressor/CompressorChartGenerator.java index d1b18144d3..8f3b378120 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/compressor/CompressorChartGenerator.java +++ b/src/main/java/neqsim/processsimulation/processequipment/compressor/CompressorChartGenerator.java @@ -1,4 +1,4 @@ -package neqsim.processSimulation.processEquipment.compressor; +package neqsim.processsimulation.processequipment.compressor; /** * Compressor chart generator. @@ -13,7 +13,7 @@ public class CompressorChartGenerator { * Constructor for CompressorChartGenerator. *

* - * @param inpcompressor a {@link neqsim.processSimulation.processEquipment.compressor.Compressor} + * @param inpcompressor a {@link neqsim.processsimulation.processequipment.compressor.Compressor} * object */ public CompressorChartGenerator(Compressor inpcompressor) { @@ -26,7 +26,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.processsimulation.processequipment.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/processsimulation/processequipment/compressor/CompressorChartInterface.java similarity index 91% rename from src/main/java/neqsim/processSimulation/processEquipment/compressor/CompressorChartInterface.java rename to src/main/java/neqsim/processsimulation/processequipment/compressor/CompressorChartInterface.java index 2a2178a078..e85500737e 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/compressor/CompressorChartInterface.java +++ b/src/main/java/neqsim/processsimulation/processequipment/compressor/CompressorChartInterface.java @@ -1,4 +1,4 @@ -package neqsim.processSimulation.processEquipment.compressor; +package neqsim.processsimulation.processequipment.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.processsimulation.processequipment.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.processsimulation.processequipment.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.processsimulation.processequipment.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.processsimulation.processequipment.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/processsimulation/processequipment/compressor/CompressorCurve.java similarity index 96% rename from src/main/java/neqsim/processSimulation/processEquipment/compressor/CompressorCurve.java rename to src/main/java/neqsim/processsimulation/processequipment/compressor/CompressorCurve.java index 9fd12cb869..075e06e1aa 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/compressor/CompressorCurve.java +++ b/src/main/java/neqsim/processsimulation/processequipment/compressor/CompressorCurve.java @@ -1,4 +1,4 @@ -package neqsim.processSimulation.processEquipment.compressor; +package neqsim.processsimulation.processequipment.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/processsimulation/processequipment/compressor/CompressorInterface.java similarity index 86% rename from src/main/java/neqsim/processSimulation/processEquipment/compressor/CompressorInterface.java rename to src/main/java/neqsim/processsimulation/processequipment/compressor/CompressorInterface.java index d78bb058db..27d1c30223 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/compressor/CompressorInterface.java +++ b/src/main/java/neqsim/processsimulation/processequipment/compressor/CompressorInterface.java @@ -4,10 +4,10 @@ * Created on 22. august 2001, 17:20 */ -package neqsim.processSimulation.processEquipment.compressor; +package neqsim.processsimulation.processequipment.compressor; -import neqsim.processSimulation.processEquipment.ProcessEquipmentInterface; -import neqsim.processSimulation.processEquipment.TwoPortInterface; +import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; +import neqsim.processsimulation.processequipment.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.processsimulation.processequipment.compressor.AntiSurge} object */ public AntiSurge getAntiSurge(); diff --git a/src/main/java/neqsim/processSimulation/processEquipment/compressor/CompressorPropertyProfile.java b/src/main/java/neqsim/processsimulation/processequipment/compressor/CompressorPropertyProfile.java similarity index 96% rename from src/main/java/neqsim/processSimulation/processEquipment/compressor/CompressorPropertyProfile.java rename to src/main/java/neqsim/processsimulation/processequipment/compressor/CompressorPropertyProfile.java index 5a155a94ee..19a7e4537d 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/compressor/CompressorPropertyProfile.java +++ b/src/main/java/neqsim/processsimulation/processequipment/compressor/CompressorPropertyProfile.java @@ -1,4 +1,4 @@ -package neqsim.processSimulation.processEquipment.compressor; +package neqsim.processsimulation.processequipment.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/processsimulation/processequipment/compressor/StoneWallCurve.java similarity index 98% rename from src/main/java/neqsim/processSimulation/processEquipment/compressor/StoneWallCurve.java rename to src/main/java/neqsim/processsimulation/processequipment/compressor/StoneWallCurve.java index 6727b9f236..c0d8b3af99 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/compressor/StoneWallCurve.java +++ b/src/main/java/neqsim/processsimulation/processequipment/compressor/StoneWallCurve.java @@ -1,4 +1,4 @@ -package neqsim.processSimulation.processEquipment.compressor; +package neqsim.processsimulation.processequipment.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/processsimulation/processequipment/compressor/SurgeCurve.java similarity index 98% rename from src/main/java/neqsim/processSimulation/processEquipment/compressor/SurgeCurve.java rename to src/main/java/neqsim/processsimulation/processequipment/compressor/SurgeCurve.java index e432b63b63..a9ce3e5c32 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/compressor/SurgeCurve.java +++ b/src/main/java/neqsim/processsimulation/processequipment/compressor/SurgeCurve.java @@ -1,4 +1,4 @@ -package neqsim.processSimulation.processEquipment.compressor; +package neqsim.processsimulation.processequipment.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/processsimulation/processequipment/distillation/Condenser.java similarity index 91% rename from src/main/java/neqsim/processSimulation/processEquipment/distillation/Condenser.java rename to src/main/java/neqsim/processsimulation/processequipment/distillation/Condenser.java index 4bb8c4f304..4f11891bae 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/distillation/Condenser.java +++ b/src/main/java/neqsim/processsimulation/processequipment/distillation/Condenser.java @@ -1,11 +1,11 @@ -package neqsim.processSimulation.processEquipment.distillation; +package neqsim.processsimulation.processequipment.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.processsimulation.processequipment.splitter.Splitter; +import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.processsimulation.processequipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +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.processsimulation.processequipment.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/processsimulation/processequipment/distillation/DistillationColumn.java similarity index 95% rename from src/main/java/neqsim/processSimulation/processEquipment/distillation/DistillationColumn.java rename to src/main/java/neqsim/processsimulation/processequipment/distillation/DistillationColumn.java index f2305d2f7b..9a25138acb 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/distillation/DistillationColumn.java +++ b/src/main/java/neqsim/processsimulation/processequipment/distillation/DistillationColumn.java @@ -1,17 +1,17 @@ -package neqsim.processSimulation.processEquipment.distillation; +package neqsim.processsimulation.processequipment.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.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.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +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.processsimulation.processsystem.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.processsimulation.processsystem.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.processsimulation.processequipment.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.processsimulation.processequipment.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.processsimulation.processequipment.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.processsimulation.processequipment.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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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.processsimulation.processequipment.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.processsimulation.processequipment.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/processsimulation/processequipment/distillation/DistillationInterface.java similarity index 71% rename from src/main/java/neqsim/processSimulation/processEquipment/distillation/DistillationInterface.java rename to src/main/java/neqsim/processsimulation/processequipment/distillation/DistillationInterface.java index de87bdeee3..560ca3d1d5 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/distillation/DistillationInterface.java +++ b/src/main/java/neqsim/processsimulation/processequipment/distillation/DistillationInterface.java @@ -1,6 +1,6 @@ -package neqsim.processSimulation.processEquipment.distillation; +package neqsim.processsimulation.processequipment.distillation; -import neqsim.processSimulation.processEquipment.ProcessEquipmentInterface; +import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; /** *

diff --git a/src/main/java/neqsim/processSimulation/processEquipment/distillation/Reboiler.java b/src/main/java/neqsim/processsimulation/processequipment/distillation/Reboiler.java similarity index 92% rename from src/main/java/neqsim/processSimulation/processEquipment/distillation/Reboiler.java rename to src/main/java/neqsim/processsimulation/processequipment/distillation/Reboiler.java index a9617c64ff..f9408373ac 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/distillation/Reboiler.java +++ b/src/main/java/neqsim/processsimulation/processequipment/distillation/Reboiler.java @@ -1,8 +1,8 @@ -package neqsim.processSimulation.processEquipment.distillation; +package neqsim.processsimulation.processequipment.distillation; import java.util.UUID; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

@@ -12,7 +12,7 @@ * @author ESOL * @version $Id: $Id */ -public class Reboiler extends neqsim.processSimulation.processEquipment.distillation.SimpleTray { +public class Reboiler extends neqsim.processsimulation.processequipment.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/processsimulation/processequipment/distillation/SimpleTray.java similarity index 92% rename from src/main/java/neqsim/processSimulation/processEquipment/distillation/SimpleTray.java rename to src/main/java/neqsim/processsimulation/processequipment/distillation/SimpleTray.java index 91c30f713f..19fbe66b50 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/distillation/SimpleTray.java +++ b/src/main/java/neqsim/processsimulation/processequipment/distillation/SimpleTray.java @@ -1,12 +1,12 @@ -package neqsim.processSimulation.processEquipment.distillation; +package neqsim.processsimulation.processequipment.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.processsimulation.processequipment.stream.Stream; +import neqsim.processsimulation.processequipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +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.processsimulation.processequipment.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.processsimulation.processequipment.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.processsimulation.processequipment.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/processsimulation/processequipment/distillation/TrayInterface.java similarity index 64% rename from src/main/java/neqsim/processSimulation/processEquipment/distillation/TrayInterface.java rename to src/main/java/neqsim/processsimulation/processequipment/distillation/TrayInterface.java index 7e09b2b22d..9e1d574d33 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/distillation/TrayInterface.java +++ b/src/main/java/neqsim/processsimulation/processequipment/distillation/TrayInterface.java @@ -1,7 +1,7 @@ -package neqsim.processSimulation.processEquipment.distillation; +package neqsim.processsimulation.processequipment.distillation; -import neqsim.processSimulation.processEquipment.ProcessEquipmentInterface; -import neqsim.processSimulation.processEquipment.stream.StreamInterface; +import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; +import neqsim.processsimulation.processequipment.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.processsimulation.processequipment.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/processsimulation/processequipment/distillation/VLSolidTray.java similarity index 93% rename from src/main/java/neqsim/processSimulation/processEquipment/distillation/VLSolidTray.java rename to src/main/java/neqsim/processsimulation/processequipment/distillation/VLSolidTray.java index 0a44e67337..540d7d87ff 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/distillation/VLSolidTray.java +++ b/src/main/java/neqsim/processsimulation/processequipment/distillation/VLSolidTray.java @@ -1,10 +1,10 @@ -package neqsim.processSimulation.processEquipment.distillation; +package neqsim.processsimulation.processequipment.distillation; import java.util.UUID; -import neqsim.processSimulation.processEquipment.stream.Stream; -import neqsim.processSimulation.processEquipment.stream.StreamInterface; +import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.processsimulation.processequipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/main/java/neqsim/processSimulation/processEquipment/expander/Expander.java b/src/main/java/neqsim/processsimulation/processequipment/expander/Expander.java similarity index 90% rename from src/main/java/neqsim/processSimulation/processEquipment/expander/Expander.java rename to src/main/java/neqsim/processsimulation/processequipment/expander/Expander.java index 66b91ee736..c4a13cd965 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/expander/Expander.java +++ b/src/main/java/neqsim/processsimulation/processequipment/expander/Expander.java @@ -1,9 +1,9 @@ -package neqsim.processSimulation.processEquipment.expander; +package neqsim.processsimulation.processequipment.expander; import java.util.UUID; -import neqsim.processSimulation.processEquipment.compressor.Compressor; -import neqsim.processSimulation.processEquipment.stream.StreamInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.processsimulation.processequipment.compressor.Compressor; +import neqsim.processsimulation.processequipment.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.processsimulation.processequipment.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/processsimulation/processequipment/expander/ExpanderInterface.java similarity index 61% rename from src/main/java/neqsim/processSimulation/processEquipment/expander/ExpanderInterface.java rename to src/main/java/neqsim/processsimulation/processequipment/expander/ExpanderInterface.java index 5d48369aff..614b4fc86b 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/expander/ExpanderInterface.java +++ b/src/main/java/neqsim/processsimulation/processequipment/expander/ExpanderInterface.java @@ -1,7 +1,7 @@ -package neqsim.processSimulation.processEquipment.expander; +package neqsim.processsimulation.processequipment.expander; -import neqsim.processSimulation.processEquipment.ProcessEquipmentInterface; -import neqsim.processSimulation.processEquipment.TwoPortInterface; +import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; +import neqsim.processsimulation.processequipment.TwoPortInterface; /** *

diff --git a/src/main/java/neqsim/processSimulation/processEquipment/expander/ExpanderOld.java b/src/main/java/neqsim/processsimulation/processequipment/expander/ExpanderOld.java similarity index 95% rename from src/main/java/neqsim/processSimulation/processEquipment/expander/ExpanderOld.java rename to src/main/java/neqsim/processsimulation/processequipment/expander/ExpanderOld.java index 64447dcffc..2407cf4fc8 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/expander/ExpanderOld.java +++ b/src/main/java/neqsim/processsimulation/processequipment/expander/ExpanderOld.java @@ -1,4 +1,4 @@ -package neqsim.processSimulation.processEquipment.expander; +package neqsim.processsimulation.processequipment.expander; import java.awt.Container; import java.awt.FlowLayout; @@ -9,10 +9,10 @@ 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.processsimulation.processequipment.TwoPortEquipment; +import neqsim.processsimulation.processequipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +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.processsimulation.processequipment.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/processsimulation/processequipment/filter/CharCoalFilter.java similarity index 77% rename from src/main/java/neqsim/processSimulation/processEquipment/filter/CharCoalFilter.java rename to src/main/java/neqsim/processsimulation/processequipment/filter/CharCoalFilter.java index 87e6890d46..68b8ad6f2e 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/filter/CharCoalFilter.java +++ b/src/main/java/neqsim/processsimulation/processequipment/filter/CharCoalFilter.java @@ -1,6 +1,6 @@ -package neqsim.processSimulation.processEquipment.filter; +package neqsim.processsimulation.processequipment.filter; -import neqsim.processSimulation.processEquipment.stream.StreamInterface; +import neqsim.processsimulation.processequipment.stream.StreamInterface; /** *

diff --git a/src/main/java/neqsim/processSimulation/processEquipment/filter/Filter.java b/src/main/java/neqsim/processsimulation/processequipment/filter/Filter.java similarity index 86% rename from src/main/java/neqsim/processSimulation/processEquipment/filter/Filter.java rename to src/main/java/neqsim/processsimulation/processequipment/filter/Filter.java index 23b59af016..e3b82ef696 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/filter/Filter.java +++ b/src/main/java/neqsim/processsimulation/processequipment/filter/Filter.java @@ -1,11 +1,11 @@ -package neqsim.processSimulation.processEquipment.filter; +package neqsim.processsimulation.processequipment.filter; import java.util.UUID; -import neqsim.processSimulation.processEquipment.ProcessEquipmentInterface; -import neqsim.processSimulation.processEquipment.TwoPortEquipment; -import neqsim.processSimulation.processEquipment.stream.StreamInterface; +import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; +import neqsim.processsimulation.processequipment.TwoPortEquipment; +import neqsim.processsimulation.processequipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +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.processsimulation.processequipment.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/processsimulation/processequipment/heatExchanger/Cooler.java similarity index 83% rename from src/main/java/neqsim/processSimulation/processEquipment/heatExchanger/Cooler.java rename to src/main/java/neqsim/processsimulation/processequipment/heatExchanger/Cooler.java index 3120ca3d15..e826bdc903 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/heatExchanger/Cooler.java +++ b/src/main/java/neqsim/processsimulation/processequipment/heatExchanger/Cooler.java @@ -1,9 +1,9 @@ -package neqsim.processSimulation.processEquipment.heatExchanger; +package neqsim.processsimulation.processequipment.heatExchanger; import java.util.UUID; import com.google.gson.GsonBuilder; -import neqsim.processSimulation.processEquipment.stream.StreamInterface; -import neqsim.processSimulation.util.monitor.HeaterResponse; +import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.processsimulation.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.processsimulation.processequipment.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/processsimulation/processequipment/heatExchanger/HeatExchanger.java similarity index 97% rename from src/main/java/neqsim/processSimulation/processEquipment/heatExchanger/HeatExchanger.java rename to src/main/java/neqsim/processsimulation/processequipment/heatExchanger/HeatExchanger.java index 090ebcd0db..d88882ade9 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/heatExchanger/HeatExchanger.java +++ b/src/main/java/neqsim/processsimulation/processequipment/heatExchanger/HeatExchanger.java @@ -4,17 +4,17 @@ * Created on 15. mars 2001, 14:17 */ -package neqsim.processSimulation.processEquipment.heatExchanger; +package neqsim.processsimulation.processequipment.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.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.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

@@ -91,7 +91,7 @@ public HeatExchanger(String name, StreamInterface inStream1, StreamInterface inS * addInStream. *

* - * @param inStream a {@link neqsim.processSimulation.processEquipment.stream.StreamInterface} + * @param inStream a {@link neqsim.processsimulation.processequipment.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.processsimulation.processequipment.stream.StreamInterface} * object */ public void setFeedStream(int number, StreamInterface inStream) { @@ -138,7 +138,7 @@ public StreamInterface getOutStream(int i) { *

* * @param i a int - * @return a {@link neqsim.processSimulation.processEquipment.stream.StreamInterface} object + * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object */ public StreamInterface getInStream(int i) { return inStream[i]; diff --git a/src/main/java/neqsim/processSimulation/processEquipment/heatExchanger/HeatExchangerInterface.java b/src/main/java/neqsim/processsimulation/processequipment/heatExchanger/HeatExchangerInterface.java similarity index 61% rename from src/main/java/neqsim/processSimulation/processEquipment/heatExchanger/HeatExchangerInterface.java rename to src/main/java/neqsim/processsimulation/processequipment/heatExchanger/HeatExchangerInterface.java index f0c5b57273..9f02c4868f 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/heatExchanger/HeatExchangerInterface.java +++ b/src/main/java/neqsim/processsimulation/processequipment/heatExchanger/HeatExchangerInterface.java @@ -1,4 +1,4 @@ -package neqsim.processSimulation.processEquipment.heatExchanger; +package neqsim.processsimulation.processequipment.heatExchanger; /** *

@@ -15,7 +15,7 @@ public interface HeatExchangerInterface extends HeaterInterface { *

* * @param i a int - * @return a {@link neqsim.processSimulation.processEquipment.stream.StreamInterface} object + * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object */ - public neqsim.processSimulation.processEquipment.stream.StreamInterface getOutStream(int i); + public neqsim.processsimulation.processequipment.stream.StreamInterface getOutStream(int i); } diff --git a/src/main/java/neqsim/processSimulation/processEquipment/heatExchanger/Heater.java b/src/main/java/neqsim/processsimulation/processequipment/heatExchanger/Heater.java similarity index 95% rename from src/main/java/neqsim/processSimulation/processEquipment/heatExchanger/Heater.java rename to src/main/java/neqsim/processsimulation/processequipment/heatExchanger/Heater.java index de9f5abb4f..3f93c496c2 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/heatExchanger/Heater.java +++ b/src/main/java/neqsim/processsimulation/processequipment/heatExchanger/Heater.java @@ -4,16 +4,16 @@ * Created on 15. mars 2001, 14:17 */ -package neqsim.processSimulation.processEquipment.heatExchanger; +package neqsim.processsimulation.processequipment.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.processsimulation.processequipment.TwoPortEquipment; +import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.processsimulation.util.monitor.HeaterResponse; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +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.processsimulation.processequipment.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/processsimulation/processequipment/heatExchanger/HeaterInterface.java similarity index 87% rename from src/main/java/neqsim/processSimulation/processEquipment/heatExchanger/HeaterInterface.java rename to src/main/java/neqsim/processsimulation/processequipment/heatExchanger/HeaterInterface.java index f0f75ec14a..bc48693e89 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/heatExchanger/HeaterInterface.java +++ b/src/main/java/neqsim/processsimulation/processequipment/heatExchanger/HeaterInterface.java @@ -1,6 +1,6 @@ -package neqsim.processSimulation.processEquipment.heatExchanger; +package neqsim.processsimulation.processequipment.heatExchanger; -import neqsim.processSimulation.SimulationInterface; +import neqsim.processsimulation.SimulationInterface; /** *

diff --git a/src/main/java/neqsim/processSimulation/processEquipment/heatExchanger/NeqHeater.java b/src/main/java/neqsim/processsimulation/processequipment/heatExchanger/NeqHeater.java similarity index 92% rename from src/main/java/neqsim/processSimulation/processEquipment/heatExchanger/NeqHeater.java rename to src/main/java/neqsim/processsimulation/processequipment/heatExchanger/NeqHeater.java index 01b2dbc546..ddeb1b47e1 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/heatExchanger/NeqHeater.java +++ b/src/main/java/neqsim/processsimulation/processequipment/heatExchanger/NeqHeater.java @@ -1,7 +1,7 @@ -package neqsim.processSimulation.processEquipment.heatExchanger; +package neqsim.processsimulation.processequipment.heatExchanger; import java.util.UUID; -import neqsim.processSimulation.processEquipment.stream.StreamInterface; +import neqsim.processsimulation.processequipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; /** diff --git a/src/main/java/neqsim/processSimulation/processEquipment/heatExchanger/ReBoiler.java b/src/main/java/neqsim/processsimulation/processequipment/heatExchanger/ReBoiler.java similarity index 86% rename from src/main/java/neqsim/processSimulation/processEquipment/heatExchanger/ReBoiler.java rename to src/main/java/neqsim/processsimulation/processequipment/heatExchanger/ReBoiler.java index cf76b80999..3f9235d0bc 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/heatExchanger/ReBoiler.java +++ b/src/main/java/neqsim/processsimulation/processequipment/heatExchanger/ReBoiler.java @@ -1,10 +1,10 @@ -package neqsim.processSimulation.processEquipment.heatExchanger; +package neqsim.processsimulation.processequipment.heatExchanger; import java.util.UUID; -import neqsim.processSimulation.processEquipment.TwoPortEquipment; -import neqsim.processSimulation.processEquipment.stream.StreamInterface; +import neqsim.processsimulation.processequipment.TwoPortEquipment; +import neqsim.processsimulation.processequipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +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.processsimulation.processequipment.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/processsimulation/processequipment/manifold/Manifold.java similarity index 80% rename from src/main/java/neqsim/processSimulation/processEquipment/manifold/Manifold.java rename to src/main/java/neqsim/processsimulation/processequipment/manifold/Manifold.java index a547a8c98b..d58b4134ba 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/manifold/Manifold.java +++ b/src/main/java/neqsim/processsimulation/processequipment/manifold/Manifold.java @@ -1,12 +1,12 @@ -package neqsim.processSimulation.processEquipment.manifold; +package neqsim.processsimulation.processequipment.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.processsimulation.processequipment.ProcessEquipmentBaseClass; +import neqsim.processsimulation.processequipment.mixer.Mixer; +import neqsim.processsimulation.processequipment.splitter.Splitter; +import neqsim.processsimulation.processequipment.stream.StreamInterface; /** *

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

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

getSplitStream.

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

* - * @return a {@link neqsim.processSimulation.processEquipment.stream.StreamInterface} + * @return a {@link neqsim.processsimulation.processequipment.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/processsimulation/processequipment/mixer/Mixer.java similarity index 98% rename from src/main/java/neqsim/processSimulation/processEquipment/mixer/Mixer.java rename to src/main/java/neqsim/processsimulation/processequipment/mixer/Mixer.java index 188c8db4ad..a9fdaf31d5 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/mixer/Mixer.java +++ b/src/main/java/neqsim/processsimulation/processequipment/mixer/Mixer.java @@ -1,4 +1,4 @@ -package neqsim.processSimulation.processEquipment.mixer; +package neqsim.processsimulation.processequipment.mixer; import java.awt.Container; import java.awt.FlowLayout; @@ -14,10 +14,10 @@ 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.processsimulation.processequipment.ProcessEquipmentBaseClass; +import neqsim.processsimulation.processequipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +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.processsimulation.processequipment.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/processsimulation/processequipment/mixer/MixerInterface.java similarity index 74% rename from src/main/java/neqsim/processSimulation/processEquipment/mixer/MixerInterface.java rename to src/main/java/neqsim/processsimulation/processequipment/mixer/MixerInterface.java index 390fd06220..662243ed6d 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/mixer/MixerInterface.java +++ b/src/main/java/neqsim/processsimulation/processequipment/mixer/MixerInterface.java @@ -4,10 +4,10 @@ * Created on 21. august 2001, 22:28 */ -package neqsim.processSimulation.processEquipment.mixer; +package neqsim.processsimulation.processequipment.mixer; -import neqsim.processSimulation.processEquipment.ProcessEquipmentInterface; -import neqsim.processSimulation.processEquipment.stream.StreamInterface; +import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; +import neqsim.processsimulation.processequipment.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.processsimulation.processequipment.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.processsimulation.processequipment.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.processsimulation.processequipment.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.processsimulation.processequipment.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/processsimulation/processequipment/mixer/StaticMixer.java similarity index 97% rename from src/main/java/neqsim/processSimulation/processEquipment/mixer/StaticMixer.java rename to src/main/java/neqsim/processsimulation/processequipment/mixer/StaticMixer.java index d37a85f948..54becee622 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/mixer/StaticMixer.java +++ b/src/main/java/neqsim/processsimulation/processequipment/mixer/StaticMixer.java @@ -4,10 +4,10 @@ * Created on 11. mars 2001, 01:49 */ -package neqsim.processSimulation.processEquipment.mixer; +package neqsim.processsimulation.processequipment.mixer; import java.util.UUID; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/main/java/neqsim/processSimulation/processEquipment/mixer/StaticNeqMixer.java b/src/main/java/neqsim/processsimulation/processequipment/mixer/StaticNeqMixer.java similarity index 97% rename from src/main/java/neqsim/processSimulation/processEquipment/mixer/StaticNeqMixer.java rename to src/main/java/neqsim/processsimulation/processequipment/mixer/StaticNeqMixer.java index 5cfe43337d..2876a89d17 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/mixer/StaticNeqMixer.java +++ b/src/main/java/neqsim/processsimulation/processequipment/mixer/StaticNeqMixer.java @@ -4,11 +4,11 @@ * Created on 11. mars 2001, 01:49 */ -package neqsim.processSimulation.processEquipment.mixer; +package neqsim.processsimulation.processequipment.mixer; import java.util.UUID; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/main/java/neqsim/processSimulation/processEquipment/mixer/StaticPhaseMixer.java b/src/main/java/neqsim/processsimulation/processequipment/mixer/StaticPhaseMixer.java similarity index 98% rename from src/main/java/neqsim/processSimulation/processEquipment/mixer/StaticPhaseMixer.java rename to src/main/java/neqsim/processsimulation/processequipment/mixer/StaticPhaseMixer.java index 4e154cbc52..3826735f18 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/mixer/StaticPhaseMixer.java +++ b/src/main/java/neqsim/processsimulation/processequipment/mixer/StaticPhaseMixer.java @@ -1,4 +1,4 @@ -package neqsim.processSimulation.processEquipment.mixer; +package neqsim.processsimulation.processequipment.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/processsimulation/processequipment/pipeline/AdiabaticPipe.java similarity index 95% rename from src/main/java/neqsim/processSimulation/processEquipment/pipeline/AdiabaticPipe.java rename to src/main/java/neqsim/processsimulation/processequipment/pipeline/AdiabaticPipe.java index 7e9343b1ce..d663489a66 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/pipeline/AdiabaticPipe.java +++ b/src/main/java/neqsim/processsimulation/processequipment/pipeline/AdiabaticPipe.java @@ -1,10 +1,10 @@ -package neqsim.processSimulation.processEquipment.pipeline; +package neqsim.processsimulation.processequipment.pipeline; import java.util.UUID; -import neqsim.fluidMechanics.flowSystem.FlowSystemInterface; -import neqsim.processSimulation.processEquipment.stream.Stream; -import neqsim.processSimulation.processEquipment.stream.StreamInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.fluidmechanics.flowsystem.FlowSystemInterface; +import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.processsimulation.processequipment.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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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/processsimulation/processequipment/pipeline/AdiabaticTwoPhasePipe.java similarity index 98% rename from src/main/java/neqsim/processSimulation/processEquipment/pipeline/AdiabaticTwoPhasePipe.java rename to src/main/java/neqsim/processsimulation/processequipment/pipeline/AdiabaticTwoPhasePipe.java index c77b190485..72a5c9bb6e 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/pipeline/AdiabaticTwoPhasePipe.java +++ b/src/main/java/neqsim/processsimulation/processequipment/pipeline/AdiabaticTwoPhasePipe.java @@ -1,10 +1,10 @@ -package neqsim.processSimulation.processEquipment.pipeline; +package neqsim.processsimulation.processequipment.pipeline; import java.util.UUID; -import neqsim.fluidMechanics.flowSystem.FlowSystemInterface; -import neqsim.processSimulation.processEquipment.stream.StreamInterface; +import neqsim.fluidmechanics.flowsystem.FlowSystemInterface; +import neqsim.processsimulation.processequipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/main/java/neqsim/processSimulation/processEquipment/pipeline/Fittings.java b/src/main/java/neqsim/processsimulation/processequipment/pipeline/Fittings.java similarity index 97% rename from src/main/java/neqsim/processSimulation/processEquipment/pipeline/Fittings.java rename to src/main/java/neqsim/processsimulation/processequipment/pipeline/Fittings.java index 1adb113d33..1095be84dd 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/pipeline/Fittings.java +++ b/src/main/java/neqsim/processsimulation/processequipment/pipeline/Fittings.java @@ -1,4 +1,4 @@ -package neqsim.processSimulation.processEquipment.pipeline; +package neqsim.processsimulation.processequipment.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/processsimulation/processequipment/pipeline/IncompressiblePipeFlow.java similarity index 93% rename from src/main/java/neqsim/processSimulation/processEquipment/pipeline/IncompressiblePipeFlow.java rename to src/main/java/neqsim/processsimulation/processequipment/pipeline/IncompressiblePipeFlow.java index f1dffad6df..eecbaa019a 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/pipeline/IncompressiblePipeFlow.java +++ b/src/main/java/neqsim/processsimulation/processequipment/pipeline/IncompressiblePipeFlow.java @@ -1,9 +1,9 @@ -package neqsim.processSimulation.processEquipment.pipeline; +package neqsim.processsimulation.processequipment.pipeline; import java.util.UUID; -import neqsim.processSimulation.processEquipment.stream.Stream; -import neqsim.processSimulation.processEquipment.stream.StreamInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.processsimulation.processequipment.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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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/processsimulation/processequipment/pipeline/OnePhasePipeLine.java similarity index 83% rename from src/main/java/neqsim/processSimulation/processEquipment/pipeline/OnePhasePipeLine.java rename to src/main/java/neqsim/processsimulation/processequipment/pipeline/OnePhasePipeLine.java index 58e5129b4f..3883b5c967 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/pipeline/OnePhasePipeLine.java +++ b/src/main/java/neqsim/processsimulation/processequipment/pipeline/OnePhasePipeLine.java @@ -4,11 +4,11 @@ * Created on 21. august 2001, 20:44 */ -package neqsim.processSimulation.processEquipment.pipeline; +package neqsim.processsimulation.processequipment.pipeline; import java.util.UUID; -import neqsim.fluidMechanics.flowSystem.onePhaseFlowSystem.pipeFlowSystem.PipeFlowSystem; -import neqsim.processSimulation.processEquipment.stream.StreamInterface; +import neqsim.fluidmechanics.flowsystem.onephaseflowsystem.pipeflowsystem.PipeFlowSystem; +import neqsim.processsimulation.processequipment.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.processsimulation.processequipment.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/processsimulation/processequipment/pipeline/PipeBeggsAndBrills.java similarity index 99% rename from src/main/java/neqsim/processSimulation/processEquipment/pipeline/PipeBeggsAndBrills.java rename to src/main/java/neqsim/processsimulation/processequipment/pipeline/PipeBeggsAndBrills.java index b0d070df62..f4e50e2e5a 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/pipeline/PipeBeggsAndBrills.java +++ b/src/main/java/neqsim/processsimulation/processequipment/pipeline/PipeBeggsAndBrills.java @@ -1,12 +1,12 @@ -package neqsim.processSimulation.processEquipment.pipeline; +package neqsim.processsimulation.processequipment.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.processsimulation.processequipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/main/java/neqsim/processSimulation/processEquipment/pipeline/PipeLineInterface.java b/src/main/java/neqsim/processsimulation/processequipment/pipeline/PipeLineInterface.java similarity index 85% rename from src/main/java/neqsim/processSimulation/processEquipment/pipeline/PipeLineInterface.java rename to src/main/java/neqsim/processsimulation/processequipment/pipeline/PipeLineInterface.java index 5072ae3ee8..9a65b348d9 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/pipeline/PipeLineInterface.java +++ b/src/main/java/neqsim/processsimulation/processequipment/pipeline/PipeLineInterface.java @@ -4,11 +4,11 @@ * Created on 21. august 2001, 20:44 */ -package neqsim.processSimulation.processEquipment.pipeline; +package neqsim.processsimulation.processequipment.pipeline; -import neqsim.fluidMechanics.flowSystem.FlowSystemInterface; -import neqsim.processSimulation.SimulationInterface; -import neqsim.processSimulation.processEquipment.TwoPortInterface; +import neqsim.fluidmechanics.flowsystem.FlowSystemInterface; +import neqsim.processsimulation.SimulationInterface; +import neqsim.processsimulation.processequipment.TwoPortInterface; /** *

@@ -105,7 +105,7 @@ public interface PipeLineInterface extends SimulationInterface, TwoPortInterface * getPipe. *

* - * @return a {@link neqsim.fluidMechanics.flowSystem.FlowSystemInterface} object + * @return a {@link neqsim.fluidmechanics.flowsystem.FlowSystemInterface} object */ public FlowSystemInterface getPipe(); } diff --git a/src/main/java/neqsim/processSimulation/processEquipment/pipeline/Pipeline.java b/src/main/java/neqsim/processsimulation/processequipment/pipeline/Pipeline.java similarity index 94% rename from src/main/java/neqsim/processSimulation/processEquipment/pipeline/Pipeline.java rename to src/main/java/neqsim/processsimulation/processequipment/pipeline/Pipeline.java index 7b63f0ec59..fe6963c760 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/pipeline/Pipeline.java +++ b/src/main/java/neqsim/processsimulation/processequipment/pipeline/Pipeline.java @@ -4,17 +4,17 @@ * Created on 14. mars 2001, 22:30 */ -package neqsim.processSimulation.processEquipment.pipeline; +package neqsim.processsimulation.processequipment.pipeline; import java.util.UUID; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -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.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.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.processsimulation.processequipment.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/processsimulation/processequipment/pipeline/SimpleTPoutPipeline.java similarity index 90% rename from src/main/java/neqsim/processSimulation/processEquipment/pipeline/SimpleTPoutPipeline.java rename to src/main/java/neqsim/processsimulation/processequipment/pipeline/SimpleTPoutPipeline.java index 21eff3508d..6c88881674 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/pipeline/SimpleTPoutPipeline.java +++ b/src/main/java/neqsim/processsimulation/processequipment/pipeline/SimpleTPoutPipeline.java @@ -1,9 +1,9 @@ -package neqsim.processSimulation.processEquipment.pipeline; +package neqsim.processsimulation.processequipment.pipeline; import java.util.UUID; -import neqsim.fluidMechanics.flowSystem.FlowSystemInterface; -import neqsim.processSimulation.processEquipment.stream.StreamInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.fluidmechanics.flowsystem.FlowSystemInterface; +import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/main/java/neqsim/processSimulation/processEquipment/pipeline/TwoPhasePipeLine.java b/src/main/java/neqsim/processsimulation/processequipment/pipeline/TwoPhasePipeLine.java similarity index 78% rename from src/main/java/neqsim/processSimulation/processEquipment/pipeline/TwoPhasePipeLine.java rename to src/main/java/neqsim/processsimulation/processequipment/pipeline/TwoPhasePipeLine.java index 14e85b137b..daa60c6f93 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/pipeline/TwoPhasePipeLine.java +++ b/src/main/java/neqsim/processsimulation/processequipment/pipeline/TwoPhasePipeLine.java @@ -4,11 +4,11 @@ * Created on 21. august 2001, 20:45 */ -package neqsim.processSimulation.processEquipment.pipeline; +package neqsim.processsimulation.processequipment.pipeline; import java.util.UUID; -import neqsim.fluidMechanics.flowSystem.twoPhaseFlowSystem.twoPhasePipeFlowSystem.TwoPhasePipeFlowSystem; -import neqsim.processSimulation.processEquipment.stream.StreamInterface; +import neqsim.fluidmechanics.flowsystem.twophaseflowsystem.twophasepipeflowsystem.TwoPhasePipeFlowSystem; +import neqsim.processsimulation.processequipment.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.processsimulation.processequipment.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/processsimulation/processequipment/powerGeneration/GasTurbine.java similarity index 90% rename from src/main/java/neqsim/processSimulation/processEquipment/powerGeneration/GasTurbine.java rename to src/main/java/neqsim/processsimulation/processequipment/powerGeneration/GasTurbine.java index 5c99d466a8..d43ba513d5 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/powerGeneration/GasTurbine.java +++ b/src/main/java/neqsim/processsimulation/processequipment/powerGeneration/GasTurbine.java @@ -1,16 +1,16 @@ -package neqsim.processSimulation.processEquipment.powerGeneration; +package neqsim.processsimulation.processequipment.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.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.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.processsimulation.processequipment.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/processsimulation/processequipment/pump/Pump.java similarity index 96% rename from src/main/java/neqsim/processSimulation/processEquipment/pump/Pump.java rename to src/main/java/neqsim/processsimulation/processequipment/pump/Pump.java index c6e05c4f2c..4a9a32e1f2 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/pump/Pump.java +++ b/src/main/java/neqsim/processsimulation/processequipment/pump/Pump.java @@ -1,4 +1,4 @@ -package neqsim.processSimulation.processEquipment.pump; +package neqsim.processsimulation.processequipment.pump; import java.awt.Container; import java.awt.FlowLayout; @@ -10,12 +10,12 @@ 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.processsimulation.processequipment.TwoPortEquipment; +import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.processsimulation.util.monitor.PumpResponse; import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +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.processsimulation.processequipment.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.processsimulation.processequipment.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/processsimulation/processequipment/pump/PumpChart.java similarity index 94% rename from src/main/java/neqsim/processSimulation/processEquipment/pump/PumpChart.java rename to src/main/java/neqsim/processsimulation/processequipment/pump/PumpChart.java index e2a8270133..32d6ca146e 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/pump/PumpChart.java +++ b/src/main/java/neqsim/processsimulation/processequipment/pump/PumpChart.java @@ -1,4 +1,4 @@ -package neqsim.processSimulation.processEquipment.pump; +package neqsim.processsimulation.processequipment.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.processsimulation.processequipment.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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.ProcessSystem(); operations.add(stream_1); operations.add(pump1); operations.run(); @@ -342,23 +342,23 @@ public void setUseRealKappa(boolean useRealKappa) { /** {@inheritDoc} */ @Override public void plot() { - neqsim.dataPresentation.JFreeChart.graph2b graph = - new neqsim.dataPresentation.JFreeChart.graph2b(flow, head, + neqsim.datapresentation.jfreechart.Graph2b graph = + new neqsim.datapresentation.jfreechart.Graph2b(flow, head, Arrays.stream(speed).mapToObj(String::valueOf).toArray(String[]::new), "head vs flow", "flow", "head"); graph.setVisible(true); - neqsim.dataPresentation.JFreeChart.graph2b graph2 = - new neqsim.dataPresentation.JFreeChart.graph2b(flow, efficiency, + neqsim.datapresentation.jfreechart.Graph2b graph2 = + new neqsim.datapresentation.jfreechart.Graph2b(flow, efficiency, Arrays.stream(speed).mapToObj(String::valueOf).toArray(String[]::new), "eff vs flow", "flow", "eff"); graph2.setVisible(true); - neqsim.dataPresentation.JFreeChart.graph2b graph3 = - new neqsim.dataPresentation.JFreeChart.graph2b(redflow, redhead, + neqsim.datapresentation.jfreechart.Graph2b graph3 = + new neqsim.datapresentation.jfreechart.Graph2b(redflow, redhead, Arrays.stream(speed).mapToObj(String::valueOf).toArray(String[]::new), "red head vs red flow", "red flow", "red head"); graph3.setVisible(true); - neqsim.dataPresentation.JFreeChart.graph2b graph4 = - new neqsim.dataPresentation.JFreeChart.graph2b(redflow, efficiency, + neqsim.datapresentation.jfreechart.Graph2b graph4 = + new neqsim.datapresentation.jfreechart.Graph2b(redflow, efficiency, Arrays.stream(speed).mapToObj(String::valueOf).toArray(String[]::new), "red eff vs red dflow", "red flow", "red eff"); graph4.setVisible(true); diff --git a/src/main/java/neqsim/processSimulation/processEquipment/pump/PumpChartInterface.java b/src/main/java/neqsim/processsimulation/processequipment/pump/PumpChartInterface.java similarity index 98% rename from src/main/java/neqsim/processSimulation/processEquipment/pump/PumpChartInterface.java rename to src/main/java/neqsim/processsimulation/processequipment/pump/PumpChartInterface.java index 9123c23cc2..723daaec3e 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/pump/PumpChartInterface.java +++ b/src/main/java/neqsim/processsimulation/processequipment/pump/PumpChartInterface.java @@ -1,4 +1,4 @@ -package neqsim.processSimulation.processEquipment.pump; +package neqsim.processsimulation.processequipment.pump; /** *

diff --git a/src/main/java/neqsim/processSimulation/processEquipment/pump/PumpCurve.java b/src/main/java/neqsim/processsimulation/processequipment/pump/PumpCurve.java similarity index 94% rename from src/main/java/neqsim/processSimulation/processEquipment/pump/PumpCurve.java rename to src/main/java/neqsim/processsimulation/processequipment/pump/PumpCurve.java index 3d5d364bde..c7de10dc19 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/pump/PumpCurve.java +++ b/src/main/java/neqsim/processsimulation/processequipment/pump/PumpCurve.java @@ -1,4 +1,4 @@ -package neqsim.processSimulation.processEquipment.pump; +package neqsim.processsimulation.processequipment.pump; /** *

diff --git a/src/main/java/neqsim/processSimulation/processEquipment/pump/PumpInterface.java b/src/main/java/neqsim/processsimulation/processequipment/pump/PumpInterface.java similarity index 68% rename from src/main/java/neqsim/processSimulation/processEquipment/pump/PumpInterface.java rename to src/main/java/neqsim/processsimulation/processequipment/pump/PumpInterface.java index 1ba71bc627..44d7e49e6e 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/pump/PumpInterface.java +++ b/src/main/java/neqsim/processsimulation/processequipment/pump/PumpInterface.java @@ -1,7 +1,7 @@ -package neqsim.processSimulation.processEquipment.pump; +package neqsim.processsimulation.processequipment.pump; -import neqsim.processSimulation.processEquipment.ProcessEquipmentInterface; -import neqsim.processSimulation.processEquipment.TwoPortInterface; +import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; +import neqsim.processsimulation.processequipment.TwoPortInterface; /** *

diff --git a/src/main/java/neqsim/processSimulation/processEquipment/reservoir/ReservoirCVDsim.java b/src/main/java/neqsim/processsimulation/processequipment/reservoir/ReservoirCVDsim.java similarity index 85% rename from src/main/java/neqsim/processSimulation/processEquipment/reservoir/ReservoirCVDsim.java rename to src/main/java/neqsim/processsimulation/processequipment/reservoir/ReservoirCVDsim.java index 73a73c2284..aa508f3278 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/reservoir/ReservoirCVDsim.java +++ b/src/main/java/neqsim/processsimulation/processequipment/reservoir/ReservoirCVDsim.java @@ -1,7 +1,7 @@ -package neqsim.processSimulation.processEquipment.reservoir; +package neqsim.processsimulation.processequipment.reservoir; import java.util.UUID; -import neqsim.processSimulation.processEquipment.ProcessEquipmentBaseClass; +import neqsim.processsimulation.processequipment.ProcessEquipmentBaseClass; import neqsim.thermo.system.SystemInterface; /** diff --git a/src/main/java/neqsim/processSimulation/processEquipment/reservoir/ReservoirDiffLibsim.java b/src/main/java/neqsim/processsimulation/processequipment/reservoir/ReservoirDiffLibsim.java similarity index 85% rename from src/main/java/neqsim/processSimulation/processEquipment/reservoir/ReservoirDiffLibsim.java rename to src/main/java/neqsim/processsimulation/processequipment/reservoir/ReservoirDiffLibsim.java index 18037be550..184773bad8 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/reservoir/ReservoirDiffLibsim.java +++ b/src/main/java/neqsim/processsimulation/processequipment/reservoir/ReservoirDiffLibsim.java @@ -1,7 +1,7 @@ -package neqsim.processSimulation.processEquipment.reservoir; +package neqsim.processsimulation.processequipment.reservoir; import java.util.UUID; -import neqsim.processSimulation.processEquipment.ProcessEquipmentBaseClass; +import neqsim.processsimulation.processequipment.ProcessEquipmentBaseClass; import neqsim.thermo.system.SystemInterface; /** diff --git a/src/main/java/neqsim/processSimulation/processEquipment/reservoir/ReservoirTPsim.java b/src/main/java/neqsim/processsimulation/processequipment/reservoir/ReservoirTPsim.java similarity index 90% rename from src/main/java/neqsim/processSimulation/processEquipment/reservoir/ReservoirTPsim.java rename to src/main/java/neqsim/processsimulation/processequipment/reservoir/ReservoirTPsim.java index 731072dfcd..dea4286759 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/reservoir/ReservoirTPsim.java +++ b/src/main/java/neqsim/processsimulation/processequipment/reservoir/ReservoirTPsim.java @@ -1,11 +1,11 @@ -package neqsim.processSimulation.processEquipment.reservoir; +package neqsim.processsimulation.processequipment.reservoir; import java.util.UUID; -import neqsim.processSimulation.processEquipment.ProcessEquipmentBaseClass; -import neqsim.processSimulation.processEquipment.stream.Stream; -import neqsim.processSimulation.processEquipment.stream.StreamInterface; +import neqsim.processsimulation.processequipment.ProcessEquipmentBaseClass; +import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.processsimulation.processequipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +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.processsimulation.processequipment.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/processsimulation/processequipment/reservoir/SimpleReservoir.java similarity index 95% rename from src/main/java/neqsim/processSimulation/processEquipment/reservoir/SimpleReservoir.java rename to src/main/java/neqsim/processsimulation/processequipment/reservoir/SimpleReservoir.java index dc431023a7..46344e6f25 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/reservoir/SimpleReservoir.java +++ b/src/main/java/neqsim/processsimulation/processequipment/reservoir/SimpleReservoir.java @@ -4,17 +4,17 @@ * Created on 12. mars 2001, 19:48 */ -package neqsim.processSimulation.processEquipment.reservoir; +package neqsim.processsimulation.processequipment.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.processsimulation.processequipment.ProcessEquipmentBaseClass; +import neqsim.processsimulation.processequipment.pipeline.AdiabaticTwoPhasePipe; +import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.processsimulation.processequipment.stream.StreamInterface; import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; import neqsim.util.unit.PressureUnit; /** @@ -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.processsimulation.processequipment.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.processsimulation.processequipment.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.processsimulation.processequipment.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.processsimulation.processequipment.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.processsimulation.processequipment.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.processsimulation.processequipment.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.processsimulation.processequipment.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.processsimulation.processequipment.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.processsimulation.processequipment.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.processsimulation.processequipment.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.processsimulation.processequipment.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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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/processsimulation/processequipment/reservoir/Well.java similarity index 90% rename from src/main/java/neqsim/processSimulation/processEquipment/reservoir/Well.java rename to src/main/java/neqsim/processsimulation/processequipment/reservoir/Well.java index 8ed55e513a..ef6a521f94 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/reservoir/Well.java +++ b/src/main/java/neqsim/processsimulation/processequipment/reservoir/Well.java @@ -1,9 +1,9 @@ -package neqsim.processSimulation.processEquipment.reservoir; +package neqsim.processsimulation.processequipment.reservoir; -import neqsim.processSimulation.processEquipment.stream.StreamInterface; +import neqsim.processsimulation.processequipment.stream.StreamInterface; import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; import neqsim.util.NamedBaseClass; /** @@ -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.processsimulation.processequipment.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.processsimulation.processequipment.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/processsimulation/processequipment/reservoir/WellFlow.java similarity index 94% rename from src/main/java/neqsim/processSimulation/processEquipment/reservoir/WellFlow.java rename to src/main/java/neqsim/processsimulation/processequipment/reservoir/WellFlow.java index 2ab8e994cf..9eaea584fc 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/reservoir/WellFlow.java +++ b/src/main/java/neqsim/processsimulation/processequipment/reservoir/WellFlow.java @@ -1,10 +1,10 @@ -package neqsim.processSimulation.processEquipment.reservoir; +package neqsim.processsimulation.processequipment.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.processsimulation.processequipment.TwoPortEquipment; +import neqsim.processsimulation.processequipment.valve.ThrottlingValve; import neqsim.thermo.system.SystemInterface; /** diff --git a/src/main/java/neqsim/processSimulation/processEquipment/separator/GasScrubber.java b/src/main/java/neqsim/processsimulation/processequipment/separator/GasScrubber.java similarity index 75% rename from src/main/java/neqsim/processSimulation/processEquipment/separator/GasScrubber.java rename to src/main/java/neqsim/processsimulation/processequipment/separator/GasScrubber.java index 7350824107..0cd964b55a 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/separator/GasScrubber.java +++ b/src/main/java/neqsim/processsimulation/processequipment/separator/GasScrubber.java @@ -4,10 +4,10 @@ * Created on 12. mars 2001, 19:48 */ -package neqsim.processSimulation.processEquipment.separator; +package neqsim.processsimulation.processequipment.separator; -import neqsim.processSimulation.mechanicalDesign.separator.GasScrubberMechanicalDesign; -import neqsim.processSimulation.processEquipment.stream.StreamInterface; +import neqsim.processsimulation.mechanicaldesign.separator.GasScrubberMechanicalDesign; +import neqsim.processsimulation.processequipment.stream.StreamInterface; /** *

@@ -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.processsimulation.processequipment.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/processsimulation/processequipment/separator/GasScrubberSimple.java similarity index 89% rename from src/main/java/neqsim/processSimulation/processEquipment/separator/GasScrubberSimple.java rename to src/main/java/neqsim/processsimulation/processequipment/separator/GasScrubberSimple.java index b831d2681e..1d9f899147 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/separator/GasScrubberSimple.java +++ b/src/main/java/neqsim/processsimulation/processequipment/separator/GasScrubberSimple.java @@ -4,14 +4,14 @@ * Created on 12. mars 2001, 19:48 */ -package neqsim.processSimulation.processEquipment.separator; +package neqsim.processsimulation.processequipment.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.processsimulation.mechanicaldesign.separator.GasScrubberMechanicalDesign; +import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.processsimulation.processequipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +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.processsimulation.processequipment.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/processsimulation/processequipment/separator/Hydrocyclone.java similarity index 88% rename from src/main/java/neqsim/processSimulation/processEquipment/separator/Hydrocyclone.java rename to src/main/java/neqsim/processsimulation/processequipment/separator/Hydrocyclone.java index 8795337294..adfd09d204 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/separator/Hydrocyclone.java +++ b/src/main/java/neqsim/processsimulation/processequipment/separator/Hydrocyclone.java @@ -1,9 +1,9 @@ -package neqsim.processSimulation.processEquipment.separator; +package neqsim.processsimulation.processequipment.separator; import java.util.UUID; -import neqsim.processSimulation.processEquipment.stream.Stream; -import neqsim.processSimulation.processEquipment.stream.StreamInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.processsimulation.processequipment.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.processsimulation.processequipment.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.processsimulation.processequipment.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.processsimulation.processequipment.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/processsimulation/processequipment/separator/NeqGasScrubber.java similarity index 88% rename from src/main/java/neqsim/processSimulation/processEquipment/separator/NeqGasScrubber.java rename to src/main/java/neqsim/processsimulation/processequipment/separator/NeqGasScrubber.java index c16e85a580..366b5766db 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/separator/NeqGasScrubber.java +++ b/src/main/java/neqsim/processsimulation/processequipment/separator/NeqGasScrubber.java @@ -1,11 +1,11 @@ -package neqsim.processSimulation.processEquipment.separator; +package neqsim.processsimulation.processequipment.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.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.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.processsimulation.processequipment.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/processsimulation/processequipment/separator/Separator.java similarity index 94% rename from src/main/java/neqsim/processSimulation/processEquipment/separator/Separator.java rename to src/main/java/neqsim/processsimulation/processequipment/separator/Separator.java index 4e3e322e15..7be36860f4 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/separator/Separator.java +++ b/src/main/java/neqsim/processsimulation/processequipment/separator/Separator.java @@ -4,7 +4,7 @@ * Created on 12. mars 2001, 19:48 */ -package neqsim.processSimulation.processEquipment.separator; +package neqsim.processsimulation.processequipment.separator; import java.util.ArrayList; import java.util.Objects; @@ -12,19 +12,19 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import com.google.gson.GsonBuilder; -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.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.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

@@ -87,7 +87,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.processsimulation.processequipment.stream.StreamInterface} * object */ public Separator(String name, StreamInterface inletStream) { @@ -113,7 +113,7 @@ public void initMechanicalDesign() { * setInletStream. *

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

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

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

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

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

* - * @return a {@link neqsim.processSimulation.processEquipment.stream.StreamInterface} object + * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object */ public StreamInterface getLiquid() { return getLiquidOutStream(); @@ -650,7 +650,7 @@ public void setSeparatorLength(double separatorLength) { * * @param i a int * @return a - * {@link neqsim.processSimulation.processEquipment.separator.sectionType.SeparatorSection} + * {@link neqsim.processsimulation.processequipment.separator.sectionType.SeparatorSection} * object */ public SeparatorSection getSeparatorSection(int i) { @@ -664,7 +664,7 @@ public SeparatorSection getSeparatorSection(int i) { * * @param name a {@link java.lang.String} object * @return a - * {@link neqsim.processSimulation.processEquipment.separator.sectionType.SeparatorSection} + * {@link neqsim.processsimulation.processequipment.separator.sectionType.SeparatorSection} * object */ public SeparatorSection getSeparatorSection(String name) { @@ -850,7 +850,7 @@ public boolean equals(Object obj) { * getFeedStream. *

* - * @return a {@link neqsim.processSimulation.processEquipment.stream.StreamInterface} object + * @return a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object */ public StreamInterface getFeedStream() { return inletStreamMixer.getOutletStream(); diff --git a/src/main/java/neqsim/processSimulation/processEquipment/separator/SeparatorInterface.java b/src/main/java/neqsim/processsimulation/processequipment/separator/SeparatorInterface.java similarity index 86% rename from src/main/java/neqsim/processSimulation/processEquipment/separator/SeparatorInterface.java rename to src/main/java/neqsim/processsimulation/processequipment/separator/SeparatorInterface.java index c0024e5c4e..c9d463fad2 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/separator/SeparatorInterface.java +++ b/src/main/java/neqsim/processsimulation/processequipment/separator/SeparatorInterface.java @@ -4,9 +4,9 @@ * Created on 22. august 2001, 17:22 */ -package neqsim.processSimulation.processEquipment.separator; +package neqsim.processsimulation.processequipment.separator; -import neqsim.processSimulation.SimulationInterface; +import neqsim.processsimulation.SimulationInterface; import neqsim.thermo.system.SystemInterface; /** diff --git a/src/main/java/neqsim/processSimulation/processEquipment/separator/ThreePhaseSeparator.java b/src/main/java/neqsim/processsimulation/processequipment/separator/ThreePhaseSeparator.java similarity index 93% rename from src/main/java/neqsim/processSimulation/processEquipment/separator/ThreePhaseSeparator.java rename to src/main/java/neqsim/processsimulation/processequipment/separator/ThreePhaseSeparator.java index 0ef95e6551..69d4100ada 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/separator/ThreePhaseSeparator.java +++ b/src/main/java/neqsim/processsimulation/processequipment/separator/ThreePhaseSeparator.java @@ -1,11 +1,11 @@ -package neqsim.processSimulation.processEquipment.separator; +package neqsim.processsimulation.processequipment.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.thermodynamicOperations.ThermodynamicOperations; +import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.processsimulation.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.processsimulation.processequipment.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.processsimulation.processequipment.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.processsimulation.processequipment.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/processsimulation/processequipment/separator/TwoPhaseSeparator.java similarity index 89% rename from src/main/java/neqsim/processSimulation/processEquipment/separator/TwoPhaseSeparator.java rename to src/main/java/neqsim/processsimulation/processequipment/separator/TwoPhaseSeparator.java index 4dffd02154..338a0292a3 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/separator/TwoPhaseSeparator.java +++ b/src/main/java/neqsim/processsimulation/processequipment/separator/TwoPhaseSeparator.java @@ -1,8 +1,8 @@ -package neqsim.processSimulation.processEquipment.separator; +package neqsim.processsimulation.processequipment.separator; import java.util.UUID; -import neqsim.processSimulation.processEquipment.stream.Stream; -import neqsim.processSimulation.processEquipment.stream.StreamInterface; +import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.processsimulation.processequipment.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.processsimulation.processequipment.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/processsimulation/processequipment/separator/sectionType/ManwaySection.java similarity index 74% rename from src/main/java/neqsim/processSimulation/processEquipment/separator/sectionType/ManwaySection.java rename to src/main/java/neqsim/processsimulation/processequipment/separator/sectionType/ManwaySection.java index 0a5b15e854..02d7a0169e 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/separator/sectionType/ManwaySection.java +++ b/src/main/java/neqsim/processsimulation/processequipment/separator/sectionType/ManwaySection.java @@ -1,7 +1,7 @@ -package neqsim.processSimulation.processEquipment.separator.sectionType; +package neqsim.processsimulation.processequipment.separator.sectionType; -import neqsim.processSimulation.mechanicalDesign.separator.sectionType.MechManwaySection; -import neqsim.processSimulation.processEquipment.separator.Separator; +import neqsim.processsimulation.mechanicaldesign.separator.sectionType.MechManwaySection; +import neqsim.processsimulation.processequipment.separator.Separator; /** *

@@ -21,7 +21,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} object + * @param sep a {@link neqsim.processsimulation.processequipment.separator.Separator} object */ public ManwaySection(String name, String type, Separator sep) { super(name, type, sep); diff --git a/src/main/java/neqsim/processSimulation/processEquipment/separator/sectionType/MeshSection.java b/src/main/java/neqsim/processsimulation/processequipment/separator/sectionType/MeshSection.java similarity index 77% rename from src/main/java/neqsim/processSimulation/processEquipment/separator/sectionType/MeshSection.java rename to src/main/java/neqsim/processsimulation/processequipment/separator/sectionType/MeshSection.java index e330691054..62c5ce147e 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/separator/sectionType/MeshSection.java +++ b/src/main/java/neqsim/processsimulation/processequipment/separator/sectionType/MeshSection.java @@ -1,7 +1,7 @@ -package neqsim.processSimulation.processEquipment.separator.sectionType; +package neqsim.processsimulation.processequipment.separator.sectionType; -import neqsim.processSimulation.mechanicalDesign.separator.sectionType.MecMeshSection; -import neqsim.processSimulation.processEquipment.separator.Separator; +import neqsim.processsimulation.mechanicaldesign.separator.sectionType.MecMeshSection; +import neqsim.processsimulation.processequipment.separator.Separator; /** *

@@ -21,7 +21,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} object + * @param sep a {@link neqsim.processsimulation.processequipment.separator.Separator} object */ public MeshSection(String name, String type, Separator sep) { super(name, type, sep); diff --git a/src/main/java/neqsim/processSimulation/processEquipment/separator/sectionType/NozzleSection.java b/src/main/java/neqsim/processsimulation/processequipment/separator/sectionType/NozzleSection.java similarity index 74% rename from src/main/java/neqsim/processSimulation/processEquipment/separator/sectionType/NozzleSection.java rename to src/main/java/neqsim/processsimulation/processequipment/separator/sectionType/NozzleSection.java index 3483ec3aef..877ca5fe67 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/separator/sectionType/NozzleSection.java +++ b/src/main/java/neqsim/processsimulation/processequipment/separator/sectionType/NozzleSection.java @@ -1,7 +1,7 @@ -package neqsim.processSimulation.processEquipment.separator.sectionType; +package neqsim.processsimulation.processequipment.separator.sectionType; -import neqsim.processSimulation.mechanicalDesign.separator.sectionType.MechNozzleSection; -import neqsim.processSimulation.processEquipment.separator.Separator; +import neqsim.processsimulation.mechanicaldesign.separator.sectionType.MechNozzleSection; +import neqsim.processsimulation.processequipment.separator.Separator; /** *

@@ -21,7 +21,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} object + * @param sep a {@link neqsim.processsimulation.processequipment.separator.Separator} object */ public NozzleSection(String name, String type, Separator sep) { super(name, type, sep); diff --git a/src/main/java/neqsim/processSimulation/processEquipment/separator/sectionType/PackedSection.java b/src/main/java/neqsim/processsimulation/processequipment/separator/sectionType/PackedSection.java similarity index 79% rename from src/main/java/neqsim/processSimulation/processEquipment/separator/sectionType/PackedSection.java rename to src/main/java/neqsim/processsimulation/processequipment/separator/sectionType/PackedSection.java index cd48cda135..f77f927d1d 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/separator/sectionType/PackedSection.java +++ b/src/main/java/neqsim/processsimulation/processequipment/separator/sectionType/PackedSection.java @@ -1,6 +1,6 @@ -package neqsim.processSimulation.processEquipment.separator.sectionType; +package neqsim.processsimulation.processequipment.separator.sectionType; -import neqsim.processSimulation.processEquipment.separator.Separator; +import neqsim.processsimulation.processequipment.separator.Separator; /** *

@@ -20,7 +20,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} object + * @param sep a {@link neqsim.processsimulation.processequipment.separator.Separator} object */ public PackedSection(String name, String type, Separator sep) { super(name, type, sep); diff --git a/src/main/java/neqsim/processSimulation/processEquipment/separator/sectionType/SeparatorSection.java b/src/main/java/neqsim/processsimulation/processequipment/separator/sectionType/SeparatorSection.java similarity index 93% rename from src/main/java/neqsim/processSimulation/processEquipment/separator/sectionType/SeparatorSection.java rename to src/main/java/neqsim/processsimulation/processequipment/separator/sectionType/SeparatorSection.java index bd73553d9d..b1b26762ac 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/separator/sectionType/SeparatorSection.java +++ b/src/main/java/neqsim/processsimulation/processequipment/separator/sectionType/SeparatorSection.java @@ -1,7 +1,7 @@ -package neqsim.processSimulation.processEquipment.separator.sectionType; +package neqsim.processsimulation.processequipment.separator.sectionType; -import neqsim.processSimulation.mechanicalDesign.separator.sectionType.SepDesignSection; -import neqsim.processSimulation.processEquipment.separator.Separator; +import neqsim.processsimulation.mechanicaldesign.separator.sectionType.SepDesignSection; +import neqsim.processsimulation.processequipment.separator.Separator; import neqsim.util.NamedBaseClass; /** @@ -29,7 +29,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} object + * @param sep a {@link neqsim.processsimulation.processequipment.separator.Separator} object */ public SeparatorSection(String name, String type, Separator sep) { super(name); diff --git a/src/main/java/neqsim/processSimulation/processEquipment/separator/sectionType/ValveSection.java b/src/main/java/neqsim/processsimulation/processequipment/separator/sectionType/ValveSection.java similarity index 78% rename from src/main/java/neqsim/processSimulation/processEquipment/separator/sectionType/ValveSection.java rename to src/main/java/neqsim/processsimulation/processequipment/separator/sectionType/ValveSection.java index 847313429f..af921b6aac 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/separator/sectionType/ValveSection.java +++ b/src/main/java/neqsim/processsimulation/processequipment/separator/sectionType/ValveSection.java @@ -1,7 +1,7 @@ -package neqsim.processSimulation.processEquipment.separator.sectionType; +package neqsim.processsimulation.processequipment.separator.sectionType; -import neqsim.processSimulation.mechanicalDesign.separator.sectionType.DistillationTraySection; -import neqsim.processSimulation.processEquipment.separator.Separator; +import neqsim.processsimulation.mechanicaldesign.separator.sectionType.DistillationTraySection; +import neqsim.processsimulation.processequipment.separator.Separator; /** *

@@ -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.processsimulation.processequipment.separator.Separator} object */ public ValveSection(String name, String type, Separator sep) { super(name, type, sep); diff --git a/src/main/java/neqsim/processSimulation/processEquipment/separator/sectionType/VaneSection.java b/src/main/java/neqsim/processsimulation/processequipment/separator/sectionType/VaneSection.java similarity index 77% rename from src/main/java/neqsim/processSimulation/processEquipment/separator/sectionType/VaneSection.java rename to src/main/java/neqsim/processsimulation/processequipment/separator/sectionType/VaneSection.java index 350379f2bd..0443915740 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/separator/sectionType/VaneSection.java +++ b/src/main/java/neqsim/processsimulation/processequipment/separator/sectionType/VaneSection.java @@ -1,7 +1,7 @@ -package neqsim.processSimulation.processEquipment.separator.sectionType; +package neqsim.processsimulation.processequipment.separator.sectionType; -import neqsim.processSimulation.mechanicalDesign.separator.sectionType.MechVaneSection; -import neqsim.processSimulation.processEquipment.separator.Separator; +import neqsim.processsimulation.mechanicaldesign.separator.sectionType.MechVaneSection; +import neqsim.processsimulation.processequipment.separator.Separator; /** *

@@ -21,7 +21,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} object + * @param sep a {@link neqsim.processsimulation.processequipment.separator.Separator} object */ public VaneSection(String name, String type, Separator sep) { super(name, type, sep); diff --git a/src/main/java/neqsim/processSimulation/processEquipment/splitter/ComponentSplitter.java b/src/main/java/neqsim/processsimulation/processequipment/splitter/ComponentSplitter.java similarity index 84% rename from src/main/java/neqsim/processSimulation/processEquipment/splitter/ComponentSplitter.java rename to src/main/java/neqsim/processsimulation/processequipment/splitter/ComponentSplitter.java index ee1cd386b1..07119b7642 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/splitter/ComponentSplitter.java +++ b/src/main/java/neqsim/processsimulation/processequipment/splitter/ComponentSplitter.java @@ -1,13 +1,13 @@ -package neqsim.processSimulation.processEquipment.splitter; +package neqsim.processsimulation.processequipment.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.processsimulation.processequipment.ProcessEquipmentBaseClass; +import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.processsimulation.processequipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

@@ -51,7 +51,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.processsimulation.processequipment.stream.StreamInterface} * object */ public ComponentSplitter(String name, StreamInterface inletStream) { @@ -75,7 +75,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.processsimulation.processequipment.stream.StreamInterface} * object */ public void setInletStream(StreamInterface inletStream) { @@ -97,7 +97,7 @@ public void setInletStream(StreamInterface inletStream) { *

* * @param i a int - * @return a {@link neqsim.processSimulation.processEquipment.stream.StreamInterface} object + * @return a {@link neqsim.processsimulation.processequipment.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/processsimulation/processequipment/splitter/Splitter.java similarity index 93% rename from src/main/java/neqsim/processSimulation/processEquipment/splitter/Splitter.java rename to src/main/java/neqsim/processsimulation/processequipment/splitter/Splitter.java index c7bc2a9a91..dd0b127850 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/splitter/Splitter.java +++ b/src/main/java/neqsim/processsimulation/processequipment/splitter/Splitter.java @@ -1,14 +1,14 @@ -package neqsim.processSimulation.processEquipment.splitter; +package neqsim.processsimulation.processequipment.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.processsimulation.processequipment.ProcessEquipmentBaseClass; +import neqsim.processsimulation.processequipment.mixer.Mixer; +import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.processsimulation.processequipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +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.processsimulation.processequipment.stream.StreamInterface} * object * @param i a int */ diff --git a/src/main/java/neqsim/processSimulation/processEquipment/splitter/SplitterInterface.java b/src/main/java/neqsim/processsimulation/processequipment/splitter/SplitterInterface.java similarity index 62% rename from src/main/java/neqsim/processSimulation/processEquipment/splitter/SplitterInterface.java rename to src/main/java/neqsim/processsimulation/processequipment/splitter/SplitterInterface.java index c5c4b8138f..e3f3663b22 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/splitter/SplitterInterface.java +++ b/src/main/java/neqsim/processsimulation/processequipment/splitter/SplitterInterface.java @@ -1,7 +1,7 @@ -package neqsim.processSimulation.processEquipment.splitter; +package neqsim.processsimulation.processequipment.splitter; -import neqsim.processSimulation.processEquipment.ProcessEquipmentInterface; -import neqsim.processSimulation.processEquipment.stream.StreamInterface; +import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; +import neqsim.processsimulation.processequipment.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.processsimulation.processequipment.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.processsimulation.processequipment.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/processsimulation/processequipment/stream/EnergyStream.java similarity index 96% rename from src/main/java/neqsim/processSimulation/processEquipment/stream/EnergyStream.java rename to src/main/java/neqsim/processsimulation/processequipment/stream/EnergyStream.java index 14605352c4..4b4bfac8fe 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/stream/EnergyStream.java +++ b/src/main/java/neqsim/processsimulation/processequipment/stream/EnergyStream.java @@ -1,4 +1,4 @@ -package neqsim.processSimulation.processEquipment.stream; +package neqsim.processsimulation.processequipment.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/processsimulation/processequipment/stream/EquilibriumStream.java similarity index 94% rename from src/main/java/neqsim/processSimulation/processEquipment/stream/EquilibriumStream.java rename to src/main/java/neqsim/processsimulation/processequipment/stream/EquilibriumStream.java index cbb831ba9b..13db3ffc8d 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/stream/EquilibriumStream.java +++ b/src/main/java/neqsim/processsimulation/processequipment/stream/EquilibriumStream.java @@ -1,10 +1,10 @@ -package neqsim.processSimulation.processEquipment.stream; +package neqsim.processsimulation.processequipment.stream; import java.util.UUID; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; import neqsim.util.exception.InvalidInputException; /** diff --git a/src/main/java/neqsim/processSimulation/processEquipment/stream/IronIonSaturationStream.java b/src/main/java/neqsim/processsimulation/processequipment/stream/IronIonSaturationStream.java similarity index 96% rename from src/main/java/neqsim/processSimulation/processEquipment/stream/IronIonSaturationStream.java rename to src/main/java/neqsim/processsimulation/processequipment/stream/IronIonSaturationStream.java index 8c6ffc06e9..186950eca7 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/stream/IronIonSaturationStream.java +++ b/src/main/java/neqsim/processsimulation/processequipment/stream/IronIonSaturationStream.java @@ -4,13 +4,13 @@ * Created on 12. mars 2001, 13:11 */ -package neqsim.processSimulation.processEquipment.stream; +package neqsim.processsimulation.processequipment.stream; import java.util.UUID; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; import neqsim.util.exception.InvalidInputException; /** diff --git a/src/main/java/neqsim/processSimulation/processEquipment/stream/NeqStream.java b/src/main/java/neqsim/processsimulation/processequipment/stream/NeqStream.java similarity index 97% rename from src/main/java/neqsim/processSimulation/processEquipment/stream/NeqStream.java rename to src/main/java/neqsim/processsimulation/processequipment/stream/NeqStream.java index d677a9e6cd..39dfb2d983 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/stream/NeqStream.java +++ b/src/main/java/neqsim/processsimulation/processequipment/stream/NeqStream.java @@ -1,4 +1,4 @@ -package neqsim.processSimulation.processEquipment.stream; +package neqsim.processsimulation.processequipment.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/processsimulation/processequipment/stream/ScalePotentialCheckStream.java similarity index 96% rename from src/main/java/neqsim/processSimulation/processEquipment/stream/ScalePotentialCheckStream.java rename to src/main/java/neqsim/processsimulation/processequipment/stream/ScalePotentialCheckStream.java index f15e1e0bc4..582bf086c3 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/stream/ScalePotentialCheckStream.java +++ b/src/main/java/neqsim/processsimulation/processequipment/stream/ScalePotentialCheckStream.java @@ -1,10 +1,10 @@ -package neqsim.processSimulation.processEquipment.stream; +package neqsim.processsimulation.processequipment.stream; import java.util.UUID; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; import neqsim.util.exception.InvalidInputException; /** diff --git a/src/main/java/neqsim/processSimulation/processEquipment/stream/Stream.java b/src/main/java/neqsim/processsimulation/processequipment/stream/Stream.java similarity index 97% rename from src/main/java/neqsim/processSimulation/processEquipment/stream/Stream.java rename to src/main/java/neqsim/processsimulation/processequipment/stream/Stream.java index 41e8da7409..df01622b62 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/stream/Stream.java +++ b/src/main/java/neqsim/processsimulation/processequipment/stream/Stream.java @@ -4,7 +4,7 @@ * Created on 12. mars 2001, 13:11 */ -package neqsim.processSimulation.processEquipment.stream; +package neqsim.processsimulation.processequipment.stream; import java.util.ArrayList; import java.util.HashMap; @@ -12,12 +12,12 @@ 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.standards.gasQuality.Standard_ISO6976; -import neqsim.standards.oilQuality.Standard_ASTM_D6377; +import neqsim.processsimulation.processequipment.ProcessEquipmentBaseClass; +import neqsim.processsimulation.util.monitor.StreamResponse; +import neqsim.standards.gasquality.Standard_ISO6976; +import neqsim.standards.oilquality.Standard_ASTM_D6377; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; import neqsim.util.exception.InvalidInputException; /** @@ -633,7 +633,7 @@ public double LCV() { * Setter for the field stream. *

* - * @param stream a {@link neqsim.processSimulation.processEquipment.stream.StreamInterface} object + * @param stream a {@link neqsim.processsimulation.processequipment.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/processsimulation/processequipment/stream/StreamInterface.java similarity index 95% rename from src/main/java/neqsim/processSimulation/processEquipment/stream/StreamInterface.java rename to src/main/java/neqsim/processsimulation/processequipment/stream/StreamInterface.java index 5ea1586d26..a20c115b75 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/stream/StreamInterface.java +++ b/src/main/java/neqsim/processsimulation/processequipment/stream/StreamInterface.java @@ -4,10 +4,10 @@ * Created on 21. august 2001, 22:49 */ -package neqsim.processSimulation.processEquipment.stream; +package neqsim.processsimulation.processequipment.stream; -import neqsim.processSimulation.processEquipment.ProcessEquipmentInterface; -import neqsim.standards.gasQuality.Standard_ISO6976; +import neqsim.processsimulation.processequipment.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.processsimulation.processequipment.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.processsimulation.processequipment.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/processsimulation/processequipment/stream/VirtualStream.java similarity index 91% rename from src/main/java/neqsim/processSimulation/processEquipment/stream/VirtualStream.java rename to src/main/java/neqsim/processsimulation/processequipment/stream/VirtualStream.java index af38a63b76..f342b1a3ce 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/stream/VirtualStream.java +++ b/src/main/java/neqsim/processsimulation/processequipment/stream/VirtualStream.java @@ -1,9 +1,9 @@ -package neqsim.processSimulation.processEquipment.stream; +package neqsim.processsimulation.processequipment.stream; 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.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.processsimulation.processequipment.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.processsimulation.processequipment.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.processsimulation.processequipment.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/processsimulation/processequipment/subsea/SimpleFlowLine.java similarity index 86% rename from src/main/java/neqsim/processSimulation/processEquipment/subsea/SimpleFlowLine.java rename to src/main/java/neqsim/processsimulation/processequipment/subsea/SimpleFlowLine.java index bbdcec9142..5f3d28dbab 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/subsea/SimpleFlowLine.java +++ b/src/main/java/neqsim/processsimulation/processequipment/subsea/SimpleFlowLine.java @@ -1,9 +1,9 @@ -package neqsim.processSimulation.processEquipment.subsea; +package neqsim.processsimulation.processequipment.subsea; import java.util.UUID; -import neqsim.processSimulation.processEquipment.TwoPortEquipment; -import neqsim.processSimulation.processEquipment.pipeline.AdiabaticTwoPhasePipe; -import neqsim.processSimulation.processEquipment.stream.StreamInterface; +import neqsim.processsimulation.processequipment.TwoPortEquipment; +import neqsim.processsimulation.processequipment.pipeline.AdiabaticTwoPhasePipe; +import neqsim.processsimulation.processequipment.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.processsimulation.processequipment.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.processsimulation.processequipment.pipeline.AdiabaticTwoPhasePipe} * object */ public AdiabaticTwoPhasePipe getPipeline() { diff --git a/src/main/java/neqsim/processSimulation/processEquipment/subsea/SubseaWell.java b/src/main/java/neqsim/processsimulation/processequipment/subsea/SubseaWell.java similarity index 90% rename from src/main/java/neqsim/processSimulation/processEquipment/subsea/SubseaWell.java rename to src/main/java/neqsim/processsimulation/processequipment/subsea/SubseaWell.java index 57e5672adc..9f2b0ff05c 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/subsea/SubseaWell.java +++ b/src/main/java/neqsim/processsimulation/processequipment/subsea/SubseaWell.java @@ -1,14 +1,14 @@ -package neqsim.processSimulation.processEquipment.subsea; +package neqsim.processsimulation.processequipment.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.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; /** *

@@ -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.processsimulation.processequipment.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.processsimulation.processequipment.pipeline.AdiabaticTwoPhasePipe} * object */ public AdiabaticTwoPhasePipe getPipeline() { diff --git a/src/main/java/neqsim/processSimulation/processEquipment/tank/Tank.java b/src/main/java/neqsim/processsimulation/processequipment/tank/Tank.java similarity index 93% rename from src/main/java/neqsim/processSimulation/processEquipment/tank/Tank.java rename to src/main/java/neqsim/processsimulation/processequipment/tank/Tank.java index 65b95f51c8..e6774e8fdd 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/tank/Tank.java +++ b/src/main/java/neqsim/processsimulation/processequipment/tank/Tank.java @@ -1,12 +1,12 @@ -package neqsim.processSimulation.processEquipment.tank; +package neqsim.processsimulation.processequipment.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.processsimulation.processequipment.ProcessEquipmentBaseClass; +import neqsim.processsimulation.processequipment.mixer.Mixer; +import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.processsimulation.processequipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +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.processsimulation.processequipment.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.processsimulation.processequipment.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.processsimulation.processequipment.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.processsimulation.processequipment.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.processsimulation.processequipment.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.processsimulation.processequipment.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.processsimulation.processequipment.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/processsimulation/processequipment/util/Adjuster.java similarity index 94% rename from src/main/java/neqsim/processSimulation/processEquipment/util/Adjuster.java rename to src/main/java/neqsim/processsimulation/processequipment/util/Adjuster.java index fa55ed5e1a..90f537ed74 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/util/Adjuster.java +++ b/src/main/java/neqsim/processsimulation/processequipment/util/Adjuster.java @@ -1,11 +1,11 @@ -package neqsim.processSimulation.processEquipment.util; +package neqsim.processsimulation.processequipment.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.processsimulation.processequipment.ProcessEquipmentBaseClass; +import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; +import neqsim.processsimulation.processequipment.stream.Stream; /** *

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

* * @param adjustedEquipment a - * {@link neqsim.processSimulation.processEquipment.ProcessEquipmentInterface} object + * {@link neqsim.processsimulation.processequipment.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.processsimulation.processequipment.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.processsimulation.processequipment.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.processsimulation.processequipment.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.processsimulation.processequipment.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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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/processsimulation/processequipment/util/Calculator.java similarity index 86% rename from src/main/java/neqsim/processSimulation/processEquipment/util/Calculator.java rename to src/main/java/neqsim/processsimulation/processequipment/util/Calculator.java index 41a1a026a3..3fe8ff2a89 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/util/Calculator.java +++ b/src/main/java/neqsim/processsimulation/processequipment/util/Calculator.java @@ -1,14 +1,14 @@ -package neqsim.processSimulation.processEquipment.util; +package neqsim.processsimulation.processequipment.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.processsimulation.processequipment.ProcessEquipmentBaseClass; +import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; +import neqsim.processsimulation.processequipment.compressor.Compressor; +import neqsim.processsimulation.processequipment.splitter.Splitter; /** *

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

* - * @param unit a {@link neqsim.processSimulation.processEquipment.ProcessEquipmentInterface} + * @param unit a {@link neqsim.processsimulation.processequipment.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.processsimulation.processequipment.ProcessEquipmentInterface} object */ public ProcessEquipmentInterface getOutputVariable() { return outputVariable; @@ -120,7 +120,7 @@ public void run(UUID id) { if (sum < 0.0) { sum = 0.0; } - ((neqsim.processSimulation.processEquipment.stream.Stream) outputVariable).setFlowRate(sum, + ((neqsim.processsimulation.processequipment.stream.Stream) outputVariable).setFlowRate(sum, "kg/hr"); outputVariable.run(); outputVariable.setCalculationIdentifier(id); @@ -137,7 +137,7 @@ public void run(UUID id) { *

* * @param outputVariable a - * {@link neqsim.processSimulation.processEquipment.ProcessEquipmentInterface} object + * {@link neqsim.processsimulation.processequipment.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/processsimulation/processequipment/util/FlowRateAdjuster.java similarity index 90% rename from src/main/java/neqsim/processSimulation/processEquipment/util/FlowRateAdjuster.java rename to src/main/java/neqsim/processsimulation/processequipment/util/FlowRateAdjuster.java index b9ce2603eb..88676e9142 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/util/FlowRateAdjuster.java +++ b/src/main/java/neqsim/processsimulation/processequipment/util/FlowRateAdjuster.java @@ -1,16 +1,16 @@ -package neqsim.processSimulation.processEquipment.util; +package neqsim.processsimulation.processequipment.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.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.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +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.processsimulation.processequipment.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/processsimulation/processequipment/util/FlowSetter.java similarity index 93% rename from src/main/java/neqsim/processSimulation/processEquipment/util/FlowSetter.java rename to src/main/java/neqsim/processsimulation/processequipment/util/FlowSetter.java index f9e53aa8a8..8857e72b34 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/util/FlowSetter.java +++ b/src/main/java/neqsim/processsimulation/processequipment/util/FlowSetter.java @@ -1,17 +1,17 @@ -package neqsim.processSimulation.processEquipment.util; +package neqsim.processsimulation.processequipment.util; 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.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.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.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; import neqsim.util.exception.InvalidInputException; /** @@ -45,7 +45,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.processsimulation.processequipment.stream.StreamInterface} object */ public FlowSetter(String name, StreamInterface stream) { super(name, stream); @@ -302,9 +302,9 @@ public void run(UUID id) { * createReferenceProcess. *

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

* - * @return a {@link neqsim.processSimulation.processSystem.ProcessSystem} object + * @return a {@link neqsim.processsimulation.processsystem.ProcessSystem} object */ public ProcessSystem getReferenceProcess() { return referenceProcess; diff --git a/src/main/java/neqsim/processSimulation/processEquipment/util/GORfitter.java b/src/main/java/neqsim/processsimulation/processequipment/util/GORfitter.java similarity index 95% rename from src/main/java/neqsim/processSimulation/processEquipment/util/GORfitter.java rename to src/main/java/neqsim/processsimulation/processequipment/util/GORfitter.java index cd5f3e5924..6173c18423 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/util/GORfitter.java +++ b/src/main/java/neqsim/processsimulation/processequipment/util/GORfitter.java @@ -1,13 +1,13 @@ -package neqsim.processSimulation.processEquipment.util; +package neqsim.processsimulation.processequipment.util; 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.stream.StreamInterface; +import neqsim.processsimulation.processequipment.TwoPortEquipment; +import neqsim.processsimulation.processequipment.stream.StreamInterface; import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

@@ -37,7 +37,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.processsimulation.processequipment.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/processsimulation/processequipment/util/MPFMfitter.java similarity index 95% rename from src/main/java/neqsim/processSimulation/processEquipment/util/MPFMfitter.java rename to src/main/java/neqsim/processsimulation/processequipment/util/MPFMfitter.java index 2a59020587..011ac248b8 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/util/MPFMfitter.java +++ b/src/main/java/neqsim/processsimulation/processequipment/util/MPFMfitter.java @@ -1,13 +1,13 @@ -package neqsim.processSimulation.processEquipment.util; +package neqsim.processsimulation.processequipment.util; 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.stream.StreamInterface; +import neqsim.processsimulation.processequipment.TwoPortEquipment; +import neqsim.processsimulation.processequipment.stream.StreamInterface; import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

@@ -48,7 +48,7 @@ public MPFMfitter() { * Constructor for MPFMfitter. *

* - * @param stream a {@link neqsim.processSimulation.processEquipment.stream.StreamInterface} object + * @param stream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} object */ @Deprecated public MPFMfitter(StreamInterface stream) { @@ -61,7 +61,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.processsimulation.processequipment.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/processsimulation/processequipment/util/MoleFractionControllerUtil.java similarity index 90% rename from src/main/java/neqsim/processSimulation/processEquipment/util/MoleFractionControllerUtil.java rename to src/main/java/neqsim/processsimulation/processequipment/util/MoleFractionControllerUtil.java index 901c261eeb..6c21252e90 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/util/MoleFractionControllerUtil.java +++ b/src/main/java/neqsim/processsimulation/processequipment/util/MoleFractionControllerUtil.java @@ -1,11 +1,11 @@ -package neqsim.processSimulation.processEquipment.util; +package neqsim.processsimulation.processequipment.util; import java.util.UUID; -import neqsim.processSimulation.processEquipment.TwoPortEquipment; -import neqsim.processSimulation.processEquipment.stream.Stream; -import neqsim.processSimulation.processEquipment.stream.StreamInterface; +import neqsim.processsimulation.processequipment.TwoPortEquipment; +import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.processsimulation.processequipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +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.processsimulation.processequipment.stream.StreamInterface} * object */ public MoleFractionControllerUtil(StreamInterface inletStream) { diff --git a/src/main/java/neqsim/processSimulation/processEquipment/util/NeqSimUnit.java b/src/main/java/neqsim/processsimulation/processequipment/util/NeqSimUnit.java similarity index 92% rename from src/main/java/neqsim/processSimulation/processEquipment/util/NeqSimUnit.java rename to src/main/java/neqsim/processsimulation/processequipment/util/NeqSimUnit.java index 9ee7a3f63e..e39b4bbe25 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/util/NeqSimUnit.java +++ b/src/main/java/neqsim/processsimulation/processequipment/util/NeqSimUnit.java @@ -1,14 +1,14 @@ -package neqsim.processSimulation.processEquipment.util; +package neqsim.processsimulation.processequipment.util; import java.util.UUID; -import neqsim.fluidMechanics.flowNode.FlowNodeInterface; -import neqsim.fluidMechanics.flowNode.twoPhaseNode.twoPhasePipeFlowNode.AnnularFlow; -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.fluidmechanics.flownode.FlowNodeInterface; +import neqsim.fluidmechanics.flownode.twophasenode.twophasepipeflownode.AnnularFlow; +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.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.processsimulation.processequipment.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/processsimulation/processequipment/util/PressureDrop.java similarity index 85% rename from src/main/java/neqsim/processSimulation/processEquipment/util/PressureDrop.java rename to src/main/java/neqsim/processsimulation/processequipment/util/PressureDrop.java index 95d08817a0..9178841b56 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/util/PressureDrop.java +++ b/src/main/java/neqsim/processsimulation/processequipment/util/PressureDrop.java @@ -1,12 +1,12 @@ -package neqsim.processSimulation.processEquipment.util; +package neqsim.processsimulation.processequipment.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.processsimulation.processequipment.stream.StreamInterface; +import neqsim.processsimulation.processequipment.valve.ThrottlingValve; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +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.processsimulation.processequipment.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/processsimulation/processequipment/util/Recycle.java similarity index 96% rename from src/main/java/neqsim/processSimulation/processEquipment/util/Recycle.java rename to src/main/java/neqsim/processsimulation/processequipment/util/Recycle.java index 72d1a4a89d..2ef92ca014 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/util/Recycle.java +++ b/src/main/java/neqsim/processsimulation/processequipment/util/Recycle.java @@ -1,14 +1,14 @@ -package neqsim.processSimulation.processEquipment.util; +package neqsim.processsimulation.processequipment.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.processsimulation.processequipment.ProcessEquipmentBaseClass; +import neqsim.processsimulation.processequipment.mixer.MixerInterface; +import neqsim.processsimulation.processequipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

@@ -149,7 +149,7 @@ 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); @@ -253,7 +253,7 @@ public StreamInterface getOutStream() { * initiateDownstreamProperties. *

* - * @param outstream a {@link neqsim.processSimulation.processEquipment.stream.StreamInterface} + * @param outstream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} * object */ public void initiateDownstreamProperties(StreamInterface outstream) { @@ -532,7 +532,7 @@ public StreamInterface getOutletStream() { * Setter for the field outletStream. *

* - * @param outletStream a {@link neqsim.processSimulation.processEquipment.stream.StreamInterface} + * @param outletStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} * object */ public void setOutletStream(StreamInterface outletStream) { diff --git a/src/main/java/neqsim/processSimulation/processEquipment/util/RecycleController.java b/src/main/java/neqsim/processsimulation/processequipment/util/RecycleController.java similarity index 94% rename from src/main/java/neqsim/processSimulation/processEquipment/util/RecycleController.java rename to src/main/java/neqsim/processsimulation/processequipment/util/RecycleController.java index 6c43cc2f35..29eaf3bdee 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/util/RecycleController.java +++ b/src/main/java/neqsim/processsimulation/processequipment/util/RecycleController.java @@ -1,4 +1,4 @@ -package neqsim.processSimulation.processEquipment.util; +package neqsim.processsimulation.processequipment.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.processsimulation.processequipment.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.processsimulation.processequipment.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.processsimulation.processequipment.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/processsimulation/processequipment/util/SetPoint.java similarity index 87% rename from src/main/java/neqsim/processSimulation/processEquipment/util/SetPoint.java rename to src/main/java/neqsim/processsimulation/processequipment/util/SetPoint.java index 6213a8d209..d23878c8c0 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/util/SetPoint.java +++ b/src/main/java/neqsim/processsimulation/processequipment/util/SetPoint.java @@ -1,11 +1,11 @@ -package neqsim.processSimulation.processEquipment.util; +package neqsim.processsimulation.processequipment.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.processsimulation.processequipment.ProcessEquipmentBaseClass; +import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; +import neqsim.processsimulation.processequipment.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.processsimulation.processequipment.ProcessEquipmentInterface} object * @param targetVariable a {@link java.lang.String} object * @param sourceEquipment a - * {@link neqsim.processSimulation.processEquipment.ProcessEquipmentInterface} object + * {@link neqsim.processsimulation.processequipment.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.processsimulation.processequipment.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.processsimulation.processequipment.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.processsimulation.processequipment.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.processsimulation.processequipment.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.processsimulation.processequipment.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.processsimulation.processequipment.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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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/processsimulation/processequipment/util/StreamSaturatorUtil.java similarity index 90% rename from src/main/java/neqsim/processSimulation/processEquipment/util/StreamSaturatorUtil.java rename to src/main/java/neqsim/processsimulation/processequipment/util/StreamSaturatorUtil.java index d7f15d32c7..f20342a3ca 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/util/StreamSaturatorUtil.java +++ b/src/main/java/neqsim/processsimulation/processequipment/util/StreamSaturatorUtil.java @@ -1,11 +1,11 @@ -package neqsim.processSimulation.processEquipment.util; +package neqsim.processsimulation.processequipment.util; import java.util.UUID; -import neqsim.processSimulation.processEquipment.TwoPortEquipment; -import neqsim.processSimulation.processEquipment.stream.Stream; -import neqsim.processSimulation.processEquipment.stream.StreamInterface; +import neqsim.processsimulation.processequipment.TwoPortEquipment; +import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.processsimulation.processequipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/main/java/neqsim/processSimulation/processEquipment/util/StreamTransition.java b/src/main/java/neqsim/processsimulation/processequipment/util/StreamTransition.java similarity index 83% rename from src/main/java/neqsim/processSimulation/processEquipment/util/StreamTransition.java rename to src/main/java/neqsim/processsimulation/processequipment/util/StreamTransition.java index 4120ebf089..f1a60243fd 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/util/StreamTransition.java +++ b/src/main/java/neqsim/processsimulation/processequipment/util/StreamTransition.java @@ -1,10 +1,9 @@ -package neqsim.processSimulation.processEquipment.util; +package neqsim.processsimulation.processequipment.util; import java.util.UUID; - -import neqsim.processSimulation.processEquipment.TwoPortEquipment; -import neqsim.processSimulation.processEquipment.stream.StreamInterface; -import neqsim.processSimulation.processSystem.ProcessSystem; +import neqsim.processsimulation.processequipment.TwoPortEquipment; +import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.processsimulation.processsystem.ProcessSystem; import neqsim.thermo.system.SystemInterface; /** @@ -33,9 +32,9 @@ public StreamTransition() { * Constructor for StreamTransition. *

* - * @param inletStream a {@link neqsim.processSimulation.processEquipment.stream.StreamInterface} + * @param inletStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} * object - * @param outletStream a {@link neqsim.processSimulation.processEquipment.stream.StreamInterface} + * @param outletStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} * object */ @Deprecated @@ -49,9 +48,9 @@ public StreamTransition(StreamInterface inletStream, StreamInterface outletStrea *

* * @param name name of unit operation - * @param inletStream a {@link neqsim.processSimulation.processEquipment.stream.StreamInterface} + * @param inletStream a {@link neqsim.processsimulation.processequipment.stream.StreamInterface} * object - * @param outletStream a {@link neqsim.processSimulation.processEquipment.stream.StreamInterface} + * @param outletStream a {@link neqsim.processsimulation.processequipment.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/processsimulation/processequipment/valve/SafetyValve.java similarity index 87% rename from src/main/java/neqsim/processSimulation/processEquipment/valve/SafetyValve.java rename to src/main/java/neqsim/processsimulation/processequipment/valve/SafetyValve.java index 3d94590a77..a417f5f437 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/valve/SafetyValve.java +++ b/src/main/java/neqsim/processsimulation/processequipment/valve/SafetyValve.java @@ -1,6 +1,6 @@ -package neqsim.processSimulation.processEquipment.valve; +package neqsim.processsimulation.processequipment.valve; -import neqsim.processSimulation.processEquipment.stream.StreamInterface; +import neqsim.processsimulation.processequipment.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.processsimulation.processequipment.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/processsimulation/processequipment/valve/ThrottlingValve.java similarity index 98% rename from src/main/java/neqsim/processSimulation/processEquipment/valve/ThrottlingValve.java rename to src/main/java/neqsim/processsimulation/processequipment/valve/ThrottlingValve.java index 3063231105..f67915e859 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/valve/ThrottlingValve.java +++ b/src/main/java/neqsim/processsimulation/processequipment/valve/ThrottlingValve.java @@ -1,16 +1,16 @@ -package neqsim.processSimulation.processEquipment.valve; +package neqsim.processsimulation.processequipment.valve; import java.util.UUID; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import com.google.gson.GsonBuilder; -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.processsimulation.mechanicaldesign.valve.ValveMechanicalDesign; +import neqsim.processsimulation.processequipment.TwoPortEquipment; +import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.processsimulation.util.monitor.ValveResponse; import neqsim.thermo.phase.PhaseType; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

@@ -60,7 +60,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.processsimulation.processequipment.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/processsimulation/processequipment/valve/ValveInterface.java similarity index 89% rename from src/main/java/neqsim/processSimulation/processEquipment/valve/ValveInterface.java rename to src/main/java/neqsim/processsimulation/processequipment/valve/ValveInterface.java index 9de6989699..50c6d4f4a1 100644 --- a/src/main/java/neqsim/processSimulation/processEquipment/valve/ValveInterface.java +++ b/src/main/java/neqsim/processsimulation/processequipment/valve/ValveInterface.java @@ -4,10 +4,10 @@ * Created on 22. august 2001, 17:20 */ -package neqsim.processSimulation.processEquipment.valve; +package neqsim.processsimulation.processequipment.valve; -import neqsim.processSimulation.processEquipment.ProcessEquipmentInterface; -import neqsim.processSimulation.processEquipment.TwoPortInterface; +import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; +import neqsim.processsimulation.processequipment.TwoPortInterface; import neqsim.thermo.system.SystemInterface; /** diff --git a/src/main/java/neqsim/processSimulation/processSystem/ModuleInterface.java b/src/main/java/neqsim/processsimulation/processsystem/ModuleInterface.java similarity index 82% rename from src/main/java/neqsim/processSimulation/processSystem/ModuleInterface.java rename to src/main/java/neqsim/processsimulation/processsystem/ModuleInterface.java index 0e188c5cb6..442282c1c5 100644 --- a/src/main/java/neqsim/processSimulation/processSystem/ModuleInterface.java +++ b/src/main/java/neqsim/processsimulation/processsystem/ModuleInterface.java @@ -4,10 +4,10 @@ * Created on 1. november 2006, 21:48 */ -package neqsim.processSimulation.processSystem; +package neqsim.processsimulation.processsystem; -import neqsim.processSimulation.processEquipment.ProcessEquipmentInterface; -import neqsim.processSimulation.processEquipment.stream.StreamInterface; +import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; +import neqsim.processsimulation.processequipment.stream.StreamInterface; /** *

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

* - * @return a {@link neqsim.processSimulation.processSystem.ProcessSystem} object + * @return a {@link neqsim.processsimulation.processsystem.ProcessSystem} object */ - public neqsim.processSimulation.processSystem.ProcessSystem getOperations(); + public neqsim.processsimulation.processsystem.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.processsimulation.processequipment.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.processsimulation.processequipment.stream.StreamInterface} object */ public StreamInterface getOutputStream(String streamName); diff --git a/src/main/java/neqsim/processSimulation/processSystem/ProcessModule.java b/src/main/java/neqsim/processsimulation/processsystem/ProcessModule.java similarity index 95% rename from src/main/java/neqsim/processSimulation/processSystem/ProcessModule.java rename to src/main/java/neqsim/processsimulation/processsystem/ProcessModule.java index a55f361fe5..d8d9fda709 100644 --- a/src/main/java/neqsim/processSimulation/processSystem/ProcessModule.java +++ b/src/main/java/neqsim/processsimulation/processsystem/ProcessModule.java @@ -1,4 +1,4 @@ -package neqsim.processSimulation.processSystem; +package neqsim.processsimulation.processsystem; 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.processsimulation.SimulationBaseClass; +import neqsim.processsimulation.processequipment.ProcessEquipmentInterface; +import neqsim.processsimulation.processequipment.util.Recycle; +import neqsim.processsimulation.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.processsimulation.processsystem.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/processsimulation/processsystem/ProcessModuleBaseClass.java similarity index 90% rename from src/main/java/neqsim/processSimulation/processSystem/ProcessModuleBaseClass.java rename to src/main/java/neqsim/processsimulation/processsystem/ProcessModuleBaseClass.java index 0475a556d4..56b933b195 100644 --- a/src/main/java/neqsim/processSimulation/processSystem/ProcessModuleBaseClass.java +++ b/src/main/java/neqsim/processsimulation/processsystem/ProcessModuleBaseClass.java @@ -4,14 +4,14 @@ * Created on 1. november 2006, 22:07 */ -package neqsim.processSimulation.processSystem; +package neqsim.processsimulation.processsystem; 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.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.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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.ProcessSystem(); /** *

@@ -117,7 +117,7 @@ public void setIsCalcDesign(boolean isCalcDesign) { /** {@inheritDoc} */ @Override - public neqsim.processSimulation.processSystem.ProcessSystem getOperations() { + public neqsim.processsimulation.processsystem.ProcessSystem getOperations() { return operations; } diff --git a/src/main/java/neqsim/processSimulation/processSystem/ProcessSystem.java b/src/main/java/neqsim/processsimulation/processsystem/ProcessSystem.java similarity index 94% rename from src/main/java/neqsim/processSimulation/processSystem/ProcessSystem.java rename to src/main/java/neqsim/processsimulation/processsystem/ProcessSystem.java index 7e2500ff3b..89e2368511 100644 --- a/src/main/java/neqsim/processSimulation/processSystem/ProcessSystem.java +++ b/src/main/java/neqsim/processsimulation/processsystem/ProcessSystem.java @@ -1,4 +1,4 @@ -package neqsim.processSimulation.processSystem; +package neqsim.processsimulation.processsystem; 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.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.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.processsimulation.processequipment.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.processsimulation.processequipment.ProcessEquipmentInterface} * object */ public void add(int position, ProcessEquipmentInterface operation) { @@ -115,7 +115,7 @@ public void add(int position, ProcessEquipmentInterface operation) { *

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

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

* * @param name Name of measurement device - * @return a {@link neqsim.processSimulation.measurementDevice.MeasurementDeviceInterface} object + * @return a {@link neqsim.processsimulation.measurementdevice.MeasurementDeviceInterface} object */ public MeasurementDeviceInterface getMeasurementDevice(String name) { for (int i = 0; i < measurementDevices.size(); i++) { @@ -223,7 +223,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.processsimulation.processequipment.ProcessEquipmentBaseClass} * object */ public void replaceObject(String unitName, ProcessEquipmentBaseClass operation) { @@ -441,7 +441,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.processsimulation.processequipment.util.Adjuster) unitOperations.get(i)) .solved()) { isConverged = false; break; @@ -656,7 +656,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.processsimulation.processsystem.ProcessSystem} object */ public static ProcessSystem open(String filePath) { try (ObjectInputStream objectinputstream = @@ -697,8 +697,8 @@ public String[][] reportResults() { * @param filename a {@link java.lang.String} object */ public void printLogFile(String filename) { - neqsim.dataPresentation.fileHandeling.createTextFile.TextFile tempFile = - new neqsim.dataPresentation.fileHandeling.createTextFile.TextFile(); + neqsim.datapresentation.filehandeling.createtextfile.TextFile tempFile = + new neqsim.datapresentation.filehandeling.createtextfile.TextFile(); tempFile.setOutputFileName(filename); tempFile.setValues(signalDB); tempFile.createFile(); @@ -788,10 +788,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.processsimulation.processequipment.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.processsimulation.processequipment.pump.Pump) unitOperations.get(i)) .getPower(); } } @@ -817,7 +817,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.processsimulation.processequipment.heatExchanger.Cooler) unitOperations.get(i)) .getDuty(); } } @@ -843,7 +843,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.processsimulation.processequipment.heatExchanger.Heater) unitOperations.get(i)) .getDuty(); } } @@ -883,7 +883,7 @@ public void setSurroundingTemperature(double surroundingTemperature) { * Create deep copy. *

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

* - * @return a {@link neqsim.processSimulation.conditionMonitor.ConditionMonitor} object + * @return a {@link neqsim.processsimulation.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/processsimulation/processsystem/processmodules/AdsorptionDehydrationlModule.java similarity index 92% rename from src/main/java/neqsim/processSimulation/processSystem/processModules/AdsorptionDehydrationlModule.java rename to src/main/java/neqsim/processsimulation/processsystem/processmodules/AdsorptionDehydrationlModule.java index e186601305..d07cb19342 100644 --- a/src/main/java/neqsim/processSimulation/processSystem/processModules/AdsorptionDehydrationlModule.java +++ b/src/main/java/neqsim/processsimulation/processsystem/processmodules/AdsorptionDehydrationlModule.java @@ -1,14 +1,14 @@ -package neqsim.processSimulation.processSystem.processModules; +package neqsim.processsimulation.processsystem.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.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.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.processsimulation.processsystem.processmodules.AdsorptionDehydrationlModule adsorptionPlant = + new neqsim.processsimulation.processsystem.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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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/processsimulation/processsystem/processmodules/CO2RemovalModule.java similarity index 91% rename from src/main/java/neqsim/processSimulation/processSystem/processModules/CO2RemovalModule.java rename to src/main/java/neqsim/processsimulation/processsystem/processmodules/CO2RemovalModule.java index 5e480f15d5..fb3d388833 100644 --- a/src/main/java/neqsim/processSimulation/processSystem/processModules/CO2RemovalModule.java +++ b/src/main/java/neqsim/processsimulation/processsystem/processmodules/CO2RemovalModule.java @@ -1,11 +1,11 @@ -package neqsim.processSimulation.processSystem.processModules; +package neqsim.processsimulation.processsystem.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.processsimulation.processequipment.separator.Separator; +import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.processsimulation.processsystem.ProcessModuleBaseClass; /** *

diff --git a/src/main/java/neqsim/processSimulation/processSystem/processModules/DPCUModule.java b/src/main/java/neqsim/processsimulation/processsystem/processmodules/DPCUModule.java similarity index 90% rename from src/main/java/neqsim/processSimulation/processSystem/processModules/DPCUModule.java rename to src/main/java/neqsim/processsimulation/processsystem/processmodules/DPCUModule.java index f58eb9cc0a..e63805e0fb 100644 --- a/src/main/java/neqsim/processSimulation/processSystem/processModules/DPCUModule.java +++ b/src/main/java/neqsim/processsimulation/processsystem/processmodules/DPCUModule.java @@ -1,24 +1,24 @@ -package neqsim.processSimulation.processSystem.processModules; +package neqsim.processsimulation.processsystem.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.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; /** *

@@ -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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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/processsimulation/processsystem/processmodules/GlycolDehydrationlModule.java similarity index 95% rename from src/main/java/neqsim/processSimulation/processSystem/processModules/GlycolDehydrationlModule.java rename to src/main/java/neqsim/processsimulation/processsystem/processmodules/GlycolDehydrationlModule.java index 00add8a0b8..f7b0bf47e2 100644 --- a/src/main/java/neqsim/processSimulation/processSystem/processModules/GlycolDehydrationlModule.java +++ b/src/main/java/neqsim/processsimulation/processsystem/processmodules/GlycolDehydrationlModule.java @@ -1,19 +1,19 @@ -package neqsim.processSimulation.processSystem.processModules; +package neqsim.processsimulation.processsystem.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.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; /** *

@@ -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.processsimulation.processsystem.processmodules.GlycolDehydrationlModule TEGplant = + new neqsim.processsimulation.processsystem.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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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/processsimulation/processsystem/processmodules/MEGReclaimerModule.java similarity index 90% rename from src/main/java/neqsim/processSimulation/processSystem/processModules/MEGReclaimerModule.java rename to src/main/java/neqsim/processsimulation/processsystem/processmodules/MEGReclaimerModule.java index 9236518045..2b8de7c2c7 100644 --- a/src/main/java/neqsim/processSimulation/processSystem/processModules/MEGReclaimerModule.java +++ b/src/main/java/neqsim/processsimulation/processsystem/processmodules/MEGReclaimerModule.java @@ -1,16 +1,16 @@ -package neqsim.processSimulation.processSystem.processModules; +package neqsim.processsimulation.processsystem.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.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; /** *

diff --git a/src/main/java/neqsim/processSimulation/processSystem/processModules/MixerGasProcessingModule.java b/src/main/java/neqsim/processsimulation/processsystem/processmodules/MixerGasProcessingModule.java similarity index 91% rename from src/main/java/neqsim/processSimulation/processSystem/processModules/MixerGasProcessingModule.java rename to src/main/java/neqsim/processsimulation/processsystem/processmodules/MixerGasProcessingModule.java index 1072abe206..b961d8444d 100644 --- a/src/main/java/neqsim/processSimulation/processSystem/processModules/MixerGasProcessingModule.java +++ b/src/main/java/neqsim/processsimulation/processsystem/processmodules/MixerGasProcessingModule.java @@ -1,16 +1,16 @@ -package neqsim.processSimulation.processSystem.processModules; +package neqsim.processsimulation.processsystem.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.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; /** *

@@ -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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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/processsimulation/processsystem/processmodules/PropaneCoolingModule.java similarity index 92% rename from src/main/java/neqsim/processSimulation/processSystem/processModules/PropaneCoolingModule.java rename to src/main/java/neqsim/processsimulation/processsystem/processmodules/PropaneCoolingModule.java index c64241c632..59e94b0326 100644 --- a/src/main/java/neqsim/processSimulation/processSystem/processModules/PropaneCoolingModule.java +++ b/src/main/java/neqsim/processsimulation/processsystem/processmodules/PropaneCoolingModule.java @@ -1,14 +1,14 @@ -package neqsim.processSimulation.processSystem.processModules; +package neqsim.processsimulation.processsystem.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.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; /** *

diff --git a/src/main/java/neqsim/processSimulation/processSystem/processModules/SeparationTrainModule.java b/src/main/java/neqsim/processsimulation/processsystem/processmodules/SeparationTrainModule.java similarity index 93% rename from src/main/java/neqsim/processSimulation/processSystem/processModules/SeparationTrainModule.java rename to src/main/java/neqsim/processsimulation/processsystem/processmodules/SeparationTrainModule.java index b01670ef1b..546a0afe25 100644 --- a/src/main/java/neqsim/processSimulation/processSystem/processModules/SeparationTrainModule.java +++ b/src/main/java/neqsim/processsimulation/processsystem/processmodules/SeparationTrainModule.java @@ -1,18 +1,18 @@ -package neqsim.processSimulation.processSystem.processModules; +package neqsim.processsimulation.processsystem.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.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; /** *

@@ -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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.ProcessSystem(); operations.add(wellStream); operations.add(separationModule); diff --git a/src/main/java/neqsim/processSimulation/processSystem/processModules/SeparationTrainModuleSimple.java b/src/main/java/neqsim/processsimulation/processsystem/processmodules/SeparationTrainModuleSimple.java similarity index 93% rename from src/main/java/neqsim/processSimulation/processSystem/processModules/SeparationTrainModuleSimple.java rename to src/main/java/neqsim/processsimulation/processsystem/processmodules/SeparationTrainModuleSimple.java index 8ae784ed4e..dc9d43ac39 100644 --- a/src/main/java/neqsim/processSimulation/processSystem/processModules/SeparationTrainModuleSimple.java +++ b/src/main/java/neqsim/processsimulation/processsystem/processmodules/SeparationTrainModuleSimple.java @@ -1,18 +1,18 @@ -package neqsim.processSimulation.processSystem.processModules; +package neqsim.processsimulation.processsystem.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.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; /** *

@@ -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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.ProcessSystem(); operations.add(wellStream); operations.add(separationModule); diff --git a/src/main/java/neqsim/processSimulation/processSystem/processModules/WellFluidModule.java b/src/main/java/neqsim/processsimulation/processsystem/processmodules/WellFluidModule.java similarity index 91% rename from src/main/java/neqsim/processSimulation/processSystem/processModules/WellFluidModule.java rename to src/main/java/neqsim/processsimulation/processsystem/processmodules/WellFluidModule.java index 31f769b187..b0147c1b12 100644 --- a/src/main/java/neqsim/processSimulation/processSystem/processModules/WellFluidModule.java +++ b/src/main/java/neqsim/processsimulation/processsystem/processmodules/WellFluidModule.java @@ -1,15 +1,15 @@ -package neqsim.processSimulation.processSystem.processModules; +package neqsim.processsimulation.processsystem.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.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.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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.ProcessSystem(); operations.add(wellStream); operations.add(separationModule); diff --git a/src/main/java/neqsim/processSimulation/util/monitor/CompressorResponse.java b/src/main/java/neqsim/processsimulation/util/monitor/CompressorResponse.java similarity index 92% rename from src/main/java/neqsim/processSimulation/util/monitor/CompressorResponse.java rename to src/main/java/neqsim/processsimulation/util/monitor/CompressorResponse.java index 77c2ecea31..4f2c5d7afd 100644 --- a/src/main/java/neqsim/processSimulation/util/monitor/CompressorResponse.java +++ b/src/main/java/neqsim/processsimulation/util/monitor/CompressorResponse.java @@ -1,6 +1,6 @@ -package neqsim.processSimulation.util.monitor; +package neqsim.processsimulation.util.monitor; -import neqsim.processSimulation.processEquipment.compressor.Compressor; +import neqsim.processsimulation.processequipment.compressor.Compressor; /** *

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

* * @param inputCompressor a - * {@link neqsim.processSimulation.processEquipment.compressor.Compressor} object + * {@link neqsim.processsimulation.processequipment.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/processsimulation/util/monitor/FluidComponentResponse.java similarity index 98% rename from src/main/java/neqsim/processSimulation/util/monitor/FluidComponentResponse.java rename to src/main/java/neqsim/processsimulation/util/monitor/FluidComponentResponse.java index ce8d11a71f..23e7737231 100644 --- a/src/main/java/neqsim/processSimulation/util/monitor/FluidComponentResponse.java +++ b/src/main/java/neqsim/processsimulation/util/monitor/FluidComponentResponse.java @@ -1,4 +1,4 @@ -package neqsim.processSimulation.util.monitor; +package neqsim.processsimulation.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/processsimulation/util/monitor/FluidResponse.java similarity index 99% rename from src/main/java/neqsim/processSimulation/util/monitor/FluidResponse.java rename to src/main/java/neqsim/processsimulation/util/monitor/FluidResponse.java index 2c20bcc133..96d9e0517e 100644 --- a/src/main/java/neqsim/processSimulation/util/monitor/FluidResponse.java +++ b/src/main/java/neqsim/processsimulation/util/monitor/FluidResponse.java @@ -1,4 +1,4 @@ -package neqsim.processSimulation.util.monitor; +package neqsim.processsimulation.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/processsimulation/util/monitor/HXResponse.java similarity index 88% rename from src/main/java/neqsim/processSimulation/util/monitor/HXResponse.java rename to src/main/java/neqsim/processsimulation/util/monitor/HXResponse.java index 926c8f8d09..093a07ab7f 100644 --- a/src/main/java/neqsim/processSimulation/util/monitor/HXResponse.java +++ b/src/main/java/neqsim/processsimulation/util/monitor/HXResponse.java @@ -1,6 +1,6 @@ -package neqsim.processSimulation.util.monitor; +package neqsim.processsimulation.util.monitor; -import neqsim.processSimulation.processEquipment.heatExchanger.HeatExchanger; +import neqsim.processsimulation.processequipment.heatExchanger.HeatExchanger; /** *

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

* * @param inputHeatExchanger a - * {@link neqsim.processSimulation.processEquipment.heatExchanger.HeatExchanger} object + * {@link neqsim.processsimulation.processequipment.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/processsimulation/util/monitor/HeaterResponse.java similarity index 73% rename from src/main/java/neqsim/processSimulation/util/monitor/HeaterResponse.java rename to src/main/java/neqsim/processsimulation/util/monitor/HeaterResponse.java index d5c44ffacd..7bf808579a 100644 --- a/src/main/java/neqsim/processSimulation/util/monitor/HeaterResponse.java +++ b/src/main/java/neqsim/processsimulation/util/monitor/HeaterResponse.java @@ -1,6 +1,6 @@ -package neqsim.processSimulation.util.monitor; +package neqsim.processsimulation.util.monitor; -import neqsim.processSimulation.processEquipment.heatExchanger.Heater; +import neqsim.processsimulation.processequipment.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.processsimulation.processequipment.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/processsimulation/util/monitor/MPMResponse.java similarity index 77% rename from src/main/java/neqsim/processSimulation/util/monitor/MPMResponse.java rename to src/main/java/neqsim/processsimulation/util/monitor/MPMResponse.java index 4c50c5a5e0..e6a805120e 100644 --- a/src/main/java/neqsim/processSimulation/util/monitor/MPMResponse.java +++ b/src/main/java/neqsim/processsimulation/util/monitor/MPMResponse.java @@ -1,6 +1,6 @@ -package neqsim.processSimulation.util.monitor; +package neqsim.processsimulation.util.monitor; -import neqsim.processSimulation.measurementDevice.MultiPhaseMeter; +import neqsim.processsimulation.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.processsimulation.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/processsimulation/util/monitor/PumpResponse.java similarity index 92% rename from src/main/java/neqsim/processSimulation/util/monitor/PumpResponse.java rename to src/main/java/neqsim/processsimulation/util/monitor/PumpResponse.java index 3d15e7fe93..7d8aae8b98 100644 --- a/src/main/java/neqsim/processSimulation/util/monitor/PumpResponse.java +++ b/src/main/java/neqsim/processsimulation/util/monitor/PumpResponse.java @@ -1,6 +1,6 @@ -package neqsim.processSimulation.util.monitor; +package neqsim.processsimulation.util.monitor; -import neqsim.processSimulation.processEquipment.pump.Pump; +import neqsim.processsimulation.processequipment.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.processsimulation.processequipment.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/processsimulation/util/monitor/SeparatorResponse.java similarity index 83% rename from src/main/java/neqsim/processSimulation/util/monitor/SeparatorResponse.java rename to src/main/java/neqsim/processsimulation/util/monitor/SeparatorResponse.java index 5c3a750a4f..b615964c07 100644 --- a/src/main/java/neqsim/processSimulation/util/monitor/SeparatorResponse.java +++ b/src/main/java/neqsim/processsimulation/util/monitor/SeparatorResponse.java @@ -1,7 +1,7 @@ -package neqsim.processSimulation.util.monitor; +package neqsim.processsimulation.util.monitor; -import neqsim.processSimulation.processEquipment.separator.Separator; -import neqsim.processSimulation.processEquipment.separator.ThreePhaseSeparator; +import neqsim.processsimulation.processequipment.separator.Separator; +import neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator; /** *

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

* * @param inputSeparator a - * {@link neqsim.processSimulation.processEquipment.separator.ThreePhaseSeparator} object + * {@link neqsim.processsimulation.processequipment.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.processsimulation.processequipment.separator.Separator} * object */ public SeparatorResponse(Separator inputSeparator) { diff --git a/src/main/java/neqsim/processSimulation/util/monitor/StreamResponse.java b/src/main/java/neqsim/processsimulation/util/monitor/StreamResponse.java similarity index 97% rename from src/main/java/neqsim/processSimulation/util/monitor/StreamResponse.java rename to src/main/java/neqsim/processsimulation/util/monitor/StreamResponse.java index f328f9a1b2..d627f7ee64 100644 --- a/src/main/java/neqsim/processSimulation/util/monitor/StreamResponse.java +++ b/src/main/java/neqsim/processsimulation/util/monitor/StreamResponse.java @@ -1,10 +1,10 @@ -package neqsim.processSimulation.util.monitor; +package neqsim.processsimulation.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.standards.gasQuality.Standard_ISO6976; +import neqsim.processsimulation.processequipment.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.processsimulation.processequipment.stream.StreamInterface} * object */ public StreamResponse(StreamInterface inputStream) { diff --git a/src/main/java/neqsim/processSimulation/util/monitor/ThreePhaseSeparatorResponse.java b/src/main/java/neqsim/processsimulation/util/monitor/ThreePhaseSeparatorResponse.java similarity index 75% rename from src/main/java/neqsim/processSimulation/util/monitor/ThreePhaseSeparatorResponse.java rename to src/main/java/neqsim/processsimulation/util/monitor/ThreePhaseSeparatorResponse.java index b06ca576ca..105f82dcb8 100644 --- a/src/main/java/neqsim/processSimulation/util/monitor/ThreePhaseSeparatorResponse.java +++ b/src/main/java/neqsim/processsimulation/util/monitor/ThreePhaseSeparatorResponse.java @@ -1,7 +1,7 @@ -package neqsim.processSimulation.util.monitor; +package neqsim.processsimulation.util.monitor; -import neqsim.processSimulation.processEquipment.separator.Separator; -import neqsim.processSimulation.processEquipment.separator.ThreePhaseSeparator; +import neqsim.processsimulation.processequipment.separator.Separator; +import neqsim.processsimulation.processequipment.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.processsimulation.processequipment.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.processsimulation.processequipment.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/processsimulation/util/monitor/Value.java similarity index 89% rename from src/main/java/neqsim/processSimulation/util/monitor/Value.java rename to src/main/java/neqsim/processsimulation/util/monitor/Value.java index 46cc0a6d7f..0a56d3d73d 100644 --- a/src/main/java/neqsim/processSimulation/util/monitor/Value.java +++ b/src/main/java/neqsim/processsimulation/util/monitor/Value.java @@ -1,4 +1,4 @@ -package neqsim.processSimulation.util.monitor; +package neqsim.processsimulation.util.monitor; /** * Unit class nested within Units. diff --git a/src/main/java/neqsim/processSimulation/util/monitor/ValveResponse.java b/src/main/java/neqsim/processsimulation/util/monitor/ValveResponse.java similarity index 84% rename from src/main/java/neqsim/processSimulation/util/monitor/ValveResponse.java rename to src/main/java/neqsim/processsimulation/util/monitor/ValveResponse.java index 9d20f49589..017b999399 100644 --- a/src/main/java/neqsim/processSimulation/util/monitor/ValveResponse.java +++ b/src/main/java/neqsim/processsimulation/util/monitor/ValveResponse.java @@ -1,7 +1,7 @@ -package neqsim.processSimulation.util.monitor; +package neqsim.processsimulation.util.monitor; import java.util.ArrayList; -import neqsim.processSimulation.processEquipment.valve.ValveInterface; +import neqsim.processsimulation.processequipment.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.processsimulation.processequipment.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/processsimulation/util/monitor/WellAllocatorResponse.java similarity index 75% rename from src/main/java/neqsim/processSimulation/util/monitor/WellAllocatorResponse.java rename to src/main/java/neqsim/processsimulation/util/monitor/WellAllocatorResponse.java index e3abbcf165..53a0127b6d 100644 --- a/src/main/java/neqsim/processSimulation/util/monitor/WellAllocatorResponse.java +++ b/src/main/java/neqsim/processsimulation/util/monitor/WellAllocatorResponse.java @@ -1,6 +1,6 @@ -package neqsim.processSimulation.util.monitor; +package neqsim.processsimulation.util.monitor; -import neqsim.processSimulation.measurementDevice.WellAllocator; +import neqsim.processsimulation.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.processsimulation.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/processsimulation/util/report/Report.java similarity index 79% rename from src/main/java/neqsim/processSimulation/util/report/Report.java rename to src/main/java/neqsim/processsimulation/util/report/Report.java index 65ee3e199d..7e4afdf27e 100644 --- a/src/main/java/neqsim/processSimulation/util/report/Report.java +++ b/src/main/java/neqsim/processsimulation/util/report/Report.java @@ -1,4 +1,4 @@ -package neqsim.processSimulation.util.report; +package neqsim.processsimulation.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.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.thermo.system.SystemInterface; /** @@ -32,7 +32,7 @@ public class Report { /** *

Constructor for Report.

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

Constructor for Report.

* - * @param processEquipmentBaseClass a {@link neqsim.processSimulation.processEquipment.ProcessEquipmentBaseClass} object + * @param processEquipmentBaseClass a {@link neqsim.processsimulation.processequipment.ProcessEquipmentBaseClass} object */ public Report(ProcessEquipmentBaseClass processEquipmentBaseClass) { processEquipment = processEquipmentBaseClass; @@ -59,7 +59,7 @@ public Report(ProcessEquipmentBaseClass processEquipmentBaseClass) { /** *

Constructor for Report.

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

Constructor for Report.

* - * @param processModuleBaseClass a {@link neqsim.processSimulation.processSystem.ProcessModuleBaseClass} object + * @param processModuleBaseClass a {@link neqsim.processsimulation.processsystem.ProcessModuleBaseClass} object */ public Report(ProcessModuleBaseClass processModuleBaseClass) { // TODO Auto-generated constructor stub diff --git a/src/main/java/neqsim/PVTsimulation/modelTuning/BaseTuningClass.java b/src/main/java/neqsim/pvtsimulation/modeltuning/BaseTuningClass.java similarity index 91% rename from src/main/java/neqsim/PVTsimulation/modelTuning/BaseTuningClass.java rename to src/main/java/neqsim/pvtsimulation/modeltuning/BaseTuningClass.java index 603be41b85..5a8ac0b643 100644 --- a/src/main/java/neqsim/PVTsimulation/modelTuning/BaseTuningClass.java +++ b/src/main/java/neqsim/pvtsimulation/modeltuning/BaseTuningClass.java @@ -1,6 +1,6 @@ -package neqsim.PVTsimulation.modelTuning; +package neqsim.pvtsimulation.modeltuning; -import neqsim.PVTsimulation.simulation.SimulationInterface; +import neqsim.pvtsimulation.simulation.SimulationInterface; /** *

@@ -22,7 +22,7 @@ public class BaseTuningClass implements TuningInterface { * Constructor for BaseTuningClass. *

* - * @param simulationClass a {@link neqsim.PVTsimulation.simulation.SimulationInterface} object + * @param simulationClass a {@link neqsim.pvtsimulation.simulation.SimulationInterface} object */ public BaseTuningClass(SimulationInterface simulationClass) { this.simulation = simulationClass; diff --git a/src/main/java/neqsim/PVTsimulation/modelTuning/TuneToSaturation.java b/src/main/java/neqsim/pvtsimulation/modeltuning/TuneToSaturation.java similarity index 95% rename from src/main/java/neqsim/PVTsimulation/modelTuning/TuneToSaturation.java rename to src/main/java/neqsim/pvtsimulation/modeltuning/TuneToSaturation.java index f16d884ec2..797c780b4a 100644 --- a/src/main/java/neqsim/PVTsimulation/modelTuning/TuneToSaturation.java +++ b/src/main/java/neqsim/pvtsimulation/modeltuning/TuneToSaturation.java @@ -1,6 +1,6 @@ -package neqsim.PVTsimulation.modelTuning; +package neqsim.pvtsimulation.modeltuning; -import neqsim.PVTsimulation.simulation.SimulationInterface; +import neqsim.pvtsimulation.simulation.SimulationInterface; /** *

@@ -16,7 +16,7 @@ public class TuneToSaturation extends BaseTuningClass { * Constructor for TuneToSaturation. *

* - * @param simulation a {@link neqsim.PVTsimulation.simulation.SimulationInterface} object + * @param simulation a {@link neqsim.pvtsimulation.simulation.SimulationInterface} object */ public TuneToSaturation(SimulationInterface simulation) { super(simulation); diff --git a/src/main/java/neqsim/PVTsimulation/modelTuning/TuningInterface.java b/src/main/java/neqsim/pvtsimulation/modeltuning/TuningInterface.java similarity index 75% rename from src/main/java/neqsim/PVTsimulation/modelTuning/TuningInterface.java rename to src/main/java/neqsim/pvtsimulation/modeltuning/TuningInterface.java index 1bd07b2512..3a2048dd41 100644 --- a/src/main/java/neqsim/PVTsimulation/modelTuning/TuningInterface.java +++ b/src/main/java/neqsim/pvtsimulation/modeltuning/TuningInterface.java @@ -1,6 +1,6 @@ -package neqsim.PVTsimulation.modelTuning; +package neqsim.pvtsimulation.modeltuning; -import neqsim.PVTsimulation.simulation.SimulationInterface; +import neqsim.pvtsimulation.simulation.SimulationInterface; /** *

@@ -16,7 +16,7 @@ public interface TuningInterface { * getSimulation. *

* - * @return a {@link neqsim.PVTsimulation.simulation.SimulationInterface} object + * @return a {@link neqsim.pvtsimulation.simulation.SimulationInterface} object */ public SimulationInterface getSimulation(); diff --git a/src/main/java/neqsim/PVTsimulation/reservoirProperties/CompositionEstimation.java b/src/main/java/neqsim/pvtsimulation/reservoirproperties/CompositionEstimation.java similarity index 95% rename from src/main/java/neqsim/PVTsimulation/reservoirProperties/CompositionEstimation.java rename to src/main/java/neqsim/pvtsimulation/reservoirproperties/CompositionEstimation.java index 17616cf0c5..b8275a511d 100644 --- a/src/main/java/neqsim/PVTsimulation/reservoirProperties/CompositionEstimation.java +++ b/src/main/java/neqsim/pvtsimulation/reservoirproperties/CompositionEstimation.java @@ -1,4 +1,4 @@ -package neqsim.PVTsimulation.reservoirProperties; +package neqsim.pvtsimulation.reservoirproperties; /** *

diff --git a/src/main/java/neqsim/PVTsimulation/simulation/BasePVTsimulation.java b/src/main/java/neqsim/pvtsimulation/simulation/BasePVTsimulation.java similarity index 95% rename from src/main/java/neqsim/PVTsimulation/simulation/BasePVTsimulation.java rename to src/main/java/neqsim/pvtsimulation/simulation/BasePVTsimulation.java index e6838e108a..33a1689dea 100644 --- a/src/main/java/neqsim/PVTsimulation/simulation/BasePVTsimulation.java +++ b/src/main/java/neqsim/pvtsimulation/simulation/BasePVTsimulation.java @@ -1,8 +1,8 @@ -package neqsim.PVTsimulation.simulation; +package neqsim.pvtsimulation.simulation; -import neqsim.statistics.parameterFitting.nonLinearParameterFitting.LevenbergMarquardt; +import neqsim.statistics.parameterfitting.nonlinearparameterfitting.LevenbergMarquardt; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/main/java/neqsim/PVTsimulation/simulation/ConstantMassExpansion.java b/src/main/java/neqsim/pvtsimulation/simulation/ConstantMassExpansion.java similarity index 97% rename from src/main/java/neqsim/PVTsimulation/simulation/ConstantMassExpansion.java rename to src/main/java/neqsim/pvtsimulation/simulation/ConstantMassExpansion.java index 80744fb9db..b3c90595d3 100644 --- a/src/main/java/neqsim/PVTsimulation/simulation/ConstantMassExpansion.java +++ b/src/main/java/neqsim/pvtsimulation/simulation/ConstantMassExpansion.java @@ -1,12 +1,12 @@ -package neqsim.PVTsimulation.simulation; +package neqsim.pvtsimulation.simulation; import java.util.ArrayList; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.PVTsimulation.util.parameterfitting.CMEFunction; -import neqsim.statistics.parameterFitting.SampleSet; -import neqsim.statistics.parameterFitting.SampleValue; -import neqsim.statistics.parameterFitting.nonLinearParameterFitting.LevenbergMarquardt; +import neqsim.pvtsimulation.util.parameterfitting.CMEFunction; +import neqsim.statistics.parameterfitting.SampleSet; +import neqsim.statistics.parameterfitting.SampleValue; +import neqsim.statistics.parameterfitting.nonlinearparameterfitting.LevenbergMarquardt; import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; diff --git a/src/main/java/neqsim/PVTsimulation/simulation/ConstantVolumeDepletion.java b/src/main/java/neqsim/pvtsimulation/simulation/ConstantVolumeDepletion.java similarity index 97% rename from src/main/java/neqsim/PVTsimulation/simulation/ConstantVolumeDepletion.java rename to src/main/java/neqsim/pvtsimulation/simulation/ConstantVolumeDepletion.java index fc13d215e3..97cbc5f9f3 100644 --- a/src/main/java/neqsim/PVTsimulation/simulation/ConstantVolumeDepletion.java +++ b/src/main/java/neqsim/pvtsimulation/simulation/ConstantVolumeDepletion.java @@ -1,12 +1,12 @@ -package neqsim.PVTsimulation.simulation; +package neqsim.pvtsimulation.simulation; import java.util.ArrayList; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.PVTsimulation.util.parameterfitting.CVDFunction; -import neqsim.statistics.parameterFitting.SampleSet; -import neqsim.statistics.parameterFitting.SampleValue; -import neqsim.statistics.parameterFitting.nonLinearParameterFitting.LevenbergMarquardt; +import neqsim.pvtsimulation.util.parameterfitting.CVDFunction; +import neqsim.statistics.parameterfitting.SampleSet; +import neqsim.statistics.parameterfitting.SampleValue; +import neqsim.statistics.parameterfitting.nonlinearparameterfitting.LevenbergMarquardt; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; diff --git a/src/main/java/neqsim/PVTsimulation/simulation/DensitySim.java b/src/main/java/neqsim/pvtsimulation/simulation/DensitySim.java similarity index 94% rename from src/main/java/neqsim/PVTsimulation/simulation/DensitySim.java rename to src/main/java/neqsim/pvtsimulation/simulation/DensitySim.java index 63d9dca18f..eafa2d6a33 100644 --- a/src/main/java/neqsim/PVTsimulation/simulation/DensitySim.java +++ b/src/main/java/neqsim/pvtsimulation/simulation/DensitySim.java @@ -1,12 +1,12 @@ -package neqsim.PVTsimulation.simulation; +package neqsim.pvtsimulation.simulation; import java.util.ArrayList; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.physicalProperties.util.parameterFitting.pureComponentParameterFitting.pureCompViscosity.linearLiquidModel.ViscosityFunction; -import neqsim.statistics.parameterFitting.SampleSet; -import neqsim.statistics.parameterFitting.SampleValue; -import neqsim.statistics.parameterFitting.nonLinearParameterFitting.LevenbergMarquardt; +import neqsim.physicalproperties.util.parameterFitting.pureComponentParameterFitting.purecompviscosity.linearLiquidModel.ViscosityFunction; +import neqsim.statistics.parameterfitting.SampleSet; +import neqsim.statistics.parameterfitting.SampleValue; +import neqsim.statistics.parameterfitting.nonlinearparameterfitting.LevenbergMarquardt; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; diff --git a/src/main/java/neqsim/PVTsimulation/simulation/DifferentialLiberation.java b/src/main/java/neqsim/pvtsimulation/simulation/DifferentialLiberation.java similarity index 99% rename from src/main/java/neqsim/PVTsimulation/simulation/DifferentialLiberation.java rename to src/main/java/neqsim/pvtsimulation/simulation/DifferentialLiberation.java index ce6f986c68..a24eb284ea 100644 --- a/src/main/java/neqsim/PVTsimulation/simulation/DifferentialLiberation.java +++ b/src/main/java/neqsim/pvtsimulation/simulation/DifferentialLiberation.java @@ -1,4 +1,4 @@ -package neqsim.PVTsimulation.simulation; +package neqsim.pvtsimulation.simulation; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/neqsim/PVTsimulation/simulation/GOR.java b/src/main/java/neqsim/pvtsimulation/simulation/GOR.java similarity index 99% rename from src/main/java/neqsim/PVTsimulation/simulation/GOR.java rename to src/main/java/neqsim/pvtsimulation/simulation/GOR.java index b91d7677ed..bb46db0b1f 100644 --- a/src/main/java/neqsim/PVTsimulation/simulation/GOR.java +++ b/src/main/java/neqsim/pvtsimulation/simulation/GOR.java @@ -1,4 +1,4 @@ -package neqsim.PVTsimulation.simulation; +package neqsim.pvtsimulation.simulation; import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.phase.PhaseType; diff --git a/src/main/java/neqsim/PVTsimulation/simulation/SaturationPressure.java b/src/main/java/neqsim/pvtsimulation/simulation/SaturationPressure.java similarity index 99% rename from src/main/java/neqsim/PVTsimulation/simulation/SaturationPressure.java rename to src/main/java/neqsim/pvtsimulation/simulation/SaturationPressure.java index 6cf8501e46..ef53f902de 100644 --- a/src/main/java/neqsim/PVTsimulation/simulation/SaturationPressure.java +++ b/src/main/java/neqsim/pvtsimulation/simulation/SaturationPressure.java @@ -1,4 +1,4 @@ -package neqsim.PVTsimulation.simulation; +package neqsim.pvtsimulation.simulation; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; diff --git a/src/main/java/neqsim/PVTsimulation/simulation/SaturationTemperature.java b/src/main/java/neqsim/pvtsimulation/simulation/SaturationTemperature.java similarity index 98% rename from src/main/java/neqsim/PVTsimulation/simulation/SaturationTemperature.java rename to src/main/java/neqsim/pvtsimulation/simulation/SaturationTemperature.java index ab17808195..31854bd812 100644 --- a/src/main/java/neqsim/PVTsimulation/simulation/SaturationTemperature.java +++ b/src/main/java/neqsim/pvtsimulation/simulation/SaturationTemperature.java @@ -1,4 +1,4 @@ -package neqsim.PVTsimulation.simulation; +package neqsim.pvtsimulation.simulation; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; diff --git a/src/main/java/neqsim/PVTsimulation/simulation/SeparatorTest.java b/src/main/java/neqsim/pvtsimulation/simulation/SeparatorTest.java similarity index 99% rename from src/main/java/neqsim/PVTsimulation/simulation/SeparatorTest.java rename to src/main/java/neqsim/pvtsimulation/simulation/SeparatorTest.java index 506faaf966..6d928ba76d 100644 --- a/src/main/java/neqsim/PVTsimulation/simulation/SeparatorTest.java +++ b/src/main/java/neqsim/pvtsimulation/simulation/SeparatorTest.java @@ -1,4 +1,4 @@ -package neqsim.PVTsimulation.simulation; +package neqsim.pvtsimulation.simulation; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/neqsim/PVTsimulation/simulation/SimulationInterface.java b/src/main/java/neqsim/pvtsimulation/simulation/SimulationInterface.java similarity index 85% rename from src/main/java/neqsim/PVTsimulation/simulation/SimulationInterface.java rename to src/main/java/neqsim/pvtsimulation/simulation/SimulationInterface.java index fab1696d8f..ddb4e4abe5 100644 --- a/src/main/java/neqsim/PVTsimulation/simulation/SimulationInterface.java +++ b/src/main/java/neqsim/pvtsimulation/simulation/SimulationInterface.java @@ -1,6 +1,6 @@ -package neqsim.PVTsimulation.simulation; +package neqsim.pvtsimulation.simulation; -import neqsim.statistics.parameterFitting.nonLinearParameterFitting.LevenbergMarquardt; +import neqsim.statistics.parameterfitting.nonlinearparameterfitting.LevenbergMarquardt; import neqsim.thermo.system.SystemInterface; /** @@ -52,7 +52,7 @@ public interface SimulationInterface { *

* * @return a - * {@link neqsim.statistics.parameterFitting.nonLinearParameterFitting.LevenbergMarquardt} + * {@link neqsim.statistics.parameterfitting.nonlinearparameterfitting.LevenbergMarquardt} * object */ public LevenbergMarquardt getOptimizer(); diff --git a/src/main/java/neqsim/PVTsimulation/simulation/SlimTubeSim.java b/src/main/java/neqsim/pvtsimulation/simulation/SlimTubeSim.java similarity index 99% rename from src/main/java/neqsim/PVTsimulation/simulation/SlimTubeSim.java rename to src/main/java/neqsim/pvtsimulation/simulation/SlimTubeSim.java index a8056b34d3..c04a1ca027 100644 --- a/src/main/java/neqsim/PVTsimulation/simulation/SlimTubeSim.java +++ b/src/main/java/neqsim/pvtsimulation/simulation/SlimTubeSim.java @@ -1,11 +1,11 @@ -package neqsim.PVTsimulation.simulation; +package neqsim.pvtsimulation.simulation; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/main/java/neqsim/PVTsimulation/simulation/SwellingTest.java b/src/main/java/neqsim/pvtsimulation/simulation/SwellingTest.java similarity index 99% rename from src/main/java/neqsim/PVTsimulation/simulation/SwellingTest.java rename to src/main/java/neqsim/pvtsimulation/simulation/SwellingTest.java index 0398db0f14..87e397194e 100644 --- a/src/main/java/neqsim/PVTsimulation/simulation/SwellingTest.java +++ b/src/main/java/neqsim/pvtsimulation/simulation/SwellingTest.java @@ -1,4 +1,4 @@ -package neqsim.PVTsimulation.simulation; +package neqsim.pvtsimulation.simulation; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/neqsim/PVTsimulation/simulation/ViscositySim.java b/src/main/java/neqsim/pvtsimulation/simulation/ViscositySim.java similarity index 94% rename from src/main/java/neqsim/PVTsimulation/simulation/ViscositySim.java rename to src/main/java/neqsim/pvtsimulation/simulation/ViscositySim.java index 571191c83f..08dad1875a 100644 --- a/src/main/java/neqsim/PVTsimulation/simulation/ViscositySim.java +++ b/src/main/java/neqsim/pvtsimulation/simulation/ViscositySim.java @@ -1,12 +1,12 @@ -package neqsim.PVTsimulation.simulation; +package neqsim.pvtsimulation.simulation; import java.util.ArrayList; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.physicalProperties.util.parameterFitting.pureComponentParameterFitting.pureCompViscosity.linearLiquidModel.ViscosityFunction; -import neqsim.statistics.parameterFitting.SampleSet; -import neqsim.statistics.parameterFitting.SampleValue; -import neqsim.statistics.parameterFitting.nonLinearParameterFitting.LevenbergMarquardt; +import neqsim.physicalproperties.util.parameterFitting.pureComponentParameterFitting.purecompviscosity.linearLiquidModel.ViscosityFunction; +import neqsim.statistics.parameterfitting.SampleSet; +import neqsim.statistics.parameterfitting.SampleValue; +import neqsim.statistics.parameterfitting.nonlinearparameterfitting.LevenbergMarquardt; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; diff --git a/src/main/java/neqsim/PVTsimulation/simulation/ViscosityWaxOilSim.java b/src/main/java/neqsim/pvtsimulation/simulation/ViscosityWaxOilSim.java similarity index 95% rename from src/main/java/neqsim/PVTsimulation/simulation/ViscosityWaxOilSim.java rename to src/main/java/neqsim/pvtsimulation/simulation/ViscosityWaxOilSim.java index b3d5b2ad1c..3c245ab651 100644 --- a/src/main/java/neqsim/PVTsimulation/simulation/ViscosityWaxOilSim.java +++ b/src/main/java/neqsim/pvtsimulation/simulation/ViscosityWaxOilSim.java @@ -1,12 +1,12 @@ -package neqsim.PVTsimulation.simulation; +package neqsim.pvtsimulation.simulation; import java.util.ArrayList; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.physicalProperties.util.parameterFitting.pureComponentParameterFitting.pureCompViscosity.linearLiquidModel.ViscosityFunction; -import neqsim.statistics.parameterFitting.SampleSet; -import neqsim.statistics.parameterFitting.SampleValue; -import neqsim.statistics.parameterFitting.nonLinearParameterFitting.LevenbergMarquardt; +import neqsim.physicalproperties.util.parameterFitting.pureComponentParameterFitting.purecompviscosity.linearLiquidModel.ViscosityFunction; +import neqsim.statistics.parameterfitting.SampleSet; +import neqsim.statistics.parameterfitting.SampleValue; +import neqsim.statistics.parameterfitting.nonlinearparameterfitting.LevenbergMarquardt; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; diff --git a/src/main/java/neqsim/PVTsimulation/simulation/WaxFractionSim.java b/src/main/java/neqsim/pvtsimulation/simulation/WaxFractionSim.java similarity index 96% rename from src/main/java/neqsim/PVTsimulation/simulation/WaxFractionSim.java rename to src/main/java/neqsim/pvtsimulation/simulation/WaxFractionSim.java index f4a6e4778a..8b71d53219 100644 --- a/src/main/java/neqsim/PVTsimulation/simulation/WaxFractionSim.java +++ b/src/main/java/neqsim/pvtsimulation/simulation/WaxFractionSim.java @@ -1,11 +1,11 @@ -package neqsim.PVTsimulation.simulation; +package neqsim.pvtsimulation.simulation; import java.util.ArrayList; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.PVTsimulation.util.parameterfitting.WaxFunction; -import neqsim.statistics.parameterFitting.SampleSet; -import neqsim.statistics.parameterFitting.SampleValue; +import neqsim.pvtsimulation.util.parameterfitting.WaxFunction; +import neqsim.statistics.parameterfitting.SampleSet; +import neqsim.statistics.parameterfitting.SampleValue; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; import neqsim.util.database.NeqSimDataBase; diff --git a/src/main/java/neqsim/PVTsimulation/util/parameterfitting/CMEFunction.java b/src/main/java/neqsim/pvtsimulation/util/parameterfitting/CMEFunction.java similarity index 96% rename from src/main/java/neqsim/PVTsimulation/util/parameterfitting/CMEFunction.java rename to src/main/java/neqsim/pvtsimulation/util/parameterfitting/CMEFunction.java index 078dac3c29..54fd68948a 100644 --- a/src/main/java/neqsim/PVTsimulation/util/parameterfitting/CMEFunction.java +++ b/src/main/java/neqsim/pvtsimulation/util/parameterfitting/CMEFunction.java @@ -1,6 +1,6 @@ -package neqsim.PVTsimulation.util.parameterfitting; +package neqsim.pvtsimulation.util.parameterfitting; -import neqsim.statistics.parameterFitting.nonLinearParameterFitting.LevenbergMarquardtFunction; +import neqsim.statistics.parameterfitting.nonlinearparameterfitting.LevenbergMarquardtFunction; import neqsim.thermo.system.SystemInterface; /** diff --git a/src/main/java/neqsim/PVTsimulation/util/parameterfitting/CVDFunction.java b/src/main/java/neqsim/pvtsimulation/util/parameterfitting/CVDFunction.java similarity index 96% rename from src/main/java/neqsim/PVTsimulation/util/parameterfitting/CVDFunction.java rename to src/main/java/neqsim/pvtsimulation/util/parameterfitting/CVDFunction.java index 34b296a4f7..ce1a95743c 100644 --- a/src/main/java/neqsim/PVTsimulation/util/parameterfitting/CVDFunction.java +++ b/src/main/java/neqsim/pvtsimulation/util/parameterfitting/CVDFunction.java @@ -1,6 +1,6 @@ -package neqsim.PVTsimulation.util.parameterfitting; +package neqsim.pvtsimulation.util.parameterfitting; -import neqsim.statistics.parameterFitting.nonLinearParameterFitting.LevenbergMarquardtFunction; +import neqsim.statistics.parameterfitting.nonlinearparameterfitting.LevenbergMarquardtFunction; import neqsim.thermo.system.SystemInterface; /** diff --git a/src/main/java/neqsim/PVTsimulation/util/parameterfitting/DensityFunction.java b/src/main/java/neqsim/pvtsimulation/util/parameterfitting/DensityFunction.java similarity index 86% rename from src/main/java/neqsim/PVTsimulation/util/parameterfitting/DensityFunction.java rename to src/main/java/neqsim/pvtsimulation/util/parameterfitting/DensityFunction.java index 2fe6c85640..1a4f011893 100644 --- a/src/main/java/neqsim/PVTsimulation/util/parameterfitting/DensityFunction.java +++ b/src/main/java/neqsim/pvtsimulation/util/parameterfitting/DensityFunction.java @@ -1,6 +1,6 @@ -package neqsim.PVTsimulation.util.parameterfitting; +package neqsim.pvtsimulation.util.parameterfitting; -import neqsim.statistics.parameterFitting.nonLinearParameterFitting.LevenbergMarquardtFunction; +import neqsim.statistics.parameterfitting.nonlinearparameterfitting.LevenbergMarquardtFunction; /** *

diff --git a/src/main/java/neqsim/PVTsimulation/util/parameterfitting/FunctionJohanSverderup.java b/src/main/java/neqsim/pvtsimulation/util/parameterfitting/FunctionJohanSverderup.java similarity index 84% rename from src/main/java/neqsim/PVTsimulation/util/parameterfitting/FunctionJohanSverderup.java rename to src/main/java/neqsim/pvtsimulation/util/parameterfitting/FunctionJohanSverderup.java index 7e0d5fff52..c83616ed70 100644 --- a/src/main/java/neqsim/PVTsimulation/util/parameterfitting/FunctionJohanSverderup.java +++ b/src/main/java/neqsim/pvtsimulation/util/parameterfitting/FunctionJohanSverderup.java @@ -1,7 +1,7 @@ -package neqsim.PVTsimulation.util.parameterfitting; +package neqsim.pvtsimulation.util.parameterfitting; -import neqsim.PVTsimulation.simulation.SaturationPressure; -import neqsim.statistics.parameterFitting.nonLinearParameterFitting.LevenbergMarquardtFunction; +import neqsim.pvtsimulation.simulation.SaturationPressure; +import neqsim.statistics.parameterfitting.nonlinearparameterfitting.LevenbergMarquardtFunction; /** *

diff --git a/src/main/java/neqsim/PVTsimulation/util/parameterfitting/SaturationPressureFunction.java b/src/main/java/neqsim/pvtsimulation/util/parameterfitting/SaturationPressureFunction.java similarity index 90% rename from src/main/java/neqsim/PVTsimulation/util/parameterfitting/SaturationPressureFunction.java rename to src/main/java/neqsim/pvtsimulation/util/parameterfitting/SaturationPressureFunction.java index b12d9daadd..9daff2b01e 100644 --- a/src/main/java/neqsim/PVTsimulation/util/parameterfitting/SaturationPressureFunction.java +++ b/src/main/java/neqsim/pvtsimulation/util/parameterfitting/SaturationPressureFunction.java @@ -1,7 +1,7 @@ -package neqsim.PVTsimulation.util.parameterfitting; +package neqsim.pvtsimulation.util.parameterfitting; -import neqsim.PVTsimulation.simulation.SaturationPressure; -import neqsim.statistics.parameterFitting.nonLinearParameterFitting.LevenbergMarquardtFunction; +import neqsim.pvtsimulation.simulation.SaturationPressure; +import neqsim.statistics.parameterfitting.nonlinearparameterfitting.LevenbergMarquardtFunction; import neqsim.thermo.system.SystemInterface; /** diff --git a/src/main/java/neqsim/PVTsimulation/util/parameterfitting/TestFitToOilFieldFluid.java b/src/main/java/neqsim/pvtsimulation/util/parameterfitting/TestFitToOilFieldFluid.java similarity index 92% rename from src/main/java/neqsim/PVTsimulation/util/parameterfitting/TestFitToOilFieldFluid.java rename to src/main/java/neqsim/pvtsimulation/util/parameterfitting/TestFitToOilFieldFluid.java index 94faf5751e..0ba007ef6b 100644 --- a/src/main/java/neqsim/PVTsimulation/util/parameterfitting/TestFitToOilFieldFluid.java +++ b/src/main/java/neqsim/pvtsimulation/util/parameterfitting/TestFitToOilFieldFluid.java @@ -1,11 +1,11 @@ -package neqsim.PVTsimulation.util.parameterfitting; +package neqsim.pvtsimulation.util.parameterfitting; import java.util.ArrayList; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.statistics.parameterFitting.SampleSet; -import neqsim.statistics.parameterFitting.SampleValue; -import neqsim.statistics.parameterFitting.nonLinearParameterFitting.LevenbergMarquardt; +import neqsim.statistics.parameterfitting.SampleSet; +import neqsim.statistics.parameterfitting.SampleValue; +import neqsim.statistics.parameterfitting.nonlinearparameterfitting.LevenbergMarquardt; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; diff --git a/src/main/java/neqsim/PVTsimulation/util/parameterfitting/TestSaturationPresFunction.java b/src/main/java/neqsim/pvtsimulation/util/parameterfitting/TestSaturationPresFunction.java similarity index 92% rename from src/main/java/neqsim/PVTsimulation/util/parameterfitting/TestSaturationPresFunction.java rename to src/main/java/neqsim/pvtsimulation/util/parameterfitting/TestSaturationPresFunction.java index f7cd60e6da..c794a7cfee 100644 --- a/src/main/java/neqsim/PVTsimulation/util/parameterfitting/TestSaturationPresFunction.java +++ b/src/main/java/neqsim/pvtsimulation/util/parameterfitting/TestSaturationPresFunction.java @@ -1,11 +1,11 @@ -package neqsim.PVTsimulation.util.parameterfitting; +package neqsim.pvtsimulation.util.parameterfitting; import java.util.ArrayList; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.statistics.parameterFitting.SampleSet; -import neqsim.statistics.parameterFitting.SampleValue; -import neqsim.statistics.parameterFitting.nonLinearParameterFitting.LevenbergMarquardt; +import neqsim.statistics.parameterfitting.SampleSet; +import neqsim.statistics.parameterfitting.SampleValue; +import neqsim.statistics.parameterfitting.nonlinearparameterfitting.LevenbergMarquardt; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; diff --git a/src/main/java/neqsim/PVTsimulation/util/parameterfitting/TestWaxTuning.java b/src/main/java/neqsim/pvtsimulation/util/parameterfitting/TestWaxTuning.java similarity index 90% rename from src/main/java/neqsim/PVTsimulation/util/parameterfitting/TestWaxTuning.java rename to src/main/java/neqsim/pvtsimulation/util/parameterfitting/TestWaxTuning.java index 91c21252d4..be7af60eba 100644 --- a/src/main/java/neqsim/PVTsimulation/util/parameterfitting/TestWaxTuning.java +++ b/src/main/java/neqsim/pvtsimulation/util/parameterfitting/TestWaxTuning.java @@ -1,11 +1,11 @@ -package neqsim.PVTsimulation.util.parameterfitting; +package neqsim.pvtsimulation.util.parameterfitting; import java.util.ArrayList; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.statistics.parameterFitting.SampleSet; -import neqsim.statistics.parameterFitting.SampleValue; -import neqsim.statistics.parameterFitting.nonLinearParameterFitting.LevenbergMarquardt; +import neqsim.statistics.parameterfitting.SampleSet; +import neqsim.statistics.parameterfitting.SampleValue; +import neqsim.statistics.parameterfitting.nonlinearparameterfitting.LevenbergMarquardt; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; diff --git a/src/main/java/neqsim/PVTsimulation/util/parameterfitting/ViscosityFunction.java b/src/main/java/neqsim/pvtsimulation/util/parameterfitting/ViscosityFunction.java similarity index 85% rename from src/main/java/neqsim/PVTsimulation/util/parameterfitting/ViscosityFunction.java rename to src/main/java/neqsim/pvtsimulation/util/parameterfitting/ViscosityFunction.java index 03dabd1b7a..09a1fc004f 100644 --- a/src/main/java/neqsim/PVTsimulation/util/parameterfitting/ViscosityFunction.java +++ b/src/main/java/neqsim/pvtsimulation/util/parameterfitting/ViscosityFunction.java @@ -1,7 +1,7 @@ -package neqsim.PVTsimulation.util.parameterfitting; +package neqsim.pvtsimulation.util.parameterfitting; -import neqsim.physicalProperties.physicalPropertyMethods.commonPhasePhysicalProperties.viscosity.FrictionTheoryViscosityMethod; -import neqsim.statistics.parameterFitting.nonLinearParameterFitting.LevenbergMarquardtFunction; +import neqsim.physicalproperties.physicalpropertymethods.commonphasephysicalproperties.viscosity.FrictionTheoryViscosityMethod; +import neqsim.statistics.parameterfitting.nonlinearparameterfitting.LevenbergMarquardtFunction; /** *

diff --git a/src/main/java/neqsim/PVTsimulation/util/parameterfitting/WaxFunction.java b/src/main/java/neqsim/pvtsimulation/util/parameterfitting/WaxFunction.java similarity index 91% rename from src/main/java/neqsim/PVTsimulation/util/parameterfitting/WaxFunction.java rename to src/main/java/neqsim/pvtsimulation/util/parameterfitting/WaxFunction.java index 63b494975e..1ef2ee7e3a 100644 --- a/src/main/java/neqsim/PVTsimulation/util/parameterfitting/WaxFunction.java +++ b/src/main/java/neqsim/pvtsimulation/util/parameterfitting/WaxFunction.java @@ -1,6 +1,6 @@ -package neqsim.PVTsimulation.util.parameterfitting; +package neqsim.pvtsimulation.util.parameterfitting; -import neqsim.statistics.parameterFitting.nonLinearParameterFitting.LevenbergMarquardtFunction; +import neqsim.statistics.parameterfitting.nonlinearparameterfitting.LevenbergMarquardtFunction; /** *

diff --git a/src/main/java/neqsim/standards/Standard.java b/src/main/java/neqsim/standards/Standard.java index 5f9daff797..3e33c26a8a 100644 --- a/src/main/java/neqsim/standards/Standard.java +++ b/src/main/java/neqsim/standards/Standard.java @@ -14,10 +14,10 @@ import javax.swing.JFrame; import javax.swing.JScrollPane; import javax.swing.JTable; -import neqsim.standards.salesContract.BaseContract; -import neqsim.standards.salesContract.ContractInterface; +import neqsim.standards.salescontract.BaseContract; +import neqsim.standards.salescontract.ContractInterface; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; import neqsim.util.NamedBaseClass; /** diff --git a/src/main/java/neqsim/standards/StandardInterface.java b/src/main/java/neqsim/standards/StandardInterface.java index e86d3b2d00..9f87a34598 100644 --- a/src/main/java/neqsim/standards/StandardInterface.java +++ b/src/main/java/neqsim/standards/StandardInterface.java @@ -6,7 +6,7 @@ package neqsim.standards; -import neqsim.standards.salesContract.ContractInterface; +import neqsim.standards.salescontract.ContractInterface; import neqsim.thermo.system.SystemInterface; /** @@ -70,7 +70,7 @@ public interface StandardInterface { * getSalesContract. *

* - * @return a {@link neqsim.standards.salesContract.ContractInterface} object + * @return a {@link neqsim.standards.salescontract.ContractInterface} object */ public ContractInterface getSalesContract(); @@ -88,7 +88,7 @@ public interface StandardInterface { * setSalesContract. *

* - * @param salesContract a {@link neqsim.standards.salesContract.ContractInterface} object + * @param salesContract a {@link neqsim.standards.salescontract.ContractInterface} object */ public void setSalesContract(ContractInterface salesContract); diff --git a/src/main/java/neqsim/standards/gasQuality/BestPracticeHydrocarbonDewPoint.java b/src/main/java/neqsim/standards/gasquality/BestPracticeHydrocarbonDewPoint.java similarity index 97% rename from src/main/java/neqsim/standards/gasQuality/BestPracticeHydrocarbonDewPoint.java rename to src/main/java/neqsim/standards/gasquality/BestPracticeHydrocarbonDewPoint.java index 2ad4cb5bf7..6fa360cd1a 100644 --- a/src/main/java/neqsim/standards/gasQuality/BestPracticeHydrocarbonDewPoint.java +++ b/src/main/java/neqsim/standards/gasquality/BestPracticeHydrocarbonDewPoint.java @@ -1,10 +1,10 @@ -package neqsim.standards.gasQuality; +package neqsim.standards.gasquality; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/main/java/neqsim/standards/gasQuality/Draft_GERG2004.java b/src/main/java/neqsim/standards/gasquality/Draft_GERG2004.java similarity index 98% rename from src/main/java/neqsim/standards/gasQuality/Draft_GERG2004.java rename to src/main/java/neqsim/standards/gasquality/Draft_GERG2004.java index cefb88e063..43f58ad0f4 100644 --- a/src/main/java/neqsim/standards/gasQuality/Draft_GERG2004.java +++ b/src/main/java/neqsim/standards/gasquality/Draft_GERG2004.java @@ -1,4 +1,4 @@ -package neqsim.standards.gasQuality; +package neqsim.standards.gasquality; import java.text.DecimalFormat; import java.text.FieldPosition; @@ -6,7 +6,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemGERG2004Eos; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/main/java/neqsim/standards/gasQuality/Draft_ISO18453.java b/src/main/java/neqsim/standards/gasquality/Draft_ISO18453.java similarity index 96% rename from src/main/java/neqsim/standards/gasQuality/Draft_ISO18453.java rename to src/main/java/neqsim/standards/gasquality/Draft_ISO18453.java index 1a839c7eb1..d09ea97db8 100644 --- a/src/main/java/neqsim/standards/gasQuality/Draft_ISO18453.java +++ b/src/main/java/neqsim/standards/gasquality/Draft_ISO18453.java @@ -1,10 +1,10 @@ -package neqsim.standards.gasQuality; +package neqsim.standards.gasquality; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemGERGwaterEos; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/main/java/neqsim/standards/gasQuality/GasChromotograpyhBase.java b/src/main/java/neqsim/standards/gasquality/GasChromotograpyhBase.java similarity index 97% rename from src/main/java/neqsim/standards/gasQuality/GasChromotograpyhBase.java rename to src/main/java/neqsim/standards/gasquality/GasChromotograpyhBase.java index 41dacfc0fb..dffb95d55e 100644 --- a/src/main/java/neqsim/standards/gasQuality/GasChromotograpyhBase.java +++ b/src/main/java/neqsim/standards/gasquality/GasChromotograpyhBase.java @@ -1,4 +1,4 @@ -package neqsim.standards.gasQuality; +package neqsim.standards.gasquality; import neqsim.thermo.system.SystemInterface; diff --git a/src/main/java/neqsim/standards/gasQuality/Standard_ISO15403.java b/src/main/java/neqsim/standards/gasquality/Standard_ISO15403.java similarity index 98% rename from src/main/java/neqsim/standards/gasQuality/Standard_ISO15403.java rename to src/main/java/neqsim/standards/gasquality/Standard_ISO15403.java index 61c35f2981..cf606a9816 100644 --- a/src/main/java/neqsim/standards/gasQuality/Standard_ISO15403.java +++ b/src/main/java/neqsim/standards/gasquality/Standard_ISO15403.java @@ -1,4 +1,4 @@ -package neqsim.standards.gasQuality; +package neqsim.standards.gasquality; import neqsim.thermo.system.SystemInterface; diff --git a/src/main/java/neqsim/standards/gasQuality/Standard_ISO6578.java b/src/main/java/neqsim/standards/gasquality/Standard_ISO6578.java similarity index 99% rename from src/main/java/neqsim/standards/gasQuality/Standard_ISO6578.java rename to src/main/java/neqsim/standards/gasquality/Standard_ISO6578.java index c9876907e9..cf186c048c 100644 --- a/src/main/java/neqsim/standards/gasQuality/Standard_ISO6578.java +++ b/src/main/java/neqsim/standards/gasquality/Standard_ISO6578.java @@ -1,4 +1,4 @@ -package neqsim.standards.gasQuality; +package neqsim.standards.gasquality; import org.apache.commons.math3.analysis.interpolation.BicubicInterpolatingFunction; import org.apache.commons.math3.analysis.interpolation.BicubicInterpolator; diff --git a/src/main/java/neqsim/standards/gasQuality/Standard_ISO6974.java b/src/main/java/neqsim/standards/gasquality/Standard_ISO6974.java similarity index 93% rename from src/main/java/neqsim/standards/gasQuality/Standard_ISO6974.java rename to src/main/java/neqsim/standards/gasquality/Standard_ISO6974.java index e21273f52d..854f80b249 100644 --- a/src/main/java/neqsim/standards/gasQuality/Standard_ISO6974.java +++ b/src/main/java/neqsim/standards/gasquality/Standard_ISO6974.java @@ -1,4 +1,4 @@ -package neqsim.standards.gasQuality; +package neqsim.standards.gasquality; import neqsim.thermo.system.SystemInterface; diff --git a/src/main/java/neqsim/standards/gasQuality/Standard_ISO6976.java b/src/main/java/neqsim/standards/gasquality/Standard_ISO6976.java similarity index 99% rename from src/main/java/neqsim/standards/gasQuality/Standard_ISO6976.java rename to src/main/java/neqsim/standards/gasquality/Standard_ISO6976.java index aa6f15de6d..a1b6ca2960 100644 --- a/src/main/java/neqsim/standards/gasQuality/Standard_ISO6976.java +++ b/src/main/java/neqsim/standards/gasquality/Standard_ISO6976.java @@ -1,4 +1,4 @@ -package neqsim.standards.gasQuality; +package neqsim.standards.gasquality; import java.text.DecimalFormat; import java.text.FieldPosition; diff --git a/src/main/java/neqsim/standards/gasQuality/Standard_ISO6976_2016.java b/src/main/java/neqsim/standards/gasquality/Standard_ISO6976_2016.java similarity index 99% rename from src/main/java/neqsim/standards/gasQuality/Standard_ISO6976_2016.java rename to src/main/java/neqsim/standards/gasquality/Standard_ISO6976_2016.java index 4936811e84..86beb0e85c 100644 --- a/src/main/java/neqsim/standards/gasQuality/Standard_ISO6976_2016.java +++ b/src/main/java/neqsim/standards/gasquality/Standard_ISO6976_2016.java @@ -1,4 +1,4 @@ -package neqsim.standards.gasQuality; +package neqsim.standards.gasquality; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/neqsim/standards/gasQuality/SulfurSpecificationMethod.java b/src/main/java/neqsim/standards/gasquality/SulfurSpecificationMethod.java similarity index 98% rename from src/main/java/neqsim/standards/gasQuality/SulfurSpecificationMethod.java rename to src/main/java/neqsim/standards/gasquality/SulfurSpecificationMethod.java index 24afd0c825..7468939fb0 100644 --- a/src/main/java/neqsim/standards/gasQuality/SulfurSpecificationMethod.java +++ b/src/main/java/neqsim/standards/gasquality/SulfurSpecificationMethod.java @@ -1,4 +1,4 @@ -package neqsim.standards.gasQuality; +package neqsim.standards.gasquality; import neqsim.thermo.system.SystemInterface; diff --git a/src/main/java/neqsim/standards/gasQuality/UKspecifications_ICF_SI.java b/src/main/java/neqsim/standards/gasquality/UKspecifications_ICF_SI.java similarity index 99% rename from src/main/java/neqsim/standards/gasQuality/UKspecifications_ICF_SI.java rename to src/main/java/neqsim/standards/gasquality/UKspecifications_ICF_SI.java index 29eea41c05..f325981fc0 100644 --- a/src/main/java/neqsim/standards/gasQuality/UKspecifications_ICF_SI.java +++ b/src/main/java/neqsim/standards/gasquality/UKspecifications_ICF_SI.java @@ -1,4 +1,4 @@ -package neqsim.standards.gasQuality; +package neqsim.standards.gasquality; import org.apache.commons.math3.linear.Array2DRowRealMatrix; import org.apache.commons.math3.linear.DecompositionSolver; diff --git a/src/main/java/neqsim/standards/oilQuality/Standard_ASTM_D6377.java b/src/main/java/neqsim/standards/oilquality/Standard_ASTM_D6377.java similarity index 98% rename from src/main/java/neqsim/standards/oilQuality/Standard_ASTM_D6377.java rename to src/main/java/neqsim/standards/oilquality/Standard_ASTM_D6377.java index 2e5aa98443..2412d88353 100644 --- a/src/main/java/neqsim/standards/oilQuality/Standard_ASTM_D6377.java +++ b/src/main/java/neqsim/standards/oilquality/Standard_ASTM_D6377.java @@ -1,11 +1,11 @@ -package neqsim.standards.oilQuality; +package neqsim.standards.oilquality; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/main/java/neqsim/standards/salesContract/BaseContract.java b/src/main/java/neqsim/standards/salescontract/BaseContract.java similarity index 95% rename from src/main/java/neqsim/standards/salesContract/BaseContract.java rename to src/main/java/neqsim/standards/salescontract/BaseContract.java index f6c822c6c4..69614eb4a9 100644 --- a/src/main/java/neqsim/standards/salesContract/BaseContract.java +++ b/src/main/java/neqsim/standards/salescontract/BaseContract.java @@ -4,7 +4,7 @@ * Created on 15. juni 2004, 21:43 */ -package neqsim.standards.salesContract; +package neqsim.standards.salescontract; import java.awt.BorderLayout; import java.awt.Container; @@ -15,13 +15,13 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import neqsim.standards.StandardInterface; -import neqsim.standards.gasQuality.BestPracticeHydrocarbonDewPoint; -import neqsim.standards.gasQuality.Draft_ISO18453; -import neqsim.standards.gasQuality.GasChromotograpyhBase; -import neqsim.standards.gasQuality.Standard_ISO6974; -import neqsim.standards.gasQuality.Standard_ISO6976; -import neqsim.standards.gasQuality.SulfurSpecificationMethod; -import neqsim.standards.gasQuality.UKspecifications_ICF_SI; +import neqsim.standards.gasquality.BestPracticeHydrocarbonDewPoint; +import neqsim.standards.gasquality.Draft_ISO18453; +import neqsim.standards.gasquality.GasChromotograpyhBase; +import neqsim.standards.gasquality.Standard_ISO6974; +import neqsim.standards.gasquality.Standard_ISO6976; +import neqsim.standards.gasquality.SulfurSpecificationMethod; +import neqsim.standards.gasquality.UKspecifications_ICF_SI; import neqsim.thermo.system.SystemInterface; /** @@ -157,7 +157,7 @@ public StandardInterface getMethod(SystemInterface system, String methodName) { * @param referenceTemperatureComb a double * @param referencePressure a double * @param comments a {@link java.lang.String} object - * @return a {@link neqsim.standards.salesContract.ContractSpecification} object + * @return a {@link neqsim.standards.salescontract.ContractSpecification} object */ public ContractSpecification getSpecification(StandardInterface method, String specificationName, String specificationName2, String country, String terminal, double minValue, double maxValue, diff --git a/src/main/java/neqsim/standards/salesContract/ContractInterface.java b/src/main/java/neqsim/standards/salescontract/ContractInterface.java similarity index 98% rename from src/main/java/neqsim/standards/salesContract/ContractInterface.java rename to src/main/java/neqsim/standards/salescontract/ContractInterface.java index fb4bbcb159..29f406e867 100644 --- a/src/main/java/neqsim/standards/salesContract/ContractInterface.java +++ b/src/main/java/neqsim/standards/salescontract/ContractInterface.java @@ -4,7 +4,7 @@ * Created on 15. juni 2004, 21:43 */ -package neqsim.standards.salesContract; +package neqsim.standards.salescontract; /** *

diff --git a/src/main/java/neqsim/standards/salesContract/ContractSpecification.java b/src/main/java/neqsim/standards/salescontract/ContractSpecification.java similarity index 99% rename from src/main/java/neqsim/standards/salesContract/ContractSpecification.java rename to src/main/java/neqsim/standards/salescontract/ContractSpecification.java index 5a1b2243e6..61fa1b255a 100644 --- a/src/main/java/neqsim/standards/salesContract/ContractSpecification.java +++ b/src/main/java/neqsim/standards/salescontract/ContractSpecification.java @@ -4,7 +4,7 @@ * Created on 15. juni 2004, 22:59 */ -package neqsim.standards.salesContract; +package neqsim.standards.salescontract; import neqsim.standards.StandardInterface; import neqsim.util.NamedBaseClass; diff --git a/src/main/java/neqsim/statistics/experimentalEquipmentData/ExperimentalEquipmentData.java b/src/main/java/neqsim/statistics/experimentalequipmentdata/ExperimentalEquipmentData.java similarity index 90% rename from src/main/java/neqsim/statistics/experimentalEquipmentData/ExperimentalEquipmentData.java rename to src/main/java/neqsim/statistics/experimentalequipmentdata/ExperimentalEquipmentData.java index bd3ae85011..d2434e1075 100644 --- a/src/main/java/neqsim/statistics/experimentalEquipmentData/ExperimentalEquipmentData.java +++ b/src/main/java/neqsim/statistics/experimentalequipmentdata/ExperimentalEquipmentData.java @@ -4,7 +4,7 @@ * Created on 9. februar 2001, 10:00 */ -package neqsim.statistics.experimentalEquipmentData; +package neqsim.statistics.experimentalequipmentdata; /** *

diff --git a/src/main/java/neqsim/statistics/experimentalEquipmentData/wettedWallColumnData/WettedWallColumnData.java b/src/main/java/neqsim/statistics/experimentalequipmentdata/wettedwallcolumndata/WettedWallColumnData.java similarity index 91% rename from src/main/java/neqsim/statistics/experimentalEquipmentData/wettedWallColumnData/WettedWallColumnData.java rename to src/main/java/neqsim/statistics/experimentalequipmentdata/wettedwallcolumndata/WettedWallColumnData.java index f65a8421ee..ca8f35fb3f 100644 --- a/src/main/java/neqsim/statistics/experimentalEquipmentData/wettedWallColumnData/WettedWallColumnData.java +++ b/src/main/java/neqsim/statistics/experimentalequipmentdata/wettedwallcolumndata/WettedWallColumnData.java @@ -4,9 +4,9 @@ * Created on 9. februar 2001, 10:01 */ -package neqsim.statistics.experimentalEquipmentData.wettedWallColumnData; +package neqsim.statistics.experimentalequipmentdata.wettedwallcolumndata; -import neqsim.statistics.experimentalEquipmentData.ExperimentalEquipmentData; +import neqsim.statistics.experimentalequipmentdata.ExperimentalEquipmentData; /** *

diff --git a/src/main/java/neqsim/statistics/experimentalSampleCreation/readDataFromFile/DataObject.java b/src/main/java/neqsim/statistics/experimentalsamplecreation/readdatafromfile/DataObject.java similarity index 77% rename from src/main/java/neqsim/statistics/experimentalSampleCreation/readDataFromFile/DataObject.java rename to src/main/java/neqsim/statistics/experimentalsamplecreation/readdatafromfile/DataObject.java index 690923264d..12c0f9d6de 100644 --- a/src/main/java/neqsim/statistics/experimentalSampleCreation/readDataFromFile/DataObject.java +++ b/src/main/java/neqsim/statistics/experimentalsamplecreation/readdatafromfile/DataObject.java @@ -1,4 +1,4 @@ -package neqsim.statistics.experimentalSampleCreation.readDataFromFile; +package neqsim.statistics.experimentalsamplecreation.readdatafromfile; /** *

diff --git a/src/main/java/neqsim/statistics/experimentalSampleCreation/readDataFromFile/DataObjectInterface.java b/src/main/java/neqsim/statistics/experimentalsamplecreation/readdatafromfile/DataObjectInterface.java similarity index 75% rename from src/main/java/neqsim/statistics/experimentalSampleCreation/readDataFromFile/DataObjectInterface.java rename to src/main/java/neqsim/statistics/experimentalsamplecreation/readdatafromfile/DataObjectInterface.java index b83cadc5f2..2c984e65f2 100644 --- a/src/main/java/neqsim/statistics/experimentalSampleCreation/readDataFromFile/DataObjectInterface.java +++ b/src/main/java/neqsim/statistics/experimentalsamplecreation/readdatafromfile/DataObjectInterface.java @@ -4,7 +4,7 @@ * Created on 1. februar 2001, 13:09 */ -package neqsim.statistics.experimentalSampleCreation.readDataFromFile; +package neqsim.statistics.experimentalsamplecreation.readdatafromfile; /** *

diff --git a/src/main/java/neqsim/statistics/experimentalSampleCreation/readDataFromFile/DataReader.java b/src/main/java/neqsim/statistics/experimentalsamplecreation/readdatafromfile/DataReader.java similarity index 92% rename from src/main/java/neqsim/statistics/experimentalSampleCreation/readDataFromFile/DataReader.java rename to src/main/java/neqsim/statistics/experimentalsamplecreation/readdatafromfile/DataReader.java index 8bc5b6458c..d0d6dd2e08 100644 --- a/src/main/java/neqsim/statistics/experimentalSampleCreation/readDataFromFile/DataReader.java +++ b/src/main/java/neqsim/statistics/experimentalsamplecreation/readdatafromfile/DataReader.java @@ -4,7 +4,7 @@ * Created on 1. februar 2001, 11:38 */ -package neqsim.statistics.experimentalSampleCreation.readDataFromFile; +package neqsim.statistics.experimentalsamplecreation.readdatafromfile; import java.io.RandomAccessFile; import java.util.ArrayList; @@ -78,7 +78,7 @@ public void readData() { *

* * @return a {@link java.util.ArrayList} of - * {@link neqsim.statistics.experimentalSampleCreation.readDataFromFile.DataObject} + * {@link neqsim.statistics.experimentalsamplecreation.readdatafromfile.DataObject} */ public ArrayList getSampleObjectList() { return sampleObjectList; diff --git a/src/main/java/neqsim/statistics/experimentalSampleCreation/readDataFromFile/DataReaderInterface.java b/src/main/java/neqsim/statistics/experimentalsamplecreation/readdatafromfile/DataReaderInterface.java similarity index 80% rename from src/main/java/neqsim/statistics/experimentalSampleCreation/readDataFromFile/DataReaderInterface.java rename to src/main/java/neqsim/statistics/experimentalsamplecreation/readdatafromfile/DataReaderInterface.java index 353fbcbcb9..b0514da9ef 100644 --- a/src/main/java/neqsim/statistics/experimentalSampleCreation/readDataFromFile/DataReaderInterface.java +++ b/src/main/java/neqsim/statistics/experimentalsamplecreation/readdatafromfile/DataReaderInterface.java @@ -4,7 +4,7 @@ * Created on 1. februar 2001, 11:38 */ -package neqsim.statistics.experimentalSampleCreation.readDataFromFile; +package neqsim.statistics.experimentalsamplecreation.readdatafromfile; /** *

diff --git a/src/main/java/neqsim/statistics/experimentalSampleCreation/readDataFromFile/wettedWallColumnReader/WettedWallColumnDataObject.java b/src/main/java/neqsim/statistics/experimentalsamplecreation/readdatafromfile/wettedwallcolumnreader/WettedWallColumnDataObject.java similarity index 96% rename from src/main/java/neqsim/statistics/experimentalSampleCreation/readDataFromFile/wettedWallColumnReader/WettedWallColumnDataObject.java rename to src/main/java/neqsim/statistics/experimentalsamplecreation/readdatafromfile/wettedwallcolumnreader/WettedWallColumnDataObject.java index ceba93f203..0f44e1e982 100644 --- a/src/main/java/neqsim/statistics/experimentalSampleCreation/readDataFromFile/wettedWallColumnReader/WettedWallColumnDataObject.java +++ b/src/main/java/neqsim/statistics/experimentalsamplecreation/readdatafromfile/wettedwallcolumnreader/WettedWallColumnDataObject.java @@ -4,10 +4,10 @@ * Created on 1. februar 2001, 12:19 */ -package neqsim.statistics.experimentalSampleCreation.readDataFromFile.wettedWallColumnReader; +package neqsim.statistics.experimentalsamplecreation.readdatafromfile.wettedwallcolumnreader; import java.sql.Time; -import neqsim.statistics.experimentalSampleCreation.readDataFromFile.DataObject; +import neqsim.statistics.experimentalsamplecreation.readdatafromfile.DataObject; /** *

diff --git a/src/main/java/neqsim/statistics/experimentalSampleCreation/readDataFromFile/wettedWallColumnReader/WettedWallDataReader.java b/src/main/java/neqsim/statistics/experimentalsamplecreation/readdatafromfile/wettedwallcolumnreader/WettedWallDataReader.java similarity index 95% rename from src/main/java/neqsim/statistics/experimentalSampleCreation/readDataFromFile/wettedWallColumnReader/WettedWallDataReader.java rename to src/main/java/neqsim/statistics/experimentalsamplecreation/readdatafromfile/wettedwallcolumnreader/WettedWallDataReader.java index 6f798ab73d..d4ea0db39d 100644 --- a/src/main/java/neqsim/statistics/experimentalSampleCreation/readDataFromFile/wettedWallColumnReader/WettedWallDataReader.java +++ b/src/main/java/neqsim/statistics/experimentalsamplecreation/readdatafromfile/wettedwallcolumnreader/WettedWallDataReader.java @@ -4,13 +4,13 @@ * Created on 1. februar 2001, 13:05 */ -package neqsim.statistics.experimentalSampleCreation.readDataFromFile.wettedWallColumnReader; +package neqsim.statistics.experimentalsamplecreation.readdatafromfile.wettedwallcolumnreader; import java.io.RandomAccessFile; import java.util.StringTokenizer; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.statistics.experimentalSampleCreation.readDataFromFile.DataReader; +import neqsim.statistics.experimentalsamplecreation.readdatafromfile.DataReader; /** *

diff --git a/src/main/java/neqsim/statistics/experimentalSampleCreation/sampleCreator/SampleCreator.java b/src/main/java/neqsim/statistics/experimentalsamplecreation/samplecreator/SampleCreator.java similarity index 79% rename from src/main/java/neqsim/statistics/experimentalSampleCreation/sampleCreator/SampleCreator.java rename to src/main/java/neqsim/statistics/experimentalsamplecreation/samplecreator/SampleCreator.java index cdeb4b5cca..c68dbd2e83 100644 --- a/src/main/java/neqsim/statistics/experimentalSampleCreation/sampleCreator/SampleCreator.java +++ b/src/main/java/neqsim/statistics/experimentalsamplecreation/samplecreator/SampleCreator.java @@ -4,11 +4,11 @@ * Created on 8. februar 2001, 09:14 */ -package neqsim.statistics.experimentalSampleCreation.sampleCreator; +package neqsim.statistics.experimentalsamplecreation.samplecreator; -import neqsim.statistics.experimentalEquipmentData.ExperimentalEquipmentData; +import neqsim.statistics.experimentalequipmentdata.ExperimentalEquipmentData; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

@@ -36,7 +36,7 @@ public SampleCreator() {} *

* * @param system a {@link neqsim.thermo.system.SystemInterface} object - * @param thermoOps a {@link neqsim.thermodynamicOperations.ThermodynamicOperations} object + * @param thermoOps a {@link neqsim.thermodynamicoperations.ThermodynamicOperations} object */ public SampleCreator(SystemInterface system, ThermodynamicOperations thermoOps) { this.system = system; @@ -60,7 +60,7 @@ public void setThermoSystem(SystemInterface system) { *

* * @param equipment a - * {@link neqsim.statistics.experimentalEquipmentData.ExperimentalEquipmentData} object + * {@link neqsim.statistics.experimentalequipmentdata.ExperimentalEquipmentData} object */ public void setExperimentalEquipment(ExperimentalEquipmentData equipment) { this.equipment = equipment; diff --git a/src/main/java/neqsim/statistics/experimentalSampleCreation/sampleCreator/wettedWallColumnSampleCreator/WettedWallColumnSampleCreator.java b/src/main/java/neqsim/statistics/experimentalsamplecreation/samplecreator/wettedwallcolumnsamplecreator/WettedWallColumnSampleCreator.java similarity index 93% rename from src/main/java/neqsim/statistics/experimentalSampleCreation/sampleCreator/wettedWallColumnSampleCreator/WettedWallColumnSampleCreator.java rename to src/main/java/neqsim/statistics/experimentalsamplecreation/samplecreator/wettedwallcolumnsamplecreator/WettedWallColumnSampleCreator.java index 6c6b69cacc..0428c1dfbf 100644 --- a/src/main/java/neqsim/statistics/experimentalSampleCreation/sampleCreator/wettedWallColumnSampleCreator/WettedWallColumnSampleCreator.java +++ b/src/main/java/neqsim/statistics/experimentalsamplecreation/samplecreator/wettedwallcolumnsamplecreator/WettedWallColumnSampleCreator.java @@ -4,15 +4,15 @@ * Created on 8. februar 2001, 09:14 */ -package neqsim.statistics.experimentalSampleCreation.sampleCreator.wettedWallColumnSampleCreator; +package neqsim.statistics.experimentalsamplecreation.samplecreator.wettedwallcolumnsamplecreator; import Jama.Matrix; import neqsim.statistics.dataanalysis.datasmoothing.DataSmoother; -import neqsim.statistics.experimentalEquipmentData.ExperimentalEquipmentData; -import neqsim.statistics.experimentalEquipmentData.wettedWallColumnData.WettedWallColumnData; -import neqsim.statistics.experimentalSampleCreation.readDataFromFile.wettedWallColumnReader.WettedWallColumnDataObject; -import neqsim.statistics.experimentalSampleCreation.readDataFromFile.wettedWallColumnReader.WettedWallDataReader; -import neqsim.statistics.experimentalSampleCreation.sampleCreator.SampleCreator; +import neqsim.statistics.experimentalequipmentdata.ExperimentalEquipmentData; +import neqsim.statistics.experimentalequipmentdata.wettedwallcolumndata.WettedWallColumnData; +import neqsim.statistics.experimentalsamplecreation.readdatafromfile.wettedwallcolumnreader.WettedWallColumnDataObject; +import neqsim.statistics.experimentalsamplecreation.readdatafromfile.wettedwallcolumnreader.WettedWallDataReader; +import neqsim.statistics.experimentalsamplecreation.samplecreator.SampleCreator; import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; diff --git a/src/main/java/neqsim/statistics/filesystem.attributes b/src/main/java/neqsim/statistics/filesystem.attributes deleted file mode 100644 index 22465784cafba118268936980c9a7376ea2663f2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1120 zcmaKr%TE(g6vj_mip8)HVP17%~v z!ua?HTpHs>A}-w+6E$vG;KIbXa^b>_iP40x^xO{8O3+<1z31`$zVB>&hoq8V3RyQq zzGhgZ1d4_DpTI4q7L^GiMYt!XAzgLxizqC)TE=BcNT z-u{e3ya+uF+H($4!dlF(k}8DwT(%Y5z541+DE04+Unh5ZQ`IkV5*Pr$^Nk49+3sN# zE|*=KS62g`o@Bm5vsh;H-s!az=`KN^t>u(ilOr50X;r4j{JL2omVSM#1U)|ecN^|N zOtUy%U<#+`l|2-RBr?Ls$Qz%drC}IN;e=#Q8Wc8bYPu|^bJlX+x&re^7`w`bC26VQ@Z9qdF-vV)2glR*D1Q7 h_O6pc`>#VC%wID#IVPgSG0tx`IiqGdW* z9~bL<@Vx`jMHtn1ho)7}<^q!|F$_09o?muv-Ug5ru+4&1fpe8Ofh~2Bk`u1Fps-g; zqjZLm<=QV>M)lH|-<(3;146%0?>qYM`#bVtE^Uc1Ib^2l%GNYjet+G6xPSV}Ae+F3 Y>n$_L#n$6hUs1?r<1PTeD1^}c02=~W#Q*>R diff --git a/src/main/java/neqsim/statistics/monteCarloSimulation/MonteCarloSimulation.java b/src/main/java/neqsim/statistics/montecarlosimulation/MonteCarloSimulation.java similarity index 87% rename from src/main/java/neqsim/statistics/monteCarloSimulation/MonteCarloSimulation.java rename to src/main/java/neqsim/statistics/montecarlosimulation/MonteCarloSimulation.java index 1361d354ca..4183ac595c 100644 --- a/src/main/java/neqsim/statistics/monteCarloSimulation/MonteCarloSimulation.java +++ b/src/main/java/neqsim/statistics/montecarlosimulation/MonteCarloSimulation.java @@ -4,11 +4,11 @@ * Created on 30. januar 2001, 13:06 */ -package neqsim.statistics.monteCarloSimulation; +package neqsim.statistics.montecarlosimulation; import Jama.Matrix; -import neqsim.statistics.parameterFitting.StatisticsBaseClass; -import neqsim.statistics.parameterFitting.StatisticsInterface; +import neqsim.statistics.parameterfitting.StatisticsBaseClass; +import neqsim.statistics.parameterfitting.StatisticsInterface; /** *

@@ -36,7 +36,7 @@ public MonteCarloSimulation() {} * Constructor for MonteCarloSimulation. *

* - * @param baseStatClass a {@link neqsim.statistics.parameterFitting.StatisticsInterface} object + * @param baseStatClass a {@link neqsim.statistics.parameterfitting.StatisticsInterface} object */ public MonteCarloSimulation(StatisticsInterface baseStatClass) { this.baseStatClass = baseStatClass; @@ -47,7 +47,7 @@ public MonteCarloSimulation(StatisticsInterface baseStatClass) { * Constructor for MonteCarloSimulation. *

* - * @param baseStatClass a {@link neqsim.statistics.parameterFitting.StatisticsBaseClass} object + * @param baseStatClass a {@link neqsim.statistics.parameterfitting.StatisticsBaseClass} object * @param numberOfRuns a int */ public MonteCarloSimulation(StatisticsBaseClass baseStatClass, int numberOfRuns) { diff --git a/src/main/java/neqsim/statistics/parameterFitting/BaseFunction.java b/src/main/java/neqsim/statistics/parameterfitting/BaseFunction.java similarity index 95% rename from src/main/java/neqsim/statistics/parameterFitting/BaseFunction.java rename to src/main/java/neqsim/statistics/parameterfitting/BaseFunction.java index d65653470e..6399a38392 100644 --- a/src/main/java/neqsim/statistics/parameterFitting/BaseFunction.java +++ b/src/main/java/neqsim/statistics/parameterfitting/BaseFunction.java @@ -1,7 +1,7 @@ -package neqsim.statistics.parameterFitting; +package neqsim.statistics.parameterfitting; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/main/java/neqsim/statistics/parameterFitting/FunctionInterface.java b/src/main/java/neqsim/statistics/parameterfitting/FunctionInterface.java similarity index 95% rename from src/main/java/neqsim/statistics/parameterFitting/FunctionInterface.java rename to src/main/java/neqsim/statistics/parameterfitting/FunctionInterface.java index a936162a8e..aa2d5b171e 100644 --- a/src/main/java/neqsim/statistics/parameterFitting/FunctionInterface.java +++ b/src/main/java/neqsim/statistics/parameterfitting/FunctionInterface.java @@ -4,7 +4,7 @@ * Created on 30. januar 2001, 21:40 */ -package neqsim.statistics.parameterFitting; +package neqsim.statistics.parameterfitting; import neqsim.thermo.system.SystemInterface; @@ -96,7 +96,7 @@ public interface FunctionInterface extends Cloneable { * clone. *

* - * @return a {@link neqsim.statistics.parameterFitting.FunctionInterface} object + * @return a {@link neqsim.statistics.parameterfitting.FunctionInterface} object */ public FunctionInterface clone(); diff --git a/src/main/java/neqsim/statistics/parameterFitting/NumericalDerivative.java b/src/main/java/neqsim/statistics/parameterfitting/NumericalDerivative.java similarity index 97% rename from src/main/java/neqsim/statistics/parameterFitting/NumericalDerivative.java rename to src/main/java/neqsim/statistics/parameterfitting/NumericalDerivative.java index 1fd82c32fc..71a2207993 100644 --- a/src/main/java/neqsim/statistics/parameterFitting/NumericalDerivative.java +++ b/src/main/java/neqsim/statistics/parameterfitting/NumericalDerivative.java @@ -4,7 +4,7 @@ * Created on 28. juli 2000, 15:39 */ -package neqsim.statistics.parameterFitting; +package neqsim.statistics.parameterfitting; /** *

@@ -33,7 +33,7 @@ private NumericalDerivative() {} * calcDerivative. *

* - * @param system a {@link neqsim.statistics.parameterFitting.StatisticsBaseClass} object + * @param system a {@link neqsim.statistics.parameterfitting.StatisticsBaseClass} object * @param sampleNumber a int * @param parameterNumber a int * @return a double diff --git a/src/main/java/neqsim/statistics/parameterFitting/SampleSet.java b/src/main/java/neqsim/statistics/parameterfitting/SampleSet.java similarity index 90% rename from src/main/java/neqsim/statistics/parameterFitting/SampleSet.java rename to src/main/java/neqsim/statistics/parameterfitting/SampleSet.java index e8b81aa470..c41e45b1e5 100644 --- a/src/main/java/neqsim/statistics/parameterFitting/SampleSet.java +++ b/src/main/java/neqsim/statistics/parameterfitting/SampleSet.java @@ -4,7 +4,7 @@ * Created on 28. januar 2001, 13:17 */ -package neqsim.statistics.parameterFitting; +package neqsim.statistics.parameterfitting; import java.util.ArrayList; import java.util.Arrays; @@ -32,7 +32,7 @@ public SampleSet() {} * Constructor for SampleSet. *

* - * @param samplesIn an array of {@link neqsim.statistics.parameterFitting.SampleValue} objects + * @param samplesIn an array of {@link neqsim.statistics.parameterfitting.SampleValue} objects */ public SampleSet(SampleValue[] samplesIn) { samples.addAll(Arrays.asList(samplesIn)); @@ -74,7 +74,7 @@ public SampleSet clone() { * add. *

* - * @param sampleIn a {@link neqsim.statistics.parameterFitting.SampleValue} object + * @param sampleIn a {@link neqsim.statistics.parameterfitting.SampleValue} object */ public void add(SampleValue sampleIn) { samples.add(sampleIn); @@ -85,7 +85,7 @@ public void add(SampleValue sampleIn) { * addSampleSet. *

* - * @param sampleSet a {@link neqsim.statistics.parameterFitting.SampleSet} object + * @param sampleSet a {@link neqsim.statistics.parameterfitting.SampleSet} object */ public void addSampleSet(SampleSet sampleSet) { for (int i = 0; i < sampleSet.getLength(); i++) { @@ -99,7 +99,7 @@ public void addSampleSet(SampleSet sampleSet) { *

* * @param i a int - * @return a {@link neqsim.statistics.parameterFitting.SampleValue} object + * @return a {@link neqsim.statistics.parameterfitting.SampleValue} object */ public SampleValue getSample(int i) { return this.samples.get(i); @@ -129,7 +129,7 @@ public int getLength() { * createNewNormalDistributedSet. *

* - * @return a {@link neqsim.statistics.parameterFitting.SampleSet} object + * @return a {@link neqsim.statistics.parameterfitting.SampleSet} object */ public SampleSet createNewNormalDistributedSet() { SampleSet newSet = this.clone(); diff --git a/src/main/java/neqsim/statistics/parameterFitting/SampleValue.java b/src/main/java/neqsim/statistics/parameterfitting/SampleValue.java similarity index 95% rename from src/main/java/neqsim/statistics/parameterFitting/SampleValue.java rename to src/main/java/neqsim/statistics/parameterfitting/SampleValue.java index 3707faf178..abb2c85f59 100644 --- a/src/main/java/neqsim/statistics/parameterFitting/SampleValue.java +++ b/src/main/java/neqsim/statistics/parameterfitting/SampleValue.java @@ -4,10 +4,10 @@ * Created on 22. januar 2001, 23:01 */ -package neqsim.statistics.parameterFitting; +package neqsim.statistics.parameterfitting; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

@@ -109,7 +109,7 @@ public void setThermodynamicSystem(SystemInterface system) { * setFunction. *

* - * @param function a {@link neqsim.statistics.parameterFitting.BaseFunction} object + * @param function a {@link neqsim.statistics.parameterfitting.BaseFunction} object */ public void setFunction(BaseFunction function) { testFunction = function; @@ -120,7 +120,7 @@ public void setFunction(BaseFunction function) { * getFunction. *

* - * @return a {@link neqsim.statistics.parameterFitting.FunctionInterface} object + * @return a {@link neqsim.statistics.parameterfitting.FunctionInterface} object */ public FunctionInterface getFunction() { return testFunction; diff --git a/src/main/java/neqsim/statistics/parameterFitting/StatisticsBaseClass.java b/src/main/java/neqsim/statistics/parameterfitting/StatisticsBaseClass.java similarity index 96% rename from src/main/java/neqsim/statistics/parameterFitting/StatisticsBaseClass.java rename to src/main/java/neqsim/statistics/parameterfitting/StatisticsBaseClass.java index f37d205059..20a3b22740 100644 --- a/src/main/java/neqsim/statistics/parameterFitting/StatisticsBaseClass.java +++ b/src/main/java/neqsim/statistics/parameterfitting/StatisticsBaseClass.java @@ -4,7 +4,7 @@ * Created on 22. januar 2001, 23:00 */ -package neqsim.statistics.parameterFitting; +package neqsim.statistics.parameterfitting; import java.awt.Container; import java.awt.FlowLayout; @@ -83,7 +83,7 @@ public StatisticsBaseClass clone() { * Setter for the field sampleSet. *

* - * @param sampleSet a {@link neqsim.statistics.parameterFitting.SampleSet} object + * @param sampleSet a {@link neqsim.statistics.parameterfitting.SampleSet} object */ public void setSampleSet(SampleSet sampleSet) { this.sampleSet = sampleSet; @@ -94,7 +94,7 @@ public void setSampleSet(SampleSet sampleSet) { * addSampleSet. *

* - * @param sampleSet a {@link neqsim.statistics.parameterFitting.SampleSet} object + * @param sampleSet a {@link neqsim.statistics.parameterfitting.SampleSet} object */ public void addSampleSet(SampleSet sampleSet) { this.sampleSet.addSampleSet(sampleSet); @@ -113,7 +113,7 @@ public StatisticsBaseClass createNewRandomClass() { * calcValue. *

* - * @param sample a {@link neqsim.statistics.parameterFitting.SampleValue} object + * @param sample a {@link neqsim.statistics.parameterfitting.SampleValue} object * @return a double */ public double calcValue(SampleValue sample) { @@ -153,7 +153,7 @@ public void checkBounds(Matrix newParameters) { * calcTrueValue. *

* - * @param sample a {@link neqsim.statistics.parameterFitting.SampleValue} object + * @param sample a {@link neqsim.statistics.parameterfitting.SampleValue} object * @return a double */ public double calcTrueValue(SampleValue sample) { @@ -166,7 +166,7 @@ public double calcTrueValue(SampleValue sample) { *

* * @param val a double - * @param sample a {@link neqsim.statistics.parameterFitting.SampleValue} object + * @param sample a {@link neqsim.statistics.parameterfitting.SampleValue} object * @return a double */ public double calcTrueValue(double val, SampleValue sample) { @@ -208,7 +208,7 @@ public void setFittingParameter(int parameterNumber, double parameterVal) { *

* * @param i a int - * @return a {@link neqsim.statistics.parameterFitting.SampleValue} object + * @return a {@link neqsim.statistics.parameterfitting.SampleValue} object */ public SampleValue getSample(int i) { return sampleSet.getSample(i); @@ -383,16 +383,16 @@ public void calcCorrelationMatrix() { *

*/ public void runMonteCarloSimulation() { - neqsim.statistics.monteCarloSimulation.MonteCarloSimulation montCarlSim = - new neqsim.statistics.monteCarloSimulation.MonteCarloSimulation(this, 10); + neqsim.statistics.montecarlosimulation.MonteCarloSimulation montCarlSim = + new neqsim.statistics.montecarlosimulation.MonteCarloSimulation(this, 10); montCarlSim.runSimulation(); } /** {@inheritDoc} */ @Override public void runMonteCarloSimulation(int numRuns) { - neqsim.statistics.monteCarloSimulation.MonteCarloSimulation montCarlSim = - new neqsim.statistics.monteCarloSimulation.MonteCarloSimulation(this, numRuns); + neqsim.statistics.montecarlosimulation.MonteCarloSimulation montCarlSim = + new neqsim.statistics.montecarlosimulation.MonteCarloSimulation(this, numRuns); montCarlSim.runSimulation(); } @@ -698,8 +698,8 @@ public void calcDeviation() { /** {@inheritDoc} */ @Override public void writeToTextFile(String name) { - neqsim.dataPresentation.fileHandeling.createTextFile.TextFile tempfile = - new neqsim.dataPresentation.fileHandeling.createTextFile.TextFile(); + neqsim.datapresentation.filehandeling.createtextfile.TextFile tempfile = + new neqsim.datapresentation.filehandeling.createtextfile.TextFile(); tempfile.setOutputFileName(name); tempfile.setValues(valTable); tempfile.createFile(); diff --git a/src/main/java/neqsim/statistics/parameterFitting/StatisticsInterface.java b/src/main/java/neqsim/statistics/parameterfitting/StatisticsInterface.java similarity index 89% rename from src/main/java/neqsim/statistics/parameterFitting/StatisticsInterface.java rename to src/main/java/neqsim/statistics/parameterfitting/StatisticsInterface.java index 6378fd9080..8caa5972fe 100644 --- a/src/main/java/neqsim/statistics/parameterFitting/StatisticsInterface.java +++ b/src/main/java/neqsim/statistics/parameterfitting/StatisticsInterface.java @@ -4,7 +4,7 @@ * Created on 30. januar 2001, 18:25 */ -package neqsim.statistics.parameterFitting; +package neqsim.statistics.parameterfitting; /** *

@@ -20,7 +20,7 @@ public interface StatisticsInterface { * createNewRandomClass. *

* - * @return a {@link neqsim.statistics.parameterFitting.StatisticsBaseClass} object + * @return a {@link neqsim.statistics.parameterfitting.StatisticsBaseClass} object */ public StatisticsBaseClass createNewRandomClass(); @@ -43,7 +43,7 @@ public interface StatisticsInterface { * getSampleSet. *

* - * @return a {@link neqsim.statistics.parameterFitting.SampleSet} object + * @return a {@link neqsim.statistics.parameterfitting.SampleSet} object */ public SampleSet getSampleSet(); diff --git a/src/main/java/neqsim/statistics/parameterFitting/nonLinearParameterFitting/LevenbergMarquardt.java b/src/main/java/neqsim/statistics/parameterfitting/nonlinearparameterfitting/LevenbergMarquardt.java similarity index 97% rename from src/main/java/neqsim/statistics/parameterFitting/nonLinearParameterFitting/LevenbergMarquardt.java rename to src/main/java/neqsim/statistics/parameterfitting/nonlinearparameterfitting/LevenbergMarquardt.java index 64dc6d3ca6..335d3778a3 100644 --- a/src/main/java/neqsim/statistics/parameterFitting/nonLinearParameterFitting/LevenbergMarquardt.java +++ b/src/main/java/neqsim/statistics/parameterfitting/nonlinearparameterfitting/LevenbergMarquardt.java @@ -4,10 +4,10 @@ * Created on 22. januar 2001, 23:00 */ -package neqsim.statistics.parameterFitting.nonLinearParameterFitting; +package neqsim.statistics.parameterfitting.nonlinearparameterfitting; import Jama.Matrix; -import neqsim.statistics.parameterFitting.StatisticsBaseClass; +import neqsim.statistics.parameterfitting.StatisticsBaseClass; /** *

diff --git a/src/main/java/neqsim/statistics/parameterFitting/nonLinearParameterFitting/LevenbergMarquardtAbsDev.java b/src/main/java/neqsim/statistics/parameterfitting/nonlinearparameterfitting/LevenbergMarquardtAbsDev.java similarity index 97% rename from src/main/java/neqsim/statistics/parameterFitting/nonLinearParameterFitting/LevenbergMarquardtAbsDev.java rename to src/main/java/neqsim/statistics/parameterfitting/nonlinearparameterfitting/LevenbergMarquardtAbsDev.java index eeada31214..72a137d71b 100644 --- a/src/main/java/neqsim/statistics/parameterFitting/nonLinearParameterFitting/LevenbergMarquardtAbsDev.java +++ b/src/main/java/neqsim/statistics/parameterfitting/nonlinearparameterfitting/LevenbergMarquardtAbsDev.java @@ -4,7 +4,7 @@ * Created on 22. januar 2001, 23:00 */ -package neqsim.statistics.parameterFitting.nonLinearParameterFitting; +package neqsim.statistics.parameterfitting.nonlinearparameterfitting; /** *

diff --git a/src/main/java/neqsim/statistics/parameterFitting/nonLinearParameterFitting/LevenbergMarquardtBiasDev.java b/src/main/java/neqsim/statistics/parameterfitting/nonlinearparameterfitting/LevenbergMarquardtBiasDev.java similarity index 97% rename from src/main/java/neqsim/statistics/parameterFitting/nonLinearParameterFitting/LevenbergMarquardtBiasDev.java rename to src/main/java/neqsim/statistics/parameterfitting/nonlinearparameterfitting/LevenbergMarquardtBiasDev.java index 1fe22f900b..46f542f23e 100644 --- a/src/main/java/neqsim/statistics/parameterFitting/nonLinearParameterFitting/LevenbergMarquardtBiasDev.java +++ b/src/main/java/neqsim/statistics/parameterfitting/nonlinearparameterfitting/LevenbergMarquardtBiasDev.java @@ -4,7 +4,7 @@ * Created on 22. januar 2001, 23:00 */ -package neqsim.statistics.parameterFitting.nonLinearParameterFitting; +package neqsim.statistics.parameterfitting.nonlinearparameterfitting; /** *

diff --git a/src/main/java/neqsim/statistics/parameterFitting/nonLinearParameterFitting/LevenbergMarquardtFunction.java b/src/main/java/neqsim/statistics/parameterfitting/nonlinearparameterfitting/LevenbergMarquardtFunction.java similarity index 92% rename from src/main/java/neqsim/statistics/parameterFitting/nonLinearParameterFitting/LevenbergMarquardtFunction.java rename to src/main/java/neqsim/statistics/parameterfitting/nonlinearparameterfitting/LevenbergMarquardtFunction.java index 15af7533b9..9e26abae05 100644 --- a/src/main/java/neqsim/statistics/parameterFitting/nonLinearParameterFitting/LevenbergMarquardtFunction.java +++ b/src/main/java/neqsim/statistics/parameterfitting/nonlinearparameterfitting/LevenbergMarquardtFunction.java @@ -1,6 +1,6 @@ -package neqsim.statistics.parameterFitting.nonLinearParameterFitting; +package neqsim.statistics.parameterfitting.nonlinearparameterfitting; -import neqsim.statistics.parameterFitting.BaseFunction; +import neqsim.statistics.parameterfitting.BaseFunction; /** *

diff --git a/src/main/java/neqsim/thermo/atomElement/Element.java b/src/main/java/neqsim/thermo/atomelement/Element.java similarity index 98% rename from src/main/java/neqsim/thermo/atomElement/Element.java rename to src/main/java/neqsim/thermo/atomelement/Element.java index d82149f7dd..a4550286b0 100644 --- a/src/main/java/neqsim/thermo/atomElement/Element.java +++ b/src/main/java/neqsim/thermo/atomelement/Element.java @@ -4,7 +4,7 @@ * Created on 4. februar 2001, 22:11 */ -package neqsim.thermo.atomElement; +package neqsim.thermo.atomelement; import java.util.ArrayList; import org.apache.logging.log4j.LogManager; diff --git a/src/main/java/neqsim/thermo/atomElement/UNIFACgroup.java b/src/main/java/neqsim/thermo/atomelement/UNIFACgroup.java similarity index 99% rename from src/main/java/neqsim/thermo/atomElement/UNIFACgroup.java rename to src/main/java/neqsim/thermo/atomelement/UNIFACgroup.java index 256c6d05fd..334ec573b3 100644 --- a/src/main/java/neqsim/thermo/atomElement/UNIFACgroup.java +++ b/src/main/java/neqsim/thermo/atomelement/UNIFACgroup.java @@ -1,4 +1,4 @@ -package neqsim.thermo.atomElement; +package neqsim.thermo.atomelement; import java.util.Arrays; import java.util.Objects; diff --git a/src/main/java/neqsim/thermo/component/Component.java b/src/main/java/neqsim/thermo/component/Component.java index 7417adae32..3f3b3c6995 100644 --- a/src/main/java/neqsim/thermo/component/Component.java +++ b/src/main/java/neqsim/thermo/component/Component.java @@ -10,8 +10,8 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.ThermodynamicModelSettings; -import neqsim.thermo.atomElement.Element; -import neqsim.thermo.component.attractiveEosTerm.AttractiveTermInterface; +import neqsim.thermo.atomelement.Element; +import neqsim.thermo.component.attractiveeosterm.AttractiveTermInterface; import neqsim.thermo.phase.PhaseInterface; import neqsim.util.database.NeqSimDataBase; import neqsim.util.unit.PressureUnit; diff --git a/src/main/java/neqsim/thermo/component/ComponentEos.java b/src/main/java/neqsim/thermo/component/ComponentEos.java index b48e16fedf..c1beb10839 100644 --- a/src/main/java/neqsim/thermo/component/ComponentEos.java +++ b/src/main/java/neqsim/thermo/component/ComponentEos.java @@ -9,27 +9,27 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import neqsim.thermo.ThermodynamicModelSettings; -import neqsim.thermo.component.attractiveEosTerm.AtractiveTermMatCopPRUMRNew; -import neqsim.thermo.component.attractiveEosTerm.AttractiveTermCPAstatoil; -import neqsim.thermo.component.attractiveEosTerm.AttractiveTermGERG; -import neqsim.thermo.component.attractiveEosTerm.AttractiveTermInterface; -import neqsim.thermo.component.attractiveEosTerm.AttractiveTermMatCop; -import neqsim.thermo.component.attractiveEosTerm.AttractiveTermMatCopPR; -import neqsim.thermo.component.attractiveEosTerm.AttractiveTermMatCopPRUMR; -import neqsim.thermo.component.attractiveEosTerm.AttractiveTermMollerup; -import neqsim.thermo.component.attractiveEosTerm.AttractiveTermPr; -import neqsim.thermo.component.attractiveEosTerm.AttractiveTermPr1978; -import neqsim.thermo.component.attractiveEosTerm.AttractiveTermPrDanesh; -import neqsim.thermo.component.attractiveEosTerm.AttractiveTermPrDelft1998; -import neqsim.thermo.component.attractiveEosTerm.AttractiveTermPrGassem2001; -import neqsim.thermo.component.attractiveEosTerm.AttractiveTermRk; -import neqsim.thermo.component.attractiveEosTerm.AttractiveTermSchwartzentruber; -import neqsim.thermo.component.attractiveEosTerm.AttractiveTermSrk; -import neqsim.thermo.component.attractiveEosTerm.AttractiveTermTwu; -import neqsim.thermo.component.attractiveEosTerm.AttractiveTermTwuCoon; -import neqsim.thermo.component.attractiveEosTerm.AttractiveTermTwuCoonParam; -import neqsim.thermo.component.attractiveEosTerm.AttractiveTermTwuCoonStatoil; -import neqsim.thermo.component.attractiveEosTerm.AttractiveTermUMRPRU; +import neqsim.thermo.component.attractiveeosterm.AtractiveTermMatCopPRUMRNew; +import neqsim.thermo.component.attractiveeosterm.AttractiveTermCPAstatoil; +import neqsim.thermo.component.attractiveeosterm.AttractiveTermGERG; +import neqsim.thermo.component.attractiveeosterm.AttractiveTermInterface; +import neqsim.thermo.component.attractiveeosterm.AttractiveTermMatCop; +import neqsim.thermo.component.attractiveeosterm.AttractiveTermMatCopPR; +import neqsim.thermo.component.attractiveeosterm.AttractiveTermMatCopPRUMR; +import neqsim.thermo.component.attractiveeosterm.AttractiveTermMollerup; +import neqsim.thermo.component.attractiveeosterm.AttractiveTermPr; +import neqsim.thermo.component.attractiveeosterm.AttractiveTermPr1978; +import neqsim.thermo.component.attractiveeosterm.AttractiveTermPrDanesh; +import neqsim.thermo.component.attractiveeosterm.AttractiveTermPrDelft1998; +import neqsim.thermo.component.attractiveeosterm.AttractiveTermPrGassem2001; +import neqsim.thermo.component.attractiveeosterm.AttractiveTermRk; +import neqsim.thermo.component.attractiveeosterm.AttractiveTermSchwartzentruber; +import neqsim.thermo.component.attractiveeosterm.AttractiveTermSrk; +import neqsim.thermo.component.attractiveeosterm.AttractiveTermTwu; +import neqsim.thermo.component.attractiveeosterm.AttractiveTermTwuCoon; +import neqsim.thermo.component.attractiveeosterm.AttractiveTermTwuCoonParam; +import neqsim.thermo.component.attractiveeosterm.AttractiveTermTwuCoonStatoil; +import neqsim.thermo.component.attractiveeosterm.AttractiveTermUMRPRU; import neqsim.thermo.phase.PhaseInterface; /** @@ -758,7 +758,7 @@ public double getdUdndnSV(PhaseInterface phase, int compNumb1, int compNumb2) { * Getter for the field attractiveParameter. *

* - * @return a {@link neqsim.thermo.component.attractiveEosTerm.AttractiveTermInterface} object + * @return a {@link neqsim.thermo.component.attractiveeosterm.AttractiveTermInterface} object */ public AttractiveTermInterface getAttractiveParameter() { return attractiveParameter; @@ -770,7 +770,7 @@ public AttractiveTermInterface getAttractiveParameter() { *

* * @param attractiveParameter a - * {@link neqsim.thermo.component.attractiveEosTerm.AttractiveTermInterface} object + * {@link neqsim.thermo.component.attractiveeosterm.AttractiveTermInterface} object */ public void setAttractiveParameter(AttractiveTermInterface attractiveParameter) { this.attractiveParameter = attractiveParameter; diff --git a/src/main/java/neqsim/thermo/component/ComponentGEUnifac.java b/src/main/java/neqsim/thermo/component/ComponentGEUnifac.java index 8066fee4d5..7a998319d7 100644 --- a/src/main/java/neqsim/thermo/component/ComponentGEUnifac.java +++ b/src/main/java/neqsim/thermo/component/ComponentGEUnifac.java @@ -9,7 +9,7 @@ import java.util.ArrayList; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.thermo.atomElement.UNIFACgroup; +import neqsim.thermo.atomelement.UNIFACgroup; import neqsim.thermo.phase.PhaseGEUnifac; import neqsim.thermo.phase.PhaseInterface; import neqsim.thermo.phase.PhaseType; @@ -273,7 +273,7 @@ public double fugcoefDiffTemp(PhaseInterface phase, int numberOfComponents, doub /** * Getter for property unifacGroups. * - * @return an ArrayList of {@link neqsim.thermo.atomElement.UNIFACgroup} objects. Value of + * @return an ArrayList of {@link neqsim.thermo.atomelement.UNIFACgroup} objects. Value of * property unifacGroups. */ public ArrayList getUnifacGroups2() { @@ -285,7 +285,7 @@ public ArrayList getUnifacGroups2() { * Getter for the field unifacGroups. *

* - * @return an array of {@link neqsim.thermo.atomElement.UNIFACgroup} objects + * @return an array of {@link neqsim.thermo.atomelement.UNIFACgroup} objects */ public UNIFACgroup[] getUnifacGroups() { return unifacGroupsArray; @@ -297,9 +297,9 @@ public UNIFACgroup[] getUnifacGroups() { *

* * @param i a int - * @return a {@link neqsim.thermo.atomElement.UNIFACgroup} object + * @return a {@link neqsim.thermo.atomelement.UNIFACgroup} object */ - public neqsim.thermo.atomElement.UNIFACgroup getUnifacGroup2(int i) { + public neqsim.thermo.atomelement.UNIFACgroup getUnifacGroup2(int i) { return unifacGroups.get(i); } @@ -309,9 +309,9 @@ public neqsim.thermo.atomElement.UNIFACgroup getUnifacGroup2(int i) { *

* * @param i a int - * @return a {@link neqsim.thermo.atomElement.UNIFACgroup} object + * @return a {@link neqsim.thermo.atomelement.UNIFACgroup} object */ - public neqsim.thermo.atomElement.UNIFACgroup getUnifacGroup(int i) { + public neqsim.thermo.atomelement.UNIFACgroup getUnifacGroup(int i) { return unifacGroupsArray[i]; } diff --git a/src/main/java/neqsim/thermo/component/ComponentGEUnifacUMRPRU.java b/src/main/java/neqsim/thermo/component/ComponentGEUnifacUMRPRU.java index b2bd488f15..7885e31c2b 100644 --- a/src/main/java/neqsim/thermo/component/ComponentGEUnifacUMRPRU.java +++ b/src/main/java/neqsim/thermo/component/ComponentGEUnifacUMRPRU.java @@ -2,7 +2,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.thermo.atomElement.UNIFACgroup; +import neqsim.thermo.atomelement.UNIFACgroup; import neqsim.thermo.phase.PhaseGEUnifac; import neqsim.thermo.phase.PhaseGEUnifacUMRPRU; import neqsim.thermo.phase.PhaseInterface; diff --git a/src/main/java/neqsim/thermo/component/ComponentInterface.java b/src/main/java/neqsim/thermo/component/ComponentInterface.java index 7a31ad60cd..cfab9e4234 100644 --- a/src/main/java/neqsim/thermo/component/ComponentInterface.java +++ b/src/main/java/neqsim/thermo/component/ComponentInterface.java @@ -8,8 +8,8 @@ import java.util.LinkedHashMap; import neqsim.thermo.ThermodynamicConstantsInterface; -import neqsim.thermo.atomElement.Element; -import neqsim.thermo.component.attractiveEosTerm.AttractiveTermInterface; +import neqsim.thermo.atomelement.Element; +import neqsim.thermo.component.attractiveeosterm.AttractiveTermInterface; import neqsim.thermo.phase.PhaseInterface; /** @@ -1393,7 +1393,7 @@ public default double getLogFugacityCoefficient() { * getAttractiveTerm. *

* - * @return a {@link neqsim.thermo.component.attractiveEosTerm.AttractiveTermInterface} object + * @return a {@link neqsim.thermo.component.attractiveeosterm.AttractiveTermInterface} object */ public AttractiveTermInterface getAttractiveTerm(); @@ -1572,7 +1572,7 @@ public default double getLogFugacityCoefficient() { * getElements. *

* - * @return a {@link neqsim.thermo.atomElement.Element} object + * @return a {@link neqsim.thermo.atomelement.Element} object */ public Element getElements(); diff --git a/src/main/java/neqsim/thermo/component/ComponentModifiedFurstElectrolyteEos.java b/src/main/java/neqsim/thermo/component/ComponentModifiedFurstElectrolyteEos.java index c78ab76363..38fab3bfb1 100644 --- a/src/main/java/neqsim/thermo/component/ComponentModifiedFurstElectrolyteEos.java +++ b/src/main/java/neqsim/thermo/component/ComponentModifiedFurstElectrolyteEos.java @@ -88,7 +88,7 @@ public ComponentModifiedFurstElectrolyteEos(String name, double moles, double mo : b; a = ionicCharge != 0 ? 1.0e-35 : a; setAttractiveParameter( - new neqsim.thermo.component.attractiveEosTerm.AttractiveTermSchwartzentruber(this)); + new neqsim.thermo.component.attractiveeosterm.AttractiveTermSchwartzentruber(this)); lennardJonesMolecularDiameter = ionicCharge != 0 ? Math.pow((6.0 * b / 1.0e5) / (pi * avagadroNumber), 1.0 / 3.0) * 1e10 : lennardJonesMolecularDiameter; diff --git a/src/main/java/neqsim/thermo/component/ComponentModifiedFurstElectrolyteEosMod2004.java b/src/main/java/neqsim/thermo/component/ComponentModifiedFurstElectrolyteEosMod2004.java index 819edde5a3..7adbd089dc 100644 --- a/src/main/java/neqsim/thermo/component/ComponentModifiedFurstElectrolyteEosMod2004.java +++ b/src/main/java/neqsim/thermo/component/ComponentModifiedFurstElectrolyteEosMod2004.java @@ -88,7 +88,7 @@ public ComponentModifiedFurstElectrolyteEosMod2004(String name, double moles, do : b; a = ionicCharge != 0 ? 1.0e-35 : a; setAttractiveParameter( - new neqsim.thermo.component.attractiveEosTerm.AttractiveTermSchwartzentruber(this)); + new neqsim.thermo.component.attractiveeosterm.AttractiveTermSchwartzentruber(this)); lennardJonesMolecularDiameter = ionicCharge != 0 ? Math.pow((6.0 * b / 1.0e5) / (pi * avagadroNumber), 1.0 / 3.0) * 1e10 : lennardJonesMolecularDiameter; diff --git a/src/main/java/neqsim/thermo/component/ComponentPR.java b/src/main/java/neqsim/thermo/component/ComponentPR.java index 239f4d2b2a..ed21c9893a 100644 --- a/src/main/java/neqsim/thermo/component/ComponentPR.java +++ b/src/main/java/neqsim/thermo/component/ComponentPR.java @@ -1,6 +1,6 @@ package neqsim.thermo.component; -import neqsim.thermo.component.attractiveEosTerm.AttractiveTermPr; +import neqsim.thermo.component.attractiveeosterm.AttractiveTermPr; /** *

diff --git a/src/main/java/neqsim/thermo/component/ComponentRK.java b/src/main/java/neqsim/thermo/component/ComponentRK.java index c6a1f46ac0..0edbb1268d 100644 --- a/src/main/java/neqsim/thermo/component/ComponentRK.java +++ b/src/main/java/neqsim/thermo/component/ComponentRK.java @@ -1,6 +1,6 @@ package neqsim.thermo.component; -import neqsim.thermo.component.attractiveEosTerm.AttractiveTermRk; +import neqsim.thermo.component.attractiveeosterm.AttractiveTermRk; /** *

diff --git a/src/main/java/neqsim/thermo/component/ComponentSrk.java b/src/main/java/neqsim/thermo/component/ComponentSrk.java index 691123b0a6..9dbfe9509f 100644 --- a/src/main/java/neqsim/thermo/component/ComponentSrk.java +++ b/src/main/java/neqsim/thermo/component/ComponentSrk.java @@ -1,7 +1,7 @@ package neqsim.thermo.component; import neqsim.thermo.ThermodynamicConstantsInterface; -import neqsim.thermo.component.attractiveEosTerm.AttractiveTermSrk; +import neqsim.thermo.component.attractiveeosterm.AttractiveTermSrk; /** *

diff --git a/src/main/java/neqsim/thermo/component/ComponentSrkPeneloux.java b/src/main/java/neqsim/thermo/component/ComponentSrkPeneloux.java index 7fb974526f..314fc8a51b 100644 --- a/src/main/java/neqsim/thermo/component/ComponentSrkPeneloux.java +++ b/src/main/java/neqsim/thermo/component/ComponentSrkPeneloux.java @@ -1,6 +1,6 @@ package neqsim.thermo.component; -import neqsim.thermo.component.attractiveEosTerm.AttractiveTermSrk; +import neqsim.thermo.component.attractiveeosterm.AttractiveTermSrk; /** *

diff --git a/src/main/java/neqsim/thermo/component/ComponentTST.java b/src/main/java/neqsim/thermo/component/ComponentTST.java index 769b5abc34..c2ae66323b 100644 --- a/src/main/java/neqsim/thermo/component/ComponentTST.java +++ b/src/main/java/neqsim/thermo/component/ComponentTST.java @@ -1,6 +1,6 @@ package neqsim.thermo.component; -import neqsim.thermo.component.attractiveEosTerm.AttractiveTermTwu; +import neqsim.thermo.component.attractiveeosterm.AttractiveTermTwu; /** *

diff --git a/src/main/java/neqsim/thermo/component/attractiveEosTerm/AtractiveTermMatCopPRUMRNew.java b/src/main/java/neqsim/thermo/component/attractiveeosterm/AtractiveTermMatCopPRUMRNew.java similarity index 99% rename from src/main/java/neqsim/thermo/component/attractiveEosTerm/AtractiveTermMatCopPRUMRNew.java rename to src/main/java/neqsim/thermo/component/attractiveeosterm/AtractiveTermMatCopPRUMRNew.java index d2acf67d07..a036a3a8a3 100644 --- a/src/main/java/neqsim/thermo/component/attractiveEosTerm/AtractiveTermMatCopPRUMRNew.java +++ b/src/main/java/neqsim/thermo/component/attractiveeosterm/AtractiveTermMatCopPRUMRNew.java @@ -1,4 +1,4 @@ -package neqsim.thermo.component.attractiveEosTerm; +package neqsim.thermo.component.attractiveeosterm; import neqsim.thermo.component.ComponentEosInterface; diff --git a/src/main/java/neqsim/thermo/component/attractiveEosTerm/AttractiveTermBaseClass.java b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermBaseClass.java similarity index 98% rename from src/main/java/neqsim/thermo/component/attractiveEosTerm/AttractiveTermBaseClass.java rename to src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermBaseClass.java index 859ac50c09..5439beaa74 100644 --- a/src/main/java/neqsim/thermo/component/attractiveEosTerm/AttractiveTermBaseClass.java +++ b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermBaseClass.java @@ -4,7 +4,7 @@ * Created on 13. mai 2001, 21:58 */ -package neqsim.thermo.component.attractiveEosTerm; +package neqsim.thermo.component.attractiveeosterm; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/neqsim/thermo/component/attractiveEosTerm/AttractiveTermCPAstatoil.java b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermCPAstatoil.java similarity index 98% rename from src/main/java/neqsim/thermo/component/attractiveEosTerm/AttractiveTermCPAstatoil.java rename to src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermCPAstatoil.java index 348dd9cd7e..4da372e9ac 100644 --- a/src/main/java/neqsim/thermo/component/attractiveEosTerm/AttractiveTermCPAstatoil.java +++ b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermCPAstatoil.java @@ -1,4 +1,4 @@ -package neqsim.thermo.component.attractiveEosTerm; +package neqsim.thermo.component.attractiveeosterm; import neqsim.thermo.component.ComponentEosInterface; diff --git a/src/main/java/neqsim/thermo/component/attractiveEosTerm/AttractiveTermGERG.java b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermGERG.java similarity index 99% rename from src/main/java/neqsim/thermo/component/attractiveEosTerm/AttractiveTermGERG.java rename to src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermGERG.java index 77974d57ec..26e3a99a47 100644 --- a/src/main/java/neqsim/thermo/component/attractiveEosTerm/AttractiveTermGERG.java +++ b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermGERG.java @@ -1,4 +1,4 @@ -package neqsim.thermo.component.attractiveEosTerm; +package neqsim.thermo.component.attractiveeosterm; import neqsim.thermo.component.ComponentEosInterface; diff --git a/src/main/java/neqsim/thermo/component/attractiveEosTerm/AttractiveTermInterface.java b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermInterface.java similarity index 93% rename from src/main/java/neqsim/thermo/component/attractiveEosTerm/AttractiveTermInterface.java rename to src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermInterface.java index 66b7861443..b358d8049f 100644 --- a/src/main/java/neqsim/thermo/component/attractiveEosTerm/AttractiveTermInterface.java +++ b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermInterface.java @@ -4,7 +4,7 @@ * Created on 13. mai 2001, 21:54 */ -package neqsim.thermo.component.attractiveEosTerm; +package neqsim.thermo.component.attractiveeosterm; /** *

@@ -116,7 +116,7 @@ public interface AttractiveTermInterface extends Cloneable, java.io.Serializable * clone. *

* - * @return a {@link neqsim.thermo.component.attractiveEosTerm.AttractiveTermInterface} object + * @return a {@link neqsim.thermo.component.attractiveeosterm.AttractiveTermInterface} object */ public AttractiveTermInterface clone(); } diff --git a/src/main/java/neqsim/thermo/component/attractiveEosTerm/AttractiveTermMatCop.java b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermMatCop.java similarity index 98% rename from src/main/java/neqsim/thermo/component/attractiveEosTerm/AttractiveTermMatCop.java rename to src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermMatCop.java index c99ffc08b9..7a93d7c78e 100644 --- a/src/main/java/neqsim/thermo/component/attractiveEosTerm/AttractiveTermMatCop.java +++ b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermMatCop.java @@ -1,4 +1,4 @@ -package neqsim.thermo.component.attractiveEosTerm; +package neqsim.thermo.component.attractiveeosterm; import neqsim.thermo.component.ComponentEosInterface; diff --git a/src/main/java/neqsim/thermo/component/attractiveEosTerm/AttractiveTermMatCopPR.java b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermMatCopPR.java similarity index 99% rename from src/main/java/neqsim/thermo/component/attractiveEosTerm/AttractiveTermMatCopPR.java rename to src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermMatCopPR.java index fbda40b094..802bb45e44 100644 --- a/src/main/java/neqsim/thermo/component/attractiveEosTerm/AttractiveTermMatCopPR.java +++ b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermMatCopPR.java @@ -1,4 +1,4 @@ -package neqsim.thermo.component.attractiveEosTerm; +package neqsim.thermo.component.attractiveeosterm; import neqsim.thermo.component.ComponentEosInterface; diff --git a/src/main/java/neqsim/thermo/component/attractiveEosTerm/AttractiveTermMatCopPRUMR.java b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermMatCopPRUMR.java similarity index 99% rename from src/main/java/neqsim/thermo/component/attractiveEosTerm/AttractiveTermMatCopPRUMR.java rename to src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermMatCopPRUMR.java index dd48e4f4de..b9bf922b4b 100644 --- a/src/main/java/neqsim/thermo/component/attractiveEosTerm/AttractiveTermMatCopPRUMR.java +++ b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermMatCopPRUMR.java @@ -1,4 +1,4 @@ -package neqsim.thermo.component.attractiveEosTerm; +package neqsim.thermo.component.attractiveeosterm; import neqsim.thermo.component.ComponentEosInterface; diff --git a/src/main/java/neqsim/thermo/component/attractiveEosTerm/AttractiveTermMollerup.java b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermMollerup.java similarity index 98% rename from src/main/java/neqsim/thermo/component/attractiveEosTerm/AttractiveTermMollerup.java rename to src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermMollerup.java index 6b0d436642..b9d0dc16c9 100644 --- a/src/main/java/neqsim/thermo/component/attractiveEosTerm/AttractiveTermMollerup.java +++ b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermMollerup.java @@ -1,4 +1,4 @@ -package neqsim.thermo.component.attractiveEosTerm; +package neqsim.thermo.component.attractiveeosterm; import neqsim.thermo.component.ComponentEosInterface; diff --git a/src/main/java/neqsim/thermo/component/attractiveEosTerm/AttractiveTermPr.java b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermPr.java similarity index 94% rename from src/main/java/neqsim/thermo/component/attractiveEosTerm/AttractiveTermPr.java rename to src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermPr.java index e3c4f27748..e566d2fdca 100644 --- a/src/main/java/neqsim/thermo/component/attractiveEosTerm/AttractiveTermPr.java +++ b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermPr.java @@ -1,4 +1,4 @@ -package neqsim.thermo.component.attractiveEosTerm; +package neqsim.thermo.component.attractiveeosterm; import neqsim.thermo.component.ComponentEosInterface; @@ -42,8 +42,8 @@ public AttractiveTermPr clone() { @Override public void setm(double val) { this.m = val; - neqsim.MathLib.nonLinearSolver.newtonRhapson solve = - new neqsim.MathLib.nonLinearSolver.newtonRhapson(); + neqsim.mathlib.nonlinearsolver.NewtonRhapson solve = + new neqsim.mathlib.nonlinearsolver.NewtonRhapson(); solve.setOrder(2); double[] acentricConstants = {-0.26992, 1.54226, (0.37464 - this.m)}; solve.setConstants(acentricConstants); diff --git a/src/main/java/neqsim/thermo/component/attractiveEosTerm/AttractiveTermPr1978.java b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermPr1978.java similarity index 92% rename from src/main/java/neqsim/thermo/component/attractiveEosTerm/AttractiveTermPr1978.java rename to src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermPr1978.java index 441bd62ce3..a3cc4b1778 100644 --- a/src/main/java/neqsim/thermo/component/attractiveEosTerm/AttractiveTermPr1978.java +++ b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermPr1978.java @@ -1,4 +1,4 @@ -package neqsim.thermo.component.attractiveEosTerm; +package neqsim.thermo.component.attractiveeosterm; import neqsim.thermo.component.ComponentEosInterface; @@ -36,8 +36,8 @@ public AttractiveTermPr1978(ComponentEosInterface component) { @Override public void setm(double val) { this.m = val; - neqsim.MathLib.nonLinearSolver.newtonRhapson solve = - new neqsim.MathLib.nonLinearSolver.newtonRhapson(); + neqsim.mathlib.nonlinearsolver.NewtonRhapson solve = + new neqsim.mathlib.nonlinearsolver.NewtonRhapson(); solve.setOrder(2); double[] acentricConstants = {-0.26992, 1.54226, (0.37464 - this.m)}; if (this.m > 0.49) { diff --git a/src/main/java/neqsim/thermo/component/attractiveEosTerm/AttractiveTermPrDanesh.java b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermPrDanesh.java similarity index 98% rename from src/main/java/neqsim/thermo/component/attractiveEosTerm/AttractiveTermPrDanesh.java rename to src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermPrDanesh.java index 77c032c49a..7362bc8596 100644 --- a/src/main/java/neqsim/thermo/component/attractiveEosTerm/AttractiveTermPrDanesh.java +++ b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermPrDanesh.java @@ -1,4 +1,4 @@ -package neqsim.thermo.component.attractiveEosTerm; +package neqsim.thermo.component.attractiveeosterm; import neqsim.thermo.component.ComponentEosInterface; diff --git a/src/main/java/neqsim/thermo/component/attractiveEosTerm/AttractiveTermPrDelft1998.java b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermPrDelft1998.java similarity index 98% rename from src/main/java/neqsim/thermo/component/attractiveEosTerm/AttractiveTermPrDelft1998.java rename to src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermPrDelft1998.java index 663a1fc616..8a012fc281 100644 --- a/src/main/java/neqsim/thermo/component/attractiveEosTerm/AttractiveTermPrDelft1998.java +++ b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermPrDelft1998.java @@ -1,4 +1,4 @@ -package neqsim.thermo.component.attractiveEosTerm; +package neqsim.thermo.component.attractiveeosterm; import neqsim.thermo.component.ComponentEosInterface; diff --git a/src/main/java/neqsim/thermo/component/attractiveEosTerm/AttractiveTermPrGassem2001.java b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermPrGassem2001.java similarity index 98% rename from src/main/java/neqsim/thermo/component/attractiveEosTerm/AttractiveTermPrGassem2001.java rename to src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermPrGassem2001.java index 5643992466..9c1ba7bd17 100644 --- a/src/main/java/neqsim/thermo/component/attractiveEosTerm/AttractiveTermPrGassem2001.java +++ b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermPrGassem2001.java @@ -1,4 +1,4 @@ -package neqsim.thermo.component.attractiveEosTerm; +package neqsim.thermo.component.attractiveeosterm; import neqsim.thermo.component.ComponentEosInterface; diff --git a/src/main/java/neqsim/thermo/component/attractiveEosTerm/AttractiveTermRk.java b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermRk.java similarity index 97% rename from src/main/java/neqsim/thermo/component/attractiveEosTerm/AttractiveTermRk.java rename to src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermRk.java index 02f1b71cbf..953a4aa8fb 100644 --- a/src/main/java/neqsim/thermo/component/attractiveEosTerm/AttractiveTermRk.java +++ b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermRk.java @@ -1,4 +1,4 @@ -package neqsim.thermo.component.attractiveEosTerm; +package neqsim.thermo.component.attractiveeosterm; import neqsim.thermo.component.ComponentEosInterface; diff --git a/src/main/java/neqsim/thermo/component/attractiveEosTerm/AttractiveTermSchwartzentruber.java b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermSchwartzentruber.java similarity index 99% rename from src/main/java/neqsim/thermo/component/attractiveEosTerm/AttractiveTermSchwartzentruber.java rename to src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermSchwartzentruber.java index 38cad498c5..62a4d45ad2 100644 --- a/src/main/java/neqsim/thermo/component/attractiveEosTerm/AttractiveTermSchwartzentruber.java +++ b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermSchwartzentruber.java @@ -1,4 +1,4 @@ -package neqsim.thermo.component.attractiveEosTerm; +package neqsim.thermo.component.attractiveeosterm; import neqsim.thermo.component.ComponentEosInterface; diff --git a/src/main/java/neqsim/thermo/component/attractiveEosTerm/AttractiveTermSrk.java b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermSrk.java similarity index 94% rename from src/main/java/neqsim/thermo/component/attractiveEosTerm/AttractiveTermSrk.java rename to src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermSrk.java index 20d60fa963..fbd5c58818 100644 --- a/src/main/java/neqsim/thermo/component/attractiveEosTerm/AttractiveTermSrk.java +++ b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermSrk.java @@ -1,4 +1,4 @@ -package neqsim.thermo.component.attractiveEosTerm; +package neqsim.thermo.component.attractiveeosterm; import neqsim.thermo.component.ComponentEosInterface; @@ -49,8 +49,8 @@ public AttractiveTermSrk clone() { @Override public void setm(double val) { this.m = val; - neqsim.MathLib.nonLinearSolver.newtonRhapson solve = - new neqsim.MathLib.nonLinearSolver.newtonRhapson(); + neqsim.mathlib.nonlinearsolver.NewtonRhapson solve = + new neqsim.mathlib.nonlinearsolver.NewtonRhapson(); solve.setOrder(2); double[] acentricConstants = {-0.176, 1.574, (0.48 - this.m)}; solve.setConstants(acentricConstants); diff --git a/src/main/java/neqsim/thermo/component/attractiveEosTerm/AttractiveTermTwu.java b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermTwu.java similarity index 97% rename from src/main/java/neqsim/thermo/component/attractiveEosTerm/AttractiveTermTwu.java rename to src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermTwu.java index 632ae2d778..fd5c2d3df4 100644 --- a/src/main/java/neqsim/thermo/component/attractiveEosTerm/AttractiveTermTwu.java +++ b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermTwu.java @@ -1,4 +1,4 @@ -package neqsim.thermo.component.attractiveEosTerm; +package neqsim.thermo.component.attractiveeosterm; import neqsim.thermo.component.ComponentEosInterface; diff --git a/src/main/java/neqsim/thermo/component/attractiveEosTerm/AttractiveTermTwuCoon.java b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermTwuCoon.java similarity index 99% rename from src/main/java/neqsim/thermo/component/attractiveEosTerm/AttractiveTermTwuCoon.java rename to src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermTwuCoon.java index 28c738633d..33991b9ede 100644 --- a/src/main/java/neqsim/thermo/component/attractiveEosTerm/AttractiveTermTwuCoon.java +++ b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermTwuCoon.java @@ -1,4 +1,4 @@ -package neqsim.thermo.component.attractiveEosTerm; +package neqsim.thermo.component.attractiveeosterm; import neqsim.thermo.component.ComponentEosInterface; diff --git a/src/main/java/neqsim/thermo/component/attractiveEosTerm/AttractiveTermTwuCoonParam.java b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermTwuCoonParam.java similarity index 99% rename from src/main/java/neqsim/thermo/component/attractiveEosTerm/AttractiveTermTwuCoonParam.java rename to src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermTwuCoonParam.java index 264ebfbcd8..374b2c3b74 100644 --- a/src/main/java/neqsim/thermo/component/attractiveEosTerm/AttractiveTermTwuCoonParam.java +++ b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermTwuCoonParam.java @@ -1,4 +1,4 @@ -package neqsim.thermo.component.attractiveEosTerm; +package neqsim.thermo.component.attractiveeosterm; import neqsim.thermo.component.ComponentEosInterface; diff --git a/src/main/java/neqsim/thermo/component/attractiveEosTerm/AttractiveTermTwuCoonStatoil.java b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermTwuCoonStatoil.java similarity index 99% rename from src/main/java/neqsim/thermo/component/attractiveEosTerm/AttractiveTermTwuCoonStatoil.java rename to src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermTwuCoonStatoil.java index 59a0567663..9493b52342 100644 --- a/src/main/java/neqsim/thermo/component/attractiveEosTerm/AttractiveTermTwuCoonStatoil.java +++ b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermTwuCoonStatoil.java @@ -1,4 +1,4 @@ -package neqsim.thermo.component.attractiveEosTerm; +package neqsim.thermo.component.attractiveeosterm; import neqsim.thermo.component.ComponentEosInterface; diff --git a/src/main/java/neqsim/thermo/component/attractiveEosTerm/AttractiveTermUMRPRU.java b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermUMRPRU.java similarity index 96% rename from src/main/java/neqsim/thermo/component/attractiveEosTerm/AttractiveTermUMRPRU.java rename to src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermUMRPRU.java index 39c2588861..5059ecae62 100644 --- a/src/main/java/neqsim/thermo/component/attractiveEosTerm/AttractiveTermUMRPRU.java +++ b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermUMRPRU.java @@ -1,4 +1,4 @@ -package neqsim.thermo.component.attractiveEosTerm; +package neqsim.thermo.component.attractiveeosterm; import neqsim.thermo.component.ComponentEosInterface; diff --git a/src/main/java/neqsim/thermo/component/filesystem.attributes b/src/main/java/neqsim/thermo/component/filesystem.attributes deleted file mode 100644 index 8a51ff1f4cce4f1fc152e4bf212dc5eb09b90c9d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5517 zcmeHLO>7%Q6rR{|>NZiDAfV6^+Ek{HMBNQYsECL|e(c1l>sql>2_lq?cgOK2>z(cF zZ0kq}34{T*1~)rU}(p}{qL0V^&yOl1x`9qLMNuS$4ww|{DXekI(r7;~Gvbt~ zsaI`|2B&GorWUbyk~)fT!%-Xp+a`us44r7qO9n8gk}aOW%qe5jB>LIn8qv7<+l|AQ zzP$Q(1Vz%Qy9_xjp*StBO>KY|jv`A_RU08RXhX>7y^yoX>_Q<^p}J8rh(33&CH{Hz zE{bj2^?P<9&vA4hPhF;w{D!4D(*DOw?^j(Wa@hRm(EXlx;cfX~4ZtbyMz;WM$d zs)&TY%C3CyXYSwUBB*N$#V%meC4ljO|4`Pg6bbuq^YfwJ&+dL&^9F?-@e<6l^*NVO z>ztuuGbCFuI^-FpElyYoYb3;gqo?ZsV;Qhl>m*h+O4kkIsJ{KQ{3cO=hbJ<1U^#jsBN9{v`f80# z6IC0MQA9Ep;YETiM*)(!APNbMG7kp6TTlde{O*mL16|`44u_UTJ)j@}Qyy{-e2wf> z*bL@4OLdZ{MV-TzZjz;&_m!^qh7_plEfmvCkVXbYfyo>tn#ya?sG0)3dZ{Cb_ex{D zh9{NDqQe;o(YHt}5YU=NKBnLPaPP|S*AmdUu*u>IfZ7O89(sVa3fT3O9Pz6->OP_3 zQC=pjLILx-m;v?rr`hC#yn1HlbyXm!7NpVgMT3`@#TSx95&7B!jL6APaU|b*IXW5~ zL>`OC=3pBiW5GV4|1@VR{fX*&=Ti)-4Uq*r^rBxeY3?e`Uc(i1B>wX+o`O#8PC;EA z1wFnBQiF*ZFr@-zRBfD~g2dhg8}>PxT(peyF4i7)`1x}>zi>KS3I0Tx-HsA&aI7`0 z2Q}lb1b#u`O1gUQ&7+=@#yd*dGqdQWFeTMlU*}`6grK1h`K*);y_u4NhU0SB#LUH4 zuX{}UeRoXjY(0R diff --git a/src/main/java/neqsim/thermo/mixingRule/filesystem.attributes b/src/main/java/neqsim/thermo/mixingRule/filesystem.attributes deleted file mode 100644 index 55149f7a20cc6f02a0a1c74f01c3cddc990e6a10..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2841 zcmeHJJxmlq6n=Nd;i(kJj~F9~k`n`lU8R&*@N>xF@)NjNKn%>?&T$KKGwbdw944CB zslBn$sIifR%EU?wjM`aXVPdQ-EHyEb5K7-H3wLMu35k)0X0tmt?|tuk@B3zM@h3!G z2Xx^~X~L%5GO3oe7;8z6S{(AT%`j!%AyK)4rM02q&Q;hgFP2 zOr)o~<}r(e@OW3j27qHWg4T?VT(yZq@>Ei11G7HS**1g?NcJS!x&`N$(-Pdh0ky-Sn69Cd1JoF^x}H|>WUpOEIva`!*XR+%jos~$-7MvwRx@r;Uh?> zwUm(RjH;oCIO^H9aAbU#SWa}}{_3y(jxR{cfC@QpQwiq{jMsxv=@}trEb8jT_-=nC zp2E!?21I8G^DwH$PzCCY@F{)0VI2ho=dt? ziJtPAPRv;{H=!1`D_!B$NzjA*8IiYf^jxBRgSRV*!I6}KI<&GDHT$mlNGhzMPQW z6kb=yAu(4I78s_GaVI!9~44 T7xj*U+vcMF=l55^whMm%MB2^r diff --git a/src/main/java/neqsim/thermo/mixingRule/CPAMixing.java b/src/main/java/neqsim/thermo/mixingrule/CPAMixing.java similarity index 99% rename from src/main/java/neqsim/thermo/mixingRule/CPAMixing.java rename to src/main/java/neqsim/thermo/mixingrule/CPAMixing.java index a1e9cac4b6..8c1c7eead3 100644 --- a/src/main/java/neqsim/thermo/mixingRule/CPAMixing.java +++ b/src/main/java/neqsim/thermo/mixingrule/CPAMixing.java @@ -4,7 +4,7 @@ * Created on 4. juni 2000, 12:38 */ -package neqsim.thermo.mixingRule; +package neqsim.thermo.mixingrule; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -573,7 +573,7 @@ public double calcDelta(int siteNumber1, int siteNumber2, int compnumb1, int com *

* * @param i a int - * @return a {@link neqsim.thermo.mixingRule.CPAMixingInterface} object + * @return a {@link neqsim.thermo.mixingrule.CPAMixingInterface} object */ public CPAMixingInterface getMixingRule(int i) { if (i == 1) { @@ -594,7 +594,7 @@ public CPAMixingInterface getMixingRule(int i) { * * @param i a int * @param phase a {@link neqsim.thermo.phase.PhaseInterface} object - * @return a {@link neqsim.thermo.mixingRule.CPAMixingInterface} object + * @return a {@link neqsim.thermo.mixingrule.CPAMixingInterface} object */ public CPAMixingInterface getMixingRule(int i, PhaseInterface phase) { assosSchemeType = new int[phase.getNumberOfComponents()][phase.getNumberOfComponents()]; @@ -661,7 +661,7 @@ public CPAMixingInterface getMixingRule(int i, PhaseInterface phase) { * * @param i a int * @param phase a {@link neqsim.thermo.phase.PhaseInterface} object - * @return a {@link neqsim.thermo.mixingRule.CPAMixingInterface} object + * @return a {@link neqsim.thermo.mixingrule.CPAMixingInterface} object */ public CPAMixingInterface resetMixingRule(int i, PhaseInterface phase) { if (i == 1) { diff --git a/src/main/java/neqsim/thermo/mixingRule/CPAMixingInterface.java b/src/main/java/neqsim/thermo/mixingrule/CPAMixingInterface.java similarity index 99% rename from src/main/java/neqsim/thermo/mixingRule/CPAMixingInterface.java rename to src/main/java/neqsim/thermo/mixingrule/CPAMixingInterface.java index 2b751923f4..86e88f5df1 100644 --- a/src/main/java/neqsim/thermo/mixingRule/CPAMixingInterface.java +++ b/src/main/java/neqsim/thermo/mixingrule/CPAMixingInterface.java @@ -4,7 +4,7 @@ * Created on 26. februar 2001, 19:38 */ -package neqsim.thermo.mixingRule; +package neqsim.thermo.mixingrule; import neqsim.thermo.phase.PhaseInterface; diff --git a/src/main/java/neqsim/thermo/mixingRule/ElectrolyteMixingRulesInterface.java b/src/main/java/neqsim/thermo/mixingrule/ElectrolyteMixingRulesInterface.java similarity index 99% rename from src/main/java/neqsim/thermo/mixingRule/ElectrolyteMixingRulesInterface.java rename to src/main/java/neqsim/thermo/mixingrule/ElectrolyteMixingRulesInterface.java index bc7ed081f6..3c784feee1 100644 --- a/src/main/java/neqsim/thermo/mixingRule/ElectrolyteMixingRulesInterface.java +++ b/src/main/java/neqsim/thermo/mixingrule/ElectrolyteMixingRulesInterface.java @@ -4,7 +4,7 @@ * Created on 26. februar 2001, 19:38 */ -package neqsim.thermo.mixingRule; +package neqsim.thermo.mixingrule; import neqsim.thermo.phase.PhaseInterface; diff --git a/src/main/java/neqsim/thermo/mixingRule/EosMixingRules.java b/src/main/java/neqsim/thermo/mixingrule/EosMixingRules.java similarity index 99% rename from src/main/java/neqsim/thermo/mixingRule/EosMixingRules.java rename to src/main/java/neqsim/thermo/mixingrule/EosMixingRules.java index 8528afaa15..0a4309b64c 100644 --- a/src/main/java/neqsim/thermo/mixingRule/EosMixingRules.java +++ b/src/main/java/neqsim/thermo/mixingrule/EosMixingRules.java @@ -4,7 +4,7 @@ * Created on 4. juni 2000, 12:38 */ -package neqsim.thermo.mixingRule; +package neqsim.thermo.mixingrule; import java.awt.BorderLayout; import java.awt.Container; @@ -2083,7 +2083,7 @@ public double calcWij(int compNumbi, int compNumj, PhaseInterface phase, double *

* * @param i a int - * @return a {@link neqsim.thermo.mixingRule.EosMixingRulesInterface} object + * @return a {@link neqsim.thermo.mixingrule.EosMixingRulesInterface} object */ public EosMixingRulesInterface getMixingRule(int i) { if (i == 1) { @@ -2104,7 +2104,7 @@ public EosMixingRulesInterface getMixingRule(int i) { * * @param i a int * @param phase a {@link neqsim.thermo.phase.PhaseInterface} object - * @return a {@link neqsim.thermo.mixingRule.EosMixingRulesInterface} object + * @return a {@link neqsim.thermo.mixingrule.EosMixingRulesInterface} object */ public EosMixingRulesInterface getMixingRule(int i, PhaseInterface phase) { this.wij = new double[3][phase.getNumberOfComponents()][phase.getNumberOfComponents()]; @@ -2485,7 +2485,7 @@ public EosMixingRulesInterface getMixingRule(int i, PhaseInterface phase) { * * @param i a int * @param phase a {@link neqsim.thermo.phase.PhaseInterface} object - * @return a {@link neqsim.thermo.mixingRule.EosMixingRulesInterface} object + * @return a {@link neqsim.thermo.mixingrule.EosMixingRulesInterface} object */ public EosMixingRulesInterface resetMixingRule(int i, PhaseInterface phase) { if (i == 1) { @@ -2543,7 +2543,7 @@ public EosMixingRulesInterface resetMixingRule(int i, PhaseInterface phase) { *

* * @param phase a {@link neqsim.thermo.phase.PhaseInterface} object - * @return a {@link neqsim.thermo.mixingRule.ElectrolyteMixingRulesInterface} object + * @return a {@link neqsim.thermo.mixingrule.ElectrolyteMixingRulesInterface} object */ public ElectrolyteMixingRulesInterface getElectrolyteMixingRule(PhaseInterface phase) { return new ElectrolyteMixRule(phase); diff --git a/src/main/java/neqsim/thermo/mixingRule/EosMixingRulesInterface.java b/src/main/java/neqsim/thermo/mixingrule/EosMixingRulesInterface.java similarity index 99% rename from src/main/java/neqsim/thermo/mixingRule/EosMixingRulesInterface.java rename to src/main/java/neqsim/thermo/mixingrule/EosMixingRulesInterface.java index 6332ab9778..f5c78e25a5 100644 --- a/src/main/java/neqsim/thermo/mixingRule/EosMixingRulesInterface.java +++ b/src/main/java/neqsim/thermo/mixingrule/EosMixingRulesInterface.java @@ -4,7 +4,7 @@ * Created on 4. juni 2000, 12:38 */ -package neqsim.thermo.mixingRule; +package neqsim.thermo.mixingrule; import neqsim.thermo.phase.PhaseInterface; diff --git a/src/main/java/neqsim/thermo/mixingRule/HVmixingRuleInterface.java b/src/main/java/neqsim/thermo/mixingrule/HVmixingRuleInterface.java similarity index 98% rename from src/main/java/neqsim/thermo/mixingRule/HVmixingRuleInterface.java rename to src/main/java/neqsim/thermo/mixingrule/HVmixingRuleInterface.java index 9dd9f46791..fc305010c3 100644 --- a/src/main/java/neqsim/thermo/mixingRule/HVmixingRuleInterface.java +++ b/src/main/java/neqsim/thermo/mixingrule/HVmixingRuleInterface.java @@ -4,7 +4,7 @@ * Created on 5. mai 2001, 17:48 */ -package neqsim.thermo.mixingRule; +package neqsim.thermo.mixingrule; /** *

diff --git a/src/main/java/neqsim/thermo/phase/Phase.java b/src/main/java/neqsim/thermo/phase/Phase.java index 198033bf77..a464839000 100644 --- a/src/main/java/neqsim/thermo/phase/Phase.java +++ b/src/main/java/neqsim/thermo/phase/Phase.java @@ -9,7 +9,7 @@ import java.util.ArrayList; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.physicalProperties.PhysicalPropertyHandler; +import neqsim.physicalproperties.PhysicalPropertyHandler; import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.ThermodynamicModelSettings; import neqsim.thermo.component.ComponentInterface; @@ -38,7 +38,7 @@ public abstract class Phase implements PhaseInterface { public int physicalPropertyType = 0; protected boolean useVolumeCorrection = true; - public neqsim.physicalProperties.PhysicalPropertyHandler physicalPropertyHandler = null; + public neqsim.physicalproperties.PhysicalPropertyHandler physicalPropertyHandler = null; protected double molarVolume = 1.0; protected double phaseVolume = 1.0; @@ -424,7 +424,7 @@ public void setTemperature(double temp) { /** {@inheritDoc} */ @Override - public neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface getPhysicalProperties() { + public neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface getPhysicalProperties() { if (physicalPropertyHandler == null) { initPhysicalProperties(); return physicalPropertyHandler.getPhysicalProperty(this); @@ -2213,22 +2213,22 @@ public double getWtFractionOfWaxFormingComponents() { /** {@inheritDoc} */ @Override public double getDensity_GERG2008() { - neqsim.thermo.util.GERG.NeqSimGERG2008 test = new neqsim.thermo.util.GERG.NeqSimGERG2008(this); + neqsim.thermo.util.gerg.NeqSimGERG2008 test = new neqsim.thermo.util.gerg.NeqSimGERG2008(this); return test.getDensity(); } /** {@inheritDoc} */ @Override public double[] getProperties_GERG2008() { - neqsim.thermo.util.GERG.NeqSimGERG2008 test = new neqsim.thermo.util.GERG.NeqSimGERG2008(this); + neqsim.thermo.util.gerg.NeqSimGERG2008 test = new neqsim.thermo.util.gerg.NeqSimGERG2008(this); return test.propertiesGERG(); } /** {@inheritDoc} */ @Override public double getDensity_AGA8() { - neqsim.thermo.util.GERG.NeqSimAGA8Detail test = - new neqsim.thermo.util.GERG.NeqSimAGA8Detail(this); + neqsim.thermo.util.gerg.NeqSimAGA8Detail test = + new neqsim.thermo.util.gerg.NeqSimAGA8Detail(this); return test.getDensity(); } diff --git a/src/main/java/neqsim/thermo/phase/PhaseCPAInterface.java b/src/main/java/neqsim/thermo/phase/PhaseCPAInterface.java index 8db43c571e..03222f7b8c 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseCPAInterface.java +++ b/src/main/java/neqsim/thermo/phase/PhaseCPAInterface.java @@ -1,6 +1,6 @@ package neqsim.thermo.phase; -import neqsim.thermo.mixingRule.CPAMixingInterface; +import neqsim.thermo.mixingrule.CPAMixingInterface; /** *

@@ -74,7 +74,7 @@ public interface PhaseCPAInterface extends PhaseEosInterface { * getCpamix. *

* - * @return a {@link neqsim.thermo.mixingRule.CPAMixingInterface} object + * @return a {@link neqsim.thermo.mixingrule.CPAMixingInterface} object */ public CPAMixingInterface getCpamix(); } diff --git a/src/main/java/neqsim/thermo/phase/PhaseElectrolyteCPA.java b/src/main/java/neqsim/thermo/phase/PhaseElectrolyteCPA.java index 6bbea6d60b..2d3d64da5e 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseElectrolyteCPA.java +++ b/src/main/java/neqsim/thermo/phase/PhaseElectrolyteCPA.java @@ -8,8 +8,8 @@ import org.ejml.simple.SimpleMatrix; import neqsim.thermo.component.ComponentCPAInterface; import neqsim.thermo.component.ComponentElectrolyteCPA; -import neqsim.thermo.mixingRule.CPAMixing; -import neqsim.thermo.mixingRule.CPAMixingInterface; +import neqsim.thermo.mixingrule.CPAMixing; +import neqsim.thermo.mixingrule.CPAMixingInterface; /** *

diff --git a/src/main/java/neqsim/thermo/phase/PhaseElectrolyteCPAOld.java b/src/main/java/neqsim/thermo/phase/PhaseElectrolyteCPAOld.java index ac113412b9..dc0670e68d 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseElectrolyteCPAOld.java +++ b/src/main/java/neqsim/thermo/phase/PhaseElectrolyteCPAOld.java @@ -5,8 +5,8 @@ import neqsim.thermo.component.ComponentCPAInterface; import neqsim.thermo.component.ComponentElectrolyteCPA; import neqsim.thermo.component.ComponentEosInterface; -import neqsim.thermo.mixingRule.CPAMixing; -import neqsim.thermo.mixingRule.CPAMixingInterface; +import neqsim.thermo.mixingrule.CPAMixing; +import neqsim.thermo.mixingrule.CPAMixingInterface; /** *

diff --git a/src/main/java/neqsim/thermo/phase/PhaseEos.java b/src/main/java/neqsim/thermo/phase/PhaseEos.java index 043eac316b..7859d62891 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseEos.java +++ b/src/main/java/neqsim/thermo/phase/PhaseEos.java @@ -10,8 +10,8 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.ThermodynamicModelSettings; import neqsim.thermo.component.ComponentEosInterface; -import neqsim.thermo.mixingRule.EosMixingRules; -import neqsim.thermo.mixingRule.EosMixingRulesInterface; +import neqsim.thermo.mixingrule.EosMixingRules; +import neqsim.thermo.mixingrule.EosMixingRulesInterface; /** * Abstract class PhaseEos. diff --git a/src/main/java/neqsim/thermo/phase/PhaseEosInterface.java b/src/main/java/neqsim/thermo/phase/PhaseEosInterface.java index 0fbab32499..b6ac17bf38 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseEosInterface.java +++ b/src/main/java/neqsim/thermo/phase/PhaseEosInterface.java @@ -6,7 +6,7 @@ package neqsim.thermo.phase; -import neqsim.thermo.mixingRule.EosMixingRulesInterface; +import neqsim.thermo.mixingrule.EosMixingRulesInterface; /** *

@@ -26,7 +26,7 @@ public interface PhaseEosInterface extends PhaseInterface { * getMixingRule. *

* - * @return a {@link neqsim.thermo.mixingRule.EosMixingRulesInterface} object + * @return a {@link neqsim.thermo.mixingrule.EosMixingRulesInterface} object */ public EosMixingRulesInterface getMixingRule(); diff --git a/src/main/java/neqsim/thermo/phase/PhaseGE.java b/src/main/java/neqsim/thermo/phase/PhaseGE.java index bbcd0701c1..88a25737ba 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseGE.java +++ b/src/main/java/neqsim/thermo/phase/PhaseGE.java @@ -11,8 +11,8 @@ import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.ThermodynamicModelSettings; import neqsim.thermo.component.ComponentGEInterface; -import neqsim.thermo.mixingRule.EosMixingRules; -import neqsim.thermo.mixingRule.EosMixingRulesInterface; +import neqsim.thermo.mixingrule.EosMixingRules; +import neqsim.thermo.mixingrule.EosMixingRulesInterface; /** *

diff --git a/src/main/java/neqsim/thermo/phase/PhaseGERG2004Eos.java b/src/main/java/neqsim/thermo/phase/PhaseGERG2004Eos.java index a56aad720f..9ed823faf3 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseGERG2004Eos.java +++ b/src/main/java/neqsim/thermo/phase/PhaseGERG2004Eos.java @@ -2,7 +2,7 @@ import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.component.ComponentGERG2004; -import neqsim.thermo.util.JNI.GERG2004EOS; +import neqsim.thermo.util.jni.GERG2004EOS; /** *

diff --git a/src/main/java/neqsim/thermo/phase/PhaseGEUnifac.java b/src/main/java/neqsim/thermo/phase/PhaseGEUnifac.java index 4a421729b0..6c02ced3be 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseGEUnifac.java +++ b/src/main/java/neqsim/thermo/phase/PhaseGEUnifac.java @@ -5,7 +5,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import neqsim.thermo.ThermodynamicModelSettings; -import neqsim.thermo.atomElement.UNIFACgroup; +import neqsim.thermo.atomelement.UNIFACgroup; import neqsim.thermo.component.ComponentGEUnifac; import neqsim.thermo.component.ComponentGEUniquac; @@ -137,7 +137,7 @@ public void calcaij() { *

*/ public void checkGroups() { - ArrayList unifacGroups = new ArrayList(); + ArrayList unifacGroups = new ArrayList(); for (int i = 0; i < numberOfComponents; i++) { for (int j = 0; j < ((ComponentGEUnifac) getComponent(i)).getNumberOfUNIFACgroups(); j++) { @@ -159,7 +159,7 @@ public void checkGroups() { } for (int i = 0; i < numberOfComponents; i++) { - neqsim.thermo.atomElement.UNIFACgroup[] array = + neqsim.thermo.atomelement.UNIFACgroup[] array = ((ComponentGEUnifac) getComponent(i)).getUnifacGroups(); java.util.Arrays.sort(array); ArrayList phaseList = new ArrayList(0); diff --git a/src/main/java/neqsim/thermo/phase/PhaseInterface.java b/src/main/java/neqsim/thermo/phase/PhaseInterface.java index c2861712b0..b045020529 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseInterface.java +++ b/src/main/java/neqsim/thermo/phase/PhaseInterface.java @@ -831,10 +831,10 @@ public default void addMolesChemReac(int component, double dn) { * getPhysicalProperties. *

* - * @return a {@link neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface} + * @return a {@link neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface} * object */ - public neqsim.physicalProperties.physicalPropertySystem.PhysicalPropertiesInterface getPhysicalProperties(); + public neqsim.physicalproperties.physicalpropertysystem.PhysicalPropertiesInterface getPhysicalProperties(); /** *

diff --git a/src/main/java/neqsim/thermo/phase/PhaseModifiedFurstElectrolyteEos.java b/src/main/java/neqsim/thermo/phase/PhaseModifiedFurstElectrolyteEos.java index 84c8d26932..e95ac031a0 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseModifiedFurstElectrolyteEos.java +++ b/src/main/java/neqsim/thermo/phase/PhaseModifiedFurstElectrolyteEos.java @@ -50,7 +50,7 @@ public class PhaseModifiedFurstElectrolyteEos extends PhaseSrkEos { double diElectricConstantdT = 0; double diElectricConstantdTdT = 0.0; double diElectricConstantdTdV = 0; - neqsim.thermo.mixingRule.ElectrolyteMixingRulesInterface electrolyteMixingRule; + neqsim.thermo.mixingrule.ElectrolyteMixingRulesInterface electrolyteMixingRule; double sr2On = 1.0; double lrOn = 1.0; double bornOn = 1.0; @@ -71,9 +71,9 @@ public PhaseModifiedFurstElectrolyteEos() { * Getter for the field electrolyteMixingRule. *

* - * @return a {@link neqsim.thermo.mixingRule.ElectrolyteMixingRulesInterface} object + * @return a {@link neqsim.thermo.mixingrule.ElectrolyteMixingRulesInterface} object */ - public neqsim.thermo.mixingRule.ElectrolyteMixingRulesInterface getElectrolyteMixingRule() { + public neqsim.thermo.mixingrule.ElectrolyteMixingRulesInterface getElectrolyteMixingRule() { return electrolyteMixingRule; } diff --git a/src/main/java/neqsim/thermo/phase/PhaseModifiedFurstElectrolyteEosMod2004.java b/src/main/java/neqsim/thermo/phase/PhaseModifiedFurstElectrolyteEosMod2004.java index 7a732a51a4..96a0af449e 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseModifiedFurstElectrolyteEosMod2004.java +++ b/src/main/java/neqsim/thermo/phase/PhaseModifiedFurstElectrolyteEosMod2004.java @@ -50,7 +50,7 @@ public class PhaseModifiedFurstElectrolyteEosMod2004 extends PhaseSrkEos { double diElectricConstantdT = 0; double diElectricConstantdTdT = 0.0; double diElectricConstantdTdV = 0; - neqsim.thermo.mixingRule.ElectrolyteMixingRulesInterface electrolyteMixingRule; + neqsim.thermo.mixingrule.ElectrolyteMixingRulesInterface electrolyteMixingRule; double sr2On = 1.0; double lrOn = 1.0; double bornOn = 1.0; @@ -71,9 +71,9 @@ public PhaseModifiedFurstElectrolyteEosMod2004() { * Getter for the field electrolyteMixingRule. *

* - * @return a {@link neqsim.thermo.mixingRule.ElectrolyteMixingRulesInterface} object + * @return a {@link neqsim.thermo.mixingrule.ElectrolyteMixingRulesInterface} object */ - public neqsim.thermo.mixingRule.ElectrolyteMixingRulesInterface getElectrolyteMixingRule() { + public neqsim.thermo.mixingrule.ElectrolyteMixingRulesInterface getElectrolyteMixingRule() { return electrolyteMixingRule; } diff --git a/src/main/java/neqsim/thermo/phase/PhasePCSAFTa.java b/src/main/java/neqsim/thermo/phase/PhasePCSAFTa.java index c148a7a20e..0639b3aef9 100644 --- a/src/main/java/neqsim/thermo/phase/PhasePCSAFTa.java +++ b/src/main/java/neqsim/thermo/phase/PhasePCSAFTa.java @@ -4,8 +4,8 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.component.ComponentCPAInterface; import neqsim.thermo.component.ComponentPCSAFTa; -import neqsim.thermo.mixingRule.CPAMixing; -import neqsim.thermo.mixingRule.CPAMixingInterface; +import neqsim.thermo.mixingrule.CPAMixing; +import neqsim.thermo.mixingrule.CPAMixingInterface; /** *

diff --git a/src/main/java/neqsim/thermo/phase/PhasePrCPA.java b/src/main/java/neqsim/thermo/phase/PhasePrCPA.java index b68e572362..4332949990 100644 --- a/src/main/java/neqsim/thermo/phase/PhasePrCPA.java +++ b/src/main/java/neqsim/thermo/phase/PhasePrCPA.java @@ -2,8 +2,8 @@ import neqsim.thermo.component.ComponentCPAInterface; import neqsim.thermo.component.ComponentSrkCPA; -import neqsim.thermo.mixingRule.CPAMixing; -import neqsim.thermo.mixingRule.CPAMixingInterface; +import neqsim.thermo.mixingrule.CPAMixing; +import neqsim.thermo.mixingrule.CPAMixingInterface; /** *

diff --git a/src/main/java/neqsim/thermo/phase/PhaseSrkCPA.java b/src/main/java/neqsim/thermo/phase/PhaseSrkCPA.java index 01d23a7041..193ae519fe 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseSrkCPA.java +++ b/src/main/java/neqsim/thermo/phase/PhaseSrkCPA.java @@ -8,8 +8,8 @@ import org.ejml.simple.SimpleMatrix; import neqsim.thermo.component.ComponentCPAInterface; import neqsim.thermo.component.ComponentSrkCPA; -import neqsim.thermo.mixingRule.CPAMixing; -import neqsim.thermo.mixingRule.CPAMixingInterface; +import neqsim.thermo.mixingrule.CPAMixing; +import neqsim.thermo.mixingrule.CPAMixingInterface; /** *

diff --git a/src/main/java/neqsim/thermo/phase/PhaseSrkCPA_proceduralMatrices.java b/src/main/java/neqsim/thermo/phase/PhaseSrkCPA_proceduralMatrices.java index 38cff3648a..7dba0ae82e 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseSrkCPA_proceduralMatrices.java +++ b/src/main/java/neqsim/thermo/phase/PhaseSrkCPA_proceduralMatrices.java @@ -7,8 +7,8 @@ import org.ejml.dense.row.NormOps_DDRM; import neqsim.thermo.component.ComponentCPAInterface; import neqsim.thermo.component.ComponentSrkCPA; -import neqsim.thermo.mixingRule.CPAMixing; -import neqsim.thermo.mixingRule.CPAMixingInterface; +import neqsim.thermo.mixingrule.CPAMixing; +import neqsim.thermo.mixingrule.CPAMixingInterface; /** *

diff --git a/src/main/java/neqsim/thermo/phase/PhaseUMRCPA.java b/src/main/java/neqsim/thermo/phase/PhaseUMRCPA.java index d843cfc7d8..24cbaa70c3 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseUMRCPA.java +++ b/src/main/java/neqsim/thermo/phase/PhaseUMRCPA.java @@ -9,8 +9,8 @@ // import org.ejml.data.DenseMatrix64F; import neqsim.thermo.component.ComponentCPAInterface; import neqsim.thermo.component.ComponentUMRCPA; -import neqsim.thermo.mixingRule.CPAMixing; -import neqsim.thermo.mixingRule.CPAMixingInterface; +import neqsim.thermo.mixingrule.CPAMixing; +import neqsim.thermo.mixingrule.CPAMixingInterface; /** *

diff --git a/src/main/java/neqsim/thermo/phase/filesystem.attributes b/src/main/java/neqsim/thermo/phase/filesystem.attributes deleted file mode 100644 index 02821bb15371ac7fa4708172e5c86f3a8afff6aa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3888 zcmeHKOKclO7#`bkFlhi6`XXv12nN)m?jj^EL>!XFNgTGWRhvpQLdopzIJ?PuW;;9E z+DIUQ5aMwKaX|u9MWRx~0n`&5%HznP9FR~?J-`hR0uhxP|BN?Y*N(S|RH;JB#gE

`Td!=^_bxqN)~ zaxSwuicpiI{j2x_)a!`TqVMxl+6Ws->OfJ*P<|)hr2YVi|Pn)a6 z65dZgj9vQh>R)M;E}Z?bj{F)?5{Iz`Q>4r$7 zR0$0O_W)V7Nfn57Y`cZcV1dibCWUs^c}#7OEMB{*rCuM`U|r`>*76u724HEf3RJjd zd0p(*XMyRR(h=l)raNDkr8Z>-f&+zPk3xw85UzdoEB%w-3iyBmG*=HjuZ$Z#@KixP zbOo>*qVP`c|0u|2Vo*U z$|3c&PoT&9bIcV%p1qVm5=o)&)u8yhL-z~;>09I-_UYHZTzT~42wm7OiLOG>0Ja33 zf3llAyj|&$LXXTmr%U?jH3i|)MOQdW@_}@`Ppt)3k|1X=%XcB3Z26F~?1e0;AFR_~ zolveTk5Kyay%zAlXaR{Ny|qJjT0k#pC$=MPFLMU6caYd5lR(Ue`-3au%GVFv#`m#) z-#)FYIL+=+EuVD8<-i`Xy+`uIT)V#VWk(_U?i7;R8X$;;}Kf-H%4PNmkd0vP!TKXr#(QZjow>T57r3Z!f*k z+)@d8AyUcx^8TU8`-dj)cOR9P-~6NU&r!HYOh=a#IArHzqjK0V34d$jgYkXu-*~Tm U-GaW*KC8_YBef?K=KIb608)Pzq5uE@ diff --git a/src/main/java/neqsim/thermo/system/SystemInterface.java b/src/main/java/neqsim/thermo/system/SystemInterface.java index 5f34696c82..8539d9213e 100644 --- a/src/main/java/neqsim/thermo/system/SystemInterface.java +++ b/src/main/java/neqsim/thermo/system/SystemInterface.java @@ -1,7 +1,7 @@ package neqsim.thermo.system; -import neqsim.chemicalReactions.ChemicalReactionOperations; -import neqsim.physicalProperties.interfaceProperties.InterphasePropertiesInterface; +import neqsim.chemicalreactions.ChemicalReactionOperations; +import neqsim.physicalproperties.interfaceproperties.InterphasePropertiesInterface; import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.characterization.WaxModelInterface; import neqsim.thermo.component.ComponentInterface; @@ -609,7 +609,7 @@ public default void display() { * getChemicalReactionOperations. *

* - * @return a {@link neqsim.chemicalReactions.ChemicalReactionOperations} object + * @return a {@link neqsim.chemicalreactions.ChemicalReactionOperations} object */ public ChemicalReactionOperations getChemicalReactionOperations(); @@ -970,7 +970,7 @@ public default double getGamma2() { * getInterphaseProperties. *

* - * @return a {@link neqsim.physicalProperties.interfaceProperties.InterphasePropertiesInterface} + * @return a {@link neqsim.physicalproperties.interfaceproperties.InterphasePropertiesInterface} * object */ public InterphasePropertiesInterface getInterphaseProperties(); diff --git a/src/main/java/neqsim/thermo/system/SystemThermo.java b/src/main/java/neqsim/thermo/system/SystemThermo.java index ae7abe473e..53b2bf5a91 100644 --- a/src/main/java/neqsim/thermo/system/SystemThermo.java +++ b/src/main/java/neqsim/thermo/system/SystemThermo.java @@ -10,9 +10,9 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import com.google.gson.GsonBuilder; -import neqsim.chemicalReactions.ChemicalReactionOperations; -import neqsim.physicalProperties.interfaceProperties.InterfaceProperties; -import neqsim.physicalProperties.interfaceProperties.InterphasePropertiesInterface; +import neqsim.chemicalreactions.ChemicalReactionOperations; +import neqsim.physicalproperties.interfaceproperties.InterfaceProperties; +import neqsim.physicalproperties.interfaceproperties.InterphasePropertiesInterface; import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.ThermodynamicModelSettings; import neqsim.thermo.characterization.Characterise; @@ -1270,7 +1270,7 @@ public void calcInterfaceProperties() { /** {@inheritDoc} */ @Override public void calcKIJ(boolean ok) { - neqsim.thermo.mixingRule.EosMixingRules.calcEOSInteractionParameters = ok; + neqsim.thermo.mixingrule.EosMixingRules.calcEOSInteractionParameters = ok; for (int i = 0; i < numberOfPhases; i++) { ((PhaseEosInterface) getPhase(i)).getMixingRule().setCalcEOSInteractionParameters(ok); } @@ -4860,11 +4860,11 @@ public void setSolidPhaseCheck(String solidComponent) { @Override public void setStandard(String standardName) { if (standardName.equals("ISO1992")) { - this.standard = new neqsim.standards.gasQuality.Standard_ISO6976(this); + this.standard = new neqsim.standards.gasquality.Standard_ISO6976(this); } else if (standardName.equals("Draft_ISO18453")) { - this.standard = new neqsim.standards.gasQuality.Draft_ISO18453(this); + this.standard = new neqsim.standards.gasquality.Draft_ISO18453(this); } else { - this.standard = new neqsim.standards.gasQuality.Standard_ISO6976(this); + this.standard = new neqsim.standards.gasquality.Standard_ISO6976(this); } } @@ -5028,8 +5028,8 @@ public String write() { @Override public void write(String name, String filename, boolean newfile) { String[][] table = createTable(name); - neqsim.dataPresentation.fileHandeling.createTextFile.TextFile file = - new neqsim.dataPresentation.fileHandeling.createTextFile.TextFile(); + neqsim.datapresentation.filehandeling.createtextfile.TextFile file = + new neqsim.datapresentation.filehandeling.createtextfile.TextFile(); if (newfile) { file.newFile(filename); } @@ -5062,13 +5062,13 @@ public double[] getzvector() { @Override public String toJson() { return new GsonBuilder().create() - .toJson(new neqsim.processSimulation.util.monitor.FluidResponse(this)); + .toJson(new neqsim.processsimulation.util.monitor.FluidResponse(this)); } /** {@inheritDoc} */ @Override public String toCompJson() { return new GsonBuilder().create() - .toJson(new neqsim.processSimulation.util.monitor.FluidComponentResponse(this)); + .toJson(new neqsim.processsimulation.util.monitor.FluidComponentResponse(this)); } } diff --git a/src/main/java/neqsim/thermo/util/benchmark/TPflash_benchmark.java b/src/main/java/neqsim/thermo/util/benchmark/TPflash_benchmark.java index f269fdd783..a5fa145bd1 100644 --- a/src/main/java/neqsim/thermo/util/benchmark/TPflash_benchmark.java +++ b/src/main/java/neqsim/thermo/util/benchmark/TPflash_benchmark.java @@ -4,7 +4,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/main/java/neqsim/thermo/util/benchmark/TPflash_benchmark_UMR.java b/src/main/java/neqsim/thermo/util/benchmark/TPflash_benchmark_UMR.java index a02ff75df2..5cb519e383 100644 --- a/src/main/java/neqsim/thermo/util/benchmark/TPflash_benchmark_UMR.java +++ b/src/main/java/neqsim/thermo/util/benchmark/TPflash_benchmark_UMR.java @@ -4,7 +4,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemUMRPRUMCEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/main/java/neqsim/thermo/util/benchmark/TPflash_benchmark_fullcomp.java b/src/main/java/neqsim/thermo/util/benchmark/TPflash_benchmark_fullcomp.java index a9f32f244a..888fc98c42 100644 --- a/src/main/java/neqsim/thermo/util/benchmark/TPflash_benchmark_fullcomp.java +++ b/src/main/java/neqsim/thermo/util/benchmark/TPflash_benchmark_fullcomp.java @@ -4,7 +4,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkCPAstatoil; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/main/java/neqsim/thermo/util/empiric/DuanSun.java b/src/main/java/neqsim/thermo/util/empiric/DuanSun.java index 9484f333ed..fa0d24847c 100644 --- a/src/main/java/neqsim/thermo/util/empiric/DuanSun.java +++ b/src/main/java/neqsim/thermo/util/empiric/DuanSun.java @@ -5,7 +5,7 @@ import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.system.SystemElectrolyteCPAstatoil; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/main/java/neqsim/thermo/util/GERG/DETAIL.java b/src/main/java/neqsim/thermo/util/gerg/DETAIL.java similarity index 99% rename from src/main/java/neqsim/thermo/util/GERG/DETAIL.java rename to src/main/java/neqsim/thermo/util/gerg/DETAIL.java index 9478f8cadb..2d2b5dfd7d 100644 --- a/src/main/java/neqsim/thermo/util/GERG/DETAIL.java +++ b/src/main/java/neqsim/thermo/util/gerg/DETAIL.java @@ -1,4 +1,4 @@ -package neqsim.thermo.util.GERG; +package neqsim.thermo.util.gerg; import org.netlib.util.StringW; import org.netlib.util.doubleW; diff --git a/src/main/java/neqsim/thermo/util/GERG/GERG2008.java b/src/main/java/neqsim/thermo/util/gerg/GERG2008.java similarity index 99% rename from src/main/java/neqsim/thermo/util/GERG/GERG2008.java rename to src/main/java/neqsim/thermo/util/gerg/GERG2008.java index 9263c712d7..640d618696 100644 --- a/src/main/java/neqsim/thermo/util/GERG/GERG2008.java +++ b/src/main/java/neqsim/thermo/util/gerg/GERG2008.java @@ -1,4 +1,4 @@ -package neqsim.thermo.util.GERG; +package neqsim.thermo.util.gerg; import org.netlib.util.StringW; import org.netlib.util.doubleW; diff --git a/src/main/java/neqsim/thermo/util/GERG/NeqSimAGA8Detail.java b/src/main/java/neqsim/thermo/util/gerg/NeqSimAGA8Detail.java similarity index 99% rename from src/main/java/neqsim/thermo/util/GERG/NeqSimAGA8Detail.java rename to src/main/java/neqsim/thermo/util/gerg/NeqSimAGA8Detail.java index d880a5f9df..4728b99ec7 100644 --- a/src/main/java/neqsim/thermo/util/GERG/NeqSimAGA8Detail.java +++ b/src/main/java/neqsim/thermo/util/gerg/NeqSimAGA8Detail.java @@ -1,4 +1,4 @@ -package neqsim.thermo.util.GERG; +package neqsim.thermo.util.gerg; import org.netlib.util.StringW; import org.netlib.util.doubleW; @@ -6,7 +6,7 @@ import neqsim.thermo.phase.PhaseInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/main/java/neqsim/thermo/util/GERG/NeqSimGERG2008.java b/src/main/java/neqsim/thermo/util/gerg/NeqSimGERG2008.java similarity index 99% rename from src/main/java/neqsim/thermo/util/GERG/NeqSimGERG2008.java rename to src/main/java/neqsim/thermo/util/gerg/NeqSimGERG2008.java index 5066df0bed..7be99ce1ad 100644 --- a/src/main/java/neqsim/thermo/util/GERG/NeqSimGERG2008.java +++ b/src/main/java/neqsim/thermo/util/gerg/NeqSimGERG2008.java @@ -1,4 +1,4 @@ -package neqsim.thermo.util.GERG; +package neqsim.thermo.util.gerg; import org.netlib.util.StringW; import org.netlib.util.doubleW; @@ -6,7 +6,7 @@ import neqsim.thermo.phase.PhaseInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/main/java/neqsim/thermo/util/JNI/GERG2004EOS.h b/src/main/java/neqsim/thermo/util/jni/GERG2004EOS.h similarity index 100% rename from src/main/java/neqsim/thermo/util/JNI/GERG2004EOS.h rename to src/main/java/neqsim/thermo/util/jni/GERG2004EOS.h diff --git a/src/main/java/neqsim/thermo/util/JNI/GERG2004EOS.java b/src/main/java/neqsim/thermo/util/jni/GERG2004EOS.java similarity index 99% rename from src/main/java/neqsim/thermo/util/JNI/GERG2004EOS.java rename to src/main/java/neqsim/thermo/util/jni/GERG2004EOS.java index d058b7cf09..4d3e2a4d7e 100644 --- a/src/main/java/neqsim/thermo/util/JNI/GERG2004EOS.java +++ b/src/main/java/neqsim/thermo/util/jni/GERG2004EOS.java @@ -4,7 +4,7 @@ * Created on 19. september 2006, 12:18 */ -package neqsim.thermo.util.JNI; +package neqsim.thermo.util.jni; /** *

diff --git a/src/main/java/neqsim/thermo/util/JNI/neqsim_thermo_util_JNI_GERG2004EOS.h b/src/main/java/neqsim/thermo/util/jni/neqsim_thermo_util_JNI_GERG2004EOS.h similarity index 100% rename from src/main/java/neqsim/thermo/util/JNI/neqsim_thermo_util_JNI_GERG2004EOS.h rename to src/main/java/neqsim/thermo/util/jni/neqsim_thermo_util_JNI_GERG2004EOS.h diff --git a/src/main/java/neqsim/thermo/util/referenceEquations/methaneBWR32.java b/src/main/java/neqsim/thermo/util/referenceequations/methaneBWR32.java similarity index 98% rename from src/main/java/neqsim/thermo/util/referenceEquations/methaneBWR32.java rename to src/main/java/neqsim/thermo/util/referenceequations/methaneBWR32.java index 5befdc5a75..ec45a4124d 100644 --- a/src/main/java/neqsim/thermo/util/referenceEquations/methaneBWR32.java +++ b/src/main/java/neqsim/thermo/util/referenceequations/methaneBWR32.java @@ -1,4 +1,4 @@ -package neqsim.thermo.util.referenceEquations; +package neqsim.thermo.util.referenceequations; /** *

diff --git a/src/main/java/neqsim/thermodynamicOperations/filesystem.attributes b/src/main/java/neqsim/thermodynamicOperations/filesystem.attributes deleted file mode 100644 index 643b28d546c7ded9364f3ebed9f53ed39eb3f8ea..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1663 zcmcIkO-~a+7=9@fDsn)BVoZoi8WT`vW9`ImdJQxoiH5yF_N8j0!Zut_8@zU2B3UL@pgm@d z5LFx_GT!px)$5b6YU9};hOpd;!w*J z({N&VpbrmuCN!F4{JzBIFOF^FZL zsfe&zTeWI)AUb(FCtF0YD4l>aE9R7*k(a5%TFkO5y9|B=P+C+=I>Uqy6s@TNavhMN$nH zvY2mgkHB_>Sn{Z{qx_+8Cz-?G{w&0o2@5dmc-8>48Q}|dm3MzxA{fhn;Z)}-;mRrr zH^7mG%37nC5S7JwV#Q}yH`*I6m2?amGSH0k$5|L1U=nNf>_;p`G#M8zO;)>(5biQM zyRl_8-0iZE*9^oRCOFMPBZ{sexr1Jv!|XJ=tp**i-{ty#b&=LUUTGg~6lEkc9EI@Q z^%wTzFGJ#{yS;LI=GJED4Gq_H zk@_WJSN|rYvI`8|Wj++qLDkJ><)B?P;W`!QO4@|%w)mMtB9s9c3xAu#S(tSK!i}RE zCiei5XmdKumnlOZ83-l3x}GCS5+}iR{fW%&2;RPQ9s6w`0wcKxMoo{9^>*pjXmLov zu6>k^k~RE!rA$<52iyNH&EJ`Lib{qL-+l4q<>%+;9&MW#uZ1yjXw)oTN>y8#hx2-s ynp;6Ldrs{YRrWsWJFg+8BK@pN&{Z2WF)7x4i*2+=-vFr@6Vl;vOZSU(H^ diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/filesystem.attributes b/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/filesystem.attributes deleted file mode 100644 index 80e1f386ad26eb7bd905243d0b4ae8e3c88b114c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1330 zcmcIk&1(}u6o2`uu@Crcv(8SWB9=s$wv-95X{XTZqzClV!u!UT( zL_oRkQLE%Ls%lEpin6k_L_($qwU&M{)Kp~(q{!%*)xO+nIg>P;3G@i2S$=H%0d z>p$ZV&qK0|2(yqD#l@i-lF<;K9jXSO?|%OhO7pz7d3?JqUHBMBUI9Sz@LFA;t|mjr z=S$Rce5E^jr>~FA-|I=3!z)R^^Eg*u>s*F8mC9;PJ{<;ukUBF(e3_biu=QhX;62Xf zKvLHNs^PqY^>)Jw+ZAHTr^;^D4@Wzh0v;Z4Ahk?bh*d`&GoZ}~U$E=E2dV)MW0_$% z)kR9UvMRz0(b`B^YYYpTZP8ck`0UC?XY4{n$03%7Hp~HfVRV2g?A5y$u`JPKLU=S& zM;#^HV{~?7+lt*eWg)K_NV!aK>OcZT*O2**UQ5#K9Hwq(bU?g|t#~abt-+$w664gY z$mBT+;d|>Z?8jd-q$?6MT?!eSAeCM6Ok;;L$q;7!`1y8DxyP4Oz=&6 zclS5bfa>1+#UEfV?Lpwb;QgDU*J!}-7Pv2-y!`b1?4yRGm=WV> @@ -77,6 +77,11 @@ public class ThermodynamicOperations implements java.io.Serializable, Cloneable private Thread thermoOperationThread = new Thread(); private OperationInterface operation = null; + + public SystemInterface getSystem() { + return system; + } + SystemInterface system = null; boolean writeFile = false; String fileName = null; @@ -151,7 +156,7 @@ public void TPflash() { system.init(1); } operation = - new neqsim.thermodynamicOperations.flashOps.TPflash(system, system.doSolidPhaseCheck()); + new neqsim.thermodynamicoperations.flashops.TPflash(system, system.doSolidPhaseCheck()); if (!isRunAsThread()) { getOperation().run(); } else { @@ -175,7 +180,7 @@ public void TPflash() { * @param checkForSolids Set true to do solid phase check and calculations */ public void TPflash(boolean checkForSolids) { - operation = new neqsim.thermodynamicOperations.flashOps.TPflash(system, checkForSolids); + operation = new neqsim.thermodynamicoperations.flashops.TPflash(system, checkForSolids); getOperation().run(); } @@ -224,7 +229,7 @@ public void saturateWithWater() { public void chemicalEquilibrium() { if (system.isChemicalSystem()) { operation = - new neqsim.thermodynamicOperations.chemicalEquilibrium.ChemicalEquilibrium(system); + new neqsim.thermodynamicoperations.chemicalequilibrium.ChemicalEquilibrium(system); getOperation().run(); } } @@ -288,7 +293,7 @@ public void PHflash(double Hspec) { * @param Hspec is the enthalpy in unit Joule to be held constant */ public void PHflashGERG2008(double Hspec) { - operation = new neqsim.thermodynamicOperations.flashOps.PHflashGERG2008(system, Hspec); + operation = new neqsim.thermodynamicoperations.flashops.PHflashGERG2008(system, Hspec); getOperation().run(); } @@ -300,7 +305,7 @@ public void PHflashGERG2008(double Hspec) { * @param Uspec a double */ public void PUflash(double Uspec) { - operation = new neqsim.thermodynamicOperations.flashOps.PUflash(system, Uspec); + operation = new neqsim.thermodynamicoperations.flashops.PUflash(system, Uspec); getOperation().run(); } @@ -541,7 +546,7 @@ public void VSflash(double volume, double entropy, String unitVol, String unitEn * @param entropy a double */ public void VSflash(double volume, double entropy) { - operation = new neqsim.thermodynamicOperations.flashOps.VSflash(system, volume, entropy); + operation = new neqsim.thermodynamicoperations.flashops.VSflash(system, volume, entropy); getOperation().run(); } @@ -585,7 +590,7 @@ public void TVflash(double Vspec) { * @param Vspec a double volume fraction of first/lightest phase */ public void TVfractionFlash(double Vspec) { - operation = new neqsim.thermodynamicOperations.flashOps.TVfractionFlash(system, Vspec); + operation = new neqsim.thermodynamicoperations.flashops.TVfractionFlash(system, Vspec); getOperation().run(); } @@ -720,7 +725,7 @@ public void VUflash(double Vspec, double Uspec) { * @throws java.lang.Exception if any. */ public void bubblePointTemperatureFlash() throws Exception { - ConstantDutyFlashInterface operation = new bubblePointTemperatureNoDer(system); + ConstantDutyFlashInterface operation = new BubblePointTemperatureNoDer(system); operation.run(); if (Double.isNaN(system.getTemperature()) || operation.isSuperCritical()) { throw new neqsim.util.exception.IsNaNException(this.getClass().getSimpleName(), @@ -737,7 +742,7 @@ public void bubblePointTemperatureFlash() throws Exception { * @throws java.lang.Exception if any. */ public void freezingPointTemperatureFlash() throws Exception { - operation = new freezingPointTemperatureFlash(system); + operation = new FreezingPointTemperatureFlash(system); getOperation().run(); if (Double.isNaN(system.getTemperature())) { throw new neqsim.util.exception.IsNaNException(this.getClass().getSimpleName(), @@ -755,7 +760,7 @@ public void freezingPointTemperatureFlash() throws Exception { * @throws java.lang.Exception if any. */ public void freezingPointTemperatureFlash(String phaseName) throws Exception { - operation = new freezingPointTemperatureFlash(system); + operation = new FreezingPointTemperatureFlash(system); getOperation().run(); if (Double.isNaN(system.getTemperature())) { throw new neqsim.util.exception.IsNaNException(this.getClass().getSimpleName(), @@ -772,7 +777,7 @@ public void freezingPointTemperatureFlash(String phaseName) throws Exception { * @throws java.lang.Exception if any. */ public void waterDewPointTemperatureFlash() throws Exception { - operation = new waterDewPointTemperatureFlash(system); + operation = new WaterDewPointTemperatureFlash(system); getOperation().run(); if (Double.isNaN(system.getTemperature())) { throw new neqsim.util.exception.IsNaNException(this.getClass().getSimpleName(), @@ -789,7 +794,7 @@ public void waterDewPointTemperatureFlash() throws Exception { * @throws java.lang.Exception if any. */ public void waterDewPointTemperatureMultiphaseFlash() throws Exception { - operation = new waterDewPointTemperatureMultiphaseFlash(system); + operation = new WaterDewPointTemperatureMultiphaseFlash(system); getOperation().run(); } @@ -842,7 +847,7 @@ public void waterPrecipitationTemperature() throws Exception { * @throws java.lang.Exception if any. */ public void calcSaltSaturation(String saltName) throws Exception { - operation = new calcSaltSatauration(system, saltName); + operation = new CalcSaltSatauration(system, saltName); getOperation().run(); if (Double.isNaN(system.getTemperature())) { throw new neqsim.util.exception.IsNaNException(this.getClass().getSimpleName(), @@ -859,7 +864,7 @@ public void calcSaltSaturation(String saltName) throws Exception { * @throws java.lang.Exception if any. */ public void checkScalePotential(int phaseNumber) throws Exception { - operation = new checkScalePotential(system, phaseNumber); + operation = new CheckScalePotential(system, phaseNumber); getOperation().run(); resultTable = getOperation().getResultTable(); if (Double.isNaN(system.getTemperature())) { @@ -880,7 +885,7 @@ public void checkScalePotential(int phaseNumber) throws Exception { */ public void addIonToScaleSaturation(int phaseNumber, String scaleSaltName, String nameOfIonToBeAdded) throws Exception { - operation = new addIonToScaleSaturation(system, phaseNumber, scaleSaltName, nameOfIonToBeAdded); + operation = new AddIonToScaleSaturation(system, phaseNumber, scaleSaltName, nameOfIonToBeAdded); getOperation().run(); resultTable = getOperation().getResultTable(); if (Double.isNaN(system.getTemperature())) { @@ -1174,7 +1179,7 @@ public void hydrateFormationTemperature(int structure) throws Exception { if (structure == 0) { system.setSolidPhaseCheck("water"); system.setHydrateCheck(true); - operation = new freezingPointTemperatureFlash(system); + operation = new FreezingPointTemperatureFlash(system); } else { operation = new HydrateFormationTemperatureFlash(system); } @@ -1277,7 +1282,7 @@ public void waterDewPointLine(double minimumPressure, double maximumPressure) th */ public double calcCricondenBar() { system.init(0); - operation = new cricondebarFlash(system); + operation = new CricondebarFlash(system); // operation = new CricondenBarFlash(system); // operation = new cricondenBarTemp1(system); @@ -1294,7 +1299,7 @@ public double calcCricondenBar() { */ public void bubblePointPressureFlash() throws Exception { system.init(0); - ConstantDutyFlashInterface operation = new constantDutyPressureFlash(system); + ConstantDutyFlashInterface operation = new ConstantDutyPressureFlash(system); system.setBeta(1, 1.0 - 1e-10); system.setBeta(0, 1e-10); operation.run(); @@ -1315,9 +1320,9 @@ public void bubblePointPressureFlash() throws Exception { public void bubblePointPressureFlash(boolean derivatives) throws Exception { ConstantDutyFlashInterface operation = null; if (derivatives) { - operation = new bubblePointPressureFlashDer(system); + operation = new BubblePointPressureFlashDer(system); } else { - operation = new bubblePointPressureFlash(system); + operation = new BubblePointPressureFlash(system); } try { operation.run(); @@ -1347,7 +1352,7 @@ public void constantPhaseFractionPressureFlash(double fraction) throws Exception if (fraction > 1.0 - 1e-10) { fraction = 1.0 - 1.0e-10; } - ConstantDutyFlashInterface operation = new constantDutyPressureFlash(system); + ConstantDutyFlashInterface operation = new ConstantDutyPressureFlash(system); system.setBeta(1, 1.0 - fraction); system.setBeta(0, fraction); operation.run(); @@ -1374,7 +1379,7 @@ public void constantPhaseFractionTemperatureFlash(double fraction) throws Except if (fraction > 1.0 - 1e-10) { fraction = 1.0 - 1.0e-10; } - ConstantDutyFlashInterface operation = new constantDutyTemperatureFlash(system); + ConstantDutyFlashInterface operation = new ConstantDutyTemperatureFlash(system); system.setBeta(1, fraction); system.setBeta(0, fraction); operation.run(); @@ -1450,7 +1455,7 @@ public void dewPointMach(String componentName, String specification, double spec */ public void dewPointTemperatureFlash() throws Exception { ConstantDutyFlashInterface operation = - new neqsim.thermodynamicOperations.flashOps.saturationOps.dewPointTemperatureFlash(system); + new neqsim.thermodynamicoperations.flashops.saturationops.DewPointTemperatureFlash(system); operation.run(); if (Double.isNaN(system.getTemperature()) || operation.isSuperCritical()) { throw new neqsim.util.exception.IsNaNException(this.getClass().getSimpleName(), @@ -1468,9 +1473,9 @@ public void dewPointTemperatureFlash() throws Exception { */ public void dewPointTemperatureFlash(boolean derivatives) throws Exception { ConstantDutyFlashInterface operation = - new neqsim.thermodynamicOperations.flashOps.saturationOps.dewPointTemperatureFlash(system); + new neqsim.thermodynamicoperations.flashops.saturationops.DewPointTemperatureFlash(system); if (derivatives) { - operation = new dewPointTemperatureFlashDer(system); + operation = new DewPointTemperatureFlashDer(system); } operation.run(); if (Double.isNaN(system.getTemperature()) || operation.isSuperCritical()) { @@ -1508,7 +1513,7 @@ public void dewPointPressureFlashHC() throws Exception { public void dewPointPressureFlash() throws Exception { // try{ system.init(0); - ConstantDutyFlashInterface operation = new dewPointPressureFlash(system); + ConstantDutyFlashInterface operation = new DewPointPressureFlash(system); operation.run(); if (Double.isNaN(system.getPressure()) || operation.isSuperCritical()) { throw new neqsim.util.exception.IsNaNException(this.getClass().getSimpleName(), @@ -1539,7 +1544,7 @@ public org.jfree.chart.JFreeChart getJfreeChart() { *

*/ public void calcPTphaseEnvelope() { - operation = new pTphaseEnvelope(system, fileName, (1.0 - 1e-10), 1.0, false); + operation = new PTphaseEnvelope(system, fileName, (1.0 - 1e-10), 1.0, false); // thisThread = new Thread(operation); // thisThread.start(); getOperation().run(); @@ -1556,7 +1561,7 @@ public void calcPTphaseEnvelope() { *

*/ public void calcPTphaseEnvelope2() { - operation = new pTphaseEnvelopeNew2(system, fileName, (1.0 - 1e-10), 1.0, false); + operation = new PTphaseEnvelopeNew2(system, fileName, (1.0 - 1e-10), 1.0, false); // thisThread = new Thread(operation); // thisThread.start(); getOperation().run(); @@ -1575,7 +1580,7 @@ public void calcPTphaseEnvelope(boolean bubfirst, double lowPres) { if (bubfirst) { phasefraction = 1.0e-10; } - operation = new pTphaseEnvelope(system, fileName, phasefraction, lowPres, bubfirst); + operation = new PTphaseEnvelope(system, fileName, phasefraction, lowPres, bubfirst); // thisThread = new Thread(operation); // thisThread.start(); @@ -1590,7 +1595,7 @@ public void calcPTphaseEnvelope(boolean bubfirst, double lowPres) { * @param lowPres a double */ public void calcPTphaseEnvelope(double lowPres) { - operation = new pTphaseEnvelope(system, fileName, 1e-10, lowPres, true); + operation = new PTphaseEnvelope(system, fileName, 1e-10, lowPres, true); // thisThread = new Thread(operation); // thisThread.start(); getOperation().run(); @@ -1608,7 +1613,7 @@ public void calcPTphaseEnvelope(boolean bubfirst) { if (bubfirst) { phasefraction = 1.0e-10; } - operation = new pTphaseEnvelope(system, fileName, phasefraction, 1.0, bubfirst); + operation = new PTphaseEnvelope(system, fileName, phasefraction, 1.0, bubfirst); // thisThread = new Thread(operation); // thisThread.start(); @@ -1628,7 +1633,7 @@ public void calcPTphaseEnvelope(boolean bubfirst) { * @param phasefraction a double */ public void calcPTphaseEnvelope(double lowPres, double phasefraction) { - operation = new pTphaseEnvelope(system, fileName, phasefraction, lowPres, true); + operation = new PTphaseEnvelope(system, fileName, phasefraction, lowPres, true); // thisThread = new Thread(operation); // thisThread.start(); @@ -1702,7 +1707,7 @@ public void OLGApropTablePH(double minEnthalpy, double maxEnthalpy, int enthalpy *

*/ public void calcPloadingCurve() { - operation = new pLoadingCurve2(system); + operation = new PloadingCurve2(system); // thisThread = new Thread(operation); // thisThread.start(); getOperation().run(); diff --git a/src/main/java/neqsim/thermodynamicOperations/chemicalEquilibrium/ChemicalEquilibrium.java b/src/main/java/neqsim/thermodynamicoperations/chemicalequilibrium/ChemicalEquilibrium.java similarity index 95% rename from src/main/java/neqsim/thermodynamicOperations/chemicalEquilibrium/ChemicalEquilibrium.java rename to src/main/java/neqsim/thermodynamicoperations/chemicalequilibrium/ChemicalEquilibrium.java index 8bdf05f150..ae50c87871 100644 --- a/src/main/java/neqsim/thermodynamicOperations/chemicalEquilibrium/ChemicalEquilibrium.java +++ b/src/main/java/neqsim/thermodynamicoperations/chemicalequilibrium/ChemicalEquilibrium.java @@ -4,12 +4,12 @@ * Created on 5. mai 2002, 20:53 */ -package neqsim.thermodynamicOperations.chemicalEquilibrium; +package neqsim.thermodynamicoperations.chemicalequilibrium; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.BaseOperation; +import neqsim.thermodynamicoperations.BaseOperation; /** *

diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/CalcIonicComposition.java b/src/main/java/neqsim/thermodynamicoperations/flashops/CalcIonicComposition.java similarity index 98% rename from src/main/java/neqsim/thermodynamicOperations/flashOps/CalcIonicComposition.java rename to src/main/java/neqsim/thermodynamicoperations/flashops/CalcIonicComposition.java index 5d36cd6522..1c196c6704 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/CalcIonicComposition.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/CalcIonicComposition.java @@ -4,7 +4,7 @@ * Created on 8. mars 2001, 10:56 */ -package neqsim.thermodynamicOperations.flashOps; +package neqsim.thermodynamicoperations.flashops; import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/CriticalPointFlash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/CriticalPointFlash.java similarity index 99% rename from src/main/java/neqsim/thermodynamicOperations/flashOps/CriticalPointFlash.java rename to src/main/java/neqsim/thermodynamicoperations/flashops/CriticalPointFlash.java index ae613c23cb..e19f0fb5a3 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/CriticalPointFlash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/CriticalPointFlash.java @@ -1,4 +1,4 @@ -package neqsim.thermodynamicOperations.flashOps; +package neqsim.thermodynamicoperations.flashops; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/Flash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/Flash.java similarity index 99% rename from src/main/java/neqsim/thermodynamicOperations/flashOps/Flash.java rename to src/main/java/neqsim/thermodynamicoperations/flashops/Flash.java index 76f7cc08f8..e8d9223f3c 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/Flash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/Flash.java @@ -4,14 +4,14 @@ * Created on 2. oktober 2000, 22:22 */ -package neqsim.thermodynamicOperations.flashOps; +package neqsim.thermodynamicoperations.flashops; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import Jama.Matrix; import neqsim.thermo.phase.PhaseType; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.BaseOperation; +import neqsim.thermodynamicoperations.BaseOperation; /** * Abstract base class for all flash classes. @@ -46,7 +46,7 @@ public abstract class Flash extends BaseOperation { double[] deltalnK; double[] tm; int lowestGibbsEnergyPhase = 0; - sysNewtonRhapsonTPflash secondOrderSolver; + SysNewtonRhapsonTPflash secondOrderSolver; /** Set true to do solid phase check and calculations */ protected boolean solidCheck = false; protected boolean stabilityCheck = false; diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/PHflash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/PHflash.java similarity index 97% rename from src/main/java/neqsim/thermodynamicOperations/flashOps/PHflash.java rename to src/main/java/neqsim/thermodynamicoperations/flashops/PHflash.java index e2a5c5dd9e..c5df5ae83c 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/PHflash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/PHflash.java @@ -4,7 +4,7 @@ * Created on 8. mars 2001, 10:56 */ -package neqsim.thermodynamicOperations.flashOps; +package neqsim.thermodynamicoperations.flashops; import neqsim.thermo.system.SystemInterface; @@ -195,8 +195,8 @@ public void run() { if (type == 0) { solveQ(); } else { - sysNewtonRhapsonPHflash secondOrderSolver = - new sysNewtonRhapsonPHflash(system, 2, system.getPhases()[0].getNumberOfComponents(), 0); + SysNewtonRhapsonPHflash secondOrderSolver = + new SysNewtonRhapsonPHflash(system, 2, system.getPhases()[0].getNumberOfComponents(), 0); secondOrderSolver.setSpec(Hspec); secondOrderSolver.solve(1); } diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/PHflashGERG2008.java b/src/main/java/neqsim/thermodynamicoperations/flashops/PHflashGERG2008.java similarity index 99% rename from src/main/java/neqsim/thermodynamicOperations/flashOps/PHflashGERG2008.java rename to src/main/java/neqsim/thermodynamicoperations/flashops/PHflashGERG2008.java index eba52489de..f7dbc50dfa 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/PHflashGERG2008.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/PHflashGERG2008.java @@ -4,7 +4,7 @@ * Created on 8. mars 2001, 10:56 */ -package neqsim.thermodynamicOperations.flashOps; +package neqsim.thermodynamicoperations.flashops; import neqsim.thermo.system.SystemInterface; diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/PHflashSingleComp.java b/src/main/java/neqsim/thermodynamicoperations/flashops/PHflashSingleComp.java similarity index 93% rename from src/main/java/neqsim/thermodynamicOperations/flashOps/PHflashSingleComp.java rename to src/main/java/neqsim/thermodynamicoperations/flashops/PHflashSingleComp.java index 7a84d17f97..747bec2417 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/PHflashSingleComp.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/PHflashSingleComp.java @@ -1,4 +1,4 @@ -package neqsim.thermodynamicOperations.flashOps; +package neqsim.thermodynamicoperations.flashops; import neqsim.thermo.phase.PhaseType; import neqsim.thermo.system.SystemInterface; @@ -33,8 +33,8 @@ public PHflashSingleComp(SystemInterface system, double Hspec, int type) { /** {@inheritDoc} */ @Override public void run() { - neqsim.thermodynamicOperations.ThermodynamicOperations bubOps = - new neqsim.thermodynamicOperations.ThermodynamicOperations(system); + neqsim.thermodynamicoperations.ThermodynamicOperations bubOps = + new neqsim.thermodynamicoperations.ThermodynamicOperations(system); double initTemp = system.getTemperature(); if (system.getPressure() < system.getPhase(0).getComponent(0).getPC()) { diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/PHsolidFlash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/PHsolidFlash.java similarity index 97% rename from src/main/java/neqsim/thermodynamicOperations/flashOps/PHsolidFlash.java rename to src/main/java/neqsim/thermodynamicoperations/flashops/PHsolidFlash.java index e3235dd1cc..28c03872f5 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/PHsolidFlash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/PHsolidFlash.java @@ -4,7 +4,7 @@ * Created on 8. mars 2001, 10:56 */ -package neqsim.thermodynamicOperations.flashOps; +package neqsim.thermodynamicoperations.flashops; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/PSFlash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/PSFlash.java similarity index 95% rename from src/main/java/neqsim/thermodynamicOperations/flashOps/PSFlash.java rename to src/main/java/neqsim/thermodynamicoperations/flashops/PSFlash.java index c26549e886..db4104aa82 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/PSFlash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/PSFlash.java @@ -1,4 +1,4 @@ -package neqsim.thermodynamicOperations.flashOps; +package neqsim.thermodynamicoperations.flashops; import neqsim.thermo.system.SystemInterface; @@ -121,8 +121,8 @@ public void run() { if (type == 0) { solveQ(); } else { - sysNewtonRhapsonPHflash secondOrderSolver = - new sysNewtonRhapsonPHflash(system, 2, system.getPhases()[0].getNumberOfComponents(), 1); + SysNewtonRhapsonPHflash secondOrderSolver = + new SysNewtonRhapsonPHflash(system, 2, system.getPhases()[0].getNumberOfComponents(), 1); secondOrderSolver.setSpec(Sspec); secondOrderSolver.solve(1); } diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/PSFlashGERG2008.java b/src/main/java/neqsim/thermodynamicoperations/flashops/PSFlashGERG2008.java similarity index 98% rename from src/main/java/neqsim/thermodynamicOperations/flashOps/PSFlashGERG2008.java rename to src/main/java/neqsim/thermodynamicoperations/flashops/PSFlashGERG2008.java index 99752dedef..42f5e92283 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/PSFlashGERG2008.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/PSFlashGERG2008.java @@ -1,4 +1,4 @@ -package neqsim.thermodynamicOperations.flashOps; +package neqsim.thermodynamicoperations.flashops; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/PSflashSingleComp.java b/src/main/java/neqsim/thermodynamicoperations/flashops/PSflashSingleComp.java similarity index 91% rename from src/main/java/neqsim/thermodynamicOperations/flashOps/PSflashSingleComp.java rename to src/main/java/neqsim/thermodynamicoperations/flashops/PSflashSingleComp.java index 9d59d19485..ac2bd5b52f 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/PSflashSingleComp.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/PSflashSingleComp.java @@ -1,4 +1,4 @@ -package neqsim.thermodynamicOperations.flashOps; +package neqsim.thermodynamicoperations.flashops; import neqsim.thermo.phase.PhaseType; import neqsim.thermo.system.SystemInterface; @@ -33,8 +33,8 @@ public PSflashSingleComp(SystemInterface system, double Sspec, int type) { /** {@inheritDoc} */ @Override public void run() { - neqsim.thermodynamicOperations.ThermodynamicOperations bubOps = - new neqsim.thermodynamicOperations.ThermodynamicOperations(system); + neqsim.thermodynamicoperations.ThermodynamicOperations bubOps = + new neqsim.thermodynamicoperations.ThermodynamicOperations(system); double initTemp = system.getTemperature(); if (system.getPressure() < system.getPhase(0).getComponent(0).getPC()) { diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/PUflash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/PUflash.java similarity index 98% rename from src/main/java/neqsim/thermodynamicOperations/flashOps/PUflash.java rename to src/main/java/neqsim/thermodynamicoperations/flashops/PUflash.java index de8b27f132..a5673f8609 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/PUflash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/PUflash.java @@ -1,4 +1,4 @@ -package neqsim.thermodynamicOperations.flashOps; +package neqsim.thermodynamicoperations.flashops; import neqsim.thermo.system.SystemInterface; diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/PVrefluxflash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/PVrefluxflash.java similarity index 97% rename from src/main/java/neqsim/thermodynamicOperations/flashOps/PVrefluxflash.java rename to src/main/java/neqsim/thermodynamicoperations/flashops/PVrefluxflash.java index c7e0153dcd..f4956a3703 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/PVrefluxflash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/PVrefluxflash.java @@ -1,4 +1,4 @@ -package neqsim.thermodynamicOperations.flashOps; +package neqsim.thermodynamicoperations.flashops; import neqsim.thermo.system.SystemInterface; diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/QfuncFlash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/QfuncFlash.java similarity index 95% rename from src/main/java/neqsim/thermodynamicOperations/flashOps/QfuncFlash.java rename to src/main/java/neqsim/thermodynamicoperations/flashops/QfuncFlash.java index 48fc794261..1bc27985f2 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/QfuncFlash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/QfuncFlash.java @@ -1,4 +1,4 @@ -package neqsim.thermodynamicOperations.flashOps; +package neqsim.thermodynamicoperations.flashops; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -95,7 +95,7 @@ public double solveQ() { public void run() { tpFlash.run(); logger.info("entropy: " + system.getEntropy()); - sysNewtonRhapsonPHflash secondOrderSolver = new sysNewtonRhapsonPHflash(system, 2, + SysNewtonRhapsonPHflash secondOrderSolver = new SysNewtonRhapsonPHflash(system, 2, system.getPhases()[0].getNumberOfComponents(), type); secondOrderSolver.setSpec(Hspec); secondOrderSolver.solve(1); diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/RachfordRice.java b/src/main/java/neqsim/thermodynamicoperations/flashops/RachfordRice.java similarity index 99% rename from src/main/java/neqsim/thermodynamicOperations/flashOps/RachfordRice.java rename to src/main/java/neqsim/thermodynamicoperations/flashops/RachfordRice.java index 415717ce61..af0ec55926 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/RachfordRice.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/RachfordRice.java @@ -4,7 +4,7 @@ * Created on 1.april 2024 */ -package neqsim.thermodynamicOperations.flashOps; +package neqsim.thermodynamicoperations.flashops; import java.io.Serializable; import neqsim.thermo.component.ComponentInterface; diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/SaturateWithWater.java b/src/main/java/neqsim/thermodynamicoperations/flashops/SaturateWithWater.java similarity index 97% rename from src/main/java/neqsim/thermodynamicOperations/flashOps/SaturateWithWater.java rename to src/main/java/neqsim/thermodynamicoperations/flashops/SaturateWithWater.java index e42ea36522..fe5e23ac5d 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/SaturateWithWater.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/SaturateWithWater.java @@ -1,11 +1,11 @@ -package neqsim.thermodynamicOperations.flashOps; +package neqsim.thermodynamicoperations.flashops; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import neqsim.thermo.phase.PhaseType; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkCPAstatoil; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/SolidFlash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/SolidFlash.java similarity index 99% rename from src/main/java/neqsim/thermodynamicOperations/flashOps/SolidFlash.java rename to src/main/java/neqsim/thermodynamicoperations/flashops/SolidFlash.java index ceac27e312..453cbb9272 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/SolidFlash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/SolidFlash.java @@ -1,4 +1,4 @@ -package neqsim.thermodynamicOperations.flashOps; +package neqsim.thermodynamicoperations.flashops; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/SolidFlash1.java b/src/main/java/neqsim/thermodynamicoperations/flashops/SolidFlash1.java similarity index 99% rename from src/main/java/neqsim/thermodynamicOperations/flashOps/SolidFlash1.java rename to src/main/java/neqsim/thermodynamicoperations/flashops/SolidFlash1.java index be08aea275..bfc4862b9f 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/SolidFlash1.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/SolidFlash1.java @@ -1,11 +1,11 @@ -package neqsim.thermodynamicOperations.flashOps; +package neqsim.thermodynamicoperations.flashops; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import Jama.Matrix; import neqsim.thermo.phase.PhaseType; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/SolidFlash12.java b/src/main/java/neqsim/thermodynamicoperations/flashops/SolidFlash12.java similarity index 99% rename from src/main/java/neqsim/thermodynamicOperations/flashOps/SolidFlash12.java rename to src/main/java/neqsim/thermodynamicoperations/flashops/SolidFlash12.java index 48f6b0a910..f9b8b4da0b 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/SolidFlash12.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/SolidFlash12.java @@ -4,14 +4,14 @@ * Created on 2. oktober 2000, 22:26 */ -package neqsim.thermodynamicOperations.flashOps; +package neqsim.thermodynamicoperations.flashops; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import Jama.Matrix; import neqsim.thermo.phase.PhaseType; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/sysNewtonRhapsonPHflash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/SysNewtonRhapsonPHflash.java similarity index 94% rename from src/main/java/neqsim/thermodynamicOperations/flashOps/sysNewtonRhapsonPHflash.java rename to src/main/java/neqsim/thermodynamicoperations/flashops/SysNewtonRhapsonPHflash.java index 1b2b87dc2f..04146f4764 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/sysNewtonRhapsonPHflash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/SysNewtonRhapsonPHflash.java @@ -1,9 +1,9 @@ -package neqsim.thermodynamicOperations.flashOps; +package neqsim.thermodynamicoperations.flashops; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import Jama.Matrix; -import neqsim.MathLib.nonLinearSolver.newtonRhapson; +import neqsim.mathlib.nonlinearsolver.NewtonRhapson; import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.system.SystemInterface; @@ -15,9 +15,9 @@ * @author asmund * @version $Id: $Id */ -public class sysNewtonRhapsonPHflash implements ThermodynamicConstantsInterface { +public class SysNewtonRhapsonPHflash implements ThermodynamicConstantsInterface { private static final long serialVersionUID = 1000; - static Logger logger = LogManager.getLogger(sysNewtonRhapsonPHflash.class); + static Logger logger = LogManager.getLogger(SysNewtonRhapsonPHflash.class); int neq = 0; int iter = 0; @@ -49,7 +49,7 @@ public class sysNewtonRhapsonPHflash implements ThermodynamicConstantsInterface Matrix s = new Matrix(1, 4); Matrix xg; Matrix xcoef; - newtonRhapson solver; + NewtonRhapson solver; boolean etterCP = false; boolean etterCP2 = false; double dVdT = 0; @@ -65,7 +65,7 @@ public class sysNewtonRhapsonPHflash implements ThermodynamicConstantsInterface * @param numberOfPhases a int * @param numberOfComponents a int */ - public sysNewtonRhapsonPHflash(SystemInterface system, int numberOfPhases, + public SysNewtonRhapsonPHflash(SystemInterface system, int numberOfPhases, int numberOfComponents) { this.system = system; this.numberOfComponents = numberOfComponents; @@ -79,7 +79,7 @@ public sysNewtonRhapsonPHflash(SystemInterface system, int numberOfPhases, setu(); uold = u.copy(); // logger.info("Spec : " +speceq); - solver = new newtonRhapson(); + solver = new NewtonRhapson(); solver.setOrder(3); } @@ -93,7 +93,7 @@ public sysNewtonRhapsonPHflash(SystemInterface system, int numberOfPhases, * @param numberOfComponents a int * @param type a int */ - public sysNewtonRhapsonPHflash(SystemInterface system, int numberOfPhases, int numberOfComponents, + public SysNewtonRhapsonPHflash(SystemInterface system, int numberOfPhases, int numberOfComponents, int type) { this(system, numberOfPhases, numberOfComponents); this.type = type; diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/sysNewtonRhapsonTPflash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/SysNewtonRhapsonTPflash.java similarity index 95% rename from src/main/java/neqsim/thermodynamicOperations/flashOps/sysNewtonRhapsonTPflash.java rename to src/main/java/neqsim/thermodynamicoperations/flashops/SysNewtonRhapsonTPflash.java index bee007d7cd..2180705109 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/sysNewtonRhapsonTPflash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/SysNewtonRhapsonTPflash.java @@ -1,4 +1,4 @@ -package neqsim.thermodynamicOperations.flashOps; +package neqsim.thermodynamicoperations.flashops; import Jama.Matrix; import neqsim.thermo.system.SystemInterface; @@ -11,7 +11,7 @@ * @author asmund * @version $Id: $Id */ -public class sysNewtonRhapsonTPflash implements java.io.Serializable { +public class SysNewtonRhapsonTPflash implements java.io.Serializable { private static final long serialVersionUID = 1000; int neq = 0; int iter = 0; @@ -51,7 +51,7 @@ public class sysNewtonRhapsonTPflash implements java.io.Serializable { * @param numberOfPhases a int * @param numberOfComponents a int */ - public sysNewtonRhapsonTPflash(SystemInterface system, int numberOfPhases, + public SysNewtonRhapsonTPflash(SystemInterface system, int numberOfPhases, int numberOfComponents) { this.system = system; this.numberOfComponents = numberOfComponents; diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/sysNewtonRhapsonTPflashNew.java b/src/main/java/neqsim/thermodynamicoperations/flashops/SysNewtonRhapsonTPflashNew.java similarity index 94% rename from src/main/java/neqsim/thermodynamicOperations/flashOps/sysNewtonRhapsonTPflashNew.java rename to src/main/java/neqsim/thermodynamicoperations/flashops/SysNewtonRhapsonTPflashNew.java index f82c35eb0d..b55d421e08 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/sysNewtonRhapsonTPflashNew.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/SysNewtonRhapsonTPflashNew.java @@ -1,7 +1,7 @@ -package neqsim.thermodynamicOperations.flashOps; +package neqsim.thermodynamicoperations.flashops; import Jama.Matrix; -import neqsim.MathLib.nonLinearSolver.newtonRhapson; +import neqsim.mathlib.nonlinearsolver.NewtonRhapson; import neqsim.thermo.system.SystemInterface; /** @@ -12,7 +12,7 @@ * @author asmund * @version $Id: $Id */ -public class sysNewtonRhapsonTPflashNew implements java.io.Serializable { +public class SysNewtonRhapsonTPflashNew implements java.io.Serializable { private static final long serialVersionUID = 1000; int neq = 0; int iter = 0; @@ -41,7 +41,7 @@ public class sysNewtonRhapsonTPflashNew implements java.io.Serializable { Matrix s = new Matrix(1, 4); Matrix xg; Matrix xcoef; - newtonRhapson solver; + NewtonRhapson solver; boolean etterCP = false; boolean etterCP2 = false; @@ -54,7 +54,7 @@ public class sysNewtonRhapsonTPflashNew implements java.io.Serializable { * @param numberOfPhases a int * @param numberOfComponents a int */ - public sysNewtonRhapsonTPflashNew(SystemInterface system, int numberOfPhases, + public SysNewtonRhapsonTPflashNew(SystemInterface system, int numberOfPhases, int numberOfComponents) { this.system = system; this.numberOfComponents = numberOfComponents; @@ -66,7 +66,7 @@ public sysNewtonRhapsonTPflashNew(SystemInterface system, int numberOfPhases, setu(); uold = u.copy(); // System.out.println("Spec : " +speceq); - solver = new newtonRhapson(); + solver = new NewtonRhapson(); solver.setOrder(3); } diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/TPflash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/TPflash.java similarity index 99% rename from src/main/java/neqsim/thermodynamicOperations/flashOps/TPflash.java rename to src/main/java/neqsim/thermodynamicoperations/flashops/TPflash.java index 9c2dfe83ca..8126716ed5 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/TPflash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/TPflash.java @@ -1,10 +1,10 @@ -package neqsim.thermodynamicOperations.flashOps; +package neqsim.thermodynamicoperations.flashops; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import neqsim.thermo.phase.PhaseType; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; import neqsim.util.exception.IsNaNException; import neqsim.util.exception.TooManyIterationsException; @@ -402,7 +402,7 @@ public void run() { } else if (iterations >= newtonLimit && Math .abs(system.getPhase(0).getPressure() - system.getPhase(1).getPressure()) < 1e-5) { if (iterations == newtonLimit) { - secondOrderSolver = new sysNewtonRhapsonTPflash(system, 2, + secondOrderSolver = new SysNewtonRhapsonTPflash(system, 2, system.getPhases()[0].getNumberOfComponents()); } try { diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/TPgradientFlash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/TPgradientFlash.java similarity index 99% rename from src/main/java/neqsim/thermodynamicOperations/flashOps/TPgradientFlash.java rename to src/main/java/neqsim/thermodynamicoperations/flashops/TPgradientFlash.java index e732347a8c..3695d4b080 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/TPgradientFlash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/TPgradientFlash.java @@ -4,7 +4,7 @@ * Created on 8. mars 2001, 10:56 */ -package neqsim.thermodynamicOperations.flashOps; +package neqsim.thermodynamicoperations.flashops; import Jama.Matrix; import neqsim.thermo.system.SystemInterface; diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/TPmultiflash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/TPmultiflash.java similarity index 99% rename from src/main/java/neqsim/thermodynamicOperations/flashOps/TPmultiflash.java rename to src/main/java/neqsim/thermodynamicoperations/flashops/TPmultiflash.java index 3d1d0337df..8b24abfe2a 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/TPmultiflash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/TPmultiflash.java @@ -4,7 +4,7 @@ * Created on 2. oktober 2000, 22:26 */ -package neqsim.thermodynamicOperations.flashOps; +package neqsim.thermodynamicoperations.flashops; import static neqsim.thermo.ThermodynamicModelSettings.phaseFractionMinimumLimit; import java.util.ArrayList; diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/TPmultiflashWAX.java b/src/main/java/neqsim/thermodynamicoperations/flashops/TPmultiflashWAX.java similarity index 99% rename from src/main/java/neqsim/thermodynamicOperations/flashOps/TPmultiflashWAX.java rename to src/main/java/neqsim/thermodynamicoperations/flashops/TPmultiflashWAX.java index eed4f4d726..0f8e14f9fa 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/TPmultiflashWAX.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/TPmultiflashWAX.java @@ -1,4 +1,4 @@ -package neqsim.thermodynamicOperations.flashOps; +package neqsim.thermodynamicoperations.flashops; import java.util.ArrayList; import org.apache.logging.log4j.LogManager; diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/TPmultiflash_1.java b/src/main/java/neqsim/thermodynamicoperations/flashops/TPmultiflash_1.java similarity index 99% rename from src/main/java/neqsim/thermodynamicOperations/flashOps/TPmultiflash_1.java rename to src/main/java/neqsim/thermodynamicoperations/flashops/TPmultiflash_1.java index c034293c6f..f86dfb337c 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/TPmultiflash_1.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/TPmultiflash_1.java @@ -4,7 +4,7 @@ * Created on 2. oktober 2000, 22:26 */ -package neqsim.thermodynamicOperations.flashOps; +package neqsim.thermodynamicoperations.flashops; import java.util.ArrayList; import org.apache.logging.log4j.LogManager; diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/TSFlash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/TSFlash.java similarity index 96% rename from src/main/java/neqsim/thermodynamicOperations/flashOps/TSFlash.java rename to src/main/java/neqsim/thermodynamicoperations/flashops/TSFlash.java index 97a566edd1..c0e78f14ed 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/TSFlash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/TSFlash.java @@ -4,11 +4,11 @@ * Created on 8. mars 2001, 10:56 */ -package neqsim.thermodynamicOperations.flashOps; +package neqsim.thermodynamicoperations.flashops; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/TVflash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/TVflash.java similarity index 98% rename from src/main/java/neqsim/thermodynamicOperations/flashOps/TVflash.java rename to src/main/java/neqsim/thermodynamicoperations/flashops/TVflash.java index 92f6847277..14786dea9f 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/TVflash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/TVflash.java @@ -4,7 +4,7 @@ * Created on 8. mars 2001, 10:56 */ -package neqsim.thermodynamicOperations.flashOps; +package neqsim.thermodynamicoperations.flashops; import neqsim.thermo.system.SystemInterface; diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/TVfractionFlash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/TVfractionFlash.java similarity index 98% rename from src/main/java/neqsim/thermodynamicOperations/flashOps/TVfractionFlash.java rename to src/main/java/neqsim/thermodynamicoperations/flashops/TVfractionFlash.java index f722505207..eb303ab53e 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/TVfractionFlash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/TVfractionFlash.java @@ -4,7 +4,7 @@ * Created on 8. mars 2001, 10:56 */ -package neqsim.thermodynamicOperations.flashOps; +package neqsim.thermodynamicoperations.flashops; import neqsim.thermo.system.SystemInterface; diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/VHflash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/VHflash.java similarity index 98% rename from src/main/java/neqsim/thermodynamicOperations/flashOps/VHflash.java rename to src/main/java/neqsim/thermodynamicoperations/flashops/VHflash.java index 73e2394255..b464ea2a11 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/VHflash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/VHflash.java @@ -1,4 +1,4 @@ -package neqsim.thermodynamicOperations.flashOps; +package neqsim.thermodynamicoperations.flashops; import neqsim.thermo.system.SystemInterface; diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/VHflashQfunc.java b/src/main/java/neqsim/thermodynamicoperations/flashops/VHflashQfunc.java similarity index 97% rename from src/main/java/neqsim/thermodynamicOperations/flashOps/VHflashQfunc.java rename to src/main/java/neqsim/thermodynamicoperations/flashops/VHflashQfunc.java index a20eceeb6a..c036a4cc99 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/VHflashQfunc.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/VHflashQfunc.java @@ -1,10 +1,10 @@ -package neqsim.thermodynamicOperations.flashOps; +package neqsim.thermodynamicoperations.flashops; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/VSflash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/VSflash.java similarity index 97% rename from src/main/java/neqsim/thermodynamicOperations/flashOps/VSflash.java rename to src/main/java/neqsim/thermodynamicoperations/flashops/VSflash.java index 0ad968e16c..617727e023 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/VSflash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/VSflash.java @@ -1,8 +1,8 @@ -package neqsim.thermodynamicOperations.flashOps; +package neqsim.thermodynamicoperations.flashops; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/VUflash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/VUflash.java similarity index 98% rename from src/main/java/neqsim/thermodynamicOperations/flashOps/VUflash.java rename to src/main/java/neqsim/thermodynamicoperations/flashops/VUflash.java index bc6bc4e2f3..4c46704c33 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/VUflash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/VUflash.java @@ -4,7 +4,7 @@ * Created on 8. mars 2001, 10:56 */ -package neqsim.thermodynamicOperations.flashOps; +package neqsim.thermodynamicoperations.flashops; import neqsim.thermo.system.SystemInterface; diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/VUflashQfunc.java b/src/main/java/neqsim/thermodynamicoperations/flashops/VUflashQfunc.java similarity index 97% rename from src/main/java/neqsim/thermodynamicOperations/flashOps/VUflashQfunc.java rename to src/main/java/neqsim/thermodynamicoperations/flashops/VUflashQfunc.java index 97b995fded..e3e8ad5464 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/VUflashQfunc.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/VUflashQfunc.java @@ -4,13 +4,13 @@ * Created on 8. mars 2001, 10:56 */ -package neqsim.thermodynamicOperations.flashOps; +package neqsim.thermodynamicoperations.flashops; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/dTPflash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/dTPflash.java similarity index 98% rename from src/main/java/neqsim/thermodynamicOperations/flashOps/dTPflash.java rename to src/main/java/neqsim/thermodynamicoperations/flashops/dTPflash.java index bdfdb6b767..b77714a532 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/dTPflash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/dTPflash.java @@ -4,7 +4,7 @@ * Created on 2. oktober 2000, 22:26 */ -package neqsim.thermodynamicOperations.flashOps; +package neqsim.thermodynamicoperations.flashops; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/addIonToScaleSaturation.java b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/AddIonToScaleSaturation.java similarity index 95% rename from src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/addIonToScaleSaturation.java rename to src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/AddIonToScaleSaturation.java index 8a468485db..97574984ef 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/addIonToScaleSaturation.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/AddIonToScaleSaturation.java @@ -1,9 +1,9 @@ -package neqsim.thermodynamicOperations.flashOps.saturationOps; +package neqsim.thermodynamicoperations.flashops.saturationops; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

@@ -13,9 +13,9 @@ * @author asmund * @version $Id: $Id */ -public class addIonToScaleSaturation extends constantDutyTemperatureFlash { +public class AddIonToScaleSaturation extends ConstantDutyTemperatureFlash { private static final long serialVersionUID = 1000; - static Logger logger = LogManager.getLogger(addIonToScaleSaturation.class); + static Logger logger = LogManager.getLogger(AddIonToScaleSaturation.class); String saltName = ""; String scaleSaltName = ""; @@ -33,7 +33,7 @@ public class addIonToScaleSaturation extends constantDutyTemperatureFlash { * @param scaleSaltName a {@link java.lang.String} object * @param nameOfIonToBeAdded a {@link java.lang.String} object */ - public addIonToScaleSaturation(SystemInterface system, int phaseNumber, String scaleSaltName, + public AddIonToScaleSaturation(SystemInterface system, int phaseNumber, String scaleSaltName, String nameOfIonToBeAdded) { super(system); this.phaseNumber = phaseNumber; diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/bubblePointPressureFlash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/BubblePointPressureFlash.java similarity index 96% rename from src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/bubblePointPressureFlash.java rename to src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/BubblePointPressureFlash.java index b09fcf1d7d..9127cd85d6 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/bubblePointPressureFlash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/BubblePointPressureFlash.java @@ -1,4 +1,4 @@ -package neqsim.thermodynamicOperations.flashOps.saturationOps; +package neqsim.thermodynamicoperations.flashops.saturationops; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -12,9 +12,9 @@ * @author asmund * @version $Id: $Id */ -public class bubblePointPressureFlash extends constantDutyPressureFlash { +public class BubblePointPressureFlash extends ConstantDutyPressureFlash { private static final long serialVersionUID = 1000; - static Logger logger = LogManager.getLogger(bubblePointPressureFlash.class); + static Logger logger = LogManager.getLogger(BubblePointPressureFlash.class); /** *

@@ -23,7 +23,7 @@ public class bubblePointPressureFlash extends constantDutyPressureFlash { * * @param system a {@link neqsim.thermo.system.SystemInterface} object */ - public bubblePointPressureFlash(SystemInterface system) { + public BubblePointPressureFlash(SystemInterface system) { super(system); } diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/bubblePointPressureFlashDer.java b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/BubblePointPressureFlashDer.java similarity index 96% rename from src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/bubblePointPressureFlashDer.java rename to src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/BubblePointPressureFlashDer.java index b3a195225d..b68c6e8d34 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/bubblePointPressureFlashDer.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/BubblePointPressureFlashDer.java @@ -1,4 +1,4 @@ -package neqsim.thermodynamicOperations.flashOps.saturationOps; +package neqsim.thermodynamicoperations.flashops.saturationops; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -12,9 +12,9 @@ * @author asmund * @version $Id: $Id */ -public class bubblePointPressureFlashDer extends constantDutyPressureFlash { +public class BubblePointPressureFlashDer extends ConstantDutyPressureFlash { private static final long serialVersionUID = 1000; - static Logger logger = LogManager.getLogger(bubblePointPressureFlashDer.class); + static Logger logger = LogManager.getLogger(BubblePointPressureFlashDer.class); /** *

@@ -23,7 +23,7 @@ public class bubblePointPressureFlashDer extends constantDutyPressureFlash { * * @param system a {@link neqsim.thermo.system.SystemInterface} object */ - public bubblePointPressureFlashDer(SystemInterface system) { + public BubblePointPressureFlashDer(SystemInterface system) { super(system); } diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/bubblePointTemperatureFlash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/BubblePointTemperatureFlash.java similarity index 89% rename from src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/bubblePointTemperatureFlash.java rename to src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/BubblePointTemperatureFlash.java index 158ae79762..44ae7a1ca7 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/bubblePointTemperatureFlash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/BubblePointTemperatureFlash.java @@ -1,8 +1,10 @@ -package neqsim.thermodynamicOperations.flashOps.saturationOps; +package neqsim.thermodynamicoperations.flashops.saturationops; + +import neqsim.thermo.system.SystemInterface; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.thermo.system.SystemInterface; + /** *

@@ -12,9 +14,9 @@ * @author asmund * @version $Id: $Id */ -public class bubblePointTemperatureFlash extends constantDutyTemperatureFlash { +public class BubblePointTemperatureFlash extends ConstantDutyTemperatureFlash { private static final long serialVersionUID = 1000; - static Logger logger = LogManager.getLogger(bubblePointTemperatureFlash.class); + static Logger logger = LogManager.getLogger(BubblePointTemperatureFlash.class); /** *

@@ -23,7 +25,7 @@ public class bubblePointTemperatureFlash extends constantDutyTemperatureFlash { * * @param system a {@link neqsim.thermo.system.SystemInterface} object */ - public bubblePointTemperatureFlash(SystemInterface system) { + public BubblePointTemperatureFlash(SystemInterface system) { super(system); } @@ -61,8 +63,8 @@ public void run() { / system.getPhases()[0].getComponents()[i].getFugacityCoefficient()); system.getPhases()[1].getComponents()[i] .setK(system.getPhases()[0].getComponents()[i].getK()); - system.getPhases()[0].getComponents()[i].setx(system.getPhases()[1].getComponents()[i] - .getx() + system.getPhases()[0].getComponents()[i] + .setx(system.getPhases()[1].getComponents()[i].getx() * system.getPhases()[1].getComponents()[i].getFugacityCoefficient() / system.getPhases()[0].getComponents()[i].getFugacityCoefficient()); } while ((Math.abs(yold - system.getPhases()[1].getComponents()[i].getx()) > 1e-10) diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/bubblePointTemperatureNoDer.java b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/BubblePointTemperatureNoDer.java similarity index 95% rename from src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/bubblePointTemperatureNoDer.java rename to src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/BubblePointTemperatureNoDer.java index abcd7d84c4..ebab18e97d 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/bubblePointTemperatureNoDer.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/BubblePointTemperatureNoDer.java @@ -1,4 +1,4 @@ -package neqsim.thermodynamicOperations.flashOps.saturationOps; +package neqsim.thermodynamicoperations.flashops.saturationops; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -12,9 +12,9 @@ * @author asmund * @version $Id: $Id */ -public class bubblePointTemperatureNoDer extends constantDutyTemperatureFlash { +public class BubblePointTemperatureNoDer extends ConstantDutyTemperatureFlash { private static final long serialVersionUID = 1000; - static Logger logger = LogManager.getLogger(bubblePointTemperatureNoDer.class); + static Logger logger = LogManager.getLogger(BubblePointTemperatureNoDer.class); /** *

@@ -23,7 +23,7 @@ public class bubblePointTemperatureNoDer extends constantDutyTemperatureFlash { * * @param system a {@link neqsim.thermo.system.SystemInterface} object */ - public bubblePointTemperatureNoDer(SystemInterface system) { + public BubblePointTemperatureNoDer(SystemInterface system) { super(system); } diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/calcSaltSatauration.java b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/CalcSaltSatauration.java similarity index 94% rename from src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/calcSaltSatauration.java rename to src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/CalcSaltSatauration.java index 8ff951293f..98aa34100e 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/calcSaltSatauration.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/CalcSaltSatauration.java @@ -1,4 +1,4 @@ -package neqsim.thermodynamicOperations.flashOps.saturationOps; +package neqsim.thermodynamicoperations.flashops.saturationops; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -12,9 +12,9 @@ * @author asmund * @version $Id: $Id */ -public class calcSaltSatauration extends constantDutyTemperatureFlash { +public class CalcSaltSatauration extends ConstantDutyTemperatureFlash { private static final long serialVersionUID = 1000; - static Logger logger = LogManager.getLogger(calcSaltSatauration.class); + static Logger logger = LogManager.getLogger(CalcSaltSatauration.class); String saltName; @@ -26,7 +26,7 @@ public class calcSaltSatauration extends constantDutyTemperatureFlash { * @param system a {@link neqsim.thermo.system.SystemInterface} object * @param name a {@link java.lang.String} object */ - public calcSaltSatauration(SystemInterface system, String name) { + public CalcSaltSatauration(SystemInterface system, String name) { super(system); this.saltName = name; logger.info("ok "); diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/checkScalePotential.java b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/CheckScalePotential.java similarity index 97% rename from src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/checkScalePotential.java rename to src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/CheckScalePotential.java index bd3e44d638..8897eb9860 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/checkScalePotential.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/CheckScalePotential.java @@ -1,4 +1,4 @@ -package neqsim.thermodynamicOperations.flashOps.saturationOps; +package neqsim.thermodynamicoperations.flashops.saturationops; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -12,9 +12,9 @@ * @author asmund * @version $Id: $Id */ -public class checkScalePotential extends constantDutyTemperatureFlash { +public class CheckScalePotential extends ConstantDutyTemperatureFlash { private static final long serialVersionUID = 1000; - static Logger logger = LogManager.getLogger(checkScalePotential.class); + static Logger logger = LogManager.getLogger(CheckScalePotential.class); String saltName; int phaseNumber = 1; @@ -28,7 +28,7 @@ public class checkScalePotential extends constantDutyTemperatureFlash { * @param system a {@link neqsim.thermo.system.SystemInterface} object * @param phaseNumber a int */ - public checkScalePotential(SystemInterface system, int phaseNumber) { + public CheckScalePotential(SystemInterface system, int phaseNumber) { super(system); this.phaseNumber = phaseNumber; logger.info("ok "); diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/constantDutyFlash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/ConstantDutyFlash.java similarity index 93% rename from src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/constantDutyFlash.java rename to src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/ConstantDutyFlash.java index ceb45933af..1713d08d2e 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/constantDutyFlash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/ConstantDutyFlash.java @@ -1,4 +1,4 @@ -package neqsim.thermodynamicOperations.flashOps.saturationOps; +package neqsim.thermodynamicoperations.flashops.saturationops; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -13,9 +13,9 @@ * @author asmund * @version $Id: $Id */ -public abstract class constantDutyFlash implements ConstantDutyFlashInterface { +public abstract class ConstantDutyFlash implements ConstantDutyFlashInterface { private static final long serialVersionUID = 1000; - static Logger logger = LogManager.getLogger(constantDutyFlash.class); + static Logger logger = LogManager.getLogger(ConstantDutyFlash.class); SystemInterface system; protected boolean superCritical = false; @@ -41,7 +41,7 @@ public abstract class constantDutyFlash implements ConstantDutyFlashInterface { /** *

Constructor for constantDutyFlash.

*/ - public constantDutyFlash() { + public ConstantDutyFlash() { } /** @@ -51,7 +51,7 @@ public constantDutyFlash() { * * @param system a {@link neqsim.thermo.system.SystemInterface} object */ - public constantDutyFlash(SystemInterface system) { + public ConstantDutyFlash(SystemInterface system) { this.system = system; lnOldOldK = new double[system.getPhases()[0].getNumberOfComponents()]; lnOldK = new double[system.getPhases()[0].getNumberOfComponents()]; diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/ConstantDutyFlashInterface.java b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/ConstantDutyFlashInterface.java similarity index 71% rename from src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/ConstantDutyFlashInterface.java rename to src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/ConstantDutyFlashInterface.java index c8517bcc84..d8c14de7ab 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/ConstantDutyFlashInterface.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/ConstantDutyFlashInterface.java @@ -1,6 +1,6 @@ -package neqsim.thermodynamicOperations.flashOps.saturationOps; +package neqsim.thermodynamicoperations.flashops.saturationops; -import neqsim.thermodynamicOperations.OperationInterface; +import neqsim.thermodynamicoperations.OperationInterface; /** *

diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/constantDutyPressureFlash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/ConstantDutyPressureFlash.java similarity index 93% rename from src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/constantDutyPressureFlash.java rename to src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/ConstantDutyPressureFlash.java index 315894aa43..abae2b2152 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/constantDutyPressureFlash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/ConstantDutyPressureFlash.java @@ -1,4 +1,4 @@ -package neqsim.thermodynamicOperations.flashOps.saturationOps; +package neqsim.thermodynamicoperations.flashops.saturationops; import neqsim.thermo.system.SystemInterface; @@ -10,7 +10,7 @@ * @author asmund * @version $Id: $Id */ -public class constantDutyPressureFlash extends constantDutyFlash { +public class ConstantDutyPressureFlash extends ConstantDutyFlash { private static final long serialVersionUID = 1000; /** @@ -20,7 +20,7 @@ public class constantDutyPressureFlash extends constantDutyFlash { * * @param system a {@link neqsim.thermo.system.SystemInterface} object */ - public constantDutyPressureFlash(SystemInterface system) { + public ConstantDutyPressureFlash(SystemInterface system) { super(system); } diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/constantDutyTemperatureFlash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/ConstantDutyTemperatureFlash.java similarity index 92% rename from src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/constantDutyTemperatureFlash.java rename to src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/ConstantDutyTemperatureFlash.java index eb2164df66..fd0a2af18e 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/constantDutyTemperatureFlash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/ConstantDutyTemperatureFlash.java @@ -1,4 +1,4 @@ -package neqsim.thermodynamicOperations.flashOps.saturationOps; +package neqsim.thermodynamicoperations.flashops.saturationops; import neqsim.thermo.system.SystemInterface; @@ -10,7 +10,7 @@ * @author asmund * @version $Id: $Id */ -public class constantDutyTemperatureFlash extends constantDutyFlash { +public class ConstantDutyTemperatureFlash extends ConstantDutyFlash { private static final long serialVersionUID = 1000; /** @@ -18,7 +18,7 @@ public class constantDutyTemperatureFlash extends constantDutyFlash { * Constructor for constantDutyTemperatureFlash. *

*/ - public constantDutyTemperatureFlash() { + public ConstantDutyTemperatureFlash() { } /** @@ -28,7 +28,7 @@ public constantDutyTemperatureFlash() { * * @param system a {@link neqsim.thermo.system.SystemInterface} object */ - public constantDutyTemperatureFlash(SystemInterface system) { + public ConstantDutyTemperatureFlash(SystemInterface system) { super(system); } diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/cricondebarFlash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/CricondebarFlash.java similarity index 96% rename from src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/cricondebarFlash.java rename to src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/CricondebarFlash.java index 1afc6c7ebf..517de33432 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/cricondebarFlash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/CricondebarFlash.java @@ -1,10 +1,10 @@ -package neqsim.thermodynamicOperations.flashOps.saturationOps; +package neqsim.thermodynamicoperations.flashops.saturationops; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import Jama.Matrix; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

@@ -14,9 +14,9 @@ * @author asmund * @version $Id: $Id */ -public class cricondebarFlash extends constantDutyPressureFlash { +public class CricondebarFlash extends ConstantDutyPressureFlash { private static final long serialVersionUID = 1000; - static Logger logger = LogManager.getLogger(constantDutyFlash.class); + static Logger logger = LogManager.getLogger(ConstantDutyFlash.class); Matrix Jac; Matrix fvec; @@ -28,7 +28,7 @@ public class cricondebarFlash extends constantDutyPressureFlash { * * @param system a {@link neqsim.thermo.system.SystemInterface} object */ - public cricondebarFlash(SystemInterface system) { + public CricondebarFlash(SystemInterface system) { super(system); Jac = new Matrix(system.getPhase(0).getNumberOfComponents() + 1, system.getPhase(0).getNumberOfComponents() + 1); diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/cricondenBarTemp.java b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/CricondenBarTemp.java similarity index 95% rename from src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/cricondenBarTemp.java rename to src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/CricondenBarTemp.java index ec4d6bc374..f9b259adc2 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/cricondenBarTemp.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/CricondenBarTemp.java @@ -1,4 +1,4 @@ -package neqsim.thermodynamicOperations.flashOps.saturationOps; +package neqsim.thermodynamicoperations.flashops.saturationops; import Jama.Matrix; import neqsim.thermo.system.SystemInterface; @@ -11,7 +11,7 @@ * @author asmund * @version $Id: $Id */ -public class cricondenBarTemp implements java.io.Serializable { +public class CricondenBarTemp implements java.io.Serializable { private static final long serialVersionUID = 1000; int neq = 0; int iter = 0; @@ -51,7 +51,7 @@ public class cricondenBarTemp implements java.io.Serializable { * @param numberOfPhases a int * @param numberOfComponents a int */ - public cricondenBarTemp(SystemInterface system, int numberOfPhases, int numberOfComponents) { + public CricondenBarTemp(SystemInterface system, int numberOfPhases, int numberOfComponents) { this.system = system; this.numberOfComponents = numberOfComponents; neq = numberOfComponents; diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/cricondenBarTemp1.java b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/CricondenBarTemp1.java similarity index 96% rename from src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/cricondenBarTemp1.java rename to src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/CricondenBarTemp1.java index 8c7d17d6f8..236ccd3867 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/cricondenBarTemp1.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/CricondenBarTemp1.java @@ -1,4 +1,4 @@ -package neqsim.thermodynamicOperations.flashOps.saturationOps; +package neqsim.thermodynamicoperations.flashops.saturationops; import Jama.Matrix; import neqsim.thermo.system.SystemInterface; @@ -11,7 +11,7 @@ * @author asmund * @version $Id: $Id */ -public class cricondenBarTemp1 implements java.io.Serializable { +public class CricondenBarTemp1 implements java.io.Serializable { private static final long serialVersionUID = 1000; int neq = 0; @@ -51,7 +51,7 @@ public class cricondenBarTemp1 implements java.io.Serializable { * * @param system a {@link neqsim.thermo.system.SystemInterface} object */ - public cricondenBarTemp1(SystemInterface system) { + public CricondenBarTemp1(SystemInterface system) { this.system = system; this.numberOfComponents = system.getPhase(0).getNumberOfComponents(); neq = numberOfComponents; diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/dewPointPressureFlash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/DewPointPressureFlash.java similarity index 95% rename from src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/dewPointPressureFlash.java rename to src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/DewPointPressureFlash.java index 509e14c620..9428dfeec7 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/dewPointPressureFlash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/DewPointPressureFlash.java @@ -1,4 +1,4 @@ -package neqsim.thermodynamicOperations.flashOps.saturationOps; +package neqsim.thermodynamicoperations.flashops.saturationops; import neqsim.thermo.system.SystemInterface; @@ -10,7 +10,7 @@ * @author asmund * @version $Id: $Id */ -public class dewPointPressureFlash extends constantDutyTemperatureFlash { +public class DewPointPressureFlash extends ConstantDutyTemperatureFlash { private static final long serialVersionUID = 1000; /** @@ -20,7 +20,7 @@ public class dewPointPressureFlash extends constantDutyTemperatureFlash { * * @param system a {@link neqsim.thermo.system.SystemInterface} object */ - public dewPointPressureFlash(SystemInterface system) { + public DewPointPressureFlash(SystemInterface system) { super(system); } diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/dewPointTemperatureFlash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/DewPointTemperatureFlash.java similarity index 96% rename from src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/dewPointTemperatureFlash.java rename to src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/DewPointTemperatureFlash.java index 155aef5337..0f8a75e042 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/dewPointTemperatureFlash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/DewPointTemperatureFlash.java @@ -1,4 +1,4 @@ -package neqsim.thermodynamicOperations.flashOps.saturationOps; +package neqsim.thermodynamicoperations.flashops.saturationops; import neqsim.thermo.system.SystemInterface; @@ -10,7 +10,7 @@ * @author asmund * @version $Id: $Id */ -public class dewPointTemperatureFlash extends constantDutyTemperatureFlash { +public class DewPointTemperatureFlash extends ConstantDutyTemperatureFlash { private static final long serialVersionUID = 1000; /** @@ -20,7 +20,7 @@ public class dewPointTemperatureFlash extends constantDutyTemperatureFlash { * * @param system a {@link neqsim.thermo.system.SystemInterface} object */ - public dewPointTemperatureFlash(SystemInterface system) { + public DewPointTemperatureFlash(SystemInterface system) { super(system); } diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/dewPointTemperatureFlashDer.java b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/DewPointTemperatureFlashDer.java similarity index 96% rename from src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/dewPointTemperatureFlashDer.java rename to src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/DewPointTemperatureFlashDer.java index 3966f6215b..0488807a99 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/dewPointTemperatureFlashDer.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/DewPointTemperatureFlashDer.java @@ -1,4 +1,4 @@ -package neqsim.thermodynamicOperations.flashOps.saturationOps; +package neqsim.thermodynamicoperations.flashops.saturationops; import neqsim.thermo.system.SystemInterface; @@ -10,7 +10,7 @@ * @author asmund * @version $Id: $Id */ -public class dewPointTemperatureFlashDer extends constantDutyTemperatureFlash { +public class DewPointTemperatureFlashDer extends ConstantDutyTemperatureFlash { private static final long serialVersionUID = 1000; /** @@ -20,7 +20,7 @@ public class dewPointTemperatureFlashDer extends constantDutyTemperatureFlash { * * @param system a {@link neqsim.thermo.system.SystemInterface} object */ - public dewPointTemperatureFlashDer(SystemInterface system) { + public DewPointTemperatureFlashDer(SystemInterface system) { super(system); } diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/FreezeOut.java b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/FreezeOut.java similarity index 97% rename from src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/FreezeOut.java rename to src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/FreezeOut.java index dc0c4aea58..7c6acb67b7 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/FreezeOut.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/FreezeOut.java @@ -1,4 +1,4 @@ -package neqsim.thermodynamicOperations.flashOps.saturationOps; +package neqsim.thermodynamicoperations.flashops.saturationops; import java.io.FileWriter; import java.io.IOException; @@ -9,7 +9,7 @@ import neqsim.thermo.phase.PhaseType; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkSchwartzentruberEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

@@ -19,7 +19,7 @@ * @author esol * @version $Id: $Id */ -public class FreezeOut extends constantDutyTemperatureFlash +public class FreezeOut extends ConstantDutyTemperatureFlash implements ThermodynamicConstantsInterface { private static final long serialVersionUID = 1000; static Logger logger = LogManager.getLogger(FreezeOut.class); diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/freezingPointTemperatureFlash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/FreezingPointTemperatureFlash.java similarity index 94% rename from src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/freezingPointTemperatureFlash.java rename to src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/FreezingPointTemperatureFlash.java index bc700a7806..f00d49d323 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/freezingPointTemperatureFlash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/FreezingPointTemperatureFlash.java @@ -1,4 +1,4 @@ -package neqsim.thermodynamicOperations.flashOps.saturationOps; +package neqsim.thermodynamicoperations.flashops.saturationops; import java.io.FileWriter; import java.io.IOException; @@ -7,7 +7,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

@@ -17,10 +17,10 @@ * @author asmund * @version $Id: $Id */ -public class freezingPointTemperatureFlash extends constantDutyTemperatureFlash +public class FreezingPointTemperatureFlash extends ConstantDutyTemperatureFlash implements ThermodynamicConstantsInterface { private static final long serialVersionUID = 1000; - static Logger logger = LogManager.getLogger(freezingPointTemperatureFlash.class); + static Logger logger = LogManager.getLogger(FreezingPointTemperatureFlash.class); public boolean noFreezeFlash = true; public int Niterations = 0; @@ -34,7 +34,7 @@ public class freezingPointTemperatureFlash extends constantDutyTemperatureFlash * * @param system a {@link neqsim.thermo.system.SystemInterface} object */ - public freezingPointTemperatureFlash(SystemInterface system) { + public FreezingPointTemperatureFlash(SystemInterface system) { super(system); } @@ -46,7 +46,7 @@ public freezingPointTemperatureFlash(SystemInterface system) { * @param system a {@link neqsim.thermo.system.SystemInterface} object * @param Freeze a boolean */ - public freezingPointTemperatureFlash(SystemInterface system, boolean Freeze) { + public FreezingPointTemperatureFlash(SystemInterface system, boolean Freeze) { super(system); noFreezeFlash = Freeze; } diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/freezingPointTemperatureFlashOld.java b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/FreezingPointTemperatureFlashOld.java similarity index 92% rename from src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/freezingPointTemperatureFlashOld.java rename to src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/FreezingPointTemperatureFlashOld.java index c976adb5c7..e8d126f97f 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/freezingPointTemperatureFlashOld.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/FreezingPointTemperatureFlashOld.java @@ -1,9 +1,9 @@ -package neqsim.thermodynamicOperations.flashOps.saturationOps; +package neqsim.thermodynamicoperations.flashops.saturationops; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

@@ -13,9 +13,9 @@ * @author asmund * @version $Id: $Id */ -public class freezingPointTemperatureFlashOld extends constantDutyTemperatureFlash { +public class FreezingPointTemperatureFlashOld extends ConstantDutyTemperatureFlash { private static final long serialVersionUID = 1000; - static Logger logger = LogManager.getLogger(freezingPointTemperatureFlashOld.class); + static Logger logger = LogManager.getLogger(FreezingPointTemperatureFlashOld.class); /** *

@@ -24,7 +24,7 @@ public class freezingPointTemperatureFlashOld extends constantDutyTemperatureFla * * @param system a {@link neqsim.thermo.system.SystemInterface} object */ - public freezingPointTemperatureFlashOld(SystemInterface system) { + public FreezingPointTemperatureFlashOld(SystemInterface system) { super(system); } diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/freezingPointTemperatureFlashTR.java b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/FreezingPointTemperatureFlashTR.java similarity index 95% rename from src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/freezingPointTemperatureFlashTR.java rename to src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/FreezingPointTemperatureFlashTR.java index 3d694eb9e8..bc37aed7dc 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/freezingPointTemperatureFlashTR.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/FreezingPointTemperatureFlashTR.java @@ -1,4 +1,4 @@ -package neqsim.thermodynamicOperations.flashOps.saturationOps; +package neqsim.thermodynamicoperations.flashops.saturationops; import java.io.FileWriter; import java.io.IOException; @@ -8,7 +8,7 @@ import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkSchwartzentruberEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

@@ -18,10 +18,10 @@ * @author asmund * @version $Id: $Id */ -public class freezingPointTemperatureFlashTR extends constantDutyTemperatureFlash +public class FreezingPointTemperatureFlashTR extends ConstantDutyTemperatureFlash implements ThermodynamicConstantsInterface { private static final long serialVersionUID = 1000; - static Logger logger = LogManager.getLogger(freezingPointTemperatureFlashTR.class); + static Logger logger = LogManager.getLogger(FreezingPointTemperatureFlashTR.class); public boolean noFreezeFlash = true; public int Niterations = 0; @@ -38,7 +38,7 @@ public class freezingPointTemperatureFlashTR extends constantDutyTemperatureFlas * * @param Freeze a boolean */ - public freezingPointTemperatureFlashTR(boolean Freeze) { + public FreezingPointTemperatureFlashTR(boolean Freeze) { noFreezeFlash = Freeze; } @@ -49,7 +49,7 @@ public freezingPointTemperatureFlashTR(boolean Freeze) { * * @param system a {@link neqsim.thermo.system.SystemInterface} object */ - public freezingPointTemperatureFlashTR(SystemInterface system) { + public FreezingPointTemperatureFlashTR(SystemInterface system) { super(system); } @@ -61,7 +61,7 @@ public freezingPointTemperatureFlashTR(SystemInterface system) { * @param system a {@link neqsim.thermo.system.SystemInterface} object * @param Freeze a boolean */ - public freezingPointTemperatureFlashTR(SystemInterface system, boolean Freeze) { + public FreezingPointTemperatureFlashTR(SystemInterface system, boolean Freeze) { super(system); noFreezeFlash = Freeze; } diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/FugTestConstP.java b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/FugTestConstP.java similarity index 94% rename from src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/FugTestConstP.java rename to src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/FugTestConstP.java index 98676e2491..fd4c2c3f0c 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/FugTestConstP.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/FugTestConstP.java @@ -1,13 +1,13 @@ -package neqsim.thermodynamicOperations.flashOps.saturationOps; +package neqsim.thermodynamicoperations.flashops.saturationops; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.dataPresentation.JFreeChart.graph2b; +import neqsim.datapresentation.jfreechart.Graph2b; import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.phase.PhaseType; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkSchwartzentruberEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

@@ -17,7 +17,7 @@ * @author esol * @version $Id: $Id */ -public class FugTestConstP extends constantDutyTemperatureFlash +public class FugTestConstP extends ConstantDutyTemperatureFlash implements ThermodynamicConstantsInterface { private static final long serialVersionUID = 1000; static Logger logger = LogManager.getLogger(FugTestConstP.class); @@ -147,13 +147,13 @@ public void run() { title[0] = "Solid Fugacity"; title[1] = "Fluid Fugacity"; - graph2b graffug = new graph2b(Fug, title, compName + " Fugacity VS T, constant P= " + pres, + Graph2b graffug = new Graph2b(Fug, title, compName + " Fugacity VS T, constant P= " + pres, "Temperature [K]", "Fugacity [bar]"); graffug.setVisible(true); String[] title2 = new String[1]; title2[0] = "Solid/Fluid"; - graph2b grafvapor = new graph2b(Fugrel, title2, compName + " Fugacity Ratio", + Graph2b grafvapor = new Graph2b(Fugrel, title2, compName + " Fugacity Ratio", "Temperature [K]", "Fsolid/Ffluid"); grafvapor.setVisible(true); } // end solidcheck lokke diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/HCdewPointPressureFlash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/HCdewPointPressureFlash.java similarity index 97% rename from src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/HCdewPointPressureFlash.java rename to src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/HCdewPointPressureFlash.java index 80a2de9d0b..cff08d8038 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/HCdewPointPressureFlash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/HCdewPointPressureFlash.java @@ -1,4 +1,4 @@ -package neqsim.thermodynamicOperations.flashOps.saturationOps; +package neqsim.thermodynamicoperations.flashops.saturationops; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -12,7 +12,7 @@ * @author asmund * @version $Id: $Id */ -public class HCdewPointPressureFlash extends constantDutyTemperatureFlash { +public class HCdewPointPressureFlash extends ConstantDutyTemperatureFlash { private static final long serialVersionUID = 1000; static Logger logger = LogManager.getLogger(HCdewPointPressureFlash.class); diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/HydrateEquilibriumLine.java b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/HydrateEquilibriumLine.java similarity index 89% rename from src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/HydrateEquilibriumLine.java rename to src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/HydrateEquilibriumLine.java index f2227f7c7c..10409aff70 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/HydrateEquilibriumLine.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/HydrateEquilibriumLine.java @@ -1,7 +1,7 @@ -package neqsim.thermodynamicOperations.flashOps.saturationOps; +package neqsim.thermodynamicoperations.flashops.saturationops; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

@@ -11,7 +11,7 @@ * @author ESOL * @version $Id: $Id */ -public class HydrateEquilibriumLine extends constantDutyTemperatureFlash { +public class HydrateEquilibriumLine extends ConstantDutyTemperatureFlash { private static final long serialVersionUID = 1000; double[][] hydratePoints = null; diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/HydrateFormationPressureFlash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/HydrateFormationPressureFlash.java similarity index 92% rename from src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/HydrateFormationPressureFlash.java rename to src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/HydrateFormationPressureFlash.java index 3189cc62e0..10fce60b0d 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/HydrateFormationPressureFlash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/HydrateFormationPressureFlash.java @@ -1,10 +1,10 @@ -package neqsim.thermodynamicOperations.flashOps.saturationOps; +package neqsim.thermodynamicoperations.flashops.saturationops; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import neqsim.thermo.component.ComponentHydrate; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

@@ -14,7 +14,7 @@ * @author asmund * @version $Id: $Id */ -public class HydrateFormationPressureFlash extends constantDutyTemperatureFlash { +public class HydrateFormationPressureFlash extends ConstantDutyTemperatureFlash { private static final long serialVersionUID = 1000; static Logger logger = LogManager.getLogger(HydrateFormationPressureFlash.class); diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/HydrateFormationTemperatureFlash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/HydrateFormationTemperatureFlash.java similarity index 96% rename from src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/HydrateFormationTemperatureFlash.java rename to src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/HydrateFormationTemperatureFlash.java index 8cbb5db896..546b4f4d97 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/HydrateFormationTemperatureFlash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/HydrateFormationTemperatureFlash.java @@ -1,10 +1,10 @@ -package neqsim.thermodynamicOperations.flashOps.saturationOps; +package neqsim.thermodynamicoperations.flashops.saturationops; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import neqsim.thermo.component.ComponentHydrate; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

@@ -14,7 +14,7 @@ * @author asmund * @version $Id: $Id */ -public class HydrateFormationTemperatureFlash extends constantDutyTemperatureFlash { +public class HydrateFormationTemperatureFlash extends ConstantDutyTemperatureFlash { private static final long serialVersionUID = 1000; static Logger logger = LogManager.getLogger(HydrateFormationTemperatureFlash.class); diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/HydrateInhibitorConcentrationFlash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/HydrateInhibitorConcentrationFlash.java similarity index 95% rename from src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/HydrateInhibitorConcentrationFlash.java rename to src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/HydrateInhibitorConcentrationFlash.java index 6bcba63062..e3d5956fb0 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/HydrateInhibitorConcentrationFlash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/HydrateInhibitorConcentrationFlash.java @@ -1,10 +1,10 @@ -package neqsim.thermodynamicOperations.flashOps.saturationOps; +package neqsim.thermodynamicoperations.flashops.saturationops; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkCPAstatoil; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

@@ -14,7 +14,7 @@ * @author asmund * @version $Id: $Id */ -public class HydrateInhibitorConcentrationFlash extends constantDutyTemperatureFlash { +public class HydrateInhibitorConcentrationFlash extends ConstantDutyTemperatureFlash { private static final long serialVersionUID = 1000; static Logger logger = LogManager.getLogger(HydrateInhibitorConcentrationFlash.class); diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/HydrateInhibitorwtFlash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/HydrateInhibitorwtFlash.java similarity index 95% rename from src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/HydrateInhibitorwtFlash.java rename to src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/HydrateInhibitorwtFlash.java index 8dec603b87..da5a5522e9 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/HydrateInhibitorwtFlash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/HydrateInhibitorwtFlash.java @@ -1,10 +1,10 @@ -package neqsim.thermodynamicOperations.flashOps.saturationOps; +package neqsim.thermodynamicoperations.flashops.saturationops; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import neqsim.thermo.phase.PhaseType; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

@@ -14,7 +14,7 @@ * @author asmund * @version $Id: $Id */ -public class HydrateInhibitorwtFlash extends constantDutyTemperatureFlash { +public class HydrateInhibitorwtFlash extends ConstantDutyTemperatureFlash { private static final long serialVersionUID = 1000; static Logger logger = LogManager.getLogger(HydrateInhibitorwtFlash.class); diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/SolidComplexTemperatureCalc.java b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/SolidComplexTemperatureCalc.java similarity index 97% rename from src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/SolidComplexTemperatureCalc.java rename to src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/SolidComplexTemperatureCalc.java index dc805bf969..6faec09dad 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/SolidComplexTemperatureCalc.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/SolidComplexTemperatureCalc.java @@ -1,9 +1,9 @@ -package neqsim.thermodynamicOperations.flashOps.saturationOps; +package neqsim.thermodynamicoperations.flashops.saturationops; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

@@ -13,7 +13,7 @@ * @author asmund * @version $Id: $Id */ -public class SolidComplexTemperatureCalc extends constantDutyTemperatureFlash { +public class SolidComplexTemperatureCalc extends ConstantDutyTemperatureFlash { private static final long serialVersionUID = 1000; static Logger logger = LogManager.getLogger(SolidComplexTemperatureCalc.class); diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/WATcalc.java b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/WATcalc.java similarity index 92% rename from src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/WATcalc.java rename to src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/WATcalc.java index 8aa9f60915..1e29556fa7 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/WATcalc.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/WATcalc.java @@ -1,9 +1,9 @@ -package neqsim.thermodynamicOperations.flashOps.saturationOps; +package neqsim.thermodynamicoperations.flashops.saturationops; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

@@ -13,7 +13,7 @@ * @author asmund * @version $Id: $Id */ -public class WATcalc extends constantDutyTemperatureFlash { +public class WATcalc extends ConstantDutyTemperatureFlash { private static final long serialVersionUID = 1000; static Logger logger = LogManager.getLogger(WATcalc.class); diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/WaterDewPointEquilibriumLine.java b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/WaterDewPointEquilibriumLine.java similarity index 89% rename from src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/WaterDewPointEquilibriumLine.java rename to src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/WaterDewPointEquilibriumLine.java index d7b0f80eb8..13428d6093 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/WaterDewPointEquilibriumLine.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/WaterDewPointEquilibriumLine.java @@ -1,7 +1,7 @@ -package neqsim.thermodynamicOperations.flashOps.saturationOps; +package neqsim.thermodynamicoperations.flashops.saturationops; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

@@ -11,7 +11,7 @@ * @author ESOL * @version $Id: $Id */ -public class WaterDewPointEquilibriumLine extends constantDutyTemperatureFlash { +public class WaterDewPointEquilibriumLine extends ConstantDutyTemperatureFlash { private static final long serialVersionUID = 1000; double[][] hydratePoints = null; diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/waterDewPointTemperatureFlash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/WaterDewPointTemperatureFlash.java similarity index 93% rename from src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/waterDewPointTemperatureFlash.java rename to src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/WaterDewPointTemperatureFlash.java index 4ab87f72aa..f7b4ee1cd7 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/waterDewPointTemperatureFlash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/WaterDewPointTemperatureFlash.java @@ -1,4 +1,4 @@ -package neqsim.thermodynamicOperations.flashOps.saturationOps; +package neqsim.thermodynamicoperations.flashops.saturationops; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -12,9 +12,9 @@ * @author asmund * @version $Id: $Id */ -public class waterDewPointTemperatureFlash extends constantDutyTemperatureFlash { +public class WaterDewPointTemperatureFlash extends ConstantDutyTemperatureFlash { private static final long serialVersionUID = 1000; - static Logger logger = LogManager.getLogger(waterDewPointTemperatureFlash.class); + static Logger logger = LogManager.getLogger(WaterDewPointTemperatureFlash.class); /** *

@@ -23,7 +23,7 @@ public class waterDewPointTemperatureFlash extends constantDutyTemperatureFlash * * @param system a {@link neqsim.thermo.system.SystemInterface} object */ - public waterDewPointTemperatureFlash(SystemInterface system) { + public WaterDewPointTemperatureFlash(SystemInterface system) { super(system); } diff --git a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/waterDewPointTemperatureMultiphaseFlash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/WaterDewPointTemperatureMultiphaseFlash.java similarity index 84% rename from src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/waterDewPointTemperatureMultiphaseFlash.java rename to src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/WaterDewPointTemperatureMultiphaseFlash.java index 2934aa20b4..e5e5cd1f8e 100644 --- a/src/main/java/neqsim/thermodynamicOperations/flashOps/saturationOps/waterDewPointTemperatureMultiphaseFlash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/WaterDewPointTemperatureMultiphaseFlash.java @@ -1,9 +1,9 @@ -package neqsim.thermodynamicOperations.flashOps.saturationOps; +package neqsim.thermodynamicoperations.flashops.saturationops; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

@@ -13,9 +13,9 @@ * @author asmund * @version $Id: $Id */ -public class waterDewPointTemperatureMultiphaseFlash extends constantDutyTemperatureFlash { +public class WaterDewPointTemperatureMultiphaseFlash extends ConstantDutyTemperatureFlash { private static final long serialVersionUID = 1000; - static Logger logger = LogManager.getLogger(waterDewPointTemperatureMultiphaseFlash.class); + static Logger logger = LogManager.getLogger(WaterDewPointTemperatureMultiphaseFlash.class); /** *

@@ -24,7 +24,7 @@ public class waterDewPointTemperatureMultiphaseFlash extends constantDutyTempera * * @param system a {@link neqsim.thermo.system.SystemInterface} object */ - public waterDewPointTemperatureMultiphaseFlash(SystemInterface system) { + public WaterDewPointTemperatureMultiphaseFlash(SystemInterface system) { super(system); } diff --git a/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/CricondenBarFlash.java b/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/CricondenBarFlash.java similarity index 98% rename from src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/CricondenBarFlash.java rename to src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/CricondenBarFlash.java index 3e39689f6d..1a78b10a6d 100644 --- a/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/CricondenBarFlash.java +++ b/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/CricondenBarFlash.java @@ -1,4 +1,4 @@ -package neqsim.thermodynamicOperations.phaseEnvelopeOps.multicomponentEnvelopeOps; +package neqsim.thermodynamicoperations.phaseenvelopeops.multicomponentenvelopeops; import Jama.Matrix; import neqsim.thermo.phase.PhaseType; @@ -12,7 +12,7 @@ * @author asmund * @version $Id: $Id */ -public class CricondenBarFlash extends pTphaseEnvelope { +public class CricondenBarFlash extends PTphaseEnvelope { private static final long serialVersionUID = 1000; int neq = 0; double beta = 0; diff --git a/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/CricondenThermFlash.java b/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/CricondenThermFlash.java similarity index 98% rename from src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/CricondenThermFlash.java rename to src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/CricondenThermFlash.java index 68c699a01a..2a4a96de4a 100644 --- a/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/CricondenThermFlash.java +++ b/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/CricondenThermFlash.java @@ -1,4 +1,4 @@ -package neqsim.thermodynamicOperations.phaseEnvelopeOps.multicomponentEnvelopeOps; +package neqsim.thermodynamicoperations.phaseenvelopeops.multicomponentenvelopeops; import Jama.Matrix; import neqsim.thermo.system.SystemInterface; @@ -11,7 +11,7 @@ * @author asmund * @version $Id: $Id */ -public class CricondenThermFlash extends pTphaseEnvelope { +public class CricondenThermFlash extends PTphaseEnvelope { private static final long serialVersionUID = 1000; int neq = 0; // double beta = 0; diff --git a/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/HPTphaseEnvelope.java b/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/HPTphaseEnvelope.java similarity index 93% rename from src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/HPTphaseEnvelope.java rename to src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/HPTphaseEnvelope.java index f9a5979237..b76c372816 100644 --- a/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/HPTphaseEnvelope.java +++ b/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/HPTphaseEnvelope.java @@ -4,7 +4,7 @@ * Created on 14. oktober 2000, 21:59 */ -package neqsim.thermodynamicOperations.phaseEnvelopeOps.multicomponentEnvelopeOps; +package neqsim.thermodynamicoperations.phaseenvelopeops.multicomponentenvelopeops; import java.awt.FlowLayout; import javax.swing.JFrame; @@ -13,8 +13,8 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.BaseOperation; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.BaseOperation; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/pTphaseEnvelope.java b/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/PTphaseEnvelope.java similarity index 96% rename from src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/pTphaseEnvelope.java rename to src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/PTphaseEnvelope.java index 135cbef097..28adbfd85d 100644 --- a/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/pTphaseEnvelope.java +++ b/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/PTphaseEnvelope.java @@ -4,7 +4,7 @@ * Created on 14. oktober 2000, 21:59 Updated on May 2019, by Nefeli */ -package neqsim.thermodynamicOperations.phaseEnvelopeOps.multicomponentEnvelopeOps; +package neqsim.thermodynamicoperations.phaseenvelopeops.multicomponentenvelopeops; import java.text.DecimalFormat; import javax.swing.JFrame; @@ -12,10 +12,10 @@ import javax.swing.JProgressBar; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.dataPresentation.JFreeChart.graph2b; +import neqsim.datapresentation.jfreechart.Graph2b; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.BaseOperation; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.BaseOperation; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

@@ -25,14 +25,14 @@ * @author asmund * @version $Id: $Id */ -public class pTphaseEnvelope extends BaseOperation { +public class PTphaseEnvelope extends BaseOperation { private static final long serialVersionUID = 1000; - static Logger logger = LogManager.getLogger(pTphaseEnvelope.class); + static Logger logger = LogManager.getLogger(PTphaseEnvelope.class); double maxPressure = 1000.0; double minPressure = 1.0; double[][] copiedPoints = null; - graph2b graph2 = null; + Graph2b graph2 = null; SystemInterface system; boolean bubblePointFirst = true; boolean hascopiedPoints = false; @@ -105,7 +105,7 @@ public class pTphaseEnvelope extends BaseOperation { * Constructor for pTphaseEnvelope. *

*/ - public pTphaseEnvelope() {} + public PTphaseEnvelope() {} /** *

@@ -118,7 +118,7 @@ public pTphaseEnvelope() {} * @param lowPres a double * @param bubfirst a boolean */ - public pTphaseEnvelope(SystemInterface system, String name, double phaseFraction, double lowPres, + public PTphaseEnvelope(SystemInterface system, String name, double phaseFraction, double lowPres, boolean bubfirst) { this.bubblePointFirst = bubfirst; if (name != null) { @@ -215,8 +215,8 @@ public void run() { system.setPressure(pres); system.setTemperature(temp); - sysNewtonRhapsonPhaseEnvelope nonLinSolver = - new sysNewtonRhapsonPhaseEnvelope(system, 2, system.getPhase(0).getNumberOfComponents()); + SysNewtonRhapsonPhaseEnvelope nonLinSolver = + new SysNewtonRhapsonPhaseEnvelope(system, 2, system.getPhase(0).getNumberOfComponents()); startPres = system.getPressure(); nonLinSolver.setu(); @@ -570,22 +570,22 @@ public void displayResult() { String title5 = "PS-graph TC=" + String.valueOf(nf.format(TC)) + " PC=" + String.valueOf(nf.format(PC)); - graph2b graph3 = new graph2b(pointsH2, navn, title3, "Enthalpy [kJ/kg]", "Pressure [bara]"); + Graph2b graph3 = new Graph2b(pointsH2, navn, title3, "Enthalpy [kJ/kg]", "Pressure [bara]"); graph3.setVisible(true); // graph3.saveFigure(new String(util.util.FileSystemSettings.tempDir + // "NeqSimTempFig4.png")); - graph2b graph4 = new graph2b(pointsV2, navn, title4, "Density [kg/m^3]", "Pressure [bara]"); + Graph2b graph4 = new Graph2b(pointsV2, navn, title4, "Density [kg/m^3]", "Pressure [bara]"); graph4.setVisible(true); // graph4.saveFigure(util.util.FileSystemSettings.tempDir + // "NeqSimTempFig2.png"); - graph2b graph5 = new graph2b(pointsS2, navn, title5, "Entropy [kJ/kg*K]", "Pressure [bara]"); + Graph2b graph5 = new Graph2b(pointsS2, navn, title5, "Entropy [kJ/kg*K]", "Pressure [bara]"); graph5.setVisible(true); // graph5.saveFigure(util.util.FileSystemSettings.tempDir + // "NeqSimTempFig3.png"); - graph2 = new graph2b(points2, navn, title, "Temperature [K]", "Pressure [bara]"); + graph2 = new Graph2b(points2, navn, title, "Temperature [K]", "Pressure [bara]"); graph2.setVisible(true); // graph2.saveFigure(util.util.FileSystemSettings.tempDir + // "NeqSimTempFig1.png"); @@ -627,7 +627,7 @@ public org.jfree.chart.JFreeChart getJFreeChart(String name) { String title = "PT-graph TC=" + String.valueOf(nf.format(TC)) + " PC=" + String.valueOf(nf.format(PC)); - graph2 = new graph2b(points2, navn, title, "Temperature [K]", "Pressure [bara]"); + graph2 = new Graph2b(points2, navn, title, "Temperature [K]", "Pressure [bara]"); return graph2.getChart(); } diff --git a/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/pTphaseEnvelope1.java b/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/PTphaseEnvelope1.java similarity index 94% rename from src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/pTphaseEnvelope1.java rename to src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/PTphaseEnvelope1.java index 72e6bbe0b2..701d43d3d6 100644 --- a/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/pTphaseEnvelope1.java +++ b/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/PTphaseEnvelope1.java @@ -1,4 +1,4 @@ -package neqsim.thermodynamicOperations.phaseEnvelopeOps.multicomponentEnvelopeOps; +package neqsim.thermodynamicoperations.phaseenvelopeops.multicomponentenvelopeops; import java.awt.FlowLayout; import java.text.DecimalFormat; @@ -7,10 +7,10 @@ import javax.swing.JProgressBar; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.dataPresentation.JFreeChart.graph2b; +import neqsim.datapresentation.jfreechart.Graph2b; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.BaseOperation; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.BaseOperation; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

@@ -20,11 +20,11 @@ * @author Even Solbraa * @version $Id: $Id */ -public class pTphaseEnvelope1 extends BaseOperation { +public class PTphaseEnvelope1 extends BaseOperation { private static final long serialVersionUID = 1000; - static Logger logger = LogManager.getLogger(pTphaseEnvelope1.class); + static Logger logger = LogManager.getLogger(PTphaseEnvelope1.class); - graph2b graph2 = null; + Graph2b graph2 = null; SystemInterface system; boolean bubblePointFirst = true; double[] cricondenTherm = new double[3]; @@ -83,7 +83,7 @@ public class pTphaseEnvelope1 extends BaseOperation { * @param lowPres a double * @param bubfirst a boolean */ - public pTphaseEnvelope1(SystemInterface system, String name, double phaseFraction, double lowPres, + public PTphaseEnvelope1(SystemInterface system, String name, double phaseFraction, double lowPres, boolean bubfirst) { this.bubblePointFirst = bubfirst; if (name != null) { @@ -168,8 +168,8 @@ public void run() { system.setBeta(phaseFraction); - sysNewtonRhapsonPhaseEnvelope nonLinSolver = - new sysNewtonRhapsonPhaseEnvelope(system, 2, system.getPhase(0).getNumberOfComponents()); + SysNewtonRhapsonPhaseEnvelope nonLinSolver = + new SysNewtonRhapsonPhaseEnvelope(system, 2, system.getPhase(0).getNumberOfComponents()); nonLinSolver.solve(1); startPres = system.getPressure(); @@ -349,19 +349,19 @@ public void displayResult() { // logger.info("start flash"); // logger.info("Tferdig.."); - graph2b graph3 = new graph2b(pointsH2, navn, title3, "Enthalpy [kJ/kg]", "Pressure [bara]"); + Graph2b graph3 = new Graph2b(pointsH2, navn, title3, "Enthalpy [kJ/kg]", "Pressure [bara]"); graph3.setVisible(true); graph3.saveFigure((neqsim.util.util.FileSystemSettings.tempDir + "NeqSimTempFig4.png")); - graph2b graph4 = new graph2b(pointsV2, navn, title4, "Density [kg/m^3]", "Pressure [bara]"); + Graph2b graph4 = new Graph2b(pointsV2, navn, title4, "Density [kg/m^3]", "Pressure [bara]"); graph4.setVisible(true); graph4.saveFigure(neqsim.util.util.FileSystemSettings.tempDir + "NeqSimTempFig2.png"); - graph2b graph5 = new graph2b(pointsS2, navn, title5, "Entropy [kJ/kg*K]", "Pressure [bara]"); + Graph2b graph5 = new Graph2b(pointsS2, navn, title5, "Entropy [kJ/kg*K]", "Pressure [bara]"); graph5.setVisible(true); graph5.saveFigure(neqsim.util.util.FileSystemSettings.tempDir + "NeqSimTempFig3.png"); - graph2 = new graph2b(points2, navn, title, "Temperature [K]", "Pressure [bara]"); + graph2 = new Graph2b(points2, navn, title, "Temperature [K]", "Pressure [bara]"); graph2.setVisible(true); graph2.saveFigure(neqsim.util.util.FileSystemSettings.tempDir + "NeqSimTempFig1.png"); @@ -389,7 +389,7 @@ public org.jfree.chart.JFreeChart getJFreeChart(String name) { String[] navn = {"bubble point", "dew point", "bubble point", "dew point"}; String title = "PT-graph. TC=" + String.valueOf(nf.format(TC)) + "K, PC=" + String.valueOf(nf.format(PC) + " bara"); - graph2 = new graph2b(points2, navn, title, "Temperature [K]", "Pressure [bara]"); + graph2 = new Graph2b(points2, navn, title, "Temperature [K]", "Pressure [bara]"); return graph2.getChart(); } diff --git a/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/pTphaseEnvelopeMay.java b/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/PTphaseEnvelopeMay.java similarity index 96% rename from src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/pTphaseEnvelopeMay.java rename to src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/PTphaseEnvelopeMay.java index b5fd289d82..1887e37b79 100644 --- a/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/pTphaseEnvelopeMay.java +++ b/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/PTphaseEnvelopeMay.java @@ -1,4 +1,4 @@ -package neqsim.thermodynamicOperations.phaseEnvelopeOps.multicomponentEnvelopeOps; +package neqsim.thermodynamicoperations.phaseenvelopeops.multicomponentenvelopeops; import java.text.DecimalFormat; import javax.swing.JFrame; @@ -6,10 +6,10 @@ import javax.swing.JProgressBar; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.dataPresentation.JFreeChart.graph2b; +import neqsim.datapresentation.jfreechart.Graph2b; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.BaseOperation; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.BaseOperation; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

@@ -19,14 +19,14 @@ * @author asmund * @version $Id: $Id */ -public class pTphaseEnvelopeMay extends BaseOperation { +public class PTphaseEnvelopeMay extends BaseOperation { private static final long serialVersionUID = 1000; - static Logger logger = LogManager.getLogger(pTphaseEnvelopeMay.class); + static Logger logger = LogManager.getLogger(PTphaseEnvelopeMay.class); double maxPressure = 1000.0; double minPressure = 1.0; double[][] copiedPoints = null; - graph2b graph2 = null; + Graph2b graph2 = null; SystemInterface system; boolean bubblePointFirst = true; boolean hascopiedPoints = false; @@ -94,7 +94,7 @@ public class pTphaseEnvelopeMay extends BaseOperation { * @param lowPres a double * @param bubfirst a boolean */ - public pTphaseEnvelopeMay(SystemInterface system, String name, double phaseFraction, + public PTphaseEnvelopeMay(SystemInterface system, String name, double phaseFraction, double lowPres, boolean bubfirst) { this.bubblePointFirst = bubfirst; if (name != null) { @@ -188,8 +188,8 @@ public void run() { system.setPressure(pres); system.setTemperature(temp); - sysNewtonRhapsonPhaseEnvelope nonLinSolver = - new sysNewtonRhapsonPhaseEnvelope(system, 2, system.getPhase(0).getNumberOfComponents()); + SysNewtonRhapsonPhaseEnvelope nonLinSolver = + new SysNewtonRhapsonPhaseEnvelope(system, 2, system.getPhase(0).getNumberOfComponents()); startPres = system.getPressure(); nonLinSolver.setu(); for (np = 1; np < 9980; np++) { @@ -527,22 +527,22 @@ public void displayResult() { String title5 = "PS-graph TC=" + String.valueOf(nf.format(TC)) + " PC=" + String.valueOf(nf.format(PC)); - graph2b graph3 = new graph2b(pointsH2, navn, title3, "Enthalpy [kJ/kg]", "Pressure [bara]"); + Graph2b graph3 = new Graph2b(pointsH2, navn, title3, "Enthalpy [kJ/kg]", "Pressure [bara]"); graph3.setVisible(true); // graph3.saveFigure(new String(util.util.FileSystemSettings.tempDir + // "NeqSimTempFig4.png")); - graph2b graph4 = new graph2b(pointsV2, navn, title4, "Density [kg/m^3]", "Pressure [bara]"); + Graph2b graph4 = new Graph2b(pointsV2, navn, title4, "Density [kg/m^3]", "Pressure [bara]"); graph4.setVisible(true); // graph4.saveFigure(util.util.FileSystemSettings.tempDir + // "NeqSimTempFig2.png"); - graph2b graph5 = new graph2b(pointsS2, navn, title5, "Entropy [kJ/kg*K]", "Pressure [bara]"); + Graph2b graph5 = new Graph2b(pointsS2, navn, title5, "Entropy [kJ/kg*K]", "Pressure [bara]"); graph5.setVisible(true); // graph5.saveFigure(util.util.FileSystemSettings.tempDir + // "NeqSimTempFig3.png"); - graph2 = new graph2b(points2, navn, title, "Temperature [K]", "Pressure [bara]"); + graph2 = new Graph2b(points2, navn, title, "Temperature [K]", "Pressure [bara]"); graph2.setVisible(true); // graph2.saveFigure(util.util.FileSystemSettings.tempDir + // "NeqSimTempFig1.png"); @@ -768,7 +768,7 @@ public org.jfree.chart.JFreeChart getJFreeChart(String name) { String[] navn = {"bubble point", "dew point", "bubble point", "dew point"}; String title = "PT-graph. TC=" + String.valueOf(nf.format(TC)) + "K, PC=" + String.valueOf(nf.format(PC) + " bara"); - graph2 = new graph2b(points2, navn, title, "Temperature [K]", "Pressure [bara]"); + graph2 = new Graph2b(points2, navn, title, "Temperature [K]", "Pressure [bara]"); return graph2.getChart(); } } diff --git a/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/pTphaseEnvelopeNew.java b/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/PTphaseEnvelopeNew.java similarity index 93% rename from src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/pTphaseEnvelopeNew.java rename to src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/PTphaseEnvelopeNew.java index 208a35ecf6..cc148e50b4 100644 --- a/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/pTphaseEnvelopeNew.java +++ b/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/PTphaseEnvelopeNew.java @@ -1,4 +1,4 @@ -package neqsim.thermodynamicOperations.phaseEnvelopeOps.multicomponentEnvelopeOps; +package neqsim.thermodynamicoperations.phaseenvelopeops.multicomponentenvelopeops; import java.awt.FlowLayout; import java.text.DecimalFormat; @@ -7,10 +7,10 @@ import javax.swing.JProgressBar; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.dataPresentation.JFreeChart.graph2b; +import neqsim.datapresentation.jfreechart.Graph2b; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.BaseOperation; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.BaseOperation; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

@@ -20,11 +20,11 @@ * @author Even Solbraa * @version $Id: $Id */ -public class pTphaseEnvelopeNew extends BaseOperation { +public class PTphaseEnvelopeNew extends BaseOperation { private static final long serialVersionUID = 1000; - static Logger logger = LogManager.getLogger(pTphaseEnvelopeNew.class); + static Logger logger = LogManager.getLogger(PTphaseEnvelopeNew.class); - graph2b graph2 = null; + Graph2b graph2 = null; SystemInterface system; double[] cricondenTherm = new double[3]; double[] cricondenBar = new double[3]; @@ -64,7 +64,7 @@ public class pTphaseEnvelopeNew extends BaseOperation { * @param phaseFraction a double * @param lowPres a double */ - public pTphaseEnvelopeNew(SystemInterface system, String name, double phaseFraction, + public PTphaseEnvelopeNew(SystemInterface system, String name, double phaseFraction, double lowPres) { this.system = system; this.phaseFraction = phaseFraction; @@ -108,7 +108,7 @@ public void run() { } logger.info("temperature bubT = " + system.getTemperature()); - sysNewtonRhapsonPhaseEnvelope2 nonLinSolver = new sysNewtonRhapsonPhaseEnvelope2(system); + SysNewtonRhapsonPhaseEnvelope2 nonLinSolver = new SysNewtonRhapsonPhaseEnvelope2(system); nonLinSolver.solve(1); nonLinSolver.calcInc(1); @@ -286,19 +286,19 @@ public void displayResult() { // logger.info("start flash"); // logger.info("Tferdig.."); - graph2b graph3 = new graph2b(pointsH2, navn, title3, "Enthalpy [kJ/kg]", "Pressure [bara]"); + Graph2b graph3 = new Graph2b(pointsH2, navn, title3, "Enthalpy [kJ/kg]", "Pressure [bara]"); graph3.setVisible(true); graph3.saveFigure((neqsim.util.util.FileSystemSettings.tempDir + "NeqSimTempFig4.png")); - graph2b graph4 = new graph2b(pointsV2, navn, title4, "Density [kg/m^3]", "Pressure [bara]"); + Graph2b graph4 = new Graph2b(pointsV2, navn, title4, "Density [kg/m^3]", "Pressure [bara]"); graph4.setVisible(true); graph4.saveFigure(neqsim.util.util.FileSystemSettings.tempDir + "NeqSimTempFig2.png"); - graph2b graph5 = new graph2b(pointsS2, navn, title5, "Entropy [kJ/kg*K]", "Pressure [bara]"); + Graph2b graph5 = new Graph2b(pointsS2, navn, title5, "Entropy [kJ/kg*K]", "Pressure [bara]"); graph5.setVisible(true); graph5.saveFigure(neqsim.util.util.FileSystemSettings.tempDir + "NeqSimTempFig3.png"); - graph2 = new graph2b(points2, navn, title, "Temperature [K]", "Pressure [bara]"); + graph2 = new Graph2b(points2, navn, title, "Temperature [K]", "Pressure [bara]"); graph2.setVisible(true); graph2.saveFigure(neqsim.util.util.FileSystemSettings.tempDir + "NeqSimTempFig1.png"); @@ -326,7 +326,7 @@ public org.jfree.chart.JFreeChart getJFreeChart(String name) { String[] navn = {"bubble point", "dew point", "bubble point", "dew point"}; String title = "PT-graph. TC=" + String.valueOf(nf.format(TC)) + "K, PC=" + String.valueOf(nf.format(PC) + " bara"); - graph2 = new graph2b(points2, navn, title, "Temperature [K]", "Pressure [bara]"); + graph2 = new Graph2b(points2, navn, title, "Temperature [K]", "Pressure [bara]"); return graph2.getChart(); } diff --git a/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/pTphaseEnvelopeNew2.java b/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/PTphaseEnvelopeNew2.java similarity index 97% rename from src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/pTphaseEnvelopeNew2.java rename to src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/PTphaseEnvelopeNew2.java index 7151848f3f..e28278339f 100644 --- a/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/pTphaseEnvelopeNew2.java +++ b/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/PTphaseEnvelopeNew2.java @@ -4,14 +4,14 @@ * Created on 14. oktober 2000, 21:59 Updated on May 2019, by Nefeli */ -package neqsim.thermodynamicOperations.phaseEnvelopeOps.multicomponentEnvelopeOps; +package neqsim.thermodynamicoperations.phaseenvelopeops.multicomponentenvelopeops; import java.util.ArrayList; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.BaseOperation; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.BaseOperation; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

@@ -21,9 +21,9 @@ * @author asmund * @version $Id: $Id */ -public class pTphaseEnvelopeNew2 extends BaseOperation { +public class PTphaseEnvelopeNew2 extends BaseOperation { private static final long serialVersionUID = 1000; - static Logger logger = LogManager.getLogger(pTphaseEnvelopeNew2.class); + static Logger logger = LogManager.getLogger(PTphaseEnvelopeNew2.class); double maxPressure = 1000.0; double minPressure = 1.0; @@ -110,7 +110,7 @@ public class pTphaseEnvelopeNew2 extends BaseOperation { * Constructor for pTphaseEnvelope. *

*/ - public pTphaseEnvelopeNew2() {} + public PTphaseEnvelopeNew2() {} /** *

@@ -123,7 +123,7 @@ public pTphaseEnvelopeNew2() {} * @param lowPres a double * @param bubfirst a boolean */ - public pTphaseEnvelopeNew2(SystemInterface system, String name, double phaseFraction, + public PTphaseEnvelopeNew2(SystemInterface system, String name, double phaseFraction, double lowPres, boolean bubfirst) { this.bubblePointFirst = bubfirst; if (name != null) { @@ -214,8 +214,8 @@ public void run() { system.setPressure(pres); system.setTemperature(temp); - sysNewtonRhapsonPhaseEnvelope nonLinSolver = - new sysNewtonRhapsonPhaseEnvelope(system, 2, system.getPhase(0).getNumberOfComponents()); + SysNewtonRhapsonPhaseEnvelope nonLinSolver = + new SysNewtonRhapsonPhaseEnvelope(system, 2, system.getPhase(0).getNumberOfComponents()); startPres = system.getPressure(); nonLinSolver.setu(); diff --git a/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/sysNewtonRhapsonPhaseEnvelope.java b/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/SysNewtonRhapsonPhaseEnvelope.java similarity index 97% rename from src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/sysNewtonRhapsonPhaseEnvelope.java rename to src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/SysNewtonRhapsonPhaseEnvelope.java index 6ae23169a3..189d761a20 100644 --- a/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/sysNewtonRhapsonPhaseEnvelope.java +++ b/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/SysNewtonRhapsonPhaseEnvelope.java @@ -1,9 +1,9 @@ -package neqsim.thermodynamicOperations.phaseEnvelopeOps.multicomponentEnvelopeOps; +package neqsim.thermodynamicoperations.phaseenvelopeops.multicomponentenvelopeops; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import Jama.Matrix; -import neqsim.MathLib.nonLinearSolver.newtonRhapson; +import neqsim.mathlib.nonlinearsolver.NewtonRhapson; import neqsim.thermo.system.SystemInterface; /** @@ -14,9 +14,9 @@ * @author asmund * @version $Id: $Id */ -public class sysNewtonRhapsonPhaseEnvelope implements java.io.Serializable { +public class SysNewtonRhapsonPhaseEnvelope implements java.io.Serializable { private static final long serialVersionUID = 1000; - static Logger logger = LogManager.getLogger(sysNewtonRhapsonPhaseEnvelope.class); + static Logger logger = LogManager.getLogger(SysNewtonRhapsonPhaseEnvelope.class); double sumx = 0; double sumy = 0; @@ -55,7 +55,7 @@ public class sysNewtonRhapsonPhaseEnvelope implements java.io.Serializable { Matrix s = new Matrix(1, 4); Matrix xg; Matrix xcoef; - newtonRhapson solver; + NewtonRhapson solver; boolean etterCP = false; boolean etterCP2 = false; boolean calcCP = false; @@ -74,7 +74,7 @@ public class sysNewtonRhapsonPhaseEnvelope implements java.io.Serializable { * Constructor for sysNewtonRhapsonPhaseEnvelope. *

*/ - public sysNewtonRhapsonPhaseEnvelope() {} + public SysNewtonRhapsonPhaseEnvelope() {} /** *

@@ -85,7 +85,7 @@ public sysNewtonRhapsonPhaseEnvelope() {} * @param numberOfPhases a int * @param numberOfComponents a int */ - public sysNewtonRhapsonPhaseEnvelope(SystemInterface system, int numberOfPhases, + public SysNewtonRhapsonPhaseEnvelope(SystemInterface system, int numberOfPhases, int numberOfComponents) { this.system = system; this.numberOfComponents = numberOfComponents; @@ -97,7 +97,7 @@ public sysNewtonRhapsonPhaseEnvelope(SystemInterface system, int numberOfPhases, setu(); uold = u.copy(); findSpecEqInit(); - solver = new newtonRhapson(); + solver = new NewtonRhapson(); solver.setOrder(3); } diff --git a/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/sysNewtonRhapsonPhaseEnvelope2.java b/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/SysNewtonRhapsonPhaseEnvelope2.java similarity index 97% rename from src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/sysNewtonRhapsonPhaseEnvelope2.java rename to src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/SysNewtonRhapsonPhaseEnvelope2.java index 1fa5ad5d39..51c8a25b3b 100644 --- a/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/sysNewtonRhapsonPhaseEnvelope2.java +++ b/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/SysNewtonRhapsonPhaseEnvelope2.java @@ -1,4 +1,4 @@ -package neqsim.thermodynamicOperations.phaseEnvelopeOps.multicomponentEnvelopeOps; +package neqsim.thermodynamicoperations.phaseenvelopeops.multicomponentenvelopeops; import org.apache.commons.math3.linear.Array2DRowRealMatrix; import org.apache.commons.math3.linear.DecompositionSolver; @@ -6,7 +6,7 @@ import org.apache.commons.math3.linear.RealMatrix; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.MathLib.nonLinearSolver.newtonRhapson; +import neqsim.mathlib.nonlinearsolver.NewtonRhapson; import neqsim.thermo.system.SystemInterface; /** @@ -17,9 +17,9 @@ * @author asmund * @version $Id: $Id */ -public class sysNewtonRhapsonPhaseEnvelope2 implements java.io.Serializable { +public class SysNewtonRhapsonPhaseEnvelope2 implements java.io.Serializable { private static final long serialVersionUID = 1000; - static Logger logger = LogManager.getLogger(sysNewtonRhapsonPhaseEnvelope2.class); + static Logger logger = LogManager.getLogger(SysNewtonRhapsonPhaseEnvelope2.class); int neq = 0; int iter = 0; @@ -47,7 +47,7 @@ public class sysNewtonRhapsonPhaseEnvelope2 implements java.io.Serializable { RealMatrix s = new Array2DRowRealMatrix(1, 4); RealMatrix xg; RealMatrix xcoef; - newtonRhapson solver; + NewtonRhapson solver; boolean etterCP = false; boolean etterCP2 = false; @@ -56,7 +56,7 @@ public class sysNewtonRhapsonPhaseEnvelope2 implements java.io.Serializable { * Constructor for sysNewtonRhapsonPhaseEnvelope2. *

*/ - public sysNewtonRhapsonPhaseEnvelope2() {} + public SysNewtonRhapsonPhaseEnvelope2() {} /** *

@@ -65,7 +65,7 @@ public sysNewtonRhapsonPhaseEnvelope2() {} * * @param system a {@link neqsim.thermo.system.SystemInterface} object */ - public sysNewtonRhapsonPhaseEnvelope2(SystemInterface system) { + public SysNewtonRhapsonPhaseEnvelope2(SystemInterface system) { this.system = system; neq = system.getPhase(0).getNumberOfComponents() + 2; Jac = new Array2DRowRealMatrix(neq, neq); @@ -76,7 +76,7 @@ public sysNewtonRhapsonPhaseEnvelope2(SystemInterface system) { setu(); uold = u.copy(); findSpecEqInit(); - solver = new newtonRhapson(); + solver = new NewtonRhapson(); solver.setOrder(3); } diff --git a/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/reactiveCurves/pLoadingCurve.java b/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/reactivecurves/PloadingCurve.java similarity index 89% rename from src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/reactiveCurves/pLoadingCurve.java rename to src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/reactivecurves/PloadingCurve.java index f43d5c6f43..4765696f42 100644 --- a/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/reactiveCurves/pLoadingCurve.java +++ b/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/reactivecurves/PloadingCurve.java @@ -1,4 +1,4 @@ -package neqsim.thermodynamicOperations.phaseEnvelopeOps.reactiveCurves; +package neqsim.thermodynamicoperations.phaseenvelopeops.reactivecurves; import java.awt.FlowLayout; import java.text.DecimalFormat; @@ -7,9 +7,9 @@ import javax.swing.JProgressBar; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.dataPresentation.JFreeChart.graph2b; +import neqsim.datapresentation.jfreechart.Graph2b; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.OperationInterface; +import neqsim.thermodynamicoperations.OperationInterface; /** *

@@ -19,9 +19,9 @@ * @author Even Solbraa * @version $Id: $Id */ -public class pLoadingCurve implements OperationInterface { +public class PloadingCurve implements OperationInterface { private static final long serialVersionUID = 1000; - static Logger logger = LogManager.getLogger(pLoadingCurve.class); + static Logger logger = LogManager.getLogger(PloadingCurve.class); SystemInterface system; int i; @@ -61,7 +61,7 @@ public class pLoadingCurve implements OperationInterface { * Constructor for pLoadingCurve. *

*/ - public pLoadingCurve() {} + public PloadingCurve() {} /** *

@@ -70,7 +70,7 @@ public pLoadingCurve() {} * * @param system a {@link neqsim.thermo.system.SystemInterface} object */ - public pLoadingCurve(SystemInterface system) { + public PloadingCurve(SystemInterface system) { this.system = system; lnOldOldK = new double[system.getPhases()[0].getNumberOfComponents()]; lnOldK = new double[system.getPhases()[0].getNumberOfComponents()]; @@ -141,14 +141,14 @@ public void displayResult() { String[] navn = {"CO2 fugacity", "", "", ""}; String title = "CO2 vapour pressure"; - graph2b graph2 = new graph2b(points, navn, title, "loading [-]", "Fugacity CO2 [bar]"); + Graph2b graph2 = new Graph2b(points, navn, title, "loading [-]", "Fugacity CO2 [bar]"); graph2.setVisible(true); } /** {@inheritDoc} */ @Override public void printToFile(String name) { - neqsim.dataPresentation.dataHandeling printDat = new neqsim.dataPresentation.dataHandeling(); + neqsim.datapresentation.DataHandeling printDat = new neqsim.datapresentation.DataHandeling(); printDat.printToFile(points, name); } diff --git a/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/reactiveCurves/pLoadingCurve2.java b/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/reactivecurves/PloadingCurve2.java similarity index 90% rename from src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/reactiveCurves/pLoadingCurve2.java rename to src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/reactivecurves/PloadingCurve2.java index 5e97d8ad33..52f6ab9eb6 100644 --- a/src/main/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/reactiveCurves/pLoadingCurve2.java +++ b/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/reactivecurves/PloadingCurve2.java @@ -1,4 +1,4 @@ -package neqsim.thermodynamicOperations.phaseEnvelopeOps.reactiveCurves; +package neqsim.thermodynamicoperations.phaseenvelopeops.reactivecurves; import java.awt.FlowLayout; import java.text.DecimalFormat; @@ -7,10 +7,10 @@ import javax.swing.JProgressBar; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.dataPresentation.JFreeChart.graph2b; +import neqsim.datapresentation.jfreechart.Graph2b; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.BaseOperation; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.BaseOperation; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

@@ -20,9 +20,9 @@ * @author Even Solbraa * @version $Id: $Id */ -public class pLoadingCurve2 extends BaseOperation { +public class PloadingCurve2 extends BaseOperation { private static final long serialVersionUID = 1000; - static Logger logger = LogManager.getLogger(pLoadingCurve2.class); + static Logger logger = LogManager.getLogger(PloadingCurve2.class); SystemInterface system; int i; @@ -65,7 +65,7 @@ public class pLoadingCurve2 extends BaseOperation { * * @param system a {@link neqsim.thermo.system.SystemInterface} object */ - public pLoadingCurve2(SystemInterface system) { + public PloadingCurve2(SystemInterface system) { this.system = system; lnOldOldK = new double[system.getPhases()[0].getNumberOfComponents()]; lnOldK = new double[system.getPhases()[0].getNumberOfComponents()]; @@ -144,14 +144,14 @@ public void displayResult() { String[] navn = {"CO2 fugacity", "", "", ""}; String title = "CO2 vapour pressure"; - graph2b graph2 = new graph2b(points, navn, title, "loading [-]", "Fugacity CO2 [bar]"); + Graph2b graph2 = new Graph2b(points, navn, title, "loading [-]", "Fugacity CO2 [bar]"); graph2.setVisible(true); } /** {@inheritDoc} */ @Override public void printToFile(String name) { - neqsim.dataPresentation.dataHandeling printDat = new neqsim.dataPresentation.dataHandeling(); + neqsim.datapresentation.DataHandeling printDat = new neqsim.datapresentation.DataHandeling(); printDat.printToFile(points, name); } diff --git a/src/main/java/neqsim/thermodynamicOperations/propertyGenerator/OLGApropertyTableGenerator.java b/src/main/java/neqsim/thermodynamicoperations/propertygenerator/OLGApropertyTableGenerator.java similarity index 98% rename from src/main/java/neqsim/thermodynamicOperations/propertyGenerator/OLGApropertyTableGenerator.java rename to src/main/java/neqsim/thermodynamicoperations/propertygenerator/OLGApropertyTableGenerator.java index c6cc760de7..339c1f0cd2 100644 --- a/src/main/java/neqsim/thermodynamicOperations/propertyGenerator/OLGApropertyTableGenerator.java +++ b/src/main/java/neqsim/thermodynamicoperations/propertygenerator/OLGApropertyTableGenerator.java @@ -1,4 +1,4 @@ -package neqsim.thermodynamicOperations.propertyGenerator; +package neqsim.thermodynamicoperations.propertygenerator; import java.io.BufferedWriter; import java.io.FileOutputStream; @@ -9,7 +9,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.phase.PhaseType; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

@@ -19,7 +19,7 @@ * @author ESOL * @version $Id: $Id */ -public class OLGApropertyTableGenerator extends neqsim.thermodynamicOperations.BaseOperation { +public class OLGApropertyTableGenerator extends neqsim.thermodynamicoperations.BaseOperation { private static final long serialVersionUID = 1000; static Logger logger = LogManager.getLogger(OLGApropertyTableGenerator.class); diff --git a/src/main/java/neqsim/thermodynamicOperations/propertyGenerator/OLGApropertyTableGeneratorKeywordFormat.java b/src/main/java/neqsim/thermodynamicoperations/propertygenerator/OLGApropertyTableGeneratorKeywordFormat.java similarity index 99% rename from src/main/java/neqsim/thermodynamicOperations/propertyGenerator/OLGApropertyTableGeneratorKeywordFormat.java rename to src/main/java/neqsim/thermodynamicoperations/propertygenerator/OLGApropertyTableGeneratorKeywordFormat.java index dd8ea2e0af..ba958acf06 100644 --- a/src/main/java/neqsim/thermodynamicOperations/propertyGenerator/OLGApropertyTableGeneratorKeywordFormat.java +++ b/src/main/java/neqsim/thermodynamicoperations/propertygenerator/OLGApropertyTableGeneratorKeywordFormat.java @@ -1,4 +1,4 @@ -package neqsim.thermodynamicOperations.propertyGenerator; +package neqsim.thermodynamicoperations.propertygenerator; import java.io.BufferedWriter; import java.io.FileOutputStream; @@ -9,7 +9,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

@@ -20,7 +20,7 @@ * @version $Id: $Id */ public class OLGApropertyTableGeneratorKeywordFormat - extends neqsim.thermodynamicOperations.BaseOperation { + extends neqsim.thermodynamicoperations.BaseOperation { private static final long serialVersionUID = 1000; static Logger logger = LogManager.getLogger(OLGApropertyTableGeneratorKeywordFormat.class); diff --git a/src/main/java/neqsim/thermodynamicOperations/propertyGenerator/OLGApropertyTableGeneratorWater.java b/src/main/java/neqsim/thermodynamicoperations/propertygenerator/OLGApropertyTableGeneratorWater.java similarity index 99% rename from src/main/java/neqsim/thermodynamicOperations/propertyGenerator/OLGApropertyTableGeneratorWater.java rename to src/main/java/neqsim/thermodynamicoperations/propertygenerator/OLGApropertyTableGeneratorWater.java index def27913b0..563d2245e0 100644 --- a/src/main/java/neqsim/thermodynamicOperations/propertyGenerator/OLGApropertyTableGeneratorWater.java +++ b/src/main/java/neqsim/thermodynamicoperations/propertygenerator/OLGApropertyTableGeneratorWater.java @@ -1,4 +1,4 @@ -package neqsim.thermodynamicOperations.propertyGenerator; +package neqsim.thermodynamicoperations.propertygenerator; import java.io.BufferedWriter; import java.io.FileOutputStream; @@ -15,7 +15,7 @@ import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkCPAstatoil; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

@@ -25,7 +25,7 @@ * @author ESOL * @version $Id: $Id */ -public class OLGApropertyTableGeneratorWater extends neqsim.thermodynamicOperations.BaseOperation { +public class OLGApropertyTableGeneratorWater extends neqsim.thermodynamicoperations.BaseOperation { private static final long serialVersionUID = 1000; static Logger logger = LogManager.getLogger(OLGApropertyTableGeneratorWater.class); diff --git a/src/main/java/neqsim/thermodynamicOperations/propertyGenerator/OLGApropertyTableGeneratorWaterEven.java b/src/main/java/neqsim/thermodynamicoperations/propertygenerator/OLGApropertyTableGeneratorWaterEven.java similarity index 99% rename from src/main/java/neqsim/thermodynamicOperations/propertyGenerator/OLGApropertyTableGeneratorWaterEven.java rename to src/main/java/neqsim/thermodynamicoperations/propertygenerator/OLGApropertyTableGeneratorWaterEven.java index e2ea191777..bae0ebcb02 100644 --- a/src/main/java/neqsim/thermodynamicOperations/propertyGenerator/OLGApropertyTableGeneratorWaterEven.java +++ b/src/main/java/neqsim/thermodynamicoperations/propertygenerator/OLGApropertyTableGeneratorWaterEven.java @@ -1,4 +1,4 @@ -package neqsim.thermodynamicOperations.propertyGenerator; +package neqsim.thermodynamicoperations.propertygenerator; import java.io.BufferedWriter; import java.io.FileOutputStream; @@ -9,7 +9,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

@@ -20,7 +20,7 @@ * @version $Id: $Id */ public class OLGApropertyTableGeneratorWaterEven - extends neqsim.thermodynamicOperations.BaseOperation { + extends neqsim.thermodynamicoperations.BaseOperation { private static final long serialVersionUID = 1000; static Logger logger = LogManager.getLogger(OLGApropertyTableGeneratorWaterEven.class); diff --git a/src/main/java/neqsim/thermodynamicOperations/propertyGenerator/OLGApropertyTableGeneratorWaterKeywordFormat.java b/src/main/java/neqsim/thermodynamicoperations/propertygenerator/OLGApropertyTableGeneratorWaterKeywordFormat.java similarity index 99% rename from src/main/java/neqsim/thermodynamicOperations/propertyGenerator/OLGApropertyTableGeneratorWaterKeywordFormat.java rename to src/main/java/neqsim/thermodynamicoperations/propertygenerator/OLGApropertyTableGeneratorWaterKeywordFormat.java index 7ae34f92ad..90f52f8927 100644 --- a/src/main/java/neqsim/thermodynamicOperations/propertyGenerator/OLGApropertyTableGeneratorWaterKeywordFormat.java +++ b/src/main/java/neqsim/thermodynamicoperations/propertygenerator/OLGApropertyTableGeneratorWaterKeywordFormat.java @@ -1,4 +1,4 @@ -package neqsim.thermodynamicOperations.propertyGenerator; +package neqsim.thermodynamicoperations.propertygenerator; import java.io.BufferedWriter; import java.io.FileOutputStream; @@ -9,7 +9,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

@@ -20,7 +20,7 @@ * @version $Id: $Id */ public class OLGApropertyTableGeneratorWaterKeywordFormat - extends neqsim.thermodynamicOperations.BaseOperation { + extends neqsim.thermodynamicoperations.BaseOperation { private static final long serialVersionUID = 1000; static Logger logger = LogManager.getLogger(OLGApropertyTableGeneratorWaterKeywordFormat.class); diff --git a/src/main/java/neqsim/thermodynamicOperations/propertyGenerator/OLGApropertyTableGeneratorWaterStudents.java b/src/main/java/neqsim/thermodynamicoperations/propertygenerator/OLGApropertyTableGeneratorWaterStudents.java similarity index 99% rename from src/main/java/neqsim/thermodynamicOperations/propertyGenerator/OLGApropertyTableGeneratorWaterStudents.java rename to src/main/java/neqsim/thermodynamicoperations/propertygenerator/OLGApropertyTableGeneratorWaterStudents.java index 4cf8638415..6aec6c9bb3 100644 --- a/src/main/java/neqsim/thermodynamicOperations/propertyGenerator/OLGApropertyTableGeneratorWaterStudents.java +++ b/src/main/java/neqsim/thermodynamicoperations/propertygenerator/OLGApropertyTableGeneratorWaterStudents.java @@ -1,4 +1,4 @@ -package neqsim.thermodynamicOperations.propertyGenerator; +package neqsim.thermodynamicoperations.propertygenerator; import java.io.BufferedWriter; import java.io.FileOutputStream; @@ -13,7 +13,7 @@ import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkCPAstatoil; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

@@ -24,7 +24,7 @@ * @version $Id: $Id */ public class OLGApropertyTableGeneratorWaterStudents - extends neqsim.thermodynamicOperations.BaseOperation { + extends neqsim.thermodynamicoperations.BaseOperation { private static final long serialVersionUID = 1000; static Logger logger = LogManager.getLogger(OLGApropertyTableGeneratorWaterStudents.class); diff --git a/src/main/java/neqsim/thermodynamicOperations/propertyGenerator/OLGApropertyTableGeneratorWaterStudentsPH.java b/src/main/java/neqsim/thermodynamicoperations/propertygenerator/OLGApropertyTableGeneratorWaterStudentsPH.java similarity index 99% rename from src/main/java/neqsim/thermodynamicOperations/propertyGenerator/OLGApropertyTableGeneratorWaterStudentsPH.java rename to src/main/java/neqsim/thermodynamicoperations/propertygenerator/OLGApropertyTableGeneratorWaterStudentsPH.java index 9fb65b8ef6..1b77316e37 100644 --- a/src/main/java/neqsim/thermodynamicOperations/propertyGenerator/OLGApropertyTableGeneratorWaterStudentsPH.java +++ b/src/main/java/neqsim/thermodynamicoperations/propertygenerator/OLGApropertyTableGeneratorWaterStudentsPH.java @@ -1,4 +1,4 @@ -package neqsim.thermodynamicOperations.propertyGenerator; +package neqsim.thermodynamicoperations.propertygenerator; import java.io.BufferedWriter; import java.io.FileOutputStream; @@ -13,7 +13,7 @@ import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkCPAstatoil; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

@@ -24,7 +24,7 @@ * @version $Id: $Id */ public class OLGApropertyTableGeneratorWaterStudentsPH - extends neqsim.thermodynamicOperations.BaseOperation { + extends neqsim.thermodynamicoperations.BaseOperation { private static final long serialVersionUID = 1000; static Logger logger = LogManager.getLogger(OLGApropertyTableGeneratorWaterStudentsPH.class); diff --git a/src/main/java/neqsim/util/generator/PropertyGenerator.java b/src/main/java/neqsim/util/generator/PropertyGenerator.java index e4ba9a856b..a94d10a6fc 100644 --- a/src/main/java/neqsim/util/generator/PropertyGenerator.java +++ b/src/main/java/neqsim/util/generator/PropertyGenerator.java @@ -2,7 +2,7 @@ import java.util.HashMap; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/main/java/neqsim/util/python/Copy of init.py b/src/main/java/neqsim/util/python/Copy of init.py deleted file mode 100644 index 487964188e..0000000000 --- a/src/main/java/neqsim/util/python/Copy of init.py +++ /dev/null @@ -1,35 +0,0 @@ -from javax.swing import * -from thermo.system import * -from thermodynamicOperations import * -from processSimulation import * -from processSimulation.processEquipment import * -from processSimulation.processEquipment.stream import * -from processSimulation.processEquipment.mixer import * -from processSimulation.processEquipment.stream import * -from processSimulation.processEquipment.separator import * -from processSimulation.processEquipment.valve import * -from processSimulation.processEquipment.pipeline import * -from processSimulation.processSystem import * -from Numeric import * -from java.sql import * -from java import * -from util.database import * -from visad.python.JPythonMethods import * -#from visad.python import * -#from util.pythonScript.pythonTools.mathTools import * -#from fluidMechanics.geometryDefinitions import * -#from fluidMechanics.flowSystem import * -# -#from fluidMechanics.geometryDefinitions.pipe import * -#from fluidMechanics.flowSystem.twoPhaseFlowSystem.twoPhasePipeFlowSystem import * -#import sys -#sys.path.append('c:\\java\\Thermo_with_Java\\util\\pythonScript\\pythonTools\\mathTools') -#sys.path.append('c:\\java\\Thermo_with_Java\\util\\pythonScript\\pythonTools\\visAdScripts') -#sys.path.append('c:\\java\\jython-2.0\\Lib') -#sys.path.append('c:\\java\\Thermo_with_Java\\util\\pythonScript\\pythonTools\\DataHandeling') -#from NetCDFcreate import * -#from newtonSolver import * -##from util.pythonScript.Even.visAdScripts import * -#from statistics.parameterFitting.nonLinearParameterFitting import * -#from statistics.parameterFitting import * -##from statistics.parameterFitting.nonLinearParameterFitting.thermodynamicParameterFitting.binaryInteractionParameters import * diff --git a/src/test/java/neqsim/PVTsimulation/simulation/ConstantMassExpansionTest.java b/src/test/java/neqsim/PVTsimulation/simulation/ConstantMassExpansionTest.java index ca22f8f059..3a2b2d58b0 100644 --- a/src/test/java/neqsim/PVTsimulation/simulation/ConstantMassExpansionTest.java +++ b/src/test/java/neqsim/PVTsimulation/simulation/ConstantMassExpansionTest.java @@ -2,6 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; +import neqsim.pvtsimulation.simulation.ConstantMassExpansion; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; diff --git a/src/test/java/neqsim/PVTsimulation/simulation/ConstantVolumeDepletionTest.java b/src/test/java/neqsim/PVTsimulation/simulation/ConstantVolumeDepletionTest.java index f1f3e9184c..ac0509f350 100644 --- a/src/test/java/neqsim/PVTsimulation/simulation/ConstantVolumeDepletionTest.java +++ b/src/test/java/neqsim/PVTsimulation/simulation/ConstantVolumeDepletionTest.java @@ -3,9 +3,11 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.File; import org.junit.jupiter.api.Test; +import neqsim.pvtsimulation.simulation.ConstantVolumeDepletion; +import neqsim.pvtsimulation.simulation.SaturationPressure; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; public class ConstantVolumeDepletionTest { @Test diff --git a/src/test/java/neqsim/PVTsimulation/simulation/DensitySimTest.java b/src/test/java/neqsim/PVTsimulation/simulation/DensitySimTest.java index 32153deb89..9c21050898 100644 --- a/src/test/java/neqsim/PVTsimulation/simulation/DensitySimTest.java +++ b/src/test/java/neqsim/PVTsimulation/simulation/DensitySimTest.java @@ -2,6 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; +import neqsim.pvtsimulation.simulation.DensitySim; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; diff --git a/src/test/java/neqsim/PVTsimulation/simulation/DifferentialLiberationTest.java b/src/test/java/neqsim/PVTsimulation/simulation/DifferentialLiberationTest.java index 7d0b85ad56..13d06d362a 100644 --- a/src/test/java/neqsim/PVTsimulation/simulation/DifferentialLiberationTest.java +++ b/src/test/java/neqsim/PVTsimulation/simulation/DifferentialLiberationTest.java @@ -2,6 +2,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; +import neqsim.pvtsimulation.simulation.DifferentialLiberation; +import neqsim.pvtsimulation.simulation.SaturationPressure; +import neqsim.pvtsimulation.simulation.SimulationInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; diff --git a/src/test/java/neqsim/PVTsimulation/simulation/SaturationPressureTest.java b/src/test/java/neqsim/PVTsimulation/simulation/SaturationPressureTest.java index 6f887368cc..afca985b07 100644 --- a/src/test/java/neqsim/PVTsimulation/simulation/SaturationPressureTest.java +++ b/src/test/java/neqsim/PVTsimulation/simulation/SaturationPressureTest.java @@ -3,6 +3,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; +import neqsim.pvtsimulation.simulation.SaturationPressure; +import neqsim.pvtsimulation.simulation.SimulationInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; diff --git a/src/test/java/neqsim/PVTsimulation/simulation/SaturationTemperatureTest.java b/src/test/java/neqsim/PVTsimulation/simulation/SaturationTemperatureTest.java index dd4f568883..9f10d49841 100644 --- a/src/test/java/neqsim/PVTsimulation/simulation/SaturationTemperatureTest.java +++ b/src/test/java/neqsim/PVTsimulation/simulation/SaturationTemperatureTest.java @@ -5,10 +5,12 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; +import neqsim.pvtsimulation.simulation.SaturationTemperature; +import neqsim.pvtsimulation.simulation.SimulationInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; import neqsim.thermo.system.SystemUMRPRUMCEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** * @author ESOL @@ -22,7 +24,7 @@ static void setUpBeforeClass() throws Exception {} /** * Test method for - * {@link neqsim.PVTsimulation.simulation.SaturationTemperature#calcSaturationTemperature()}. + * {@link neqsim.pvtsimulation.simulation.SaturationTemperature#calcSaturationTemperature()}. */ @Test void testCalcSaturationTemperature() { diff --git a/src/test/java/neqsim/PVTsimulation/simulation/SeparatorTestTest.java b/src/test/java/neqsim/PVTsimulation/simulation/SeparatorTestTest.java index cb5b7c580e..8beb0989ff 100644 --- a/src/test/java/neqsim/PVTsimulation/simulation/SeparatorTestTest.java +++ b/src/test/java/neqsim/PVTsimulation/simulation/SeparatorTestTest.java @@ -2,6 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; +import neqsim.pvtsimulation.simulation.SeparatorTest; import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; diff --git a/src/test/java/neqsim/PVTsimulation/simulation/SlimTubeSimTest.java b/src/test/java/neqsim/PVTsimulation/simulation/SlimTubeSimTest.java index 37694696ab..8df4ad645a 100644 --- a/src/test/java/neqsim/PVTsimulation/simulation/SlimTubeSimTest.java +++ b/src/test/java/neqsim/PVTsimulation/simulation/SlimTubeSimTest.java @@ -2,6 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; +import neqsim.pvtsimulation.simulation.SlimTubeSim; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; diff --git a/src/test/java/neqsim/PVTsimulation/simulation/ViscositySimTest.java b/src/test/java/neqsim/PVTsimulation/simulation/ViscositySimTest.java index 9c36e0f946..e089c23b2f 100644 --- a/src/test/java/neqsim/PVTsimulation/simulation/ViscositySimTest.java +++ b/src/test/java/neqsim/PVTsimulation/simulation/ViscositySimTest.java @@ -2,6 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; +import neqsim.pvtsimulation.simulation.ViscositySim; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; diff --git a/src/test/java/neqsim/PVTsimulation/simulation/WaxFractionSimTest.java b/src/test/java/neqsim/PVTsimulation/simulation/WaxFractionSimTest.java index 84cad879d2..627cad7677 100644 --- a/src/test/java/neqsim/PVTsimulation/simulation/WaxFractionSimTest.java +++ b/src/test/java/neqsim/PVTsimulation/simulation/WaxFractionSimTest.java @@ -2,6 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; +import neqsim.pvtsimulation.simulation.WaxFractionSim; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; import neqsim.util.database.NeqSimDataBase; diff --git a/src/test/java/neqsim/chemicalReactions/chemicalReaction/ChemicalReactionFactoryTest.java b/src/test/java/neqsim/chemicalReactions/chemicalReaction/ChemicalReactionFactoryTest.java index df1b73c752..2e0b445ca0 100644 --- a/src/test/java/neqsim/chemicalReactions/chemicalReaction/ChemicalReactionFactoryTest.java +++ b/src/test/java/neqsim/chemicalReactions/chemicalReaction/ChemicalReactionFactoryTest.java @@ -2,6 +2,7 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import neqsim.chemicalreactions.chemicalreaction.ChemicalReactionFactory; public class ChemicalReactionFactoryTest { @Test diff --git a/src/test/java/neqsim/chemicalReactions/chemicalReaction/ChemicalReactionListTest.java b/src/test/java/neqsim/chemicalReactions/chemicalReaction/ChemicalReactionListTest.java index a44d0552c0..e0fe6bbfac 100644 --- a/src/test/java/neqsim/chemicalReactions/chemicalReaction/ChemicalReactionListTest.java +++ b/src/test/java/neqsim/chemicalReactions/chemicalReaction/ChemicalReactionListTest.java @@ -3,6 +3,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; +import neqsim.chemicalreactions.chemicalreaction.ChemicalReactionList; public class ChemicalReactionListTest { ChemicalReactionList test; diff --git a/src/test/java/neqsim/chemicalReactions/util/example/NaturalGasCombustion.java b/src/test/java/neqsim/chemicalReactions/util/example/NaturalGasCombustion.java index 2453e4b10c..2d52e24b63 100644 --- a/src/test/java/neqsim/chemicalReactions/util/example/NaturalGasCombustion.java +++ b/src/test/java/neqsim/chemicalReactions/util/example/NaturalGasCombustion.java @@ -2,7 +2,7 @@ import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

NaturalGasCombustion class.

diff --git a/src/test/java/neqsim/fluidMechanics/flowNode/twoPhaseNode/twoPhasePipeFlowNode/StratifiedFlowNodeTest.java b/src/test/java/neqsim/fluidMechanics/flowNode/twoPhaseNode/twoPhasePipeFlowNode/StratifiedFlowNodeTest.java index 13867a9b0c..b2f03be204 100644 --- a/src/test/java/neqsim/fluidMechanics/flowNode/twoPhaseNode/twoPhasePipeFlowNode/StratifiedFlowNodeTest.java +++ b/src/test/java/neqsim/fluidMechanics/flowNode/twoPhaseNode/twoPhasePipeFlowNode/StratifiedFlowNodeTest.java @@ -2,11 +2,12 @@ import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import neqsim.fluidMechanics.geometryDefinitions.pipe.PipeData; +import neqsim.fluidmechanics.flownode.twophasenode.twophasepipeflownode.StratifiedFlowNode; +import neqsim.fluidmechanics.geometrydefinitions.pipe.PipeData; import neqsim.thermo.phase.PhaseType; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; public class StratifiedFlowNodeTest { @Test diff --git a/src/test/java/neqsim/fluidMechanics/flowNode/twoPhaseNode/twoPhaseStirredCellNode/StirredCellNodeTest.java b/src/test/java/neqsim/fluidMechanics/flowNode/twoPhaseNode/twoPhaseStirredCellNode/StirredCellNodeTest.java index e7a1cf84db..2c89bceb6c 100644 --- a/src/test/java/neqsim/fluidMechanics/flowNode/twoPhaseNode/twoPhaseStirredCellNode/StirredCellNodeTest.java +++ b/src/test/java/neqsim/fluidMechanics/flowNode/twoPhaseNode/twoPhaseStirredCellNode/StirredCellNodeTest.java @@ -1,7 +1,8 @@ package neqsim.fluidMechanics.flowNode.twoPhaseNode.twoPhaseStirredCellNode; import org.junit.jupiter.api.Test; -import neqsim.fluidMechanics.geometryDefinitions.stirredCell.StirredCell; +import neqsim.fluidmechanics.flownode.twophasenode.twophasestirredcellnode.StirredCellNode; +import neqsim.fluidmechanics.geometrydefinitions.stirredcell.StirredCell; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; diff --git a/src/test/java/neqsim/fluidMechanics/flowSystem/onePhaseFlowSystem/pipeFlowSystem/PipeFlowSystemTest.java b/src/test/java/neqsim/fluidMechanics/flowSystem/onePhaseFlowSystem/pipeFlowSystem/PipeFlowSystemTest.java index 075bc77fe4..8883532218 100644 --- a/src/test/java/neqsim/fluidMechanics/flowSystem/onePhaseFlowSystem/pipeFlowSystem/PipeFlowSystemTest.java +++ b/src/test/java/neqsim/fluidMechanics/flowSystem/onePhaseFlowSystem/pipeFlowSystem/PipeFlowSystemTest.java @@ -3,7 +3,8 @@ import java.util.Arrays; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import neqsim.fluidMechanics.flowSystem.FlowSystemInterface; +import neqsim.fluidmechanics.flowsystem.FlowSystemInterface; +import neqsim.fluidmechanics.flowsystem.onephaseflowsystem.pipeflowsystem.PipeFlowSystem; import neqsim.thermo.system.SystemInterface; public class PipeFlowSystemTest extends neqsim.NeqSimTest { @@ -34,11 +35,11 @@ void setUp() { double[] outerTemperature = {278.0, 278.0, 278.0, 278.0, 278.0, 278.0, 278.0, 278.0, 278.0, 278.0, 278.0}; - neqsim.fluidMechanics.geometryDefinitions.GeometryDefinitionInterface[] pipeGeometry = - new neqsim.fluidMechanics.geometryDefinitions.pipe.PipeData[height.length]; + neqsim.fluidmechanics.geometrydefinitions.GeometryDefinitionInterface[] pipeGeometry = + new neqsim.fluidmechanics.geometrydefinitions.pipe.PipeData[height.length]; for (int i = 0; i < height.length; i++) { - pipeGeometry[i] = new neqsim.fluidMechanics.geometryDefinitions.pipe.PipeData(); + pipeGeometry[i] = new neqsim.fluidmechanics.geometrydefinitions.pipe.PipeData(); pipeGeometry[i].setDiameter(diameter[i]); pipeGeometry[i].setInnerSurfaceRoughness(roughness[i]); } diff --git a/src/test/java/neqsim/fluidMechanics/flowSystem/twoPhaseFlowSystem/shipSystem/LNGshipTest.java b/src/test/java/neqsim/fluidMechanics/flowSystem/twoPhaseFlowSystem/shipSystem/LNGshipTest.java index 1287735344..fe657ccc04 100644 --- a/src/test/java/neqsim/fluidMechanics/flowSystem/twoPhaseFlowSystem/shipSystem/LNGshipTest.java +++ b/src/test/java/neqsim/fluidMechanics/flowSystem/twoPhaseFlowSystem/shipSystem/LNGshipTest.java @@ -4,6 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertNull; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import neqsim.fluidmechanics.flowsystem.twophaseflowsystem.shipsystem.LNGship; import neqsim.thermo.system.SystemInterface; class LNGshipTest { diff --git a/src/test/java/neqsim/fluidMechanics/geometryDefinitions/internalGeometry/packings/PallRingPackingTest.java b/src/test/java/neqsim/fluidMechanics/geometryDefinitions/internalGeometry/packings/PallRingPackingTest.java index 0a1ad5e847..d44214e388 100644 --- a/src/test/java/neqsim/fluidMechanics/geometryDefinitions/internalGeometry/packings/PallRingPackingTest.java +++ b/src/test/java/neqsim/fluidMechanics/geometryDefinitions/internalGeometry/packings/PallRingPackingTest.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.fluidmechanics.geometrydefinitions.internalgeometry.packings.PallRingPacking; public class PallRingPackingTest { static PallRingPacking prp; diff --git a/src/test/java/neqsim/fluidMechanics/geometryDefinitions/internalGeometry/packings/RachigRingPackingTest.java b/src/test/java/neqsim/fluidMechanics/geometryDefinitions/internalGeometry/packings/RachigRingPackingTest.java index ad7c27ad35..c583b06005 100644 --- a/src/test/java/neqsim/fluidMechanics/geometryDefinitions/internalGeometry/packings/RachigRingPackingTest.java +++ b/src/test/java/neqsim/fluidMechanics/geometryDefinitions/internalGeometry/packings/RachigRingPackingTest.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.fluidmechanics.geometrydefinitions.internalgeometry.packings.RachigRingPacking; public class RachigRingPackingTest { static RachigRingPacking rp; 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 5a54f05647..a6ed12cb04 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.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.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; diff --git a/src/test/java/neqsim/physicalProperties/physicalPropertyMethods/commonPhasePhysicalProperties/viscosity/FrictionTheoryViscosityMethodTest.java b/src/test/java/neqsim/physicalProperties/physicalPropertyMethods/commonPhasePhysicalProperties/viscosity/FrictionTheoryViscosityMethodTest.java index 07bf52556f..41595b2bc4 100644 --- a/src/test/java/neqsim/physicalProperties/physicalPropertyMethods/commonPhasePhysicalProperties/viscosity/FrictionTheoryViscosityMethodTest.java +++ b/src/test/java/neqsim/physicalProperties/physicalPropertyMethods/commonPhasePhysicalProperties/viscosity/FrictionTheoryViscosityMethodTest.java @@ -3,7 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; public class FrictionTheoryViscosityMethodTest extends neqsim.NeqSimTest { static neqsim.thermo.system.SystemInterface testSystem = null; diff --git a/src/test/java/neqsim/physicalProperties/physicalPropertyMethods/commonPhasePhysicalProperties/viscosity/PFCTViscosityMethodTest.java b/src/test/java/neqsim/physicalProperties/physicalPropertyMethods/commonPhasePhysicalProperties/viscosity/PFCTViscosityMethodTest.java index 489a2c3829..4dd0e42909 100644 --- a/src/test/java/neqsim/physicalProperties/physicalPropertyMethods/commonPhasePhysicalProperties/viscosity/PFCTViscosityMethodTest.java +++ b/src/test/java/neqsim/physicalProperties/physicalPropertyMethods/commonPhasePhysicalProperties/viscosity/PFCTViscosityMethodTest.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; public class PFCTViscosityMethodTest extends neqsim.NeqSimTest { static neqsim.thermo.system.SystemInterface testSystem = null; diff --git a/src/test/java/neqsim/physicalProperties/physicalPropertyMethods/liquidPhysicalProperties/density/CostaldTest.java b/src/test/java/neqsim/physicalProperties/physicalPropertyMethods/liquidPhysicalProperties/density/CostaldTest.java index 95fed3d04d..2a1b3137ce 100644 --- a/src/test/java/neqsim/physicalProperties/physicalPropertyMethods/liquidPhysicalProperties/density/CostaldTest.java +++ b/src/test/java/neqsim/physicalProperties/physicalPropertyMethods/liquidPhysicalProperties/density/CostaldTest.java @@ -3,7 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; public class CostaldTest extends neqsim.NeqSimTest { static neqsim.thermo.system.SystemInterface testSystem = null; diff --git a/src/test/java/neqsim/physicalProperties/util/examples/TPflashTest.java b/src/test/java/neqsim/physicalProperties/util/examples/TPflashTest.java index fb80fb207e..1922a73df6 100644 --- a/src/test/java/neqsim/physicalProperties/util/examples/TPflashTest.java +++ b/src/test/java/neqsim/physicalProperties/util/examples/TPflashTest.java @@ -4,7 +4,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkCPAstatoil; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/physicalProperties/util/examples/TPflashWater.java b/src/test/java/neqsim/physicalProperties/util/examples/TPflashWater.java index 98b5f1570c..8f8bb150f2 100644 --- a/src/test/java/neqsim/physicalProperties/util/examples/TPflashWater.java +++ b/src/test/java/neqsim/physicalProperties/util/examples/TPflashWater.java @@ -4,7 +4,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkCPAstatoil; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/physicalProperties/util/examples/TPflash_1.java b/src/test/java/neqsim/physicalProperties/util/examples/TPflash_1.java index eded1a6d25..c67e446e45 100644 --- a/src/test/java/neqsim/physicalProperties/util/examples/TPflash_1.java +++ b/src/test/java/neqsim/physicalProperties/util/examples/TPflash_1.java @@ -4,7 +4,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/physicalProperties/util/examples/TestCondensate.java b/src/test/java/neqsim/physicalProperties/util/examples/TestCondensate.java index 915c06c25e..f9093f0192 100644 --- a/src/test/java/neqsim/physicalProperties/util/examples/TestCondensate.java +++ b/src/test/java/neqsim/physicalProperties/util/examples/TestCondensate.java @@ -5,7 +5,7 @@ import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemPrEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/physicalProperties/util/examples/TestDiffusionCoefficient.java b/src/test/java/neqsim/physicalProperties/util/examples/TestDiffusionCoefficient.java index 70993223a6..b897bc3eab 100644 --- a/src/test/java/neqsim/physicalProperties/util/examples/TestDiffusionCoefficient.java +++ b/src/test/java/neqsim/physicalProperties/util/examples/TestDiffusionCoefficient.java @@ -4,7 +4,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/physicalProperties/util/examples/TestSolidAdsorption.java b/src/test/java/neqsim/physicalProperties/util/examples/TestSolidAdsorption.java index 47d92f64c8..beb6a05cb1 100644 --- a/src/test/java/neqsim/physicalProperties/util/examples/TestSolidAdsorption.java +++ b/src/test/java/neqsim/physicalProperties/util/examples/TestSolidAdsorption.java @@ -4,7 +4,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/physicalProperties/util/examples/TestSurfaceTenison.java b/src/test/java/neqsim/physicalProperties/util/examples/TestSurfaceTenison.java index 37cb4f5a48..3240ee49a2 100644 --- a/src/test/java/neqsim/physicalProperties/util/examples/TestSurfaceTenison.java +++ b/src/test/java/neqsim/physicalProperties/util/examples/TestSurfaceTenison.java @@ -4,7 +4,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/physicalProperties/util/examples/TestSurfaceTension2.java b/src/test/java/neqsim/physicalProperties/util/examples/TestSurfaceTension2.java index 7f03d5ad6d..1fb86c5d0c 100644 --- a/src/test/java/neqsim/physicalProperties/util/examples/TestSurfaceTension2.java +++ b/src/test/java/neqsim/physicalProperties/util/examples/TestSurfaceTension2.java @@ -2,7 +2,7 @@ import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

TestSurfaceTension2 class.

diff --git a/src/test/java/neqsim/physicalProperties/util/examples/TestSurfaceTensionOde.java b/src/test/java/neqsim/physicalProperties/util/examples/TestSurfaceTensionOde.java index 37cd21f2da..212c93a50f 100644 --- a/src/test/java/neqsim/physicalProperties/util/examples/TestSurfaceTensionOde.java +++ b/src/test/java/neqsim/physicalProperties/util/examples/TestSurfaceTensionOde.java @@ -4,7 +4,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/processSimulation/controllerDevice/ControllerDeviceBaseClassTest.java b/src/test/java/neqsim/processSimulation/controllerDevice/ControllerDeviceBaseClassTest.java index 5325a1ccf6..c90846f782 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.processsimulation.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 cc7e9f1d70..ecbc239493 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.processsimulation.measurementdevice.CombustionEmissionsCalculator; +import neqsim.processsimulation.processequipment.stream.Stream; 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 a4fc226def..607e640250 100644 --- a/src/test/java/neqsim/processSimulation/measurementDevice/FLowInducedVibrationTest.java +++ b/src/test/java/neqsim/processSimulation/measurementDevice/FLowInducedVibrationTest.java @@ -3,12 +3,13 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; 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.processsimulation.measurementdevice.FlowInducedVibrationAnalyser; +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.thermo.ThermodynamicConstantsInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; public class FLowInducedVibrationTest extends neqsim.NeqSimTest { static ProcessSystem process1; @@ -101,8 +102,8 @@ public void testSetUnit() { flowInducedVibrationAnalyserFRMS.setMethod("FRMS"); pipe.getOutletStream(); - neqsim.processSimulation.processSystem.ProcessSystem operations = - new neqsim.processSimulation.processSystem.ProcessSystem(); + neqsim.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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 d63036d0c9..7ca9ad2d23 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.processsimulation.measurementdevice.MultiPhaseMeter; +import neqsim.processsimulation.processequipment.stream.Stream; 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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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 c5571daaf0..8fdc2bfd02 100644 --- a/src/test/java/neqsim/processSimulation/measurementDevice/WellAllocatorTest.java +++ b/src/test/java/neqsim/processSimulation/measurementDevice/WellAllocatorTest.java @@ -4,9 +4,10 @@ import org.apache.logging.log4j.Logger; import org.junit.jupiter.api.BeforeAll; 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.processsimulation.measurementdevice.WellAllocator; +import neqsim.processsimulation.processequipment.separator.Separator; +import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.processsimulation.util.monitor.WellAllocatorResponse; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; @@ -24,7 +25,7 @@ static void setUpBeforeClass() throws Exception {} /** * Test method for - * {@link neqsim.processSimulation.measurementDevice.WellAllocator#getMeasuredValue(java.lang.String)}. + * {@link neqsim.processsimulation.measurementdevice.WellAllocator#getMeasuredValue(java.lang.String)}. */ @Test void testGetMeasuredValueString() { @@ -67,8 +68,8 @@ void testGetMeasuredValueString() { wellAlloc.setExportGasStream(stream_gasExp); wellAlloc.setExportOilStream(stream_oilExp); - neqsim.processSimulation.processSystem.ProcessSystem operations = - new neqsim.processSimulation.processSystem.ProcessSystem(); + neqsim.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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 8804efe23e..6a1ba0b488 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.processsimulation.measurementdevice.NMVOCAnalyser; +import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.processsimulation.processsystem.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 6c9b10fe84..19eaeec1c9 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.processsimulation.measurementdevice.pHProbe; +import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.processsimulation.processequipment.stream.StreamInterface; 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 9b8d7d5522..d95b923e58 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.processsimulation.measurementdevice.simpleflowregime.SevereSlugAnalyser; +import neqsim.processsimulation.processequipment.stream.Stream; 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 9836650e21..a5766aa9ef 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.processsimulation.costestimation.CostEstimateBaseClass; +import neqsim.processsimulation.mechanicaldesign.SystemMechanicalDesign; +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.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; public class SystemMechanicalDesignTest { - static neqsim.processSimulation.processSystem.ProcessSystem operations; + static neqsim.processsimulation.processsystem.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.processsimulation.processequipment.separator.ThreePhaseSeparator seprator1stStage = + new neqsim.processsimulation.processequipment.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.processsimulation.processequipment.separator.ThreePhaseSeparator seprator2ndStage = + new neqsim.processsimulation.processequipment.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.processsimulation.processequipment.separator.ThreePhaseSeparator seprator3rdStage = + new neqsim.processsimulation.processequipment.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.processsimulation.processsystem.ProcessSystem(); operations.add(feedStream); operations.add(seprator1stStage); operations.add(valve1); @@ -190,7 +191,7 @@ void testRunDesignCalculationforValve() { @Test void testRunDesignForPipeline() { AdiabaticPipe pipe = new AdiabaticPipe("pipe1", - ((neqsim.processSimulation.processEquipment.separator.ThreePhaseSeparator) operations + ((neqsim.processsimulation.processequipment.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 4bb8f6725f..41cb2f9854 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.processsimulation.processequipment.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.processsimulation.processequipment.absorber.SimpleAbsorber absorber1 = + new neqsim.processsimulation.processequipment.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 e77f00adb6..e7adbe0eb4 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.processsimulation.processequipment.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.processsimulation.processequipment.adsorber.SimpleAdsorber adsorber1 = + new neqsim.processsimulation.processequipment.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 1fe3576468..2eae66b27b 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.processsimulation.processequipment.compressor.Compressor; +import neqsim.processsimulation.processequipment.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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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 923d2268ec..4744e30608 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.processsimulation.processequipment.compressor.Compressor; +import neqsim.processsimulation.processequipment.compressor.CompressorChart; +import neqsim.processsimulation.processequipment.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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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 84b59d686e..8642d38ff1 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.processsimulation.processequipment.stream.Stream; +import neqsim.processsimulation.processsystem.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.processsimulation.processequipment.compressor.Compressor compressor1 = null; /** *

@@ -33,7 +33,7 @@ public void setUp() throws Exception { 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.processsimulation.processequipment.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 6ce02199c4..01a9976674 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.processsimulation.processequipment.compressor.Compressor; +import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.processsimulation.processsystem.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.processsimulation.processequipment.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.processsimulation.processequipment.compressor.Compressor compressor1 = + new neqsim.processsimulation.processequipment.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.processsimulation.processequipment.compressor.Compressor compressor1 = + new neqsim.processsimulation.processequipment.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.processsimulation.processequipment.compressor.Compressor compressor1 = + new neqsim.processsimulation.processequipment.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 0e2701be34..91f8e0a701 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.processsimulation.processequipment.distillation.Condenser; +import neqsim.processsimulation.processequipment.distillation.DistillationColumn; +import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.processsimulation.processequipment.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 ee52fde752..ac7c552042 100644 --- a/src/test/java/neqsim/processSimulation/processEquipment/heatExchanger/HeatExchangerTest.java +++ b/src/test/java/neqsim/processSimulation/processEquipment/heatExchanger/HeatExchangerTest.java @@ -3,11 +3,12 @@ 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.thermodynamicOperations.ThermodynamicOperations; +import neqsim.processsimulation.processequipment.heatExchanger.HeatExchanger; +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.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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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.processsimulation.processequipment.heatExchanger.HeatExchanger heatExchanger1 = + new neqsim.processsimulation.processequipment.heatExchanger.HeatExchanger("heatEx", stream_Hot, stream_Cold); - neqsim.processSimulation.processSystem.ProcessSystem operations = - new neqsim.processSimulation.processSystem.ProcessSystem(); + neqsim.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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.processsimulation.processequipment.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 7e82f77113..09bc8a3227 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.processsimulation.processequipment.heatExchanger.Heater; +import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.processsimulation.processsystem.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 73ee08dcaf..c366cb0079 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.processsimulation.processequipment.manifold.Manifold; +import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.processsimulation.processsystem.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 4e156d1e81..7bd2d52573 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.processsimulation.processequipment.mixer.Mixer; +import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.processsimulation.processsystem.ProcessSystem; import neqsim.thermo.system.SystemSrkEos; /** @@ -48,7 +49,7 @@ static void setUpBeforeClass() throws Exception { } /** - * Test method for {@link neqsim.processSimulation.processEquipment.mixer.Mixer#run()}. + * Test method for {@link neqsim.processsimulation.processequipment.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.processsimulation.processequipment.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 21525856d8..081bf173a1 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.processsimulation.processequipment.pipeline.AdiabaticTwoPhasePipe; +import neqsim.processsimulation.processequipment.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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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 c25a6c86d3..fe421955c9 100644 --- a/src/test/java/neqsim/processSimulation/processEquipment/pipeline/BeggsAndBrillsPipeTest.java +++ b/src/test/java/neqsim/processSimulation/processEquipment/pipeline/BeggsAndBrillsPipeTest.java @@ -2,9 +2,10 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import neqsim.processSimulation.processEquipment.stream.Stream; +import neqsim.processsimulation.processequipment.pipeline.PipeBeggsAndBrills; +import neqsim.processsimulation.processequipment.stream.Stream; import neqsim.thermo.ThermodynamicConstantsInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; public class BeggsAndBrillsPipeTest { @Test @@ -76,8 +77,8 @@ public void testPipeLineBeggsAndBrills() { pipe.setNumberOfIncrements(20); pipe.setRunIsothermal(false); - neqsim.processSimulation.processSystem.ProcessSystem operations = - new neqsim.processSimulation.processSystem.ProcessSystem(); + neqsim.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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.processsimulation.processsystem.ProcessSystem operations2 = + new neqsim.processsimulation.processsystem.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.processsimulation.processsystem.ProcessSystem operations3 = + new neqsim.processsimulation.processsystem.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 d50b406fd6..6aee8de495 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.processsimulation.processequipment.pipeline.AdiabaticPipe; +import neqsim.processsimulation.processequipment.pipeline.OnePhasePipeLine; +import neqsim.processsimulation.processequipment.pipeline.PipeBeggsAndBrills; +import neqsim.processsimulation.processequipment.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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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 1fd56cbc56..26a543e903 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.processsimulation.processequipment.powerGeneration.GasTurbine; +import neqsim.processsimulation.processequipment.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 dd88a58228..431f51348e 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.processsimulation.processequipment.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 7a652fec80..26b304c226 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.processsimulation.processequipment.pump.Pump; +import neqsim.processsimulation.processequipment.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 5189d934de..8ffc326c22 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.processsimulation.processequipment.reservoir.SimpleReservoir; +import neqsim.processsimulation.processequipment.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 d17887bdb0..929026a158 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.processsimulation.processequipment.pipeline.PipeBeggsAndBrills; +import neqsim.processsimulation.processequipment.reservoir.SimpleReservoir; +import neqsim.processsimulation.processequipment.reservoir.WellFlow; +import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.processsimulation.processequipment.util.Adjuster; +import neqsim.processsimulation.processequipment.valve.ThrottlingValve; +import neqsim.processsimulation.processsystem.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.processsimulation.processequipment.reservoir.SimpleReservoir reservoirOps = + new neqsim.processsimulation.processequipment.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.processsimulation.processequipment.reservoir.WellFlow wellflow = + new neqsim.processsimulation.processequipment.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.processsimulation.processequipment.pipeline.PipeBeggsAndBrills pipe = + new neqsim.processsimulation.processequipment.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.processsimulation.processequipment.compressor.Compressor compressor = + new neqsim.processsimulation.processequipment.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.processsimulation.processequipment.heatExchanger.Cooler intercooler = + new neqsim.processsimulation.processequipment.heatExchanger.Cooler("cooler", compressor.getOutletStream()); intercooler.setOutTemperature(25.0, "C"); - neqsim.processSimulation.processEquipment.compressor.Compressor compressor2 = - new neqsim.processSimulation.processEquipment.compressor.Compressor("subcomp2"); + neqsim.processsimulation.processequipment.compressor.Compressor compressor2 = + new neqsim.processsimulation.processequipment.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.processsimulation.processequipment.heatExchanger.Heater cooler1 = + new neqsim.processsimulation.processequipment.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.processsimulation.processequipment.pipeline.PipeBeggsAndBrills pipeline = + new neqsim.processsimulation.processequipment.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.processsimulation.processequipment.util.Adjuster adjuster = + new neqsim.processsimulation.processequipment.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.processsimulation.processsystem.ProcessSystem process = + new neqsim.processsimulation.processsystem.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 7f7664f6c7..5656e5bb29 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.processsimulation.measurementdevice.LevelTransmitter; +import neqsim.processsimulation.processequipment.separator.Separator; +import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.processsimulation.processsystem.ProcessSystem; import neqsim.thermo.system.SystemSrkCPAstatoil; /** diff --git a/src/test/java/neqsim/processSimulation/processEquipment/splitter/ComponentSplitterTest.java b/src/test/java/neqsim/processSimulation/processEquipment/splitter/ComponentSplitterTest.java index 60c232b49e..d3c8410ff5 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.processsimulation.processequipment.compressor.Compressor; +import neqsim.processsimulation.processequipment.mixer.Mixer; +import neqsim.processsimulation.processequipment.splitter.ComponentSplitter; +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.processsystem.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 32f3fa93cf..9b8fbc6ddd 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.processsimulation.processequipment.stream.Stream; +import neqsim.processsimulation.processsystem.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 7ced411bb8..2c66f561a6 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.processsimulation.processequipment.stream.Stream; +import neqsim.processsimulation.processequipment.stream.VirtualStream; +import neqsim.processsimulation.processsystem.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 24b28732a7..8186427715 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.processsimulation.processequipment.stream.Stream stream1 = + new neqsim.processsimulation.processequipment.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.processsimulation.processequipment.pipeline.PipeBeggsAndBrills flowline1 = + new neqsim.processsimulation.processequipment.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.processsimulation.processequipment.util.Adjuster adjuster = + new neqsim.processsimulation.processequipment.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.processsimulation.processsystem.ProcessSystem process = + new neqsim.processsimulation.processsystem.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.processsimulation.processequipment.stream.Stream stream1 = + new neqsim.processsimulation.processequipment.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.processsimulation.processequipment.pipeline.PipeBeggsAndBrills flowline1 = + new neqsim.processsimulation.processequipment.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.processsimulation.processequipment.util.Adjuster adjuster = + new neqsim.processsimulation.processequipment.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.processsimulation.processsystem.ProcessSystem process = + new neqsim.processsimulation.processsystem.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 2bc0053b74..6208225a6c 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.processsimulation.measurementdevice.MultiPhaseMeter; +import neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator; +import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.processsimulation.processequipment.util.FlowSetter; 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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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 763625c990..48b7d847c1 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.processsimulation.measurementdevice.MultiPhaseMeter; +import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.processsimulation.processequipment.util.GORfitter; 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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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 3b3b653e68..5f00061309 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.processsimulation.measurementdevice.MultiPhaseMeter; +import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.processsimulation.processequipment.util.MPFMfitter; 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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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 4c2b6450a2..3c4994d00a 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.processsimulation.processequipment.stream.Stream; +import neqsim.processsimulation.processequipment.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 52b0df150e..2769ad4d74 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.processsimulation.processequipment.stream.Stream; +import neqsim.processsimulation.processequipment.util.StreamSaturatorUtil; +import neqsim.processsimulation.processsystem.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 a4ff30104e..4c60541fee 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.processsimulation.processequipment.stream.Stream; +import neqsim.processsimulation.processequipment.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 969d0f991d..fda7f717f8 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.processsimulation.measurementdevice.MultiPhaseMeter; +import neqsim.processsimulation.processequipment.reservoir.ReservoirTPsim; 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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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 f8a5e9dc3d..d188ec7ef1 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.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.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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.ProcessSystem(); operations.add(feedStream); operations.add(inletSeparator); operations.add(oilHeater); @@ -136,8 +136,8 @@ public void testProcess() { assertEquals(2046.8012652616517, recycleScrubberStream.getFlowRate("kg/hr"), 0.1); - neqsim.processSimulation.processEquipment.compressor.CompressorChartGenerator compchartgenerator = - new neqsim.processSimulation.processEquipment.compressor.CompressorChartGenerator( + neqsim.processsimulation.processequipment.compressor.CompressorChartGenerator compchartgenerator = + new neqsim.processsimulation.processequipment.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 3cfb1d9a26..b2bd5f85de 100644 --- a/src/test/java/neqsim/processSimulation/processSystem/GlycolModulesTest.java +++ b/src/test/java/neqsim/processSimulation/processSystem/GlycolModulesTest.java @@ -1,24 +1,24 @@ 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.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.thermo.phase.PhaseEosInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; public class GlycolModulesTest extends neqsim.NeqSimTest { @Test @@ -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.processsimulation.processsystem.ProcessSystem operations1 = + new neqsim.processsimulation.processsystem.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.processsimulation.processsystem.ProcessSystem operations2 = + new neqsim.processsimulation.processsystem.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.processsimulation.processsystem.ProcessSystem operations3 = + new neqsim.processsimulation.processsystem.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.processsimulation.processsystem.ProcessSystem operations4 = + new neqsim.processsimulation.processsystem.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.processsimulation.processsystem.ProcessSystem operations5 = + new neqsim.processsimulation.processsystem.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.processsimulation.processsystem.ProcessModule module1 = + new neqsim.processsimulation.processsystem.ProcessModule("Start process"); module1.add(operations1); module1.add(operations2); - neqsim.processSimulation.processSystem.ProcessModule module2 = - new neqsim.processSimulation.processSystem.ProcessModule("Column recycle"); + neqsim.processsimulation.processsystem.ProcessModule module2 = + new neqsim.processsimulation.processsystem.ProcessModule("Column recycle"); module2.add(operations3); - neqsim.processSimulation.processSystem.ProcessModule module3 = - new neqsim.processSimulation.processSystem.ProcessModule("TEG recycle"); + neqsim.processsimulation.processsystem.ProcessModule module3 = + new neqsim.processsimulation.processsystem.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.processsimulation.processsystem.ProcessModule module4 = + new neqsim.processsimulation.processsystem.ProcessModule("Finish Process"); module4.add(operations5); - neqsim.processSimulation.processSystem.ProcessModule modules = - new neqsim.processSimulation.processSystem.ProcessModule("Modules wrapper"); + neqsim.processsimulation.processsystem.ProcessModule modules = + new neqsim.processsimulation.processsystem.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 0207fe7013..d531abdb75 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.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.processsimulation.processsystem.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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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 379e9331c2..2161d93ac8 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.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.processsimulation.processsystem.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 c72a190be2..2147ad77e5 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.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.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.processsimulation.processequipment.separator.ThreePhaseSeparator seprator1stStage = + new neqsim.processsimulation.processequipment.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.processsimulation.processequipment.separator.ThreePhaseSeparator seprator2ndStage = + new neqsim.processsimulation.processequipment.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.processsimulation.processequipment.separator.ThreePhaseSeparator seprator3rdStage = + new neqsim.processsimulation.processequipment.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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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.processsimulation.processequipment.compressor.CompressorChartGenerator compchartgenerator = + new neqsim.processsimulation.processequipment.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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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.setFlowAccuracy(1e-2); - neqsim.processSimulation.processSystem.ProcessSystem operations = - new neqsim.processSimulation.processSystem.ProcessSystem(); + neqsim.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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.processsimulation.processequipment.compressor.CompressorChartGenerator compchartgenerator = + new neqsim.processsimulation.processequipment.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 3e776d665f..cb2ff388a7 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.processsimulation.processsystem.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 3d036f8866..6652de6fb1 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.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.processsimulation.processsystem.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 aa2b129570..5c826146c5 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.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.processsimulation.processsystem.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.processsimulation.processequipment.compressor.CompressorChartGenerator compchartgenerator = + new neqsim.processsimulation.processequipment.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.processsimulation.processequipment.compressor.CompressorChartGenerator compchartgenerator = + new neqsim.processsimulation.processequipment.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.processsimulation.processequipment.compressor.CompressorChartGenerator compchartgenerator = + new neqsim.processsimulation.processequipment.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.processsimulation.processequipment.compressor.CompressorChartGenerator compchartgenerator = + new neqsim.processsimulation.processequipment.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 28b45f8dd5..5be3cd057c 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.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; 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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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.processsimulation.processsystem.ProcessSystem operationsCopy = + (neqsim.processsimulation.processsystem.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 5d7fca7651..746d766f48 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.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.processsimulation.processsystem.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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.ProcessSystem(); operations.add(dryFeedGasSmorbukk); operations.add(saturatedFeedGasSmorbukk); operations.add(waterSaturatedFeedGasSmorbukk); @@ -826,8 +827,8 @@ public void testRun_step() { recycleLeanTEG.setPriority(200); recycleLeanTEG.setDownstreamProperty("flow rate"); - neqsim.processSimulation.processSystem.ProcessSystem operations = - new neqsim.processSimulation.processSystem.ProcessSystem(); + neqsim.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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 8cf0f24e92..6f727b6c76 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.processsimulation.processequipment.stream.Stream wellStream = + new neqsim.processsimulation.processequipment.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.processsimulation.processequipment.separator.ThreePhaseSeparator firstStageSeparator = + new neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator( "1st stage separator", wellStream); - neqsim.processSimulation.processEquipment.heatExchanger.Heater oilHeaterSecondStage = - new neqsim.processSimulation.processEquipment.heatExchanger.Heater( + neqsim.processsimulation.processequipment.heatExchanger.Heater oilHeaterSecondStage = + new neqsim.processsimulation.processequipment.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.processsimulation.processequipment.separator.ThreePhaseSeparator secondStageSeparator = + new neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator( "2nd stage separator", oilHeaterSecondStage.getOutletStream()); - neqsim.processSimulation.processEquipment.heatExchanger.Heater oilHeaterThirdStage = - new neqsim.processSimulation.processEquipment.heatExchanger.Heater("oil heater third stage", + neqsim.processsimulation.processequipment.heatExchanger.Heater oilHeaterThirdStage = + new neqsim.processsimulation.processequipment.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.processsimulation.processequipment.separator.ThreePhaseSeparator thirdStageSeparator = + new neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator( "3rd stage separator", oilHeaterThirdStage.getOutletStream()); - neqsim.processSimulation.processEquipment.heatExchanger.Heater oilHeaterStandardStage = - new neqsim.processSimulation.processEquipment.heatExchanger.Heater( + neqsim.processsimulation.processequipment.heatExchanger.Heater oilHeaterStandardStage = + new neqsim.processsimulation.processequipment.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.processsimulation.processequipment.separator.ThreePhaseSeparator standardStageSeparator = + new neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator( "standard stage separator", oilHeaterStandardStage.getOutletStream()); - neqsim.processSimulation.processEquipment.mixer.Mixer gasMixer = - new neqsim.processSimulation.processEquipment.mixer.Mixer("gas mixer"); + neqsim.processsimulation.processequipment.mixer.Mixer gasMixer = + new neqsim.processsimulation.processequipment.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.processsimulation.processequipment.stream.Stream exportoil = + new neqsim.processsimulation.processequipment.stream.Stream("export oil", standardStageSeparator.getOilOutStream()); - neqsim.processSimulation.processEquipment.stream.Stream exportgas = - new neqsim.processSimulation.processEquipment.stream.Stream("export gas", + neqsim.processsimulation.processequipment.stream.Stream exportgas = + new neqsim.processsimulation.processequipment.stream.Stream("export gas", gasMixer.getOutletStream()); - neqsim.processSimulation.processSystem.ProcessSystem oilprocess = - new neqsim.processSimulation.processSystem.ProcessSystem(); + neqsim.processsimulation.processsystem.ProcessSystem oilprocess = + new neqsim.processsimulation.processsystem.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 8aaaec7062..62f88ff8bd 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.processsimulation.processequipment.stream.Stream inlet_stream_VA_01 = + new neqsim.processsimulation.processequipment.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.processsimulation.processequipment.separator.ThreePhaseSeparator separator_VA_01 = + new neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator( "FIRST_SEPARATOR", inlet_stream_VA_01); - neqsim.processSimulation.processEquipment.heatExchanger.Heater TP_setter_hydrocyclone = - new neqsim.processSimulation.processEquipment.heatExchanger.Heater( + neqsim.processsimulation.processequipment.heatExchanger.Heater TP_setter_hydrocyclone = + new neqsim.processsimulation.processequipment.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.processsimulation.processequipment.separator.ThreePhaseSeparator hydrocyclone_main = + new neqsim.processsimulation.processequipment.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.processsimulation.processequipment.heatExchanger.Heater heater_TP_setter_main_stream = + new neqsim.processsimulation.processequipment.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.processsimulation.processsystem.ProcessSystem process = + new neqsim.processsimulation.processsystem.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.processsimulation.processequipment.stream.Stream inlet_stream_VA_01 = + new neqsim.processsimulation.processequipment.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.processsimulation.processequipment.separator.ThreePhaseSeparator separator_VA_01 = + new neqsim.processsimulation.processequipment.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.processsimulation.processequipment.heatExchanger.Heater TP_setter_hydrocyclone = + new neqsim.processsimulation.processequipment.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.processsimulation.processequipment.separator.ThreePhaseSeparator hydrocyclone_main = + (new neqsim.processsimulation.processequipment.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 574a3d5c4b..3e5a06430a 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.processsimulation.processequipment.mixer.Mixer; +import neqsim.processsimulation.processequipment.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.processsimulation.processequipment.mixer.StaticMixer("LNG Tank Mix"); mixer.addStream(stream_1); mixer.addStream(stream_2); - neqsim.processSimulation.processSystem.ProcessSystem operations = - new neqsim.processSimulation.processSystem.ProcessSystem(); + neqsim.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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 dd09e55f44..ab31c5ed8b 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.processsimulation.processequipment.stream.Stream; +import neqsim.processsimulation.processequipment.stream.StreamInterface; +import neqsim.processsimulation.processequipment.tank.Tank; /** *

LNGfilling2 class.

@@ -30,20 +30,20 @@ public static void main(String args[]) { testSystem.createDatabase(true); testSystem.setMixingRule(2); - neqsim.thermodynamicOperations.ThermodynamicOperations ops = - new neqsim.thermodynamicOperations.ThermodynamicOperations(testSystem); + neqsim.thermodynamicoperations.ThermodynamicOperations ops = + new neqsim.thermodynamicoperations.ThermodynamicOperations(testSystem); ops.TPflash(); testSystem.display(); Stream stream_1 = new Stream("Methane Stream", testSystem); - Tank tank = new neqsim.processSimulation.processEquipment.tank.Tank("tank"); + Tank tank = new neqsim.processsimulation.processequipment.tank.Tank("tank"); tank.addStream(stream_1); StreamInterface liqstream = tank.getLiquidOutStream(); - neqsim.processSimulation.processSystem.ProcessSystem operations = - new neqsim.processSimulation.processSystem.ProcessSystem(); + neqsim.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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 7ca17be9fd..ddeed96398 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.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.thermo.ThermodynamicConstantsInterface; /** @@ -53,8 +53,8 @@ public static void main(String args[]) { testSystem2.createDatabase(true); testSystem2.setMixingRule(2); - neqsim.thermodynamicOperations.ThermodynamicOperations ops = - new neqsim.thermodynamicOperations.ThermodynamicOperations(testSystem); + neqsim.thermodynamicoperations.ThermodynamicOperations ops = + new neqsim.thermodynamicoperations.ThermodynamicOperations(testSystem); ops.TPflash(); testSystem.display(); @@ -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.processsimulation.processequipment.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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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 1ed26d758e..69fcb2ccbd 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.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; /** *

@@ -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.processsimulation.processsystem.ProcessSystem MEGwelloperations = + new neqsim.processsimulation.processsystem.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.processsimulation.processequipment.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.processsimulation.processsystem.ProcessSystem onshoreOperations = + new neqsim.processsimulation.processsystem.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 eac9492228..ffd7221ca9 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.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.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.processsimulation.processequipment.util.NeqSimUnit pipeline = + new neqsim.processsimulation.processequipment.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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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 29b99feb21..c8fd92b5c0 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.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; /** *

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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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 ed3ab60332..c5b5768905 100644 --- a/src/test/java/neqsim/processSimulation/util/example/OffshoreProcess2.java +++ b/src/test/java/neqsim/processSimulation/util/example/OffshoreProcess2.java @@ -1,13 +1,13 @@ 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.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.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkCPA; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

OffshoreProcess2 class.

@@ -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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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 e4b46fe6a8..638d54e150 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.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.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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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 2272d3a2b6..818165ba89 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.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; /** *

@@ -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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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 d3a50ceee8..bb34c2c76c 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.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; /** *

@@ -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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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 3646a97a4f..319163ba17 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.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; /** *

@@ -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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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 d997624a82..62643f5cb5 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.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; /** *

@@ -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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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 53526e0d5b..447ff86078 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.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.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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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 4b6d2e72cd..1d20ff2fc6 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.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.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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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 848f9f978f..bc3f1a3e04 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.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.thermo.ThermodynamicConstantsInterface; /** @@ -34,9 +34,9 @@ public class TEGdehydrationProcessDistillationAaHa { * getProcess. *

* - * @return a {@link neqsim.processSimulation.processSystem.ProcessSystem} object + * @return a {@link neqsim.processsimulation.processsystem.ProcessSystem} object */ - public static neqsim.processSimulation.processSystem.ProcessSystem getProcess() { + public static neqsim.processsimulation.processsystem.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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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.processsimulation.processsystem.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 c3e76e4fbf..a626cfb5cd 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.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; /** *

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

* - * @return a {@link neqsim.processSimulation.processSystem.ProcessSystem} object + * @return a {@link neqsim.processsimulation.processsystem.ProcessSystem} object */ - public neqsim.processSimulation.processSystem.ProcessSystem getProcess() { + public neqsim.processsimulation.processsystem.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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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.processsimulation.processsystem.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 fff5b760cf..aac3ea5bfa 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.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; /** *

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

* - * @return a {@link neqsim.processSimulation.processSystem.ProcessSystem} object + * @return a {@link neqsim.processsimulation.processsystem.ProcessSystem} object */ - public neqsim.processSimulation.processSystem.ProcessSystem getProcess() { + public neqsim.processsimulation.processsystem.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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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.processsimulation.processsystem.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 6c868a0704..422e88e12e 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.processsimulation.processequipment.absorber.WaterStripperColumn; +import neqsim.processsimulation.processequipment.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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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 5cae4e4224..e479f1ffdc 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.processsimulation.processequipment.separator.Separator; +import neqsim.processsimulation.processequipment.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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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 03c70288b3..5856582a41 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.processsimulation.processequipment.compressor.Compressor; +import neqsim.processsimulation.processequipment.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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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 ccd84ea5a3..17bd806c3f 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.processsimulation.measurementdevice.TemperatureTransmitter; +import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.processsimulation.processequipment.valve.ThrottlingValve; /** *

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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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 12a572ff97..3cc9c31043 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.processsimulation.processequipment.separator.Separator; +import neqsim.processsimulation.processequipment.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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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 346115cd6c..499adab6ba 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.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; /** *

@@ -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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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 b714133beb..32d19033b8 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.processsimulation.measurementdevice.VolumeFlowTransmitter; +import neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator; +import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.processsimulation.processequipment.valve.ThrottlingValve; /** *

@@ -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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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 c047e2ec8d..7144b207b0 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.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; /** *

@@ -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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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 cda2238d57..93c99dd780 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.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; /** *

@@ -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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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 4b37922d5d..465af4851a 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.processsimulation.processequipment.mixer.Mixer; +import neqsim.processsimulation.processequipment.mixer.StaticMixer; +import neqsim.processsimulation.processequipment.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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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 997421c0a1..3cf470811a 100644 --- a/src/test/java/neqsim/processSimulation/util/example/compressorTest.java +++ b/src/test/java/neqsim/processSimulation/util/example/compressorTest.java @@ -1,12 +1,12 @@ 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.thermodynamicOperations.ThermodynamicOperations; +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.thermodynamicoperations.ThermodynamicOperations; /** *

compressorTest class.

@@ -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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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 6a8e7b8feb..ad5dfa8779 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.processsimulation.processequipment.compressor.Compressor; +import neqsim.processsimulation.processequipment.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 4ae05f6726..00b55addfc 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.processsimulation.processequipment.compressor.Compressor; +import neqsim.processsimulation.processequipment.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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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 43a7080f71..10f24d69a2 100644 --- a/src/test/java/neqsim/processSimulation/util/example/destillation1.java +++ b/src/test/java/neqsim/processSimulation/util/example/destillation1.java @@ -1,10 +1,10 @@ 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.thermodynamicOperations.ThermodynamicOperations; +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.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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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 f07879acf3..7809f585ab 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.processsimulation.processequipment.distillation.DistillationColumn; +import neqsim.processsimulation.processequipment.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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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 4b6e7a32cc..4a22cd0c29 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.processsimulation.processequipment.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.processsimulation.processequipment.compressor.Compressor expander = + new neqsim.processsimulation.processequipment.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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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 88a8e835b8..ce7003e8bc 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.processsimulation.processequipment.pipeline.AdiabaticPipe; +import neqsim.processsimulation.processequipment.pipeline.AdiabaticTwoPhasePipe; +import neqsim.processsimulation.processequipment.pipeline.OnePhasePipeLine; +import neqsim.processsimulation.processequipment.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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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 dbea2efd94..bc4f83bf9c 100644 --- a/src/test/java/neqsim/processSimulation/util/example/multiThreadTest.java +++ b/src/test/java/neqsim/processSimulation/util/example/multiThreadTest.java @@ -2,15 +2,15 @@ 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.thermodynamicOperations.ThermodynamicOperations; +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.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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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.processsimulation.processsystem.ProcessSystem operations2 = + new neqsim.processsimulation.processsystem.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 ae1d10817f..b309836276 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.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.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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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 8e45c592e5..20e5599c55 100644 --- a/src/test/java/neqsim/processSimulation/util/example/process1.java +++ b/src/test/java/neqsim/processSimulation/util/example/process1.java @@ -1,7 +1,7 @@ package neqsim.processSimulation.util.example; -import neqsim.processSimulation.processEquipment.stream.Stream; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.processsimulation.processequipment.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.processsimulation.processequipment.compressor.Compressor compr = + new neqsim.processsimulation.processequipment.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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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 7395fe6103..a949c8176a 100644 --- a/src/test/java/neqsim/processSimulation/util/example/process1Test.java +++ b/src/test/java/neqsim/processSimulation/util/example/process1Test.java @@ -3,11 +3,11 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import neqsim.processSimulation.processEquipment.stream.Stream; +import neqsim.processsimulation.processequipment.stream.Stream; class process1Test extends neqsim.NeqSimTest { static neqsim.thermo.system.SystemInterface testSystem; - static neqsim.processSimulation.processSystem.ProcessSystem operations; + static neqsim.processsimulation.processsystem.ProcessSystem operations; /** *

@@ -26,15 +26,15 @@ public static void setUp() { Stream stream_1 = new Stream("Stream1", testSystem); - neqsim.processSimulation.processEquipment.compressor.Compressor compr = - new neqsim.processSimulation.processEquipment.compressor.Compressor("compr", + neqsim.processsimulation.processequipment.compressor.Compressor compr = + new neqsim.processsimulation.processequipment.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.processsimulation.processsystem.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 304d1116ac..c99e663d4d 100644 --- a/src/test/java/neqsim/processSimulation/util/example/process2.java +++ b/src/test/java/neqsim/processSimulation/util/example/process2.java @@ -1,14 +1,14 @@ 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.thermodynamicOperations.ThermodynamicOperations; +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.thermodynamicoperations.ThermodynamicOperations; /** *

process2 class.

@@ -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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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 28f1337e86..a6a58febe1 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.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.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 d4292f91ed..2b8acdcc94 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.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; /** *

@@ -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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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 b8ce31f4e9..a7ed5bf4e4 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.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; /** *

@@ -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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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 34fd89b352..d4cdd2744b 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.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; /** *

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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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 4a6e1e0ad1..080d5e79b7 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.processsimulation.processequipment.separator.Separator; +import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.processsimulation.processequipment.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.processsimulation.processequipment.heatExchanger.Heater heater = + new neqsim.processsimulation.processequipment.heatExchanger.Heater("heater", stream_2); heater.setOutTemperature(273.15 + 35); heater.setPressureDrop(134); - neqsim.processSimulation.processSystem.ProcessSystem operations = - new neqsim.processSimulation.processSystem.ProcessSystem(); + neqsim.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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 6254feacf6..3212a5deb6 100644 --- a/src/test/java/neqsim/processSimulation/util/example/shtokman_MEG.java +++ b/src/test/java/neqsim/processSimulation/util/example/shtokman_MEG.java @@ -2,10 +2,10 @@ 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.thermodynamicOperations.ThermodynamicOperations; +import neqsim.processsimulation.processequipment.separator.Separator; +import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.processsimulation.processequipment.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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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 fcc028f209..e6e441100e 100644 --- a/src/test/java/neqsim/processSimulation/util/example/simpleGasScrubber.java +++ b/src/test/java/neqsim/processSimulation/util/example/simpleGasScrubber.java @@ -1,8 +1,8 @@ package neqsim.processSimulation.util.example; -import neqsim.processSimulation.processEquipment.separator.GasScrubberSimple; -import neqsim.processSimulation.processEquipment.stream.Stream; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.processsimulation.processequipment.separator.GasScrubberSimple; +import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

@@ -38,8 +38,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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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 eb85cf345a..9519a461f1 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.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; /** *

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.processsimulation.processequipment.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.processsimulation.processequipment.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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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 cfc79998e0..18471298d0 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.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; /** *

@@ -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.processsimulation.processequipment.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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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 6a602a7d72..9200d3229f 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.processsimulation.processequipment.pipeline.AdiabaticPipe; +import neqsim.processsimulation.processequipment.separator.GasScrubberSimple; +import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.processsimulation.processequipment.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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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 426e1d77db..c546d598ca 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.processsimulation.processequipment.separator.ThreePhaseSeparator; +import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.processsimulation.processequipment.util.MoleFractionControllerUtil; +import neqsim.processsimulation.processequipment.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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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 6d3d08d596..c42ed2544c 100644 --- a/src/test/java/neqsim/processSimulation/util/example/threePhaseSeparation_1.java +++ b/src/test/java/neqsim/processSimulation/util/example/threePhaseSeparation_1.java @@ -1,8 +1,8 @@ package neqsim.processSimulation.util.example; -import neqsim.processSimulation.processEquipment.separator.ThreePhaseSeparator; -import neqsim.processSimulation.processEquipment.stream.Stream; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator; +import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

threePhaseSeparation_1 class.

@@ -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.processsimulation.processsystem.ProcessSystem operations = + new neqsim.processsimulation.processsystem.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 c1d8c1c808..a6dbff3de1 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.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.thermo.system.SystemSrkEos; public class SeparatorResponseTest { diff --git a/src/test/java/neqsim/processSimulation/util/report/FluidReportTest.java b/src/test/java/neqsim/processSimulation/util/report/FluidReportTest.java index 9e62b209aa..6f6dd3c4b6 100644 --- a/src/test/java/neqsim/processSimulation/util/report/FluidReportTest.java +++ b/src/test/java/neqsim/processSimulation/util/report/FluidReportTest.java @@ -2,7 +2,7 @@ import org.junit.jupiter.api.Test; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; public class FluidReportTest { @Test diff --git a/src/test/java/neqsim/processSimulation/util/report/ReportTest.java b/src/test/java/neqsim/processSimulation/util/report/ReportTest.java index ce3ee81ea1..99000e0ce5 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.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.processsimulation.util.report.Report; import neqsim.thermo.system.SystemSrkEos; public class ReportTest { diff --git a/src/test/java/neqsim/standards/gasQuality/Draft_GERG2004Test.java b/src/test/java/neqsim/standards/gasQuality/Draft_GERG2004Test.java index c82336f973..51675aa067 100644 --- a/src/test/java/neqsim/standards/gasQuality/Draft_GERG2004Test.java +++ b/src/test/java/neqsim/standards/gasQuality/Draft_GERG2004Test.java @@ -3,6 +3,7 @@ import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import neqsim.standards.StandardInterface; +import neqsim.standards.gasquality.Draft_GERG2004; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; diff --git a/src/test/java/neqsim/standards/gasQuality/Draft_ISO18453Test.java b/src/test/java/neqsim/standards/gasQuality/Draft_ISO18453Test.java index 391a10fae5..e8c3457407 100644 --- a/src/test/java/neqsim/standards/gasQuality/Draft_ISO18453Test.java +++ b/src/test/java/neqsim/standards/gasQuality/Draft_ISO18453Test.java @@ -3,6 +3,7 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import neqsim.standards.StandardInterface; +import neqsim.standards.gasquality.Draft_ISO18453; import neqsim.thermo.system.SystemGERGwaterEos; import neqsim.thermo.system.SystemInterface; diff --git a/src/test/java/neqsim/standards/gasQuality/Standard_ISO15403Test.java b/src/test/java/neqsim/standards/gasQuality/Standard_ISO15403Test.java index 900771490f..da965af555 100644 --- a/src/test/java/neqsim/standards/gasQuality/Standard_ISO15403Test.java +++ b/src/test/java/neqsim/standards/gasQuality/Standard_ISO15403Test.java @@ -4,9 +4,10 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; +import neqsim.standards.gasquality.Standard_ISO15403; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; public class Standard_ISO15403Test { private static SystemInterface testSystem = null; diff --git a/src/test/java/neqsim/standards/gasQuality/Standard_ISO6578Test.java b/src/test/java/neqsim/standards/gasQuality/Standard_ISO6578Test.java index 3f8b77a9c2..d57aa1339b 100644 --- a/src/test/java/neqsim/standards/gasQuality/Standard_ISO6578Test.java +++ b/src/test/java/neqsim/standards/gasQuality/Standard_ISO6578Test.java @@ -4,6 +4,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; +import neqsim.standards.gasquality.Standard_ISO6578; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; diff --git a/src/test/java/neqsim/standards/gasQuality/Standard_ISO6976Test.java b/src/test/java/neqsim/standards/gasQuality/Standard_ISO6976Test.java index 076cb9ae3a..925d23debe 100644 --- a/src/test/java/neqsim/standards/gasQuality/Standard_ISO6976Test.java +++ b/src/test/java/neqsim/standards/gasQuality/Standard_ISO6976Test.java @@ -5,9 +5,10 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; +import neqsim.standards.gasquality.Standard_ISO6976; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** * @author ESOL @@ -31,7 +32,7 @@ static void setUpBeforeClass() throws Exception { } /** - * Test method for {@link neqsim.standards.gasQuality.Standard_ISO6976#calculate()}. + * Test method for {@link neqsim.standards.gasquality.Standard_ISO6976#calculate()}. */ @Test void testCalculate() { @@ -46,7 +47,7 @@ void testCalculate() { } /** - * Test method for {@link neqsim.standards.gasQuality.Standard_ISO6976#calculate()} if wrong + * Test method for {@link neqsim.standards.gasquality.Standard_ISO6976#calculate()} if wrong * reference state is gven. Valid reference states should be 0, 15 and 20 C and 15F (15.55C). If * wrong reference state is given, the program should use standard conditions (15C). */ @@ -72,7 +73,7 @@ void testCalculateWithWrongReferenceState() { } /** - * Test method for {@link neqsim.standards.gasQuality.Standard_ISO6976#calculate()}. + * Test method for {@link neqsim.standards.gasquality.Standard_ISO6976#calculate()}. */ @Test void testCalculateWithPSeudo() { diff --git a/src/test/java/neqsim/standards/gasQuality/Standard_ISO6976_2016_Test.java b/src/test/java/neqsim/standards/gasQuality/Standard_ISO6976_2016_Test.java index 645ff2638e..b3d2875cc3 100644 --- a/src/test/java/neqsim/standards/gasQuality/Standard_ISO6976_2016_Test.java +++ b/src/test/java/neqsim/standards/gasQuality/Standard_ISO6976_2016_Test.java @@ -5,9 +5,10 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; +import neqsim.standards.gasquality.Standard_ISO6976_2016; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** * @author ESOL @@ -31,7 +32,7 @@ static void setUpBeforeClass() throws Exception { } /** - * Test method for {@link neqsim.standards.gasQuality.Standard_ISO6976#calculate()}. + * Test method for {@link neqsim.standards.gasquality.Standard_ISO6976#calculate()}. */ @Test void testCalculate() { @@ -46,7 +47,7 @@ void testCalculate() { } /** - * Test method for {@link neqsim.standards.gasQuality.Standard_ISO6976#calculate()} if wrong + * Test method for {@link neqsim.standards.gasquality.Standard_ISO6976#calculate()} if wrong * reference state is gven. Valid reference states should be 0, 15 and 20 C and 15F (15.55C). If * wrong reference state is given, the program should use standard conditions (15C). */ @@ -72,7 +73,7 @@ void testCalculateWithWrongReferenceState() { } /** - * Test method for {@link neqsim.standards.gasQuality.Standard_ISO6976#calculate()}. + * Test method for {@link neqsim.standards.gasquality.Standard_ISO6976#calculate()}. */ @Test void testCalculateWithPSeudo() { diff --git a/src/test/java/neqsim/standards/oilQuality/Standard_ASTM_D6377Test.java b/src/test/java/neqsim/standards/oilQuality/Standard_ASTM_D6377Test.java index 413c620b9b..bd66d281e6 100644 --- a/src/test/java/neqsim/standards/oilQuality/Standard_ASTM_D6377Test.java +++ b/src/test/java/neqsim/standards/oilQuality/Standard_ASTM_D6377Test.java @@ -2,6 +2,7 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import neqsim.standards.oilquality.Standard_ASTM_D6377; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; diff --git a/src/test/java/neqsim/standards/salesContract/BaseContractTest.java b/src/test/java/neqsim/standards/salesContract/BaseContractTest.java index 5b4cec7959..9092b440f0 100644 --- a/src/test/java/neqsim/standards/salesContract/BaseContractTest.java +++ b/src/test/java/neqsim/standards/salesContract/BaseContractTest.java @@ -4,6 +4,8 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; +import neqsim.standards.salescontract.BaseContract; +import neqsim.standards.salescontract.ContractInterface; import neqsim.thermo.system.SystemGERGwaterEos; import neqsim.thermo.system.SystemInterface; diff --git a/src/test/java/neqsim/statistics/monteCarloSimulation/util/example/TestFunction.java b/src/test/java/neqsim/statistics/monteCarloSimulation/util/example/TestFunction.java index 0315a19a09..6283f539b2 100644 --- a/src/test/java/neqsim/statistics/monteCarloSimulation/util/example/TestFunction.java +++ b/src/test/java/neqsim/statistics/monteCarloSimulation/util/example/TestFunction.java @@ -1,6 +1,6 @@ package neqsim.statistics.monteCarloSimulation.util.example; -import neqsim.statistics.parameterFitting.nonLinearParameterFitting.LevenbergMarquardtFunction; +import neqsim.statistics.parameterfitting.nonlinearparameterfitting.LevenbergMarquardtFunction; /** *

TestFunction class.

diff --git a/src/test/java/neqsim/statistics/monteCarloSimulation/util/example/TestLevenbergMarquardt_MonteCarlo.java b/src/test/java/neqsim/statistics/monteCarloSimulation/util/example/TestLevenbergMarquardt_MonteCarlo.java index 82a8177053..f1b0612e4a 100644 --- a/src/test/java/neqsim/statistics/monteCarloSimulation/util/example/TestLevenbergMarquardt_MonteCarlo.java +++ b/src/test/java/neqsim/statistics/monteCarloSimulation/util/example/TestLevenbergMarquardt_MonteCarlo.java @@ -1,9 +1,9 @@ package neqsim.statistics.monteCarloSimulation.util.example; import java.util.ArrayList; -import neqsim.statistics.parameterFitting.SampleSet; -import neqsim.statistics.parameterFitting.SampleValue; -import neqsim.statistics.parameterFitting.nonLinearParameterFitting.LevenbergMarquardt; +import neqsim.statistics.parameterfitting.SampleSet; +import neqsim.statistics.parameterfitting.SampleValue; +import neqsim.statistics.parameterfitting.nonlinearparameterfitting.LevenbergMarquardt; /** *

TestLevenbergMarquardt_MonteCarlo class.

diff --git a/src/test/java/neqsim/statistics/parameterFitting/util/example/TestFunction.java b/src/test/java/neqsim/statistics/parameterFitting/util/example/TestFunction.java index dc94ab3478..85f9780ce8 100644 --- a/src/test/java/neqsim/statistics/parameterFitting/util/example/TestFunction.java +++ b/src/test/java/neqsim/statistics/parameterFitting/util/example/TestFunction.java @@ -1,6 +1,6 @@ package neqsim.statistics.parameterFitting.util.example; -import neqsim.statistics.parameterFitting.nonLinearParameterFitting.LevenbergMarquardtFunction; +import neqsim.statistics.parameterfitting.nonlinearparameterfitting.LevenbergMarquardtFunction; /** *

TestFunction class.

diff --git a/src/test/java/neqsim/statistics/parameterFitting/util/example/TestLevenbergMarquardt.java b/src/test/java/neqsim/statistics/parameterFitting/util/example/TestLevenbergMarquardt.java index f0160e723b..d61796745c 100644 --- a/src/test/java/neqsim/statistics/parameterFitting/util/example/TestLevenbergMarquardt.java +++ b/src/test/java/neqsim/statistics/parameterFitting/util/example/TestLevenbergMarquardt.java @@ -1,9 +1,9 @@ package neqsim.statistics.parameterFitting.util.example; import java.util.ArrayList; -import neqsim.statistics.parameterFitting.SampleSet; -import neqsim.statistics.parameterFitting.SampleValue; -import neqsim.statistics.parameterFitting.nonLinearParameterFitting.LevenbergMarquardt; +import neqsim.statistics.parameterfitting.SampleSet; +import neqsim.statistics.parameterfitting.SampleValue; +import neqsim.statistics.parameterfitting.nonlinearparameterfitting.LevenbergMarquardt; /** *

diff --git a/src/test/java/neqsim/thermo/atomElement/ElementTest.java b/src/test/java/neqsim/thermo/atomElement/ElementTest.java index 6bc2782ea9..f3b3477a10 100644 --- a/src/test/java/neqsim/thermo/atomElement/ElementTest.java +++ b/src/test/java/neqsim/thermo/atomElement/ElementTest.java @@ -3,6 +3,7 @@ import java.util.ArrayList; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import neqsim.thermo.atomelement.Element; public class ElementTest { @Test diff --git a/src/test/java/neqsim/thermo/characterization/CharacteriseTest.java b/src/test/java/neqsim/thermo/characterization/CharacteriseTest.java index 0273b5d776..4afc2d6ed9 100644 --- a/src/test/java/neqsim/thermo/characterization/CharacteriseTest.java +++ b/src/test/java/neqsim/thermo/characterization/CharacteriseTest.java @@ -4,7 +4,7 @@ import org.junit.jupiter.api.Test; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; public class CharacteriseTest extends neqsim.NeqSimTest { static SystemInterface thermoSystem = null; diff --git a/src/test/java/neqsim/thermo/characterization/PlusFractionModelTest.java b/src/test/java/neqsim/thermo/characterization/PlusFractionModelTest.java index 53a00e5c43..eb92f2ae93 100644 --- a/src/test/java/neqsim/thermo/characterization/PlusFractionModelTest.java +++ b/src/test/java/neqsim/thermo/characterization/PlusFractionModelTest.java @@ -5,7 +5,7 @@ import neqsim.thermo.characterization.PlusFractionModel.WhitsonGammaModel; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; public class PlusFractionModelTest { diff --git a/src/test/java/neqsim/thermo/component/AmmoniaTest.java b/src/test/java/neqsim/thermo/component/AmmoniaTest.java index 1c8ea75155..adaf085ebf 100644 --- a/src/test/java/neqsim/thermo/component/AmmoniaTest.java +++ b/src/test/java/neqsim/thermo/component/AmmoniaTest.java @@ -6,7 +6,7 @@ import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; public class AmmoniaTest extends neqsim.NeqSimTest { static SystemInterface thermoSystem = null; diff --git a/src/test/java/neqsim/thermo/component/ComponentHydrateGFTest.java b/src/test/java/neqsim/thermo/component/ComponentHydrateGFTest.java index 97c69fefdb..2be9815741 100644 --- a/src/test/java/neqsim/thermo/component/ComponentHydrateGFTest.java +++ b/src/test/java/neqsim/thermo/component/ComponentHydrateGFTest.java @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkCPAstatoil; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** * @author ESOL diff --git a/src/test/java/neqsim/thermo/system/SystemElectrolyteCPATest.java b/src/test/java/neqsim/thermo/system/SystemElectrolyteCPATest.java index df3558a0b1..2404c0c30b 100644 --- a/src/test/java/neqsim/thermo/system/SystemElectrolyteCPATest.java +++ b/src/test/java/neqsim/thermo/system/SystemElectrolyteCPATest.java @@ -7,7 +7,7 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import neqsim.thermo.phase.PhaseType; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/system/SystemFurstElectrolyteEosTest.java b/src/test/java/neqsim/thermo/system/SystemFurstElectrolyteEosTest.java index a37accbf09..3a04f14d55 100644 --- a/src/test/java/neqsim/thermo/system/SystemFurstElectrolyteEosTest.java +++ b/src/test/java/neqsim/thermo/system/SystemFurstElectrolyteEosTest.java @@ -5,7 +5,7 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/system/SystemPCSAFTTest.java b/src/test/java/neqsim/thermo/system/SystemPCSAFTTest.java index 157790342e..2ab890d50f 100644 --- a/src/test/java/neqsim/thermo/system/SystemPCSAFTTest.java +++ b/src/test/java/neqsim/thermo/system/SystemPCSAFTTest.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; public class SystemPCSAFTTest { @Test diff --git a/src/test/java/neqsim/thermo/system/SystemPrEoSTest.java b/src/test/java/neqsim/thermo/system/SystemPrEoSTest.java index df738c0566..a4622546cc 100644 --- a/src/test/java/neqsim/thermo/system/SystemPrEoSTest.java +++ b/src/test/java/neqsim/thermo/system/SystemPrEoSTest.java @@ -5,7 +5,7 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; public class SystemPrEoSTest extends neqsim.NeqSimTest { static neqsim.thermo.system.SystemInterface testSystem = null; diff --git a/src/test/java/neqsim/thermo/system/SystemSrkCPAstatoilTest.java b/src/test/java/neqsim/thermo/system/SystemSrkCPAstatoilTest.java index a123c11885..ec737c607a 100644 --- a/src/test/java/neqsim/thermo/system/SystemSrkCPAstatoilTest.java +++ b/src/test/java/neqsim/thermo/system/SystemSrkCPAstatoilTest.java @@ -3,7 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/system/SystemThermoTest.java b/src/test/java/neqsim/thermo/system/SystemThermoTest.java index 2d6e940e35..bdca62a470 100644 --- a/src/test/java/neqsim/thermo/system/SystemThermoTest.java +++ b/src/test/java/neqsim/thermo/system/SystemThermoTest.java @@ -6,7 +6,7 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import neqsim.thermo.ThermodynamicConstantsInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; class SystemThermoTest extends neqsim.NeqSimTest { static neqsim.thermo.system.SystemInterface testSystem = null; diff --git a/src/test/java/neqsim/thermo/system/SystemUMRCPAEoStest.java b/src/test/java/neqsim/thermo/system/SystemUMRCPAEoStest.java index 14c83345c3..9c796a7423 100644 --- a/src/test/java/neqsim/thermo/system/SystemUMRCPAEoStest.java +++ b/src/test/java/neqsim/thermo/system/SystemUMRCPAEoStest.java @@ -6,7 +6,7 @@ import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; class SystemUMRCPAEoStest extends neqsim.NeqSimTest { static neqsim.thermo.system.SystemInterface testSystem = null; diff --git a/src/test/java/neqsim/thermo/system/SystemUMRPRUMCEosNewTest.java b/src/test/java/neqsim/thermo/system/SystemUMRPRUMCEosNewTest.java index 14af4075e1..665bac8ec1 100644 --- a/src/test/java/neqsim/thermo/system/SystemUMRPRUMCEosNewTest.java +++ b/src/test/java/neqsim/thermo/system/SystemUMRPRUMCEosNewTest.java @@ -8,8 +8,8 @@ import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import neqsim.PVTsimulation.simulation.SaturationPressure; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.pvtsimulation.simulation.SaturationPressure; +import neqsim.thermodynamicoperations.ThermodynamicOperations; class SystemUMRPRUMCEosNewTest extends neqsim.NeqSimTest { static Logger logger = LogManager.getLogger(SystemUMRPRUMCEosNewTest.class); diff --git a/src/test/java/neqsim/thermo/util/example/ActivityCalc.java b/src/test/java/neqsim/thermo/util/example/ActivityCalc.java index cc8db77078..0b8cb73b3a 100644 --- a/src/test/java/neqsim/thermo/util/example/ActivityCalc.java +++ b/src/test/java/neqsim/thermo/util/example/ActivityCalc.java @@ -9,7 +9,7 @@ import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkCPAstatoil; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/util/example/AmineFlash.java b/src/test/java/neqsim/thermo/util/example/AmineFlash.java index 8bf2c09e33..c02a49397b 100644 --- a/src/test/java/neqsim/thermo/util/example/AmineFlash.java +++ b/src/test/java/neqsim/thermo/util/example/AmineFlash.java @@ -5,7 +5,7 @@ import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.system.SystemFurstElectrolyteEos; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/util/example/BubbleFlash.java b/src/test/java/neqsim/thermo/util/example/BubbleFlash.java index 692b047cc2..5cddded1dd 100644 --- a/src/test/java/neqsim/thermo/util/example/BubbleFlash.java +++ b/src/test/java/neqsim/thermo/util/example/BubbleFlash.java @@ -4,7 +4,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkCPAstatoil; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/util/example/BubbleFlashCPA.java b/src/test/java/neqsim/thermo/util/example/BubbleFlashCPA.java index 33f06f01ef..d8cd6e1a78 100644 --- a/src/test/java/neqsim/thermo/util/example/BubbleFlashCPA.java +++ b/src/test/java/neqsim/thermo/util/example/BubbleFlashCPA.java @@ -4,7 +4,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkCPAstatoil; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/util/example/CricondenbarTest.java b/src/test/java/neqsim/thermo/util/example/CricondenbarTest.java index 28c92fb8e5..f420cc94f5 100644 --- a/src/test/java/neqsim/thermo/util/example/CricondenbarTest.java +++ b/src/test/java/neqsim/thermo/util/example/CricondenbarTest.java @@ -4,7 +4,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/util/example/DewPointCurve.java b/src/test/java/neqsim/thermo/util/example/DewPointCurve.java index 81d6eb1416..505f02285f 100644 --- a/src/test/java/neqsim/thermo/util/example/DewPointCurve.java +++ b/src/test/java/neqsim/thermo/util/example/DewPointCurve.java @@ -4,7 +4,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemPrEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/util/example/FlashGasTest.java b/src/test/java/neqsim/thermo/util/example/FlashGasTest.java index c48a2d418b..8ee50785d5 100644 --- a/src/test/java/neqsim/thermo/util/example/FlashGasTest.java +++ b/src/test/java/neqsim/thermo/util/example/FlashGasTest.java @@ -5,7 +5,7 @@ import org.junit.jupiter.api.Test; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; class FlashGasTest { static SystemInterface fluid1 = null; diff --git a/src/test/java/neqsim/thermo/util/example/FlashOilTest.java b/src/test/java/neqsim/thermo/util/example/FlashOilTest.java index f7cd948e5f..bb3cd4c877 100644 --- a/src/test/java/neqsim/thermo/util/example/FlashOilTest.java +++ b/src/test/java/neqsim/thermo/util/example/FlashOilTest.java @@ -5,7 +5,7 @@ import org.junit.jupiter.api.Test; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; class FlashOilTest { static SystemInterface fluid1 = null; diff --git a/src/test/java/neqsim/thermo/util/example/FlashWaterTest.java b/src/test/java/neqsim/thermo/util/example/FlashWaterTest.java index 7e77a4aac4..1da975cb12 100644 --- a/src/test/java/neqsim/thermo/util/example/FlashWaterTest.java +++ b/src/test/java/neqsim/thermo/util/example/FlashWaterTest.java @@ -5,7 +5,7 @@ import org.junit.jupiter.api.Test; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; class FlashWaterTest { static SystemInterface waterSystem = null; diff --git a/src/test/java/neqsim/thermo/util/example/FreezeMEGwater.java b/src/test/java/neqsim/thermo/util/example/FreezeMEGwater.java index e3fc00351a..c5bec1c0a6 100644 --- a/src/test/java/neqsim/thermo/util/example/FreezeMEGwater.java +++ b/src/test/java/neqsim/thermo/util/example/FreezeMEGwater.java @@ -4,7 +4,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkCPAstatoil; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/util/example/FreezingPoint.java b/src/test/java/neqsim/thermo/util/example/FreezingPoint.java index 059458db1b..c4408a3216 100644 --- a/src/test/java/neqsim/thermo/util/example/FreezingPoint.java +++ b/src/test/java/neqsim/thermo/util/example/FreezingPoint.java @@ -5,7 +5,7 @@ import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkCPAstatoil; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/util/example/H2Sdistribution.java b/src/test/java/neqsim/thermo/util/example/H2Sdistribution.java index 6dc20ca7c4..cddb51ef0e 100644 --- a/src/test/java/neqsim/thermo/util/example/H2Sdistribution.java +++ b/src/test/java/neqsim/thermo/util/example/H2Sdistribution.java @@ -4,7 +4,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemElectrolyteCPAstatoil; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/util/example/HeatOfVaporization.java b/src/test/java/neqsim/thermo/util/example/HeatOfVaporization.java index 5dc299efdb..310570aa18 100644 --- a/src/test/java/neqsim/thermo/util/example/HeatOfVaporization.java +++ b/src/test/java/neqsim/thermo/util/example/HeatOfVaporization.java @@ -4,7 +4,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkCPAstatoil; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/util/example/HenryConstantCalc.java b/src/test/java/neqsim/thermo/util/example/HenryConstantCalc.java index baa356f705..2c72ea372e 100644 --- a/src/test/java/neqsim/thermo/util/example/HenryConstantCalc.java +++ b/src/test/java/neqsim/thermo/util/example/HenryConstantCalc.java @@ -2,7 +2,7 @@ import neqsim.thermo.system.SystemElectrolyteCPA; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/util/example/HydrateFlash.java b/src/test/java/neqsim/thermo/util/example/HydrateFlash.java index a7c4d5639b..a464a2f6f6 100644 --- a/src/test/java/neqsim/thermo/util/example/HydrateFlash.java +++ b/src/test/java/neqsim/thermo/util/example/HydrateFlash.java @@ -4,7 +4,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/util/example/HydrateFlash2.java b/src/test/java/neqsim/thermo/util/example/HydrateFlash2.java index 3bfdd6fb78..1e33184d5e 100644 --- a/src/test/java/neqsim/thermo/util/example/HydrateFlash2.java +++ b/src/test/java/neqsim/thermo/util/example/HydrateFlash2.java @@ -4,7 +4,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkCPAstatoil; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/util/example/KlabFlashBugTest.java b/src/test/java/neqsim/thermo/util/example/KlabFlashBugTest.java index d1325061e1..4b06635bea 100644 --- a/src/test/java/neqsim/thermo/util/example/KlabFlashBugTest.java +++ b/src/test/java/neqsim/thermo/util/example/KlabFlashBugTest.java @@ -5,7 +5,7 @@ import org.junit.jupiter.api.Test; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; class KlabFlashBugTest { static SystemInterface fluid1 = null; diff --git a/src/test/java/neqsim/thermo/util/example/LNGFlash.java b/src/test/java/neqsim/thermo/util/example/LNGFlash.java index ea57a444f5..6573de04a2 100644 --- a/src/test/java/neqsim/thermo/util/example/LNGFlash.java +++ b/src/test/java/neqsim/thermo/util/example/LNGFlash.java @@ -4,7 +4,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/util/example/LNGfilling.java b/src/test/java/neqsim/thermo/util/example/LNGfilling.java index ecc0f0705e..508cef52dd 100644 --- a/src/test/java/neqsim/thermo/util/example/LNGfilling.java +++ b/src/test/java/neqsim/thermo/util/example/LNGfilling.java @@ -4,7 +4,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkCPAs; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/util/example/LNGfreezing.java b/src/test/java/neqsim/thermo/util/example/LNGfreezing.java index 0732222e3a..cfdbd5268e 100644 --- a/src/test/java/neqsim/thermo/util/example/LNGfreezing.java +++ b/src/test/java/neqsim/thermo/util/example/LNGfreezing.java @@ -4,7 +4,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/util/example/LNGfreezingTestSolid1.java b/src/test/java/neqsim/thermo/util/example/LNGfreezingTestSolid1.java index 7ce628cdae..23961a7038 100644 --- a/src/test/java/neqsim/thermo/util/example/LNGfreezingTestSolid1.java +++ b/src/test/java/neqsim/thermo/util/example/LNGfreezingTestSolid1.java @@ -4,7 +4,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/util/example/ModelTest.java b/src/test/java/neqsim/thermo/util/example/ModelTest.java index e905e668e2..271aa832ef 100644 --- a/src/test/java/neqsim/thermo/util/example/ModelTest.java +++ b/src/test/java/neqsim/thermo/util/example/ModelTest.java @@ -4,7 +4,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkCPA; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

ModelTest class.

diff --git a/src/test/java/neqsim/thermo/util/example/OsmoticCoefficient_1.java b/src/test/java/neqsim/thermo/util/example/OsmoticCoefficient_1.java index c5362907ed..41bb8c6cd8 100644 --- a/src/test/java/neqsim/thermo/util/example/OsmoticCoefficient_1.java +++ b/src/test/java/neqsim/thermo/util/example/OsmoticCoefficient_1.java @@ -3,7 +3,7 @@ import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.system.SystemFurstElectrolyteEos; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/util/example/PS_PH_flash.java b/src/test/java/neqsim/thermo/util/example/PS_PH_flash.java index c31fd705d7..b50393d400 100644 --- a/src/test/java/neqsim/thermo/util/example/PS_PH_flash.java +++ b/src/test/java/neqsim/thermo/util/example/PS_PH_flash.java @@ -2,7 +2,7 @@ import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/util/example/PhaseEnvelope.java b/src/test/java/neqsim/thermo/util/example/PhaseEnvelope.java index fb958e0187..546b1b353d 100644 --- a/src/test/java/neqsim/thermo/util/example/PhaseEnvelope.java +++ b/src/test/java/neqsim/thermo/util/example/PhaseEnvelope.java @@ -2,11 +2,11 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import neqsim.PVTsimulation.simulation.SaturationPressure; -import neqsim.PVTsimulation.simulation.SimulationInterface; +import neqsim.pvtsimulation.simulation.SaturationPressure; +import neqsim.pvtsimulation.simulation.SimulationInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemUMRPRUMCEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/util/example/PhaseEnvelope2.java b/src/test/java/neqsim/thermo/util/example/PhaseEnvelope2.java index ec774eed31..aef4ba9555 100644 --- a/src/test/java/neqsim/thermo/util/example/PhaseEnvelope2.java +++ b/src/test/java/neqsim/thermo/util/example/PhaseEnvelope2.java @@ -4,7 +4,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/util/example/PressureLoadingCurve.java b/src/test/java/neqsim/thermo/util/example/PressureLoadingCurve.java index a5b00d6111..fc8324bda8 100644 --- a/src/test/java/neqsim/thermo/util/example/PressureLoadingCurve.java +++ b/src/test/java/neqsim/thermo/util/example/PressureLoadingCurve.java @@ -4,7 +4,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemFurstElectrolyteEos; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/util/example/ReactiveDesmukhMather.java b/src/test/java/neqsim/thermo/util/example/ReactiveDesmukhMather.java index 5165a92825..33cbaea315 100644 --- a/src/test/java/neqsim/thermo/util/example/ReactiveDesmukhMather.java +++ b/src/test/java/neqsim/thermo/util/example/ReactiveDesmukhMather.java @@ -2,7 +2,7 @@ import neqsim.thermo.system.SystemDesmukhMather; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/util/example/ReactiveKentEisenberg.java b/src/test/java/neqsim/thermo/util/example/ReactiveKentEisenberg.java index 61483069a4..78e6ab9f50 100644 --- a/src/test/java/neqsim/thermo/util/example/ReactiveKentEisenberg.java +++ b/src/test/java/neqsim/thermo/util/example/ReactiveKentEisenberg.java @@ -4,7 +4,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemFurstElectrolyteEos; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/util/example/ReactiveTPflash.java b/src/test/java/neqsim/thermo/util/example/ReactiveTPflash.java index 2fc07cb1e8..9f288ead41 100644 --- a/src/test/java/neqsim/thermo/util/example/ReactiveTPflash.java +++ b/src/test/java/neqsim/thermo/util/example/ReactiveTPflash.java @@ -4,7 +4,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemElectrolyteCPAstatoil; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/util/example/ReactiveTPflash2.java b/src/test/java/neqsim/thermo/util/example/ReactiveTPflash2.java index 7573c63185..370b069050 100644 --- a/src/test/java/neqsim/thermo/util/example/ReactiveTPflash2.java +++ b/src/test/java/neqsim/thermo/util/example/ReactiveTPflash2.java @@ -11,7 +11,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemFurstElectrolyteEos; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/util/example/ReadFluidData.java b/src/test/java/neqsim/thermo/util/example/ReadFluidData.java index 546eea38e9..baf7b8a916 100644 --- a/src/test/java/neqsim/thermo/util/example/ReadFluidData.java +++ b/src/test/java/neqsim/thermo/util/example/ReadFluidData.java @@ -4,7 +4,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/util/example/ReadFluidData2.java b/src/test/java/neqsim/thermo/util/example/ReadFluidData2.java index 64cfb4d9dc..c036fbd702 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.processsimulation.processequipment.separator.ThreePhaseSeparator; +import neqsim.processsimulation.processequipment.stream.Stream; +import neqsim.processsimulation.processequipment.stream.StreamInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; diff --git a/src/test/java/neqsim/thermo/util/example/ScalePotentialCheck.java b/src/test/java/neqsim/thermo/util/example/ScalePotentialCheck.java index 3e21b17d03..2535b4e1e3 100644 --- a/src/test/java/neqsim/thermo/util/example/ScalePotentialCheck.java +++ b/src/test/java/neqsim/thermo/util/example/ScalePotentialCheck.java @@ -10,7 +10,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemElectrolyteCPAstatoil; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/util/example/SolidFlash.java b/src/test/java/neqsim/thermo/util/example/SolidFlash.java index dbdfdf1ae3..7261ef25c6 100644 --- a/src/test/java/neqsim/thermo/util/example/SolidFlash.java +++ b/src/test/java/neqsim/thermo/util/example/SolidFlash.java @@ -4,7 +4,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkCPAstatoil; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/util/example/SrkEoSTest.java b/src/test/java/neqsim/thermo/util/example/SrkEoSTest.java index 7f71890ba8..7648dc4a80 100644 --- a/src/test/java/neqsim/thermo/util/example/SrkEoSTest.java +++ b/src/test/java/neqsim/thermo/util/example/SrkEoSTest.java @@ -7,7 +7,7 @@ import org.junit.jupiter.api.Test; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/util/example/SrkOilCharacterizationTest.java b/src/test/java/neqsim/thermo/util/example/SrkOilCharacterizationTest.java index ea421aa416..898f412d9c 100644 --- a/src/test/java/neqsim/thermo/util/example/SrkOilCharacterizationTest.java +++ b/src/test/java/neqsim/thermo/util/example/SrkOilCharacterizationTest.java @@ -6,7 +6,7 @@ import neqsim.thermo.system.SystemInterface; // import junit.framework.TestCase; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

SrkOilCharacterizationTest class.

diff --git a/src/test/java/neqsim/thermo/util/example/SulfureDeposition.java b/src/test/java/neqsim/thermo/util/example/SulfureDeposition.java index 37c889e1f5..db9e0a3ffd 100644 --- a/src/test/java/neqsim/thermo/util/example/SulfureDeposition.java +++ b/src/test/java/neqsim/thermo/util/example/SulfureDeposition.java @@ -5,7 +5,7 @@ import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/util/example/TPMultiFlash.java b/src/test/java/neqsim/thermo/util/example/TPMultiFlash.java index f51bdfa325..3944d8df85 100644 --- a/src/test/java/neqsim/thermo/util/example/TPMultiFlash.java +++ b/src/test/java/neqsim/thermo/util/example/TPMultiFlash.java @@ -5,7 +5,7 @@ import neqsim.thermo.phase.PhaseType; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkCPAstatoil; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/util/example/TPflash.java b/src/test/java/neqsim/thermo/util/example/TPflash.java index ae044a6929..c04a171155 100644 --- a/src/test/java/neqsim/thermo/util/example/TPflash.java +++ b/src/test/java/neqsim/thermo/util/example/TPflash.java @@ -4,7 +4,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/util/example/TPflash1.java b/src/test/java/neqsim/thermo/util/example/TPflash1.java index 0931b35e5e..46f27681c4 100644 --- a/src/test/java/neqsim/thermo/util/example/TPflash1.java +++ b/src/test/java/neqsim/thermo/util/example/TPflash1.java @@ -4,7 +4,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkCPAstatoil; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/util/example/TPflash2.java b/src/test/java/neqsim/thermo/util/example/TPflash2.java index 3adcb4eb01..72f30c778e 100644 --- a/src/test/java/neqsim/thermo/util/example/TPflash2.java +++ b/src/test/java/neqsim/thermo/util/example/TPflash2.java @@ -5,7 +5,7 @@ import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkCPAstatoil; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/util/example/TPflashCAPEOPEN.java b/src/test/java/neqsim/thermo/util/example/TPflashCAPEOPEN.java index 7dd8de0b8a..3360248db8 100644 --- a/src/test/java/neqsim/thermo/util/example/TPflashCAPEOPEN.java +++ b/src/test/java/neqsim/thermo/util/example/TPflashCAPEOPEN.java @@ -3,7 +3,7 @@ import neqsim.thermo.phase.PhaseType; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/util/example/TPflashDehyd.java b/src/test/java/neqsim/thermo/util/example/TPflashDehyd.java index ed8f2e83a3..66a173e168 100644 --- a/src/test/java/neqsim/thermo/util/example/TPflashDehyd.java +++ b/src/test/java/neqsim/thermo/util/example/TPflashDehyd.java @@ -5,7 +5,7 @@ import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkCPAstatoil; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/util/example/TPflashGR.java b/src/test/java/neqsim/thermo/util/example/TPflashGR.java index e5be7666a1..639b0cbdea 100644 --- a/src/test/java/neqsim/thermo/util/example/TPflashGR.java +++ b/src/test/java/neqsim/thermo/util/example/TPflashGR.java @@ -4,7 +4,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/util/example/TPflashMembrane.java b/src/test/java/neqsim/thermo/util/example/TPflashMembrane.java index 4696a02b50..bb341bd6ee 100644 --- a/src/test/java/neqsim/thermo/util/example/TPflashMembrane.java +++ b/src/test/java/neqsim/thermo/util/example/TPflashMembrane.java @@ -6,7 +6,7 @@ import neqsim.thermo.phase.PhaseType; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/util/example/TPflashMethanolWaterPropane.java b/src/test/java/neqsim/thermo/util/example/TPflashMethanolWaterPropane.java index 04da438fc9..9c7d51ea08 100644 --- a/src/test/java/neqsim/thermo/util/example/TPflashMethanolWaterPropane.java +++ b/src/test/java/neqsim/thermo/util/example/TPflashMethanolWaterPropane.java @@ -4,7 +4,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkCPA; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/util/example/TPflashTestPablo.java b/src/test/java/neqsim/thermo/util/example/TPflashTestPablo.java index 22bf856432..164a6d181c 100644 --- a/src/test/java/neqsim/thermo/util/example/TPflashTestPablo.java +++ b/src/test/java/neqsim/thermo/util/example/TPflashTestPablo.java @@ -2,7 +2,7 @@ import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkCPAstatoil; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/util/example/TVPexample.java b/src/test/java/neqsim/thermo/util/example/TVPexample.java index ed92f1db91..1e330ac2ea 100644 --- a/src/test/java/neqsim/thermo/util/example/TVPexample.java +++ b/src/test/java/neqsim/thermo/util/example/TVPexample.java @@ -4,7 +4,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/util/example/TestCSPsrk.java b/src/test/java/neqsim/thermo/util/example/TestCSPsrk.java index e7021306e6..e6137e6298 100644 --- a/src/test/java/neqsim/thermo/util/example/TestCSPsrk.java +++ b/src/test/java/neqsim/thermo/util/example/TestCSPsrk.java @@ -4,7 +4,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemCSPsrkEos; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/util/example/TestCharacterizationCPA.java b/src/test/java/neqsim/thermo/util/example/TestCharacterizationCPA.java index 349a7a63ef..f1cad1349b 100644 --- a/src/test/java/neqsim/thermo/util/example/TestCharacterizationCPA.java +++ b/src/test/java/neqsim/thermo/util/example/TestCharacterizationCPA.java @@ -4,7 +4,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkCPAstatoil; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/util/example/TestCharacterizationCondensate.java b/src/test/java/neqsim/thermo/util/example/TestCharacterizationCondensate.java index 654c1104f8..c533e79d37 100644 --- a/src/test/java/neqsim/thermo/util/example/TestCharacterizationCondensate.java +++ b/src/test/java/neqsim/thermo/util/example/TestCharacterizationCondensate.java @@ -4,7 +4,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/util/example/TestCharacterizationCondensate1.java b/src/test/java/neqsim/thermo/util/example/TestCharacterizationCondensate1.java index 3b15f51a6e..8b66505096 100644 --- a/src/test/java/neqsim/thermo/util/example/TestCharacterizationCondensate1.java +++ b/src/test/java/neqsim/thermo/util/example/TestCharacterizationCondensate1.java @@ -5,7 +5,7 @@ import neqsim.thermo.phase.PhaseEosInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/util/example/TestElectrolyteCPAstatoil.java b/src/test/java/neqsim/thermo/util/example/TestElectrolyteCPAstatoil.java index 3cf29d1c43..38c6ce93d0 100644 --- a/src/test/java/neqsim/thermo/util/example/TestElectrolyteCPAstatoil.java +++ b/src/test/java/neqsim/thermo/util/example/TestElectrolyteCPAstatoil.java @@ -4,7 +4,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemElectrolyteCPAstatoil; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/util/example/TestFlash.java b/src/test/java/neqsim/thermo/util/example/TestFlash.java index 42cca14137..ec6d53b8d0 100644 --- a/src/test/java/neqsim/thermo/util/example/TestFlash.java +++ b/src/test/java/neqsim/thermo/util/example/TestFlash.java @@ -7,7 +7,7 @@ import neqsim.thermo.phase.PhaseType; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/util/example/TestFluidIssues.java b/src/test/java/neqsim/thermo/util/example/TestFluidIssues.java index 9bf29fe417..bc35f09fe4 100644 --- a/src/test/java/neqsim/thermo/util/example/TestFluidIssues.java +++ b/src/test/java/neqsim/thermo/util/example/TestFluidIssues.java @@ -4,7 +4,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkCPAstatoil; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

TestFluidIssues class.

diff --git a/src/test/java/neqsim/thermo/util/example/TestGEHenry.java b/src/test/java/neqsim/thermo/util/example/TestGEHenry.java index a0b7a14c0d..5ff68387ef 100644 --- a/src/test/java/neqsim/thermo/util/example/TestGEHenry.java +++ b/src/test/java/neqsim/thermo/util/example/TestGEHenry.java @@ -4,7 +4,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemGEWilson; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/util/example/TestGERG2004EOS.java b/src/test/java/neqsim/thermo/util/example/TestGERG2004EOS.java index da1ba03f54..d774690875 100644 --- a/src/test/java/neqsim/thermo/util/example/TestGERG2004EOS.java +++ b/src/test/java/neqsim/thermo/util/example/TestGERG2004EOS.java @@ -4,7 +4,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemGERG2004Eos; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/util/example/TestGERGwater.java b/src/test/java/neqsim/thermo/util/example/TestGERGwater.java index 2715646756..ec4271e5c4 100644 --- a/src/test/java/neqsim/thermo/util/example/TestGERGwater.java +++ b/src/test/java/neqsim/thermo/util/example/TestGERGwater.java @@ -4,7 +4,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkCPAstatoil; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/util/example/TestISO1982.java b/src/test/java/neqsim/thermo/util/example/TestISO1982.java index 7bbbdfed2c..824d34c254 100644 --- a/src/test/java/neqsim/thermo/util/example/TestISO1982.java +++ b/src/test/java/neqsim/thermo/util/example/TestISO1982.java @@ -10,7 +10,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/util/example/TestMBWR32.java b/src/test/java/neqsim/thermo/util/example/TestMBWR32.java index c4f77a46ed..5b795464d9 100644 --- a/src/test/java/neqsim/thermo/util/example/TestMBWR32.java +++ b/src/test/java/neqsim/thermo/util/example/TestMBWR32.java @@ -4,7 +4,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemBWRSEos; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/util/example/TestMEGFlash.java b/src/test/java/neqsim/thermo/util/example/TestMEGFlash.java index d4e05223c8..e862e8caed 100644 --- a/src/test/java/neqsim/thermo/util/example/TestMEGFlash.java +++ b/src/test/java/neqsim/thermo/util/example/TestMEGFlash.java @@ -4,7 +4,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkCPAs; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/util/example/TestNeqSimBug.java b/src/test/java/neqsim/thermo/util/example/TestNeqSimBug.java index b5e0610257..0aed02a1a4 100644 --- a/src/test/java/neqsim/thermo/util/example/TestNeqSimBug.java +++ b/src/test/java/neqsim/thermo/util/example/TestNeqSimBug.java @@ -3,7 +3,7 @@ import java.util.Arrays; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/util/example/TestPCSAFT.java b/src/test/java/neqsim/thermo/util/example/TestPCSAFT.java index 646c2d83fd..6ea16a7d84 100644 --- a/src/test/java/neqsim/thermo/util/example/TestPCSAFT.java +++ b/src/test/java/neqsim/thermo/util/example/TestPCSAFT.java @@ -5,7 +5,7 @@ import neqsim.thermo.ThermodynamicModelTest; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkCPAstatoil; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/util/example/TestPCSAFT1.java b/src/test/java/neqsim/thermo/util/example/TestPCSAFT1.java index 399999d82d..5df7788632 100644 --- a/src/test/java/neqsim/thermo/util/example/TestPCSAFT1.java +++ b/src/test/java/neqsim/thermo/util/example/TestPCSAFT1.java @@ -4,7 +4,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/util/example/TestPCSAFT1_1.java b/src/test/java/neqsim/thermo/util/example/TestPCSAFT1_1.java index ba95a24069..f29524641c 100644 --- a/src/test/java/neqsim/thermo/util/example/TestPCSAFT1_1.java +++ b/src/test/java/neqsim/thermo/util/example/TestPCSAFT1_1.java @@ -4,7 +4,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/util/example/TestPSRK.java b/src/test/java/neqsim/thermo/util/example/TestPSRK.java index 532728a0da..80d521db8d 100644 --- a/src/test/java/neqsim/thermo/util/example/TestPSRK.java +++ b/src/test/java/neqsim/thermo/util/example/TestPSRK.java @@ -4,7 +4,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemPsrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/util/example/TestSRKWS.java b/src/test/java/neqsim/thermo/util/example/TestSRKWS.java index e4ad97ca70..6e62ef82bc 100644 --- a/src/test/java/neqsim/thermo/util/example/TestSRKWS.java +++ b/src/test/java/neqsim/thermo/util/example/TestSRKWS.java @@ -4,7 +4,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemPsrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/util/example/TestSurfaceTenison.java b/src/test/java/neqsim/thermo/util/example/TestSurfaceTenison.java index 56a088dd59..ca483d72f4 100644 --- a/src/test/java/neqsim/thermo/util/example/TestSurfaceTenison.java +++ b/src/test/java/neqsim/thermo/util/example/TestSurfaceTenison.java @@ -4,7 +4,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/util/example/TestUMRPRU.java b/src/test/java/neqsim/thermo/util/example/TestUMRPRU.java index 8b052a110d..ccfe3171e7 100644 --- a/src/test/java/neqsim/thermo/util/example/TestUMRPRU.java +++ b/src/test/java/neqsim/thermo/util/example/TestUMRPRU.java @@ -4,7 +4,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemUMRPRUMCEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/util/example/TestUMRPRUMC.java b/src/test/java/neqsim/thermo/util/example/TestUMRPRUMC.java index a2b24cb239..3baa4530fd 100644 --- a/src/test/java/neqsim/thermo/util/example/TestUMRPRUMC.java +++ b/src/test/java/neqsim/thermo/util/example/TestUMRPRUMC.java @@ -4,7 +4,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/util/example/TestUNIFAC.java b/src/test/java/neqsim/thermo/util/example/TestUNIFAC.java index ba0c3614ca..291032d9fd 100644 --- a/src/test/java/neqsim/thermo/util/example/TestUNIFAC.java +++ b/src/test/java/neqsim/thermo/util/example/TestUNIFAC.java @@ -4,7 +4,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemPsrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/util/example/TestUNIFAC_1.java b/src/test/java/neqsim/thermo/util/example/TestUNIFAC_1.java index 80f294d804..fa59c24727 100644 --- a/src/test/java/neqsim/thermo/util/example/TestUNIFAC_1.java +++ b/src/test/java/neqsim/thermo/util/example/TestUNIFAC_1.java @@ -4,7 +4,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemPsrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/util/example/TestUniSimsFlash.java b/src/test/java/neqsim/thermo/util/example/TestUniSimsFlash.java index 9ed4964bd2..74523253ff 100644 --- a/src/test/java/neqsim/thermo/util/example/TestUniSimsFlash.java +++ b/src/test/java/neqsim/thermo/util/example/TestUniSimsFlash.java @@ -2,7 +2,7 @@ import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/util/example/TestVHflash.java b/src/test/java/neqsim/thermo/util/example/TestVHflash.java index 9ad56b3f51..a49a27679c 100644 --- a/src/test/java/neqsim/thermo/util/example/TestVHflash.java +++ b/src/test/java/neqsim/thermo/util/example/TestVHflash.java @@ -5,7 +5,7 @@ import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/util/example/TestmercuryTPflash.java b/src/test/java/neqsim/thermo/util/example/TestmercuryTPflash.java index 281536d204..6d811da171 100644 --- a/src/test/java/neqsim/thermo/util/example/TestmercuryTPflash.java +++ b/src/test/java/neqsim/thermo/util/example/TestmercuryTPflash.java @@ -4,7 +4,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkTwuCoonStatoilEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/util/example/VapourPressureTTest.java b/src/test/java/neqsim/thermo/util/example/VapourPressureTTest.java index 824f57b96b..860a1cb2ae 100644 --- a/src/test/java/neqsim/thermo/util/example/VapourPressureTTest.java +++ b/src/test/java/neqsim/thermo/util/example/VapourPressureTTest.java @@ -5,7 +5,7 @@ import org.junit.jupiter.api.Test; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkCPAstatoil; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/util/example/WaxFlash.java b/src/test/java/neqsim/thermo/util/example/WaxFlash.java index ef2fd89916..d1cdb5ba38 100644 --- a/src/test/java/neqsim/thermo/util/example/WaxFlash.java +++ b/src/test/java/neqsim/thermo/util/example/WaxFlash.java @@ -4,7 +4,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; import neqsim.util.database.NeqSimDataBase; /** diff --git a/src/test/java/neqsim/thermo/util/example/longman/Problem15102009LNGfreezing.java b/src/test/java/neqsim/thermo/util/example/longman/Problem15102009LNGfreezing.java index efa0a441ab..48dc2d7f70 100644 --- a/src/test/java/neqsim/thermo/util/example/longman/Problem15102009LNGfreezing.java +++ b/src/test/java/neqsim/thermo/util/example/longman/Problem15102009LNGfreezing.java @@ -4,7 +4,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/util/example/longman/Problem280809LNGfreezing.java b/src/test/java/neqsim/thermo/util/example/longman/Problem280809LNGfreezing.java index 5a4584e009..33bb197d9d 100644 --- a/src/test/java/neqsim/thermo/util/example/longman/Problem280809LNGfreezing.java +++ b/src/test/java/neqsim/thermo/util/example/longman/Problem280809LNGfreezing.java @@ -4,7 +4,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemGERG2004Eos; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/util/example/longman/Problem280809LNGphaseEnvelope.java b/src/test/java/neqsim/thermo/util/example/longman/Problem280809LNGphaseEnvelope.java index 1467f78f53..023b9f63a7 100644 --- a/src/test/java/neqsim/thermo/util/example/longman/Problem280809LNGphaseEnvelope.java +++ b/src/test/java/neqsim/thermo/util/example/longman/Problem280809LNGphaseEnvelope.java @@ -4,7 +4,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemGERG2004Eos; import neqsim.thermo.system.SystemInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermo/util/readwrite/EclipseFluidReadWriteTest.java b/src/test/java/neqsim/thermo/util/readwrite/EclipseFluidReadWriteTest.java index d51d42d922..bcccb7a3fe 100644 --- a/src/test/java/neqsim/thermo/util/readwrite/EclipseFluidReadWriteTest.java +++ b/src/test/java/neqsim/thermo/util/readwrite/EclipseFluidReadWriteTest.java @@ -4,7 +4,7 @@ import java.io.IOException; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** * @author ESOL diff --git a/src/test/java/neqsim/thermodynamicOperations/ThermodynamicOperationsTest.java b/src/test/java/neqsim/thermodynamicOperations/ThermodynamicOperationsTest.java index e39bb89528..7f53f8820f 100644 --- a/src/test/java/neqsim/thermodynamicOperations/ThermodynamicOperationsTest.java +++ b/src/test/java/neqsim/thermodynamicOperations/ThermodynamicOperationsTest.java @@ -20,7 +20,8 @@ import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemProperties; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations.FlashType; +import neqsim.thermodynamicoperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations.FlashType; public class ThermodynamicOperationsTest extends neqsim.NeqSimTest { @Test @@ -36,17 +37,17 @@ void testFlash() { String unitT = "C"; ops.flash(FlashType.PT, P, T, unitP, unitT); - ops.system.init(2); - ops.system.initPhysicalProperties(); - Double[] PTfluidProperties = ops.system.getProperties().getValues(); + ops.getSystem().init(2); + ops.getSystem().initPhysicalProperties(); + Double[] PTfluidProperties = ops.getSystem().getProperties().getValues(); // Test that the operations are stable, i.e., do the same flash on the same system with the same // components and at the same conditions and assert that the result is the same. - ops.system.init(0); + ops.getSystem().init(0); ops.flash(FlashType.TP, T, P, unitT, unitP); - ops.system.init(2); - ops.system.initPhysicalProperties(); - Double[] TPfluidProperties = ops.system.getProperties().getValues(); + ops.getSystem().init(2); + ops.getSystem().initPhysicalProperties(); + Double[] TPfluidProperties = ops.getSystem().getProperties().getValues(); for (int k = 0; k < PTfluidProperties.length; k++) { Assertions.assertEquals(PTfluidProperties[k], TPfluidProperties[k]); @@ -135,7 +136,7 @@ void testNeqSimPython() { thermoSystem.init(0); ThermodynamicOperations thermoOps = - new neqsim.thermodynamicOperations.ThermodynamicOperations(thermoSystem); + new neqsim.thermodynamicoperations.ThermodynamicOperations(thermoSystem); List jP = Arrays.asList(new Double[] {10.0}); List jT = Arrays.asList(new Double[] {280.0}); CalculationResult res = thermoOps.propertyFlash(jP, jT, 1, null, null); @@ -177,7 +178,7 @@ void testNeqSimPython2() { thermoSystem.addComponents(components, fractions); thermoSystem.init(0); ThermodynamicOperations thermoOps = - new neqsim.thermodynamicOperations.ThermodynamicOperations(thermoSystem); + new neqsim.thermodynamicoperations.ThermodynamicOperations(thermoSystem); double temp = 373.15; double press = 60.0 + ThermodynamicConstantsInterface.referencePressure; @@ -218,7 +219,7 @@ void testNeqSimPython2() { SystemInterface thermoSystem2 = new neqsim.thermo.system.SystemSrkEos(273.15, 0.0); thermoSystem2.addComponents(components, fractions2); ThermodynamicOperations thermoOps2 = - new neqsim.thermodynamicOperations.ThermodynamicOperations(thermoSystem2); + new neqsim.thermodynamicoperations.ThermodynamicOperations(thermoSystem2); CalculationResult res2 = thermoOps2.propertyFlash(jP2, jT2, 1, null, onlineFractions2); // Assert no calculation failed for (String errorMessage : res.calculationError) { diff --git a/src/test/java/neqsim/thermodynamicOperations/flashOps/Degasser.java b/src/test/java/neqsim/thermodynamicOperations/flashOps/Degasser.java index fd0c0334fd..9472586a2b 100644 --- a/src/test/java/neqsim/thermodynamicOperations/flashOps/Degasser.java +++ b/src/test/java/neqsim/thermodynamicOperations/flashOps/Degasser.java @@ -5,7 +5,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import neqsim.thermo.phase.PhaseEosInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** * @author ESOL @@ -111,22 +111,22 @@ void testRun() { neqsim.thermo.system.SystemInterface fluid_test_separator = fluid1.clone(); fluid_test_separator.setMolarComposition(molarCompositionArray); - neqsim.processSimulation.processEquipment.stream.Stream inlet_stream_test_sep = - new neqsim.processSimulation.processEquipment.stream.Stream("TEST_SEPARATOR_INLET", + neqsim.processsimulation.processequipment.stream.Stream inlet_stream_test_sep = + new neqsim.processsimulation.processequipment.stream.Stream("TEST_SEPARATOR_INLET", fluid_test_separator); inlet_stream_test_sep.setTemperature(72.6675872802734, "C"); inlet_stream_test_sep.setPressure(10.6767892837524, "bara"); inlet_stream_test_sep.setFlowRate(721.3143271348611, "kg/hr"); inlet_stream_test_sep.run(); - neqsim.processSimulation.processEquipment.separator.ThreePhaseSeparator test_separator = - new neqsim.processSimulation.processEquipment.separator.ThreePhaseSeparator( + neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator test_separator = + new neqsim.processsimulation.processequipment.separator.ThreePhaseSeparator( "TEST_SEPARATOR", inlet_stream_test_sep); test_separator.run(); test_separator.getWaterOutStream().getThermoSystem().prettyPrint(); - neqsim.processSimulation.processEquipment.heatExchanger.Heater heater_TP_setter_test_stream = - new neqsim.processSimulation.processEquipment.heatExchanger.Heater( + neqsim.processsimulation.processequipment.heatExchanger.Heater heater_TP_setter_test_stream = + new neqsim.processsimulation.processequipment.heatExchanger.Heater( "TP_SETTER_FOR_THE_DEGASSER_TEST_SEP_STREAM", test_separator.getWaterOutStream()); heater_TP_setter_test_stream.setOutPressure(5.9061164855957 - 0.01, "bara"); heater_TP_setter_test_stream.setOutTemperature(79.8487854003906, "C"); @@ -135,8 +135,8 @@ void testRun() { // .getFluid().getPhase("gas").getFlowRate("kg/hr")); heater_TP_setter_test_stream.getOutletStream().getThermoSystem().prettyPrint(); - neqsim.processSimulation.processEquipment.heatExchanger.Heater heater_TP_setter_test_stream2 = - new neqsim.processSimulation.processEquipment.heatExchanger.Heater( + neqsim.processsimulation.processequipment.heatExchanger.Heater heater_TP_setter_test_stream2 = + new neqsim.processsimulation.processequipment.heatExchanger.Heater( "TP_SETTER_FOR_THE_DEGASSER_TEST_SEP_STREAM", test_separator.getWaterOutStream()); heater_TP_setter_test_stream2.setOutPressure(5.9061164855957, "bara"); heater_TP_setter_test_stream2.setOutTemperature(79.8487854003906, "C"); diff --git a/src/test/java/neqsim/thermodynamicOperations/flashOps/PHFlashCPATest.java b/src/test/java/neqsim/thermodynamicOperations/flashOps/PHFlashCPATest.java index 898ef5d1a8..d309ab6236 100644 --- a/src/test/java/neqsim/thermodynamicOperations/flashOps/PHFlashCPATest.java +++ b/src/test/java/neqsim/thermodynamicOperations/flashOps/PHFlashCPATest.java @@ -2,7 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** * @author ESOL diff --git a/src/test/java/neqsim/thermodynamicOperations/flashOps/PHFlashGERG2008Test.java b/src/test/java/neqsim/thermodynamicOperations/flashOps/PHFlashGERG2008Test.java index 731e7d5f63..ddffe959e4 100644 --- a/src/test/java/neqsim/thermodynamicOperations/flashOps/PHFlashGERG2008Test.java +++ b/src/test/java/neqsim/thermodynamicOperations/flashOps/PHFlashGERG2008Test.java @@ -3,7 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** * @author ESOL diff --git a/src/test/java/neqsim/thermodynamicOperations/flashOps/PHFlashTest.java b/src/test/java/neqsim/thermodynamicOperations/flashOps/PHFlashTest.java index f2239b838a..be4e4e7130 100644 --- a/src/test/java/neqsim/thermodynamicOperations/flashOps/PHFlashTest.java +++ b/src/test/java/neqsim/thermodynamicOperations/flashOps/PHFlashTest.java @@ -3,7 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** * @author ESOL diff --git a/src/test/java/neqsim/thermodynamicOperations/flashOps/PSFlashGERG2008Test.java b/src/test/java/neqsim/thermodynamicOperations/flashOps/PSFlashGERG2008Test.java index d7345039c1..78938b874c 100644 --- a/src/test/java/neqsim/thermodynamicOperations/flashOps/PSFlashGERG2008Test.java +++ b/src/test/java/neqsim/thermodynamicOperations/flashOps/PSFlashGERG2008Test.java @@ -3,7 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** * @author ESOL @@ -28,7 +28,7 @@ void setUp() throws Exception { } /** - * Test method for {@link neqsim.thermodynamicOperations.flashOps.PSFlashGERG2008#run()}. + * Test method for {@link neqsim.thermodynamicoperations.flashops.PSFlashGERG2008#run()}. */ @Test void testRun() { diff --git a/src/test/java/neqsim/thermodynamicOperations/flashOps/RachfordRiceTest.java b/src/test/java/neqsim/thermodynamicOperations/flashOps/RachfordRiceTest.java index 9f7db4f95c..32a46053f6 100644 --- a/src/test/java/neqsim/thermodynamicOperations/flashOps/RachfordRiceTest.java +++ b/src/test/java/neqsim/thermodynamicOperations/flashOps/RachfordRiceTest.java @@ -2,6 +2,7 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import neqsim.thermodynamicoperations.flashops.RachfordRice; public class RachfordRiceTest { @Test diff --git a/src/test/java/neqsim/thermodynamicOperations/flashOps/SaturateWithWaterTest.java b/src/test/java/neqsim/thermodynamicOperations/flashOps/SaturateWithWaterTest.java index fac2ef054e..d69d394653 100644 --- a/src/test/java/neqsim/thermodynamicOperations/flashOps/SaturateWithWaterTest.java +++ b/src/test/java/neqsim/thermodynamicOperations/flashOps/SaturateWithWaterTest.java @@ -7,7 +7,7 @@ import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemPrEos; import neqsim.thermo.system.SystemSrkCPAstatoil; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; public class SaturateWithWaterTest { static Logger logger = LogManager.getLogger(SaturateWithWaterTest.class); diff --git a/src/test/java/neqsim/thermodynamicOperations/flashOps/SolidFlash1Test.java b/src/test/java/neqsim/thermodynamicOperations/flashOps/SolidFlash1Test.java index 6c21564fcd..5006052f48 100644 --- a/src/test/java/neqsim/thermodynamicOperations/flashOps/SolidFlash1Test.java +++ b/src/test/java/neqsim/thermodynamicOperations/flashOps/SolidFlash1Test.java @@ -4,7 +4,7 @@ import org.junit.jupiter.api.Test; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; public class SolidFlash1Test { @Test diff --git a/src/test/java/neqsim/thermodynamicOperations/flashOps/TPFlashTest.java b/src/test/java/neqsim/thermodynamicOperations/flashOps/TPFlashTest.java index fb3a5e9e65..451e884680 100644 --- a/src/test/java/neqsim/thermodynamicOperations/flashOps/TPFlashTest.java +++ b/src/test/java/neqsim/thermodynamicOperations/flashOps/TPFlashTest.java @@ -3,7 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** * @author ESOL diff --git a/src/test/java/neqsim/thermodynamicOperations/flashOps/TPFlashTestHighTemp.java b/src/test/java/neqsim/thermodynamicOperations/flashOps/TPFlashTestHighTemp.java index 4dac61a32a..dcf80d49fe 100644 --- a/src/test/java/neqsim/thermodynamicOperations/flashOps/TPFlashTestHighTemp.java +++ b/src/test/java/neqsim/thermodynamicOperations/flashOps/TPFlashTestHighTemp.java @@ -3,7 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** * @author ESOL diff --git a/src/test/java/neqsim/thermodynamicOperations/flashOps/TPFlashTestWellFluid.java b/src/test/java/neqsim/thermodynamicOperations/flashOps/TPFlashTestWellFluid.java index bdca57ff62..989ec2f5c7 100644 --- a/src/test/java/neqsim/thermodynamicOperations/flashOps/TPFlashTestWellFluid.java +++ b/src/test/java/neqsim/thermodynamicOperations/flashOps/TPFlashTestWellFluid.java @@ -3,7 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** * @author ESOL diff --git a/src/test/java/neqsim/thermodynamicOperations/flashOps/TPsolidFlash.java b/src/test/java/neqsim/thermodynamicOperations/flashOps/TPsolidFlash.java index ec2c5bdeaa..5738ab6be8 100644 --- a/src/test/java/neqsim/thermodynamicOperations/flashOps/TPsolidFlash.java +++ b/src/test/java/neqsim/thermodynamicOperations/flashOps/TPsolidFlash.java @@ -4,7 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import org.junit.jupiter.api.Test; import neqsim.thermo.phase.PhaseType; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** * @author ESOL diff --git a/src/test/java/neqsim/thermodynamicOperations/flashOps/TVFlashTest.java b/src/test/java/neqsim/thermodynamicOperations/flashOps/TVFlashTest.java index 9d4596f77c..f3d1cbeb20 100644 --- a/src/test/java/neqsim/thermodynamicOperations/flashOps/TVFlashTest.java +++ b/src/test/java/neqsim/thermodynamicOperations/flashOps/TVFlashTest.java @@ -5,7 +5,7 @@ import org.apache.logging.log4j.Logger; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** * Test TVFlash. diff --git a/src/test/java/neqsim/thermodynamicOperations/flashOps/VUFlashTest.java b/src/test/java/neqsim/thermodynamicOperations/flashOps/VUFlashTest.java index 6a09ad7d7e..728915fcd3 100644 --- a/src/test/java/neqsim/thermodynamicOperations/flashOps/VUFlashTest.java +++ b/src/test/java/neqsim/thermodynamicOperations/flashOps/VUFlashTest.java @@ -5,7 +5,7 @@ import org.apache.logging.log4j.Logger; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** * Test VUFlash. diff --git a/src/test/java/neqsim/thermodynamicOperations/flashOps/WaxFlashTest.java b/src/test/java/neqsim/thermodynamicOperations/flashOps/WaxFlashTest.java index c93f01a0ed..4a1e1672f9 100644 --- a/src/test/java/neqsim/thermodynamicOperations/flashOps/WaxFlashTest.java +++ b/src/test/java/neqsim/thermodynamicOperations/flashOps/WaxFlashTest.java @@ -6,7 +6,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; import neqsim.util.database.NeqSimDataBase; /** @@ -46,7 +46,7 @@ void setUp() throws Exception { } /** - * Test method for {@link neqsim.thermodynamicOperations.flashOps.saturationOps.WATcalc#run()}. + * Test method for {@link neqsim.thermodynamicoperations.flashops.saturationops.WATcalc#run()}. */ @Test void testRun() { diff --git a/src/test/java/neqsim/thermodynamicOperations/flashOps/saturationOps/HydrateInhibitorwtFlashTest.java b/src/test/java/neqsim/thermodynamicOperations/flashOps/saturationOps/HydrateInhibitorwtFlashTest.java index bf1044044d..07ed4bc215 100644 --- a/src/test/java/neqsim/thermodynamicOperations/flashOps/saturationOps/HydrateInhibitorwtFlashTest.java +++ b/src/test/java/neqsim/thermodynamicOperations/flashOps/saturationOps/HydrateInhibitorwtFlashTest.java @@ -5,7 +5,7 @@ import org.junit.jupiter.api.Test; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkCPAstatoil; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; public class HydrateInhibitorwtFlashTest { @Test diff --git a/src/test/java/neqsim/thermodynamicOperations/flashOps/saturationOps/bubblePointPressureFlashTest.java b/src/test/java/neqsim/thermodynamicOperations/flashOps/saturationOps/bubblePointPressureFlashTest.java index 78f9820386..bc36b7df07 100644 --- a/src/test/java/neqsim/thermodynamicOperations/flashOps/saturationOps/bubblePointPressureFlashTest.java +++ b/src/test/java/neqsim/thermodynamicOperations/flashOps/saturationOps/bubblePointPressureFlashTest.java @@ -3,7 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; public class bubblePointPressureFlashTest { @Test diff --git a/src/test/java/neqsim/thermodynamicOperations/flashOps/saturationOps/bubblePointTemperatureFlashTest.java b/src/test/java/neqsim/thermodynamicOperations/flashOps/saturationOps/bubblePointTemperatureFlashTest.java index 1e94ace143..30d7fca3ac 100644 --- a/src/test/java/neqsim/thermodynamicOperations/flashOps/saturationOps/bubblePointTemperatureFlashTest.java +++ b/src/test/java/neqsim/thermodynamicOperations/flashOps/saturationOps/bubblePointTemperatureFlashTest.java @@ -3,7 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; public class bubblePointTemperatureFlashTest { @Test diff --git a/src/test/java/neqsim/thermodynamicOperations/flashOps/saturationOps/dewPointPressureFlashTest.java b/src/test/java/neqsim/thermodynamicOperations/flashOps/saturationOps/dewPointPressureFlashTest.java index 8764e39d70..d649f34fbf 100644 --- a/src/test/java/neqsim/thermodynamicOperations/flashOps/saturationOps/dewPointPressureFlashTest.java +++ b/src/test/java/neqsim/thermodynamicOperations/flashOps/saturationOps/dewPointPressureFlashTest.java @@ -3,7 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; public class dewPointPressureFlashTest { @Test diff --git a/src/test/java/neqsim/thermodynamicOperations/flashOps/saturationOps/dewPointTemperatureFlashTest.java b/src/test/java/neqsim/thermodynamicOperations/flashOps/saturationOps/dewPointTemperatureFlashTest.java index da810feb75..d04dd33fec 100644 --- a/src/test/java/neqsim/thermodynamicOperations/flashOps/saturationOps/dewPointTemperatureFlashTest.java +++ b/src/test/java/neqsim/thermodynamicOperations/flashOps/saturationOps/dewPointTemperatureFlashTest.java @@ -3,7 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; public class dewPointTemperatureFlashTest { @Test diff --git a/src/test/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/PTPhaseEnvelopeTest.java b/src/test/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/PTPhaseEnvelopeTest.java index 4faa6a5316..3508278e89 100644 --- a/src/test/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/PTPhaseEnvelopeTest.java +++ b/src/test/java/neqsim/thermodynamicOperations/phaseEnvelopeOps/multicomponentEnvelopeOps/PTPhaseEnvelopeTest.java @@ -5,7 +5,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; public class PTPhaseEnvelopeTest { static neqsim.thermo.system.SystemInterface testSystem = null; @@ -18,7 +18,7 @@ void setUp() { /** * Test method for - * {@link neqsim.thermodynamicOperations.phaseEnvelopeOps.multicomponentEnvelopeOps.pTphaseEnvelope}. + * {@link neqsim.thermodynamicoperations.phaseenvelopeops.multicomponentenvelopeops.PTphaseEnvelope}. */ @Test void testDewP() { diff --git a/src/test/java/neqsim/thermodynamicOperations/util/example/CompGradientFlash.java b/src/test/java/neqsim/thermodynamicOperations/util/example/CompGradientFlash.java index 28ed7a29c1..01412fe3e5 100644 --- a/src/test/java/neqsim/thermodynamicOperations/util/example/CompGradientFlash.java +++ b/src/test/java/neqsim/thermodynamicOperations/util/example/CompGradientFlash.java @@ -4,7 +4,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermodynamicOperations/util/example/CriticalPointFlash.java b/src/test/java/neqsim/thermodynamicOperations/util/example/CriticalPointFlash.java index bb56cf9d43..35692ebcce 100644 --- a/src/test/java/neqsim/thermodynamicOperations/util/example/CriticalPointFlash.java +++ b/src/test/java/neqsim/thermodynamicOperations/util/example/CriticalPointFlash.java @@ -4,7 +4,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermodynamicOperations/util/example/MEGwaterComplexFlash.java b/src/test/java/neqsim/thermodynamicOperations/util/example/MEGwaterComplexFlash.java index cdaea5701b..6280edbfa1 100644 --- a/src/test/java/neqsim/thermodynamicOperations/util/example/MEGwaterComplexFlash.java +++ b/src/test/java/neqsim/thermodynamicOperations/util/example/MEGwaterComplexFlash.java @@ -4,7 +4,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkCPAstatoil; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermodynamicOperations/util/example/OLGApropGenerator.java b/src/test/java/neqsim/thermodynamicOperations/util/example/OLGApropGenerator.java index 833e85d025..77e5a612ef 100644 --- a/src/test/java/neqsim/thermodynamicOperations/util/example/OLGApropGenerator.java +++ b/src/test/java/neqsim/thermodynamicOperations/util/example/OLGApropGenerator.java @@ -4,7 +4,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermodynamicOperations/util/example/OLGApropGeneratorPH.java b/src/test/java/neqsim/thermodynamicOperations/util/example/OLGApropGeneratorPH.java index 33b31c5e56..60f571e8d3 100644 --- a/src/test/java/neqsim/thermodynamicOperations/util/example/OLGApropGeneratorPH.java +++ b/src/test/java/neqsim/thermodynamicOperations/util/example/OLGApropGeneratorPH.java @@ -4,7 +4,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermodynamicOperations/util/example/PhaseEnvelope.java b/src/test/java/neqsim/thermodynamicOperations/util/example/PhaseEnvelope.java index 5cc91bae76..4088a490f3 100644 --- a/src/test/java/neqsim/thermodynamicOperations/util/example/PhaseEnvelope.java +++ b/src/test/java/neqsim/thermodynamicOperations/util/example/PhaseEnvelope.java @@ -5,7 +5,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /* *

PhaseEnvelope class. Created on 27. september 2001, 10:21 Updated on May 2019 by Nefeli

diff --git a/src/test/java/neqsim/thermodynamicOperations/util/example/SolidFlash.java b/src/test/java/neqsim/thermodynamicOperations/util/example/SolidFlash.java index 7a7a0d6d6a..93fd647678 100644 --- a/src/test/java/neqsim/thermodynamicOperations/util/example/SolidFlash.java +++ b/src/test/java/neqsim/thermodynamicOperations/util/example/SolidFlash.java @@ -4,7 +4,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemUMRPRUMCEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermodynamicOperations/util/example/TVflash.java b/src/test/java/neqsim/thermodynamicOperations/util/example/TVflash.java index f026b64ad7..5067baf97b 100644 --- a/src/test/java/neqsim/thermodynamicOperations/util/example/TVflash.java +++ b/src/test/java/neqsim/thermodynamicOperations/util/example/TVflash.java @@ -4,7 +4,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermodynamicOperations/util/example/VLSolidTPFLash.java b/src/test/java/neqsim/thermodynamicOperations/util/example/VLSolidTPFLash.java index af8b089743..c51a586ba9 100644 --- a/src/test/java/neqsim/thermodynamicOperations/util/example/VLSolidTPFLash.java +++ b/src/test/java/neqsim/thermodynamicOperations/util/example/VLSolidTPFLash.java @@ -4,7 +4,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemPrEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/thermodynamicOperations/util/example/VUflash.java b/src/test/java/neqsim/thermodynamicOperations/util/example/VUflash.java index 9f15833968..547c8c969d 100644 --- a/src/test/java/neqsim/thermodynamicOperations/util/example/VUflash.java +++ b/src/test/java/neqsim/thermodynamicOperations/util/example/VUflash.java @@ -4,7 +4,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; /** *

diff --git a/src/test/java/neqsim/util/unit/PressureUnitTest.java b/src/test/java/neqsim/util/unit/PressureUnitTest.java index 91b38dfef2..c450319154 100644 --- a/src/test/java/neqsim/util/unit/PressureUnitTest.java +++ b/src/test/java/neqsim/util/unit/PressureUnitTest.java @@ -3,7 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; import neqsim.thermo.ThermodynamicConstantsInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; class PressureUnitTest extends neqsim.NeqSimTest { /** diff --git a/src/test/java/neqsim/util/unit/TemperatureUnitTest.java b/src/test/java/neqsim/util/unit/TemperatureUnitTest.java index c8f1b9497a..3262a00394 100644 --- a/src/test/java/neqsim/util/unit/TemperatureUnitTest.java +++ b/src/test/java/neqsim/util/unit/TemperatureUnitTest.java @@ -3,7 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; import neqsim.thermo.ThermodynamicConstantsInterface; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; class TemperatureUnitTest extends neqsim.NeqSimTest { /** diff --git a/src/test/java/neqsim/util/unit/UnitsTest.java b/src/test/java/neqsim/util/unit/UnitsTest.java index 0d321c4c2a..a9ea0f1ed0 100644 --- a/src/test/java/neqsim/util/unit/UnitsTest.java +++ b/src/test/java/neqsim/util/unit/UnitsTest.java @@ -1,7 +1,7 @@ package neqsim.util.unit; import org.junit.jupiter.api.Test; -import neqsim.thermodynamicOperations.ThermodynamicOperations; +import neqsim.thermodynamicoperations.ThermodynamicOperations; public class UnitsTest { @Test