diff --git a/src/main/java/neqsim/chemicalreactions/ChemicalReactionOperations.java b/src/main/java/neqsim/chemicalreactions/ChemicalReactionOperations.java index be76c01767..4d59a3b48a 100644 --- a/src/main/java/neqsim/chemicalreactions/ChemicalReactionOperations.java +++ b/src/main/java/neqsim/chemicalreactions/ChemicalReactionOperations.java @@ -29,7 +29,9 @@ */ public class ChemicalReactionOperations implements neqsim.thermo.ThermodynamicConstantsInterface, Cloneable { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(ChemicalReactionOperations.class); SystemInterface system; diff --git a/src/main/java/neqsim/chemicalreactions/chemicalequilibrium/ChemEq.java b/src/main/java/neqsim/chemicalreactions/chemicalequilibrium/ChemEq.java index 7a2474d224..e1574ee8db 100644 --- a/src/main/java/neqsim/chemicalreactions/chemicalequilibrium/ChemEq.java +++ b/src/main/java/neqsim/chemicalreactions/chemicalequilibrium/ChemEq.java @@ -12,6 +12,7 @@ * @version $Id: $Id */ public class ChemEq implements java.io.Serializable { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; int NSPEC = 10; int NELE = 3; diff --git a/src/main/java/neqsim/chemicalreactions/chemicalequilibrium/ChemicalEquilibrium.java b/src/main/java/neqsim/chemicalreactions/chemicalequilibrium/ChemicalEquilibrium.java index 62499ec238..6cbe6cfecf 100644 --- a/src/main/java/neqsim/chemicalreactions/chemicalequilibrium/ChemicalEquilibrium.java +++ b/src/main/java/neqsim/chemicalreactions/chemicalequilibrium/ChemicalEquilibrium.java @@ -16,7 +16,9 @@ * @version $Id: $Id */ public class ChemicalEquilibrium implements java.io.Serializable { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(ChemicalEquilibrium.class); SystemInterface system; diff --git a/src/main/java/neqsim/chemicalreactions/chemicalequilibrium/LinearProgrammingChemicalEquilibrium.java b/src/main/java/neqsim/chemicalreactions/chemicalequilibrium/LinearProgrammingChemicalEquilibrium.java index bdf101c550..c2c13edae7 100644 --- a/src/main/java/neqsim/chemicalreactions/chemicalequilibrium/LinearProgrammingChemicalEquilibrium.java +++ b/src/main/java/neqsim/chemicalreactions/chemicalequilibrium/LinearProgrammingChemicalEquilibrium.java @@ -36,7 +36,9 @@ */ public class LinearProgrammingChemicalEquilibrium implements neqsim.thermo.ThermodynamicConstantsInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(LinearProgrammingChemicalEquilibrium.class); double[] xEts = null; diff --git a/src/main/java/neqsim/chemicalreactions/chemicalequilibrium/ReferencePotComparator.java b/src/main/java/neqsim/chemicalreactions/chemicalequilibrium/ReferencePotComparator.java index 112d73dba5..3517b2ccf9 100644 --- a/src/main/java/neqsim/chemicalreactions/chemicalequilibrium/ReferencePotComparator.java +++ b/src/main/java/neqsim/chemicalreactions/chemicalequilibrium/ReferencePotComparator.java @@ -19,6 +19,7 @@ */ public class ReferencePotComparator implements Comparator, java.io.Serializable { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** {@inheritDoc} */ diff --git a/src/main/java/neqsim/chemicalreactions/chemicalreaction/ChemicalReaction.java b/src/main/java/neqsim/chemicalreactions/chemicalreaction/ChemicalReaction.java index b5253dc69c..27b438fc1d 100644 --- a/src/main/java/neqsim/chemicalreactions/chemicalreaction/ChemicalReaction.java +++ b/src/main/java/neqsim/chemicalreactions/chemicalreaction/ChemicalReaction.java @@ -22,6 +22,7 @@ */ public class ChemicalReaction extends NamedBaseClass implements neqsim.thermo.ThermodynamicConstantsInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; String[] names; diff --git a/src/main/java/neqsim/chemicalreactions/chemicalreaction/ChemicalReactionFactory.java b/src/main/java/neqsim/chemicalreactions/chemicalreaction/ChemicalReactionFactory.java index c716881ab0..52fa8c58ef 100644 --- a/src/main/java/neqsim/chemicalreactions/chemicalreaction/ChemicalReactionFactory.java +++ b/src/main/java/neqsim/chemicalreactions/chemicalreaction/ChemicalReactionFactory.java @@ -19,6 +19,7 @@ * @version $Id: $Id */ public final class ChemicalReactionFactory { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(ChemicalReactionFactory.class); /** diff --git a/src/main/java/neqsim/chemicalreactions/chemicalreaction/ChemicalReactionList.java b/src/main/java/neqsim/chemicalreactions/chemicalreaction/ChemicalReactionList.java index 1f272c8e5b..3e9bf3a4c1 100644 --- a/src/main/java/neqsim/chemicalreactions/chemicalreaction/ChemicalReactionList.java +++ b/src/main/java/neqsim/chemicalreactions/chemicalreaction/ChemicalReactionList.java @@ -27,7 +27,9 @@ * @version $Id: $Id */ public class ChemicalReactionList implements ThermodynamicConstantsInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(ChemicalReactionList.class); ArrayList chemicalReactionList = new ArrayList(); diff --git a/src/main/java/neqsim/chemicalreactions/kinetics/Kinetics.java b/src/main/java/neqsim/chemicalreactions/kinetics/Kinetics.java index f1bf25c21e..b8411898ea 100644 --- a/src/main/java/neqsim/chemicalreactions/kinetics/Kinetics.java +++ b/src/main/java/neqsim/chemicalreactions/kinetics/Kinetics.java @@ -20,6 +20,7 @@ * @version $Id: $Id */ public class Kinetics implements java.io.Serializable { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; protected ChemicalReactionOperations operations; double phiInfinite = 0.0; diff --git a/src/main/java/neqsim/datapresentation/DataHandling.java b/src/main/java/neqsim/datapresentation/DataHandling.java index 06bb5c5c23..163b871f35 100644 --- a/src/main/java/neqsim/datapresentation/DataHandling.java +++ b/src/main/java/neqsim/datapresentation/DataHandling.java @@ -17,6 +17,7 @@ * @version $Id: $Id */ public class DataHandling { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(DataHandling.class); /** diff --git a/src/main/java/neqsim/datapresentation/filehandling/TextFile.java b/src/main/java/neqsim/datapresentation/filehandling/TextFile.java index fc3d09862f..cdbf93fd7e 100644 --- a/src/main/java/neqsim/datapresentation/filehandling/TextFile.java +++ b/src/main/java/neqsim/datapresentation/filehandling/TextFile.java @@ -14,7 +14,9 @@ * @version $Id: $Id */ public class TextFile implements java.io.Serializable { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(TextFile.class); String fileName = "c:/example.txt"; diff --git a/src/main/java/neqsim/datapresentation/jfreechart/Graph2b.java b/src/main/java/neqsim/datapresentation/jfreechart/Graph2b.java index e4a201c16c..bd929a86e4 100644 --- a/src/main/java/neqsim/datapresentation/jfreechart/Graph2b.java +++ b/src/main/java/neqsim/datapresentation/jfreechart/Graph2b.java @@ -29,7 +29,9 @@ * @version $Id: $Id */ public class Graph2b extends javax.swing.JFrame { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(Graph2b.class); XYDataset xyData; diff --git a/src/main/java/neqsim/fluidmechanics/flowleg/FlowLeg.java b/src/main/java/neqsim/fluidmechanics/flowleg/FlowLeg.java index b15fc78410..e58b722fbd 100644 --- a/src/main/java/neqsim/fluidmechanics/flowleg/FlowLeg.java +++ b/src/main/java/neqsim/fluidmechanics/flowleg/FlowLeg.java @@ -20,6 +20,7 @@ * @version $Id: $Id */ public abstract class FlowLeg implements FlowLegInterface, java.io.Serializable { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; protected FlowNodeInterface[] flowNode; diff --git a/src/main/java/neqsim/fluidmechanics/flowleg/pipeleg/PipeLeg.java b/src/main/java/neqsim/fluidmechanics/flowleg/pipeleg/PipeLeg.java index 262d920008..10ed630c1b 100644 --- a/src/main/java/neqsim/fluidmechanics/flowleg/pipeleg/PipeLeg.java +++ b/src/main/java/neqsim/fluidmechanics/flowleg/pipeleg/PipeLeg.java @@ -18,6 +18,7 @@ * @version $Id: $Id */ public class PipeLeg extends FlowLeg { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; // FlowNodeInterface[] node; @@ -27,8 +28,7 @@ public class PipeLeg extends FlowLeg { * Constructor for PipeLeg. *

*/ - public PipeLeg() { - } + public PipeLeg() {} /** {@inheritDoc} */ @Override diff --git a/src/main/java/neqsim/fluidmechanics/flownode/FlowNode.java b/src/main/java/neqsim/fluidmechanics/flownode/FlowNode.java index 348601dd78..408fc67aba 100644 --- a/src/main/java/neqsim/fluidmechanics/flownode/FlowNode.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/FlowNode.java @@ -33,7 +33,9 @@ * @version $Id: $Id */ public abstract class FlowNode implements FlowNodeInterface, ThermodynamicConstantsInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(FlowNode.class); protected double distanceToCenterOfNode = 0; diff --git a/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/FluidBoundary.java b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/FluidBoundary.java index b3ca3618c8..372e738405 100644 --- a/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/FluidBoundary.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/FluidBoundary.java @@ -29,7 +29,9 @@ * @version $Id: $Id */ public abstract class FluidBoundary implements FluidBoundaryInterface, java.io.Serializable { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(FluidBoundary.class); protected FlowNodeInterface flowNode; 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 index 35ba6ecae0..beef263f24 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 @@ -18,6 +18,7 @@ */ public class EquilibriumFluidBoundary extends neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.FluidBoundary { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** 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 index 2402bb5bf1..75bd9d2ef9 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 @@ -17,7 +17,9 @@ */ public abstract class NonEquilibriumFluidBoundary extends neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.FluidBoundary { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(NonEquilibriumFluidBoundary.class); protected int neq = 0; 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 index e5408b3ee0..6a5253438b 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 @@ -24,7 +24,9 @@ public class KrishnaStandartFilmModel extends neqsim.fluidmechanics.flownode.fluidboundary.heatmasstransfercalc.nonequilibriumfluidboundary.NonEquilibriumFluidBoundary implements ThermodynamicConstantsInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(KrishnaStandartFilmModel.class); Matrix phiMatrix; Matrix redPhiMatrix; 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 index 842455749b..87129bc2c9 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 @@ -17,7 +17,9 @@ * @version $Id: $Id */ public abstract class ReactiveFluidBoundary extends KrishnaStandartFilmModel { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(ReactiveFluidBoundary.class); + /** Serialization version UID. */ private static final long serialVersionUID = 1000; protected int neq = 0; 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 index e96eee9569..a585b48932 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 @@ -22,6 +22,7 @@ * @version $Id: $Id */ public class ReactiveKrishnaStandartFilmModel extends KrishnaStandartFilmModel { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; int enhancementType = 1; 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 index e628cd1fe1..87cea22655 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 @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class InterphaseAnnularFlow extends InterphaseStratifiedFlow { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** 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 index 43d8fffab8..4c541a0728 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 @@ -12,6 +12,7 @@ */ public class InterphaseDropletFlow extends InterphaseTwoPhasePipeFlow implements neqsim.thermo.ThermodynamicConstantsInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** 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 index 5374e811cd..c1d4ae11ca 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 @@ -12,6 +12,7 @@ */ public class InterphaseStratifiedFlow extends InterphaseTwoPhasePipeFlow implements neqsim.thermo.ThermodynamicConstantsInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** 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 index 53cd71b8c6..e2ce9de53d 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 @@ -12,6 +12,7 @@ */ public class InterphasePackedBed extends InterphaseReactorFlow implements neqsim.thermo.ThermodynamicConstantsInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** 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 index 925e316060..3fcf643e43 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 @@ -12,6 +12,7 @@ * @version $Id: $Id */ public class InterphaseStirredCellFlow extends InterphaseStratifiedFlow { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/fluidmechanics/flownode/multiphasenode/MultiPhaseFlowNode.java b/src/main/java/neqsim/fluidmechanics/flownode/multiphasenode/MultiPhaseFlowNode.java index e2fa9c66d4..64ddf77fcb 100644 --- a/src/main/java/neqsim/fluidmechanics/flownode/multiphasenode/MultiPhaseFlowNode.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/multiphasenode/MultiPhaseFlowNode.java @@ -17,7 +17,9 @@ * @version $Id: $Id */ public abstract class MultiPhaseFlowNode extends FlowNode { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(MultiPhaseFlowNode.class); /** diff --git a/src/main/java/neqsim/fluidmechanics/flownode/multiphasenode/waxnode/WaxDepositionFlowNode.java b/src/main/java/neqsim/fluidmechanics/flownode/multiphasenode/waxnode/WaxDepositionFlowNode.java index e0ca807838..3230f74d94 100644 --- a/src/main/java/neqsim/fluidmechanics/flownode/multiphasenode/waxnode/WaxDepositionFlowNode.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/multiphasenode/waxnode/WaxDepositionFlowNode.java @@ -23,7 +23,9 @@ * @version $Id: $Id */ public class WaxDepositionFlowNode extends MultiPhaseFlowNode { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(WaxDepositionFlowNode.class); /** diff --git a/src/main/java/neqsim/fluidmechanics/flownode/onephasenode/onePhaseFlowNode.java b/src/main/java/neqsim/fluidmechanics/flownode/onephasenode/onePhaseFlowNode.java index 353778be57..94edab4bb6 100644 --- a/src/main/java/neqsim/fluidmechanics/flownode/onephasenode/onePhaseFlowNode.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/onephasenode/onePhaseFlowNode.java @@ -16,7 +16,9 @@ * @version $Id: $Id */ public abstract class onePhaseFlowNode extends FlowNode { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(onePhaseFlowNode.class); /** diff --git a/src/main/java/neqsim/fluidmechanics/flownode/onephasenode/onephasepipeflownode/onePhasePipeFlowNode.java b/src/main/java/neqsim/fluidmechanics/flownode/onephasenode/onephasepipeflownode/onePhasePipeFlowNode.java index 79fd5597f3..e2cc64b6cd 100644 --- a/src/main/java/neqsim/fluidmechanics/flownode/onephasenode/onephasepipeflownode/onePhasePipeFlowNode.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/onephasenode/onephasepipeflownode/onePhasePipeFlowNode.java @@ -22,7 +22,9 @@ * @version $Id: $Id */ public class onePhasePipeFlowNode extends onePhaseFlowNode { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(onePhasePipeFlowNode.class); /** diff --git a/src/main/java/neqsim/fluidmechanics/flownode/twophasenode/TwoPhaseFlowNode.java b/src/main/java/neqsim/fluidmechanics/flownode/twophasenode/TwoPhaseFlowNode.java index 1a77f2964a..00af1ec7d2 100644 --- a/src/main/java/neqsim/fluidmechanics/flownode/twophasenode/TwoPhaseFlowNode.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/twophasenode/TwoPhaseFlowNode.java @@ -16,7 +16,9 @@ * @version $Id: $Id */ public abstract class TwoPhaseFlowNode extends FlowNode { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(TwoPhaseFlowNode.class); // public double[] molarMassTransferFlux; diff --git a/src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasepipeflownode/AnnularFlow.java b/src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasepipeflownode/AnnularFlow.java index f2281600cf..ec53cbe153 100644 --- a/src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasepipeflownode/AnnularFlow.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasepipeflownode/AnnularFlow.java @@ -25,7 +25,9 @@ * @version $Id: $Id */ public class AnnularFlow extends TwoPhaseFlowNode { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(AnnularFlow.class); // ThermodynamicOperations interphaseOps = new ThermodynamicOperations(); // double liquidFilmThickness=0; diff --git a/src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasepipeflownode/BubbleFlowNode.java b/src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasepipeflownode/BubbleFlowNode.java index ca676e61cd..f0d506a6e3 100644 --- a/src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasepipeflownode/BubbleFlowNode.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasepipeflownode/BubbleFlowNode.java @@ -20,7 +20,9 @@ * @version $Id: $Id */ public class BubbleFlowNode extends TwoPhaseFlowNode { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(BubbleFlowNode.class); private double averageBubbleDiameter = 0.001; diff --git a/src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasepipeflownode/DropletFlowNode.java b/src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasepipeflownode/DropletFlowNode.java index a1203f428b..eae9fa2deb 100644 --- a/src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasepipeflownode/DropletFlowNode.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasepipeflownode/DropletFlowNode.java @@ -19,6 +19,7 @@ * @version $Id: $Id */ public class DropletFlowNode extends TwoPhaseFlowNode { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; private double averageDropletDiameter = 100.0e-6; diff --git a/src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasepipeflownode/StratifiedFlowNode.java b/src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasepipeflownode/StratifiedFlowNode.java index 4f33c71a95..aae233602e 100644 --- a/src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasepipeflownode/StratifiedFlowNode.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasepipeflownode/StratifiedFlowNode.java @@ -20,7 +20,9 @@ * @version $Id: $Id */ public class StratifiedFlowNode extends TwoPhaseFlowNode { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(StratifiedFlowNode.class); /** diff --git a/src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasereactorflownode/TwoPhasePackedBedFlowNode.java b/src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasereactorflownode/TwoPhasePackedBedFlowNode.java index 8acedab64d..bb37230158 100644 --- a/src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasereactorflownode/TwoPhasePackedBedFlowNode.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasereactorflownode/TwoPhasePackedBedFlowNode.java @@ -23,7 +23,9 @@ * @version $Id: $Id */ public class TwoPhasePackedBedFlowNode extends TwoPhaseFlowNode { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(TwoPhasePackedBedFlowNode.class); /** diff --git a/src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasereactorflownode/TwoPhaseTrayTowerFlowNode.java b/src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasereactorflownode/TwoPhaseTrayTowerFlowNode.java index daca34075e..1c8a6f2955 100644 --- a/src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasereactorflownode/TwoPhaseTrayTowerFlowNode.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasereactorflownode/TwoPhaseTrayTowerFlowNode.java @@ -22,7 +22,9 @@ * @version $Id: $Id */ public class TwoPhaseTrayTowerFlowNode extends TwoPhaseFlowNode { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(TwoPhaseTrayTowerFlowNode.class); /** diff --git a/src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasestirredcellnode/StirredCellNode.java b/src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasestirredcellnode/StirredCellNode.java index b92e0faaae..7360989ba8 100644 --- a/src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasestirredcellnode/StirredCellNode.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasestirredcellnode/StirredCellNode.java @@ -22,7 +22,9 @@ * @version $Id: $Id */ public class StirredCellNode extends TwoPhaseFlowNode { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(StirredCellNode.class); private double[] stirrerRate = {1.0, 1.0}; diff --git a/src/main/java/neqsim/fluidmechanics/flowsolver/FlowSolver.java b/src/main/java/neqsim/fluidmechanics/flowsolver/FlowSolver.java index ffc123e8d3..efc81b662a 100644 --- a/src/main/java/neqsim/fluidmechanics/flowsolver/FlowSolver.java +++ b/src/main/java/neqsim/fluidmechanics/flowsolver/FlowSolver.java @@ -15,6 +15,7 @@ * @version $Id: $Id */ public abstract class FlowSolver implements FlowSolverInterface, java.io.Serializable { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; protected int numberOfVelocityNodes = 0; diff --git a/src/main/java/neqsim/fluidmechanics/flowsolver/onephaseflowsolver/OnePhaseFlowSolver.java b/src/main/java/neqsim/fluidmechanics/flowsolver/onephaseflowsolver/OnePhaseFlowSolver.java index 7200e3e414..99b42706d3 100644 --- a/src/main/java/neqsim/fluidmechanics/flowsolver/onephaseflowsolver/OnePhaseFlowSolver.java +++ b/src/main/java/neqsim/fluidmechanics/flowsolver/onephaseflowsolver/OnePhaseFlowSolver.java @@ -15,6 +15,7 @@ * @version $Id: $Id */ public abstract class OnePhaseFlowSolver extends neqsim.fluidmechanics.flowsolver.FlowSolver { + /** Serialization version UID. */ 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 index f72d316ce1..eec636dc03 100644 --- a/src/main/java/neqsim/fluidmechanics/flowsolver/onephaseflowsolver/onephasepipeflowsolver/OnePhaseFixedStaggeredGrid.java +++ b/src/main/java/neqsim/fluidmechanics/flowsolver/onephaseflowsolver/onephasepipeflowsolver/OnePhaseFixedStaggeredGrid.java @@ -22,7 +22,9 @@ */ public class OnePhaseFixedStaggeredGrid extends OnePhasePipeFlowSolver implements neqsim.thermo.ThermodynamicConstantsInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(OnePhaseFixedStaggeredGrid.class); Matrix diffMatrix; diff --git a/src/main/java/neqsim/fluidmechanics/flowsolver/onephaseflowsolver/onephasepipeflowsolver/OnePhasePipeFlowSolver.java b/src/main/java/neqsim/fluidmechanics/flowsolver/onephaseflowsolver/onephasepipeflowsolver/OnePhasePipeFlowSolver.java index f4321b58c0..9fa1ef3401 100644 --- a/src/main/java/neqsim/fluidmechanics/flowsolver/onephaseflowsolver/onephasepipeflowsolver/OnePhasePipeFlowSolver.java +++ b/src/main/java/neqsim/fluidmechanics/flowsolver/onephaseflowsolver/onephasepipeflowsolver/OnePhasePipeFlowSolver.java @@ -21,7 +21,9 @@ */ public class OnePhasePipeFlowSolver extends neqsim.fluidmechanics.flowsolver.onephaseflowsolver.OnePhaseFlowSolver { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(OnePhasePipeFlowSolver.class); protected double[] PbArray; // = new double[100]; diff --git a/src/main/java/neqsim/fluidmechanics/flowsolver/twophaseflowsolver/stirredcellsolver/StirredCellSolver.java b/src/main/java/neqsim/fluidmechanics/flowsolver/twophaseflowsolver/stirredcellsolver/StirredCellSolver.java index d55ebb3a80..b513277501 100644 --- a/src/main/java/neqsim/fluidmechanics/flowsolver/twophaseflowsolver/stirredcellsolver/StirredCellSolver.java +++ b/src/main/java/neqsim/fluidmechanics/flowsolver/twophaseflowsolver/stirredcellsolver/StirredCellSolver.java @@ -20,7 +20,9 @@ */ public class StirredCellSolver extends TwoPhasePipeFlowSolver implements neqsim.thermo.ThermodynamicConstantsInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(StirredCellSolver.class); Matrix diffMatrix; double[][] dn; diff --git a/src/main/java/neqsim/fluidmechanics/flowsolver/twophaseflowsolver/twophasepipeflowsolver/TwoPhaseFixedStaggeredGridSolver.java b/src/main/java/neqsim/fluidmechanics/flowsolver/twophaseflowsolver/twophasepipeflowsolver/TwoPhaseFixedStaggeredGridSolver.java index d8d363ddbd..841f951c71 100644 --- a/src/main/java/neqsim/fluidmechanics/flowsolver/twophaseflowsolver/twophasepipeflowsolver/TwoPhaseFixedStaggeredGridSolver.java +++ b/src/main/java/neqsim/fluidmechanics/flowsolver/twophaseflowsolver/twophasepipeflowsolver/TwoPhaseFixedStaggeredGridSolver.java @@ -17,7 +17,9 @@ */ public class TwoPhaseFixedStaggeredGridSolver extends TwoPhasePipeFlowSolver implements neqsim.thermo.ThermodynamicConstantsInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(TwoPhaseFixedStaggeredGridSolver.class); Matrix diffMatrix; double[][] dn; diff --git a/src/main/java/neqsim/fluidmechanics/flowsolver/twophaseflowsolver/twophasepipeflowsolver/TwoPhasePipeFlowSolver.java b/src/main/java/neqsim/fluidmechanics/flowsolver/twophaseflowsolver/twophasepipeflowsolver/TwoPhasePipeFlowSolver.java index 59066df62a..90cd18e9cc 100644 --- a/src/main/java/neqsim/fluidmechanics/flowsolver/twophaseflowsolver/twophasepipeflowsolver/TwoPhasePipeFlowSolver.java +++ b/src/main/java/neqsim/fluidmechanics/flowsolver/twophaseflowsolver/twophasepipeflowsolver/TwoPhasePipeFlowSolver.java @@ -15,7 +15,9 @@ */ public class TwoPhasePipeFlowSolver extends neqsim.fluidmechanics.flowsolver.onephaseflowsolver.OnePhaseFlowSolver { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(TwoPhasePipeFlowSolver.class); protected double[] PbArray; // = new double[100]; diff --git a/src/main/java/neqsim/fluidmechanics/flowsystem/FlowSystem.java b/src/main/java/neqsim/fluidmechanics/flowsystem/FlowSystem.java index 31e43cffaf..b676573d88 100644 --- a/src/main/java/neqsim/fluidmechanics/flowsystem/FlowSystem.java +++ b/src/main/java/neqsim/fluidmechanics/flowsystem/FlowSystem.java @@ -19,6 +19,7 @@ * @version $Id: $Id */ public abstract class FlowSystem implements FlowSystemInterface, java.io.Serializable { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/fluidmechanics/flowsystem/onephaseflowsystem/OnePhaseFlowSystem.java b/src/main/java/neqsim/fluidmechanics/flowsystem/onephaseflowsystem/OnePhaseFlowSystem.java index 9bc412bcf0..b90548400d 100644 --- a/src/main/java/neqsim/fluidmechanics/flowsystem/onephaseflowsystem/OnePhaseFlowSystem.java +++ b/src/main/java/neqsim/fluidmechanics/flowsystem/onephaseflowsystem/OnePhaseFlowSystem.java @@ -13,6 +13,7 @@ * @version $Id: $Id */ public abstract class OnePhaseFlowSystem extends FlowSystem { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; // public FluidMechanicsInterface[] flowNode; diff --git a/src/main/java/neqsim/fluidmechanics/flowsystem/onephaseflowsystem/pipeflowsystem/PipeFlowSystem.java b/src/main/java/neqsim/fluidmechanics/flowsystem/onephaseflowsystem/pipeflowsystem/PipeFlowSystem.java index ac0fc5c68b..1152a2bf0f 100644 --- a/src/main/java/neqsim/fluidmechanics/flowsystem/onephaseflowsystem/pipeflowsystem/PipeFlowSystem.java +++ b/src/main/java/neqsim/fluidmechanics/flowsystem/onephaseflowsystem/pipeflowsystem/PipeFlowSystem.java @@ -14,6 +14,7 @@ */ public class PipeFlowSystem extends neqsim.fluidmechanics.flowsystem.onephaseflowsystem.OnePhaseFlowSystem { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/fluidmechanics/flowsystem/twophaseflowsystem/TwoPhaseFlowSystem.java b/src/main/java/neqsim/fluidmechanics/flowsystem/twophaseflowsystem/TwoPhaseFlowSystem.java index 10ecc416f9..920bb66e77 100644 --- a/src/main/java/neqsim/fluidmechanics/flowsystem/twophaseflowsystem/TwoPhaseFlowSystem.java +++ b/src/main/java/neqsim/fluidmechanics/flowsystem/twophaseflowsystem/TwoPhaseFlowSystem.java @@ -13,6 +13,7 @@ * @version $Id: $Id */ public abstract class TwoPhaseFlowSystem extends FlowSystem { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; // FlowNodeInterface[] test = new AnnularFlow[100]; // public FluidMechanicsInterface[] flowNode; diff --git a/src/main/java/neqsim/fluidmechanics/flowsystem/twophaseflowsystem/shipsystem/LNGship.java b/src/main/java/neqsim/fluidmechanics/flowsystem/twophaseflowsystem/shipsystem/LNGship.java index da46879619..7700e974a5 100644 --- a/src/main/java/neqsim/fluidmechanics/flowsystem/twophaseflowsystem/shipsystem/LNGship.java +++ b/src/main/java/neqsim/fluidmechanics/flowsystem/twophaseflowsystem/shipsystem/LNGship.java @@ -23,7 +23,9 @@ */ public class LNGship extends neqsim.fluidmechanics.flowsystem.twophaseflowsystem.TwoPhaseFlowSystem { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(LNGship.class); double[] temperature = null; diff --git a/src/main/java/neqsim/fluidmechanics/flowsystem/twophaseflowsystem/stirredcellsystem/StirredCellSystem.java b/src/main/java/neqsim/fluidmechanics/flowsystem/twophaseflowsystem/stirredcellsystem/StirredCellSystem.java index d9ac4c512e..c419af11a1 100644 --- a/src/main/java/neqsim/fluidmechanics/flowsystem/twophaseflowsystem/stirredcellsystem/StirredCellSystem.java +++ b/src/main/java/neqsim/fluidmechanics/flowsystem/twophaseflowsystem/stirredcellsystem/StirredCellSystem.java @@ -14,6 +14,7 @@ */ public class StirredCellSystem extends neqsim.fluidmechanics.flowsystem.twophaseflowsystem.TwoPhaseFlowSystem { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/fluidmechanics/flowsystem/twophaseflowsystem/twophasepipeflowsystem/TwoPhasePipeFlowSystem.java b/src/main/java/neqsim/fluidmechanics/flowsystem/twophaseflowsystem/twophasepipeflowsystem/TwoPhasePipeFlowSystem.java index caab7846a2..71c6865089 100644 --- a/src/main/java/neqsim/fluidmechanics/flowsystem/twophaseflowsystem/twophasepipeflowsystem/TwoPhasePipeFlowSystem.java +++ b/src/main/java/neqsim/fluidmechanics/flowsystem/twophaseflowsystem/twophasepipeflowsystem/TwoPhasePipeFlowSystem.java @@ -13,6 +13,7 @@ */ public class TwoPhasePipeFlowSystem extends neqsim.fluidmechanics.flowsystem.twophaseflowsystem.TwoPhaseFlowSystem { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/fluidmechanics/flowsystem/twophaseflowsystem/twophasepipeflowsystem/TwoPhasePipeFlowSystemReac.java b/src/main/java/neqsim/fluidmechanics/flowsystem/twophaseflowsystem/twophasepipeflowsystem/TwoPhasePipeFlowSystemReac.java index 8b7dc7507f..5a7f147e5c 100644 --- a/src/main/java/neqsim/fluidmechanics/flowsystem/twophaseflowsystem/twophasepipeflowsystem/TwoPhasePipeFlowSystemReac.java +++ b/src/main/java/neqsim/fluidmechanics/flowsystem/twophaseflowsystem/twophasepipeflowsystem/TwoPhasePipeFlowSystemReac.java @@ -15,6 +15,7 @@ * @version $Id: $Id */ public class TwoPhasePipeFlowSystemReac extends TwoPhasePipeFlowSystem { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/fluidmechanics/flowsystem/twophaseflowsystem/twophasereactorflowsystem/TwoPhaseReactorFlowSystem.java b/src/main/java/neqsim/fluidmechanics/flowsystem/twophaseflowsystem/twophasereactorflowsystem/TwoPhaseReactorFlowSystem.java index 4bf8d58dcc..6d0841ec98 100644 --- a/src/main/java/neqsim/fluidmechanics/flowsystem/twophaseflowsystem/twophasereactorflowsystem/TwoPhaseReactorFlowSystem.java +++ b/src/main/java/neqsim/fluidmechanics/flowsystem/twophaseflowsystem/twophasereactorflowsystem/TwoPhaseReactorFlowSystem.java @@ -14,6 +14,7 @@ */ public class TwoPhaseReactorFlowSystem extends neqsim.fluidmechanics.flowsystem.twophaseflowsystem.TwoPhaseFlowSystem { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/fluidmechanics/geometrydefinitions/GeometryDefinition.java b/src/main/java/neqsim/fluidmechanics/geometrydefinitions/GeometryDefinition.java index 9d8dc01dce..2e6d5a1b76 100644 --- a/src/main/java/neqsim/fluidmechanics/geometrydefinitions/GeometryDefinition.java +++ b/src/main/java/neqsim/fluidmechanics/geometrydefinitions/GeometryDefinition.java @@ -24,7 +24,9 @@ */ public abstract class GeometryDefinition implements GeometryDefinitionInterface, neqsim.thermo.ThermodynamicConstantsInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(GeometryDefinition.class); /** {@inheritDoc} */ diff --git a/src/main/java/neqsim/fluidmechanics/geometrydefinitions/internalgeometry/packings/BerlSaddlePacking.java b/src/main/java/neqsim/fluidmechanics/geometrydefinitions/internalgeometry/packings/BerlSaddlePacking.java index 61d8e060a6..e9cd7d27e4 100644 --- a/src/main/java/neqsim/fluidmechanics/geometrydefinitions/internalgeometry/packings/BerlSaddlePacking.java +++ b/src/main/java/neqsim/fluidmechanics/geometrydefinitions/internalgeometry/packings/BerlSaddlePacking.java @@ -9,7 +9,8 @@ * @version $Id: $Id */ public class BerlSaddlePacking extends Packing { - private static final long serialVersionUID = 1L; + /** Serialization version UID. */ + private static final long serialVersionUID = 1000; /** *

diff --git a/src/main/java/neqsim/fluidmechanics/geometrydefinitions/internalgeometry/packings/Packing.java b/src/main/java/neqsim/fluidmechanics/geometrydefinitions/internalgeometry/packings/Packing.java index fa133c824f..27d5b6ab71 100644 --- a/src/main/java/neqsim/fluidmechanics/geometrydefinitions/internalgeometry/packings/Packing.java +++ b/src/main/java/neqsim/fluidmechanics/geometrydefinitions/internalgeometry/packings/Packing.java @@ -19,7 +19,9 @@ * @version $Id: $Id */ public abstract class Packing extends NamedBaseClass implements PackingInterface { - private static final long serialVersionUID = 1L; + /** Serialization version UID. */ + private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(Packing.class); double voidFractionPacking = 0.951; diff --git a/src/main/java/neqsim/fluidmechanics/geometrydefinitions/internalgeometry/packings/PallRingPacking.java b/src/main/java/neqsim/fluidmechanics/geometrydefinitions/internalgeometry/packings/PallRingPacking.java index 39b950fcb3..de84c1f906 100644 --- a/src/main/java/neqsim/fluidmechanics/geometrydefinitions/internalgeometry/packings/PallRingPacking.java +++ b/src/main/java/neqsim/fluidmechanics/geometrydefinitions/internalgeometry/packings/PallRingPacking.java @@ -15,7 +15,8 @@ * @version $Id: $Id */ public class PallRingPacking extends Packing { - private static final long serialVersionUID = 1L; + /** Serialization version UID. */ + private static final long serialVersionUID = 1000; /** *

diff --git a/src/main/java/neqsim/fluidmechanics/geometrydefinitions/internalgeometry/packings/RachigRingPacking.java b/src/main/java/neqsim/fluidmechanics/geometrydefinitions/internalgeometry/packings/RachigRingPacking.java index 9a80381090..3d092761ab 100644 --- a/src/main/java/neqsim/fluidmechanics/geometrydefinitions/internalgeometry/packings/RachigRingPacking.java +++ b/src/main/java/neqsim/fluidmechanics/geometrydefinitions/internalgeometry/packings/RachigRingPacking.java @@ -9,7 +9,8 @@ * @version $Id: $Id */ public class RachigRingPacking extends Packing { - private static final long serialVersionUID = 1L; + /** Serialization version UID. */ + private static final long serialVersionUID = 1000; /** *

diff --git a/src/main/java/neqsim/fluidmechanics/geometrydefinitions/pipe/PipeData.java b/src/main/java/neqsim/fluidmechanics/geometrydefinitions/pipe/PipeData.java index d9b9249ce8..593485aeaa 100644 --- a/src/main/java/neqsim/fluidmechanics/geometrydefinitions/pipe/PipeData.java +++ b/src/main/java/neqsim/fluidmechanics/geometrydefinitions/pipe/PipeData.java @@ -15,7 +15,9 @@ * @version $Id: $Id */ public class PipeData extends GeometryDefinition { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(PipeData.class); /** diff --git a/src/main/java/neqsim/fluidmechanics/geometrydefinitions/reactor/ReactorData.java b/src/main/java/neqsim/fluidmechanics/geometrydefinitions/reactor/ReactorData.java index 3cac7318f0..66bb4a7d2e 100644 --- a/src/main/java/neqsim/fluidmechanics/geometrydefinitions/reactor/ReactorData.java +++ b/src/main/java/neqsim/fluidmechanics/geometrydefinitions/reactor/ReactorData.java @@ -14,7 +14,9 @@ * @version $Id: $Id */ public class ReactorData extends GeometryDefinition { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(ReactorData.class); /** diff --git a/src/main/java/neqsim/fluidmechanics/geometrydefinitions/stirredcell/StirredCell.java b/src/main/java/neqsim/fluidmechanics/geometrydefinitions/stirredcell/StirredCell.java index ca6268da5d..0a18e3b249 100644 --- a/src/main/java/neqsim/fluidmechanics/geometrydefinitions/stirredcell/StirredCell.java +++ b/src/main/java/neqsim/fluidmechanics/geometrydefinitions/stirredcell/StirredCell.java @@ -14,7 +14,9 @@ * @version $Id: $Id */ public class StirredCell extends GeometryDefinition { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(StirredCell.class); /** diff --git a/src/main/java/neqsim/fluidmechanics/util/timeseries/TimeSeries.java b/src/main/java/neqsim/fluidmechanics/util/timeseries/TimeSeries.java index e509bc20d8..7d7d409e1f 100644 --- a/src/main/java/neqsim/fluidmechanics/util/timeseries/TimeSeries.java +++ b/src/main/java/neqsim/fluidmechanics/util/timeseries/TimeSeries.java @@ -18,6 +18,7 @@ * @version $Id: $Id */ public class TimeSeries implements java.io.Serializable { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; protected double[] timeSeries, outletMolarFlowRate, outletMolarFlowRates; diff --git a/src/main/java/neqsim/mathlib/nonlinearsolver/NewtonRhapson.java b/src/main/java/neqsim/mathlib/nonlinearsolver/NewtonRhapson.java index 82f47acb86..a6195e78e4 100644 --- a/src/main/java/neqsim/mathlib/nonlinearsolver/NewtonRhapson.java +++ b/src/main/java/neqsim/mathlib/nonlinearsolver/NewtonRhapson.java @@ -17,6 +17,7 @@ * @version $Id: $Id */ public class NewtonRhapson implements java.io.Serializable { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; int order; diff --git a/src/main/java/neqsim/mathlib/nonlinearsolver/NumericalDerivative.java b/src/main/java/neqsim/mathlib/nonlinearsolver/NumericalDerivative.java index 8cb732b1b2..8e3b63d117 100644 --- a/src/main/java/neqsim/mathlib/nonlinearsolver/NumericalDerivative.java +++ b/src/main/java/neqsim/mathlib/nonlinearsolver/NumericalDerivative.java @@ -19,6 +19,7 @@ * @version $Id: $Id */ public final class NumericalDerivative implements java.io.Serializable { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; static final double CON = 1.4; diff --git a/src/main/java/neqsim/mathlib/nonlinearsolver/SysNewtonRhapson.java b/src/main/java/neqsim/mathlib/nonlinearsolver/SysNewtonRhapson.java index 2d4f867199..8e4750f331 100644 --- a/src/main/java/neqsim/mathlib/nonlinearsolver/SysNewtonRhapson.java +++ b/src/main/java/neqsim/mathlib/nonlinearsolver/SysNewtonRhapson.java @@ -14,6 +14,7 @@ * @version $Id: $Id */ public class SysNewtonRhapson implements java.io.Serializable { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; int neq = 0; int iter = 0; diff --git a/src/main/java/neqsim/physicalproperties/PhysicalPropertyHandler.java b/src/main/java/neqsim/physicalproperties/PhysicalPropertyHandler.java index 27365ccd74..7c61ab8c64 100644 --- a/src/main/java/neqsim/physicalproperties/PhysicalPropertyHandler.java +++ b/src/main/java/neqsim/physicalproperties/PhysicalPropertyHandler.java @@ -23,7 +23,9 @@ * @version $Id: $Id */ public class PhysicalPropertyHandler implements Cloneable, java.io.Serializable { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(PhysicalPropertyHandler.class); private PhysicalProperties gasPhysicalProperties = null; diff --git a/src/main/java/neqsim/physicalproperties/interfaceproperties/InterfaceProperties.java b/src/main/java/neqsim/physicalproperties/interfaceproperties/InterfaceProperties.java index 72cc63329f..44dc1c7f54 100644 --- a/src/main/java/neqsim/physicalproperties/interfaceproperties/InterfaceProperties.java +++ b/src/main/java/neqsim/physicalproperties/interfaceproperties/InterfaceProperties.java @@ -28,7 +28,9 @@ * @version $Id: $Id */ public class InterfaceProperties implements InterphasePropertiesInterface, java.io.Serializable { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(InterfaceProperties.class); SystemInterface system; diff --git a/src/main/java/neqsim/physicalproperties/interfaceproperties/solidadsorption/PotentialTheoryAdsorption.java b/src/main/java/neqsim/physicalproperties/interfaceproperties/solidadsorption/PotentialTheoryAdsorption.java index f303a72f17..26d75da665 100644 --- a/src/main/java/neqsim/physicalproperties/interfaceproperties/solidadsorption/PotentialTheoryAdsorption.java +++ b/src/main/java/neqsim/physicalproperties/interfaceproperties/solidadsorption/PotentialTheoryAdsorption.java @@ -13,7 +13,9 @@ * @version $Id: $Id */ public class PotentialTheoryAdsorption implements AdsorptionInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(PotentialTheoryAdsorption.class); SystemInterface system; diff --git a/src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/FirozabadiRamleyInterfaceTension.java b/src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/FirozabadiRamleyInterfaceTension.java index 42c5ebdbee..87cb171cd8 100644 --- a/src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/FirozabadiRamleyInterfaceTension.java +++ b/src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/FirozabadiRamleyInterfaceTension.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class FirozabadiRamleyInterfaceTension extends SurfaceTension { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/GTSurfaceTension.java b/src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/GTSurfaceTension.java index 426f3de4b7..439531f222 100644 --- a/src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/GTSurfaceTension.java +++ b/src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/GTSurfaceTension.java @@ -69,6 +69,7 @@ * @version $Id: $Id */ public class GTSurfaceTension extends SurfaceTension { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; int useFullGT = 1; // 1 will use full gradient theory 0 - will use ODE solver and one component diff --git a/src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/GTSurfaceTensionFullGT.java b/src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/GTSurfaceTensionFullGT.java index 0dae58a86a..a284014c66 100644 --- a/src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/GTSurfaceTensionFullGT.java +++ b/src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/GTSurfaceTensionFullGT.java @@ -18,6 +18,7 @@ * @version $Id: $Id */ public class GTSurfaceTensionFullGT { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(GTSurfaceTensionFullGT.class); private int ncomp; // Number of components. diff --git a/src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/GTSurfaceTensionODE.java b/src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/GTSurfaceTensionODE.java index f80990924b..222cd23365 100644 --- a/src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/GTSurfaceTensionODE.java +++ b/src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/GTSurfaceTensionODE.java @@ -28,6 +28,7 @@ * @version $Id: $Id */ public class GTSurfaceTensionODE implements FirstOrderDifferentialEquations { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(GTSurfaceTensionODE.class); private boolean initialized = false; diff --git a/src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/GTSurfaceTensionSimple.java b/src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/GTSurfaceTensionSimple.java index 29ea5a41b1..63540f0918 100644 --- a/src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/GTSurfaceTensionSimple.java +++ b/src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/GTSurfaceTensionSimple.java @@ -17,7 +17,9 @@ * @version $Id: $Id */ public class GTSurfaceTensionSimple extends SurfaceTension { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(GTSurfaceTensionSimple.class); int ite_step = 200; diff --git a/src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/LGTSurfaceTension.java b/src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/LGTSurfaceTension.java index bb4eb6d737..0bda10d933 100644 --- a/src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/LGTSurfaceTension.java +++ b/src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/LGTSurfaceTension.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class LGTSurfaceTension extends SurfaceTension { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; int ite_step = 200; diff --git a/src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/ParachorSurfaceTension.java b/src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/ParachorSurfaceTension.java index 0e36241e77..d513b2b98b 100644 --- a/src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/ParachorSurfaceTension.java +++ b/src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/ParachorSurfaceTension.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class ParachorSurfaceTension extends SurfaceTension { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** @@ -40,11 +41,10 @@ public ParachorSurfaceTension(SystemInterface system) { */ @Override public double calcPureComponentSurfaceTension(int componentNumber) { - return 1.0e-3 * Math.pow(system.getPhases()[0].getComponents()[componentNumber] - .getParachorParameter() - * 1.0e-6 - * (system.getPhases()[1].getPhysicalProperties().getDensity() - / system.getPhases()[1].getMolarMass() + return 1.0e-3 * Math + .pow(system.getPhases()[0].getComponents()[componentNumber].getParachorParameter() * 1.0e-6 + * (system.getPhases()[1].getPhysicalProperties().getDensity() + / system.getPhases()[1].getMolarMass() * system.getPhases()[1].getComponents()[componentNumber].getx() - system.getPhases()[0].getPhysicalProperties().getDensity() / system.getPhases()[0].getMolarMass() diff --git a/src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/SurfaceTension.java b/src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/SurfaceTension.java index dcd19105c1..59e1225988 100644 --- a/src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/SurfaceTension.java +++ b/src/main/java/neqsim/physicalproperties/interfaceproperties/surfacetension/SurfaceTension.java @@ -18,6 +18,7 @@ * @version $Id: $Id */ public class SurfaceTension extends InterfaceProperties implements SurfaceTensionInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; protected SystemInterface system; diff --git a/src/main/java/neqsim/physicalproperties/methods/PhysicalPropertyMethod.java b/src/main/java/neqsim/physicalproperties/methods/PhysicalPropertyMethod.java index a35fceb9a2..48df5fd785 100644 --- a/src/main/java/neqsim/physicalproperties/methods/PhysicalPropertyMethod.java +++ b/src/main/java/neqsim/physicalproperties/methods/PhysicalPropertyMethod.java @@ -19,7 +19,9 @@ * @version $Id: $Id */ public abstract class PhysicalPropertyMethod implements PhysicalPropertyMethodInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(PhysicalPropertyMethod.class); /** diff --git a/src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/CommonPhysicalPropertyMethod.java b/src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/CommonPhysicalPropertyMethod.java index c3964368e2..3c48c8c4cf 100644 --- a/src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/CommonPhysicalPropertyMethod.java +++ b/src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/CommonPhysicalPropertyMethod.java @@ -12,6 +12,7 @@ * @version $Id: $Id */ public abstract class CommonPhysicalPropertyMethod extends PhysicalPropertyMethod { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; protected PhysicalProperties phase; diff --git a/src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/conductivity/Conductivity.java b/src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/conductivity/Conductivity.java index 4a88d97126..2beb363c08 100644 --- a/src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/conductivity/Conductivity.java +++ b/src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/conductivity/Conductivity.java @@ -13,7 +13,9 @@ */ public abstract class Conductivity extends CommonPhysicalPropertyMethod implements ConductivityInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(Conductivity.class); double conductivity = 0; diff --git a/src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/conductivity/PFCTConductivityMethodMod86.java b/src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/conductivity/PFCTConductivityMethodMod86.java index 1ed649637f..ffb4a2da63 100644 --- a/src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/conductivity/PFCTConductivityMethodMod86.java +++ b/src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/conductivity/PFCTConductivityMethodMod86.java @@ -14,6 +14,7 @@ * @version Method was revised by Even Solbraa 21.01.2019 */ public class PFCTConductivityMethodMod86 extends Conductivity { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** Constant referenceSystem. */ diff --git a/src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/diffusivity/CorrespondingStatesDiffusivity.java b/src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/diffusivity/CorrespondingStatesDiffusivity.java index 6f6018617f..446735052d 100644 --- a/src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/diffusivity/CorrespondingStatesDiffusivity.java +++ b/src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/diffusivity/CorrespondingStatesDiffusivity.java @@ -12,6 +12,7 @@ * @version $Id: $Id */ public class CorrespondingStatesDiffusivity extends Diffusivity { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; double[][] binaryDiffusionCoefficients; diff --git a/src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/diffusivity/Diffusivity.java b/src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/diffusivity/Diffusivity.java index 2fa6d305ce..2e3a00c69a 100644 --- a/src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/diffusivity/Diffusivity.java +++ b/src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/diffusivity/Diffusivity.java @@ -15,7 +15,9 @@ * @version $Id: $Id */ public class Diffusivity extends CommonPhysicalPropertyMethod implements DiffusivityInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(Diffusivity.class); double[][] binaryDiffusionCoefficients; @@ -113,9 +115,8 @@ public double getEffectiveDiffusionCoefficient(int i) { public double getMaxwellStefanBinaryDiffusionCoefficient(int i, int j) { /* * double temp = (i==j)? 1.0: 0.0; double nonIdealCorrection = temp + - * gasPhase.getPhase().getComponent(i).getx() * - * gasPhase.getPhase().getComponent(i).getdfugdn(j) * - * gasPhase.getPhase().getNumberOfMolesInPhase(); if (Double.isNaN(nonIdealCorrection)) + * gasPhase.getPhase().getComponent(i).getx() * gasPhase.getPhase().getComponent(i).getdfugdn(j) + * * gasPhase.getPhase().getNumberOfMolesInPhase(); if (Double.isNaN(nonIdealCorrection)) * nonIdealCorrection=1.0; return binaryDiffusionCoefficients[i][j]/nonIdealCorrection; // shuld * be divided by non ideality factor */ diff --git a/src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/viscosity/FrictionTheoryViscosityMethod.java b/src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/viscosity/FrictionTheoryViscosityMethod.java index 84c54b952a..612c62fcff 100644 --- a/src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/viscosity/FrictionTheoryViscosityMethod.java +++ b/src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/viscosity/FrictionTheoryViscosityMethod.java @@ -14,7 +14,9 @@ */ public class FrictionTheoryViscosityMethod extends Viscosity implements neqsim.thermo.ThermodynamicConstantsInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(FrictionTheoryViscosityMethod.class); public double[] pureComponentViscosity; diff --git a/src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/viscosity/LBCViscosityMethod.java b/src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/viscosity/LBCViscosityMethod.java index d593db718f..efdf8bc506 100644 --- a/src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/viscosity/LBCViscosityMethod.java +++ b/src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/viscosity/LBCViscosityMethod.java @@ -13,7 +13,9 @@ * @version Method was checked on 2.8.2001 - seems to be correct - Even Solbraa */ public class LBCViscosityMethod extends Viscosity { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(LBCViscosityMethod.class); double[] a = {0.10230, 0.023364, 0.058533, -0.040758, 0.0093324}; diff --git a/src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/viscosity/PFCTViscosityMethod.java b/src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/viscosity/PFCTViscosityMethod.java index e6d40eea1c..8289b0b142 100644 --- a/src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/viscosity/PFCTViscosityMethod.java +++ b/src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/viscosity/PFCTViscosityMethod.java @@ -20,6 +20,7 @@ * @version Method was checked on 2.8.2001 - seems to be correct - Even Solbraa */ public class PFCTViscosityMethod extends Viscosity { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; // todo: is this parameter required? diff --git a/src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/viscosity/PFCTViscosityMethodHeavyOil.java b/src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/viscosity/PFCTViscosityMethodHeavyOil.java index 3b21867b06..079b9ef20b 100644 --- a/src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/viscosity/PFCTViscosityMethodHeavyOil.java +++ b/src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/viscosity/PFCTViscosityMethodHeavyOil.java @@ -14,6 +14,7 @@ * @version Method was checked on 2.8.2001 - seems to be correct - Even Solbraa */ public class PFCTViscosityMethodHeavyOil extends Viscosity { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; // SystemInterface referenceSystem = new SystemBWRSEos(273.15, diff --git a/src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/viscosity/PFCTViscosityMethodMod86.java b/src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/viscosity/PFCTViscosityMethodMod86.java index 58e2b462e6..11f2d632d3 100644 --- a/src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/viscosity/PFCTViscosityMethodMod86.java +++ b/src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/viscosity/PFCTViscosityMethodMod86.java @@ -14,6 +14,7 @@ * @version Method was checked on 2.8.2001 - seems to be correct - Even Solbraa */ public class PFCTViscosityMethodMod86 extends Viscosity { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; // SystemInterface referenceSystem = new SystemBWRSEos(273.15, diff --git a/src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/viscosity/Viscosity.java b/src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/viscosity/Viscosity.java index 3981f8a968..b631ff0d97 100644 --- a/src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/viscosity/Viscosity.java +++ b/src/main/java/neqsim/physicalproperties/methods/commonphasephysicalproperties/viscosity/Viscosity.java @@ -12,7 +12,9 @@ * @author Even Solbraa */ public abstract class Viscosity extends CommonPhysicalPropertyMethod implements ViscosityInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(Viscosity.class); public double[] pureComponentViscosity; @@ -40,10 +42,9 @@ public void calcPureComponentViscosity() { if (phase.getPhase().getTemperature() > phase.getPhase().getComponent(i).getTC()) { pureComponentViscosity[i] = 5.0e-1; } else if (phase.getPhase().getComponent(i).getLiquidViscosityModel() == 1) { - pureComponentViscosity[i] = - phase.getPhase().getComponent(i).getLiquidViscosityParameter(0) - * Math.pow(phase.getPhase().getTemperature(), - phase.getPhase().getComponent(i).getLiquidViscosityParameter(1)); + pureComponentViscosity[i] = phase.getPhase().getComponent(i).getLiquidViscosityParameter(0) + * Math.pow(phase.getPhase().getTemperature(), + phase.getPhase().getComponent(i).getLiquidViscosityParameter(1)); } else if (phase.getPhase().getComponent(i).getLiquidViscosityModel() == 2) { } else if (phase.getPhase().getComponent(i).getLiquidViscosityModel() == 3) { pureComponentViscosity[i] = diff --git a/src/main/java/neqsim/physicalproperties/methods/gasphysicalproperties/GasPhysicalPropertyMethod.java b/src/main/java/neqsim/physicalproperties/methods/gasphysicalproperties/GasPhysicalPropertyMethod.java index d883dfc411..b5248c2fd8 100644 --- a/src/main/java/neqsim/physicalproperties/methods/gasphysicalproperties/GasPhysicalPropertyMethod.java +++ b/src/main/java/neqsim/physicalproperties/methods/gasphysicalproperties/GasPhysicalPropertyMethod.java @@ -12,6 +12,7 @@ * @version $Id: $Id */ public abstract class GasPhysicalPropertyMethod extends PhysicalPropertyMethod { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; protected PhysicalProperties gasPhase; diff --git a/src/main/java/neqsim/physicalproperties/methods/gasphysicalproperties/conductivity/ChungConductivityMethod.java b/src/main/java/neqsim/physicalproperties/methods/gasphysicalproperties/conductivity/ChungConductivityMethod.java index 3e359b4418..bdbe5c8011 100644 --- a/src/main/java/neqsim/physicalproperties/methods/gasphysicalproperties/conductivity/ChungConductivityMethod.java +++ b/src/main/java/neqsim/physicalproperties/methods/gasphysicalproperties/conductivity/ChungConductivityMethod.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class ChungConductivityMethod extends Conductivity { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; double conductivity = 0; public double[] pureComponentConductivity; diff --git a/src/main/java/neqsim/physicalproperties/methods/gasphysicalproperties/conductivity/Conductivity.java b/src/main/java/neqsim/physicalproperties/methods/gasphysicalproperties/conductivity/Conductivity.java index 20765be306..868a710dd2 100644 --- a/src/main/java/neqsim/physicalproperties/methods/gasphysicalproperties/conductivity/Conductivity.java +++ b/src/main/java/neqsim/physicalproperties/methods/gasphysicalproperties/conductivity/Conductivity.java @@ -19,7 +19,9 @@ */ public abstract class Conductivity extends GasPhysicalPropertyMethod implements ConductivityInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(Conductivity.class); double conductivity = 0; diff --git a/src/main/java/neqsim/physicalproperties/methods/gasphysicalproperties/density/Density.java b/src/main/java/neqsim/physicalproperties/methods/gasphysicalproperties/density/Density.java index 2540f633cb..7d611a9d9f 100644 --- a/src/main/java/neqsim/physicalproperties/methods/gasphysicalproperties/density/Density.java +++ b/src/main/java/neqsim/physicalproperties/methods/gasphysicalproperties/density/Density.java @@ -21,7 +21,9 @@ * @version $Id: $Id */ public class Density extends GasPhysicalPropertyMethod implements DensityInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(Density.class); /** diff --git a/src/main/java/neqsim/physicalproperties/methods/gasphysicalproperties/diffusivity/Diffusivity.java b/src/main/java/neqsim/physicalproperties/methods/gasphysicalproperties/diffusivity/Diffusivity.java index bd6fce823c..bdf3e9f435 100644 --- a/src/main/java/neqsim/physicalproperties/methods/gasphysicalproperties/diffusivity/Diffusivity.java +++ b/src/main/java/neqsim/physicalproperties/methods/gasphysicalproperties/diffusivity/Diffusivity.java @@ -15,7 +15,9 @@ * @version $Id: $Id */ public class Diffusivity extends GasPhysicalPropertyMethod implements DiffusivityInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(Diffusivity.class); double[][] binaryDiffusionCoefficients; @@ -114,8 +116,7 @@ public void calcEffectiveDiffusionCoefficients() { sum += gasPhase.getPhase().getComponent(j).getx() / binaryDiffusionCoefficients[i][j]; } } - effectiveDiffusionCoefficient[i] = - (1.0 - gasPhase.getPhase().getComponent(i).getx()) / sum; + effectiveDiffusionCoefficient[i] = (1.0 - gasPhase.getPhase().getComponent(i).getx()) / sum; } } @@ -136,9 +137,8 @@ public double getEffectiveDiffusionCoefficient(int i) { public double getMaxwellStefanBinaryDiffusionCoefficient(int i, int j) { /* * double temp = (i==j)? 1.0: 0.0; double nonIdealCorrection = temp + - * gasPhase.getPhase().getComponent(i).getx() * - * gasPhase.getPhase().getComponent(i).getdfugdn(j) * - * gasPhase.getPhase().getNumberOfMolesInPhase(); if (Double.isNaN(nonIdealCorrection)) + * gasPhase.getPhase().getComponent(i).getx() * gasPhase.getPhase().getComponent(i).getdfugdn(j) + * * gasPhase.getPhase().getNumberOfMolesInPhase(); if (Double.isNaN(nonIdealCorrection)) * nonIdealCorrection=1.0; return binaryDiffusionCoefficients[i][j]/nonIdealCorrection; // shuld * be divided by non ideality factor */ diff --git a/src/main/java/neqsim/physicalproperties/methods/gasphysicalproperties/diffusivity/WilkeLeeDiffusivity.java b/src/main/java/neqsim/physicalproperties/methods/gasphysicalproperties/diffusivity/WilkeLeeDiffusivity.java index ae1b46d8d9..37c254f3ae 100644 --- a/src/main/java/neqsim/physicalproperties/methods/gasphysicalproperties/diffusivity/WilkeLeeDiffusivity.java +++ b/src/main/java/neqsim/physicalproperties/methods/gasphysicalproperties/diffusivity/WilkeLeeDiffusivity.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class WilkeLeeDiffusivity extends Diffusivity { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; double[][] binaryDiffusionCoefficients; diff --git a/src/main/java/neqsim/physicalproperties/methods/gasphysicalproperties/viscosity/ChungViscosityMethod.java b/src/main/java/neqsim/physicalproperties/methods/gasphysicalproperties/viscosity/ChungViscosityMethod.java index b728e89e0a..db77885bf6 100644 --- a/src/main/java/neqsim/physicalproperties/methods/gasphysicalproperties/viscosity/ChungViscosityMethod.java +++ b/src/main/java/neqsim/physicalproperties/methods/gasphysicalproperties/viscosity/ChungViscosityMethod.java @@ -17,6 +17,7 @@ * @version Method was checked on 2.8.2001 - seems to be correct - Even Solbraa */ public class ChungViscosityMethod extends Viscosity { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; public double[] pureComponentViscosity; diff --git a/src/main/java/neqsim/physicalproperties/methods/gasphysicalproperties/viscosity/Viscosity.java b/src/main/java/neqsim/physicalproperties/methods/gasphysicalproperties/viscosity/Viscosity.java index b73c4eb79c..2f8baf1a35 100644 --- a/src/main/java/neqsim/physicalproperties/methods/gasphysicalproperties/viscosity/Viscosity.java +++ b/src/main/java/neqsim/physicalproperties/methods/gasphysicalproperties/viscosity/Viscosity.java @@ -12,7 +12,9 @@ * @author Even Solbraa */ public abstract class Viscosity extends GasPhysicalPropertyMethod implements ViscosityInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(Viscosity.class); /** diff --git a/src/main/java/neqsim/physicalproperties/methods/liquidphysicalproperties/LiquidPhysicalPropertyMethod.java b/src/main/java/neqsim/physicalproperties/methods/liquidphysicalproperties/LiquidPhysicalPropertyMethod.java index 8d74315996..a9b5842722 100644 --- a/src/main/java/neqsim/physicalproperties/methods/liquidphysicalproperties/LiquidPhysicalPropertyMethod.java +++ b/src/main/java/neqsim/physicalproperties/methods/liquidphysicalproperties/LiquidPhysicalPropertyMethod.java @@ -12,6 +12,7 @@ * @version $Id: $Id */ public abstract class LiquidPhysicalPropertyMethod extends PhysicalPropertyMethod { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; protected PhysicalProperties liquidPhase; diff --git a/src/main/java/neqsim/physicalproperties/methods/liquidphysicalproperties/conductivity/Conductivity.java b/src/main/java/neqsim/physicalproperties/methods/liquidphysicalproperties/conductivity/Conductivity.java index ef534f0dfd..62b04f5ffd 100644 --- a/src/main/java/neqsim/physicalproperties/methods/liquidphysicalproperties/conductivity/Conductivity.java +++ b/src/main/java/neqsim/physicalproperties/methods/liquidphysicalproperties/conductivity/Conductivity.java @@ -21,7 +21,9 @@ * @version $Id: $Id */ public class Conductivity extends LiquidPhysicalPropertyMethod implements ConductivityInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(Conductivity.class); double conductivity = 0; diff --git a/src/main/java/neqsim/physicalproperties/methods/liquidphysicalproperties/density/Costald.java b/src/main/java/neqsim/physicalproperties/methods/liquidphysicalproperties/density/Costald.java index e83a047267..3b869f9584 100644 --- a/src/main/java/neqsim/physicalproperties/methods/liquidphysicalproperties/density/Costald.java +++ b/src/main/java/neqsim/physicalproperties/methods/liquidphysicalproperties/density/Costald.java @@ -21,7 +21,9 @@ * @version $Id: $Id */ public class Costald extends LiquidPhysicalPropertyMethod implements DensityInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(Density.class); /** diff --git a/src/main/java/neqsim/physicalproperties/methods/liquidphysicalproperties/density/Density.java b/src/main/java/neqsim/physicalproperties/methods/liquidphysicalproperties/density/Density.java index cbe28174eb..ccd9a93b68 100644 --- a/src/main/java/neqsim/physicalproperties/methods/liquidphysicalproperties/density/Density.java +++ b/src/main/java/neqsim/physicalproperties/methods/liquidphysicalproperties/density/Density.java @@ -21,7 +21,9 @@ * @version $Id: $Id */ public class Density extends LiquidPhysicalPropertyMethod implements DensityInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(Density.class); /** diff --git a/src/main/java/neqsim/physicalproperties/methods/liquidphysicalproperties/diffusivity/AmineDiffusivity.java b/src/main/java/neqsim/physicalproperties/methods/liquidphysicalproperties/diffusivity/AmineDiffusivity.java index cd7c78b444..de8de51fb7 100644 --- a/src/main/java/neqsim/physicalproperties/methods/liquidphysicalproperties/diffusivity/AmineDiffusivity.java +++ b/src/main/java/neqsim/physicalproperties/methods/liquidphysicalproperties/diffusivity/AmineDiffusivity.java @@ -13,7 +13,9 @@ * @version $Id: $Id */ public class AmineDiffusivity extends SiddiqiLucasMethod { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(AmineDiffusivity.class); /** diff --git a/src/main/java/neqsim/physicalproperties/methods/liquidphysicalproperties/diffusivity/CO2water.java b/src/main/java/neqsim/physicalproperties/methods/liquidphysicalproperties/diffusivity/CO2water.java index f2bf8a768c..66ac79afe5 100644 --- a/src/main/java/neqsim/physicalproperties/methods/liquidphysicalproperties/diffusivity/CO2water.java +++ b/src/main/java/neqsim/physicalproperties/methods/liquidphysicalproperties/diffusivity/CO2water.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class CO2water extends Diffusivity { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/physicalproperties/methods/liquidphysicalproperties/diffusivity/Diffusivity.java b/src/main/java/neqsim/physicalproperties/methods/liquidphysicalproperties/diffusivity/Diffusivity.java index ec36626704..51ad9f1d1e 100644 --- a/src/main/java/neqsim/physicalproperties/methods/liquidphysicalproperties/diffusivity/Diffusivity.java +++ b/src/main/java/neqsim/physicalproperties/methods/liquidphysicalproperties/diffusivity/Diffusivity.java @@ -12,7 +12,9 @@ * @author Even Solbraa */ abstract class Diffusivity extends LiquidPhysicalPropertyMethod implements DiffusivityInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(Diffusivity.class); double[][] binaryDiffusionCoefficients; diff --git a/src/main/java/neqsim/physicalproperties/methods/liquidphysicalproperties/diffusivity/SiddiqiLucasMethod.java b/src/main/java/neqsim/physicalproperties/methods/liquidphysicalproperties/diffusivity/SiddiqiLucasMethod.java index b91e3fb37d..3dadd09937 100644 --- a/src/main/java/neqsim/physicalproperties/methods/liquidphysicalproperties/diffusivity/SiddiqiLucasMethod.java +++ b/src/main/java/neqsim/physicalproperties/methods/liquidphysicalproperties/diffusivity/SiddiqiLucasMethod.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class SiddiqiLucasMethod extends Diffusivity { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/physicalproperties/methods/liquidphysicalproperties/viscosity/AmineViscosity.java b/src/main/java/neqsim/physicalproperties/methods/liquidphysicalproperties/viscosity/AmineViscosity.java index dd2bb2253b..6f417b8ed1 100644 --- a/src/main/java/neqsim/physicalproperties/methods/liquidphysicalproperties/viscosity/AmineViscosity.java +++ b/src/main/java/neqsim/physicalproperties/methods/liquidphysicalproperties/viscosity/AmineViscosity.java @@ -11,6 +11,7 @@ * @version Method was checked on 2.8.2001 - seems to be correct - Even Solbraa */ public class AmineViscosity extends Viscosity { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/physicalproperties/methods/liquidphysicalproperties/viscosity/Viscosity.java b/src/main/java/neqsim/physicalproperties/methods/liquidphysicalproperties/viscosity/Viscosity.java index 5e10ed5cc5..2d7a9c45cc 100644 --- a/src/main/java/neqsim/physicalproperties/methods/liquidphysicalproperties/viscosity/Viscosity.java +++ b/src/main/java/neqsim/physicalproperties/methods/liquidphysicalproperties/viscosity/Viscosity.java @@ -15,7 +15,9 @@ * @version Method was checked on 2.8.2001 - seems to be correct - Even Solbraa */ public class Viscosity extends LiquidPhysicalPropertyMethod implements ViscosityInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(Viscosity.class); public double[] pureComponentViscosity; diff --git a/src/main/java/neqsim/physicalproperties/methods/solidphysicalproperties/SolidPhysicalPropertyMethod.java b/src/main/java/neqsim/physicalproperties/methods/solidphysicalproperties/SolidPhysicalPropertyMethod.java index 57859df9ac..ee1273dd46 100644 --- a/src/main/java/neqsim/physicalproperties/methods/solidphysicalproperties/SolidPhysicalPropertyMethod.java +++ b/src/main/java/neqsim/physicalproperties/methods/solidphysicalproperties/SolidPhysicalPropertyMethod.java @@ -12,6 +12,7 @@ * @version $Id: $Id */ public abstract class SolidPhysicalPropertyMethod extends PhysicalPropertyMethod { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; protected PhysicalProperties solidPhase; diff --git a/src/main/java/neqsim/physicalproperties/methods/solidphysicalproperties/conductivity/Conductivity.java b/src/main/java/neqsim/physicalproperties/methods/solidphysicalproperties/conductivity/Conductivity.java index bae6fd4b16..25e3a4eecd 100644 --- a/src/main/java/neqsim/physicalproperties/methods/solidphysicalproperties/conductivity/Conductivity.java +++ b/src/main/java/neqsim/physicalproperties/methods/solidphysicalproperties/conductivity/Conductivity.java @@ -22,7 +22,9 @@ * @version $Id: $Id */ public class Conductivity extends SolidPhysicalPropertyMethod implements ConductivityInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(Conductivity.class); double conductivity = 0; diff --git a/src/main/java/neqsim/physicalproperties/methods/solidphysicalproperties/density/Density.java b/src/main/java/neqsim/physicalproperties/methods/solidphysicalproperties/density/Density.java index 2aa4d68fa5..f7a6253653 100644 --- a/src/main/java/neqsim/physicalproperties/methods/solidphysicalproperties/density/Density.java +++ b/src/main/java/neqsim/physicalproperties/methods/solidphysicalproperties/density/Density.java @@ -21,7 +21,9 @@ * @version $Id: $Id */ public class Density extends SolidPhysicalPropertyMethod implements DensityInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(Density.class); /** diff --git a/src/main/java/neqsim/physicalproperties/methods/solidphysicalproperties/diffusivity/Diffusivity.java b/src/main/java/neqsim/physicalproperties/methods/solidphysicalproperties/diffusivity/Diffusivity.java index 3dd3ff1785..734cd3a298 100644 --- a/src/main/java/neqsim/physicalproperties/methods/solidphysicalproperties/diffusivity/Diffusivity.java +++ b/src/main/java/neqsim/physicalproperties/methods/solidphysicalproperties/diffusivity/Diffusivity.java @@ -15,7 +15,9 @@ * @version $Id: $Id */ public class Diffusivity extends SolidPhysicalPropertyMethod implements DiffusivityInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(Diffusivity.class); double[][] binaryDiffusionCoefficients; diff --git a/src/main/java/neqsim/physicalproperties/methods/solidphysicalproperties/viscosity/Viscosity.java b/src/main/java/neqsim/physicalproperties/methods/solidphysicalproperties/viscosity/Viscosity.java index 3e63cc1e9e..519d8db575 100644 --- a/src/main/java/neqsim/physicalproperties/methods/solidphysicalproperties/viscosity/Viscosity.java +++ b/src/main/java/neqsim/physicalproperties/methods/solidphysicalproperties/viscosity/Viscosity.java @@ -16,7 +16,9 @@ * @version Method was checked on 2.8.2001 - seems to be correct - Even Solbraa */ public class Viscosity extends SolidPhysicalPropertyMethod implements ViscosityInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(Viscosity.class); public double[] pureComponentViscosity; diff --git a/src/main/java/neqsim/physicalproperties/mixingrule/PhysicalPropertyMixingRule.java b/src/main/java/neqsim/physicalproperties/mixingrule/PhysicalPropertyMixingRule.java index 019deda316..95df4034da 100644 --- a/src/main/java/neqsim/physicalproperties/mixingrule/PhysicalPropertyMixingRule.java +++ b/src/main/java/neqsim/physicalproperties/mixingrule/PhysicalPropertyMixingRule.java @@ -21,7 +21,9 @@ */ public class PhysicalPropertyMixingRule implements PhysicalPropertyMixingRuleInterface, ThermodynamicConstantsInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(PhysicalPropertyMixingRule.class); public double[][] Gij; diff --git a/src/main/java/neqsim/physicalproperties/system/PhysicalProperties.java b/src/main/java/neqsim/physicalproperties/system/PhysicalProperties.java index 47d97814e6..4978dfe131 100644 --- a/src/main/java/neqsim/physicalproperties/system/PhysicalProperties.java +++ b/src/main/java/neqsim/physicalproperties/system/PhysicalProperties.java @@ -37,7 +37,9 @@ * @version $Id: $Id */ public abstract class PhysicalProperties implements Cloneable, ThermodynamicConstantsInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(PhysicalProperties.class); protected PhaseInterface phase; diff --git a/src/main/java/neqsim/physicalproperties/system/commonphasephysicalproperties/DefaultPhysicalProperties.java b/src/main/java/neqsim/physicalproperties/system/commonphasephysicalproperties/DefaultPhysicalProperties.java index 284bb36954..18644e162d 100644 --- a/src/main/java/neqsim/physicalproperties/system/commonphasephysicalproperties/DefaultPhysicalProperties.java +++ b/src/main/java/neqsim/physicalproperties/system/commonphasephysicalproperties/DefaultPhysicalProperties.java @@ -15,6 +15,7 @@ * @version $Id: $Id */ public class DefaultPhysicalProperties extends PhysicalProperties { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/physicalproperties/system/gasphysicalproperties/AirPhysicalProperties.java b/src/main/java/neqsim/physicalproperties/system/gasphysicalproperties/AirPhysicalProperties.java index e45d589a00..75907dff43 100644 --- a/src/main/java/neqsim/physicalproperties/system/gasphysicalproperties/AirPhysicalProperties.java +++ b/src/main/java/neqsim/physicalproperties/system/gasphysicalproperties/AirPhysicalProperties.java @@ -19,6 +19,7 @@ * @version $Id: $Id */ public class AirPhysicalProperties extends GasPhysicalProperties { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/physicalproperties/system/gasphysicalproperties/GasPhysicalProperties.java b/src/main/java/neqsim/physicalproperties/system/gasphysicalproperties/GasPhysicalProperties.java index c96b3a7add..9a44def856 100644 --- a/src/main/java/neqsim/physicalproperties/system/gasphysicalproperties/GasPhysicalProperties.java +++ b/src/main/java/neqsim/physicalproperties/system/gasphysicalproperties/GasPhysicalProperties.java @@ -22,7 +22,9 @@ * @version $Id: $Id */ public class GasPhysicalProperties extends PhysicalProperties { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(GasPhysicalProperties.class); /** diff --git a/src/main/java/neqsim/physicalproperties/system/gasphysicalproperties/NaturalGasPhysicalProperties.java b/src/main/java/neqsim/physicalproperties/system/gasphysicalproperties/NaturalGasPhysicalProperties.java index f6dbd388cb..ddf6322240 100644 --- a/src/main/java/neqsim/physicalproperties/system/gasphysicalproperties/NaturalGasPhysicalProperties.java +++ b/src/main/java/neqsim/physicalproperties/system/gasphysicalproperties/NaturalGasPhysicalProperties.java @@ -19,6 +19,7 @@ * @version $Id: $Id */ public class NaturalGasPhysicalProperties extends GasPhysicalProperties { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/physicalproperties/system/liquidphysicalproperties/AminePhysicalProperties.java b/src/main/java/neqsim/physicalproperties/system/liquidphysicalproperties/AminePhysicalProperties.java index b776fb8689..fa69a95111 100644 --- a/src/main/java/neqsim/physicalproperties/system/liquidphysicalproperties/AminePhysicalProperties.java +++ b/src/main/java/neqsim/physicalproperties/system/liquidphysicalproperties/AminePhysicalProperties.java @@ -21,6 +21,7 @@ * @version $Id: $Id */ public class AminePhysicalProperties extends LiquidPhysicalProperties { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/physicalproperties/system/liquidphysicalproperties/CO2waterPhysicalProperties.java b/src/main/java/neqsim/physicalproperties/system/liquidphysicalproperties/CO2waterPhysicalProperties.java index c79ecdebd5..63567892e9 100644 --- a/src/main/java/neqsim/physicalproperties/system/liquidphysicalproperties/CO2waterPhysicalProperties.java +++ b/src/main/java/neqsim/physicalproperties/system/liquidphysicalproperties/CO2waterPhysicalProperties.java @@ -18,7 +18,9 @@ * @version $Id: $Id */ public class CO2waterPhysicalProperties extends PhysicalProperties { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(CO2waterPhysicalProperties.class); /** diff --git a/src/main/java/neqsim/physicalproperties/system/liquidphysicalproperties/GlycolPhysicalProperties.java b/src/main/java/neqsim/physicalproperties/system/liquidphysicalproperties/GlycolPhysicalProperties.java index ed3e35c366..3d80f35d0f 100644 --- a/src/main/java/neqsim/physicalproperties/system/liquidphysicalproperties/GlycolPhysicalProperties.java +++ b/src/main/java/neqsim/physicalproperties/system/liquidphysicalproperties/GlycolPhysicalProperties.java @@ -21,6 +21,7 @@ * @version $Id: $Id */ public class GlycolPhysicalProperties extends LiquidPhysicalProperties { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/physicalproperties/system/liquidphysicalproperties/LiquidPhysicalProperties.java b/src/main/java/neqsim/physicalproperties/system/liquidphysicalproperties/LiquidPhysicalProperties.java index 62d749b6a1..3f4d07ef14 100644 --- a/src/main/java/neqsim/physicalproperties/system/liquidphysicalproperties/LiquidPhysicalProperties.java +++ b/src/main/java/neqsim/physicalproperties/system/liquidphysicalproperties/LiquidPhysicalProperties.java @@ -24,7 +24,9 @@ * @version $Id: $Id */ public class LiquidPhysicalProperties extends PhysicalProperties { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(LiquidPhysicalProperties.class); /** diff --git a/src/main/java/neqsim/physicalproperties/system/liquidphysicalproperties/WaterPhysicalProperties.java b/src/main/java/neqsim/physicalproperties/system/liquidphysicalproperties/WaterPhysicalProperties.java index f66c46e6f3..0d8bbee872 100644 --- a/src/main/java/neqsim/physicalproperties/system/liquidphysicalproperties/WaterPhysicalProperties.java +++ b/src/main/java/neqsim/physicalproperties/system/liquidphysicalproperties/WaterPhysicalProperties.java @@ -21,6 +21,7 @@ * @version $Id: $Id */ public class WaterPhysicalProperties extends LiquidPhysicalProperties { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/physicalproperties/system/solidphysicalproperties/SolidPhysicalProperties.java b/src/main/java/neqsim/physicalproperties/system/solidphysicalproperties/SolidPhysicalProperties.java index 7d5e5e3eca..a4bbab9f5b 100644 --- a/src/main/java/neqsim/physicalproperties/system/solidphysicalproperties/SolidPhysicalProperties.java +++ b/src/main/java/neqsim/physicalproperties/system/solidphysicalproperties/SolidPhysicalProperties.java @@ -12,6 +12,7 @@ * @version $Id: $Id */ public class SolidPhysicalProperties extends PhysicalProperties { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** 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 index 53b513eb06..e53918b24f 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 @@ -13,6 +13,7 @@ * @version $Id: $Id */ public class ParachorFunction extends LevenbergMarquardtFunction { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(ParachorFunction.class); /** 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 index 62cf8e3b47..d1fa274a05 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 @@ -21,6 +21,7 @@ * @version $Id: $Id */ public class TestParachorFit { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(TestParachorFit.class); /** 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 index bf555c1a56..55bde01e77 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 @@ -21,6 +21,7 @@ * @version $Id: $Id */ public class TestChungFit { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(TestChungFit.class); /** 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 index c1c5e445b7..c90efa222d 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 @@ -21,6 +21,7 @@ * @version $Id: $Id */ public class TestViscosityFit { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(TestViscosityFit.class); /** diff --git a/src/main/java/neqsim/process/SimulationBaseClass.java b/src/main/java/neqsim/process/SimulationBaseClass.java index 63b776867e..46f53b3ac4 100644 --- a/src/main/java/neqsim/process/SimulationBaseClass.java +++ b/src/main/java/neqsim/process/SimulationBaseClass.java @@ -11,7 +11,8 @@ * @version $Id: $Id */ public abstract class SimulationBaseClass extends NamedBaseClass implements SimulationInterface { - private static final long serialVersionUID = 1L; + /** Serialization version UID. */ + private static final long serialVersionUID = 1000; /** * Unique identifier of which solve/run call was last called successfully. diff --git a/src/main/java/neqsim/process/conditionmonitor/ConditionMonitor.java b/src/main/java/neqsim/process/conditionmonitor/ConditionMonitor.java index cfb1dd09a7..3c3fca6a5e 100644 --- a/src/main/java/neqsim/process/conditionmonitor/ConditionMonitor.java +++ b/src/main/java/neqsim/process/conditionmonitor/ConditionMonitor.java @@ -12,6 +12,7 @@ * @version $Id: $Id */ public class ConditionMonitor implements java.io.Serializable, Runnable { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; ProcessSystem refprocess = null; ProcessSystem process = null; @@ -45,12 +46,11 @@ public ConditionMonitor(ProcessSystem refprocess) { */ public void conditionAnalysis(String unitName) { neqsim.process.equipment.ProcessEquipmentBaseClass refUn = - (neqsim.process.equipment.ProcessEquipmentBaseClass) refprocess - .getUnit(unitName); - ((neqsim.process.equipment.ProcessEquipmentInterface) process - .getUnit(unitName)).runConditionAnalysis(refUn); - report += ((neqsim.process.equipment.ProcessEquipmentInterface) process - .getUnit(unitName)).getConditionAnalysisMessage(); + (neqsim.process.equipment.ProcessEquipmentBaseClass) refprocess.getUnit(unitName); + ((neqsim.process.equipment.ProcessEquipmentInterface) process.getUnit(unitName)) + .runConditionAnalysis(refUn); + report += ((neqsim.process.equipment.ProcessEquipmentInterface) process.getUnit(unitName)) + .getConditionAnalysisMessage(); } /** diff --git a/src/main/java/neqsim/process/controllerdevice/ControllerDeviceBaseClass.java b/src/main/java/neqsim/process/controllerdevice/ControllerDeviceBaseClass.java index 28f0c1c444..50459eccf6 100644 --- a/src/main/java/neqsim/process/controllerdevice/ControllerDeviceBaseClass.java +++ b/src/main/java/neqsim/process/controllerdevice/ControllerDeviceBaseClass.java @@ -21,7 +21,9 @@ * @version $Id: $Id */ public class ControllerDeviceBaseClass extends NamedBaseClass implements ControllerDeviceInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(ControllerDeviceBaseClass.class); /** diff --git a/src/main/java/neqsim/process/costestimation/CostEstimateBaseClass.java b/src/main/java/neqsim/process/costestimation/CostEstimateBaseClass.java index 7510c75e25..74aeaf5130 100644 --- a/src/main/java/neqsim/process/costestimation/CostEstimateBaseClass.java +++ b/src/main/java/neqsim/process/costestimation/CostEstimateBaseClass.java @@ -16,7 +16,9 @@ * @version $Id: $Id */ public class CostEstimateBaseClass implements java.io.Serializable { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(CostEstimateBaseClass.class); private SystemMechanicalDesign processdesign; @@ -27,8 +29,7 @@ public class CostEstimateBaseClass implements java.io.Serializable { * Constructor for CostEstimateBaseClass. *

* - * @param processdesign a {@link neqsim.process.mechanicaldesign.SystemMechanicalDesign} - * object + * @param processdesign a {@link neqsim.process.mechanicaldesign.SystemMechanicalDesign} object */ public CostEstimateBaseClass(SystemMechanicalDesign processdesign) { this.processdesign = processdesign; diff --git a/src/main/java/neqsim/process/costestimation/UnitCostEstimateBaseClass.java b/src/main/java/neqsim/process/costestimation/UnitCostEstimateBaseClass.java index c61509d51d..2569cdc11a 100644 --- a/src/main/java/neqsim/process/costestimation/UnitCostEstimateBaseClass.java +++ b/src/main/java/neqsim/process/costestimation/UnitCostEstimateBaseClass.java @@ -12,6 +12,7 @@ * @version $Id: $Id */ public class UnitCostEstimateBaseClass implements java.io.Serializable { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; private double costPerWeightUnit = 1000.0; @@ -29,8 +30,7 @@ public UnitCostEstimateBaseClass() {} * Constructor for UnitCostEstimateBaseClass. *

* - * @param mechanicalEquipment a {@link neqsim.process.mechanicaldesign.MechanicalDesign} - * object + * @param mechanicalEquipment a {@link neqsim.process.mechanicaldesign.MechanicalDesign} object */ public UnitCostEstimateBaseClass(MechanicalDesign mechanicalEquipment) { this.mechanicalEquipment = mechanicalEquipment; diff --git a/src/main/java/neqsim/process/costestimation/compressor/CompressorCostEstimate.java b/src/main/java/neqsim/process/costestimation/compressor/CompressorCostEstimate.java index b011938351..99a64a740e 100644 --- a/src/main/java/neqsim/process/costestimation/compressor/CompressorCostEstimate.java +++ b/src/main/java/neqsim/process/costestimation/compressor/CompressorCostEstimate.java @@ -12,6 +12,7 @@ * @version $Id: $Id */ public class CompressorCostEstimate extends UnitCostEstimateBaseClass { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** @@ -20,8 +21,7 @@ public class CompressorCostEstimate extends UnitCostEstimateBaseClass { *

* * @param mechanicalEquipment a - * {@link neqsim.process.mechanicaldesign.compressor.CompressorMechanicalDesign} - * object + * {@link neqsim.process.mechanicaldesign.compressor.CompressorMechanicalDesign} object */ public CompressorCostEstimate(CompressorMechanicalDesign mechanicalEquipment) { super(mechanicalEquipment); diff --git a/src/main/java/neqsim/process/costestimation/separator/SeparatorCostEstimate.java b/src/main/java/neqsim/process/costestimation/separator/SeparatorCostEstimate.java index 83027014d3..12e639fac5 100644 --- a/src/main/java/neqsim/process/costestimation/separator/SeparatorCostEstimate.java +++ b/src/main/java/neqsim/process/costestimation/separator/SeparatorCostEstimate.java @@ -12,6 +12,7 @@ * @version $Id: $Id */ public class SeparatorCostEstimate extends UnitCostEstimateBaseClass { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** @@ -20,8 +21,7 @@ public class SeparatorCostEstimate extends UnitCostEstimateBaseClass { *

* * @param mechanicalEquipment a - * {@link neqsim.process.mechanicaldesign.separator.SeparatorMechanicalDesign} - * object + * {@link neqsim.process.mechanicaldesign.separator.SeparatorMechanicalDesign} object */ public SeparatorCostEstimate(SeparatorMechanicalDesign mechanicalEquipment) { super(mechanicalEquipment); diff --git a/src/main/java/neqsim/process/costestimation/valve/ValveCostEstimate.java b/src/main/java/neqsim/process/costestimation/valve/ValveCostEstimate.java index cff037ac81..fed5f88423 100644 --- a/src/main/java/neqsim/process/costestimation/valve/ValveCostEstimate.java +++ b/src/main/java/neqsim/process/costestimation/valve/ValveCostEstimate.java @@ -12,6 +12,7 @@ * @version $Id: $Id */ public class ValveCostEstimate extends UnitCostEstimateBaseClass { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/process/equipment/ProcessEquipmentBaseClass.java b/src/main/java/neqsim/process/equipment/ProcessEquipmentBaseClass.java index 8d165ae502..f4b1edb4f8 100644 --- a/src/main/java/neqsim/process/equipment/ProcessEquipmentBaseClass.java +++ b/src/main/java/neqsim/process/equipment/ProcessEquipmentBaseClass.java @@ -29,6 +29,7 @@ */ public abstract class ProcessEquipmentBaseClass extends SimulationBaseClass implements ProcessEquipmentInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; private ControllerDeviceInterface controller = null; diff --git a/src/main/java/neqsim/process/equipment/TwoPortEquipment.java b/src/main/java/neqsim/process/equipment/TwoPortEquipment.java index 0833e753f8..fdb52c4ede 100644 --- a/src/main/java/neqsim/process/equipment/TwoPortEquipment.java +++ b/src/main/java/neqsim/process/equipment/TwoPortEquipment.java @@ -10,7 +10,8 @@ */ public abstract class TwoPortEquipment extends ProcessEquipmentBaseClass implements TwoPortInterface { - private static final long serialVersionUID = 1L; + /** Serialization version UID. */ + private static final long serialVersionUID = 1000; protected StreamInterface inStream; protected StreamInterface outStream; diff --git a/src/main/java/neqsim/process/equipment/absorber/SimpleAbsorber.java b/src/main/java/neqsim/process/equipment/absorber/SimpleAbsorber.java index 015acffd0c..7414884778 100644 --- a/src/main/java/neqsim/process/equipment/absorber/SimpleAbsorber.java +++ b/src/main/java/neqsim/process/equipment/absorber/SimpleAbsorber.java @@ -17,6 +17,7 @@ * @version $Id: $Id */ public class SimpleAbsorber extends Separator implements AbsorberInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; boolean setTemperature = false; diff --git a/src/main/java/neqsim/process/equipment/absorber/SimpleTEGAbsorber.java b/src/main/java/neqsim/process/equipment/absorber/SimpleTEGAbsorber.java index 198dbd30aa..463ab23dd8 100644 --- a/src/main/java/neqsim/process/equipment/absorber/SimpleTEGAbsorber.java +++ b/src/main/java/neqsim/process/equipment/absorber/SimpleTEGAbsorber.java @@ -27,7 +27,9 @@ * @version $Id: $Id */ public class SimpleTEGAbsorber extends SimpleAbsorber { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(SimpleTEGAbsorber.class); protected ArrayList streams = new ArrayList(0); @@ -142,8 +144,8 @@ public void mixStream() { if (mixedStream.getThermoSystem().getPhases()[0].getComponent(p).getName() .equals(componentName)) { gotComponent = true; - compName = streams.get(0).getThermoSystem().getPhases()[0].getComponent(p) - .getComponentName(); + compName = + streams.get(0).getThermoSystem().getPhases()[0].getComponent(p).getComponentName(); } } diff --git a/src/main/java/neqsim/process/equipment/absorber/WaterStripperColumn.java b/src/main/java/neqsim/process/equipment/absorber/WaterStripperColumn.java index 9d8e74bc32..507b653b92 100644 --- a/src/main/java/neqsim/process/equipment/absorber/WaterStripperColumn.java +++ b/src/main/java/neqsim/process/equipment/absorber/WaterStripperColumn.java @@ -27,7 +27,9 @@ * @version $Id: $Id */ public class WaterStripperColumn extends SimpleAbsorber { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(WaterStripperColumn.class); protected ArrayList streams = new ArrayList(0); @@ -142,8 +144,8 @@ public void mixStream() { .equals(componentName)) { gotComponent = true; - compName = streams.get(0).getThermoSystem().getPhases()[0].getComponent(p) - .getComponentName(); + compName = + streams.get(0).getThermoSystem().getPhases()[0].getComponent(p).getComponentName(); } } diff --git a/src/main/java/neqsim/process/equipment/adsorber/SimpleAdsorber.java b/src/main/java/neqsim/process/equipment/adsorber/SimpleAdsorber.java index 25c205bfad..7b46a4a71e 100644 --- a/src/main/java/neqsim/process/equipment/adsorber/SimpleAdsorber.java +++ b/src/main/java/neqsim/process/equipment/adsorber/SimpleAdsorber.java @@ -17,6 +17,7 @@ * @version $Id: $Id */ public class SimpleAdsorber extends ProcessEquipmentBaseClass { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; boolean setTemperature = false; diff --git a/src/main/java/neqsim/process/equipment/compressor/AntiSurge.java b/src/main/java/neqsim/process/equipment/compressor/AntiSurge.java index 1fe56eb596..6c97d783ae 100644 --- a/src/main/java/neqsim/process/equipment/compressor/AntiSurge.java +++ b/src/main/java/neqsim/process/equipment/compressor/AntiSurge.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class AntiSurge implements java.io.Serializable { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; private boolean isActive = false; private boolean isSurge = false; diff --git a/src/main/java/neqsim/process/equipment/compressor/Compressor.java b/src/main/java/neqsim/process/equipment/compressor/Compressor.java index 35b415ec6f..7537fa1ce5 100644 --- a/src/main/java/neqsim/process/equipment/compressor/Compressor.java +++ b/src/main/java/neqsim/process/equipment/compressor/Compressor.java @@ -32,7 +32,9 @@ * @version $Id: $Id */ public class Compressor extends TwoPortEquipment implements CompressorInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(Compressor.class); public SystemInterface thermoSystem; diff --git a/src/main/java/neqsim/process/equipment/compressor/CompressorChart.java b/src/main/java/neqsim/process/equipment/compressor/CompressorChart.java index 5c29db3cf3..a01729d994 100644 --- a/src/main/java/neqsim/process/equipment/compressor/CompressorChart.java +++ b/src/main/java/neqsim/process/equipment/compressor/CompressorChart.java @@ -18,7 +18,9 @@ * @version $Id: $Id */ public class CompressorChart implements CompressorChartInterface, java.io.Serializable { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(CompressorChart.class); ArrayList chartValues = new ArrayList(); diff --git a/src/main/java/neqsim/process/equipment/compressor/CompressorChartAlternativeMapLookup.java b/src/main/java/neqsim/process/equipment/compressor/CompressorChartAlternativeMapLookup.java index d351250984..3098fae765 100644 --- a/src/main/java/neqsim/process/equipment/compressor/CompressorChartAlternativeMapLookup.java +++ b/src/main/java/neqsim/process/equipment/compressor/CompressorChartAlternativeMapLookup.java @@ -131,7 +131,9 @@ */ public class CompressorChartAlternativeMapLookup implements CompressorChartInterface, java.io.Serializable { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(CompressorChart.class); ArrayList chartValues = new ArrayList(); diff --git a/src/main/java/neqsim/process/equipment/compressor/CompressorChartAlternativeMapLookupExtrapolate.java b/src/main/java/neqsim/process/equipment/compressor/CompressorChartAlternativeMapLookupExtrapolate.java index 634b1fd629..58271bb7b4 100644 --- a/src/main/java/neqsim/process/equipment/compressor/CompressorChartAlternativeMapLookupExtrapolate.java +++ b/src/main/java/neqsim/process/equipment/compressor/CompressorChartAlternativeMapLookupExtrapolate.java @@ -7,13 +7,17 @@ import org.apache.logging.log4j.Logger; /** - *

CompressorChartAlternativeMapLookupExtrapolate class.

+ *

+ * CompressorChartAlternativeMapLookupExtrapolate class. + *

* * @author ASMF */ public class CompressorChartAlternativeMapLookupExtrapolate extends CompressorChartAlternativeMapLookup { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(CompressorChartAlternativeMapLookupExtrapolate.class); diff --git a/src/main/java/neqsim/process/equipment/compressor/CompressorCurve.java b/src/main/java/neqsim/process/equipment/compressor/CompressorCurve.java index 9afba438cd..c18897a5c8 100644 --- a/src/main/java/neqsim/process/equipment/compressor/CompressorCurve.java +++ b/src/main/java/neqsim/process/equipment/compressor/CompressorCurve.java @@ -12,6 +12,7 @@ * @version $Id: $Id */ public class CompressorCurve implements java.io.Serializable { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; public double[] flow; public double[] flowPolytropicEfficiency; diff --git a/src/main/java/neqsim/process/equipment/compressor/CompressorPropertyProfile.java b/src/main/java/neqsim/process/equipment/compressor/CompressorPropertyProfile.java index 1b26b2c184..d413f0b2aa 100644 --- a/src/main/java/neqsim/process/equipment/compressor/CompressorPropertyProfile.java +++ b/src/main/java/neqsim/process/equipment/compressor/CompressorPropertyProfile.java @@ -13,7 +13,8 @@ * @version $Id: $Id */ public class CompressorPropertyProfile implements Serializable { - private static final long serialVersionUID = 1L; + /** Serialization version UID. */ + private static final long serialVersionUID = 1000; private ArrayList fluid = new ArrayList(); private boolean isActive = false; diff --git a/src/main/java/neqsim/process/equipment/compressor/StoneWallCurve.java b/src/main/java/neqsim/process/equipment/compressor/StoneWallCurve.java index 2d9aa760d1..250d287386 100644 --- a/src/main/java/neqsim/process/equipment/compressor/StoneWallCurve.java +++ b/src/main/java/neqsim/process/equipment/compressor/StoneWallCurve.java @@ -17,7 +17,9 @@ * @version $Id: $Id */ public class StoneWallCurve implements java.io.Serializable { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(StoneWallCurve.class); double[] flow; diff --git a/src/main/java/neqsim/process/equipment/compressor/SurgeCurve.java b/src/main/java/neqsim/process/equipment/compressor/SurgeCurve.java index e4177604be..8eabd1975b 100644 --- a/src/main/java/neqsim/process/equipment/compressor/SurgeCurve.java +++ b/src/main/java/neqsim/process/equipment/compressor/SurgeCurve.java @@ -17,7 +17,9 @@ * @version $Id: $Id */ public class SurgeCurve implements java.io.Serializable { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(SurgeCurve.class); double[] flow; diff --git a/src/main/java/neqsim/process/equipment/distillation/Condenser.java b/src/main/java/neqsim/process/equipment/distillation/Condenser.java index 3e070b23f0..924b59c68d 100644 --- a/src/main/java/neqsim/process/equipment/distillation/Condenser.java +++ b/src/main/java/neqsim/process/equipment/distillation/Condenser.java @@ -16,6 +16,7 @@ * @version $Id: $Id */ public class Condenser extends SimpleTray { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; private double refluxRatio = 0.1; diff --git a/src/main/java/neqsim/process/equipment/distillation/DistillationColumn.java b/src/main/java/neqsim/process/equipment/distillation/DistillationColumn.java index fe14b76522..0a61b26f73 100644 --- a/src/main/java/neqsim/process/equipment/distillation/DistillationColumn.java +++ b/src/main/java/neqsim/process/equipment/distillation/DistillationColumn.java @@ -23,7 +23,9 @@ * @version $Id: $Id */ public class DistillationColumn extends ProcessEquipmentBaseClass implements DistillationInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(DistillationColumn.class); private boolean doInitializion = true; diff --git a/src/main/java/neqsim/process/equipment/distillation/Reboiler.java b/src/main/java/neqsim/process/equipment/distillation/Reboiler.java index 3150f7f9c8..a54d77b693 100644 --- a/src/main/java/neqsim/process/equipment/distillation/Reboiler.java +++ b/src/main/java/neqsim/process/equipment/distillation/Reboiler.java @@ -13,6 +13,7 @@ * @version $Id: $Id */ public class Reboiler extends neqsim.process.equipment.distillation.SimpleTray { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; private double refluxRatio = 0.1; diff --git a/src/main/java/neqsim/process/equipment/distillation/SimpleTray.java b/src/main/java/neqsim/process/equipment/distillation/SimpleTray.java index caecd5676a..3b51fe7441 100644 --- a/src/main/java/neqsim/process/equipment/distillation/SimpleTray.java +++ b/src/main/java/neqsim/process/equipment/distillation/SimpleTray.java @@ -17,7 +17,9 @@ * @version $Id: $Id */ public class SimpleTray extends neqsim.process.equipment.mixer.Mixer implements TrayInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(SimpleTray.class); double heatInput = 0.0; diff --git a/src/main/java/neqsim/process/equipment/distillation/VLSolidTray.java b/src/main/java/neqsim/process/equipment/distillation/VLSolidTray.java index 33e88f69a6..197abeb1c2 100644 --- a/src/main/java/neqsim/process/equipment/distillation/VLSolidTray.java +++ b/src/main/java/neqsim/process/equipment/distillation/VLSolidTray.java @@ -15,6 +15,7 @@ * @version $Id: $Id */ public class VLSolidTray extends SimpleTray { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; double heatInput = 0.0; diff --git a/src/main/java/neqsim/process/equipment/expander/Expander.java b/src/main/java/neqsim/process/equipment/expander/Expander.java index e740044de8..05f314c32c 100644 --- a/src/main/java/neqsim/process/equipment/expander/Expander.java +++ b/src/main/java/neqsim/process/equipment/expander/Expander.java @@ -14,6 +14,7 @@ * @version $Id: $Id */ public class Expander extends Compressor implements ExpanderInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/process/equipment/expander/ExpanderOld.java b/src/main/java/neqsim/process/equipment/expander/ExpanderOld.java index 89905e79eb..b72c7331c7 100644 --- a/src/main/java/neqsim/process/equipment/expander/ExpanderOld.java +++ b/src/main/java/neqsim/process/equipment/expander/ExpanderOld.java @@ -24,6 +24,7 @@ * @version $Id: $Id */ public class ExpanderOld extends TwoPortEquipment implements ExpanderInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; SystemInterface thermoSystem; diff --git a/src/main/java/neqsim/process/equipment/filter/CharCoalFilter.java b/src/main/java/neqsim/process/equipment/filter/CharCoalFilter.java index f46c64aa3e..cf055bd6af 100644 --- a/src/main/java/neqsim/process/equipment/filter/CharCoalFilter.java +++ b/src/main/java/neqsim/process/equipment/filter/CharCoalFilter.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class CharCoalFilter extends Filter { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/process/equipment/filter/Filter.java b/src/main/java/neqsim/process/equipment/filter/Filter.java index de54dc2089..b7e7d50832 100644 --- a/src/main/java/neqsim/process/equipment/filter/Filter.java +++ b/src/main/java/neqsim/process/equipment/filter/Filter.java @@ -16,6 +16,7 @@ * @version $Id: $Id */ public class Filter extends TwoPortEquipment { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; private double deltaP = 0.01; @@ -27,8 +28,7 @@ public class Filter extends TwoPortEquipment { *

* * @param name name of filter - * @param inStream a {@link neqsim.process.equipment.stream.StreamInterface} - * object + * @param inStream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public Filter(String name, StreamInterface inStream) { super(name, inStream); diff --git a/src/main/java/neqsim/process/equipment/heatexchanger/Cooler.java b/src/main/java/neqsim/process/equipment/heatexchanger/Cooler.java index 926e30da14..93d97825f2 100644 --- a/src/main/java/neqsim/process/equipment/heatexchanger/Cooler.java +++ b/src/main/java/neqsim/process/equipment/heatexchanger/Cooler.java @@ -14,6 +14,7 @@ * @version $Id: $Id */ public class Cooler extends Heater { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** @@ -31,8 +32,7 @@ public Cooler(String name) { *

* * @param name a {@link java.lang.String} object - * @param inStream a {@link neqsim.process.equipment.stream.StreamInterface} - * object + * @param inStream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public Cooler(String name, StreamInterface inStream) { super(name, inStream); diff --git a/src/main/java/neqsim/process/equipment/heatexchanger/HeatExchanger.java b/src/main/java/neqsim/process/equipment/heatexchanger/HeatExchanger.java index 6bd0867c60..9750ddd64f 100644 --- a/src/main/java/neqsim/process/equipment/heatexchanger/HeatExchanger.java +++ b/src/main/java/neqsim/process/equipment/heatexchanger/HeatExchanger.java @@ -26,6 +26,7 @@ * @version $Id: $Id */ public class HeatExchanger extends Heater implements HeatExchangerInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; boolean setTemperature = false; diff --git a/src/main/java/neqsim/process/equipment/heatexchanger/Heater.java b/src/main/java/neqsim/process/equipment/heatexchanger/Heater.java index 636004026d..54dfe627b5 100644 --- a/src/main/java/neqsim/process/equipment/heatexchanger/Heater.java +++ b/src/main/java/neqsim/process/equipment/heatexchanger/Heater.java @@ -25,6 +25,7 @@ * @version $Id: $Id */ public class Heater extends TwoPortEquipment implements HeaterInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; boolean setTemperature = false, setOutPressure = false; diff --git a/src/main/java/neqsim/process/equipment/heatexchanger/MultiStreamHeatExchanger.java b/src/main/java/neqsim/process/equipment/heatexchanger/MultiStreamHeatExchanger.java index e20b71c385..86925ba2c8 100644 --- a/src/main/java/neqsim/process/equipment/heatexchanger/MultiStreamHeatExchanger.java +++ b/src/main/java/neqsim/process/equipment/heatexchanger/MultiStreamHeatExchanger.java @@ -31,6 +31,7 @@ */ public class MultiStreamHeatExchanger extends Heater implements MultiStreamHeatExchangerInterface { private static final long serialVersionUID = 1001; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(MultiStreamHeatExchanger.class); private boolean setTemperature = false; diff --git a/src/main/java/neqsim/process/equipment/heatexchanger/NeqHeater.java b/src/main/java/neqsim/process/equipment/heatexchanger/NeqHeater.java index 0206da2217..53e76c980e 100644 --- a/src/main/java/neqsim/process/equipment/heatexchanger/NeqHeater.java +++ b/src/main/java/neqsim/process/equipment/heatexchanger/NeqHeater.java @@ -14,6 +14,7 @@ * @version $Id: $Id */ public class NeqHeater extends Heater { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; SystemInterface system; diff --git a/src/main/java/neqsim/process/equipment/heatexchanger/ReBoiler.java b/src/main/java/neqsim/process/equipment/heatexchanger/ReBoiler.java index 6e08e5207d..ccc8bac958 100644 --- a/src/main/java/neqsim/process/equipment/heatexchanger/ReBoiler.java +++ b/src/main/java/neqsim/process/equipment/heatexchanger/ReBoiler.java @@ -16,6 +16,7 @@ * @version $Id: $Id */ public class ReBoiler extends TwoPortEquipment { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; boolean setTemperature = false; diff --git a/src/main/java/neqsim/process/equipment/manifold/Manifold.java b/src/main/java/neqsim/process/equipment/manifold/Manifold.java index 708d8df05a..4fb0396da0 100644 --- a/src/main/java/neqsim/process/equipment/manifold/Manifold.java +++ b/src/main/java/neqsim/process/equipment/manifold/Manifold.java @@ -19,7 +19,9 @@ * @version $Id: $Id */ public class Manifold extends ProcessEquipmentBaseClass { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(Manifold.class); protected Mixer localmixer = new Mixer("tmpName"); @@ -44,8 +46,7 @@ public Manifold(String name) { * addStream. *

* - * @param newStream a {@link neqsim.process.equipment.stream.StreamInterface} - * object + * @param newStream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public void addStream(StreamInterface newStream) { localmixer.addStream(newStream); diff --git a/src/main/java/neqsim/process/equipment/mixer/Mixer.java b/src/main/java/neqsim/process/equipment/mixer/Mixer.java index fb2fdc56d3..065f1fd7ca 100644 --- a/src/main/java/neqsim/process/equipment/mixer/Mixer.java +++ b/src/main/java/neqsim/process/equipment/mixer/Mixer.java @@ -28,7 +28,9 @@ * @version $Id: $Id */ public class Mixer extends ProcessEquipmentBaseClass implements MixerInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(Mixer.class); protected ArrayList streams = new ArrayList(0); diff --git a/src/main/java/neqsim/process/equipment/mixer/StaticMixer.java b/src/main/java/neqsim/process/equipment/mixer/StaticMixer.java index 912eecd3eb..6080d87b5d 100644 --- a/src/main/java/neqsim/process/equipment/mixer/StaticMixer.java +++ b/src/main/java/neqsim/process/equipment/mixer/StaticMixer.java @@ -18,6 +18,7 @@ * @version $Id: $Id */ public class StaticMixer extends Mixer { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** @@ -54,8 +55,8 @@ public void mixStream() { gotComponent = true; index = streams.get(0).getThermoSystem().getPhases()[0].getComponent(p) .getComponentNumber(); - compName = streams.get(0).getThermoSystem().getPhases()[0].getComponent(p) - .getComponentName(); + compName = + streams.get(0).getThermoSystem().getPhases()[0].getComponent(p).getComponentName(); } } diff --git a/src/main/java/neqsim/process/equipment/mixer/StaticNeqMixer.java b/src/main/java/neqsim/process/equipment/mixer/StaticNeqMixer.java index ff5c18a77e..c995828fa1 100644 --- a/src/main/java/neqsim/process/equipment/mixer/StaticNeqMixer.java +++ b/src/main/java/neqsim/process/equipment/mixer/StaticNeqMixer.java @@ -19,6 +19,7 @@ * @version $Id: $Id */ public class StaticNeqMixer extends StaticMixer { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** @@ -60,8 +61,8 @@ public void mixStream() { gotComponent = true; index = streams.get(0).getThermoSystem().getPhases()[0].getComponent(p) .getComponentNumber(); - compName = streams.get(0).getThermoSystem().getPhases()[0].getComponent(p) - .getComponentName(); + compName = + streams.get(0).getThermoSystem().getPhases()[0].getComponent(p).getComponentName(); } } diff --git a/src/main/java/neqsim/process/equipment/mixer/StaticPhaseMixer.java b/src/main/java/neqsim/process/equipment/mixer/StaticPhaseMixer.java index ec1fa64769..3d86ee8fbe 100644 --- a/src/main/java/neqsim/process/equipment/mixer/StaticPhaseMixer.java +++ b/src/main/java/neqsim/process/equipment/mixer/StaticPhaseMixer.java @@ -12,6 +12,7 @@ * @version $Id: $Id */ public class StaticPhaseMixer extends StaticMixer { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** @@ -62,8 +63,8 @@ public void mixStream() { gotComponent = true; index = streams.get(0).getThermoSystem().getPhases()[0].getComponent(p) .getComponentNumber(); - compName = streams.get(0).getThermoSystem().getPhases()[0].getComponent(p) - .getComponentName(); + compName = + streams.get(0).getThermoSystem().getPhases()[0].getComponent(p).getComponentName(); } } diff --git a/src/main/java/neqsim/process/equipment/pipeline/AdiabaticPipe.java b/src/main/java/neqsim/process/equipment/pipeline/AdiabaticPipe.java index 92670db884..c74a326bfb 100644 --- a/src/main/java/neqsim/process/equipment/pipeline/AdiabaticPipe.java +++ b/src/main/java/neqsim/process/equipment/pipeline/AdiabaticPipe.java @@ -16,6 +16,7 @@ * @version $Id: $Id */ public class AdiabaticPipe extends Pipeline { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; double inletPressure = 0; diff --git a/src/main/java/neqsim/process/equipment/pipeline/AdiabaticTwoPhasePipe.java b/src/main/java/neqsim/process/equipment/pipeline/AdiabaticTwoPhasePipe.java index 629a80a610..9aa216906d 100644 --- a/src/main/java/neqsim/process/equipment/pipeline/AdiabaticTwoPhasePipe.java +++ b/src/main/java/neqsim/process/equipment/pipeline/AdiabaticTwoPhasePipe.java @@ -16,6 +16,7 @@ * @version $Id: $Id */ public class AdiabaticTwoPhasePipe extends Pipeline { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; double inletPressure = 0; diff --git a/src/main/java/neqsim/process/equipment/pipeline/Fittings.java b/src/main/java/neqsim/process/equipment/pipeline/Fittings.java index 6259727add..c92e502064 100644 --- a/src/main/java/neqsim/process/equipment/pipeline/Fittings.java +++ b/src/main/java/neqsim/process/equipment/pipeline/Fittings.java @@ -14,7 +14,9 @@ * @version $Id: $Id */ public class Fittings implements Serializable { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(Fittings.class); ArrayList fittingList = new ArrayList(); @@ -64,6 +66,7 @@ public ArrayList getFittingsList() { * Constructor for Fitting. */ public class Fitting implements Serializable { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; private String fittingName = ""; diff --git a/src/main/java/neqsim/process/equipment/pipeline/IncompressiblePipeFlow.java b/src/main/java/neqsim/process/equipment/pipeline/IncompressiblePipeFlow.java index 3c5fa68c10..a88693a677 100644 --- a/src/main/java/neqsim/process/equipment/pipeline/IncompressiblePipeFlow.java +++ b/src/main/java/neqsim/process/equipment/pipeline/IncompressiblePipeFlow.java @@ -15,6 +15,7 @@ * @version $Id: $Id */ public class IncompressiblePipeFlow extends AdiabaticPipe { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; Fittings fittings = new Fittings(); diff --git a/src/main/java/neqsim/process/equipment/pipeline/OnePhasePipeLine.java b/src/main/java/neqsim/process/equipment/pipeline/OnePhasePipeLine.java index 332670da2a..b1cb02e0a1 100644 --- a/src/main/java/neqsim/process/equipment/pipeline/OnePhasePipeLine.java +++ b/src/main/java/neqsim/process/equipment/pipeline/OnePhasePipeLine.java @@ -19,6 +19,7 @@ * @version $Id: $Id */ public class OnePhasePipeLine extends Pipeline { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/process/equipment/pipeline/Pipeline.java b/src/main/java/neqsim/process/equipment/pipeline/Pipeline.java index 674af46d41..8a45597309 100644 --- a/src/main/java/neqsim/process/equipment/pipeline/Pipeline.java +++ b/src/main/java/neqsim/process/equipment/pipeline/Pipeline.java @@ -26,7 +26,9 @@ * @version $Id: $Id */ public class Pipeline extends TwoPortEquipment implements PipeLineInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(Pipeline.class); protected String fileName = "c:/test5.nc"; diff --git a/src/main/java/neqsim/process/equipment/pipeline/SimpleTPoutPipeline.java b/src/main/java/neqsim/process/equipment/pipeline/SimpleTPoutPipeline.java index cd204db954..6b3a4f3469 100644 --- a/src/main/java/neqsim/process/equipment/pipeline/SimpleTPoutPipeline.java +++ b/src/main/java/neqsim/process/equipment/pipeline/SimpleTPoutPipeline.java @@ -15,6 +15,7 @@ * @version $Id: $Id */ public class SimpleTPoutPipeline extends Pipeline { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; boolean setTemperature = false; diff --git a/src/main/java/neqsim/process/equipment/pipeline/TwoPhasePipeLine.java b/src/main/java/neqsim/process/equipment/pipeline/TwoPhasePipeLine.java index 468b8cd180..8cacd2c7a6 100644 --- a/src/main/java/neqsim/process/equipment/pipeline/TwoPhasePipeLine.java +++ b/src/main/java/neqsim/process/equipment/pipeline/TwoPhasePipeLine.java @@ -19,6 +19,7 @@ * @version $Id: $Id */ public class TwoPhasePipeLine extends Pipeline { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/process/equipment/powergeneration/GasTurbine.java b/src/main/java/neqsim/process/equipment/powergeneration/GasTurbine.java index 5087229ad6..3e6a86cd5b 100644 --- a/src/main/java/neqsim/process/equipment/powergeneration/GasTurbine.java +++ b/src/main/java/neqsim/process/equipment/powergeneration/GasTurbine.java @@ -23,7 +23,9 @@ * @version $Id: $Id */ public class GasTurbine extends TwoPortEquipment { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(Compressor.class); public SystemInterface thermoSystem; @@ -71,8 +73,7 @@ public GasTurbine(String name) { *

* * @param name a {@link java.lang.String} object - * @param inletStream a {@link neqsim.process.equipment.stream.StreamInterface} - * object + * @param inletStream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public GasTurbine(String name, StreamInterface inletStream) { super(name, inletStream); diff --git a/src/main/java/neqsim/process/equipment/pump/Pump.java b/src/main/java/neqsim/process/equipment/pump/Pump.java index 43568fab0e..67665988c5 100644 --- a/src/main/java/neqsim/process/equipment/pump/Pump.java +++ b/src/main/java/neqsim/process/equipment/pump/Pump.java @@ -27,6 +27,7 @@ * @version $Id: $Id */ public class Pump extends TwoPortEquipment implements PumpInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; SystemInterface thermoSystem; diff --git a/src/main/java/neqsim/process/equipment/pump/PumpChart.java b/src/main/java/neqsim/process/equipment/pump/PumpChart.java index 4a5614a27a..c1265e4765 100644 --- a/src/main/java/neqsim/process/equipment/pump/PumpChart.java +++ b/src/main/java/neqsim/process/equipment/pump/PumpChart.java @@ -21,7 +21,9 @@ * @version $Id: $Id */ public class PumpChart implements PumpChartInterface, java.io.Serializable { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(PumpChart.class); ArrayList chartValues = new ArrayList(); diff --git a/src/main/java/neqsim/process/equipment/pump/PumpCurve.java b/src/main/java/neqsim/process/equipment/pump/PumpCurve.java index 8a5c875793..ed9d89046c 100644 --- a/src/main/java/neqsim/process/equipment/pump/PumpCurve.java +++ b/src/main/java/neqsim/process/equipment/pump/PumpCurve.java @@ -9,6 +9,7 @@ * @version $Id: $Id */ public class PumpCurve implements java.io.Serializable { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; public double[] flow; public double[] head; diff --git a/src/main/java/neqsim/process/equipment/reservoir/ReservoirCVDsim.java b/src/main/java/neqsim/process/equipment/reservoir/ReservoirCVDsim.java index 6d21c84278..bfc8feb596 100644 --- a/src/main/java/neqsim/process/equipment/reservoir/ReservoirCVDsim.java +++ b/src/main/java/neqsim/process/equipment/reservoir/ReservoirCVDsim.java @@ -13,6 +13,7 @@ * @version $Id: ReservoirCVDsim.java 1234 2024-05-31 10:00:00Z esolbraa $ */ public class ReservoirCVDsim extends ProcessEquipmentBaseClass { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/process/equipment/reservoir/ReservoirDiffLibsim.java b/src/main/java/neqsim/process/equipment/reservoir/ReservoirDiffLibsim.java index c209156b11..d39dd2cd19 100644 --- a/src/main/java/neqsim/process/equipment/reservoir/ReservoirDiffLibsim.java +++ b/src/main/java/neqsim/process/equipment/reservoir/ReservoirDiffLibsim.java @@ -13,6 +13,7 @@ * @version $Id: ReservoirDiffLibsim.java 1234 2024-05-31 10:00:00Z esolbraa $ */ public class ReservoirDiffLibsim extends ProcessEquipmentBaseClass { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/process/equipment/reservoir/ReservoirTPsim.java b/src/main/java/neqsim/process/equipment/reservoir/ReservoirTPsim.java index 7bda53cdb0..eb2cafc727 100644 --- a/src/main/java/neqsim/process/equipment/reservoir/ReservoirTPsim.java +++ b/src/main/java/neqsim/process/equipment/reservoir/ReservoirTPsim.java @@ -16,6 +16,7 @@ * @version $Id: ReservoirTPsim.java 1234 2024-05-31 10:00:00Z esolbraa $ */ public class ReservoirTPsim extends ProcessEquipmentBaseClass { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; private SystemInterface reservoirFluid = null; diff --git a/src/main/java/neqsim/process/equipment/reservoir/SimpleReservoir.java b/src/main/java/neqsim/process/equipment/reservoir/SimpleReservoir.java index 6fbd9ad218..af0b364f6f 100644 --- a/src/main/java/neqsim/process/equipment/reservoir/SimpleReservoir.java +++ b/src/main/java/neqsim/process/equipment/reservoir/SimpleReservoir.java @@ -27,6 +27,7 @@ * @version $Id: $Id */ public class SimpleReservoir extends ProcessEquipmentBaseClass { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; SystemInterface thermoSystem; diff --git a/src/main/java/neqsim/process/equipment/reservoir/Well.java b/src/main/java/neqsim/process/equipment/reservoir/Well.java index fefe1140a7..31566477a2 100644 --- a/src/main/java/neqsim/process/equipment/reservoir/Well.java +++ b/src/main/java/neqsim/process/equipment/reservoir/Well.java @@ -15,6 +15,7 @@ * @version $Id: $Id */ public class Well extends NamedBaseClass { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; private StreamInterface stream = null; diff --git a/src/main/java/neqsim/process/equipment/reservoir/WellFlow.java b/src/main/java/neqsim/process/equipment/reservoir/WellFlow.java index c632f4434b..8c555e95ef 100644 --- a/src/main/java/neqsim/process/equipment/reservoir/WellFlow.java +++ b/src/main/java/neqsim/process/equipment/reservoir/WellFlow.java @@ -16,7 +16,9 @@ * @version $Id: $Id */ public class WellFlow extends TwoPortEquipment { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(ThrottlingValve.class); SystemInterface thermoSystem; private double wellProductionIndex = 0; diff --git a/src/main/java/neqsim/process/equipment/separator/GasScrubber.java b/src/main/java/neqsim/process/equipment/separator/GasScrubber.java index cec0d9bafe..105cfb1928 100644 --- a/src/main/java/neqsim/process/equipment/separator/GasScrubber.java +++ b/src/main/java/neqsim/process/equipment/separator/GasScrubber.java @@ -18,6 +18,7 @@ * @version $Id: $Id */ public class GasScrubber extends Separator { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/process/equipment/separator/GasScrubberSimple.java b/src/main/java/neqsim/process/equipment/separator/GasScrubberSimple.java index 1a35854475..a6066682a2 100644 --- a/src/main/java/neqsim/process/equipment/separator/GasScrubberSimple.java +++ b/src/main/java/neqsim/process/equipment/separator/GasScrubberSimple.java @@ -22,6 +22,7 @@ * @version $Id: $Id */ public class GasScrubberSimple extends Separator { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; SystemInterface gasSystem; diff --git a/src/main/java/neqsim/process/equipment/separator/Hydrocyclone.java b/src/main/java/neqsim/process/equipment/separator/Hydrocyclone.java index 357ee7201f..fdb5e6d795 100644 --- a/src/main/java/neqsim/process/equipment/separator/Hydrocyclone.java +++ b/src/main/java/neqsim/process/equipment/separator/Hydrocyclone.java @@ -15,6 +15,7 @@ * @version $Id: $Id */ public class Hydrocyclone extends Separator { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; double PDR = 1.4; diff --git a/src/main/java/neqsim/process/equipment/separator/NeqGasScrubber.java b/src/main/java/neqsim/process/equipment/separator/NeqGasScrubber.java index 0a63d3a72d..7f58a003a6 100644 --- a/src/main/java/neqsim/process/equipment/separator/NeqGasScrubber.java +++ b/src/main/java/neqsim/process/equipment/separator/NeqGasScrubber.java @@ -18,6 +18,7 @@ * @version $Id: $Id */ public class NeqGasScrubber extends Separator { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; SystemInterface thermoSystem; diff --git a/src/main/java/neqsim/process/equipment/separator/Separator.java b/src/main/java/neqsim/process/equipment/separator/Separator.java index 570ad97d45..8cff5c8b6b 100644 --- a/src/main/java/neqsim/process/equipment/separator/Separator.java +++ b/src/main/java/neqsim/process/equipment/separator/Separator.java @@ -37,7 +37,9 @@ * @version $Id: $Id */ public class Separator extends ProcessEquipmentBaseClass implements SeparatorInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(Separator.class); SystemInterface thermoSystem; diff --git a/src/main/java/neqsim/process/equipment/separator/ThreePhaseSeparator.java b/src/main/java/neqsim/process/equipment/separator/ThreePhaseSeparator.java index f10c383584..21e287c281 100644 --- a/src/main/java/neqsim/process/equipment/separator/ThreePhaseSeparator.java +++ b/src/main/java/neqsim/process/equipment/separator/ThreePhaseSeparator.java @@ -17,6 +17,7 @@ * @version $Id: $Id */ public class ThreePhaseSeparator extends Separator { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; StreamInterface waterOutStream = new Stream("waterOutStream", waterSystem); diff --git a/src/main/java/neqsim/process/equipment/separator/TwoPhaseSeparator.java b/src/main/java/neqsim/process/equipment/separator/TwoPhaseSeparator.java index d3c53f3113..58dae0ee1b 100644 --- a/src/main/java/neqsim/process/equipment/separator/TwoPhaseSeparator.java +++ b/src/main/java/neqsim/process/equipment/separator/TwoPhaseSeparator.java @@ -15,6 +15,7 @@ * @version $Id: $Id */ public class TwoPhaseSeparator extends Separator { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; SystemInterface thermoSystem; diff --git a/src/main/java/neqsim/process/equipment/separator/sectiontype/ManwaySection.java b/src/main/java/neqsim/process/equipment/separator/sectiontype/ManwaySection.java index e774b780d3..d8887c2fb8 100644 --- a/src/main/java/neqsim/process/equipment/separator/sectiontype/ManwaySection.java +++ b/src/main/java/neqsim/process/equipment/separator/sectiontype/ManwaySection.java @@ -12,6 +12,7 @@ * @version $Id: $Id */ public class ManwaySection extends SeparatorSection { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** @@ -21,9 +22,7 @@ public class ManwaySection extends SeparatorSection { * * @param name a {@link java.lang.String} object * @param type a {@link java.lang.String} object - * @param sep a - * {@link neqsim.process.equipment.separator.Separator} - * object + * @param sep a {@link neqsim.process.equipment.separator.Separator} object */ public ManwaySection(String name, String type, Separator sep) { super(name, type, sep); diff --git a/src/main/java/neqsim/process/equipment/separator/sectiontype/MeshSection.java b/src/main/java/neqsim/process/equipment/separator/sectiontype/MeshSection.java index ec12d0dca7..ea66d07b54 100644 --- a/src/main/java/neqsim/process/equipment/separator/sectiontype/MeshSection.java +++ b/src/main/java/neqsim/process/equipment/separator/sectiontype/MeshSection.java @@ -12,6 +12,7 @@ * @version $Id: $Id */ public class MeshSection extends SeparatorSection { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** @@ -21,9 +22,7 @@ public class MeshSection extends SeparatorSection { * * @param name a {@link java.lang.String} object * @param type a {@link java.lang.String} object - * @param sep a - * {@link neqsim.process.equipment.separator.Separator} - * object + * @param sep a {@link neqsim.process.equipment.separator.Separator} object */ public MeshSection(String name, String type, Separator sep) { super(name, type, sep); diff --git a/src/main/java/neqsim/process/equipment/separator/sectiontype/NozzleSection.java b/src/main/java/neqsim/process/equipment/separator/sectiontype/NozzleSection.java index fce3828271..a9a6a4ea9e 100644 --- a/src/main/java/neqsim/process/equipment/separator/sectiontype/NozzleSection.java +++ b/src/main/java/neqsim/process/equipment/separator/sectiontype/NozzleSection.java @@ -12,6 +12,7 @@ * @version $Id: $Id */ public class NozzleSection extends SeparatorSection { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** @@ -21,9 +22,7 @@ public class NozzleSection extends SeparatorSection { * * @param name a {@link java.lang.String} object * @param type a {@link java.lang.String} object - * @param sep a - * {@link neqsim.process.equipment.separator.Separator} - * object + * @param sep a {@link neqsim.process.equipment.separator.Separator} object */ public NozzleSection(String name, String type, Separator sep) { super(name, type, sep); diff --git a/src/main/java/neqsim/process/equipment/separator/sectiontype/PackedSection.java b/src/main/java/neqsim/process/equipment/separator/sectiontype/PackedSection.java index 4ae30d94d6..ce7c8da5c8 100644 --- a/src/main/java/neqsim/process/equipment/separator/sectiontype/PackedSection.java +++ b/src/main/java/neqsim/process/equipment/separator/sectiontype/PackedSection.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class PackedSection extends SeparatorSection { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** @@ -20,9 +21,7 @@ public class PackedSection extends SeparatorSection { * * @param name a {@link java.lang.String} object * @param type a {@link java.lang.String} object - * @param sep a - * {@link neqsim.process.equipment.separator.Separator} - * object + * @param sep a {@link neqsim.process.equipment.separator.Separator} object */ public PackedSection(String name, String type, Separator sep) { super(name, type, sep); diff --git a/src/main/java/neqsim/process/equipment/separator/sectiontype/SeparatorSection.java b/src/main/java/neqsim/process/equipment/separator/sectiontype/SeparatorSection.java index 95b05746d8..4ffa60c54d 100644 --- a/src/main/java/neqsim/process/equipment/separator/sectiontype/SeparatorSection.java +++ b/src/main/java/neqsim/process/equipment/separator/sectiontype/SeparatorSection.java @@ -13,6 +13,7 @@ * @version $Id: $Id */ public class SeparatorSection extends NamedBaseClass { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; private double efficiency = 0.95; @@ -29,9 +30,7 @@ public class SeparatorSection extends NamedBaseClass { * * @param name a {@link java.lang.String} object * @param type a {@link java.lang.String} object - * @param sep a - * {@link neqsim.process.equipment.separator.Separator} - * object + * @param sep a {@link neqsim.process.equipment.separator.Separator} object */ public SeparatorSection(String name, String type, Separator sep) { super(name); diff --git a/src/main/java/neqsim/process/equipment/separator/sectiontype/ValveSection.java b/src/main/java/neqsim/process/equipment/separator/sectiontype/ValveSection.java index 14f6840010..c7450a2757 100644 --- a/src/main/java/neqsim/process/equipment/separator/sectiontype/ValveSection.java +++ b/src/main/java/neqsim/process/equipment/separator/sectiontype/ValveSection.java @@ -12,6 +12,7 @@ * @version $Id: $Id */ public class ValveSection extends SeparatorSection { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/process/equipment/separator/sectiontype/VaneSection.java b/src/main/java/neqsim/process/equipment/separator/sectiontype/VaneSection.java index f7816204e1..dd0f75e906 100644 --- a/src/main/java/neqsim/process/equipment/separator/sectiontype/VaneSection.java +++ b/src/main/java/neqsim/process/equipment/separator/sectiontype/VaneSection.java @@ -12,6 +12,7 @@ * @version $Id: $Id */ public class VaneSection extends SeparatorSection { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** @@ -21,9 +22,7 @@ public class VaneSection extends SeparatorSection { * * @param name a {@link java.lang.String} object * @param type a {@link java.lang.String} object - * @param sep a - * {@link neqsim.process.equipment.separator.Separator} - * object + * @param sep a {@link neqsim.process.equipment.separator.Separator} object */ public VaneSection(String name, String type, Separator sep) { super(name, type, sep); diff --git a/src/main/java/neqsim/process/equipment/splitter/ComponentSplitter.java b/src/main/java/neqsim/process/equipment/splitter/ComponentSplitter.java index d6ea9c05c3..0124b64977 100644 --- a/src/main/java/neqsim/process/equipment/splitter/ComponentSplitter.java +++ b/src/main/java/neqsim/process/equipment/splitter/ComponentSplitter.java @@ -19,7 +19,9 @@ * @version $Id: $Id */ public class ComponentSplitter extends ProcessEquipmentBaseClass { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(ComponentSplitter.class); SystemInterface thermoSystem; diff --git a/src/main/java/neqsim/process/equipment/splitter/Splitter.java b/src/main/java/neqsim/process/equipment/splitter/Splitter.java index ea0cde7655..31c6c2dd25 100644 --- a/src/main/java/neqsim/process/equipment/splitter/Splitter.java +++ b/src/main/java/neqsim/process/equipment/splitter/Splitter.java @@ -21,7 +21,9 @@ * @version $Id: $Id */ public class Splitter extends ProcessEquipmentBaseClass implements SplitterInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(Splitter.class); SystemInterface thermoSystem; diff --git a/src/main/java/neqsim/process/equipment/stream/EnergyStream.java b/src/main/java/neqsim/process/equipment/stream/EnergyStream.java index 45a3f94dd0..d1ee25028c 100644 --- a/src/main/java/neqsim/process/equipment/stream/EnergyStream.java +++ b/src/main/java/neqsim/process/equipment/stream/EnergyStream.java @@ -13,7 +13,9 @@ * @version $Id: $Id */ public class EnergyStream implements java.io.Serializable, Cloneable { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(EnergyStream.class); private String name = ""; diff --git a/src/main/java/neqsim/process/equipment/stream/EquilibriumStream.java b/src/main/java/neqsim/process/equipment/stream/EquilibriumStream.java index 06e164ed3f..ca8089204a 100644 --- a/src/main/java/neqsim/process/equipment/stream/EquilibriumStream.java +++ b/src/main/java/neqsim/process/equipment/stream/EquilibriumStream.java @@ -16,7 +16,9 @@ * @version $Id: $Id */ public class EquilibriumStream extends Stream { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(EquilibriumStream.class); /** diff --git a/src/main/java/neqsim/process/equipment/stream/IronIonSaturationStream.java b/src/main/java/neqsim/process/equipment/stream/IronIonSaturationStream.java index 3be79032ec..411de38f02 100644 --- a/src/main/java/neqsim/process/equipment/stream/IronIonSaturationStream.java +++ b/src/main/java/neqsim/process/equipment/stream/IronIonSaturationStream.java @@ -23,7 +23,9 @@ * @version $Id: $Id */ public class IronIonSaturationStream extends Stream { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(IronIonSaturationStream.class); protected SystemInterface reactiveThermoSystem; diff --git a/src/main/java/neqsim/process/equipment/stream/NeqStream.java b/src/main/java/neqsim/process/equipment/stream/NeqStream.java index 59a7d859dc..fc1ee7f416 100644 --- a/src/main/java/neqsim/process/equipment/stream/NeqStream.java +++ b/src/main/java/neqsim/process/equipment/stream/NeqStream.java @@ -15,7 +15,9 @@ * @version $Id: $Id */ public class NeqStream extends Stream { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(NeqStream.class); /** diff --git a/src/main/java/neqsim/process/equipment/stream/ScalePotentialCheckStream.java b/src/main/java/neqsim/process/equipment/stream/ScalePotentialCheckStream.java index 0a52435a26..3cce0bbea5 100644 --- a/src/main/java/neqsim/process/equipment/stream/ScalePotentialCheckStream.java +++ b/src/main/java/neqsim/process/equipment/stream/ScalePotentialCheckStream.java @@ -17,7 +17,9 @@ * @version $Id: $Id */ public class ScalePotentialCheckStream extends Stream { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(ScalePotentialCheckStream.class); protected SystemInterface reactiveThermoSystem; diff --git a/src/main/java/neqsim/process/equipment/stream/Stream.java b/src/main/java/neqsim/process/equipment/stream/Stream.java index 8fac2ea9af..59571daf9c 100644 --- a/src/main/java/neqsim/process/equipment/stream/Stream.java +++ b/src/main/java/neqsim/process/equipment/stream/Stream.java @@ -31,7 +31,9 @@ * @version $Id: $Id */ public class Stream extends ProcessEquipmentBaseClass implements StreamInterface, Cloneable { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(Stream.class); protected SystemInterface thermoSystem; diff --git a/src/main/java/neqsim/process/equipment/stream/VirtualStream.java b/src/main/java/neqsim/process/equipment/stream/VirtualStream.java index 8b3f515342..c569f06903 100644 --- a/src/main/java/neqsim/process/equipment/stream/VirtualStream.java +++ b/src/main/java/neqsim/process/equipment/stream/VirtualStream.java @@ -14,7 +14,9 @@ * @version $Id: $Id */ public class VirtualStream extends ProcessEquipmentBaseClass { - private static final long serialVersionUID = 1L; + /** Serialization version UID. */ + private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(VirtualStream.class); protected StreamInterface refStream = null; diff --git a/src/main/java/neqsim/process/equipment/subsea/SimpleFlowLine.java b/src/main/java/neqsim/process/equipment/subsea/SimpleFlowLine.java index a86e9c58da..4e6836248e 100644 --- a/src/main/java/neqsim/process/equipment/subsea/SimpleFlowLine.java +++ b/src/main/java/neqsim/process/equipment/subsea/SimpleFlowLine.java @@ -15,6 +15,7 @@ * @version $Id: $Id */ public class SimpleFlowLine extends TwoPortEquipment { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; private double height = 100.0; @@ -26,8 +27,7 @@ public class SimpleFlowLine extends TwoPortEquipment { * Constructor for SimpleFlowLine. * * @param name Name of SimpleFlowLine object - * @param inStream a {@link neqsim.process.equipment.stream.StreamInterface} - * object + * @param inStream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public SimpleFlowLine(String name, StreamInterface inStream) { super(name); @@ -40,8 +40,7 @@ public SimpleFlowLine(String name, StreamInterface inStream) { * Getter for the field pipeline. *

* - * @return a {@link neqsim.process.equipment.pipeline.AdiabaticTwoPhasePipe} - * object + * @return a {@link neqsim.process.equipment.pipeline.AdiabaticTwoPhasePipe} object */ public AdiabaticTwoPhasePipe getPipeline() { return pipeline; diff --git a/src/main/java/neqsim/process/equipment/subsea/SubseaWell.java b/src/main/java/neqsim/process/equipment/subsea/SubseaWell.java index ff66433fe9..a0db40dfd1 100644 --- a/src/main/java/neqsim/process/equipment/subsea/SubseaWell.java +++ b/src/main/java/neqsim/process/equipment/subsea/SubseaWell.java @@ -20,6 +20,7 @@ * @version $Id: $Id */ public class SubseaWell extends TwoPortEquipment { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; public double height = 1000.0; diff --git a/src/main/java/neqsim/process/equipment/tank/Tank.java b/src/main/java/neqsim/process/equipment/tank/Tank.java index 119f02e090..ae6012ba03 100644 --- a/src/main/java/neqsim/process/equipment/tank/Tank.java +++ b/src/main/java/neqsim/process/equipment/tank/Tank.java @@ -18,6 +18,7 @@ * @version $Id: $Id */ public class Tank extends ProcessEquipmentBaseClass { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; SystemInterface thermoSystem; diff --git a/src/main/java/neqsim/process/equipment/util/Adjuster.java b/src/main/java/neqsim/process/equipment/util/Adjuster.java index 98f0da49d8..29b1d4a2d7 100644 --- a/src/main/java/neqsim/process/equipment/util/Adjuster.java +++ b/src/main/java/neqsim/process/equipment/util/Adjuster.java @@ -17,7 +17,9 @@ * @version $Id: $Id */ public class Adjuster extends ProcessEquipmentBaseClass { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(Adjuster.class); ProcessEquipmentInterface adjustedEquipment = null; diff --git a/src/main/java/neqsim/process/equipment/util/Calculator.java b/src/main/java/neqsim/process/equipment/util/Calculator.java index a64952a59d..6f2fccef5e 100644 --- a/src/main/java/neqsim/process/equipment/util/Calculator.java +++ b/src/main/java/neqsim/process/equipment/util/Calculator.java @@ -19,7 +19,9 @@ * @version $Id: $Id */ public class Calculator extends ProcessEquipmentBaseClass { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(Calculator.class); ArrayList inputVariable = new ArrayList(); @@ -42,8 +44,7 @@ public Calculator(String name) { * addInputVariable. *

* - * @param unit a {@link neqsim.process.equipment.ProcessEquipmentInterface} - * object + * @param unit a {@link neqsim.process.equipment.ProcessEquipmentInterface} object */ public void addInputVariable(ProcessEquipmentInterface unit) { inputVariable.add(unit); @@ -84,7 +85,7 @@ public void runAntiSurgeCalc(UUID id) { flowInAntiSurge = 1e-6; } - anitSurgeSplitter.setFlowRates(new double[] { -1, flowInAntiSurge }, "MSm3/day"); + anitSurgeSplitter.setFlowRates(new double[] {-1, flowInAntiSurge}, "MSm3/day"); anitSurgeSplitter.run(); anitSurgeSplitter.setCalculationIdentifier(id); } @@ -114,8 +115,7 @@ public void run(UUID id) { if (sum < 0.0) { sum = 0.0; } - ((neqsim.process.equipment.stream.Stream) outputVariable).setFlowRate(sum, - "kg/hr"); + ((neqsim.process.equipment.stream.Stream) outputVariable).setFlowRate(sum, "kg/hr"); outputVariable.run(); outputVariable.setCalculationIdentifier(id); } catch (Exception ex) { @@ -130,9 +130,7 @@ public void run(UUID id) { * Setter for the field outputVariable. *

* - * @param outputVariable a - * {@link neqsim.process.equipment.ProcessEquipmentInterface} - * object + * @param outputVariable a {@link neqsim.process.equipment.ProcessEquipmentInterface} object */ public void setOutputVariable(ProcessEquipmentInterface outputVariable) { this.outputVariable = outputVariable; diff --git a/src/main/java/neqsim/process/equipment/util/FlowRateAdjuster.java b/src/main/java/neqsim/process/equipment/util/FlowRateAdjuster.java index 74d5268a6a..33cbb70eef 100644 --- a/src/main/java/neqsim/process/equipment/util/FlowRateAdjuster.java +++ b/src/main/java/neqsim/process/equipment/util/FlowRateAdjuster.java @@ -21,7 +21,9 @@ * @version $Id: $Id */ public class FlowRateAdjuster extends TwoPortEquipment { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(FlowRateAdjuster.class); String name = "Flow Rate Adjuster"; @@ -72,8 +74,7 @@ public FlowRateAdjuster(String name) { *

* * @param name a {@link java.lang.String} object - * @param inStream a {@link neqsim.process.equipment.stream.StreamInterface} - * object + * @param inStream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public FlowRateAdjuster(String name, StreamInterface inStream) { super(name, inStream); diff --git a/src/main/java/neqsim/process/equipment/util/FlowSetter.java b/src/main/java/neqsim/process/equipment/util/FlowSetter.java index 4e4c393ab4..ba7286fa2f 100644 --- a/src/main/java/neqsim/process/equipment/util/FlowSetter.java +++ b/src/main/java/neqsim/process/equipment/util/FlowSetter.java @@ -24,6 +24,7 @@ * @version $Id: $Id */ public class FlowSetter extends TwoPortEquipment { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; private static final Logger logger = LogManager.getLogger(FlowSetter.class); double[] pressure = new double[] {1.01325}; @@ -303,8 +304,7 @@ public void run(UUID id) { * createReferenceProcess. *

* - * @param feedStream a {@link neqsim.process.equipment.stream.StreamInterface} - * object + * @param feedStream a {@link neqsim.process.equipment.stream.StreamInterface} object * @return a {@link neqsim.process.processmodel.ProcessSystem} object */ public ProcessSystem createReferenceProcess(StreamInterface feedStream) { diff --git a/src/main/java/neqsim/process/equipment/util/GORfitter.java b/src/main/java/neqsim/process/equipment/util/GORfitter.java index 2c59b542b0..0eaa937b67 100644 --- a/src/main/java/neqsim/process/equipment/util/GORfitter.java +++ b/src/main/java/neqsim/process/equipment/util/GORfitter.java @@ -19,7 +19,9 @@ * @version $Id: $Id */ public class GORfitter extends TwoPortEquipment { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(GORfitter.class); double pressure = ThermodynamicConstantsInterface.referencePressure; diff --git a/src/main/java/neqsim/process/equipment/util/MPFMfitter.java b/src/main/java/neqsim/process/equipment/util/MPFMfitter.java index 0d57764ba2..ed25e1b9cd 100644 --- a/src/main/java/neqsim/process/equipment/util/MPFMfitter.java +++ b/src/main/java/neqsim/process/equipment/util/MPFMfitter.java @@ -19,7 +19,9 @@ * @version $Id: $Id */ public class MPFMfitter extends TwoPortEquipment { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(MPFMfitter.class); double pressure = ThermodynamicConstantsInterface.referencePressure; diff --git a/src/main/java/neqsim/process/equipment/util/MoleFractionControllerUtil.java b/src/main/java/neqsim/process/equipment/util/MoleFractionControllerUtil.java index 6860f1ff9c..e576605c70 100644 --- a/src/main/java/neqsim/process/equipment/util/MoleFractionControllerUtil.java +++ b/src/main/java/neqsim/process/equipment/util/MoleFractionControllerUtil.java @@ -17,6 +17,7 @@ * @version $Id: $Id */ public class MoleFractionControllerUtil extends TwoPortEquipment { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; SystemInterface thermoSystem; diff --git a/src/main/java/neqsim/process/equipment/util/NeqSimUnit.java b/src/main/java/neqsim/process/equipment/util/NeqSimUnit.java index e6476464d6..03bd7c015a 100644 --- a/src/main/java/neqsim/process/equipment/util/NeqSimUnit.java +++ b/src/main/java/neqsim/process/equipment/util/NeqSimUnit.java @@ -20,6 +20,7 @@ * @version $Id: $Id */ public class NeqSimUnit extends TwoPortEquipment { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; SystemInterface thermoSystem; diff --git a/src/main/java/neqsim/process/equipment/util/PressureDrop.java b/src/main/java/neqsim/process/equipment/util/PressureDrop.java index fb5534c594..510e94aca7 100644 --- a/src/main/java/neqsim/process/equipment/util/PressureDrop.java +++ b/src/main/java/neqsim/process/equipment/util/PressureDrop.java @@ -19,7 +19,9 @@ * @version $Id: $Id */ public class PressureDrop extends ThrottlingValve { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(PressureDrop.class); SystemInterface thermoSystem; @@ -37,7 +39,9 @@ public PressureDrop(String name) { } /** - *

Setter for the field pressureDrop.

+ *

+ * Setter for the field pressureDrop. + *

* * @param pressureDrop a double * @param unit a {@link java.lang.String} object @@ -58,8 +62,7 @@ public void setPressureDrop(double pressureDrop, String unit) { *

* * @param name a {@link java.lang.String} object - * @param inletStream a {@link neqsim.process.equipment.stream.StreamInterface} - * object + * @param inletStream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public PressureDrop(String name, StreamInterface inletStream) { this(name); diff --git a/src/main/java/neqsim/process/equipment/util/Recycle.java b/src/main/java/neqsim/process/equipment/util/Recycle.java index f6f11ca32b..2b9847f4cd 100644 --- a/src/main/java/neqsim/process/equipment/util/Recycle.java +++ b/src/main/java/neqsim/process/equipment/util/Recycle.java @@ -20,7 +20,9 @@ * @version $Id: $Id */ public class Recycle extends ProcessEquipmentBaseClass implements MixerInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(Recycle.class); protected ArrayList streams = new ArrayList(0); diff --git a/src/main/java/neqsim/process/equipment/util/RecycleController.java b/src/main/java/neqsim/process/equipment/util/RecycleController.java index e1dfa9b2be..858e4d0cad 100644 --- a/src/main/java/neqsim/process/equipment/util/RecycleController.java +++ b/src/main/java/neqsim/process/equipment/util/RecycleController.java @@ -14,7 +14,9 @@ * @version $Id: $Id */ public class RecycleController implements java.io.Serializable { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(RecycleController.class); + /** Serialization version UID. */ private static final long serialVersionUID = 1000; ArrayList recycleArray = new ArrayList(); diff --git a/src/main/java/neqsim/process/equipment/util/SetPoint.java b/src/main/java/neqsim/process/equipment/util/SetPoint.java index 6f9bbf1d8b..34133c73ef 100644 --- a/src/main/java/neqsim/process/equipment/util/SetPoint.java +++ b/src/main/java/neqsim/process/equipment/util/SetPoint.java @@ -17,7 +17,9 @@ * @version $Id: $Id */ public class SetPoint extends ProcessEquipmentBaseClass { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(SetPoint.class); ProcessEquipmentInterface sourceEquipment = null; diff --git a/src/main/java/neqsim/process/equipment/util/StreamSaturatorUtil.java b/src/main/java/neqsim/process/equipment/util/StreamSaturatorUtil.java index a77a178be7..374781abc0 100644 --- a/src/main/java/neqsim/process/equipment/util/StreamSaturatorUtil.java +++ b/src/main/java/neqsim/process/equipment/util/StreamSaturatorUtil.java @@ -18,7 +18,9 @@ * @version $Id: $Id */ public class StreamSaturatorUtil extends TwoPortEquipment { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(StreamSaturatorUtil.class); + /** Serialization version UID. */ private static final long serialVersionUID = 1000; SystemInterface thermoSystem; diff --git a/src/main/java/neqsim/process/equipment/util/StreamTransition.java b/src/main/java/neqsim/process/equipment/util/StreamTransition.java index b9bc7ab417..1cd110e19b 100644 --- a/src/main/java/neqsim/process/equipment/util/StreamTransition.java +++ b/src/main/java/neqsim/process/equipment/util/StreamTransition.java @@ -16,7 +16,8 @@ * @version $Id: $Id */ public class StreamTransition extends TwoPortEquipment { - private static final long serialVersionUID = 1L; + /** Serialization version UID. */ + private static final long serialVersionUID = 1000; /** *

diff --git a/src/main/java/neqsim/process/equipment/valve/SafetyValve.java b/src/main/java/neqsim/process/equipment/valve/SafetyValve.java index 1d8fce0b6e..e597795788 100644 --- a/src/main/java/neqsim/process/equipment/valve/SafetyValve.java +++ b/src/main/java/neqsim/process/equipment/valve/SafetyValve.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class SafetyValve extends ThrottlingValve { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; private double pressureSpec = 10.0; diff --git a/src/main/java/neqsim/process/equipment/valve/ThrottlingValve.java b/src/main/java/neqsim/process/equipment/valve/ThrottlingValve.java index 79152a3984..174fb732d9 100644 --- a/src/main/java/neqsim/process/equipment/valve/ThrottlingValve.java +++ b/src/main/java/neqsim/process/equipment/valve/ThrottlingValve.java @@ -23,7 +23,9 @@ * @version $Id: $Id */ public class ThrottlingValve extends TwoPortEquipment implements ValveInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(ThrottlingValve.class); SystemInterface thermoSystem; diff --git a/src/main/java/neqsim/process/measurementdevice/CombustionEmissionsCalculator.java b/src/main/java/neqsim/process/measurementdevice/CombustionEmissionsCalculator.java index 6ed55f82ef..8adaa470c4 100644 --- a/src/main/java/neqsim/process/measurementdevice/CombustionEmissionsCalculator.java +++ b/src/main/java/neqsim/process/measurementdevice/CombustionEmissionsCalculator.java @@ -12,7 +12,8 @@ * @author Even Solbraa */ public class CombustionEmissionsCalculator extends StreamMeasurementDeviceBaseClass { - private static final long serialVersionUID = 1L; + /** Serialization version UID. */ + private static final long serialVersionUID = 1000; // Composition of natural gas (in mole percent) private static final Map NATURAL_GAS_COMPOSITION = new HashMap<>(); diff --git a/src/main/java/neqsim/process/measurementdevice/CompressorMonitor.java b/src/main/java/neqsim/process/measurementdevice/CompressorMonitor.java index 833d95cd08..2e1521e516 100644 --- a/src/main/java/neqsim/process/measurementdevice/CompressorMonitor.java +++ b/src/main/java/neqsim/process/measurementdevice/CompressorMonitor.java @@ -12,6 +12,7 @@ * @version $Id: $Id */ public class CompressorMonitor extends MeasurementDeviceBaseClass { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; protected Compressor compressor = null; diff --git a/src/main/java/neqsim/process/measurementdevice/CricondenbarAnalyser.java b/src/main/java/neqsim/process/measurementdevice/CricondenbarAnalyser.java index bded027e9c..c61e4646ab 100644 --- a/src/main/java/neqsim/process/measurementdevice/CricondenbarAnalyser.java +++ b/src/main/java/neqsim/process/measurementdevice/CricondenbarAnalyser.java @@ -16,7 +16,9 @@ * @version $Id: $Id */ public class CricondenbarAnalyser extends StreamMeasurementDeviceBaseClass { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(CricondenbarAnalyser.class); /** diff --git a/src/main/java/neqsim/process/measurementdevice/FlowInducedVibrationAnalyser.java b/src/main/java/neqsim/process/measurementdevice/FlowInducedVibrationAnalyser.java index cf3dac0b6e..5c46eaf4fb 100644 --- a/src/main/java/neqsim/process/measurementdevice/FlowInducedVibrationAnalyser.java +++ b/src/main/java/neqsim/process/measurementdevice/FlowInducedVibrationAnalyser.java @@ -14,7 +14,9 @@ * @version $Id: $Id */ public class FlowInducedVibrationAnalyser extends MeasurementDeviceBaseClass { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(WaterDewPointAnalyser.class); private double supportDistance = 3; diff --git a/src/main/java/neqsim/process/measurementdevice/HydrateEquilibriumTemperatureAnalyser.java b/src/main/java/neqsim/process/measurementdevice/HydrateEquilibriumTemperatureAnalyser.java index 85e2991d7b..fcc233c20d 100644 --- a/src/main/java/neqsim/process/measurementdevice/HydrateEquilibriumTemperatureAnalyser.java +++ b/src/main/java/neqsim/process/measurementdevice/HydrateEquilibriumTemperatureAnalyser.java @@ -16,7 +16,9 @@ * @version $Id: $Id */ public class HydrateEquilibriumTemperatureAnalyser extends StreamMeasurementDeviceBaseClass { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(HydrateEquilibriumTemperatureAnalyser.class); private double referencePressure = 0; diff --git a/src/main/java/neqsim/process/measurementdevice/LevelTransmitter.java b/src/main/java/neqsim/process/measurementdevice/LevelTransmitter.java index 765dce2bdd..4df495031a 100644 --- a/src/main/java/neqsim/process/measurementdevice/LevelTransmitter.java +++ b/src/main/java/neqsim/process/measurementdevice/LevelTransmitter.java @@ -12,6 +12,7 @@ * @version $Id: $Id */ public class LevelTransmitter extends MeasurementDeviceBaseClass { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; protected Separator separator = null; diff --git a/src/main/java/neqsim/process/measurementdevice/MeasurementDeviceBaseClass.java b/src/main/java/neqsim/process/measurementdevice/MeasurementDeviceBaseClass.java index a2b995351c..3fb7d3cd9f 100644 --- a/src/main/java/neqsim/process/measurementdevice/MeasurementDeviceBaseClass.java +++ b/src/main/java/neqsim/process/measurementdevice/MeasurementDeviceBaseClass.java @@ -14,6 +14,7 @@ */ public abstract class MeasurementDeviceBaseClass extends NamedBaseClass implements MeasurementDeviceInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; protected String unit; diff --git a/src/main/java/neqsim/process/measurementdevice/MolarMassAnalyser.java b/src/main/java/neqsim/process/measurementdevice/MolarMassAnalyser.java index 9b56481edf..7bfd688e28 100644 --- a/src/main/java/neqsim/process/measurementdevice/MolarMassAnalyser.java +++ b/src/main/java/neqsim/process/measurementdevice/MolarMassAnalyser.java @@ -12,6 +12,7 @@ * @version $Id: $Id */ public class MolarMassAnalyser extends StreamMeasurementDeviceBaseClass { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/process/measurementdevice/MultiPhaseMeter.java b/src/main/java/neqsim/process/measurementdevice/MultiPhaseMeter.java index 7a2b3d4947..db821310e8 100644 --- a/src/main/java/neqsim/process/measurementdevice/MultiPhaseMeter.java +++ b/src/main/java/neqsim/process/measurementdevice/MultiPhaseMeter.java @@ -17,7 +17,9 @@ * @version $Id: $Id */ public class MultiPhaseMeter extends StreamMeasurementDeviceBaseClass { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(MultiPhaseMeter.class); double pressure = 1.01325; diff --git a/src/main/java/neqsim/process/measurementdevice/NMVOCAnalyser.java b/src/main/java/neqsim/process/measurementdevice/NMVOCAnalyser.java index 6bcfbfd8f2..055391588c 100644 --- a/src/main/java/neqsim/process/measurementdevice/NMVOCAnalyser.java +++ b/src/main/java/neqsim/process/measurementdevice/NMVOCAnalyser.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class NMVOCAnalyser extends StreamMeasurementDeviceBaseClass { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** @@ -53,10 +54,9 @@ public double getMeasuredValue(String unit) { */ public double getnmVOCFlowRate(String unit) { // Define list of components to include in mass flow calculation - java.util.List nmVOCcomponents = java.util.Arrays.asList("ethane", "propane", "i-butane", "n-butane", - "i-pentane", - "n-pentane", - "n-hexane", "n-heptane", "benzene", "nC8", "nC9", "nC10", "nC11"); + java.util.List nmVOCcomponents = + java.util.Arrays.asList("ethane", "propane", "i-butane", "n-butane", "i-pentane", + "n-pentane", "n-hexane", "n-heptane", "benzene", "nC8", "nC9", "nC10", "nC11"); double flow = 0.0; for (int i = 0; i < this.stream.getFluid().getNumberOfComponents(); i++) { diff --git a/src/main/java/neqsim/process/measurementdevice/PressureTransmitter.java b/src/main/java/neqsim/process/measurementdevice/PressureTransmitter.java index 22dd9f4244..e84b4ec25a 100644 --- a/src/main/java/neqsim/process/measurementdevice/PressureTransmitter.java +++ b/src/main/java/neqsim/process/measurementdevice/PressureTransmitter.java @@ -12,6 +12,7 @@ * @version $Id: $Id */ public class PressureTransmitter extends StreamMeasurementDeviceBaseClass { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/process/measurementdevice/StreamMeasurementDeviceBaseClass.java b/src/main/java/neqsim/process/measurementdevice/StreamMeasurementDeviceBaseClass.java index 9502268ed5..d55545f6b3 100644 --- a/src/main/java/neqsim/process/measurementdevice/StreamMeasurementDeviceBaseClass.java +++ b/src/main/java/neqsim/process/measurementdevice/StreamMeasurementDeviceBaseClass.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public abstract class StreamMeasurementDeviceBaseClass extends MeasurementDeviceBaseClass { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; protected StreamInterface stream = null; diff --git a/src/main/java/neqsim/process/measurementdevice/TemperatureTransmitter.java b/src/main/java/neqsim/process/measurementdevice/TemperatureTransmitter.java index cc5e896825..7f1e7e62b0 100644 --- a/src/main/java/neqsim/process/measurementdevice/TemperatureTransmitter.java +++ b/src/main/java/neqsim/process/measurementdevice/TemperatureTransmitter.java @@ -18,6 +18,7 @@ * @version $Id: $Id */ public class TemperatureTransmitter extends StreamMeasurementDeviceBaseClass { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/process/measurementdevice/VolumeFlowTransmitter.java b/src/main/java/neqsim/process/measurementdevice/VolumeFlowTransmitter.java index 0350f8da79..e629f464b2 100644 --- a/src/main/java/neqsim/process/measurementdevice/VolumeFlowTransmitter.java +++ b/src/main/java/neqsim/process/measurementdevice/VolumeFlowTransmitter.java @@ -13,6 +13,7 @@ * @version $Id: $Id */ public class VolumeFlowTransmitter extends StreamMeasurementDeviceBaseClass { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; private int measuredPhaseNumber = 0; diff --git a/src/main/java/neqsim/process/measurementdevice/WaterContentAnalyser.java b/src/main/java/neqsim/process/measurementdevice/WaterContentAnalyser.java index 52a027498a..20f7563981 100644 --- a/src/main/java/neqsim/process/measurementdevice/WaterContentAnalyser.java +++ b/src/main/java/neqsim/process/measurementdevice/WaterContentAnalyser.java @@ -12,6 +12,7 @@ * @version $Id: $Id */ public class WaterContentAnalyser extends StreamMeasurementDeviceBaseClass { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/process/measurementdevice/WaterDewPointAnalyser.java b/src/main/java/neqsim/process/measurementdevice/WaterDewPointAnalyser.java index c01ede211f..a3cf30853b 100644 --- a/src/main/java/neqsim/process/measurementdevice/WaterDewPointAnalyser.java +++ b/src/main/java/neqsim/process/measurementdevice/WaterDewPointAnalyser.java @@ -17,7 +17,9 @@ * @version $Id: $Id */ public class WaterDewPointAnalyser extends StreamMeasurementDeviceBaseClass { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(WaterDewPointAnalyser.class); private double referencePressure = 70.0; diff --git a/src/main/java/neqsim/process/measurementdevice/WellAllocator.java b/src/main/java/neqsim/process/measurementdevice/WellAllocator.java index 1563d59c36..fae1770a8d 100644 --- a/src/main/java/neqsim/process/measurementdevice/WellAllocator.java +++ b/src/main/java/neqsim/process/measurementdevice/WellAllocator.java @@ -11,7 +11,8 @@ * @version $Id: $Id */ public class WellAllocator extends StreamMeasurementDeviceBaseClass { - private static final long serialVersionUID = 1L; + /** Serialization version UID. */ + private static final long serialVersionUID = 1000; protected StreamInterface exportGasStream = null; protected StreamInterface exportOilStream = null; @@ -83,8 +84,7 @@ public double getMeasuredValue(String measurement, String unit) { splitFactors[i] = exportGasStream.getFluid().getComponent(i).getFlowRate("kg/hr") / (exportGasStream.getFluid().getComponent(i).getFlowRate("kg/hr") + exportOilStream.getFluid().getComponent(i).getFlowRate("kg/hr")); - gasExportFlow += - stream.getFluid().getComponent(i).getTotalFlowRate(unit) * splitFactors[i]; + gasExportFlow += stream.getFluid().getComponent(i).getTotalFlowRate(unit) * splitFactors[i]; oilExportFlow += stream.getFluid().getComponent(i).getTotalFlowRate(unit) * (1.0 - splitFactors[i]); } diff --git a/src/main/java/neqsim/process/measurementdevice/online/OnlineSignal.java b/src/main/java/neqsim/process/measurementdevice/online/OnlineSignal.java index a5b52294e5..04a70fa556 100644 --- a/src/main/java/neqsim/process/measurementdevice/online/OnlineSignal.java +++ b/src/main/java/neqsim/process/measurementdevice/online/OnlineSignal.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class OnlineSignal implements java.io.Serializable { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/process/measurementdevice/pHProbe.java b/src/main/java/neqsim/process/measurementdevice/pHProbe.java index bde487fcb0..9d54f886ba 100644 --- a/src/main/java/neqsim/process/measurementdevice/pHProbe.java +++ b/src/main/java/neqsim/process/measurementdevice/pHProbe.java @@ -13,6 +13,7 @@ * @version $Id: $Id */ public class pHProbe extends StreamMeasurementDeviceBaseClass { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; protected SystemInterface reactiveThermoSystem; diff --git a/src/main/java/neqsim/process/measurementdevice/simpleflowregime/SevereSlugAnalyser.java b/src/main/java/neqsim/process/measurementdevice/simpleflowregime/SevereSlugAnalyser.java index fbd4454073..f424563e45 100644 --- a/src/main/java/neqsim/process/measurementdevice/simpleflowregime/SevereSlugAnalyser.java +++ b/src/main/java/neqsim/process/measurementdevice/simpleflowregime/SevereSlugAnalyser.java @@ -20,7 +20,9 @@ * @version $Id: $Id */ public class SevereSlugAnalyser extends MeasurementDeviceBaseClass { - private static final long serialVersionUID = 1L; + /** Serialization version UID. */ + private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(SevereSlugAnalyser.class); FluidSevereSlug fluidSevereS; diff --git a/src/main/java/neqsim/process/mechanicaldesign/MechanicalDesign.java b/src/main/java/neqsim/process/mechanicaldesign/MechanicalDesign.java index 87e01972c7..6017a1105c 100644 --- a/src/main/java/neqsim/process/mechanicaldesign/MechanicalDesign.java +++ b/src/main/java/neqsim/process/mechanicaldesign/MechanicalDesign.java @@ -30,6 +30,7 @@ * @version $Id: $Id */ public class MechanicalDesign implements java.io.Serializable { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/process/mechanicaldesign/SystemMechanicalDesign.java b/src/main/java/neqsim/process/mechanicaldesign/SystemMechanicalDesign.java index f787bdfd2f..16c6009100 100644 --- a/src/main/java/neqsim/process/mechanicaldesign/SystemMechanicalDesign.java +++ b/src/main/java/neqsim/process/mechanicaldesign/SystemMechanicalDesign.java @@ -16,7 +16,9 @@ * @version $Id: $Id */ public class SystemMechanicalDesign implements java.io.Serializable { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(SystemMechanicalDesign.class); ProcessSystem processSystem = null; diff --git a/src/main/java/neqsim/process/mechanicaldesign/absorber/AbsorberMechanicalDesign.java b/src/main/java/neqsim/process/mechanicaldesign/absorber/AbsorberMechanicalDesign.java index b86ecb7981..20d366bd6a 100644 --- a/src/main/java/neqsim/process/mechanicaldesign/absorber/AbsorberMechanicalDesign.java +++ b/src/main/java/neqsim/process/mechanicaldesign/absorber/AbsorberMechanicalDesign.java @@ -18,6 +18,7 @@ * @version $Id: $Id */ public class AbsorberMechanicalDesign extends SeparatorMechanicalDesign { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; private double wallThickness = 0.02; @@ -30,8 +31,7 @@ public class AbsorberMechanicalDesign extends SeparatorMechanicalDesign { * Constructor for AbsorberMechanicalDesign. *

* - * @param equipment a {@link neqsim.process.equipment.ProcessEquipmentInterface} - * object + * @param equipment a {@link neqsim.process.equipment.ProcessEquipmentInterface} object */ public AbsorberMechanicalDesign(ProcessEquipmentInterface equipment) { super(equipment); diff --git a/src/main/java/neqsim/process/mechanicaldesign/adsorber/AdsorberMechanicalDesign.java b/src/main/java/neqsim/process/mechanicaldesign/adsorber/AdsorberMechanicalDesign.java index b0b7c3f9a6..457b90b4dd 100644 --- a/src/main/java/neqsim/process/mechanicaldesign/adsorber/AdsorberMechanicalDesign.java +++ b/src/main/java/neqsim/process/mechanicaldesign/adsorber/AdsorberMechanicalDesign.java @@ -16,6 +16,7 @@ * @version $Id: $Id */ public class AdsorberMechanicalDesign extends MechanicalDesign { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; private double wallThickness = 0.0; @@ -27,8 +28,7 @@ public class AdsorberMechanicalDesign extends MechanicalDesign { * Constructor for AdsorberMechanicalDesign. *

* - * @param equipment a {@link neqsim.process.equipment.ProcessEquipmentInterface} - * object + * @param equipment a {@link neqsim.process.equipment.ProcessEquipmentInterface} object */ public AdsorberMechanicalDesign(ProcessEquipmentInterface equipment) { super(equipment); diff --git a/src/main/java/neqsim/process/mechanicaldesign/compressor/CompressorMechanicalDesign.java b/src/main/java/neqsim/process/mechanicaldesign/compressor/CompressorMechanicalDesign.java index 6582893950..1d70a36a1a 100644 --- a/src/main/java/neqsim/process/mechanicaldesign/compressor/CompressorMechanicalDesign.java +++ b/src/main/java/neqsim/process/mechanicaldesign/compressor/CompressorMechanicalDesign.java @@ -23,6 +23,7 @@ * @version $Id: $Id */ public class CompressorMechanicalDesign extends MechanicalDesign { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; double compressorFactor = 0.0; diff --git a/src/main/java/neqsim/process/mechanicaldesign/designstandards/AbsorptionColumnDesignStandard.java b/src/main/java/neqsim/process/mechanicaldesign/designstandards/AbsorptionColumnDesignStandard.java index c6f8a26037..655a2cf467 100644 --- a/src/main/java/neqsim/process/mechanicaldesign/designstandards/AbsorptionColumnDesignStandard.java +++ b/src/main/java/neqsim/process/mechanicaldesign/designstandards/AbsorptionColumnDesignStandard.java @@ -13,7 +13,9 @@ * @version $Id: $Id */ public class AbsorptionColumnDesignStandard extends DesignStandard { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(AbsorptionColumnDesignStandard.class); private double molecularSieveWaterCapacity = 20; @@ -30,7 +32,8 @@ public AbsorptionColumnDesignStandard(String name, MechanicalDesign equipmentInn super(name, equipmentInn); java.sql.ResultSet dataSet = null; - try (neqsim.util.database.NeqSimProcessDesignDataBase database = new neqsim.util.database.NeqSimProcessDesignDataBase()) { + try (neqsim.util.database.NeqSimProcessDesignDataBase database = + new neqsim.util.database.NeqSimProcessDesignDataBase()) { dataSet = database.getResultSet( ("SELECT * FROM technicalrequirements WHERE EQUIPMENTTYPE='Absorber' AND Company='" + standardName + "'")); diff --git a/src/main/java/neqsim/process/mechanicaldesign/designstandards/AdsorptionDehydrationDesignStandard.java b/src/main/java/neqsim/process/mechanicaldesign/designstandards/AdsorptionDehydrationDesignStandard.java index 290190084a..d9b81293c3 100644 --- a/src/main/java/neqsim/process/mechanicaldesign/designstandards/AdsorptionDehydrationDesignStandard.java +++ b/src/main/java/neqsim/process/mechanicaldesign/designstandards/AdsorptionDehydrationDesignStandard.java @@ -13,7 +13,9 @@ * @version $Id: $Id */ public class AdsorptionDehydrationDesignStandard extends DesignStandard { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(AdsorptionDehydrationDesignStandard.class); private double molecularSieveWaterCapacity = 20; diff --git a/src/main/java/neqsim/process/mechanicaldesign/designstandards/CompressorDesignStandard.java b/src/main/java/neqsim/process/mechanicaldesign/designstandards/CompressorDesignStandard.java index 4559939192..bd62ea23d5 100644 --- a/src/main/java/neqsim/process/mechanicaldesign/designstandards/CompressorDesignStandard.java +++ b/src/main/java/neqsim/process/mechanicaldesign/designstandards/CompressorDesignStandard.java @@ -13,7 +13,9 @@ * @version $Id: $Id */ public class CompressorDesignStandard extends DesignStandard { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(CompressorDesignStandard.class); private double compressorFactor = 0.11; diff --git a/src/main/java/neqsim/process/mechanicaldesign/designstandards/DesignStandard.java b/src/main/java/neqsim/process/mechanicaldesign/designstandards/DesignStandard.java index f16321577d..c8b6bc2a93 100644 --- a/src/main/java/neqsim/process/mechanicaldesign/designstandards/DesignStandard.java +++ b/src/main/java/neqsim/process/mechanicaldesign/designstandards/DesignStandard.java @@ -12,6 +12,7 @@ * @version $Id: $Id */ public class DesignStandard implements java.io.Serializable { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; public MechanicalDesign equipment = null; diff --git a/src/main/java/neqsim/process/mechanicaldesign/designstandards/GasScrubberDesignStandard.java b/src/main/java/neqsim/process/mechanicaldesign/designstandards/GasScrubberDesignStandard.java index 5d9a213019..18c7826c31 100644 --- a/src/main/java/neqsim/process/mechanicaldesign/designstandards/GasScrubberDesignStandard.java +++ b/src/main/java/neqsim/process/mechanicaldesign/designstandards/GasScrubberDesignStandard.java @@ -13,7 +13,9 @@ * @version $Id: $Id */ public class GasScrubberDesignStandard extends DesignStandard { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(GasScrubberDesignStandard.class); double gasLoadFactor = 0.11; diff --git a/src/main/java/neqsim/process/mechanicaldesign/designstandards/JointEfficiencyPipelineStandard.java b/src/main/java/neqsim/process/mechanicaldesign/designstandards/JointEfficiencyPipelineStandard.java index 920c2a9ef1..6056265db8 100644 --- a/src/main/java/neqsim/process/mechanicaldesign/designstandards/JointEfficiencyPipelineStandard.java +++ b/src/main/java/neqsim/process/mechanicaldesign/designstandards/JointEfficiencyPipelineStandard.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class JointEfficiencyPipelineStandard extends DesignStandard { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/process/mechanicaldesign/designstandards/JointEfficiencyPlateStandard.java b/src/main/java/neqsim/process/mechanicaldesign/designstandards/JointEfficiencyPlateStandard.java index a8bfc53cc6..83624b0f9b 100644 --- a/src/main/java/neqsim/process/mechanicaldesign/designstandards/JointEfficiencyPlateStandard.java +++ b/src/main/java/neqsim/process/mechanicaldesign/designstandards/JointEfficiencyPlateStandard.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class JointEfficiencyPlateStandard extends DesignStandard { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/process/mechanicaldesign/designstandards/MaterialPipeDesignStandard.java b/src/main/java/neqsim/process/mechanicaldesign/designstandards/MaterialPipeDesignStandard.java index 0a7b8aac85..fa4f115bc7 100644 --- a/src/main/java/neqsim/process/mechanicaldesign/designstandards/MaterialPipeDesignStandard.java +++ b/src/main/java/neqsim/process/mechanicaldesign/designstandards/MaterialPipeDesignStandard.java @@ -13,7 +13,9 @@ * @version $Id: $Id */ public class MaterialPipeDesignStandard extends DesignStandard { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(MaterialPipeDesignStandard.class); /** diff --git a/src/main/java/neqsim/process/mechanicaldesign/designstandards/MaterialPlateDesignStandard.java b/src/main/java/neqsim/process/mechanicaldesign/designstandards/MaterialPlateDesignStandard.java index 8157411d17..e9dcb3817d 100644 --- a/src/main/java/neqsim/process/mechanicaldesign/designstandards/MaterialPlateDesignStandard.java +++ b/src/main/java/neqsim/process/mechanicaldesign/designstandards/MaterialPlateDesignStandard.java @@ -13,7 +13,9 @@ * @version $Id: $Id */ public class MaterialPlateDesignStandard extends DesignStandard { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(MaterialPlateDesignStandard.class); /** diff --git a/src/main/java/neqsim/process/mechanicaldesign/designstandards/PipelineDesignStandard.java b/src/main/java/neqsim/process/mechanicaldesign/designstandards/PipelineDesignStandard.java index 74ad323365..f4d0b3d70a 100644 --- a/src/main/java/neqsim/process/mechanicaldesign/designstandards/PipelineDesignStandard.java +++ b/src/main/java/neqsim/process/mechanicaldesign/designstandards/PipelineDesignStandard.java @@ -13,7 +13,9 @@ * @version $Id: $Id */ public class PipelineDesignStandard extends DesignStandard { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(PipelineDesignStandard.class); double safetyFactor = 1.0; diff --git a/src/main/java/neqsim/process/mechanicaldesign/designstandards/PipingDesignStandard.java b/src/main/java/neqsim/process/mechanicaldesign/designstandards/PipingDesignStandard.java index 639ebeab9c..f155164e04 100644 --- a/src/main/java/neqsim/process/mechanicaldesign/designstandards/PipingDesignStandard.java +++ b/src/main/java/neqsim/process/mechanicaldesign/designstandards/PipingDesignStandard.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class PipingDesignStandard extends DesignStandard { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/process/mechanicaldesign/designstandards/PressureVesselDesignStandard.java b/src/main/java/neqsim/process/mechanicaldesign/designstandards/PressureVesselDesignStandard.java index d61236678f..11dfc46d3a 100644 --- a/src/main/java/neqsim/process/mechanicaldesign/designstandards/PressureVesselDesignStandard.java +++ b/src/main/java/neqsim/process/mechanicaldesign/designstandards/PressureVesselDesignStandard.java @@ -12,6 +12,7 @@ * @version $Id: $Id */ public class PressureVesselDesignStandard extends DesignStandard { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/process/mechanicaldesign/designstandards/SeparatorDesignStandard.java b/src/main/java/neqsim/process/mechanicaldesign/designstandards/SeparatorDesignStandard.java index 3ec60964eb..845f771eef 100644 --- a/src/main/java/neqsim/process/mechanicaldesign/designstandards/SeparatorDesignStandard.java +++ b/src/main/java/neqsim/process/mechanicaldesign/designstandards/SeparatorDesignStandard.java @@ -14,7 +14,9 @@ * @version $Id: $Id */ public class SeparatorDesignStandard extends DesignStandard { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(SeparatorDesignStandard.class); /** diff --git a/src/main/java/neqsim/process/mechanicaldesign/designstandards/ValveDesignStandard.java b/src/main/java/neqsim/process/mechanicaldesign/designstandards/ValveDesignStandard.java index 88c84baaa1..0d5156bbe3 100644 --- a/src/main/java/neqsim/process/mechanicaldesign/designstandards/ValveDesignStandard.java +++ b/src/main/java/neqsim/process/mechanicaldesign/designstandards/ValveDesignStandard.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class ValveDesignStandard extends DesignStandard { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; public double valveCvMax = 1.0; diff --git a/src/main/java/neqsim/process/mechanicaldesign/pipeline/PipelineMechanicalDesign.java b/src/main/java/neqsim/process/mechanicaldesign/pipeline/PipelineMechanicalDesign.java index 21f5e68882..b34206b39b 100644 --- a/src/main/java/neqsim/process/mechanicaldesign/pipeline/PipelineMechanicalDesign.java +++ b/src/main/java/neqsim/process/mechanicaldesign/pipeline/PipelineMechanicalDesign.java @@ -17,6 +17,7 @@ * @version $Id: $Id */ public class PipelineMechanicalDesign extends MechanicalDesign { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; double innerDiameter = 1.0; diff --git a/src/main/java/neqsim/process/mechanicaldesign/separator/GasScrubberMechanicalDesign.java b/src/main/java/neqsim/process/mechanicaldesign/separator/GasScrubberMechanicalDesign.java index 53ad7137a9..45f0650071 100644 --- a/src/main/java/neqsim/process/mechanicaldesign/separator/GasScrubberMechanicalDesign.java +++ b/src/main/java/neqsim/process/mechanicaldesign/separator/GasScrubberMechanicalDesign.java @@ -16,6 +16,7 @@ * @version $Id: $Id */ public class GasScrubberMechanicalDesign extends SeparatorMechanicalDesign { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** @@ -23,8 +24,7 @@ public class GasScrubberMechanicalDesign extends SeparatorMechanicalDesign { * Constructor for GasScrubberMechanicalDesign. *

* - * @param equipment a {@link neqsim.process.equipment.ProcessEquipmentInterface} - * object + * @param equipment a {@link neqsim.process.equipment.ProcessEquipmentInterface} object */ public GasScrubberMechanicalDesign(ProcessEquipmentInterface equipment) { super(equipment); diff --git a/src/main/java/neqsim/process/mechanicaldesign/separator/SeparatorMechanicalDesign.java b/src/main/java/neqsim/process/mechanicaldesign/separator/SeparatorMechanicalDesign.java index e7253235e6..57da2b9064 100644 --- a/src/main/java/neqsim/process/mechanicaldesign/separator/SeparatorMechanicalDesign.java +++ b/src/main/java/neqsim/process/mechanicaldesign/separator/SeparatorMechanicalDesign.java @@ -24,6 +24,7 @@ * @version $Id: $Id */ public class SeparatorMechanicalDesign extends MechanicalDesign { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; double gasLoadFactor = 1.0; double volumeSafetyFactor = 1.0; @@ -35,8 +36,7 @@ public class SeparatorMechanicalDesign extends MechanicalDesign { * Constructor for SeparatorMechanicalDesign. *

* - * @param equipment a {@link neqsim.process.equipment.ProcessEquipmentInterface} - * object + * @param equipment a {@link neqsim.process.equipment.ProcessEquipmentInterface} object */ public SeparatorMechanicalDesign(ProcessEquipmentInterface equipment) { super(equipment); diff --git a/src/main/java/neqsim/process/mechanicaldesign/valve/ValveMechanicalDesign.java b/src/main/java/neqsim/process/mechanicaldesign/valve/ValveMechanicalDesign.java index d1e1733201..53c37827dd 100644 --- a/src/main/java/neqsim/process/mechanicaldesign/valve/ValveMechanicalDesign.java +++ b/src/main/java/neqsim/process/mechanicaldesign/valve/ValveMechanicalDesign.java @@ -21,6 +21,7 @@ * @version $Id: $Id */ public class ValveMechanicalDesign extends MechanicalDesign { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; double valveCvMax = 1.0; diff --git a/src/main/java/neqsim/process/processmodel/ProcessModel.java b/src/main/java/neqsim/process/processmodel/ProcessModel.java index 6bf05b1345..899fe21ab7 100644 --- a/src/main/java/neqsim/process/processmodel/ProcessModel.java +++ b/src/main/java/neqsim/process/processmodel/ProcessModel.java @@ -16,6 +16,7 @@ */ public class ProcessModel implements Runnable { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(ProcessModel.class); private Map processes = new LinkedHashMap<>(); diff --git a/src/main/java/neqsim/process/processmodel/ProcessModule.java b/src/main/java/neqsim/process/processmodel/ProcessModule.java index 73bb0876ec..a759ea8b27 100644 --- a/src/main/java/neqsim/process/processmodel/ProcessModule.java +++ b/src/main/java/neqsim/process/processmodel/ProcessModule.java @@ -20,6 +20,7 @@ * @version 1.0 */ public class ProcessModule extends SimulationBaseClass { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; private static final Logger logger = LogManager.getLogger(ProcessModule.class); diff --git a/src/main/java/neqsim/process/processmodel/ProcessModuleBaseClass.java b/src/main/java/neqsim/process/processmodel/ProcessModuleBaseClass.java index 45b037d85e..c45d35fd3d 100644 --- a/src/main/java/neqsim/process/processmodel/ProcessModuleBaseClass.java +++ b/src/main/java/neqsim/process/processmodel/ProcessModuleBaseClass.java @@ -25,6 +25,7 @@ */ public abstract class ProcessModuleBaseClass extends SimulationBaseClass implements ModuleInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; protected String preferedThermodynamicModel = ""; diff --git a/src/main/java/neqsim/process/processmodel/ProcessSystem.java b/src/main/java/neqsim/process/processmodel/ProcessSystem.java index 159342a1b9..98f7b1ffd9 100644 --- a/src/main/java/neqsim/process/processmodel/ProcessSystem.java +++ b/src/main/java/neqsim/process/processmodel/ProcessSystem.java @@ -31,7 +31,9 @@ * @version $Id: $Id */ public class ProcessSystem extends SimulationBaseClass { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(ProcessSystem.class); transient Thread thisThread; diff --git a/src/main/java/neqsim/process/processmodel/processmodules/AdsorptionDehydrationlModule.java b/src/main/java/neqsim/process/processmodel/processmodules/AdsorptionDehydrationlModule.java index c2c0c725ff..118ff1ebff 100644 --- a/src/main/java/neqsim/process/processmodel/processmodules/AdsorptionDehydrationlModule.java +++ b/src/main/java/neqsim/process/processmodel/processmodules/AdsorptionDehydrationlModule.java @@ -21,7 +21,9 @@ * @version $Id: $Id */ public class AdsorptionDehydrationlModule extends ProcessModuleBaseClass { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(AdsorptionDehydrationlModule.class); protected StreamInterface gasStreamToAdsorber = null; diff --git a/src/main/java/neqsim/process/processmodel/processmodules/CO2RemovalModule.java b/src/main/java/neqsim/process/processmodel/processmodules/CO2RemovalModule.java index 9e67363344..cc49c158c7 100644 --- a/src/main/java/neqsim/process/processmodel/processmodules/CO2RemovalModule.java +++ b/src/main/java/neqsim/process/processmodel/processmodules/CO2RemovalModule.java @@ -16,7 +16,9 @@ * @version $Id: $Id */ public class CO2RemovalModule extends ProcessModuleBaseClass { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(CO2RemovalModule.class); protected StreamInterface streamToAbsorber = null, streamFromAbsorber = null, diff --git a/src/main/java/neqsim/process/processmodel/processmodules/DPCUModule.java b/src/main/java/neqsim/process/processmodel/processmodules/DPCUModule.java index eabd133b87..398b5b6fee 100644 --- a/src/main/java/neqsim/process/processmodel/processmodules/DPCUModule.java +++ b/src/main/java/neqsim/process/processmodel/processmodules/DPCUModule.java @@ -30,7 +30,9 @@ * @version $Id: $Id */ public class DPCUModule extends ProcessModuleBaseClass { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(ProcessModuleBaseClass.class); StreamInterface ethaneOvhComp; diff --git a/src/main/java/neqsim/process/processmodel/processmodules/GlycolDehydrationlModule.java b/src/main/java/neqsim/process/processmodel/processmodules/GlycolDehydrationlModule.java index db5c695541..a8335a3eb1 100644 --- a/src/main/java/neqsim/process/processmodel/processmodules/GlycolDehydrationlModule.java +++ b/src/main/java/neqsim/process/processmodel/processmodules/GlycolDehydrationlModule.java @@ -25,7 +25,9 @@ * @version $Id: $Id */ public class GlycolDehydrationlModule extends ProcessModuleBaseClass { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(GlycolDehydrationlModule.class); protected StreamInterface gasStreamToAbsorber = null; diff --git a/src/main/java/neqsim/process/processmodel/processmodules/MEGReclaimerModule.java b/src/main/java/neqsim/process/processmodel/processmodules/MEGReclaimerModule.java index 18808aee04..dc61f979fa 100644 --- a/src/main/java/neqsim/process/processmodel/processmodules/MEGReclaimerModule.java +++ b/src/main/java/neqsim/process/processmodel/processmodules/MEGReclaimerModule.java @@ -22,7 +22,9 @@ * @version $Id: $Id */ public class MEGReclaimerModule extends ProcessModuleBaseClass { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(MEGReclaimerModule.class); protected StreamInterface streamToReclaimer = null; diff --git a/src/main/java/neqsim/process/processmodel/processmodules/MixerGasProcessingModule.java b/src/main/java/neqsim/process/processmodel/processmodules/MixerGasProcessingModule.java index a970ac5c5e..bdb52c5caa 100644 --- a/src/main/java/neqsim/process/processmodel/processmodules/MixerGasProcessingModule.java +++ b/src/main/java/neqsim/process/processmodel/processmodules/MixerGasProcessingModule.java @@ -22,6 +22,7 @@ * @version $Id: $Id */ public class MixerGasProcessingModule extends ProcessModuleBaseClass { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; StreamInterface feedStream; diff --git a/src/main/java/neqsim/process/processmodel/processmodules/PropaneCoolingModule.java b/src/main/java/neqsim/process/processmodel/processmodules/PropaneCoolingModule.java index 156f93451a..69c64f77c4 100644 --- a/src/main/java/neqsim/process/processmodel/processmodules/PropaneCoolingModule.java +++ b/src/main/java/neqsim/process/processmodel/processmodules/PropaneCoolingModule.java @@ -53,6 +53,7 @@ public void setVaporizerTemperature(double vaporizerTemperature) { this.vaporizerTemperature = vaporizerTemperature; } + /** Serialization version UID. */ private static final long serialVersionUID = 1000; StreamInterface refrigerantStream; diff --git a/src/main/java/neqsim/process/processmodel/processmodules/SeparationTrainModule.java b/src/main/java/neqsim/process/processmodel/processmodules/SeparationTrainModule.java index ffafa4557b..5a28498323 100644 --- a/src/main/java/neqsim/process/processmodel/processmodules/SeparationTrainModule.java +++ b/src/main/java/neqsim/process/processmodel/processmodules/SeparationTrainModule.java @@ -24,6 +24,7 @@ * @version $Id: $Id */ public class SeparationTrainModule extends ProcessModuleBaseClass { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; protected StreamInterface feedStream = null; diff --git a/src/main/java/neqsim/process/processmodel/processmodules/SeparationTrainModuleSimple.java b/src/main/java/neqsim/process/processmodel/processmodules/SeparationTrainModuleSimple.java index af73a86924..db14f64f52 100644 --- a/src/main/java/neqsim/process/processmodel/processmodules/SeparationTrainModuleSimple.java +++ b/src/main/java/neqsim/process/processmodel/processmodules/SeparationTrainModuleSimple.java @@ -24,6 +24,7 @@ * @version $Id: $Id */ public class SeparationTrainModuleSimple extends ProcessModuleBaseClass { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; protected StreamInterface feedStream = null; diff --git a/src/main/java/neqsim/process/processmodel/processmodules/WellFluidModule.java b/src/main/java/neqsim/process/processmodel/processmodules/WellFluidModule.java index 09127f61ac..4d557a0a14 100644 --- a/src/main/java/neqsim/process/processmodel/processmodules/WellFluidModule.java +++ b/src/main/java/neqsim/process/processmodel/processmodules/WellFluidModule.java @@ -22,6 +22,7 @@ * @version $Id: $Id */ public class WellFluidModule extends ProcessModuleBaseClass { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; protected StreamInterface feedStream = null; diff --git a/src/main/java/neqsim/process/util/monitor/FluidComponentResponse.java b/src/main/java/neqsim/process/util/monitor/FluidComponentResponse.java index 5fa2c769b1..cbf93f9397 100644 --- a/src/main/java/neqsim/process/util/monitor/FluidComponentResponse.java +++ b/src/main/java/neqsim/process/util/monitor/FluidComponentResponse.java @@ -16,6 +16,7 @@ * @version $Id: $Id */ public class FluidComponentResponse { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(FluidComponentResponse.class); public String name; public HashMap> properties = diff --git a/src/main/java/neqsim/process/util/monitor/FluidResponse.java b/src/main/java/neqsim/process/util/monitor/FluidResponse.java index d4e413cab4..23b7c16138 100644 --- a/src/main/java/neqsim/process/util/monitor/FluidResponse.java +++ b/src/main/java/neqsim/process/util/monitor/FluidResponse.java @@ -14,7 +14,9 @@ * @version $Id: $Id */ public class FluidResponse { - private static final long serialVersionUID = 1L; + /** Serialization version UID. */ + private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(FluidResponse.class); public String name; public HashMap> properties = diff --git a/src/main/java/neqsim/process/util/monitor/StreamResponse.java b/src/main/java/neqsim/process/util/monitor/StreamResponse.java index 46b27e6f1b..5e057fa147 100644 --- a/src/main/java/neqsim/process/util/monitor/StreamResponse.java +++ b/src/main/java/neqsim/process/util/monitor/StreamResponse.java @@ -15,6 +15,7 @@ * @version $Id: $Id */ public class StreamResponse { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(StreamResponse.class); public String name; public HashMap> properties = @@ -29,8 +30,7 @@ public class StreamResponse { * Constructor for StreamResponse. *

* - * @param inputStream a {@link neqsim.process.equipment.stream.StreamInterface} - * object + * @param inputStream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public StreamResponse(StreamInterface inputStream) { name = inputStream.getName(); diff --git a/src/main/java/neqsim/process/util/report/Report.java b/src/main/java/neqsim/process/util/report/Report.java index cc8e41b743..b78dc2001d 100644 --- a/src/main/java/neqsim/process/util/report/Report.java +++ b/src/main/java/neqsim/process/util/report/Report.java @@ -24,6 +24,7 @@ * @version $Id: $Id */ public class Report { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(Report.class); ProcessSystem process = null; ProcessEquipmentBaseClass processEquipment = null; @@ -56,8 +57,8 @@ public Report(SystemInterface fluid) { * Constructor for Report. *

* - * @param processEquipmentBaseClass a - * {@link neqsim.process.equipment.ProcessEquipmentBaseClass} object + * @param processEquipmentBaseClass a {@link neqsim.process.equipment.ProcessEquipmentBaseClass} + * object */ public Report(ProcessEquipmentBaseClass processEquipmentBaseClass) { processEquipment = processEquipmentBaseClass; @@ -79,8 +80,8 @@ public Report(ProcessModule processModule) { * Constructor for Report. *

* - * @param processModuleBaseClass a - * {@link neqsim.process.processmodel.ProcessModuleBaseClass} object + * @param processModuleBaseClass a {@link neqsim.process.processmodel.ProcessModuleBaseClass} + * object */ public Report(ProcessModuleBaseClass processModuleBaseClass) { // TODO Auto-generated constructor stub diff --git a/src/main/java/neqsim/pvtsimulation/simulation/ConstantMassExpansion.java b/src/main/java/neqsim/pvtsimulation/simulation/ConstantMassExpansion.java index 171114dc5f..5e998b3e72 100644 --- a/src/main/java/neqsim/pvtsimulation/simulation/ConstantMassExpansion.java +++ b/src/main/java/neqsim/pvtsimulation/simulation/ConstantMassExpansion.java @@ -21,6 +21,7 @@ * @version $Id: $Id */ public class ConstantMassExpansion extends BasePVTsimulation { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(ConstantMassExpansion.class); double[] relativeVolume = null; diff --git a/src/main/java/neqsim/pvtsimulation/simulation/ConstantVolumeDepletion.java b/src/main/java/neqsim/pvtsimulation/simulation/ConstantVolumeDepletion.java index 67875605a2..ff589051df 100644 --- a/src/main/java/neqsim/pvtsimulation/simulation/ConstantVolumeDepletion.java +++ b/src/main/java/neqsim/pvtsimulation/simulation/ConstantVolumeDepletion.java @@ -21,6 +21,7 @@ * @version $Id: $Id */ public class ConstantVolumeDepletion extends BasePVTsimulation { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(ConstantVolumeDepletion.class); private double[] relativeVolume = null; diff --git a/src/main/java/neqsim/pvtsimulation/simulation/DensitySim.java b/src/main/java/neqsim/pvtsimulation/simulation/DensitySim.java index 37f75e0742..98e86e9f47 100644 --- a/src/main/java/neqsim/pvtsimulation/simulation/DensitySim.java +++ b/src/main/java/neqsim/pvtsimulation/simulation/DensitySim.java @@ -20,6 +20,7 @@ * @version $Id: $Id */ public class DensitySim extends BasePVTsimulation { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(DensitySim.class); double[] temperature = null; diff --git a/src/main/java/neqsim/pvtsimulation/simulation/DifferentialLiberation.java b/src/main/java/neqsim/pvtsimulation/simulation/DifferentialLiberation.java index e3f414c794..f919ed1957 100644 --- a/src/main/java/neqsim/pvtsimulation/simulation/DifferentialLiberation.java +++ b/src/main/java/neqsim/pvtsimulation/simulation/DifferentialLiberation.java @@ -17,6 +17,7 @@ * @version $Id: $Id */ public class DifferentialLiberation extends BasePVTsimulation { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(DifferentialLiberation.class); double VoilStd = 0.0; diff --git a/src/main/java/neqsim/pvtsimulation/simulation/SeparatorTest.java b/src/main/java/neqsim/pvtsimulation/simulation/SeparatorTest.java index ae06d9eb0a..e1f7c81ea5 100644 --- a/src/main/java/neqsim/pvtsimulation/simulation/SeparatorTest.java +++ b/src/main/java/neqsim/pvtsimulation/simulation/SeparatorTest.java @@ -17,6 +17,7 @@ * @version $Id: $Id */ public class SeparatorTest extends BasePVTsimulation { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(SeparatorTest.class); double[] temperature = null; diff --git a/src/main/java/neqsim/pvtsimulation/simulation/SlimTubeSim.java b/src/main/java/neqsim/pvtsimulation/simulation/SlimTubeSim.java index a7694f52e8..6f134f2a87 100644 --- a/src/main/java/neqsim/pvtsimulation/simulation/SlimTubeSim.java +++ b/src/main/java/neqsim/pvtsimulation/simulation/SlimTubeSim.java @@ -17,6 +17,7 @@ * @version $Id: $Id */ public class SlimTubeSim extends BasePVTsimulation { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(SlimTubeSim.class); SystemInterface inectionGasSystem = null; private int numberOfSlimTubeNodes = 200; diff --git a/src/main/java/neqsim/pvtsimulation/simulation/SwellingTest.java b/src/main/java/neqsim/pvtsimulation/simulation/SwellingTest.java index 037f3f741f..8796f4cb02 100644 --- a/src/main/java/neqsim/pvtsimulation/simulation/SwellingTest.java +++ b/src/main/java/neqsim/pvtsimulation/simulation/SwellingTest.java @@ -15,6 +15,7 @@ * @version $Id: $Id */ public class SwellingTest extends BasePVTsimulation { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(SwellingTest.class); double[] gasInjected = null; diff --git a/src/main/java/neqsim/pvtsimulation/simulation/ViscositySim.java b/src/main/java/neqsim/pvtsimulation/simulation/ViscositySim.java index 5c61c37745..e202c81505 100644 --- a/src/main/java/neqsim/pvtsimulation/simulation/ViscositySim.java +++ b/src/main/java/neqsim/pvtsimulation/simulation/ViscositySim.java @@ -20,6 +20,7 @@ * @version $Id: $Id */ public class ViscositySim extends BasePVTsimulation { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(ViscositySim.class); double[] temperature = null; diff --git a/src/main/java/neqsim/pvtsimulation/simulation/ViscosityWaxOilSim.java b/src/main/java/neqsim/pvtsimulation/simulation/ViscosityWaxOilSim.java index 6e9ac7d5bd..1803bb8c3d 100644 --- a/src/main/java/neqsim/pvtsimulation/simulation/ViscosityWaxOilSim.java +++ b/src/main/java/neqsim/pvtsimulation/simulation/ViscosityWaxOilSim.java @@ -20,6 +20,7 @@ * @version $Id: $Id */ public class ViscosityWaxOilSim extends BasePVTsimulation { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(ViscosityWaxOilSim.class); double[] temperature = null; diff --git a/src/main/java/neqsim/pvtsimulation/simulation/WaxFractionSim.java b/src/main/java/neqsim/pvtsimulation/simulation/WaxFractionSim.java index 27130e8f6e..e6b50d9314 100644 --- a/src/main/java/neqsim/pvtsimulation/simulation/WaxFractionSim.java +++ b/src/main/java/neqsim/pvtsimulation/simulation/WaxFractionSim.java @@ -20,6 +20,7 @@ * @version $Id: $Id */ public class WaxFractionSim extends BasePVTsimulation { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(WaxFractionSim.class); double[] temperature = null; diff --git a/src/main/java/neqsim/pvtsimulation/util/parameterfitting/TestFitToOilFieldFluid.java b/src/main/java/neqsim/pvtsimulation/util/parameterfitting/TestFitToOilFieldFluid.java index 4bd897907f..ca1b06a4b5 100644 --- a/src/main/java/neqsim/pvtsimulation/util/parameterfitting/TestFitToOilFieldFluid.java +++ b/src/main/java/neqsim/pvtsimulation/util/parameterfitting/TestFitToOilFieldFluid.java @@ -19,6 +19,7 @@ * @version $Id: $Id */ public class TestFitToOilFieldFluid { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(TestFitToOilFieldFluid.class); /** diff --git a/src/main/java/neqsim/pvtsimulation/util/parameterfitting/TestSaturationPresFunction.java b/src/main/java/neqsim/pvtsimulation/util/parameterfitting/TestSaturationPresFunction.java index 334df2a26e..977438da15 100644 --- a/src/main/java/neqsim/pvtsimulation/util/parameterfitting/TestSaturationPresFunction.java +++ b/src/main/java/neqsim/pvtsimulation/util/parameterfitting/TestSaturationPresFunction.java @@ -19,6 +19,7 @@ * @version $Id: $Id */ public class TestSaturationPresFunction { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(TestSaturationPresFunction.class); /** diff --git a/src/main/java/neqsim/pvtsimulation/util/parameterfitting/TestWaxTuning.java b/src/main/java/neqsim/pvtsimulation/util/parameterfitting/TestWaxTuning.java index 5cefe5f6f2..c018785a22 100644 --- a/src/main/java/neqsim/pvtsimulation/util/parameterfitting/TestWaxTuning.java +++ b/src/main/java/neqsim/pvtsimulation/util/parameterfitting/TestWaxTuning.java @@ -19,6 +19,7 @@ * @version $Id: $Id */ public class TestWaxTuning { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(TestWaxTuning.class); /** diff --git a/src/main/java/neqsim/standards/Standard.java b/src/main/java/neqsim/standards/Standard.java index 85f6983496..e6b717dc74 100644 --- a/src/main/java/neqsim/standards/Standard.java +++ b/src/main/java/neqsim/standards/Standard.java @@ -30,7 +30,8 @@ * @version $Id: $Id */ public abstract class Standard extends NamedBaseClass implements StandardInterface { - private static final long serialVersionUID = 1L; + /** Serialization version UID. */ + private static final long serialVersionUID = 1000; protected String standardDescription = "Base Description"; protected ContractInterface salesContract = new BaseContract(); protected String[][] resultTable = null; diff --git a/src/main/java/neqsim/standards/gasquality/BestPracticeHydrocarbonDewPoint.java b/src/main/java/neqsim/standards/gasquality/BestPracticeHydrocarbonDewPoint.java index 6fa360cd1a..472ee3ed71 100644 --- a/src/main/java/neqsim/standards/gasquality/BestPracticeHydrocarbonDewPoint.java +++ b/src/main/java/neqsim/standards/gasquality/BestPracticeHydrocarbonDewPoint.java @@ -15,9 +15,11 @@ * @version $Id: $Id */ public class BestPracticeHydrocarbonDewPoint extends neqsim.standards.Standard { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(BestPracticeHydrocarbonDewPoint.class); - private static final long serialVersionUID = 1L; + /** Serialization version UID. */ + private static final long serialVersionUID = 1000; String dewPointTemperatureUnit = "C"; String pressureUnit = "bar"; double dewPointTemperature = 273.0; diff --git a/src/main/java/neqsim/standards/gasquality/Draft_GERG2004.java b/src/main/java/neqsim/standards/gasquality/Draft_GERG2004.java index 9254e8136f..86301410ca 100644 --- a/src/main/java/neqsim/standards/gasquality/Draft_GERG2004.java +++ b/src/main/java/neqsim/standards/gasquality/Draft_GERG2004.java @@ -17,7 +17,9 @@ * @version $Id: $Id */ public class Draft_GERG2004 extends neqsim.standards.Standard { - private static final long serialVersionUID = 1L; + /** Serialization version UID. */ + private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(Draft_GERG2004.class); double specPressure = 70.0; diff --git a/src/main/java/neqsim/standards/gasquality/Draft_ISO18453.java b/src/main/java/neqsim/standards/gasquality/Draft_ISO18453.java index d09ea97db8..4411e1ff1e 100644 --- a/src/main/java/neqsim/standards/gasquality/Draft_ISO18453.java +++ b/src/main/java/neqsim/standards/gasquality/Draft_ISO18453.java @@ -15,7 +15,9 @@ * @version $Id: $Id */ public class Draft_ISO18453 extends neqsim.standards.Standard { - private static final long serialVersionUID = 1L; + /** Serialization version UID. */ + private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(Draft_ISO18453.class); String dewPointTemperatureUnit = "C"; String pressureUnit = "bar"; diff --git a/src/main/java/neqsim/standards/gasquality/GasChromotograpyhBase.java b/src/main/java/neqsim/standards/gasquality/GasChromotograpyhBase.java index dffb95d55e..096ef8176f 100644 --- a/src/main/java/neqsim/standards/gasquality/GasChromotograpyhBase.java +++ b/src/main/java/neqsim/standards/gasquality/GasChromotograpyhBase.java @@ -11,7 +11,8 @@ * @version $Id: $Id */ public class GasChromotograpyhBase extends neqsim.standards.Standard { - private static final long serialVersionUID = 1L; + /** Serialization version UID. */ + private static final long serialVersionUID = 1000; String unit = "mol%"; /** diff --git a/src/main/java/neqsim/standards/gasquality/Standard_ISO15403.java b/src/main/java/neqsim/standards/gasquality/Standard_ISO15403.java index cf05c1ada1..a5631ae8f7 100644 --- a/src/main/java/neqsim/standards/gasquality/Standard_ISO15403.java +++ b/src/main/java/neqsim/standards/gasquality/Standard_ISO15403.java @@ -10,7 +10,8 @@ * @author ASMF */ public class Standard_ISO15403 extends neqsim.standards.Standard { - private static final long serialVersionUID = 1L; + /** Serialization version UID. */ + private static final long serialVersionUID = 1000; private double NM; private double MON; diff --git a/src/main/java/neqsim/standards/gasquality/Standard_ISO6578.java b/src/main/java/neqsim/standards/gasquality/Standard_ISO6578.java index cf186c048c..b338963aa8 100644 --- a/src/main/java/neqsim/standards/gasquality/Standard_ISO6578.java +++ b/src/main/java/neqsim/standards/gasquality/Standard_ISO6578.java @@ -15,7 +15,8 @@ * @version $Id: $Id */ public class Standard_ISO6578 extends neqsim.standards.Standard { - private static final long serialVersionUID = 1L; + /** Serialization version UID. */ + private static final long serialVersionUID = 1000; double LNGdensity = 0.0; String densityUnit = "kg/m^3"; double KMcorrectionFactor1 = 0.0; diff --git a/src/main/java/neqsim/standards/gasquality/Standard_ISO6974.java b/src/main/java/neqsim/standards/gasquality/Standard_ISO6974.java index 854f80b249..6bb00a18cf 100644 --- a/src/main/java/neqsim/standards/gasquality/Standard_ISO6974.java +++ b/src/main/java/neqsim/standards/gasquality/Standard_ISO6974.java @@ -11,7 +11,8 @@ * @version $Id: $Id */ public class Standard_ISO6974 extends GasChromotograpyhBase { - private static final long serialVersionUID = 1L; + /** Serialization version UID. */ + private static final long serialVersionUID = 1000; /** *

diff --git a/src/main/java/neqsim/standards/gasquality/Standard_ISO6976.java b/src/main/java/neqsim/standards/gasquality/Standard_ISO6976.java index 4198aee662..1df4d2deba 100644 --- a/src/main/java/neqsim/standards/gasquality/Standard_ISO6976.java +++ b/src/main/java/neqsim/standards/gasquality/Standard_ISO6976.java @@ -18,7 +18,9 @@ */ public class Standard_ISO6976 extends neqsim.standards.Standard implements neqsim.thermo.ThermodynamicConstantsInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(Standard_ISO6976.class); // metering conditions diff --git a/src/main/java/neqsim/standards/gasquality/Standard_ISO6976_2016.java b/src/main/java/neqsim/standards/gasquality/Standard_ISO6976_2016.java index 62ea3b471d..67a2b15723 100644 --- a/src/main/java/neqsim/standards/gasquality/Standard_ISO6976_2016.java +++ b/src/main/java/neqsim/standards/gasquality/Standard_ISO6976_2016.java @@ -13,7 +13,9 @@ * @version $Id: $Id */ public class Standard_ISO6976_2016 extends Standard_ISO6976 { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(Standard_ISO6976_2016.class); // metering conditions diff --git a/src/main/java/neqsim/standards/gasquality/SulfurSpecificationMethod.java b/src/main/java/neqsim/standards/gasquality/SulfurSpecificationMethod.java index 7468939fb0..0c444e1df9 100644 --- a/src/main/java/neqsim/standards/gasquality/SulfurSpecificationMethod.java +++ b/src/main/java/neqsim/standards/gasquality/SulfurSpecificationMethod.java @@ -11,7 +11,8 @@ * @version $Id: $Id */ public class SulfurSpecificationMethod extends neqsim.standards.Standard { - private static final long serialVersionUID = 1L; + /** Serialization version UID. */ + private static final long serialVersionUID = 1000; String unit = "ppm"; double H2Scontent = 0.0; diff --git a/src/main/java/neqsim/standards/gasquality/UKspecifications_ICF_SI.java b/src/main/java/neqsim/standards/gasquality/UKspecifications_ICF_SI.java index f325981fc0..4e58ff24d5 100644 --- a/src/main/java/neqsim/standards/gasquality/UKspecifications_ICF_SI.java +++ b/src/main/java/neqsim/standards/gasquality/UKspecifications_ICF_SI.java @@ -16,7 +16,9 @@ * @version $Id: $Id */ public class UKspecifications_ICF_SI extends neqsim.standards.Standard { - private static final long serialVersionUID = 1L; + /** Serialization version UID. */ + private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(UKspecifications_ICF_SI.class); String componentName = ""; diff --git a/src/main/java/neqsim/standards/oilquality/Standard_ASTM_D6377.java b/src/main/java/neqsim/standards/oilquality/Standard_ASTM_D6377.java index 6baacf2b6b..217e99082e 100644 --- a/src/main/java/neqsim/standards/oilquality/Standard_ASTM_D6377.java +++ b/src/main/java/neqsim/standards/oilquality/Standard_ASTM_D6377.java @@ -17,7 +17,9 @@ * @version $Id: $Id */ public class Standard_ASTM_D6377 extends neqsim.standards.Standard { - private static final long serialVersionUID = 1L; + /** Serialization version UID. */ + private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(Standard_ASTM_D6377.class); String unit = "bara"; diff --git a/src/main/java/neqsim/standards/salescontract/BaseContract.java b/src/main/java/neqsim/standards/salescontract/BaseContract.java index c4875193c9..ea15a74181 100644 --- a/src/main/java/neqsim/standards/salescontract/BaseContract.java +++ b/src/main/java/neqsim/standards/salescontract/BaseContract.java @@ -34,6 +34,7 @@ * @version $Id: $Id */ public class BaseContract implements ContractInterface { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(BaseContract.class); private String[][] resultTable = new String[50][9]; diff --git a/src/main/java/neqsim/standards/salescontract/ContractSpecification.java b/src/main/java/neqsim/standards/salescontract/ContractSpecification.java index 61fa1b255a..25e57a60d2 100644 --- a/src/main/java/neqsim/standards/salescontract/ContractSpecification.java +++ b/src/main/java/neqsim/standards/salescontract/ContractSpecification.java @@ -18,7 +18,8 @@ * @version $Id: $Id */ public class ContractSpecification extends NamedBaseClass { - private static final long serialVersionUID = 1L; + /** Serialization version UID. */ + private static final long serialVersionUID = 1000; StandardInterface standard = null; String specification = "dew point temperature specification"; private String country = ""; diff --git a/src/main/java/neqsim/statistics/experimentalsamplecreation/readdatafromfile/DataReader.java b/src/main/java/neqsim/statistics/experimentalsamplecreation/readdatafromfile/DataReader.java index e42ccd81ee..37037731fe 100644 --- a/src/main/java/neqsim/statistics/experimentalsamplecreation/readdatafromfile/DataReader.java +++ b/src/main/java/neqsim/statistics/experimentalsamplecreation/readdatafromfile/DataReader.java @@ -22,6 +22,7 @@ * @version $Id: $Id */ public class DataReader implements DataReaderInterface { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(DataReader.class); protected String fileName; diff --git a/src/main/java/neqsim/statistics/experimentalsamplecreation/readdatafromfile/wettedwallcolumnreader/WettedWallDataReader.java b/src/main/java/neqsim/statistics/experimentalsamplecreation/readdatafromfile/wettedwallcolumnreader/WettedWallDataReader.java index 8c67be7619..cfd8a4124a 100644 --- a/src/main/java/neqsim/statistics/experimentalsamplecreation/readdatafromfile/wettedwallcolumnreader/WettedWallDataReader.java +++ b/src/main/java/neqsim/statistics/experimentalsamplecreation/readdatafromfile/wettedwallcolumnreader/WettedWallDataReader.java @@ -22,6 +22,7 @@ * @version $Id: $Id */ public class WettedWallDataReader extends DataReader { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(WettedWallDataReader.class); /** diff --git a/src/main/java/neqsim/statistics/parameterfitting/BaseFunction.java b/src/main/java/neqsim/statistics/parameterfitting/BaseFunction.java index 3a61483302..0bbe2d6506 100644 --- a/src/main/java/neqsim/statistics/parameterfitting/BaseFunction.java +++ b/src/main/java/neqsim/statistics/parameterfitting/BaseFunction.java @@ -15,6 +15,7 @@ * @version $Id: $Id */ public abstract class BaseFunction implements FunctionInterface { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(BaseFunction.class); public double[] params = null; public double[][] bounds = null; diff --git a/src/main/java/neqsim/statistics/parameterfitting/NumericalDerivative.java b/src/main/java/neqsim/statistics/parameterfitting/NumericalDerivative.java index 71a2207993..72a3772f1f 100644 --- a/src/main/java/neqsim/statistics/parameterfitting/NumericalDerivative.java +++ b/src/main/java/neqsim/statistics/parameterfitting/NumericalDerivative.java @@ -15,6 +15,7 @@ * @version $Id: $Id */ public final class NumericalDerivative implements java.io.Serializable { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; static final double CON = 1.4; diff --git a/src/main/java/neqsim/statistics/parameterfitting/SampleSet.java b/src/main/java/neqsim/statistics/parameterfitting/SampleSet.java index 10d2d77ca7..52ec069286 100644 --- a/src/main/java/neqsim/statistics/parameterfitting/SampleSet.java +++ b/src/main/java/neqsim/statistics/parameterfitting/SampleSet.java @@ -20,6 +20,7 @@ * @version $Id: $Id */ public class SampleSet implements Cloneable { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(SampleSet.class); private ArrayList samples = new ArrayList(1); diff --git a/src/main/java/neqsim/statistics/parameterfitting/SampleValue.java b/src/main/java/neqsim/statistics/parameterfitting/SampleValue.java index 1188339d3d..45e8f83aae 100644 --- a/src/main/java/neqsim/statistics/parameterfitting/SampleValue.java +++ b/src/main/java/neqsim/statistics/parameterfitting/SampleValue.java @@ -20,6 +20,7 @@ * @version $Id: $Id */ public class SampleValue implements Cloneable { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(SampleValue.class); protected FunctionInterface testFunction; double sampleValue = 0; diff --git a/src/main/java/neqsim/statistics/parameterfitting/StatisticsBaseClass.java b/src/main/java/neqsim/statistics/parameterfitting/StatisticsBaseClass.java index b368646f9e..ba70f6e79d 100644 --- a/src/main/java/neqsim/statistics/parameterfitting/StatisticsBaseClass.java +++ b/src/main/java/neqsim/statistics/parameterfitting/StatisticsBaseClass.java @@ -28,6 +28,7 @@ * @version $Id: $Id */ public abstract class StatisticsBaseClass implements Cloneable, StatisticsInterface { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(StatisticsBaseClass.class); protected SampleSet sampleSet = new SampleSet(); diff --git a/src/main/java/neqsim/statistics/parameterfitting/nonlinearparameterfitting/LevenbergMarquardt.java b/src/main/java/neqsim/statistics/parameterfitting/nonlinearparameterfitting/LevenbergMarquardt.java index 3ab5281439..059b61c3a0 100644 --- a/src/main/java/neqsim/statistics/parameterfitting/nonlinearparameterfitting/LevenbergMarquardt.java +++ b/src/main/java/neqsim/statistics/parameterfitting/nonlinearparameterfitting/LevenbergMarquardt.java @@ -22,6 +22,7 @@ * @version $Id: $Id */ public class LevenbergMarquardt extends StatisticsBaseClass { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(LevenbergMarquardt.class); double oldChiSquare = 1e100; double newChiSquare = 0; diff --git a/src/main/java/neqsim/thermo/Fluid.java b/src/main/java/neqsim/thermo/Fluid.java index 45a93ffbb2..43be92a5d5 100644 --- a/src/main/java/neqsim/thermo/Fluid.java +++ b/src/main/java/neqsim/thermo/Fluid.java @@ -13,6 +13,7 @@ * @version $Id: $Id */ public class Fluid { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(Fluid.class); neqsim.thermo.system.SystemInterface fluid = null; diff --git a/src/main/java/neqsim/thermo/ThermodynamicModelTest.java b/src/main/java/neqsim/thermo/ThermodynamicModelTest.java index 728f749126..628ede3283 100644 --- a/src/main/java/neqsim/thermo/ThermodynamicModelTest.java +++ b/src/main/java/neqsim/thermo/ThermodynamicModelTest.java @@ -19,7 +19,9 @@ * @version $Id: $Id */ public class ThermodynamicModelTest implements ThermodynamicConstantsInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(ThermodynamicModelTest.class); SystemInterface system; diff --git a/src/main/java/neqsim/thermo/atomelement/Element.java b/src/main/java/neqsim/thermo/atomelement/Element.java index 9dfacdec71..53c0f88031 100644 --- a/src/main/java/neqsim/thermo/atomelement/Element.java +++ b/src/main/java/neqsim/thermo/atomelement/Element.java @@ -20,7 +20,9 @@ * @version $Id: $Id */ public class Element implements ThermodynamicConstantsInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(Element.class); private String name; diff --git a/src/main/java/neqsim/thermo/atomelement/UNIFACgroup.java b/src/main/java/neqsim/thermo/atomelement/UNIFACgroup.java index 334ec573b3..dc99a3ffe7 100644 --- a/src/main/java/neqsim/thermo/atomelement/UNIFACgroup.java +++ b/src/main/java/neqsim/thermo/atomelement/UNIFACgroup.java @@ -18,7 +18,9 @@ * @version $Id: $Id */ public class UNIFACgroup implements ThermodynamicConstantsInterface, Comparable { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(UNIFACgroup.class); double R = 0.0; diff --git a/src/main/java/neqsim/thermo/characterization/Characterise.java b/src/main/java/neqsim/thermo/characterization/Characterise.java index 3c598c8686..40033e499d 100644 --- a/src/main/java/neqsim/thermo/characterization/Characterise.java +++ b/src/main/java/neqsim/thermo/characterization/Characterise.java @@ -13,7 +13,9 @@ * @version $Id: $Id */ public class Characterise implements java.io.Serializable, Cloneable { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(Characterise.class); SystemInterface system = null; diff --git a/src/main/java/neqsim/thermo/characterization/LumpingModel.java b/src/main/java/neqsim/thermo/characterization/LumpingModel.java index 4d85337f74..73f6e0d216 100644 --- a/src/main/java/neqsim/thermo/characterization/LumpingModel.java +++ b/src/main/java/neqsim/thermo/characterization/LumpingModel.java @@ -13,7 +13,9 @@ * @version $Id: $Id */ public class LumpingModel implements java.io.Serializable { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(LumpingModel.class); int numberOfLumpedComponents = 7; @@ -43,6 +45,7 @@ public LumpingModel(SystemInterface system) { */ public class StandardLumpingModel implements LumpingModelInterface, Cloneable, java.io.Serializable { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; public StandardLumpingModel() {} @@ -212,6 +215,7 @@ public double getFractionOfHeavyEnd(int i) { * @version 1.0 */ public class PVTLumpingModel extends StandardLumpingModel { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; public PVTLumpingModel() {} @@ -325,6 +329,7 @@ public double getFractionOfHeavyEnd(int i) { * @version 1.0 */ public class NoLumpingModel extends StandardLumpingModel { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; public NoLumpingModel() {} diff --git a/src/main/java/neqsim/thermo/characterization/NewtonSolveAB.java b/src/main/java/neqsim/thermo/characterization/NewtonSolveAB.java index cadd4f7cc2..034f621ca7 100644 --- a/src/main/java/neqsim/thermo/characterization/NewtonSolveAB.java +++ b/src/main/java/neqsim/thermo/characterization/NewtonSolveAB.java @@ -14,7 +14,9 @@ * @version $Id: $Id */ public class NewtonSolveAB implements java.io.Serializable { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(NewtonSolveAB.class); int iter = 0; diff --git a/src/main/java/neqsim/thermo/characterization/NewtonSolveABCD.java b/src/main/java/neqsim/thermo/characterization/NewtonSolveABCD.java index 57ef607efb..2eb8f27511 100644 --- a/src/main/java/neqsim/thermo/characterization/NewtonSolveABCD.java +++ b/src/main/java/neqsim/thermo/characterization/NewtonSolveABCD.java @@ -14,7 +14,9 @@ * @version $Id: $Id */ public class NewtonSolveABCD implements java.io.Serializable { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(NewtonSolveABCD.class); int iter = 0; diff --git a/src/main/java/neqsim/thermo/characterization/NewtonSolveCDplus.java b/src/main/java/neqsim/thermo/characterization/NewtonSolveCDplus.java index 11f9e0db87..5053780b17 100644 --- a/src/main/java/neqsim/thermo/characterization/NewtonSolveCDplus.java +++ b/src/main/java/neqsim/thermo/characterization/NewtonSolveCDplus.java @@ -14,7 +14,9 @@ * @version $Id: $Id */ public class NewtonSolveCDplus implements java.io.Serializable { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(NewtonSolveCDplus.class); int iter = 0; diff --git a/src/main/java/neqsim/thermo/characterization/PedersenPlusModelSolver.java b/src/main/java/neqsim/thermo/characterization/PedersenPlusModelSolver.java index 360a3262bd..b128e59489 100644 --- a/src/main/java/neqsim/thermo/characterization/PedersenPlusModelSolver.java +++ b/src/main/java/neqsim/thermo/characterization/PedersenPlusModelSolver.java @@ -14,7 +14,9 @@ * @version $Id: $Id */ public class PedersenPlusModelSolver implements java.io.Serializable { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(PedersenPlusModelSolver.class); int iter = 0; diff --git a/src/main/java/neqsim/thermo/characterization/PlusCharacterize.java b/src/main/java/neqsim/thermo/characterization/PlusCharacterize.java index d926fde9a7..c26bf21d83 100644 --- a/src/main/java/neqsim/thermo/characterization/PlusCharacterize.java +++ b/src/main/java/neqsim/thermo/characterization/PlusCharacterize.java @@ -14,7 +14,9 @@ * @version $Id: $Id */ public class PlusCharacterize implements java.io.Serializable, CharacteriseInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(PlusCharacterize.class); double[] TBPfractions = null; diff --git a/src/main/java/neqsim/thermo/characterization/PlusFractionModel.java b/src/main/java/neqsim/thermo/characterization/PlusFractionModel.java index e95773cc87..04a89cefc8 100644 --- a/src/main/java/neqsim/thermo/characterization/PlusFractionModel.java +++ b/src/main/java/neqsim/thermo/characterization/PlusFractionModel.java @@ -13,7 +13,9 @@ * @version $Id: $Id */ public class PlusFractionModel implements java.io.Serializable { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(PlusFractionModel.class); + /** Serialization version UID. */ private static final long serialVersionUID = 1000; private String name = ""; private SystemInterface system = null; @@ -43,6 +45,7 @@ public PlusFractionModel(SystemInterface system) { } class PedersenPlusModel implements PlusFractionModelInterface, Cloneable { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; double[] coefs = {4.4660105006, -1.1266303727, 0.80, 0.0408709562}; @@ -302,6 +305,7 @@ public void setLastPlusFractionNumber(int fract) { } private class PedersenHeavyOilPlusModel extends PedersenPlusModel { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; public PedersenHeavyOilPlusModel() { @@ -313,7 +317,8 @@ public PedersenHeavyOilPlusModel() { class WhitsonGammaModel extends PedersenPlusModel { - private static final long serialVersionUID = 1L; + /** Serialization version UID. */ + private static final long serialVersionUID = 1000; public double[] zValues; public double[] molarMasses; public double[] densities; diff --git a/src/main/java/neqsim/thermo/characterization/TBPCharacterize.java b/src/main/java/neqsim/thermo/characterization/TBPCharacterize.java index 31fd1ed4b4..542ef3afde 100644 --- a/src/main/java/neqsim/thermo/characterization/TBPCharacterize.java +++ b/src/main/java/neqsim/thermo/characterization/TBPCharacterize.java @@ -17,6 +17,7 @@ * @version $Id: $Id */ public class TBPCharacterize extends PlusCharacterize { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; int startPlus = 7; int endPlus = 20; diff --git a/src/main/java/neqsim/thermo/characterization/TBPfractionModel.java b/src/main/java/neqsim/thermo/characterization/TBPfractionModel.java index 1d06a7f978..3d533969b2 100644 --- a/src/main/java/neqsim/thermo/characterization/TBPfractionModel.java +++ b/src/main/java/neqsim/thermo/characterization/TBPfractionModel.java @@ -14,7 +14,9 @@ * @version $Id: $Id */ public class TBPfractionModel implements java.io.Serializable { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(TBPfractionModel.class); String name = ""; @@ -30,6 +32,7 @@ public TBPfractionModel() {} * Base model for something. */ public abstract class TBPBaseModel implements TBPModelInterface, Cloneable, java.io.Serializable { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; protected boolean calcm = true; @@ -125,6 +128,7 @@ public boolean isCalcm() { * PedersenTBPModelSRK */ public class PedersenTBPModelSRK extends TBPBaseModel { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; double[][] TBPfractionCoefOil = {{163.12, 86.052, 0.43475, -1877.4, 0.0}, @@ -195,6 +199,7 @@ public double calcRacketZ(SystemInterface thermoSystem, double molarMass, double } public class PedersenTBPModelSRKHeavyOil extends PedersenTBPModelSRK { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; double[][] TBPfractionCoefsHeavyOil = {{8.3063e2, 1.75228e1, 4.55911e-2, -1.13484e4, 0.0}, @@ -211,6 +216,7 @@ public PedersenTBPModelSRKHeavyOil() { } public class PedersenTBPModelPR extends PedersenTBPModelSRK { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; public PedersenTBPModelPR() { @@ -228,6 +234,7 @@ public PedersenTBPModelPR() { } public class PedersenTBPModelPRHeavyOil extends PedersenTBPModelPR { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; public PedersenTBPModelPRHeavyOil() { @@ -242,6 +249,7 @@ public PedersenTBPModelPRHeavyOil() { } public class RiaziDaubert extends PedersenTBPModelSRK { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; public RiaziDaubert() { @@ -311,6 +319,7 @@ public double calcAcentricFactor(double molarMass, double density) { * Lee-Kesler property estimation method */ public class LeeKesler extends TBPBaseModel { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; public LeeKesler() { @@ -348,6 +357,7 @@ public double calcAcentricFactor(double molarMass, double density) { * Two property estimation method */ public class TwuModel extends TBPBaseModel { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; public TwuModel() { diff --git a/src/main/java/neqsim/thermo/characterization/WaxCharacterise.java b/src/main/java/neqsim/thermo/characterization/WaxCharacterise.java index 90947772db..744b878448 100644 --- a/src/main/java/neqsim/thermo/characterization/WaxCharacterise.java +++ b/src/main/java/neqsim/thermo/characterization/WaxCharacterise.java @@ -13,7 +13,9 @@ * @version $Id: $Id */ public class WaxCharacterise implements java.io.Serializable, Cloneable { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(WaxCharacterise.class); SystemInterface thermoSystem = null; @@ -45,6 +47,7 @@ public WaxCharacterise clone() { } public abstract class WaxBaseModel implements WaxModelInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; double[] parameterWax = new double[3]; @@ -124,6 +127,7 @@ public void setParameterWaxTriplePointTemperature(double[] parameterWaxTriplePoi } public class PedersenWaxModel extends WaxBaseModel { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; public PedersenWaxModel() { diff --git a/src/main/java/neqsim/thermo/component/Component.java b/src/main/java/neqsim/thermo/component/Component.java index 045bede3e4..5cf3461368 100644 --- a/src/main/java/neqsim/thermo/component/Component.java +++ b/src/main/java/neqsim/thermo/component/Component.java @@ -25,7 +25,9 @@ * @author Even Solbraa */ public abstract class Component implements ComponentInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(Component.class); double[] surfTensInfluenceParam = {0.28367, -0.05164, -0.81594, 1.06810, -1.1147}; diff --git a/src/main/java/neqsim/thermo/component/ComponentBWRS.java b/src/main/java/neqsim/thermo/component/ComponentBWRS.java index 575afafc87..baac6f0231 100644 --- a/src/main/java/neqsim/thermo/component/ComponentBWRS.java +++ b/src/main/java/neqsim/thermo/component/ComponentBWRS.java @@ -14,7 +14,9 @@ * @version $Id: $Id */ public class ComponentBWRS extends ComponentSrk { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(ComponentBWRS.class); int OP = 9; diff --git a/src/main/java/neqsim/thermo/component/ComponentCSPsrk.java b/src/main/java/neqsim/thermo/component/ComponentCSPsrk.java index d3ef2d951a..1214abdca9 100644 --- a/src/main/java/neqsim/thermo/component/ComponentCSPsrk.java +++ b/src/main/java/neqsim/thermo/component/ComponentCSPsrk.java @@ -12,6 +12,7 @@ * @version $Id: $Id */ public class ComponentCSPsrk extends ComponentSrk { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; double f_scale_mix_i = 0; diff --git a/src/main/java/neqsim/thermo/component/ComponentDesmukhMather.java b/src/main/java/neqsim/thermo/component/ComponentDesmukhMather.java index 5ab49ccf19..73222944b0 100644 --- a/src/main/java/neqsim/thermo/component/ComponentDesmukhMather.java +++ b/src/main/java/neqsim/thermo/component/ComponentDesmukhMather.java @@ -15,9 +15,11 @@ * @version $Id: $Id */ public class ComponentDesmukhMather extends ComponentGE { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; private double deshMathIonicDiameter = 1.0; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(ComponentDesmukhMather.class); /** diff --git a/src/main/java/neqsim/thermo/component/ComponentElectrolyteCPA.java b/src/main/java/neqsim/thermo/component/ComponentElectrolyteCPA.java index 27516f2057..25cd6d26b0 100644 --- a/src/main/java/neqsim/thermo/component/ComponentElectrolyteCPA.java +++ b/src/main/java/neqsim/thermo/component/ComponentElectrolyteCPA.java @@ -13,6 +13,7 @@ */ public class ComponentElectrolyteCPA extends ComponentModifiedFurstElectrolyteEos implements ComponentCPAInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; int cpaon = 1; diff --git a/src/main/java/neqsim/thermo/component/ComponentElectrolyteCPAOld.java b/src/main/java/neqsim/thermo/component/ComponentElectrolyteCPAOld.java index 0b6edce44b..0e6db3c965 100644 --- a/src/main/java/neqsim/thermo/component/ComponentElectrolyteCPAOld.java +++ b/src/main/java/neqsim/thermo/component/ComponentElectrolyteCPAOld.java @@ -15,7 +15,9 @@ */ public class ComponentElectrolyteCPAOld extends ComponentModifiedFurstElectrolyteEos implements ComponentCPAInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(ComponentElectrolyteCPAOld.class); int cpaon = 1; diff --git a/src/main/java/neqsim/thermo/component/ComponentElectrolyteCPAstatoil.java b/src/main/java/neqsim/thermo/component/ComponentElectrolyteCPAstatoil.java index dce4d5b8f6..a71504db16 100644 --- a/src/main/java/neqsim/thermo/component/ComponentElectrolyteCPAstatoil.java +++ b/src/main/java/neqsim/thermo/component/ComponentElectrolyteCPAstatoil.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class ComponentElectrolyteCPAstatoil extends ComponentElectrolyteCPA { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/thermo/component/ComponentEos.java b/src/main/java/neqsim/thermo/component/ComponentEos.java index 0c1ed82ffa..74b0ee4285 100644 --- a/src/main/java/neqsim/thermo/component/ComponentEos.java +++ b/src/main/java/neqsim/thermo/component/ComponentEos.java @@ -40,6 +40,7 @@ * @author Even Solbraa */ public abstract class ComponentEos extends Component implements ComponentEosInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; public double a = 1; @@ -83,6 +84,7 @@ public abstract class ComponentEos extends Component implements ComponentEosInte protected double[] dAdndn = new double[ThermodynamicModelSettings.MAX_NUMBER_OF_COMPONENTS]; protected double[] dBdndn = new double[ThermodynamicModelSettings.MAX_NUMBER_OF_COMPONENTS]; private AttractiveTermInterface attractiveParameter; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(ComponentEos.class); /** diff --git a/src/main/java/neqsim/thermo/component/ComponentGE.java b/src/main/java/neqsim/thermo/component/ComponentGE.java index 0260c74beb..e55ac7404a 100644 --- a/src/main/java/neqsim/thermo/component/ComponentGE.java +++ b/src/main/java/neqsim/thermo/component/ComponentGE.java @@ -17,6 +17,7 @@ * @author Even Solbraa */ public abstract class ComponentGE extends Component implements ComponentGEInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; protected double gamma = 0; @@ -26,6 +27,7 @@ public abstract class ComponentGE extends Component implements ComponentGEInterf protected double dlngammadp = 0; protected double dlngammadtdt = 0.0; protected double[] dlngammadn; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(ComponentGE.class); /** diff --git a/src/main/java/neqsim/thermo/component/ComponentGENRTLmodifiedHV.java b/src/main/java/neqsim/thermo/component/ComponentGENRTLmodifiedHV.java index be1f98c343..34aa88928a 100644 --- a/src/main/java/neqsim/thermo/component/ComponentGENRTLmodifiedHV.java +++ b/src/main/java/neqsim/thermo/component/ComponentGENRTLmodifiedHV.java @@ -18,6 +18,7 @@ * @version $Id: $Id */ public class ComponentGENRTLmodifiedHV extends ComponentGeNRTL { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/thermo/component/ComponentGENRTLmodifiedWS.java b/src/main/java/neqsim/thermo/component/ComponentGENRTLmodifiedWS.java index aa37b657f3..244ce9a67f 100644 --- a/src/main/java/neqsim/thermo/component/ComponentGENRTLmodifiedWS.java +++ b/src/main/java/neqsim/thermo/component/ComponentGENRTLmodifiedWS.java @@ -12,6 +12,7 @@ * @version $Id: $Id */ public class ComponentGENRTLmodifiedWS extends ComponentGeNRTL { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/thermo/component/ComponentGERG2004.java b/src/main/java/neqsim/thermo/component/ComponentGERG2004.java index d35ea424cb..4850e5baaa 100644 --- a/src/main/java/neqsim/thermo/component/ComponentGERG2004.java +++ b/src/main/java/neqsim/thermo/component/ComponentGERG2004.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class ComponentGERG2004 extends ComponentEos { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/thermo/component/ComponentGEUnifac.java b/src/main/java/neqsim/thermo/component/ComponentGEUnifac.java index 7a998319d7..d616f0adc9 100644 --- a/src/main/java/neqsim/thermo/component/ComponentGEUnifac.java +++ b/src/main/java/neqsim/thermo/component/ComponentGEUnifac.java @@ -23,7 +23,9 @@ * @version $Id: $Id */ public class ComponentGEUnifac extends ComponentGEUniquac { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(ComponentGEUnifac.class); ArrayList unifacGroups = new ArrayList(); diff --git a/src/main/java/neqsim/thermo/component/ComponentGEUnifacPSRK.java b/src/main/java/neqsim/thermo/component/ComponentGEUnifacPSRK.java index c5c421dadb..037a1024c5 100644 --- a/src/main/java/neqsim/thermo/component/ComponentGEUnifacPSRK.java +++ b/src/main/java/neqsim/thermo/component/ComponentGEUnifacPSRK.java @@ -13,6 +13,7 @@ * @version $Id: $Id */ public class ComponentGEUnifacPSRK extends ComponentGEUnifac { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; double[][] bij = new double[1][1]; diff --git a/src/main/java/neqsim/thermo/component/ComponentGEUnifacUMRPRU.java b/src/main/java/neqsim/thermo/component/ComponentGEUnifacUMRPRU.java index 7885e31c2b..a0b3e65d8c 100644 --- a/src/main/java/neqsim/thermo/component/ComponentGEUnifacUMRPRU.java +++ b/src/main/java/neqsim/thermo/component/ComponentGEUnifacUMRPRU.java @@ -17,7 +17,9 @@ * @version $Id: $Id */ public class ComponentGEUnifacUMRPRU extends ComponentGEUnifac { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(ComponentGEUnifacUMRPRU.class); int numberOfUnifacSubGroups = 139; diff --git a/src/main/java/neqsim/thermo/component/ComponentGEUniquac.java b/src/main/java/neqsim/thermo/component/ComponentGEUniquac.java index 752a6746e2..a7d083d342 100644 --- a/src/main/java/neqsim/thermo/component/ComponentGEUniquac.java +++ b/src/main/java/neqsim/thermo/component/ComponentGEUniquac.java @@ -20,7 +20,9 @@ * @version $Id: $Id */ public class ComponentGEUniquac extends ComponentGE { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(ComponentGEUniquac.class); double r = 0; diff --git a/src/main/java/neqsim/thermo/component/ComponentGEUniquacmodifiedHV.java b/src/main/java/neqsim/thermo/component/ComponentGEUniquacmodifiedHV.java index 609e32ab32..c4311bbe35 100644 --- a/src/main/java/neqsim/thermo/component/ComponentGEUniquacmodifiedHV.java +++ b/src/main/java/neqsim/thermo/component/ComponentGEUniquacmodifiedHV.java @@ -15,6 +15,7 @@ * @author Even Solbraa */ public abstract class ComponentGEUniquacmodifiedHV extends ComponentGEUniquac { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/thermo/component/ComponentGEWilson.java b/src/main/java/neqsim/thermo/component/ComponentGEWilson.java index 4de3d69bcd..cf448d05a8 100644 --- a/src/main/java/neqsim/thermo/component/ComponentGEWilson.java +++ b/src/main/java/neqsim/thermo/component/ComponentGEWilson.java @@ -13,6 +13,7 @@ * @version $Id: $Id */ public class ComponentGEWilson extends ComponentGE { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/thermo/component/ComponentGeDuanSun.java b/src/main/java/neqsim/thermo/component/ComponentGeDuanSun.java index 7c7ed37ae8..3e7bbae9cd 100644 --- a/src/main/java/neqsim/thermo/component/ComponentGeDuanSun.java +++ b/src/main/java/neqsim/thermo/component/ComponentGeDuanSun.java @@ -13,6 +13,7 @@ * @version $Id: $Id */ public class ComponentGeDuanSun extends ComponentGE { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; double r = 0; diff --git a/src/main/java/neqsim/thermo/component/ComponentGeNRTL.java b/src/main/java/neqsim/thermo/component/ComponentGeNRTL.java index df0150d83a..10ae1c04d3 100644 --- a/src/main/java/neqsim/thermo/component/ComponentGeNRTL.java +++ b/src/main/java/neqsim/thermo/component/ComponentGeNRTL.java @@ -12,6 +12,7 @@ * @version $Id: $Id */ public class ComponentGeNRTL extends ComponentGE { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; double r = 0; diff --git a/src/main/java/neqsim/thermo/component/ComponentHydrate.java b/src/main/java/neqsim/thermo/component/ComponentHydrate.java index c1381a654c..24ba5b47a9 100644 --- a/src/main/java/neqsim/thermo/component/ComponentHydrate.java +++ b/src/main/java/neqsim/thermo/component/ComponentHydrate.java @@ -16,7 +16,9 @@ * @version $Id: $Id */ public class ComponentHydrate extends Component { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(ComponentHydrate.class); // double[][] emptyHydrateVapourPressureConstant = {{17.6025820786, diff --git a/src/main/java/neqsim/thermo/component/ComponentHydrateBallard.java b/src/main/java/neqsim/thermo/component/ComponentHydrateBallard.java index ccf6890e5d..e23e18d119 100644 --- a/src/main/java/neqsim/thermo/component/ComponentHydrateBallard.java +++ b/src/main/java/neqsim/thermo/component/ComponentHydrateBallard.java @@ -14,7 +14,9 @@ * @version $Id: $Id */ public class ComponentHydrateBallard extends ComponentHydrate { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(ComponentHydrateBallard.class); /** diff --git a/src/main/java/neqsim/thermo/component/ComponentHydrateGF.java b/src/main/java/neqsim/thermo/component/ComponentHydrateGF.java index fc81c8e03c..3f39df23af 100644 --- a/src/main/java/neqsim/thermo/component/ComponentHydrateGF.java +++ b/src/main/java/neqsim/thermo/component/ComponentHydrateGF.java @@ -14,7 +14,9 @@ * @version $Id: $Id */ public class ComponentHydrateGF extends ComponentHydrate { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(ComponentHydrateGF.class); double[][] Ak = new double[2][2]; // [structure][cavitytype] diff --git a/src/main/java/neqsim/thermo/component/ComponentHydrateKluda.java b/src/main/java/neqsim/thermo/component/ComponentHydrateKluda.java index be9c652bd1..fcbe81f7e7 100644 --- a/src/main/java/neqsim/thermo/component/ComponentHydrateKluda.java +++ b/src/main/java/neqsim/thermo/component/ComponentHydrateKluda.java @@ -14,7 +14,9 @@ * @version $Id: $Id */ public class ComponentHydrateKluda extends Component { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(ComponentHydrateKluda.class); double par1_struc1 = 17.44; diff --git a/src/main/java/neqsim/thermo/component/ComponentHydratePVTsim.java b/src/main/java/neqsim/thermo/component/ComponentHydratePVTsim.java index 4ec13f5d2a..579b8caf20 100644 --- a/src/main/java/neqsim/thermo/component/ComponentHydratePVTsim.java +++ b/src/main/java/neqsim/thermo/component/ComponentHydratePVTsim.java @@ -15,10 +15,12 @@ * @version $Id: $Id */ public class ComponentHydratePVTsim extends ComponentHydrate { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; double[][] Ak = new double[2][2]; // [structure][cavitytype] double[][] Bk = new double[2][2]; // [structure][cavitytype] + /** Logger object for class. */ static Logger logger = LogManager.getLogger(ComponentHydratePVTsim.class); /** diff --git a/src/main/java/neqsim/thermo/component/ComponentHydrateStatoil.java b/src/main/java/neqsim/thermo/component/ComponentHydrateStatoil.java index 3715194981..4a4c577a6b 100644 --- a/src/main/java/neqsim/thermo/component/ComponentHydrateStatoil.java +++ b/src/main/java/neqsim/thermo/component/ComponentHydrateStatoil.java @@ -13,7 +13,9 @@ * @version $Id: $Id */ public class ComponentHydrateStatoil extends ComponentHydrate { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(ComponentHydrateStatoil.class); double[][] coordNumb = new double[2][2]; diff --git a/src/main/java/neqsim/thermo/component/ComponentKentEisenberg.java b/src/main/java/neqsim/thermo/component/ComponentKentEisenberg.java index a80f5c84a0..4d7d8a4529 100644 --- a/src/main/java/neqsim/thermo/component/ComponentKentEisenberg.java +++ b/src/main/java/neqsim/thermo/component/ComponentKentEisenberg.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class ComponentKentEisenberg extends ComponentGeNRTL { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/thermo/component/ComponentModifiedFurstElectrolyteEos.java b/src/main/java/neqsim/thermo/component/ComponentModifiedFurstElectrolyteEos.java index 6269cd2dc0..9ecc056ba4 100644 --- a/src/main/java/neqsim/thermo/component/ComponentModifiedFurstElectrolyteEos.java +++ b/src/main/java/neqsim/thermo/component/ComponentModifiedFurstElectrolyteEos.java @@ -18,6 +18,7 @@ * @version $Id: $Id */ public class ComponentModifiedFurstElectrolyteEos extends ComponentSrk { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; double Wi = 0; diff --git a/src/main/java/neqsim/thermo/component/ComponentModifiedFurstElectrolyteEosMod2004.java b/src/main/java/neqsim/thermo/component/ComponentModifiedFurstElectrolyteEosMod2004.java index ee1f1cef46..b15e0b75f6 100644 --- a/src/main/java/neqsim/thermo/component/ComponentModifiedFurstElectrolyteEosMod2004.java +++ b/src/main/java/neqsim/thermo/component/ComponentModifiedFurstElectrolyteEosMod2004.java @@ -18,6 +18,7 @@ * @version $Id: $Id */ public class ComponentModifiedFurstElectrolyteEosMod2004 extends ComponentSrk { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; double Wi = 0; diff --git a/src/main/java/neqsim/thermo/component/ComponentPCSAFT.java b/src/main/java/neqsim/thermo/component/ComponentPCSAFT.java index 37f1b1b61e..6a6a1ead1d 100644 --- a/src/main/java/neqsim/thermo/component/ComponentPCSAFT.java +++ b/src/main/java/neqsim/thermo/component/ComponentPCSAFT.java @@ -14,6 +14,7 @@ * @version $Id: $Id */ public class ComponentPCSAFT extends ComponentSrk { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; private double dSAFTi = 1.0; diff --git a/src/main/java/neqsim/thermo/component/ComponentPCSAFTa.java b/src/main/java/neqsim/thermo/component/ComponentPCSAFTa.java index ee3b4b6015..5bc1ed825c 100644 --- a/src/main/java/neqsim/thermo/component/ComponentPCSAFTa.java +++ b/src/main/java/neqsim/thermo/component/ComponentPCSAFTa.java @@ -12,6 +12,7 @@ * @version $Id: $Id */ public class ComponentPCSAFTa extends ComponentPCSAFT implements ComponentCPAInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; int cpaon = 1; diff --git a/src/main/java/neqsim/thermo/component/ComponentPR.java b/src/main/java/neqsim/thermo/component/ComponentPR.java index 7bd93677f8..0abe79791f 100644 --- a/src/main/java/neqsim/thermo/component/ComponentPR.java +++ b/src/main/java/neqsim/thermo/component/ComponentPR.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class ComponentPR extends ComponentEos { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/thermo/component/ComponentPRvolcor.java b/src/main/java/neqsim/thermo/component/ComponentPRvolcor.java index deba24ab9b..78bc40a1dd 100644 --- a/src/main/java/neqsim/thermo/component/ComponentPRvolcor.java +++ b/src/main/java/neqsim/thermo/component/ComponentPRvolcor.java @@ -19,6 +19,7 @@ * @version $Id: $Id */ public class ComponentPRvolcor extends ComponentPR { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; private double c; // private double calcc; diff --git a/src/main/java/neqsim/thermo/component/ComponentPrCPA.java b/src/main/java/neqsim/thermo/component/ComponentPrCPA.java index f2cb631c5a..0274c83e4d 100644 --- a/src/main/java/neqsim/thermo/component/ComponentPrCPA.java +++ b/src/main/java/neqsim/thermo/component/ComponentPrCPA.java @@ -9,6 +9,7 @@ * @author Even Solbraa */ public abstract class ComponentPrCPA extends ComponentPR implements ComponentCPAInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; int cpaon = 1; diff --git a/src/main/java/neqsim/thermo/component/ComponentRK.java b/src/main/java/neqsim/thermo/component/ComponentRK.java index 4713c9f456..0a149ab298 100644 --- a/src/main/java/neqsim/thermo/component/ComponentRK.java +++ b/src/main/java/neqsim/thermo/component/ComponentRK.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class ComponentRK extends ComponentEos { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/thermo/component/ComponentSolid.java b/src/main/java/neqsim/thermo/component/ComponentSolid.java index daf1c3d071..2db361c621 100644 --- a/src/main/java/neqsim/thermo/component/ComponentSolid.java +++ b/src/main/java/neqsim/thermo/component/ComponentSolid.java @@ -19,6 +19,7 @@ * @version $Id: $Id */ public class ComponentSolid extends ComponentSrk { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; double dpdt = 1.0; diff --git a/src/main/java/neqsim/thermo/component/ComponentSrk.java b/src/main/java/neqsim/thermo/component/ComponentSrk.java index 5db09136f5..e9aa1b1942 100644 --- a/src/main/java/neqsim/thermo/component/ComponentSrk.java +++ b/src/main/java/neqsim/thermo/component/ComponentSrk.java @@ -12,6 +12,7 @@ * @version $Id: $Id */ public class ComponentSrk extends ComponentEos { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; private double factTemp = Math.pow(2.0, 1.0 / 3.0); diff --git a/src/main/java/neqsim/thermo/component/ComponentSrkCPA.java b/src/main/java/neqsim/thermo/component/ComponentSrkCPA.java index ee9d87aa7e..3f82e542b6 100644 --- a/src/main/java/neqsim/thermo/component/ComponentSrkCPA.java +++ b/src/main/java/neqsim/thermo/component/ComponentSrkCPA.java @@ -13,6 +13,7 @@ * @version $Id: $Id */ public class ComponentSrkCPA extends ComponentSrk implements ComponentCPAInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; int cpaon = 1; diff --git a/src/main/java/neqsim/thermo/component/ComponentSrkCPAs.java b/src/main/java/neqsim/thermo/component/ComponentSrkCPAs.java index ab410861e3..45b7fc7a94 100644 --- a/src/main/java/neqsim/thermo/component/ComponentSrkCPAs.java +++ b/src/main/java/neqsim/thermo/component/ComponentSrkCPAs.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class ComponentSrkCPAs extends ComponentSrkCPA { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/thermo/component/ComponentSrkPeneloux.java b/src/main/java/neqsim/thermo/component/ComponentSrkPeneloux.java index c6eb4b5884..b824872056 100644 --- a/src/main/java/neqsim/thermo/component/ComponentSrkPeneloux.java +++ b/src/main/java/neqsim/thermo/component/ComponentSrkPeneloux.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class ComponentSrkPeneloux extends ComponentSrk { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; private double factTemp = Math.pow(2.0, 1.0 / 3.0); diff --git a/src/main/java/neqsim/thermo/component/ComponentTST.java b/src/main/java/neqsim/thermo/component/ComponentTST.java index 8a76584817..a58b65e707 100644 --- a/src/main/java/neqsim/thermo/component/ComponentTST.java +++ b/src/main/java/neqsim/thermo/component/ComponentTST.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class ComponentTST extends ComponentEos { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/thermo/component/ComponentUMRCPA.java b/src/main/java/neqsim/thermo/component/ComponentUMRCPA.java index 8495fa8528..0274ec8b30 100644 --- a/src/main/java/neqsim/thermo/component/ComponentUMRCPA.java +++ b/src/main/java/neqsim/thermo/component/ComponentUMRCPA.java @@ -13,6 +13,7 @@ * @version $Id: $Id */ public class ComponentUMRCPA extends ComponentPR implements ComponentCPAInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; int cpaon = 1; diff --git a/src/main/java/neqsim/thermo/component/ComponentWax.java b/src/main/java/neqsim/thermo/component/ComponentWax.java index 7f37d81e8b..496af4c3d5 100644 --- a/src/main/java/neqsim/thermo/component/ComponentWax.java +++ b/src/main/java/neqsim/thermo/component/ComponentWax.java @@ -14,7 +14,9 @@ * @version $Id: $Id */ public class ComponentWax extends ComponentSolid { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(ComponentWax.class); /** diff --git a/src/main/java/neqsim/thermo/component/ComponentWaxWilson.java b/src/main/java/neqsim/thermo/component/ComponentWaxWilson.java index a1b79e5702..ada600f267 100644 --- a/src/main/java/neqsim/thermo/component/ComponentWaxWilson.java +++ b/src/main/java/neqsim/thermo/component/ComponentWaxWilson.java @@ -15,7 +15,9 @@ * @version $Id: $Id */ public class ComponentWaxWilson extends ComponentSolid { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(ComponentWaxWilson.class); /** diff --git a/src/main/java/neqsim/thermo/component/ComponentWonWax.java b/src/main/java/neqsim/thermo/component/ComponentWonWax.java index 0b46ae5c61..24f01b3738 100644 --- a/src/main/java/neqsim/thermo/component/ComponentWonWax.java +++ b/src/main/java/neqsim/thermo/component/ComponentWonWax.java @@ -14,7 +14,9 @@ * @version $Id: $Id */ public class ComponentWonWax extends ComponentSolid { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(ComponentWonWax.class); /** diff --git a/src/main/java/neqsim/thermo/component/attractiveeosterm/AtractiveTermMatCopPRUMRNew.java b/src/main/java/neqsim/thermo/component/attractiveeosterm/AtractiveTermMatCopPRUMRNew.java index a036a3a8a3..4fa2b775f4 100644 --- a/src/main/java/neqsim/thermo/component/attractiveeosterm/AtractiveTermMatCopPRUMRNew.java +++ b/src/main/java/neqsim/thermo/component/attractiveeosterm/AtractiveTermMatCopPRUMRNew.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class AtractiveTermMatCopPRUMRNew extends AttractiveTermMatCopPRUMR { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; double orgpar = 0.0; boolean useStandardAlphaForSupercritical = false; diff --git a/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermBaseClass.java b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermBaseClass.java index 83e546df67..5779294ab2 100644 --- a/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermBaseClass.java +++ b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermBaseClass.java @@ -19,7 +19,9 @@ * @version $Id: $Id */ public abstract class AttractiveTermBaseClass implements AttractiveTermInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(AttractiveTermBaseClass.class); private ComponentEosInterface component = null; diff --git a/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermCPAstatoil.java b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermCPAstatoil.java index 4da372e9ac..b376592e2f 100644 --- a/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermCPAstatoil.java +++ b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermCPAstatoil.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class AttractiveTermCPAstatoil extends AttractiveTermSrk { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; double orgpar = 0.0; @@ -114,14 +115,14 @@ public double diffalphaT(double temperature) { public double diffdiffalphaT(double temperature) { double Tr = temperature / getComponent().getTC(); double TC = getComponent().getTC(); - return 2.0 * Math.pow(-parameters[0] / Math.sqrt(Tr) / TC / 2.0 - - parameters[1] * (1.0 - Math.sqrt(Tr)) / Math.sqrt(Tr) / TC + return 2.0 + * Math.pow(-parameters[0] / Math.sqrt(Tr) / TC / 2.0 + - parameters[1] * (1.0 - Math.sqrt(Tr)) / Math.sqrt(Tr) / TC - 3.0 / 2.0 * parameters[2] * Math.pow(1.0 - Math.sqrt(Tr), 2.0) / Math.sqrt(Tr) / TC, 2.0) - + 2.0 - * (1.0 + parameters[0] * (1.0 - Math.sqrt(Tr)) - + parameters[1] * Math.pow(1.0 - Math.sqrt(Tr), 2.0) - + parameters[2] * Math.pow(1.0 - Math.sqrt(Tr), 3.0)) + + 2.0 * (1.0 + parameters[0] * (1.0 - Math.sqrt(Tr)) + + parameters[1] * Math.pow(1.0 - Math.sqrt(Tr), 2.0) + + parameters[2] * Math.pow(1.0 - Math.sqrt(Tr), 3.0)) * (parameters[0] / Math.sqrt(Tr * Tr * Tr) / (TC * TC) / 4.0 + parameters[1] / temperature / TC / 2.0 + parameters[1] * (1.0 - Math.sqrt(Tr)) / Math.sqrt(Tr * Tr * Tr) / (TC * TC) / 2.0 diff --git a/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermGERG.java b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermGERG.java index 26e3a99a47..0e586372fa 100644 --- a/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermGERG.java +++ b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermGERG.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class AttractiveTermGERG extends AttractiveTermPr { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; protected double[] parametersGERG = {0.905436, -0.213781, 0.26005}; protected double[] parametersSolidGERG = {0.106025, 2.683845, -4.75638}; @@ -124,14 +125,14 @@ public double diffdiffalphaTGERG(double temperature) { double Tr = temperature / getComponent().getTC(); double TC = getComponent().getTC(); - return 2.0 * Math.pow(-parameters[0] / Math.sqrt(Tr) / TC / 2.0 - - parameters[1] * (1.0 - Math.sqrt(Tr)) / Math.sqrt(Tr) / TC + return 2.0 + * Math.pow(-parameters[0] / Math.sqrt(Tr) / TC / 2.0 + - parameters[1] * (1.0 - Math.sqrt(Tr)) / Math.sqrt(Tr) / TC - 3.0 / 2.0 * parameters[2] * Math.pow(1.0 - Math.sqrt(Tr), 2.0) / Math.sqrt(Tr) / TC, 2.0) - + 2.0 - * (1.0 + parameters[0] * (1.0 - Math.sqrt(Tr)) - + parameters[1] * Math.pow(1.0 - Math.sqrt(Tr), 2.0) - + parameters[2] * Math.pow(1.0 - Math.sqrt(Tr), 3.0)) + + 2.0 * (1.0 + parameters[0] * (1.0 - Math.sqrt(Tr)) + + parameters[1] * Math.pow(1.0 - Math.sqrt(Tr), 2.0) + + parameters[2] * Math.pow(1.0 - Math.sqrt(Tr), 3.0)) * (parameters[0] / Math.sqrt(Tr * Tr * Tr) / (TC * TC) / 4.0 + parameters[1] / temperature / TC / 2.0 + parameters[1] * (1.0 - Math.sqrt(Tr)) / Math.sqrt(Tr * Tr * Tr) / (TC * TC) / 2.0 diff --git a/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermMatCop.java b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermMatCop.java index 7a93d7c78e..bb317ff894 100644 --- a/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermMatCop.java +++ b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermMatCop.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class AttractiveTermMatCop extends AttractiveTermSrk { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; double orgpar = 0.0; diff --git a/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermMatCopPR.java b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermMatCopPR.java index 802bb45e44..f4dc69da89 100644 --- a/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermMatCopPR.java +++ b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermMatCopPR.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class AttractiveTermMatCopPR extends AttractiveTermPr { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; double orgpar = 0.0; diff --git a/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermMatCopPRUMR.java b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermMatCopPRUMR.java index b9bf922b4b..cd47ad2072 100644 --- a/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermMatCopPRUMR.java +++ b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermMatCopPRUMR.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class AttractiveTermMatCopPRUMR extends AttractiveTermPr { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; double orgpar = 0.0; boolean useStandardAlphaForSupercritical = false; diff --git a/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermMollerup.java b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermMollerup.java index f1e8a77741..0334c2c0e4 100644 --- a/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermMollerup.java +++ b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermMollerup.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class AttractiveTermMollerup extends AttractiveTermBaseClass { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermPr.java b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermPr.java index e566d2fdca..aacea5b21f 100644 --- a/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermPr.java +++ b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermPr.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class AttractiveTermPr extends AttractiveTermBaseClass { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermPr1978.java b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermPr1978.java index a3cc4b1778..cd07131a13 100644 --- a/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermPr1978.java +++ b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermPr1978.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class AttractiveTermPr1978 extends AttractiveTermPr { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermPrDanesh.java b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermPrDanesh.java index 7362bc8596..a6e3a10c9f 100644 --- a/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermPrDanesh.java +++ b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermPrDanesh.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class AttractiveTermPrDanesh extends AttractiveTermPr1978 { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; double mMod = 0; @@ -84,8 +85,8 @@ public double diffdiffalphaT(double temperature) { mMod = m; } - return mMod * mMod / temperature / getComponent().getTC() / 2.0 + (1.0 - + mMod * (1.0 - Math.sqrt(temperature / getComponent().getTC()))) * m + return mMod * mMod / temperature / getComponent().getTC() / 2.0 + + (1.0 + mMod * (1.0 - Math.sqrt(temperature / getComponent().getTC()))) * m / Math.sqrt( temperature * temperature * temperature / (Math.pow(getComponent().getTC(), 3.0))) / (getComponent().getTC() * getComponent().getTC()) / 2.0; diff --git a/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermPrDelft1998.java b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermPrDelft1998.java index 8a012fc281..2777675f1b 100644 --- a/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermPrDelft1998.java +++ b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermPrDelft1998.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class AttractiveTermPrDelft1998 extends AttractiveTermPr1978 { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; boolean isMethane = false; @@ -80,8 +81,8 @@ public double diffdiffalphaT(double temperature) { return -2.0 * 0.3256987 / Math.pow(getComponent().getTC(), 2.0) + 6.0 * 0.06653 * temperature / Math.pow(getComponent().getTC(), 3.0); } else { - return m * m / temperature / getComponent().getTC() / 2.0 + (1.0 - + m * (1.0 - Math.sqrt(temperature / getComponent().getTC()))) * m + return m * m / temperature / getComponent().getTC() / 2.0 + + (1.0 + m * (1.0 - Math.sqrt(temperature / getComponent().getTC()))) * m / Math.sqrt( temperature * temperature * temperature / (Math.pow(getComponent().getTC(), 3.0))) / (getComponent().getTC() * getComponent().getTC()) / 2.0; diff --git a/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermPrGassem2001.java b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermPrGassem2001.java index 9c1ba7bd17..3082544e20 100644 --- a/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermPrGassem2001.java +++ b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermPrGassem2001.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class AttractiveTermPrGassem2001 extends AttractiveTermPr { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; protected double A = 2.0; @@ -69,11 +70,11 @@ public double aT(double temperature) { @Override public double diffalphaT(double temperature) { return 1.0 / getComponent().getTC() * alpha(temperature) - * ((B * (1.0 - Math.pow(temperature / getComponent().getTC(), C - + D * getComponent().getAcentricFactor() + * ((B * (1.0 - Math.pow(temperature / getComponent().getTC(), + C + D * getComponent().getAcentricFactor() + E * getComponent().getAcentricFactor() * getComponent().getAcentricFactor()))) - - (A + B * temperature / getComponent().getTC()) * (C - + D * getComponent().getAcentricFactor() + - (A + B * temperature / getComponent().getTC()) + * (C + D * getComponent().getAcentricFactor() + E * getComponent().getAcentricFactor() * getComponent().getAcentricFactor()) * Math.pow(temperature / getComponent().getTC(), C + D * getComponent().getAcentricFactor() + E @@ -86,8 +87,8 @@ public double diffalphaT(double temperature) { public double diffdiffalphaT(double temperature) { // not implemented dubble derivative - return m * m / temperature / getComponent().getTC() / 2.0 + (1.0 - + m * (1.0 - Math.sqrt(temperature / getComponent().getTC()))) * m + return m * m / temperature / getComponent().getTC() / 2.0 + + (1.0 + m * (1.0 - Math.sqrt(temperature / getComponent().getTC()))) * m / Math.sqrt( temperature * temperature * temperature / (Math.pow(getComponent().getTC(), 3.0))) / (getComponent().getTC() * getComponent().getTC()) / 2.0; diff --git a/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermRk.java b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermRk.java index be1cd3f767..f0696af111 100644 --- a/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermRk.java +++ b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermRk.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class AttractiveTermRk extends AttractiveTermBaseClass { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermSchwartzentruber.java b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermSchwartzentruber.java index 62a4d45ad2..f079177493 100644 --- a/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermSchwartzentruber.java +++ b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermSchwartzentruber.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class AttractiveTermSchwartzentruber extends AttractiveTermBaseClass { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; private double c = 0.0; diff --git a/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermSrk.java b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermSrk.java index 03bc0d920a..f0dc9259dd 100644 --- a/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermSrk.java +++ b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermSrk.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class AttractiveTermSrk extends AttractiveTermBaseClass { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermTwu.java b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermTwu.java index fd5c2d3df4..411d1f350f 100644 --- a/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermTwu.java +++ b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermTwu.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class AttractiveTermTwu extends AttractiveTermSrk { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** @@ -66,8 +67,8 @@ public double diffalphaT(double temperature) { /** {@inheritDoc} */ @Override public double diffdiffalphaT(double temperature) { - return m * m / temperature / getComponent().getTC() / 2.0 + (1.0 - + m * (1.0 - Math.sqrt(temperature / getComponent().getTC()))) * m + return m * m / temperature / getComponent().getTC() / 2.0 + + (1.0 + m * (1.0 - Math.sqrt(temperature / getComponent().getTC()))) * m / Math.sqrt( temperature * temperature * temperature / (Math.pow(getComponent().getTC(), 3.0))) / (getComponent().getTC() * getComponent().getTC()) / 2.0; diff --git a/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermTwuCoon.java b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermTwuCoon.java index 33991b9ede..63e8295e84 100644 --- a/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermTwuCoon.java +++ b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermTwuCoon.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class AttractiveTermTwuCoon extends AttractiveTermBaseClass { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; private double a = -0.201158; diff --git a/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermTwuCoonParam.java b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermTwuCoonParam.java index 374b2c3b74..bdad1a67b8 100644 --- a/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermTwuCoonParam.java +++ b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermTwuCoonParam.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class AttractiveTermTwuCoonParam extends AttractiveTermBaseClass { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; private double a = 0.0; diff --git a/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermTwuCoonStatoil.java b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermTwuCoonStatoil.java index 9493b52342..628f0b86e1 100644 --- a/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermTwuCoonStatoil.java +++ b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermTwuCoonStatoil.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class AttractiveTermTwuCoonStatoil extends AttractiveTermBaseClass { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; private double a = 0.0; diff --git a/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermUMRPRU.java b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermUMRPRU.java index 5059ecae62..2be2df5d74 100644 --- a/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermUMRPRU.java +++ b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermUMRPRU.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class AttractiveTermUMRPRU extends AttractiveTermPr { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/thermo/mixingrule/CPAMixing.java b/src/main/java/neqsim/thermo/mixingrule/CPAMixing.java index c9fe704ef2..1a5e742ee4 100644 --- a/src/main/java/neqsim/thermo/mixingrule/CPAMixing.java +++ b/src/main/java/neqsim/thermo/mixingrule/CPAMixing.java @@ -24,7 +24,9 @@ * @version $Id: $Id */ public class CPAMixing implements Cloneable, ThermodynamicConstantsInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(CPAMixing.class); int[][] assosSchemeType = null; // 0- ER - 1 - CR1 @@ -56,6 +58,7 @@ public CPAMixing clone() { } public class CPA_Radoch_base implements CPAMixingInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; double eps = 12000.76; @@ -120,6 +123,7 @@ public double calcDeltadTdV(int siteNumber1, int siteNumber2, int compnumb1, int } public class CPA_Radoch extends CPA_Radoch_base { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; public double getCrossAssociationEnergy(int compnumb1, int compnumb2, PhaseInterface phase, @@ -534,6 +538,7 @@ public double calcDeltadTdT(int siteNumber1, int siteNumber2, int compnumb1, int } public class PCSAFTa_Radoch extends CPA_Radoch { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; public double getCrossAssociationEnergy(int siteNumber1, int siteNumber2, int compnumb1, diff --git a/src/main/java/neqsim/thermo/mixingrule/EosMixingRules.java b/src/main/java/neqsim/thermo/mixingrule/EosMixingRules.java index 90589ebeba..8d9d2f6318 100644 --- a/src/main/java/neqsim/thermo/mixingrule/EosMixingRules.java +++ b/src/main/java/neqsim/thermo/mixingrule/EosMixingRules.java @@ -35,7 +35,9 @@ * @version $Id: $Id */ public class EosMixingRules implements Cloneable, ThermodynamicConstantsInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(EosMixingRules.class); public double Atot = 0; @@ -109,6 +111,7 @@ public EosMixingRules clone() { } public class ClassicVdW implements EosMixingRulesInterface, java.io.Serializable { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; @Override @@ -406,6 +409,7 @@ public ClassicVdW clone() { } public class ClassicSRK extends ClassicVdW { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; public double getkij(double temp, int i, int j) { @@ -579,6 +583,7 @@ public ClassicSRK clone() { } public class ClassicSRKT extends ClassicSRK { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; @Override @@ -691,6 +696,7 @@ public ClassicSRKT clone() { } public class ClassicSRKT2x extends ClassicSRKT2 { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; public double getkij(PhaseInterface phase, double temperature, int i, int j) { @@ -947,6 +953,7 @@ public double calcAiT(int compNumb, PhaseInterface phase, double temperature, do } public class ClassicSRKT2 extends ClassicSRKT { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; @Override @@ -996,6 +1003,7 @@ public ClassicSRKT clone() { } public class SRKHuronVidal extends ClassicSRK implements HVmixingRuleInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; PhaseInterface orgPhase; @@ -1175,6 +1183,7 @@ public double calcAij(int compNumb, int compNumbj, PhaseInterface phase, double } public class SRKHuronVidal2 extends ClassicSRK implements HVmixingRuleInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; PhaseInterface orgPhase; @@ -1528,6 +1537,7 @@ public double calcAiT(int compNumb, PhaseInterface phase, double temperature, do } public class WongSandlerMixingRule extends SRKHuronVidal2 { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; double Q = 0; @@ -1903,6 +1913,7 @@ public double calcBij(int compNumb, int compNumbj, PhaseInterface phase, double } public class ElectrolyteMixRule implements ElectrolyteMixingRulesInterface, Cloneable { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; public ElectrolyteMixRule(PhaseInterface phase) { diff --git a/src/main/java/neqsim/thermo/phase/Phase.java b/src/main/java/neqsim/thermo/phase/Phase.java index e1509396b3..385ae371ed 100644 --- a/src/main/java/neqsim/thermo/phase/Phase.java +++ b/src/main/java/neqsim/thermo/phase/Phase.java @@ -37,9 +37,11 @@ * @author Even Solbraa */ public abstract class Phase implements PhaseInterface { + /** Serialization version UID. */ /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** Logger object for class. */ + /** Logger object for class. */ static Logger logger = LogManager.getLogger(Phase.class); public int numberOfComponents = 0; diff --git a/src/main/java/neqsim/thermo/phase/PhaseBWRSEos.java b/src/main/java/neqsim/thermo/phase/PhaseBWRSEos.java index ddf4db88ec..de0e7b6d72 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseBWRSEos.java +++ b/src/main/java/neqsim/thermo/phase/PhaseBWRSEos.java @@ -13,7 +13,9 @@ * @version $Id: $Id */ public class PhaseBWRSEos extends PhaseSrkEos { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(PhaseBWRSEos.class); int OP = 9; @@ -24,8 +26,7 @@ public class PhaseBWRSEos extends PhaseSrkEos { * Constructor for PhaseBWRSEos. *

*/ - public PhaseBWRSEos() { - } + public PhaseBWRSEos() {} /** {@inheritDoc} */ @Override diff --git a/src/main/java/neqsim/thermo/phase/PhaseCSPsrkEos.java b/src/main/java/neqsim/thermo/phase/PhaseCSPsrkEos.java index 43333422c2..e5c24b81b8 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseCSPsrkEos.java +++ b/src/main/java/neqsim/thermo/phase/PhaseCSPsrkEos.java @@ -12,6 +12,7 @@ * @version $Id: $Id */ public class PhaseCSPsrkEos extends PhaseSrkEos { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; double f_scale_mix = 0; diff --git a/src/main/java/neqsim/thermo/phase/PhaseDefault.java b/src/main/java/neqsim/thermo/phase/PhaseDefault.java index 12765a68df..9a6d7af3a3 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseDefault.java +++ b/src/main/java/neqsim/thermo/phase/PhaseDefault.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class PhaseDefault extends Phase { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; protected ComponentInterface defComponent = null; diff --git a/src/main/java/neqsim/thermo/phase/PhaseDesmukhMather.java b/src/main/java/neqsim/thermo/phase/PhaseDesmukhMather.java index b58c31f07c..7f9de17b63 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseDesmukhMather.java +++ b/src/main/java/neqsim/thermo/phase/PhaseDesmukhMather.java @@ -16,7 +16,9 @@ * @version $Id: $Id */ public class PhaseDesmukhMather extends PhaseGE { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(PhaseDesmukhMather.class); double GE = 0.0; diff --git a/src/main/java/neqsim/thermo/phase/PhaseDuanSun.java b/src/main/java/neqsim/thermo/phase/PhaseDuanSun.java index 31c4c078d3..4f9cdca9ca 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseDuanSun.java +++ b/src/main/java/neqsim/thermo/phase/PhaseDuanSun.java @@ -13,6 +13,7 @@ * @version $Id: $Id */ public class PhaseDuanSun extends PhaseGE { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; double[][] alpha; @@ -26,8 +27,7 @@ public class PhaseDuanSun extends PhaseGE { * Constructor for PhaseDuanSun. *

*/ - public PhaseDuanSun() { - } + public PhaseDuanSun() {} /** {@inheritDoc} */ @Override diff --git a/src/main/java/neqsim/thermo/phase/PhaseElectrolyteCPA.java b/src/main/java/neqsim/thermo/phase/PhaseElectrolyteCPA.java index dfc5fb49b2..415f390230 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseElectrolyteCPA.java +++ b/src/main/java/neqsim/thermo/phase/PhaseElectrolyteCPA.java @@ -21,7 +21,9 @@ */ public class PhaseElectrolyteCPA extends PhaseModifiedFurstElectrolyteEos implements PhaseCPAInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(PhaseElectrolyteCPA.class); public CPAMixing cpaSelect = new CPAMixing(); diff --git a/src/main/java/neqsim/thermo/phase/PhaseElectrolyteCPAOld.java b/src/main/java/neqsim/thermo/phase/PhaseElectrolyteCPAOld.java index dc0670e68d..622e2d56a0 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseElectrolyteCPAOld.java +++ b/src/main/java/neqsim/thermo/phase/PhaseElectrolyteCPAOld.java @@ -18,7 +18,9 @@ */ public class PhaseElectrolyteCPAOld extends PhaseModifiedFurstElectrolyteEos implements PhaseCPAInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(PhaseElectrolyteCPAOld.class); public CPAMixing cpaSelect = new CPAMixing(); @@ -47,8 +49,7 @@ public class PhaseElectrolyteCPAOld extends PhaseModifiedFurstElectrolyteEos * Constructor for PhaseElectrolyteCPAOld. *

*/ - public PhaseElectrolyteCPAOld() { - } + public PhaseElectrolyteCPAOld() {} /** {@inheritDoc} */ @Override diff --git a/src/main/java/neqsim/thermo/phase/PhaseElectrolyteCPAstatoil.java b/src/main/java/neqsim/thermo/phase/PhaseElectrolyteCPAstatoil.java index 2f764a5072..4442a15a5c 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseElectrolyteCPAstatoil.java +++ b/src/main/java/neqsim/thermo/phase/PhaseElectrolyteCPAstatoil.java @@ -17,6 +17,7 @@ * @version $Id: $Id */ public class PhaseElectrolyteCPAstatoil extends PhaseElectrolyteCPA { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** @@ -24,8 +25,7 @@ public class PhaseElectrolyteCPAstatoil extends PhaseElectrolyteCPA { * Constructor for PhaseElectrolyteCPAstatoil. *

*/ - public PhaseElectrolyteCPAstatoil() { - } + public PhaseElectrolyteCPAstatoil() {} /** {@inheritDoc} */ @Override diff --git a/src/main/java/neqsim/thermo/phase/PhaseEos.java b/src/main/java/neqsim/thermo/phase/PhaseEos.java index 6c2f3f8abc..8843cd8346 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseEos.java +++ b/src/main/java/neqsim/thermo/phase/PhaseEos.java @@ -20,7 +20,9 @@ * @author Even Solbraa */ public abstract class PhaseEos extends Phase implements PhaseEosInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(PhaseEos.class); private double loc_A; diff --git a/src/main/java/neqsim/thermo/phase/PhaseGE.java b/src/main/java/neqsim/thermo/phase/PhaseGE.java index 95e68862fd..5236273565 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseGE.java +++ b/src/main/java/neqsim/thermo/phase/PhaseGE.java @@ -23,7 +23,9 @@ * @version $Id: $Id */ public abstract class PhaseGE extends Phase implements PhaseGEInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(PhaseGE.class); EosMixingRules mixSelect = new EosMixingRules(); diff --git a/src/main/java/neqsim/thermo/phase/PhaseGENRTL.java b/src/main/java/neqsim/thermo/phase/PhaseGENRTL.java index 70787d78aa..5a668c0bd8 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseGENRTL.java +++ b/src/main/java/neqsim/thermo/phase/PhaseGENRTL.java @@ -20,6 +20,7 @@ * @version $Id: $Id */ public class PhaseGENRTL extends PhaseGE { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; double[][] alpha; @@ -33,8 +34,7 @@ public class PhaseGENRTL extends PhaseGE { * Constructor for PhaseGENRTL. *

*/ - public PhaseGENRTL() { - } + public PhaseGENRTL() {} /** *

@@ -57,8 +57,7 @@ public PhaseGENRTL(PhaseInterface phase, double[][] alpha, double[][] Dij, Strin for (int i = 0; i < alpha[0].length; i++) { numberOfComponents++; componentArray[i] = new ComponentGeNRTL(phase.getComponent(i).getName(), - phase.getComponent(i).getNumberOfmoles(), - phase.getComponent(i).getNumberOfMolesInPhase(), + phase.getComponent(i).getNumberOfmoles(), phase.getComponent(i).getNumberOfMolesInPhase(), phase.getComponent(i).getComponentNumber()); } setMixingRule(2); diff --git a/src/main/java/neqsim/thermo/phase/PhaseGENRTLmodifiedHV.java b/src/main/java/neqsim/thermo/phase/PhaseGENRTLmodifiedHV.java index 3fab491a7b..0e2e171503 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseGENRTLmodifiedHV.java +++ b/src/main/java/neqsim/thermo/phase/PhaseGENRTLmodifiedHV.java @@ -18,6 +18,7 @@ * @version $Id: $Id */ public class PhaseGENRTLmodifiedHV extends PhaseGENRTL { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; double[][] DijT; @@ -50,8 +51,7 @@ public PhaseGENRTLmodifiedHV(PhaseInterface phase, double[][] alpha, double[][] type = 0; for (int i = 0; i < alpha[0].length; i++) { componentArray[i] = new ComponentGENRTLmodifiedHV(phase.getComponent(i).getName(), - phase.getComponent(i).getNumberOfmoles(), - phase.getComponent(i).getNumberOfMolesInPhase(), + phase.getComponent(i).getNumberOfmoles(), phase.getComponent(i).getNumberOfMolesInPhase(), phase.getComponent(i).getComponentNumber()); } } @@ -76,8 +76,7 @@ public PhaseGENRTLmodifiedHV(PhaseInterface phase, double[][] alpha, double[][] this.DijT = DijT; for (int i = 0; i < alpha[0].length; i++) { componentArray[i] = new ComponentGENRTLmodifiedHV(phase.getComponent(i).getName(), - phase.getComponent(i).getNumberOfmoles(), - phase.getComponent(i).getNumberOfMolesInPhase(), + phase.getComponent(i).getNumberOfmoles(), phase.getComponent(i).getNumberOfMolesInPhase(), phase.getComponent(i).getComponentNumber()); } } @@ -146,7 +145,8 @@ public double getGibbsEnergy() { double val = 0.0; for (int i = 0; i < numberOfComponents; i++) { val += - getComponent(i).getNumberOfMolesInPhase() * (getComponent(i).getLogFugacityCoefficient()); // +Math.log(getComponent(i).getx()*getComponent(i).getAntoineVaporPressure(temperature))); + getComponent(i).getNumberOfMolesInPhase() * (getComponent(i).getLogFugacityCoefficient()); + // +Math.log(getComponent(i).getx()*getComponent(i).getAntoineVaporPressure(temperature))); } return R * temperature * numberOfMolesInPhase * (val + Math.log(pressure)); } diff --git a/src/main/java/neqsim/thermo/phase/PhaseGENRTLmodifiedWS.java b/src/main/java/neqsim/thermo/phase/PhaseGENRTLmodifiedWS.java index cfc32104d7..147ef5befa 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseGENRTLmodifiedWS.java +++ b/src/main/java/neqsim/thermo/phase/PhaseGENRTLmodifiedWS.java @@ -12,6 +12,7 @@ * @version $Id: $Id */ public class PhaseGENRTLmodifiedWS extends PhaseGENRTLmodifiedHV { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** @@ -19,8 +20,7 @@ public class PhaseGENRTLmodifiedWS extends PhaseGENRTLmodifiedHV { * Constructor for PhaseGENRTLmodifiedWS. *

*/ - public PhaseGENRTLmodifiedWS() { - } + public PhaseGENRTLmodifiedWS() {} /** *

@@ -40,8 +40,7 @@ public PhaseGENRTLmodifiedWS(PhaseInterface phase, double[][] alpha, double[][] for (int i = 0; i < alpha[0].length; i++) { numberOfComponents++; componentArray[i] = new ComponentGENRTLmodifiedWS(phase.getComponent(i).getName(), - phase.getComponent(i).getNumberOfmoles(), - phase.getComponent(i).getNumberOfMolesInPhase(), + phase.getComponent(i).getNumberOfmoles(), phase.getComponent(i).getNumberOfMolesInPhase(), phase.getComponent(i).getComponentNumber()); } } @@ -64,8 +63,7 @@ public PhaseGENRTLmodifiedWS(PhaseInterface phase, double[][] alpha, double[][] componentArray = new ComponentGENRTLmodifiedWS[alpha[0].length]; for (int i = 0; i < alpha[0].length; i++) { componentArray[i] = new ComponentGENRTLmodifiedWS(phase.getComponent(i).getName(), - phase.getComponent(i).getNumberOfmoles(), - phase.getComponent(i).getNumberOfMolesInPhase(), + phase.getComponent(i).getNumberOfmoles(), phase.getComponent(i).getNumberOfMolesInPhase(), phase.getComponent(i).getComponentNumber()); } } diff --git a/src/main/java/neqsim/thermo/phase/PhaseGERG2004Eos.java b/src/main/java/neqsim/thermo/phase/PhaseGERG2004Eos.java index 9ed823faf3..353e19c8f3 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseGERG2004Eos.java +++ b/src/main/java/neqsim/thermo/phase/PhaseGERG2004Eos.java @@ -13,6 +13,7 @@ * @version $Id: $Id */ public class PhaseGERG2004Eos extends PhaseEos { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; private GERG2004EOS gergEOS = new GERG2004EOS(); diff --git a/src/main/java/neqsim/thermo/phase/PhaseGEUnifac.java b/src/main/java/neqsim/thermo/phase/PhaseGEUnifac.java index 9f6e7c9ddc..b54b9bcc89 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseGEUnifac.java +++ b/src/main/java/neqsim/thermo/phase/PhaseGEUnifac.java @@ -18,12 +18,14 @@ * @version $Id: $Id */ public class PhaseGEUnifac extends PhaseGEUniquac { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; double[][] aij = new double[1][1]; double[][] bij = new double[1][1]; double[][] cij = new double[1][1]; boolean checkedGroups = false; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(PhaseGEUnifac.class); /** @@ -52,8 +54,7 @@ public PhaseGEUnifac(PhaseInterface phase, double[][] alpha, double[][] Dij, Str componentArray = new ComponentGEUnifac[alpha[0].length]; for (int i = 0; i < alpha[0].length; i++) { componentArray[i] = new ComponentGEUnifac(phase.getComponent(i).getName(), - phase.getComponent(i).getNumberOfmoles(), - phase.getComponent(i).getNumberOfMolesInPhase(), + phase.getComponent(i).getNumberOfmoles(), phase.getComponent(i).getNumberOfMolesInPhase(), phase.getComponent(i).getComponentNumber()); } } diff --git a/src/main/java/neqsim/thermo/phase/PhaseGEUnifacPSRK.java b/src/main/java/neqsim/thermo/phase/PhaseGEUnifacPSRK.java index 63fb5eed1b..2527ea9475 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseGEUnifacPSRK.java +++ b/src/main/java/neqsim/thermo/phase/PhaseGEUnifacPSRK.java @@ -16,7 +16,9 @@ * @version $Id: $Id */ public class PhaseGEUnifacPSRK extends PhaseGEUnifac { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(PhaseGEUnifacPSRK.class); /** @@ -45,8 +47,7 @@ public PhaseGEUnifacPSRK(PhaseInterface phase, double[][] alpha, double[][] Dij, componentArray = new ComponentGEUnifac[alpha[0].length]; for (int i = 0; i < alpha[0].length; i++) { componentArray[i] = new ComponentGEUnifacPSRK(phase.getComponent(i).getName(), - phase.getComponent(i).getNumberOfmoles(), - phase.getComponent(i).getNumberOfMolesInPhase(), + phase.getComponent(i).getNumberOfmoles(), phase.getComponent(i).getNumberOfMolesInPhase(), phase.getComponent(i).getComponentNumber()); } this.setMixingRule(2); diff --git a/src/main/java/neqsim/thermo/phase/PhaseGEUnifacUMRPRU.java b/src/main/java/neqsim/thermo/phase/PhaseGEUnifacUMRPRU.java index e0529cb823..b695d54717 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseGEUnifacUMRPRU.java +++ b/src/main/java/neqsim/thermo/phase/PhaseGEUnifacUMRPRU.java @@ -16,7 +16,9 @@ * @version $Id: $Id */ public class PhaseGEUnifacUMRPRU extends PhaseGEUnifac { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(PhaseGEUnifacUMRPRU.class); double[] Qmix = null; diff --git a/src/main/java/neqsim/thermo/phase/PhaseGEUniquac.java b/src/main/java/neqsim/thermo/phase/PhaseGEUniquac.java index 00959506ef..0cf21a4505 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseGEUniquac.java +++ b/src/main/java/neqsim/thermo/phase/PhaseGEUniquac.java @@ -21,6 +21,7 @@ * @version $Id: $Id */ public class PhaseGEUniquac extends PhaseGE { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; double[][] alpha; @@ -59,8 +60,7 @@ public PhaseGEUniquac(PhaseInterface phase, double[][] alpha, double[][] Dij, St for (int i = 0; i < alpha[0].length; i++) { numberOfComponents++; componentArray[i] = new ComponentGEUniquac(phase.getComponent(i).getName(), - phase.getComponent(i).getNumberOfmoles(), - phase.getComponent(i).getNumberOfMolesInPhase(), + phase.getComponent(i).getNumberOfmoles(), phase.getComponent(i).getNumberOfMolesInPhase(), phase.getComponent(i).getComponentNumber()); } } diff --git a/src/main/java/neqsim/thermo/phase/PhaseGEUniquacmodifiedHV.java b/src/main/java/neqsim/thermo/phase/PhaseGEUniquacmodifiedHV.java index a678bf8e58..e9fab713af 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseGEUniquacmodifiedHV.java +++ b/src/main/java/neqsim/thermo/phase/PhaseGEUniquacmodifiedHV.java @@ -15,6 +15,7 @@ * @version $Id: $Id */ public class PhaseGEUniquacmodifiedHV extends PhaseGEUniquac { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** @@ -22,8 +23,7 @@ public class PhaseGEUniquacmodifiedHV extends PhaseGEUniquac { * Constructor for PhaseGEUniquacmodifiedHV. *

*/ - public PhaseGEUniquacmodifiedHV() { - } + public PhaseGEUniquacmodifiedHV() {} /** {@inheritDoc} */ @Override diff --git a/src/main/java/neqsim/thermo/phase/PhaseGEWilson.java b/src/main/java/neqsim/thermo/phase/PhaseGEWilson.java index 44bfd0a935..fcb0fa73c2 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseGEWilson.java +++ b/src/main/java/neqsim/thermo/phase/PhaseGEWilson.java @@ -14,6 +14,7 @@ * @version $Id: $Id */ public class PhaseGEWilson extends PhaseGE { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; double GE = 0; @@ -44,8 +45,7 @@ public PhaseGEWilson(PhaseInterface phase, double[][] alpha, double[][] Dij, Str for (int i = 0; i < alpha[0].length; i++) { numberOfComponents++; componentArray[i] = new ComponentGEWilson(phase.getComponent(i).getName(), - phase.getComponent(i).getNumberOfmoles(), - phase.getComponent(i).getNumberOfMolesInPhase(), + phase.getComponent(i).getNumberOfmoles(), phase.getComponent(i).getNumberOfMolesInPhase(), phase.getComponent(i).getComponentNumber()); } } diff --git a/src/main/java/neqsim/thermo/phase/PhaseHydrate.java b/src/main/java/neqsim/thermo/phase/PhaseHydrate.java index e49a1ddefd..4678a51c87 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseHydrate.java +++ b/src/main/java/neqsim/thermo/phase/PhaseHydrate.java @@ -19,6 +19,7 @@ * @version $Id: $Id */ public class PhaseHydrate extends Phase { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; String hydrateModel = "PVTsimHydrateModel"; diff --git a/src/main/java/neqsim/thermo/phase/PhaseKentEisenberg.java b/src/main/java/neqsim/thermo/phase/PhaseKentEisenberg.java index 04c115d3c4..8016ec72b2 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseKentEisenberg.java +++ b/src/main/java/neqsim/thermo/phase/PhaseKentEisenberg.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class PhaseKentEisenberg extends PhaseGENRTL { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** @@ -18,8 +19,7 @@ public class PhaseKentEisenberg extends PhaseGENRTL { * Constructor for PhaseKentEisenberg. *

*/ - public PhaseKentEisenberg() { - } + public PhaseKentEisenberg() {} /** {@inheritDoc} */ @Override diff --git a/src/main/java/neqsim/thermo/phase/PhaseModifiedFurstElectrolyteEos.java b/src/main/java/neqsim/thermo/phase/PhaseModifiedFurstElectrolyteEos.java index e95ac031a0..e7eb13cba6 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseModifiedFurstElectrolyteEos.java +++ b/src/main/java/neqsim/thermo/phase/PhaseModifiedFurstElectrolyteEos.java @@ -19,7 +19,9 @@ * @version $Id: $Id */ public class PhaseModifiedFurstElectrolyteEos extends PhaseSrkEos { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(PhaseModifiedFurstElectrolyteEos.class); double gammaold = 0; diff --git a/src/main/java/neqsim/thermo/phase/PhaseModifiedFurstElectrolyteEosMod2004.java b/src/main/java/neqsim/thermo/phase/PhaseModifiedFurstElectrolyteEosMod2004.java index 96a0af449e..ddaea6968f 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseModifiedFurstElectrolyteEosMod2004.java +++ b/src/main/java/neqsim/thermo/phase/PhaseModifiedFurstElectrolyteEosMod2004.java @@ -19,7 +19,9 @@ * @version $Id: $Id */ public class PhaseModifiedFurstElectrolyteEosMod2004 extends PhaseSrkEos { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(PhaseModifiedFurstElectrolyteEos.class); double gammaold = 0; diff --git a/src/main/java/neqsim/thermo/phase/PhasePCSAFT.java b/src/main/java/neqsim/thermo/phase/PhasePCSAFT.java index d4a444e5d5..4933f49987 100644 --- a/src/main/java/neqsim/thermo/phase/PhasePCSAFT.java +++ b/src/main/java/neqsim/thermo/phase/PhasePCSAFT.java @@ -14,7 +14,9 @@ * @version $Id: $Id */ public class PhasePCSAFT extends PhaseSrkEos { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(PhasePCSAFT.class); double nSAFT = 1.0; diff --git a/src/main/java/neqsim/thermo/phase/PhasePCSAFTRahmat.java b/src/main/java/neqsim/thermo/phase/PhasePCSAFTRahmat.java index 2408a8934b..feb6e5b807 100644 --- a/src/main/java/neqsim/thermo/phase/PhasePCSAFTRahmat.java +++ b/src/main/java/neqsim/thermo/phase/PhasePCSAFTRahmat.java @@ -14,7 +14,9 @@ * @version $Id: $Id */ public class PhasePCSAFTRahmat extends PhasePCSAFT { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(PhasePCSAFTRahmat.class); double dnSAFTdVdVdV = 1.0; diff --git a/src/main/java/neqsim/thermo/phase/PhasePCSAFTa.java b/src/main/java/neqsim/thermo/phase/PhasePCSAFTa.java index 0639b3aef9..220d046554 100644 --- a/src/main/java/neqsim/thermo/phase/PhasePCSAFTa.java +++ b/src/main/java/neqsim/thermo/phase/PhasePCSAFTa.java @@ -16,6 +16,7 @@ * @version $Id: $Id */ public class PhasePCSAFTa extends PhasePCSAFT implements PhaseCPAInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; public CPAMixing cpaSelect = new CPAMixing(); @@ -33,6 +34,7 @@ public class PhasePCSAFTa extends PhasePCSAFT implements PhaseCPAInterface { int[][][] selfAccociationScheme = null; int[][][][] crossAccociationScheme = null; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(PhasePCSAFTa.class); /** @@ -40,8 +42,7 @@ public class PhasePCSAFTa extends PhasePCSAFT implements PhaseCPAInterface { * Constructor for PhasePCSAFTa. *

*/ - public PhasePCSAFTa() { - } + public PhasePCSAFTa() {} /** {@inheritDoc} */ @Override diff --git a/src/main/java/neqsim/thermo/phase/PhasePrCPA.java b/src/main/java/neqsim/thermo/phase/PhasePrCPA.java index 4332949990..bc4ffa64d8 100644 --- a/src/main/java/neqsim/thermo/phase/PhasePrCPA.java +++ b/src/main/java/neqsim/thermo/phase/PhasePrCPA.java @@ -14,6 +14,7 @@ * @version $Id: $Id */ public class PhasePrCPA extends PhasePrEos implements PhaseCPAInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; int totalNumberOfAccociationSites = 0; diff --git a/src/main/java/neqsim/thermo/phase/PhasePrEos.java b/src/main/java/neqsim/thermo/phase/PhasePrEos.java index c65ed33dce..3646ebaa37 100644 --- a/src/main/java/neqsim/thermo/phase/PhasePrEos.java +++ b/src/main/java/neqsim/thermo/phase/PhasePrEos.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class PhasePrEos extends PhaseEos { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/thermo/phase/PhasePrEosvolcor.java b/src/main/java/neqsim/thermo/phase/PhasePrEosvolcor.java index 9eb91abc6f..024b2f8b7a 100644 --- a/src/main/java/neqsim/thermo/phase/PhasePrEosvolcor.java +++ b/src/main/java/neqsim/thermo/phase/PhasePrEosvolcor.java @@ -18,6 +18,7 @@ * @version $Id: $Id */ public class PhasePrEosvolcor extends PhasePrEos { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; double loc_C = 0; private double CT; diff --git a/src/main/java/neqsim/thermo/phase/PhasePureComponentSolid.java b/src/main/java/neqsim/thermo/phase/PhasePureComponentSolid.java index 2f565a87fd..c3d6d46e8d 100644 --- a/src/main/java/neqsim/thermo/phase/PhasePureComponentSolid.java +++ b/src/main/java/neqsim/thermo/phase/PhasePureComponentSolid.java @@ -15,6 +15,7 @@ * @version $Id: $Id */ public class PhasePureComponentSolid extends PhaseSolid { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** @@ -22,8 +23,7 @@ public class PhasePureComponentSolid extends PhaseSolid { * Constructor for PhasePureComponentSolid. *

*/ - public PhasePureComponentSolid() { - } + public PhasePureComponentSolid() {} /** {@inheritDoc} */ @Override diff --git a/src/main/java/neqsim/thermo/phase/PhaseRK.java b/src/main/java/neqsim/thermo/phase/PhaseRK.java index 179bd6fe45..2faab04fb6 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseRK.java +++ b/src/main/java/neqsim/thermo/phase/PhaseRK.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class PhaseRK extends PhaseEos { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/thermo/phase/PhaseSolid.java b/src/main/java/neqsim/thermo/phase/PhaseSolid.java index aed714f06e..c3b16950c1 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseSolid.java +++ b/src/main/java/neqsim/thermo/phase/PhaseSolid.java @@ -17,6 +17,7 @@ * @version $Id: $Id */ public abstract class PhaseSolid extends PhaseSrkEos { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/thermo/phase/PhaseSolidComplex.java b/src/main/java/neqsim/thermo/phase/PhaseSolidComplex.java index de6d26cd67..8c997b71e8 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseSolidComplex.java +++ b/src/main/java/neqsim/thermo/phase/PhaseSolidComplex.java @@ -9,6 +9,7 @@ * @version $Id: $Id */ public class PhaseSolidComplex extends PhaseSolid { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/thermo/phase/PhaseSrkCPA.java b/src/main/java/neqsim/thermo/phase/PhaseSrkCPA.java index 85db2c2d05..3ad8d7b3ef 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseSrkCPA.java +++ b/src/main/java/neqsim/thermo/phase/PhaseSrkCPA.java @@ -20,7 +20,9 @@ * @version $Id: $Id */ public class PhaseSrkCPA extends PhaseSrkEos implements PhaseCPAInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(PhaseSrkCPA.class); public CPAMixing cpaSelect = new CPAMixing(); diff --git a/src/main/java/neqsim/thermo/phase/PhaseSrkCPA_proceduralMatrices.java b/src/main/java/neqsim/thermo/phase/PhaseSrkCPA_proceduralMatrices.java index 5b72792bc5..bfc11027f8 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseSrkCPA_proceduralMatrices.java +++ b/src/main/java/neqsim/thermo/phase/PhaseSrkCPA_proceduralMatrices.java @@ -19,7 +19,9 @@ * @version Modified to use procedural oriented ejml matrices by Marlene Lund */ public class PhaseSrkCPA_proceduralMatrices extends PhaseSrkEos implements PhaseCPAInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(PhaseSrkCPA_proceduralMatrices.class); public CPAMixing cpaSelect = new CPAMixing(); diff --git a/src/main/java/neqsim/thermo/phase/PhaseSrkCPAs.java b/src/main/java/neqsim/thermo/phase/PhaseSrkCPAs.java index 1a777f8f57..e179b710c1 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseSrkCPAs.java +++ b/src/main/java/neqsim/thermo/phase/PhaseSrkCPAs.java @@ -13,6 +13,7 @@ * @version $Id: $Id */ public class PhaseSrkCPAs extends PhaseSrkCPA { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** @@ -20,8 +21,7 @@ public class PhaseSrkCPAs extends PhaseSrkCPA { * Constructor for PhaseSrkCPAs. *

*/ - public PhaseSrkCPAs() { - } + public PhaseSrkCPAs() {} /** {@inheritDoc} */ @Override diff --git a/src/main/java/neqsim/thermo/phase/PhaseSrkCPAsOld.java b/src/main/java/neqsim/thermo/phase/PhaseSrkCPAsOld.java index 1d85a522a7..47cf98dee7 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseSrkCPAsOld.java +++ b/src/main/java/neqsim/thermo/phase/PhaseSrkCPAsOld.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class PhaseSrkCPAsOld extends PhaseSrkCPAs { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** @@ -18,8 +19,7 @@ public class PhaseSrkCPAsOld extends PhaseSrkCPAs { * Constructor for PhaseSrkCPAsOld. *

*/ - public PhaseSrkCPAsOld() { - } + public PhaseSrkCPAsOld() {} /** {@inheritDoc} */ @Override diff --git a/src/main/java/neqsim/thermo/phase/PhaseSrkEos.java b/src/main/java/neqsim/thermo/phase/PhaseSrkEos.java index cfabc3c268..b72379ea1c 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseSrkEos.java +++ b/src/main/java/neqsim/thermo/phase/PhaseSrkEos.java @@ -17,6 +17,7 @@ * @version $Id: $Id */ public class PhaseSrkEos extends PhaseEos { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/thermo/phase/PhaseSrkPenelouxEos.java b/src/main/java/neqsim/thermo/phase/PhaseSrkPenelouxEos.java index 19b311db70..b726b59e00 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseSrkPenelouxEos.java +++ b/src/main/java/neqsim/thermo/phase/PhaseSrkPenelouxEos.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class PhaseSrkPenelouxEos extends PhaseSrkEos { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** @@ -18,8 +19,7 @@ public class PhaseSrkPenelouxEos extends PhaseSrkEos { * Constructor for PhaseSrkPenelouxEos. *

*/ - public PhaseSrkPenelouxEos() { - } + public PhaseSrkPenelouxEos() {} /** {@inheritDoc} */ @Override diff --git a/src/main/java/neqsim/thermo/phase/PhaseTSTEos.java b/src/main/java/neqsim/thermo/phase/PhaseTSTEos.java index 17b543b78b..c233d1fab9 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseTSTEos.java +++ b/src/main/java/neqsim/thermo/phase/PhaseTSTEos.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class PhaseTSTEos extends PhaseEos { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/thermo/phase/PhaseUMRCPA.java b/src/main/java/neqsim/thermo/phase/PhaseUMRCPA.java index 9fbe76787b..7aed4f1225 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseUMRCPA.java +++ b/src/main/java/neqsim/thermo/phase/PhaseUMRCPA.java @@ -32,7 +32,9 @@ public double[] getdFdNtemp() { return dFdNtemp; } + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(PhaseUMRCPA.class); public CPAMixing cpaSelect = new CPAMixing(); diff --git a/src/main/java/neqsim/thermo/phase/PhaseWax.java b/src/main/java/neqsim/thermo/phase/PhaseWax.java index 5b7235663d..07fea97049 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseWax.java +++ b/src/main/java/neqsim/thermo/phase/PhaseWax.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class PhaseWax extends PhaseSolid { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/thermo/system/SystemBWRSEos.java b/src/main/java/neqsim/thermo/system/SystemBWRSEos.java index 49ab6bb1de..1533265abf 100644 --- a/src/main/java/neqsim/thermo/system/SystemBWRSEos.java +++ b/src/main/java/neqsim/thermo/system/SystemBWRSEos.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class SystemBWRSEos extends SystemEos { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; double[][] TBPfractionCoefs = {{163.12, 86.052, 0.43475, -1877.4, 0.0}, {-0.13408, 2.5019, 208.46, -3987.2, 1.0}, {0.7431, 0.004812, 0.009671, -3.7e-6, 0.0}}; diff --git a/src/main/java/neqsim/thermo/system/SystemCSPsrkEos.java b/src/main/java/neqsim/thermo/system/SystemCSPsrkEos.java index 446deb6ad3..9e48d67670 100644 --- a/src/main/java/neqsim/thermo/system/SystemCSPsrkEos.java +++ b/src/main/java/neqsim/thermo/system/SystemCSPsrkEos.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class SystemCSPsrkEos extends SystemSrkEos { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/thermo/system/SystemDesmukhMather.java b/src/main/java/neqsim/thermo/system/SystemDesmukhMather.java index 41401466b8..48c6775857 100644 --- a/src/main/java/neqsim/thermo/system/SystemDesmukhMather.java +++ b/src/main/java/neqsim/thermo/system/SystemDesmukhMather.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class SystemDesmukhMather extends SystemEos { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/thermo/system/SystemDuanSun.java b/src/main/java/neqsim/thermo/system/SystemDuanSun.java index 5ceacbabf6..f44861a760 100644 --- a/src/main/java/neqsim/thermo/system/SystemDuanSun.java +++ b/src/main/java/neqsim/thermo/system/SystemDuanSun.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class SystemDuanSun extends SystemEos { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; protected String[] CapeOpenProperties11 = diff --git a/src/main/java/neqsim/thermo/system/SystemElectrolyteCPA.java b/src/main/java/neqsim/thermo/system/SystemElectrolyteCPA.java index 64dd9bb7b5..06df6d8798 100644 --- a/src/main/java/neqsim/thermo/system/SystemElectrolyteCPA.java +++ b/src/main/java/neqsim/thermo/system/SystemElectrolyteCPA.java @@ -10,6 +10,7 @@ * @version $Id: $Id */ public class SystemElectrolyteCPA extends SystemFurstElectrolyteEos { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/thermo/system/SystemElectrolyteCPAstatoil.java b/src/main/java/neqsim/thermo/system/SystemElectrolyteCPAstatoil.java index 9a7ef693ce..82987af4e9 100644 --- a/src/main/java/neqsim/thermo/system/SystemElectrolyteCPAstatoil.java +++ b/src/main/java/neqsim/thermo/system/SystemElectrolyteCPAstatoil.java @@ -10,6 +10,7 @@ * @version $Id: $Id */ public class SystemElectrolyteCPAstatoil extends SystemFurstElectrolyteEos { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/thermo/system/SystemEos.java b/src/main/java/neqsim/thermo/system/SystemEos.java index 8eca58b132..2e07973454 100644 --- a/src/main/java/neqsim/thermo/system/SystemEos.java +++ b/src/main/java/neqsim/thermo/system/SystemEos.java @@ -6,6 +6,7 @@ * @author Even Solbraa */ public abstract class SystemEos extends neqsim.thermo.system.SystemThermo { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/thermo/system/SystemFurstElectrolyteEos.java b/src/main/java/neqsim/thermo/system/SystemFurstElectrolyteEos.java index f9b59318dd..8a412078eb 100644 --- a/src/main/java/neqsim/thermo/system/SystemFurstElectrolyteEos.java +++ b/src/main/java/neqsim/thermo/system/SystemFurstElectrolyteEos.java @@ -9,6 +9,7 @@ * @version $Id: $Id */ public class SystemFurstElectrolyteEos extends SystemSrkEos { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/thermo/system/SystemFurstElectrolyteEosMod2004.java b/src/main/java/neqsim/thermo/system/SystemFurstElectrolyteEosMod2004.java index 8a7daac0d1..4d09bedfac 100644 --- a/src/main/java/neqsim/thermo/system/SystemFurstElectrolyteEosMod2004.java +++ b/src/main/java/neqsim/thermo/system/SystemFurstElectrolyteEosMod2004.java @@ -10,6 +10,7 @@ * @version $Id: $Id */ public class SystemFurstElectrolyteEosMod2004 extends SystemSrkEos { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/thermo/system/SystemGERG2004Eos.java b/src/main/java/neqsim/thermo/system/SystemGERG2004Eos.java index e803e4e095..ae7c66cde3 100644 --- a/src/main/java/neqsim/thermo/system/SystemGERG2004Eos.java +++ b/src/main/java/neqsim/thermo/system/SystemGERG2004Eos.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class SystemGERG2004Eos extends SystemEos { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/thermo/system/SystemGERGwaterEos.java b/src/main/java/neqsim/thermo/system/SystemGERGwaterEos.java index e648660800..47ef7a5ac1 100644 --- a/src/main/java/neqsim/thermo/system/SystemGERGwaterEos.java +++ b/src/main/java/neqsim/thermo/system/SystemGERGwaterEos.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class SystemGERGwaterEos extends SystemPrEos { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/thermo/system/SystemGEWilson.java b/src/main/java/neqsim/thermo/system/SystemGEWilson.java index e3beea7147..93a4cc6ee5 100644 --- a/src/main/java/neqsim/thermo/system/SystemGEWilson.java +++ b/src/main/java/neqsim/thermo/system/SystemGEWilson.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class SystemGEWilson extends SystemEos { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/thermo/system/SystemKentEisenberg.java b/src/main/java/neqsim/thermo/system/SystemKentEisenberg.java index d6cb016838..cf17c7d56d 100644 --- a/src/main/java/neqsim/thermo/system/SystemKentEisenberg.java +++ b/src/main/java/neqsim/thermo/system/SystemKentEisenberg.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class SystemKentEisenberg extends SystemEos { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/thermo/system/SystemNRTL.java b/src/main/java/neqsim/thermo/system/SystemNRTL.java index 9c7d2be421..4f27859cdf 100644 --- a/src/main/java/neqsim/thermo/system/SystemNRTL.java +++ b/src/main/java/neqsim/thermo/system/SystemNRTL.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class SystemNRTL extends SystemEos { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/thermo/system/SystemPCSAFT.java b/src/main/java/neqsim/thermo/system/SystemPCSAFT.java index 83fecbbf86..aee2243118 100644 --- a/src/main/java/neqsim/thermo/system/SystemPCSAFT.java +++ b/src/main/java/neqsim/thermo/system/SystemPCSAFT.java @@ -13,7 +13,9 @@ * @version $Id: $Id */ public class SystemPCSAFT extends SystemSrkEos { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(SystemPCSAFT.class); + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/thermo/system/SystemPCSAFTa.java b/src/main/java/neqsim/thermo/system/SystemPCSAFTa.java index ef03b2f1e0..b8f010a232 100644 --- a/src/main/java/neqsim/thermo/system/SystemPCSAFTa.java +++ b/src/main/java/neqsim/thermo/system/SystemPCSAFTa.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class SystemPCSAFTa extends SystemSrkEos { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/thermo/system/SystemPrCPA.java b/src/main/java/neqsim/thermo/system/SystemPrCPA.java index 1d2d2ab100..708132911a 100644 --- a/src/main/java/neqsim/thermo/system/SystemPrCPA.java +++ b/src/main/java/neqsim/thermo/system/SystemPrCPA.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class SystemPrCPA extends SystemPrEos { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/thermo/system/SystemPrDanesh.java b/src/main/java/neqsim/thermo/system/SystemPrDanesh.java index c42a3d7419..367b8e3124 100644 --- a/src/main/java/neqsim/thermo/system/SystemPrDanesh.java +++ b/src/main/java/neqsim/thermo/system/SystemPrDanesh.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class SystemPrDanesh extends SystemPrEos { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/thermo/system/SystemPrEos.java b/src/main/java/neqsim/thermo/system/SystemPrEos.java index 2773c923b4..88b589ee3b 100644 --- a/src/main/java/neqsim/thermo/system/SystemPrEos.java +++ b/src/main/java/neqsim/thermo/system/SystemPrEos.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class SystemPrEos extends SystemEos { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/thermo/system/SystemPrEos1978.java b/src/main/java/neqsim/thermo/system/SystemPrEos1978.java index ee38018307..e62e170265 100644 --- a/src/main/java/neqsim/thermo/system/SystemPrEos1978.java +++ b/src/main/java/neqsim/thermo/system/SystemPrEos1978.java @@ -7,6 +7,7 @@ * @version $Id: $Id */ public class SystemPrEos1978 extends SystemPrEos { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/thermo/system/SystemPrEosDelft1998.java b/src/main/java/neqsim/thermo/system/SystemPrEosDelft1998.java index f33eee0feb..37984699a6 100644 --- a/src/main/java/neqsim/thermo/system/SystemPrEosDelft1998.java +++ b/src/main/java/neqsim/thermo/system/SystemPrEosDelft1998.java @@ -12,6 +12,7 @@ * @version $Id: $Id */ public class SystemPrEosDelft1998 extends SystemPrEos { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/thermo/system/SystemPrGassemEos.java b/src/main/java/neqsim/thermo/system/SystemPrGassemEos.java index 1f83e2167d..b33679f46c 100644 --- a/src/main/java/neqsim/thermo/system/SystemPrGassemEos.java +++ b/src/main/java/neqsim/thermo/system/SystemPrGassemEos.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class SystemPrGassemEos extends SystemPrEos { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/thermo/system/SystemPrMathiasCopeman.java b/src/main/java/neqsim/thermo/system/SystemPrMathiasCopeman.java index 70e54d9f93..ac6d54ed09 100644 --- a/src/main/java/neqsim/thermo/system/SystemPrMathiasCopeman.java +++ b/src/main/java/neqsim/thermo/system/SystemPrMathiasCopeman.java @@ -7,6 +7,7 @@ * @version $Id: $Id */ public class SystemPrMathiasCopeman extends SystemPrEos { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/thermo/system/SystemPsrkEos.java b/src/main/java/neqsim/thermo/system/SystemPsrkEos.java index 797b76a73c..f2fd8c0a40 100644 --- a/src/main/java/neqsim/thermo/system/SystemPsrkEos.java +++ b/src/main/java/neqsim/thermo/system/SystemPsrkEos.java @@ -7,6 +7,7 @@ * @version $Id: $Id */ public class SystemPsrkEos extends SystemSrkEos { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/thermo/system/SystemRKEos.java b/src/main/java/neqsim/thermo/system/SystemRKEos.java index 28cc108e4f..d76d845d96 100644 --- a/src/main/java/neqsim/thermo/system/SystemRKEos.java +++ b/src/main/java/neqsim/thermo/system/SystemRKEos.java @@ -10,6 +10,7 @@ * @version $Id: $Id */ public class SystemRKEos extends SystemEos { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/thermo/system/SystemSrkCPA.java b/src/main/java/neqsim/thermo/system/SystemSrkCPA.java index acf5c117cf..9e29375df9 100644 --- a/src/main/java/neqsim/thermo/system/SystemSrkCPA.java +++ b/src/main/java/neqsim/thermo/system/SystemSrkCPA.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class SystemSrkCPA extends SystemSrkEos { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/thermo/system/SystemSrkCPAs.java b/src/main/java/neqsim/thermo/system/SystemSrkCPAs.java index 6f86bc584d..d7238605d7 100644 --- a/src/main/java/neqsim/thermo/system/SystemSrkCPAs.java +++ b/src/main/java/neqsim/thermo/system/SystemSrkCPAs.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class SystemSrkCPAs extends SystemSrkCPA { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/thermo/system/SystemSrkCPAstatoil.java b/src/main/java/neqsim/thermo/system/SystemSrkCPAstatoil.java index 61b653fcb8..ed7a0b1b8f 100644 --- a/src/main/java/neqsim/thermo/system/SystemSrkCPAstatoil.java +++ b/src/main/java/neqsim/thermo/system/SystemSrkCPAstatoil.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class SystemSrkCPAstatoil extends SystemSrkCPAs { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/thermo/system/SystemSrkEos.java b/src/main/java/neqsim/thermo/system/SystemSrkEos.java index aed2de75d6..24606395cd 100644 --- a/src/main/java/neqsim/thermo/system/SystemSrkEos.java +++ b/src/main/java/neqsim/thermo/system/SystemSrkEos.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class SystemSrkEos extends SystemEos { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/thermo/system/SystemSrkMathiasCopeman.java b/src/main/java/neqsim/thermo/system/SystemSrkMathiasCopeman.java index 8f51302ad2..0e190bf7ae 100644 --- a/src/main/java/neqsim/thermo/system/SystemSrkMathiasCopeman.java +++ b/src/main/java/neqsim/thermo/system/SystemSrkMathiasCopeman.java @@ -7,6 +7,7 @@ * @version $Id: $Id */ public class SystemSrkMathiasCopeman extends SystemSrkEos { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/thermo/system/SystemSrkPenelouxEos.java b/src/main/java/neqsim/thermo/system/SystemSrkPenelouxEos.java index 701f961890..e7ed39e9c2 100644 --- a/src/main/java/neqsim/thermo/system/SystemSrkPenelouxEos.java +++ b/src/main/java/neqsim/thermo/system/SystemSrkPenelouxEos.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class SystemSrkPenelouxEos extends SystemSrkEos { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/thermo/system/SystemSrkSchwartzentruberEos.java b/src/main/java/neqsim/thermo/system/SystemSrkSchwartzentruberEos.java index 8372590e29..c12d6d917a 100644 --- a/src/main/java/neqsim/thermo/system/SystemSrkSchwartzentruberEos.java +++ b/src/main/java/neqsim/thermo/system/SystemSrkSchwartzentruberEos.java @@ -7,6 +7,7 @@ * @version $Id: $Id */ public class SystemSrkSchwartzentruberEos extends SystemSrkEos { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/thermo/system/SystemSrkTwuCoonEos.java b/src/main/java/neqsim/thermo/system/SystemSrkTwuCoonEos.java index 12d851c3a5..5c9b001174 100644 --- a/src/main/java/neqsim/thermo/system/SystemSrkTwuCoonEos.java +++ b/src/main/java/neqsim/thermo/system/SystemSrkTwuCoonEos.java @@ -7,6 +7,7 @@ * @version $Id: $Id */ public class SystemSrkTwuCoonEos extends SystemSrkEos { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/thermo/system/SystemSrkTwuCoonParamEos.java b/src/main/java/neqsim/thermo/system/SystemSrkTwuCoonParamEos.java index 8b3cfd4aa2..2ec5f4cfb7 100644 --- a/src/main/java/neqsim/thermo/system/SystemSrkTwuCoonParamEos.java +++ b/src/main/java/neqsim/thermo/system/SystemSrkTwuCoonParamEos.java @@ -7,6 +7,7 @@ * @version $Id: $Id */ public class SystemSrkTwuCoonParamEos extends SystemSrkEos { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/thermo/system/SystemSrkTwuCoonStatoilEos.java b/src/main/java/neqsim/thermo/system/SystemSrkTwuCoonStatoilEos.java index 92c7283735..668ac49236 100644 --- a/src/main/java/neqsim/thermo/system/SystemSrkTwuCoonStatoilEos.java +++ b/src/main/java/neqsim/thermo/system/SystemSrkTwuCoonStatoilEos.java @@ -8,6 +8,7 @@ * @version $Id: $Id */ public class SystemSrkTwuCoonStatoilEos extends SystemSrkEos { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/thermo/system/SystemTSTEos.java b/src/main/java/neqsim/thermo/system/SystemTSTEos.java index ea85114bad..19ac2ed8e8 100644 --- a/src/main/java/neqsim/thermo/system/SystemTSTEos.java +++ b/src/main/java/neqsim/thermo/system/SystemTSTEos.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class SystemTSTEos extends SystemEos { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; double[][] TBPfractionCoefs = {{73.404, 97.356, 0.61874, -2059.3, 0.0}, {0.072846, 2.1881, 163.91, -4043.4, 1.0 / 3.0}, {0.37377, 0.005493, 0.011793, -4.9e-6, 0.0}}; diff --git a/src/main/java/neqsim/thermo/system/SystemUMRCPAEoS.java b/src/main/java/neqsim/thermo/system/SystemUMRCPAEoS.java index 654631a6ec..dc4c1ade0c 100644 --- a/src/main/java/neqsim/thermo/system/SystemUMRCPAEoS.java +++ b/src/main/java/neqsim/thermo/system/SystemUMRCPAEoS.java @@ -8,7 +8,8 @@ * @author Even Solbraa */ public class SystemUMRCPAEoS extends SystemPrEos { - private static final long serialVersionUID = 1L; + /** Serialization version UID. */ + private static final long serialVersionUID = 1000; /** *

diff --git a/src/main/java/neqsim/thermo/system/SystemUMRPRUEos.java b/src/main/java/neqsim/thermo/system/SystemUMRPRUEos.java index f4946c67f1..a487850617 100644 --- a/src/main/java/neqsim/thermo/system/SystemUMRPRUEos.java +++ b/src/main/java/neqsim/thermo/system/SystemUMRPRUEos.java @@ -7,6 +7,7 @@ * @version $Id: $Id */ public class SystemUMRPRUEos extends SystemPrEos { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/thermo/system/SystemUMRPRUMCEos.java b/src/main/java/neqsim/thermo/system/SystemUMRPRUMCEos.java index 9c69122466..063d80d4ac 100644 --- a/src/main/java/neqsim/thermo/system/SystemUMRPRUMCEos.java +++ b/src/main/java/neqsim/thermo/system/SystemUMRPRUMCEos.java @@ -7,6 +7,7 @@ * @version $Id: $Id */ public class SystemUMRPRUMCEos extends SystemUMRPRUEos { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/thermo/system/SystemUMRPRUMCEosNew.java b/src/main/java/neqsim/thermo/system/SystemUMRPRUMCEosNew.java index 87ee8f9bd1..9ab1b33e3a 100644 --- a/src/main/java/neqsim/thermo/system/SystemUMRPRUMCEosNew.java +++ b/src/main/java/neqsim/thermo/system/SystemUMRPRUMCEosNew.java @@ -8,7 +8,8 @@ * @author Even Solbraa */ public class SystemUMRPRUMCEosNew extends SystemUMRPRUMCEos { - private static final long serialVersionUID = 1L; + /** Serialization version UID. */ + private static final long serialVersionUID = 1000; /** *

diff --git a/src/main/java/neqsim/thermo/system/SystemUNIFAC.java b/src/main/java/neqsim/thermo/system/SystemUNIFAC.java index ff40e81d69..2d88da9ef4 100644 --- a/src/main/java/neqsim/thermo/system/SystemUNIFAC.java +++ b/src/main/java/neqsim/thermo/system/SystemUNIFAC.java @@ -12,6 +12,7 @@ * @version $Id: $Id */ public class SystemUNIFAC extends SystemEos { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/thermo/system/SystemUNIFACpsrk.java b/src/main/java/neqsim/thermo/system/SystemUNIFACpsrk.java index e3091c3325..91e7a798ed 100644 --- a/src/main/java/neqsim/thermo/system/SystemUNIFACpsrk.java +++ b/src/main/java/neqsim/thermo/system/SystemUNIFACpsrk.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class SystemUNIFACpsrk extends SystemEos { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** 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 ce08e015a0..c3d293fd8c 100644 --- a/src/main/java/neqsim/thermo/util/benchmark/TPflash_benchmark.java +++ b/src/main/java/neqsim/thermo/util/benchmark/TPflash_benchmark.java @@ -16,6 +16,7 @@ * @version $Id: $Id */ public class TPflash_benchmark { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(TPflash_benchmark.class); /** 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 b80b1f33e4..2cb33abe4e 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 @@ -16,6 +16,7 @@ * @version $Id: $Id */ public class TPflash_benchmark_UMR { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(TPflash_benchmark_UMR.class); /** 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 156d40bcb4..21cf66247e 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 @@ -16,6 +16,7 @@ * @version $Id: $Id */ public class TPflash_benchmark_fullcomp { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(TPflash_benchmark_fullcomp.class); /** diff --git a/src/main/java/neqsim/thermo/util/constants/FurstElectrolyteConstants.java b/src/main/java/neqsim/thermo/util/constants/FurstElectrolyteConstants.java index 0a960a4ae9..b859668cf0 100644 --- a/src/main/java/neqsim/thermo/util/constants/FurstElectrolyteConstants.java +++ b/src/main/java/neqsim/thermo/util/constants/FurstElectrolyteConstants.java @@ -15,6 +15,7 @@ * @version $Id: $Id */ public final class FurstElectrolyteConstants implements java.io.Serializable { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; // public static double[] furstParams = {0.0982e-6, 7.003e-6, 77.22e-6, diff --git a/src/main/java/neqsim/thermo/util/empiric/DuanSun.java b/src/main/java/neqsim/thermo/util/empiric/DuanSun.java index 80a1c75edb..a407288330 100644 --- a/src/main/java/neqsim/thermo/util/empiric/DuanSun.java +++ b/src/main/java/neqsim/thermo/util/empiric/DuanSun.java @@ -17,6 +17,7 @@ * @version $Id: $Id */ public class DuanSun { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(DuanSun.class); double[] c = new double[] {0.1, 0.2, 0.3, 0.4, 0.5}; diff --git a/src/main/java/neqsim/thermo/util/jni/GERG2004EOS.java b/src/main/java/neqsim/thermo/util/jni/GERG2004EOS.java index 90ecd6af8d..cc01e583ed 100644 --- a/src/main/java/neqsim/thermo/util/jni/GERG2004EOS.java +++ b/src/main/java/neqsim/thermo/util/jni/GERG2004EOS.java @@ -17,6 +17,7 @@ * @version $Id: $Id */ public class GERG2004EOS { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/thermo/util/readwrite/EclipseFluidReadWrite.java b/src/main/java/neqsim/thermo/util/readwrite/EclipseFluidReadWrite.java index b18c6488aa..61486f2e4d 100644 --- a/src/main/java/neqsim/thermo/util/readwrite/EclipseFluidReadWrite.java +++ b/src/main/java/neqsim/thermo/util/readwrite/EclipseFluidReadWrite.java @@ -21,6 +21,7 @@ * @version $Id: $Id */ public class EclipseFluidReadWrite { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(EclipseFluidReadWrite.class); /** Constant pseudoName="" */ diff --git a/src/main/java/neqsim/thermo/util/readwrite/TablePrinter.java b/src/main/java/neqsim/thermo/util/readwrite/TablePrinter.java index 84eceb2b7c..fa4b50ebe7 100644 --- a/src/main/java/neqsim/thermo/util/readwrite/TablePrinter.java +++ b/src/main/java/neqsim/thermo/util/readwrite/TablePrinter.java @@ -8,7 +8,8 @@ * @author Even Solbraa */ public class TablePrinter implements Serializable { - private static final long serialVersionUID = 1L; + /** Serialization version UID. */ + private static final long serialVersionUID = 1000; /** * Prints a 2D string table in a formatted and visually appealing way. diff --git a/src/main/java/neqsim/thermodynamicoperations/BaseOperation.java b/src/main/java/neqsim/thermodynamicoperations/BaseOperation.java index 410a519ae4..241d7f04ab 100644 --- a/src/main/java/neqsim/thermodynamicoperations/BaseOperation.java +++ b/src/main/java/neqsim/thermodynamicoperations/BaseOperation.java @@ -17,6 +17,7 @@ * @version $Id: $Id */ public abstract class BaseOperation implements OperationInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; SystemInterface systemThermo = null; diff --git a/src/main/java/neqsim/thermodynamicoperations/ThermodynamicOperations.java b/src/main/java/neqsim/thermodynamicoperations/ThermodynamicOperations.java index b2fae0fb63..4044f4525c 100644 --- a/src/main/java/neqsim/thermodynamicoperations/ThermodynamicOperations.java +++ b/src/main/java/neqsim/thermodynamicoperations/ThermodynamicOperations.java @@ -75,6 +75,7 @@ * @version $Id: $Id */ public class ThermodynamicOperations implements java.io.Serializable, Cloneable { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; private Thread thermoOperationThread = new Thread(); @@ -96,6 +97,7 @@ public SystemInterface getSystem() { String fileName = null; private boolean runAsThread = false; protected String[][] resultTable = null; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(ThermodynamicOperations.class); /** diff --git a/src/main/java/neqsim/thermodynamicoperations/chemicalequilibrium/ChemicalEquilibrium.java b/src/main/java/neqsim/thermodynamicoperations/chemicalequilibrium/ChemicalEquilibrium.java index 7bc4c61e36..e23dbb9eb2 100644 --- a/src/main/java/neqsim/thermodynamicoperations/chemicalequilibrium/ChemicalEquilibrium.java +++ b/src/main/java/neqsim/thermodynamicoperations/chemicalequilibrium/ChemicalEquilibrium.java @@ -21,7 +21,9 @@ * @version $Id: $Id */ public class ChemicalEquilibrium extends BaseOperation { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(ChemicalEquilibrium.class); SystemInterface system; diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/CalcIonicComposition.java b/src/main/java/neqsim/thermodynamicoperations/flashops/CalcIonicComposition.java index 3776c95193..8dfe6dd2c9 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/CalcIonicComposition.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/CalcIonicComposition.java @@ -21,6 +21,7 @@ * @version $Id: $Id */ public class CalcIonicComposition extends Flash { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; Logger logger = LogManager.getLogger(CalcIonicComposition.class); diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/CriticalPointFlash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/CriticalPointFlash.java index e19f0fb5a3..c9fe7ad576 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/CriticalPointFlash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/CriticalPointFlash.java @@ -14,7 +14,9 @@ * @version $Id: $Id */ public class CriticalPointFlash extends Flash { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(CriticalPointFlash.class); SimpleMatrix Mmatrix = null; diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/Flash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/Flash.java index 7350aac2d9..870dd5af51 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/Flash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/Flash.java @@ -20,7 +20,9 @@ * @author Even Solbraa */ public abstract class Flash extends BaseOperation { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(Flash.class); SystemInterface system; @@ -89,7 +91,7 @@ public int findLowestGibbsEnergyPhase() { * stabilityAnalysis. *

* - * @throws neqsim.util.exception.IsNaNException if any. + * @throws neqsim.util.exception.IsNaNException if any. * @throws neqsim.util.exception.TooManyIterationsException if any. */ public void stabilityAnalysis() throws neqsim.util.exception.IsNaNException, @@ -212,7 +214,8 @@ public void stabilityAnalysis() throws neqsim.util.exception.IsNaNException, } else { // succsessive substitution for (int i = 0; i < clonedSystem.getPhases()[0].getNumberOfComponents(); i++) { - logWi[i] = d[i] - clonedSystem.getPhase(j).getComponent(i).getLogFugacityCoefficient(); + logWi[i] = + d[i] - clonedSystem.getPhase(j).getComponent(i).getLogFugacityCoefficient(); error[j] += Math.abs((logWi[i] - oldlogw[i]) / oldlogw[i]); Wi[j][i] = Math.exp(logWi[i]); } @@ -415,8 +418,9 @@ public void solidPhaseFlash() { if (system.getPhase(0).getComponent(k).doSolidCheck()) { tempVar[k] = system.getPhase(0).getComponent(k).getz(); for (int i = 0; i < system.getNumberOfPhases() - 1; i++) { - tempVar[k] -= system.getBeta(i) * system.getPhases()[3].getComponent(k).getFugacityCoefficient() - / system.getPhase(i).getComponent(k).getFugacityCoefficient(); + tempVar[k] -= + system.getBeta(i) * system.getPhases()[3].getComponent(k).getFugacityCoefficient() + / system.getPhase(i).getComponent(k).getFugacityCoefficient(); } if (tempVar[k] > 0.0 && tempVar[k] > frac) { @@ -485,8 +489,7 @@ public void solidPhaseFlash() { /** {@inheritDoc} */ @Override - public void printToFile(String name) { - } + public void printToFile(String name) {} /** {@inheritDoc} */ @Override @@ -502,6 +505,5 @@ public String[][] getResultTable() { /** {@inheritDoc} */ @Override - public void addData(String name, double[][] data) { - } + public void addData(String name, double[][] data) {} } diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/PHflash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/PHflash.java index c5df5ae83c..8eed670c78 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/PHflash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/PHflash.java @@ -17,6 +17,7 @@ * @version $Id: $Id */ public class PHflash extends Flash { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; double Hspec = 0; diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/PHflashGERG2008.java b/src/main/java/neqsim/thermodynamicoperations/flashops/PHflashGERG2008.java index f7dbc50dfa..04f3686368 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/PHflashGERG2008.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/PHflashGERG2008.java @@ -17,6 +17,7 @@ * @version $Id: $Id */ public class PHflashGERG2008 extends Flash { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; double Hspec = 0; diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/PHflashSingleComp.java b/src/main/java/neqsim/thermodynamicoperations/flashops/PHflashSingleComp.java index 747bec2417..7a0952f57a 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/PHflashSingleComp.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/PHflashSingleComp.java @@ -12,6 +12,7 @@ * @version $Id: $Id */ public class PHflashSingleComp extends Flash { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; double Hspec = 0; diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/PHsolidFlash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/PHsolidFlash.java index 28c03872f5..adf9c3248a 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/PHsolidFlash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/PHsolidFlash.java @@ -19,7 +19,9 @@ * @version $Id: $Id */ public class PHsolidFlash extends Flash { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(PHsolidFlash.class); Flash tpFlash; diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/PSFlash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/PSFlash.java index db4104aa82..daebfb6ffa 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/PSFlash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/PSFlash.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class PSFlash extends QfuncFlash { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; double Sspec = 0; diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/PSFlashGERG2008.java b/src/main/java/neqsim/thermodynamicoperations/flashops/PSFlashGERG2008.java index 42f5e92283..d01c3eba1e 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/PSFlashGERG2008.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/PSFlashGERG2008.java @@ -13,7 +13,9 @@ * @version $Id: $Id */ public class PSFlashGERG2008 extends QfuncFlash { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(PSFlashGERG2008.class); double Sspec = 0; diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/PSflashSingleComp.java b/src/main/java/neqsim/thermodynamicoperations/flashops/PSflashSingleComp.java index ac2bd5b52f..f336837d96 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/PSflashSingleComp.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/PSflashSingleComp.java @@ -12,6 +12,7 @@ * @version $Id: $Id */ public class PSflashSingleComp extends Flash { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; double Sspec = 0; diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/PUflash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/PUflash.java index a5673f8609..32207ed254 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/PUflash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/PUflash.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class PUflash extends Flash { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; double Uspec = 0; diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/PVrefluxflash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/PVrefluxflash.java index f4956a3703..a9f18ff822 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/PVrefluxflash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/PVrefluxflash.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class PVrefluxflash extends Flash { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; Flash tpFlash; diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/QfuncFlash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/QfuncFlash.java index 1bc27985f2..46be932f3f 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/QfuncFlash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/QfuncFlash.java @@ -14,7 +14,9 @@ * @version $Id: $Id */ public class QfuncFlash extends Flash { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(QfuncFlash.class); double Hspec = 0; @@ -26,8 +28,7 @@ public class QfuncFlash extends Flash { * Constructor for QfuncFlash. *

*/ - public QfuncFlash() { - } + public QfuncFlash() {} /** *

@@ -35,8 +36,8 @@ public QfuncFlash() { *

* * @param system a {@link neqsim.thermo.system.SystemInterface} object - * @param Hspec a double - * @param type a int + * @param Hspec a double + * @param type a int */ public QfuncFlash(SystemInterface system, double Hspec, int type) { this.system = system; @@ -95,8 +96,8 @@ public double solveQ() { public void run() { tpFlash.run(); logger.info("entropy: " + system.getEntropy()); - SysNewtonRhapsonPHflash secondOrderSolver = new SysNewtonRhapsonPHflash(system, 2, - system.getPhases()[0].getNumberOfComponents(), type); + 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 index 84102dd94d..65117fd641 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/RachfordRice.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/RachfordRice.java @@ -19,7 +19,9 @@ * @author Even Solbraa */ public class RachfordRice implements Serializable { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(RachfordRice.class); + /** Serialization version UID. */ private static final long serialVersionUID = 1000; private double[] beta = new double[2]; private static String method = "Nielsen2023"; // alternative use Nielsen2023 or Michelsen2001 diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/SaturateWithWater.java b/src/main/java/neqsim/thermodynamicoperations/flashops/SaturateWithWater.java index 368cc8b04d..2e3a7e44ca 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/SaturateWithWater.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/SaturateWithWater.java @@ -17,7 +17,9 @@ * @version $Id: $Id */ public class SaturateWithWater extends QfuncFlash { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(SaturateWithWater.class); Flash tpFlash; diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/SolidFlash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/SolidFlash.java index b8711ad3b7..f5aef2d296 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/SolidFlash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/SolidFlash.java @@ -15,7 +15,9 @@ * @version $Id: $Id */ public class SolidFlash extends TPflash { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(SolidFlash.class); // SystemInterface clonedSystem; diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/SolidFlash1.java b/src/main/java/neqsim/thermodynamicoperations/flashops/SolidFlash1.java index 5318749879..beceb6204f 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/SolidFlash1.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/SolidFlash1.java @@ -16,7 +16,9 @@ * @version $Id: $Id */ public class SolidFlash1 extends TPflash { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(SolidFlash1.class); // SystemInterface clonedSystem; diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/SolidFlash12.java b/src/main/java/neqsim/thermodynamicoperations/flashops/SolidFlash12.java index 6ab902d50f..d38b5360e8 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/SolidFlash12.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/SolidFlash12.java @@ -22,7 +22,9 @@ * @version $Id: $Id */ public class SolidFlash12 extends TPflash { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(SolidFlash12.class); // SystemInterface clonedSystem; diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/SysNewtonRhapsonPHflash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/SysNewtonRhapsonPHflash.java index d3a44c37e5..2cb588df88 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/SysNewtonRhapsonPHflash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/SysNewtonRhapsonPHflash.java @@ -16,7 +16,9 @@ * @version $Id: $Id */ public class SysNewtonRhapsonPHflash implements ThermodynamicConstantsInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(SysNewtonRhapsonPHflash.class); int neq = 0; diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/SysNewtonRhapsonTPflash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/SysNewtonRhapsonTPflash.java index 9ec55d6578..fc68346129 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/SysNewtonRhapsonTPflash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/SysNewtonRhapsonTPflash.java @@ -12,6 +12,7 @@ * @version $Id: $Id */ public class SysNewtonRhapsonTPflash implements java.io.Serializable { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; int neq = 0; int iter = 0; @@ -131,8 +132,8 @@ public void init() { system.getPhase(0).getComponent(i).setx(u.get(i, 0) / system.getBeta()); system.getPhase(1).getComponent(i).setx( (system.getPhase(0).getComponent(i).getz() - u.get(i, 0)) / (1.0 - system.getBeta())); - system.getPhase(0).getComponent(i).setK(system.getPhase(0).getComponent(i).getx() - / system.getPhase(1).getComponent(i).getx()); + system.getPhase(0).getComponent(i).setK( + system.getPhase(0).getComponent(i).getx() / system.getPhase(1).getComponent(i).getx()); system.getPhase(1).getComponent(i).setK(system.getPhase(0).getComponent(i).getK()); } diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/SysNewtonRhapsonTPflashNew.java b/src/main/java/neqsim/thermodynamicoperations/flashops/SysNewtonRhapsonTPflashNew.java index 8dcc7eec6c..59e086e936 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/SysNewtonRhapsonTPflashNew.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/SysNewtonRhapsonTPflashNew.java @@ -13,6 +13,7 @@ * @version $Id: $Id */ public class SysNewtonRhapsonTPflashNew implements java.io.Serializable { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; int neq = 0; int iter = 0; diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/TPflash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/TPflash.java index 3db87f7875..69de69b594 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/TPflash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/TPflash.java @@ -17,7 +17,9 @@ * @version $Id: $Id */ public class TPflash extends Flash { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(TPflash.class); SystemInterface clonedSystem; diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/TPgradientFlash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/TPgradientFlash.java index f6b608a9f8..aa804d7aca 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/TPgradientFlash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/TPgradientFlash.java @@ -16,6 +16,7 @@ * @author ASMF */ public class TPgradientFlash extends Flash { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; private SystemInterface system; private double temperature; @@ -90,15 +91,13 @@ public void setJac() { for (int i = 0; i < numComponents; i++) { for (int j = 0; j < numComponents; j++) { double dij = (i == j) ? 1.0 : 0.0; // Kronecker delta - double fugacityCoeff = - localSystem.getPhases()[0].getComponent(i).getFugacityCoefficient(); + double fugacityCoeff = localSystem.getPhases()[0].getComponent(i).getFugacityCoefficient(); double componentX = localSystem.getPhases()[0].getComponent(i).getx(); double pressure = localSystem.getPressure(); - double tempJ = 1.0 / (fugacityCoeff * componentX * pressure) - * (fugacityCoeff * dij * pressure - + localSystem.getPhases()[0].getComponent(i).getdfugdx(j) * componentX - * pressure); + double tempJ = + 1.0 / (fugacityCoeff * componentX * pressure) * (fugacityCoeff * dij * pressure + + localSystem.getPhases()[0].getComponent(i).getdfugdx(j) * componentX * pressure); Jac.set(i, j, tempJ); } } diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/TPmultiflash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/TPmultiflash.java index 299c399905..f01b5571ca 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/TPmultiflash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/TPmultiflash.java @@ -24,7 +24,9 @@ * @version $Id: $Id */ public class TPmultiflash extends TPflash { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(TPmultiflash.class); // SystemInterface clonedSystem; diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/TPmultiflashWAX.java b/src/main/java/neqsim/thermodynamicoperations/flashops/TPmultiflashWAX.java index b8ab9e9362..d4dcae7653 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/TPmultiflashWAX.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/TPmultiflashWAX.java @@ -16,7 +16,9 @@ * @version $Id: $Id */ public class TPmultiflashWAX extends TPflash { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(TPmultiflashWAX.class); // SystemInterface clonedSystem; diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/TPmultiflash_1.java b/src/main/java/neqsim/thermodynamicoperations/flashops/TPmultiflash_1.java index 456276f26e..f87c5fa2de 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/TPmultiflash_1.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/TPmultiflash_1.java @@ -21,7 +21,9 @@ * @version $Id: $Id */ public class TPmultiflash_1 extends TPflash { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(TPmultiflash_1.class); // SystemInterface clonedSystem; diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/TSFlash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/TSFlash.java index ef7f4e4189..0146ce9e55 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/TSFlash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/TSFlash.java @@ -20,6 +20,7 @@ * @version $Id: $Id */ public class TSFlash extends QfuncFlash { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; double Sspec = 0; diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/TVflash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/TVflash.java index 14786dea9f..840a61a1d7 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/TVflash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/TVflash.java @@ -17,6 +17,7 @@ * @version $Id: $Id */ public class TVflash extends Flash { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; double Vspec = 0; diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/TVfractionFlash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/TVfractionFlash.java index cb85507806..36ccf1e21f 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/TVfractionFlash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/TVfractionFlash.java @@ -19,7 +19,9 @@ * @version $Id: $Id */ public class TVfractionFlash extends Flash { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(TVfractionFlash.class); double Vfractionspec = 0; diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/VHflash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/VHflash.java index b464ea2a11..73e704652e 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/VHflash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/VHflash.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class VHflash extends Flash { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; double Hspec = 0; diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/VHflashQfunc.java b/src/main/java/neqsim/thermodynamicoperations/flashops/VHflashQfunc.java index 1504e1f2cb..da36439978 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/VHflashQfunc.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/VHflashQfunc.java @@ -16,7 +16,9 @@ * @version $Id: $Id */ public class VHflashQfunc extends Flash { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(VHflashQfunc.class); double Vspec = 0; diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/VSflash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/VSflash.java index 62a2ee7465..f9a0510ed2 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/VSflash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/VSflash.java @@ -14,6 +14,7 @@ * @version $Id: $Id */ public class VSflash extends Flash { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; double Sspec = 0; diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/VUflash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/VUflash.java index 4c46704c33..08754ce906 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/VUflash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/VUflash.java @@ -17,6 +17,7 @@ * @version $Id: $Id */ public class VUflash extends Flash { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; double Uspec = 0; diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/VUflashQfunc.java b/src/main/java/neqsim/thermodynamicoperations/flashops/VUflashQfunc.java index 081b71e0f2..d5125fedb5 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/VUflashQfunc.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/VUflashQfunc.java @@ -22,7 +22,9 @@ * @version $Id: $Id */ public class VUflashQfunc extends Flash { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(VUflashQfunc.class); double Vspec = 0; diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/dTPflash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/dTPflash.java index b77714a532..f8405db90a 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/dTPflash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/dTPflash.java @@ -19,7 +19,9 @@ * @version $Id: $Id */ public class dTPflash extends TPflash { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(dTPflash.class); String[] flashComp = null; @@ -60,8 +62,9 @@ public void run() { - (system.getPhase(0).getComponent(i).getx() * system.getPhase(0).getComponent(i).getFugacityCoefficient() * system.getPhase(0).getPressure())); - system.getPhase(1).getComponent(i).setx(system.getPhase(1).getComponent(i).getx() - * (system.getPhase(0).getComponent(i).getx() + system.getPhase(1).getComponent(i) + .setx(system.getPhase(1).getComponent(i).getx() + * (system.getPhase(0).getComponent(i).getx() * system.getPhase(0).getComponent(i).getFugacityCoefficient() * system.getPhase(0).getPressure()) / (system.getPhase(1).getComponent(i).getx() diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/AddIonToScaleSaturation.java b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/AddIonToScaleSaturation.java index 97574984ef..4dadbbf6fa 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/AddIonToScaleSaturation.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/AddIonToScaleSaturation.java @@ -14,7 +14,9 @@ * @version $Id: $Id */ public class AddIonToScaleSaturation extends ConstantDutyTemperatureFlash { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(AddIonToScaleSaturation.class); String saltName = ""; diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/BubblePointPressureFlash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/BubblePointPressureFlash.java index 134fd39c10..6f87583219 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/BubblePointPressureFlash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/BubblePointPressureFlash.java @@ -13,7 +13,9 @@ * @version $Id: $Id */ public class BubblePointPressureFlash extends ConstantDutyPressureFlash { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(BubblePointPressureFlash.class); /** @@ -56,14 +58,12 @@ public void run() { } for (int i = 0; i < system.getPhases()[1].getNumberOfComponents(); i++) { - system.getPhases()[1].getComponent(i) - .setx(system.getPhases()[0].getComponent(i).getz()); + system.getPhases()[1].getComponent(i).setx(system.getPhases()[0].getComponent(i).getz()); if (system.getPhases()[0].getComponent(i).getIonicCharge() != 0) { system.getPhases()[0].getComponent(i).setx(1e-40); } else { - system.getPhases()[0].getComponent(i) - .setx(system.getPhases()[0].getComponent(i).getK() - * system.getPhases()[1].getComponent(i).getz()); + system.getPhases()[0].getComponent(i).setx(system.getPhases()[0].getComponent(i).getK() + * system.getPhases()[1].getComponent(i).getz()); } } @@ -91,22 +91,21 @@ public void run() { for (int i = 0; i < system.getPhases()[1].getNumberOfComponents(); i++) { do { yold = system.getPhases()[0].getComponent(i).getx(); - if (!Double.isNaN(Math.exp( - Math.log(system.getPhases()[1].getComponent(i).getFugacityCoefficient()) - Math - .log(system.getPhases()[0].getComponent(i).getFugacityCoefficient())))) { + if (!Double.isNaN( + Math.exp(Math.log(system.getPhases()[1].getComponent(i).getFugacityCoefficient()) + - Math.log(system.getPhases()[0].getComponent(i).getFugacityCoefficient())))) { if (system.getPhase(0).getComponent(i).getIonicCharge() != 0) { system.getPhases()[0].getComponent(i).setK(1e-40); } else { - system.getPhases()[0].getComponent(i).setK(Math.exp(Math - .log(system.getPhases()[1].getComponent(i).getFugacityCoefficient()) - - Math.log(system.getPhases()[0].getComponent(i).getFugacityCoefficient()))); + system.getPhases()[0].getComponent(i).setK(Math.exp( + Math.log(system.getPhases()[1].getComponent(i).getFugacityCoefficient()) - Math + .log(system.getPhases()[0].getComponent(i).getFugacityCoefficient()))); } } system.getPhases()[1].getComponent(i) .setK(system.getPhases()[0].getComponent(i).getK()); - system.getPhases()[0].getComponent(i) - .setx(system.getPhases()[0].getComponent(i).getK() - * system.getPhases()[1].getComponent(i).getz()); + system.getPhases()[0].getComponent(i).setx(system.getPhases()[0].getComponent(i).getK() + * system.getPhases()[1].getComponent(i).getz()); // logger.info("y err " + // Math.abs(system.getPhases()[0].getComponent(i).getx()-yold)); } while (Math.abs(system.getPhases()[0].getComponent(i).getx() - yold) / yold > 1e-8); @@ -114,9 +113,8 @@ public void run() { } for (int i = 0; i < system.getPhases()[0].getNumberOfComponents(); i++) { if (!Double.isNaN(system.getPhases()[0].getComponent(i).getK())) { - system.getPhases()[0].getComponent(i) - .setx(system.getPhases()[0].getComponent(i).getK() - * system.getPhases()[1].getComponent(i).getz()); + system.getPhases()[0].getComponent(i).setx(system.getPhases()[0].getComponent(i).getK() + * system.getPhases()[1].getComponent(i).getz()); } else { system.init(0); logger.error("k err. : nan"); diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/BubblePointPressureFlashDer.java b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/BubblePointPressureFlashDer.java index 7f4e10c471..c25f3c1c8c 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/BubblePointPressureFlashDer.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/BubblePointPressureFlashDer.java @@ -13,7 +13,9 @@ * @version $Id: $Id */ public class BubblePointPressureFlashDer extends ConstantDutyPressureFlash { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(BubblePointPressureFlashDer.class); /** @@ -56,14 +58,12 @@ public void run() { } for (int i = 0; i < system.getPhases()[1].getNumberOfComponents(); i++) { - system.getPhases()[1].getComponent(i) - .setx(system.getPhases()[0].getComponent(i).getz()); + system.getPhases()[1].getComponent(i).setx(system.getPhases()[0].getComponent(i).getz()); if (system.getPhases()[0].getComponent(i).getIonicCharge() != 0) { system.getPhases()[0].getComponent(i).setx(1e-40); } else { - system.getPhases()[0].getComponent(i) - .setx(system.getPhases()[0].getComponent(i).getK() - * system.getPhases()[1].getComponent(i).getz()); + system.getPhases()[0].getComponent(i).setx(system.getPhases()[0].getComponent(i).getK() + * system.getPhases()[1].getComponent(i).getz()); } } @@ -91,22 +91,21 @@ public void run() { for (int i = 0; i < system.getPhases()[1].getNumberOfComponents(); i++) { do { yold = system.getPhases()[0].getComponent(i).getx(); - if (!Double.isNaN(Math.exp( - Math.log(system.getPhases()[1].getComponent(i).getFugacityCoefficient()) - Math - .log(system.getPhases()[0].getComponent(i).getFugacityCoefficient())))) { + if (!Double.isNaN( + Math.exp(Math.log(system.getPhases()[1].getComponent(i).getFugacityCoefficient()) + - Math.log(system.getPhases()[0].getComponent(i).getFugacityCoefficient())))) { if (system.getPhase(0).getComponent(i).getIonicCharge() != 0) { system.getPhases()[0].getComponent(i).setK(1e-40); } else { - system.getPhases()[0].getComponent(i).setK(Math.exp(Math - .log(system.getPhases()[1].getComponent(i).getFugacityCoefficient()) - - Math.log(system.getPhases()[0].getComponent(i).getFugacityCoefficient()))); + system.getPhases()[0].getComponent(i).setK(Math.exp( + Math.log(system.getPhases()[1].getComponent(i).getFugacityCoefficient()) - Math + .log(system.getPhases()[0].getComponent(i).getFugacityCoefficient()))); } } system.getPhases()[1].getComponent(i) .setK(system.getPhases()[0].getComponent(i).getK()); - system.getPhases()[0].getComponent(i) - .setx(system.getPhases()[0].getComponent(i).getK() - * system.getPhases()[1].getComponent(i).getz()); + system.getPhases()[0].getComponent(i).setx(system.getPhases()[0].getComponent(i).getK() + * system.getPhases()[1].getComponent(i).getz()); // logger.info("y err " + // Math.abs(system.getPhases()[0].getComponent(i).getx()-yold)); } while (Math.abs(system.getPhases()[0].getComponent(i).getx() - yold) / yold > 1e-8); @@ -114,9 +113,8 @@ public void run() { } for (int i = 0; i < system.getPhases()[0].getNumberOfComponents(); i++) { if (!Double.isNaN(system.getPhases()[0].getComponent(i).getK())) { - system.getPhases()[0].getComponent(i) - .setx(system.getPhases()[0].getComponent(i).getK() - * system.getPhases()[1].getComponent(i).getz()); + system.getPhases()[0].getComponent(i).setx(system.getPhases()[0].getComponent(i).getK() + * system.getPhases()[1].getComponent(i).getz()); } else { system.init(0); logger.error("K error : nan"); diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/BubblePointTemperatureFlash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/BubblePointTemperatureFlash.java index 1fde945f61..d1c7ccfeb5 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/BubblePointTemperatureFlash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/BubblePointTemperatureFlash.java @@ -13,7 +13,9 @@ * @version $Id: $Id */ public class BubblePointTemperatureFlash extends ConstantDutyTemperatureFlash { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(BubblePointTemperatureFlash.class); /** @@ -38,8 +40,7 @@ public void run() { double funk = 0; for (int i = 0; i < system.getPhases()[1].getNumberOfComponents(); i++) { - system.getPhases()[1].getComponent(i) - .setx(system.getPhases()[0].getComponent(i).getz()); + system.getPhases()[1].getComponent(i).setx(system.getPhases()[0].getComponent(i).getz()); system.getPhases()[0].getComponent(i).setx(system.getPhases()[0].getComponent(i).getK() * system.getPhases()[1].getComponent(i).getx()); } @@ -59,8 +60,7 @@ public void run() { system.getPhases()[0].getComponent(i) .setK(system.getPhases()[1].getComponent(i).getFugacityCoefficient() / system.getPhases()[0].getComponent(i).getFugacityCoefficient()); - system.getPhases()[1].getComponent(i) - .setK(system.getPhases()[0].getComponent(i).getK()); + system.getPhases()[1].getComponent(i).setK(system.getPhases()[0].getComponent(i).getK()); system.getPhases()[0].getComponent(i) .setx(system.getPhases()[1].getComponent(i).getx() * system.getPhases()[1].getComponent(i).getFugacityCoefficient() diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/BubblePointTemperatureNoDer.java b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/BubblePointTemperatureNoDer.java index 3e7cd91a72..3111878d4b 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/BubblePointTemperatureNoDer.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/BubblePointTemperatureNoDer.java @@ -13,7 +13,9 @@ * @version $Id: $Id */ public class BubblePointTemperatureNoDer extends ConstantDutyTemperatureFlash { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(BubblePointTemperatureNoDer.class); /** diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/CalcSaltSatauration.java b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/CalcSaltSatauration.java index 98aa34100e..dc6cedadf7 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/CalcSaltSatauration.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/CalcSaltSatauration.java @@ -13,7 +13,9 @@ * @version $Id: $Id */ public class CalcSaltSatauration extends ConstantDutyTemperatureFlash { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(CalcSaltSatauration.class); String saltName; diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/CheckScalePotential.java b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/CheckScalePotential.java index 8897eb9860..25c088c414 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/CheckScalePotential.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/CheckScalePotential.java @@ -13,7 +13,9 @@ * @version $Id: $Id */ public class CheckScalePotential extends ConstantDutyTemperatureFlash { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(CheckScalePotential.class); String saltName; diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/ConstantDutyFlash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/ConstantDutyFlash.java index a98cf1bc39..ce747d5981 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/ConstantDutyFlash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/ConstantDutyFlash.java @@ -14,7 +14,9 @@ * @version $Id: $Id */ public abstract class ConstantDutyFlash implements ConstantDutyFlashInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(ConstantDutyFlash.class); SystemInterface system; diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/ConstantDutyPressureFlash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/ConstantDutyPressureFlash.java index 16820568dd..96bd0b36b1 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/ConstantDutyPressureFlash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/ConstantDutyPressureFlash.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class ConstantDutyPressureFlash extends ConstantDutyFlash { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** @@ -50,8 +51,7 @@ public void run() { system.getPhases()[0].getComponent(i) .setK(system.getPhases()[1].getComponent(i).getFugacityCoefficient() / system.getPhases()[0].getComponent(i).getFugacityCoefficient()); - system.getPhases()[1].getComponent(i) - .setK(system.getPhases()[0].getComponent(i).getK()); + system.getPhases()[1].getComponent(i).setK(system.getPhases()[0].getComponent(i).getK()); } system.calc_x_y_nonorm(); diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/ConstantDutyTemperatureFlash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/ConstantDutyTemperatureFlash.java index 5118154ed3..a05843716a 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/ConstantDutyTemperatureFlash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/ConstantDutyTemperatureFlash.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class ConstantDutyTemperatureFlash extends ConstantDutyFlash { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** @@ -18,8 +19,7 @@ public class ConstantDutyTemperatureFlash extends ConstantDutyFlash { * Constructor for constantDutyTemperatureFlash. *

*/ - public ConstantDutyTemperatureFlash() { - } + public ConstantDutyTemperatureFlash() {} /** *

diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/CricondebarFlash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/CricondebarFlash.java index 4a3b7b5997..b0ca533823 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/CricondebarFlash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/CricondebarFlash.java @@ -15,7 +15,9 @@ * @version $Id: $Id */ public class CricondebarFlash extends ConstantDutyPressureFlash { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(ConstantDutyFlash.class); Matrix Jac; @@ -49,11 +51,9 @@ public double calcx() { .setK(Math.exp(system.getPhases()[1].getComponent(i).getLogFugacityCoefficient() - system.getPhases()[0].getComponent(i).getLogFugacityCoefficient())); - system.getPhases()[1].getComponent(i) - .setK(system.getPhases()[0].getComponent(i).getK()); - system.getPhases()[1].getComponent(i) - .setx(1.0 / system.getPhases()[0].getComponent(i).getK() - * system.getPhases()[1].getComponent(i).getz()); + system.getPhases()[1].getComponent(i).setK(system.getPhases()[0].getComponent(i).getK()); + system.getPhases()[1].getComponent(i).setx(1.0 / system.getPhases()[0].getComponent(i).getK() + * system.getPhases()[1].getComponent(i).getz()); // ktot += Math.abs(system.getPhases()[1].getComponent(i).getK() - 1.0); } xtotal = 0.0; diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/CricondenBarTemp.java b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/CricondenBarTemp.java index 559502e8bb..34e82e7e47 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/CricondenBarTemp.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/CricondenBarTemp.java @@ -12,6 +12,7 @@ * @version $Id: $Id */ public class CricondenBarTemp implements java.io.Serializable { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; int neq = 0; int iter = 0; @@ -95,9 +96,8 @@ public void setJac() { tempJ = 1.0 / system.getBeta() * (dij / system.getPhases()[0].getComponent(i).getx() - 1.0 + system.getPhases()[0].getComponent(i).getdfugdx(j)) - + 1.0 / (1.0 - system.getBeta()) - * (dij / system.getPhases()[1].getComponent(i).getx() - 1.0 - + system.getPhases()[1].getComponent(i).getdfugdx(j)); + + 1.0 / (1.0 - system.getBeta()) * (dij / system.getPhases()[1].getComponent(i).getx() + - 1.0 + system.getPhases()[1].getComponent(i).getdfugdx(j)); Jac.set(i, j, tempJ); } } @@ -129,13 +129,11 @@ public void init() { for (int i = 0; i < numberOfComponents; i++) { system.getPhases()[0].getComponent(i).setx(u.get(i, 0) / system.getBeta()); - system.getPhases()[1].getComponent(i) - .setx((system.getPhases()[0].getComponent(i).getz() - u.get(i, 0)) - / (1.0 - system.getBeta())); + system.getPhases()[1].getComponent(i).setx( + (system.getPhases()[0].getComponent(i).getz() - u.get(i, 0)) / (1.0 - system.getBeta())); system.getPhases()[0].getComponent(i).setK(system.getPhases()[0].getComponent(i).getx() / system.getPhases()[1].getComponent(i).getx()); - system.getPhases()[1].getComponent(i) - .setK(system.getPhases()[0].getComponent(i).getK()); + system.getPhases()[1].getComponent(i).setK(system.getPhases()[0].getComponent(i).getK()); } system.init(3); diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/CricondenBarTemp1.java b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/CricondenBarTemp1.java index 3f577362d7..7b69f2f63d 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/CricondenBarTemp1.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/CricondenBarTemp1.java @@ -13,6 +13,7 @@ * @version $Id: $Id */ public class CricondenBarTemp1 implements java.io.Serializable { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; int neq = 0; @@ -107,9 +108,8 @@ public void setJac() { tempJ = 1.0 / system.getBeta() * (dij / system.getPhases()[0].getComponent(i).getx() - 1.0 + system.getPhases()[0].getComponent(i).getdfugdx(j)) - + 1.0 / (1.0 - system.getBeta()) - * (dij / system.getPhases()[1].getComponent(i).getx() - 1.0 - + system.getPhases()[1].getComponent(i).getdfugdx(j)); + + 1.0 / (1.0 - system.getBeta()) * (dij / system.getPhases()[1].getComponent(i).getx() + - 1.0 + system.getPhases()[1].getComponent(i).getdfugdx(j)); Jac.set(i, j, tempJ); } } @@ -141,13 +141,11 @@ public void init() { for (int i = 0; i < numberOfComponents; i++) { system.getPhases()[0].getComponent(i).setx(u.get(i, 0) / system.getBeta()); - system.getPhases()[1].getComponent(i) - .setx((system.getPhases()[0].getComponent(i).getz() - u.get(i, 0)) - / (1.0 - system.getBeta())); + system.getPhases()[1].getComponent(i).setx( + (system.getPhases()[0].getComponent(i).getz() - u.get(i, 0)) / (1.0 - system.getBeta())); system.getPhases()[0].getComponent(i).setK(system.getPhases()[0].getComponent(i).getx() / system.getPhases()[1].getComponent(i).getx()); - system.getPhases()[1].getComponent(i) - .setK(system.getPhases()[0].getComponent(i).getK()); + system.getPhases()[1].getComponent(i).setK(system.getPhases()[0].getComponent(i).getK()); } system.init(3); diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/DewPointPressureFlash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/DewPointPressureFlash.java index 5cd619b54a..1c816b547f 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/DewPointPressureFlash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/DewPointPressureFlash.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class DewPointPressureFlash extends ConstantDutyTemperatureFlash { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/DewPointTemperatureFlash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/DewPointTemperatureFlash.java index 19b2c30461..ce7b6d58dd 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/DewPointTemperatureFlash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/DewPointTemperatureFlash.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class DewPointTemperatureFlash extends ConstantDutyTemperatureFlash { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** @@ -50,8 +51,7 @@ public void run() { } for (int i = 0; i < system.getPhases()[1].getNumberOfComponents(); i++) { - system.getPhases()[0].getComponent(i) - .setx(system.getPhases()[0].getComponent(i).getz()); + system.getPhases()[0].getComponent(i).setx(system.getPhases()[0].getComponent(i).getz()); if (system.getPhases()[0].getComponent(i).getIonicCharge() != 0) { system.getPhases()[0].getComponent(i).setx(1e-40); } else { @@ -93,8 +93,7 @@ public void run() { .setK(Math.exp(system.getPhases()[1].getComponent(i).getLogFugacityCoefficient() - system.getPhases()[0].getComponent(i).getLogFugacityCoefficient())); } - system.getPhases()[1].getComponent(i) - .setK(system.getPhases()[0].getComponent(i).getK()); + system.getPhases()[1].getComponent(i).setK(system.getPhases()[0].getComponent(i).getK()); system.getPhases()[1].getComponent(i) .setx(1.0 / system.getPhases()[0].getComponent(i).getK() * system.getPhases()[1].getComponent(i).getz()); diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/DewPointTemperatureFlashDer.java b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/DewPointTemperatureFlashDer.java index 2eb754f605..97e970813f 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/DewPointTemperatureFlashDer.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/DewPointTemperatureFlashDer.java @@ -11,6 +11,7 @@ * @version $Id: $Id */ public class DewPointTemperatureFlashDer extends ConstantDutyTemperatureFlash { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** @@ -46,8 +47,7 @@ public void run() { } for (int i = 0; i < system.getPhases()[1].getNumberOfComponents(); i++) { - system.getPhases()[0].getComponent(i) - .setx(system.getPhases()[0].getComponent(i).getz()); + system.getPhases()[0].getComponent(i).setx(system.getPhases()[0].getComponent(i).getz()); if (system.getPhases()[0].getComponent(i).getIonicCharge() != 0) { system.getPhases()[0].getComponent(i).setx(1e-40); } else { @@ -117,8 +117,7 @@ public void run() { .setK(Math.exp(system.getPhases()[1].getComponent(i).getLogFugacityCoefficient() - system.getPhases()[0].getComponent(i).getLogFugacityCoefficient())); } - system.getPhases()[1].getComponent(i) - .setK(system.getPhases()[0].getComponent(i).getK()); + system.getPhases()[1].getComponent(i).setK(system.getPhases()[0].getComponent(i).getK()); system.getPhases()[1].getComponent(i) .setx(1.0 / system.getPhases()[0].getComponent(i).getK() * system.getPhases()[1].getComponent(i).getz()); diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/FreezeOut.java b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/FreezeOut.java index fcf7de0d16..a982aeb3e4 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/FreezeOut.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/FreezeOut.java @@ -21,7 +21,9 @@ */ public class FreezeOut extends ConstantDutyTemperatureFlash implements ThermodynamicConstantsInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(FreezeOut.class); public double[] FCompTemp = new double[10]; diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/FreezingPointTemperatureFlash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/FreezingPointTemperatureFlash.java index a75ef13ddf..cadafc25fe 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/FreezingPointTemperatureFlash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/FreezingPointTemperatureFlash.java @@ -19,7 +19,9 @@ */ public class FreezingPointTemperatureFlash extends ConstantDutyTemperatureFlash implements ThermodynamicConstantsInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(FreezingPointTemperatureFlash.class); public boolean noFreezeFlash = true; diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/FreezingPointTemperatureFlashOld.java b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/FreezingPointTemperatureFlashOld.java index 3e53d6bf5c..8f62b0ee40 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/FreezingPointTemperatureFlashOld.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/FreezingPointTemperatureFlashOld.java @@ -14,7 +14,9 @@ * @version $Id: $Id */ public class FreezingPointTemperatureFlashOld extends ConstantDutyTemperatureFlash { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(FreezingPointTemperatureFlashOld.class); /** diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/FreezingPointTemperatureFlashTR.java b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/FreezingPointTemperatureFlashTR.java index ccc1cfd2c3..5166be1ca4 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/FreezingPointTemperatureFlashTR.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/FreezingPointTemperatureFlashTR.java @@ -20,7 +20,9 @@ */ public class FreezingPointTemperatureFlashTR extends ConstantDutyTemperatureFlash implements ThermodynamicConstantsInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(FreezingPointTemperatureFlashTR.class); public boolean noFreezeFlash = true; diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/FugTestConstP.java b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/FugTestConstP.java index 0d578c6b50..1335cafc47 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/FugTestConstP.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/FugTestConstP.java @@ -19,7 +19,9 @@ */ public class FugTestConstP extends ConstantDutyTemperatureFlash implements ThermodynamicConstantsInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(FugTestConstP.class); public double temp = 0.0; diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/HCdewPointPressureFlash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/HCdewPointPressureFlash.java index 30f338c6fd..0d69f4119a 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/HCdewPointPressureFlash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/HCdewPointPressureFlash.java @@ -13,7 +13,9 @@ * @version $Id: $Id */ public class HCdewPointPressureFlash extends ConstantDutyTemperatureFlash { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ 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 index 10409aff70..27fb53458c 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/HydrateEquilibriumLine.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/HydrateEquilibriumLine.java @@ -12,6 +12,7 @@ * @version $Id: $Id */ public class HydrateEquilibriumLine extends ConstantDutyTemperatureFlash { + /** Serialization version UID. */ 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 index 10fce60b0d..c62fad351e 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/HydrateFormationPressureFlash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/HydrateFormationPressureFlash.java @@ -15,7 +15,9 @@ * @version $Id: $Id */ public class HydrateFormationPressureFlash extends ConstantDutyTemperatureFlash { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ 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 index 546b4f4d97..a04b414d02 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/HydrateFormationTemperatureFlash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/HydrateFormationTemperatureFlash.java @@ -15,7 +15,9 @@ * @version $Id: $Id */ public class HydrateFormationTemperatureFlash extends ConstantDutyTemperatureFlash { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ 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 index f64d2f038a..6953463233 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/HydrateInhibitorConcentrationFlash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/HydrateInhibitorConcentrationFlash.java @@ -16,7 +16,9 @@ * @version $Id: $Id */ public class HydrateInhibitorConcentrationFlash extends ConstantDutyTemperatureFlash { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(HydrateInhibitorConcentrationFlash.class); double hydT = 273.15; diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/HydrateInhibitorwtFlash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/HydrateInhibitorwtFlash.java index da5a5522e9..228996b56d 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/HydrateInhibitorwtFlash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/HydrateInhibitorwtFlash.java @@ -15,7 +15,9 @@ * @version $Id: $Id */ public class HydrateInhibitorwtFlash extends ConstantDutyTemperatureFlash { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(HydrateInhibitorwtFlash.class); double wtfrac = 0.5; diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/SolidComplexTemperatureCalc.java b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/SolidComplexTemperatureCalc.java index 6faec09dad..f5fdef2643 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/SolidComplexTemperatureCalc.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/SolidComplexTemperatureCalc.java @@ -14,7 +14,9 @@ * @version $Id: $Id */ public class SolidComplexTemperatureCalc extends ConstantDutyTemperatureFlash { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(SolidComplexTemperatureCalc.class); String comp1; diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/WATcalc.java b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/WATcalc.java index 1e29556fa7..38cd2612f8 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/WATcalc.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/WATcalc.java @@ -14,7 +14,9 @@ * @version $Id: $Id */ public class WATcalc extends ConstantDutyTemperatureFlash { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ 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 index 13428d6093..e45f48ee2d 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/WaterDewPointEquilibriumLine.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/WaterDewPointEquilibriumLine.java @@ -12,6 +12,7 @@ * @version $Id: $Id */ public class WaterDewPointEquilibriumLine extends ConstantDutyTemperatureFlash { + /** Serialization version UID. */ 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 index accc16d319..0da94df5ae 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/WaterDewPointTemperatureFlash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/WaterDewPointTemperatureFlash.java @@ -13,7 +13,9 @@ * @version $Id: $Id */ public class WaterDewPointTemperatureFlash extends ConstantDutyTemperatureFlash { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(WaterDewPointTemperatureFlash.class); /** diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/WaterDewPointTemperatureMultiphaseFlash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/WaterDewPointTemperatureMultiphaseFlash.java index e5e5cd1f8e..842d938f94 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/WaterDewPointTemperatureMultiphaseFlash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/WaterDewPointTemperatureMultiphaseFlash.java @@ -14,7 +14,9 @@ * @version $Id: $Id */ public class WaterDewPointTemperatureMultiphaseFlash extends ConstantDutyTemperatureFlash { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(WaterDewPointTemperatureMultiphaseFlash.class); /** diff --git a/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/CricondenBarFlash.java b/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/CricondenBarFlash.java index 16747ee637..e2662d47c5 100644 --- a/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/CricondenBarFlash.java +++ b/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/CricondenBarFlash.java @@ -13,6 +13,7 @@ * @version $Id: $Id */ public class CricondenBarFlash extends PTphaseEnvelope { + /** Serialization version UID. */ 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 index a19940bc1c..3b4402f630 100644 --- a/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/CricondenThermFlash.java +++ b/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/CricondenThermFlash.java @@ -12,6 +12,7 @@ * @version $Id: $Id */ public class CricondenThermFlash extends PTphaseEnvelope { + /** Serialization version UID. */ 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 index 56e545436f..cb519af2fd 100644 --- a/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/HPTphaseEnvelope.java +++ b/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/HPTphaseEnvelope.java @@ -26,7 +26,9 @@ * @version $Id: $Id */ public class HPTphaseEnvelope extends BaseOperation { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(HPTphaseEnvelope.class); double[][] points = new double[10][10]; diff --git a/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/PTphaseEnvelope.java b/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/PTphaseEnvelope.java index a34d24dfc0..330cbaa27b 100644 --- a/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/PTphaseEnvelope.java +++ b/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/PTphaseEnvelope.java @@ -27,7 +27,9 @@ * @version $Id: $Id */ public class PTphaseEnvelope extends BaseOperation { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(PTphaseEnvelope.class); double maxPressure = 1000.0; diff --git a/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/PTphaseEnvelope1.java b/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/PTphaseEnvelope1.java index 58497d4249..4024d463df 100644 --- a/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/PTphaseEnvelope1.java +++ b/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/PTphaseEnvelope1.java @@ -22,7 +22,9 @@ * @version $Id: $Id */ public class PTphaseEnvelope1 extends BaseOperation { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(PTphaseEnvelope1.class); Graph2b graph2 = null; diff --git a/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/PTphaseEnvelopeMay.java b/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/PTphaseEnvelopeMay.java index f75437e500..4ac7bb7184 100644 --- a/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/PTphaseEnvelopeMay.java +++ b/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/PTphaseEnvelopeMay.java @@ -21,7 +21,9 @@ * @version $Id: $Id */ public class PTphaseEnvelopeMay extends BaseOperation { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(PTphaseEnvelopeMay.class); double maxPressure = 1000.0; diff --git a/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/PTphaseEnvelopeNew.java b/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/PTphaseEnvelopeNew.java index 958f44862a..6bbb9ceb21 100644 --- a/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/PTphaseEnvelopeNew.java +++ b/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/PTphaseEnvelopeNew.java @@ -22,7 +22,9 @@ * @version $Id: $Id */ public class PTphaseEnvelopeNew extends BaseOperation { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(PTphaseEnvelopeNew.class); Graph2b graph2 = null; diff --git a/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/PTphaseEnvelopeNew2.java b/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/PTphaseEnvelopeNew2.java index 3f42474d0b..3ff2c4266d 100644 --- a/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/PTphaseEnvelopeNew2.java +++ b/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/PTphaseEnvelopeNew2.java @@ -23,7 +23,9 @@ * @version $Id: $Id */ public class PTphaseEnvelopeNew2 extends BaseOperation { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(PTphaseEnvelopeNew2.class); double maxPressure = 1000.0; diff --git a/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/SysNewtonRhapsonPhaseEnvelope.java b/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/SysNewtonRhapsonPhaseEnvelope.java index f9cf0d8c94..ed9c9671e8 100644 --- a/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/SysNewtonRhapsonPhaseEnvelope.java +++ b/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/SysNewtonRhapsonPhaseEnvelope.java @@ -15,7 +15,9 @@ * @version $Id: $Id */ public class SysNewtonRhapsonPhaseEnvelope implements java.io.Serializable { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(SysNewtonRhapsonPhaseEnvelope.class); double sumx = 0; diff --git a/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/SysNewtonRhapsonPhaseEnvelope2.java b/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/SysNewtonRhapsonPhaseEnvelope2.java index 201ca9c183..5e4661846e 100644 --- a/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/SysNewtonRhapsonPhaseEnvelope2.java +++ b/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/multicomponentenvelopeops/SysNewtonRhapsonPhaseEnvelope2.java @@ -19,7 +19,9 @@ * @version $Id: $Id */ public class SysNewtonRhapsonPhaseEnvelope2 implements java.io.Serializable { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(SysNewtonRhapsonPhaseEnvelope2.class); int neq = 0; diff --git a/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/reactivecurves/PloadingCurve.java b/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/reactivecurves/PloadingCurve.java index 3e923d4804..cbc0f0e8db 100644 --- a/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/reactivecurves/PloadingCurve.java +++ b/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/reactivecurves/PloadingCurve.java @@ -21,7 +21,9 @@ * @version $Id: $Id */ public class PloadingCurve implements OperationInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(PloadingCurve.class); SystemInterface system; diff --git a/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/reactivecurves/PloadingCurve2.java b/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/reactivecurves/PloadingCurve2.java index de40c8e8b9..6c3e45554b 100644 --- a/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/reactivecurves/PloadingCurve2.java +++ b/src/main/java/neqsim/thermodynamicoperations/phaseenvelopeops/reactivecurves/PloadingCurve2.java @@ -22,7 +22,9 @@ * @version $Id: $Id */ public class PloadingCurve2 extends BaseOperation { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(PloadingCurve2.class); SystemInterface system; diff --git a/src/main/java/neqsim/thermodynamicoperations/propertygenerator/OLGApropertyTableGenerator.java b/src/main/java/neqsim/thermodynamicoperations/propertygenerator/OLGApropertyTableGenerator.java index 2bfa8437be..e9d52b3342 100644 --- a/src/main/java/neqsim/thermodynamicoperations/propertygenerator/OLGApropertyTableGenerator.java +++ b/src/main/java/neqsim/thermodynamicoperations/propertygenerator/OLGApropertyTableGenerator.java @@ -21,7 +21,9 @@ * @version $Id: $Id */ public class OLGApropertyTableGenerator extends neqsim.thermodynamicoperations.BaseOperation { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(OLGApropertyTableGenerator.class); SystemInterface thermoSystem = null; diff --git a/src/main/java/neqsim/thermodynamicoperations/propertygenerator/OLGApropertyTableGeneratorKeywordFormat.java b/src/main/java/neqsim/thermodynamicoperations/propertygenerator/OLGApropertyTableGeneratorKeywordFormat.java index 8e0aebe03a..04d2221d9b 100644 --- a/src/main/java/neqsim/thermodynamicoperations/propertygenerator/OLGApropertyTableGeneratorKeywordFormat.java +++ b/src/main/java/neqsim/thermodynamicoperations/propertygenerator/OLGApropertyTableGeneratorKeywordFormat.java @@ -22,7 +22,9 @@ */ public class OLGApropertyTableGeneratorKeywordFormat extends neqsim.thermodynamicoperations.BaseOperation { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(OLGApropertyTableGeneratorKeywordFormat.class); SystemInterface thermoSystem = null; diff --git a/src/main/java/neqsim/thermodynamicoperations/propertygenerator/OLGApropertyTableGeneratorWater.java b/src/main/java/neqsim/thermodynamicoperations/propertygenerator/OLGApropertyTableGeneratorWater.java index 4792f7c265..e5bf06099d 100644 --- a/src/main/java/neqsim/thermodynamicoperations/propertygenerator/OLGApropertyTableGeneratorWater.java +++ b/src/main/java/neqsim/thermodynamicoperations/propertygenerator/OLGApropertyTableGeneratorWater.java @@ -27,7 +27,9 @@ * @version $Id: $Id */ public class OLGApropertyTableGeneratorWater extends neqsim.thermodynamicoperations.BaseOperation { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(OLGApropertyTableGeneratorWater.class); BicubicInterpolator interpolationFunc = new BicubicInterpolator(); diff --git a/src/main/java/neqsim/thermodynamicoperations/propertygenerator/OLGApropertyTableGeneratorWaterEven.java b/src/main/java/neqsim/thermodynamicoperations/propertygenerator/OLGApropertyTableGeneratorWaterEven.java index 4928cc30c7..91b69c064e 100644 --- a/src/main/java/neqsim/thermodynamicoperations/propertygenerator/OLGApropertyTableGeneratorWaterEven.java +++ b/src/main/java/neqsim/thermodynamicoperations/propertygenerator/OLGApropertyTableGeneratorWaterEven.java @@ -22,7 +22,9 @@ */ public class OLGApropertyTableGeneratorWaterEven extends neqsim.thermodynamicoperations.BaseOperation { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(OLGApropertyTableGeneratorWaterEven.class); SystemInterface thermoSystem = null; diff --git a/src/main/java/neqsim/thermodynamicoperations/propertygenerator/OLGApropertyTableGeneratorWaterKeywordFormat.java b/src/main/java/neqsim/thermodynamicoperations/propertygenerator/OLGApropertyTableGeneratorWaterKeywordFormat.java index 8feb53a85b..859d09befa 100644 --- a/src/main/java/neqsim/thermodynamicoperations/propertygenerator/OLGApropertyTableGeneratorWaterKeywordFormat.java +++ b/src/main/java/neqsim/thermodynamicoperations/propertygenerator/OLGApropertyTableGeneratorWaterKeywordFormat.java @@ -22,7 +22,9 @@ */ public class OLGApropertyTableGeneratorWaterKeywordFormat extends neqsim.thermodynamicoperations.BaseOperation { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(OLGApropertyTableGeneratorWaterKeywordFormat.class); SystemInterface thermoSystem = null; diff --git a/src/main/java/neqsim/thermodynamicoperations/propertygenerator/OLGApropertyTableGeneratorWaterStudents.java b/src/main/java/neqsim/thermodynamicoperations/propertygenerator/OLGApropertyTableGeneratorWaterStudents.java index f2d61690b8..51d1d94617 100644 --- a/src/main/java/neqsim/thermodynamicoperations/propertygenerator/OLGApropertyTableGeneratorWaterStudents.java +++ b/src/main/java/neqsim/thermodynamicoperations/propertygenerator/OLGApropertyTableGeneratorWaterStudents.java @@ -26,7 +26,9 @@ */ public class OLGApropertyTableGeneratorWaterStudents extends neqsim.thermodynamicoperations.BaseOperation { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(OLGApropertyTableGeneratorWaterStudents.class); SystemInterface thermoSystem = null; diff --git a/src/main/java/neqsim/thermodynamicoperations/propertygenerator/OLGApropertyTableGeneratorWaterStudentsPH.java b/src/main/java/neqsim/thermodynamicoperations/propertygenerator/OLGApropertyTableGeneratorWaterStudentsPH.java index a82158fb99..bf05961ffc 100644 --- a/src/main/java/neqsim/thermodynamicoperations/propertygenerator/OLGApropertyTableGeneratorWaterStudentsPH.java +++ b/src/main/java/neqsim/thermodynamicoperations/propertygenerator/OLGApropertyTableGeneratorWaterStudentsPH.java @@ -26,7 +26,9 @@ */ public class OLGApropertyTableGeneratorWaterStudentsPH extends neqsim.thermodynamicoperations.BaseOperation { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(OLGApropertyTableGeneratorWaterStudentsPH.class); SystemInterface thermoSystem = null; diff --git a/src/main/java/neqsim/util/NamedBaseClass.java b/src/main/java/neqsim/util/NamedBaseClass.java index 16da43dc2f..f198e86ced 100644 --- a/src/main/java/neqsim/util/NamedBaseClass.java +++ b/src/main/java/neqsim/util/NamedBaseClass.java @@ -7,7 +7,8 @@ * @version $Id: $Id */ public abstract class NamedBaseClass implements NamedInterface, java.io.Serializable { - private static final long serialVersionUID = 1L; + /** Serialization version UID. */ + private static final long serialVersionUID = 1000; public String name; /** diff --git a/src/main/java/neqsim/util/database/AspenIP21Database.java b/src/main/java/neqsim/util/database/AspenIP21Database.java index 88468e116c..fb38e972ff 100644 --- a/src/main/java/neqsim/util/database/AspenIP21Database.java +++ b/src/main/java/neqsim/util/database/AspenIP21Database.java @@ -18,7 +18,9 @@ */ public class AspenIP21Database implements neqsim.util.util.FileSystemSettings, java.io.Serializable { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(AspenIP21Database.class); protected Connection databaseConnection = null; diff --git a/src/main/java/neqsim/util/database/NeqSimBlobDatabase.java b/src/main/java/neqsim/util/database/NeqSimBlobDatabase.java index a26be5d583..edd66f49c9 100644 --- a/src/main/java/neqsim/util/database/NeqSimBlobDatabase.java +++ b/src/main/java/neqsim/util/database/NeqSimBlobDatabase.java @@ -18,7 +18,9 @@ */ public class NeqSimBlobDatabase implements neqsim.util.util.FileSystemSettings, java.io.Serializable { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(NeqSimBlobDatabase.class); /** Constant dataBasePath="". */ diff --git a/src/main/java/neqsim/util/database/NeqSimContractDataBase.java b/src/main/java/neqsim/util/database/NeqSimContractDataBase.java index 4c25fa365c..268fb4c89c 100644 --- a/src/main/java/neqsim/util/database/NeqSimContractDataBase.java +++ b/src/main/java/neqsim/util/database/NeqSimContractDataBase.java @@ -14,7 +14,9 @@ * @version June 2023 */ public class NeqSimContractDataBase extends NeqSimDataBase { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(NeqSimContractDataBase.class); /** Constant dataBasePath="". */ diff --git a/src/main/java/neqsim/util/database/NeqSimDataBase.java b/src/main/java/neqsim/util/database/NeqSimDataBase.java index 61bc6f9730..e33acf4eb2 100644 --- a/src/main/java/neqsim/util/database/NeqSimDataBase.java +++ b/src/main/java/neqsim/util/database/NeqSimDataBase.java @@ -23,7 +23,9 @@ */ public class NeqSimDataBase implements neqsim.util.util.FileSystemSettings, java.io.Serializable, AutoCloseable { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(NeqSimDataBase.class); /** Constant dataBasePath="". */ @@ -72,7 +74,7 @@ public NeqSimDataBase() { *

* * @return a Connection object - * @throws java.sql.SQLException if any. + * @throws java.sql.SQLException if any. * @throws java.lang.ClassNotFoundException if any. */ public Connection openConnection() throws SQLException, ClassNotFoundException { @@ -163,8 +165,7 @@ public void setStatement(Statement statement) { *

* * @param sqlString Query to execute. - * @return True if the first result is a ResultSet object; false if it is an - * update count or there + * @return True if the first result is a ResultSet object; false if it is an update count or there * are no results */ public boolean execute(String sqlString) { @@ -287,7 +288,7 @@ public static void setDataBaseType(String aDataBaseType) { * Setter for the field dataBaseType. *

* - * @param aDataBaseType a {@link java.lang.String} object + * @param aDataBaseType a {@link java.lang.String} object * @param connectionString a {@link java.lang.String} object */ public static void setDataBaseType(String aDataBaseType, String connectionString) { @@ -403,7 +404,8 @@ public static String[] getComponentNames() { */ public static boolean hasComponent(String name) { try (neqsim.util.database.NeqSimDataBase database = new neqsim.util.database.NeqSimDataBase(); - java.sql.ResultSet dataSet = database.getResultSet("select count(*) from comp WHERE NAME='" + name + "'")) { + java.sql.ResultSet dataSet = + database.getResultSet("select count(*) from comp WHERE NAME='" + name + "'")) { dataSet.next(); int size = dataSet.getInt(1); if (size == 0) { @@ -424,7 +426,8 @@ public static boolean hasComponent(String name) { */ public static boolean hasTempComponent(String name) { try (neqsim.util.database.NeqSimDataBase database = new neqsim.util.database.NeqSimDataBase(); - java.sql.ResultSet dataSet = database.getResultSet("select count(*) from comptemp WHERE NAME='" + name + "'")) { + java.sql.ResultSet dataSet = + database.getResultSet("select count(*) from comptemp WHERE NAME='" + name + "'")) { dataSet.next(); int size = dataSet.getInt(1); if (size == 0) { @@ -450,7 +453,7 @@ public static void updateTable(String tableName) { * Drops and re-creates table from contents in csv file. * * @param tableName Name of table to replace - * @param path Path to csv file to get table data from + * @param path Path to csv file to get table data from */ public static void updateTable(String tableName, String path) { URL url = NeqSimDataBase.class.getClassLoader().getResource(path); @@ -460,7 +463,8 @@ public static void updateTable(String tableName, String path) { } try (neqsim.util.database.NeqSimDataBase database = new neqsim.util.database.NeqSimDataBase()) { database.execute("DROP TABLE IF EXISTS " + tableName); - String sqlString = "CREATE TABLE " + tableName + " AS SELECT * FROM CSVREAD('file:" + url + "')"; + String sqlString = + "CREATE TABLE " + tableName + " AS SELECT * FROM CSVREAD('file:" + url + "')"; database.execute(sqlString); } catch (Exception ex) { logger.error("Failed updating table " + tableName, ex); @@ -471,7 +475,7 @@ public static void updateTable(String tableName, String path) { * Drops and re-creates table from contents in csv file. * * @param tableName Name of table to replace - * @param path Path to csv file to + * @param path Path to csv file to */ public static void replaceTable(String tableName, String path) { try (neqsim.util.database.NeqSimDataBase database = new neqsim.util.database.NeqSimDataBase()) { @@ -493,7 +497,8 @@ public static void replaceTable(String tableName, String path) { */ public static void initH2DatabaseFromCSVfiles() { h2IsInitalizing = true; - neqsim.util.database.NeqSimDataBase.connectionString = "jdbc:h2:mem:neqsimthermodatabase;DB_CLOSE_DELAY=-1"; + neqsim.util.database.NeqSimDataBase.connectionString = + "jdbc:h2:mem:neqsimthermodatabase;DB_CLOSE_DELAY=-1"; neqsim.util.database.NeqSimDataBase.dataBaseType = "H2"; try { @@ -537,7 +542,8 @@ public static void initH2DatabaseFromCSVfiles() { // technicalrequirements, technicalrequirements_process, materialpipeproperties, // materialplateproperties, fittings, LuciaData, Luciadata8 - try (neqsim.util.database.NeqSimDataBase database = new neqsim.util.database.NeqSimDataBase()) { + try (neqsim.util.database.NeqSimDataBase database = + new neqsim.util.database.NeqSimDataBase()) { database.execute("CREATE TABLE comptemp AS SELECT * FROM comp"); database.execute("CREATE TABLE intertemp AS SELECT * FROM inter"); } diff --git a/src/main/java/neqsim/util/database/NeqSimExperimentDatabase.java b/src/main/java/neqsim/util/database/NeqSimExperimentDatabase.java index 07fd5ce17d..bce10bd464 100644 --- a/src/main/java/neqsim/util/database/NeqSimExperimentDatabase.java +++ b/src/main/java/neqsim/util/database/NeqSimExperimentDatabase.java @@ -40,7 +40,9 @@ public void setCreateTemporaryTables(boolean createTemporaryTables) { NeqSimExperimentDatabase.createTemporaryTables = createTemporaryTables; } + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(NeqSimExperimentDatabase.class); /** Constant dataBasePath="". */ diff --git a/src/main/java/neqsim/util/database/NeqSimFluidDataBase.java b/src/main/java/neqsim/util/database/NeqSimFluidDataBase.java index 83ff08e603..735af07d3c 100644 --- a/src/main/java/neqsim/util/database/NeqSimFluidDataBase.java +++ b/src/main/java/neqsim/util/database/NeqSimFluidDataBase.java @@ -19,7 +19,9 @@ */ public class NeqSimFluidDataBase implements neqsim.util.util.FileSystemSettings, java.io.Serializable { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(NeqSimFluidDataBase.class); static boolean started = false; diff --git a/src/main/java/neqsim/util/database/NeqSimProcessDesignDataBase.java b/src/main/java/neqsim/util/database/NeqSimProcessDesignDataBase.java index 00da2647b2..68770d9af7 100644 --- a/src/main/java/neqsim/util/database/NeqSimProcessDesignDataBase.java +++ b/src/main/java/neqsim/util/database/NeqSimProcessDesignDataBase.java @@ -14,7 +14,9 @@ * @version June 2023 */ public class NeqSimProcessDesignDataBase extends NeqSimDataBase { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(NeqSimProcessDesignDataBase.class); /** Constant dataBasePath="". */ diff --git a/src/main/java/neqsim/util/exception/InvalidInputException.java b/src/main/java/neqsim/util/exception/InvalidInputException.java index 03f5a570e6..cafd9f9387 100644 --- a/src/main/java/neqsim/util/exception/InvalidInputException.java +++ b/src/main/java/neqsim/util/exception/InvalidInputException.java @@ -9,6 +9,7 @@ * @version $Id: $Id */ public class InvalidInputException extends neqsim.util.exception.ThermoException { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/util/exception/InvalidOutputException.java b/src/main/java/neqsim/util/exception/InvalidOutputException.java index 38f5d90426..812d3e8446 100644 --- a/src/main/java/neqsim/util/exception/InvalidOutputException.java +++ b/src/main/java/neqsim/util/exception/InvalidOutputException.java @@ -9,6 +9,7 @@ * @version $Id: $Id */ public class InvalidOutputException extends neqsim.util.exception.ThermoException { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/util/exception/IsNaNException.java b/src/main/java/neqsim/util/exception/IsNaNException.java index c21a83eed3..082efc42b7 100644 --- a/src/main/java/neqsim/util/exception/IsNaNException.java +++ b/src/main/java/neqsim/util/exception/IsNaNException.java @@ -9,6 +9,7 @@ * @version $Id: $Id */ public class IsNaNException extends neqsim.util.exception.ThermoException { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/util/exception/NotImplementedException.java b/src/main/java/neqsim/util/exception/NotImplementedException.java index 8b6856e9d0..b5ee5d7e1d 100644 --- a/src/main/java/neqsim/util/exception/NotImplementedException.java +++ b/src/main/java/neqsim/util/exception/NotImplementedException.java @@ -8,6 +8,7 @@ * @author Åsmund Våge Fannemel */ public class NotImplementedException extends neqsim.util.exception.ThermoException { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/util/exception/NotInitializedException.java b/src/main/java/neqsim/util/exception/NotInitializedException.java index 7cd6d29e62..1b5f6900b3 100644 --- a/src/main/java/neqsim/util/exception/NotInitializedException.java +++ b/src/main/java/neqsim/util/exception/NotInitializedException.java @@ -9,54 +9,55 @@ * @version $Id: $Id */ public class NotInitializedException extends neqsim.util.exception.ThermoException { - private static final long serialVersionUID = 1000; + /** Serialization version UID. */ + private static final long serialVersionUID = 1000; - /** - * Constructs an NotInitializedException with the specified detail message. - * - * @param className Class exception is raised from - * @param methodName Method exception is raised from - * @param msg Detailed error message - */ - public NotInitializedException(String className, String methodName, String msg) { - super(className, methodName, msg); - } + /** + * Constructs an NotInitializedException with the specified detail message. + * + * @param className Class exception is raised from + * @param methodName Method exception is raised from + * @param msg Detailed error message + */ + public NotInitializedException(String className, String methodName, String msg) { + super(className, methodName, msg); + } - /** - * Constructs an NotInitializedException with default detail message. - * - * @param className Class exception is raised from - * @param methodName Method exception is raised from - * @param parameter Parameter not initialized - * @param initMethod Method to call to initialize parameter - */ - public NotInitializedException(String className, String methodName, String parameter, - String initMethod) { - this(className, methodName, - "Parameter " + parameter + " not initialized. Method " + initMethod + " must be called."); - } + /** + * Constructs an NotInitializedException with default detail message. + * + * @param className Class exception is raised from + * @param methodName Method exception is raised from + * @param parameter Parameter not initialized + * @param initMethod Method to call to initialize parameter + */ + public NotInitializedException(String className, String methodName, String parameter, + String initMethod) { + this(className, methodName, + "Parameter " + parameter + " not initialized. Method " + initMethod + " must be called."); + } - /** - * Constructs an NotInitializedException with the specified detail message. - * - * @param obj Object exception is raised from - * @param methodName Method exception is raised from - * @param msg Detailed error message - */ - public NotInitializedException(Object obj, String methodName, String msg) { - this(obj.getClass().getSimpleName(), methodName, msg); - } + /** + * Constructs an NotInitializedException with the specified detail message. + * + * @param obj Object exception is raised from + * @param methodName Method exception is raised from + * @param msg Detailed error message + */ + public NotInitializedException(Object obj, String methodName, String msg) { + this(obj.getClass().getSimpleName(), methodName, msg); + } - /** - * Constructs an NotInitializedException with default detail message. - * - * @param obj Object exception is raised from - * @param methodName Method exception is raised from - * @param parameter Parameter not initialized - * @param initMethod Method to call to initialize parameter - */ - public NotInitializedException(Object obj, String methodName, String parameter, - String initMethod) { - this(obj.getClass().getSimpleName(), methodName, parameter, initMethod); - } + /** + * Constructs an NotInitializedException with default detail message. + * + * @param obj Object exception is raised from + * @param methodName Method exception is raised from + * @param parameter Parameter not initialized + * @param initMethod Method to call to initialize parameter + */ + public NotInitializedException(Object obj, String methodName, String parameter, + String initMethod) { + this(obj.getClass().getSimpleName(), methodName, parameter, initMethod); + } } diff --git a/src/main/java/neqsim/util/exception/ThermoException.java b/src/main/java/neqsim/util/exception/ThermoException.java index 11a59874fc..23f2c8ff08 100644 --- a/src/main/java/neqsim/util/exception/ThermoException.java +++ b/src/main/java/neqsim/util/exception/ThermoException.java @@ -15,6 +15,7 @@ * @version $Id: $Id */ public abstract class ThermoException extends java.lang.Exception { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/util/exception/TooManyIterationsException.java b/src/main/java/neqsim/util/exception/TooManyIterationsException.java index 1452843f8f..90523eb90b 100644 --- a/src/main/java/neqsim/util/exception/TooManyIterationsException.java +++ b/src/main/java/neqsim/util/exception/TooManyIterationsException.java @@ -9,6 +9,7 @@ * @version $Id: $Id */ public class TooManyIterationsException extends neqsim.util.exception.ThermoException { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/util/unit/BaseUnit.java b/src/main/java/neqsim/util/unit/BaseUnit.java index 7407e5963a..66255c51aa 100644 --- a/src/main/java/neqsim/util/unit/BaseUnit.java +++ b/src/main/java/neqsim/util/unit/BaseUnit.java @@ -9,6 +9,7 @@ * @version $Id: $Id */ public abstract class BaseUnit implements Unit, neqsim.thermo.ThermodynamicConstantsInterface { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** Process value in SI units */ diff --git a/src/main/java/neqsim/util/unit/LengthUnit.java b/src/main/java/neqsim/util/unit/LengthUnit.java index 867650ab9b..b03b349996 100644 --- a/src/main/java/neqsim/util/unit/LengthUnit.java +++ b/src/main/java/neqsim/util/unit/LengthUnit.java @@ -15,6 +15,7 @@ * @version $Id: $Id */ public class LengthUnit extends neqsim.util.unit.BaseUnit { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/util/unit/PressureUnit.java b/src/main/java/neqsim/util/unit/PressureUnit.java index 5d8769fb92..d4cc158023 100644 --- a/src/main/java/neqsim/util/unit/PressureUnit.java +++ b/src/main/java/neqsim/util/unit/PressureUnit.java @@ -12,6 +12,7 @@ * @version $Id: $Id */ public class PressureUnit extends neqsim.util.unit.BaseUnit { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/util/unit/RateUnit.java b/src/main/java/neqsim/util/unit/RateUnit.java index 88da94593c..8de89a68f8 100644 --- a/src/main/java/neqsim/util/unit/RateUnit.java +++ b/src/main/java/neqsim/util/unit/RateUnit.java @@ -20,7 +20,9 @@ * @version $Id: $Id */ public class RateUnit extends neqsim.util.unit.BaseUnit { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; + /** Logger object for class. */ static Logger logger = LogManager.getLogger(RateUnit.class); double molarmass = 0.0; diff --git a/src/main/java/neqsim/util/unit/TemperatureUnit.java b/src/main/java/neqsim/util/unit/TemperatureUnit.java index 14b23d6253..23ad4a52eb 100644 --- a/src/main/java/neqsim/util/unit/TemperatureUnit.java +++ b/src/main/java/neqsim/util/unit/TemperatureUnit.java @@ -9,6 +9,7 @@ * @version $Id: $Id */ public class TemperatureUnit extends neqsim.util.unit.BaseUnit { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/util/unit/TimeUnit.java b/src/main/java/neqsim/util/unit/TimeUnit.java index bb5aff3a7c..4f8a8c87dc 100644 --- a/src/main/java/neqsim/util/unit/TimeUnit.java +++ b/src/main/java/neqsim/util/unit/TimeUnit.java @@ -15,6 +15,7 @@ * @version $Id: $Id */ public class TimeUnit extends neqsim.util.unit.BaseUnit { + /** Serialization version UID. */ private static final long serialVersionUID = 1000; /** diff --git a/src/main/java/neqsim/util/util/DoubleCloneable.java b/src/main/java/neqsim/util/util/DoubleCloneable.java index c1b2292b41..783258fbd1 100644 --- a/src/main/java/neqsim/util/util/DoubleCloneable.java +++ b/src/main/java/neqsim/util/util/DoubleCloneable.java @@ -19,6 +19,7 @@ * @version $Id: $Id */ public class DoubleCloneable implements Cloneable { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(DoubleCloneable.class); double doubleValue; 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 bc94c70b28..c36dd0a537 100644 --- a/src/test/java/neqsim/fluidmechanics/flownode/twophasenode/twophasepipeflownode/StratifiedFlowNodeTest.java +++ b/src/test/java/neqsim/fluidmechanics/flownode/twophasenode/twophasepipeflownode/StratifiedFlowNodeTest.java @@ -11,6 +11,7 @@ import neqsim.thermodynamicoperations.ThermodynamicOperations; public class StratifiedFlowNodeTest { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(StratifiedFlowNodeTest.class); @Test diff --git a/src/test/java/neqsim/physicalproperties/util/examples/TPflashTest.java b/src/test/java/neqsim/physicalproperties/util/examples/TPflashTest.java index 9a8b31f29d..1989060998 100644 --- a/src/test/java/neqsim/physicalproperties/util/examples/TPflashTest.java +++ b/src/test/java/neqsim/physicalproperties/util/examples/TPflashTest.java @@ -17,6 +17,7 @@ * @since 2.2.3 */ public class TPflashTest { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(TPflashTest.class); /** diff --git a/src/test/java/neqsim/physicalproperties/util/examples/TPflashWater.java b/src/test/java/neqsim/physicalproperties/util/examples/TPflashWater.java index af6d992d82..9ec57dd72d 100644 --- a/src/test/java/neqsim/physicalproperties/util/examples/TPflashWater.java +++ b/src/test/java/neqsim/physicalproperties/util/examples/TPflashWater.java @@ -17,6 +17,7 @@ * @since 2.2.3 */ public class TPflashWater { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(TPflashWater.class); /** 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 ab0fc162a1..75f44999ad 100644 --- a/src/test/java/neqsim/physicalproperties/util/examples/TPflash_1.java +++ b/src/test/java/neqsim/physicalproperties/util/examples/TPflash_1.java @@ -17,6 +17,7 @@ * @since 2.2.3 */ public class TPflash_1 { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(TPflash_1.class); /** diff --git a/src/test/java/neqsim/physicalproperties/util/examples/TestCondensate.java b/src/test/java/neqsim/physicalproperties/util/examples/TestCondensate.java index 24d68669f5..5b14cff90a 100644 --- a/src/test/java/neqsim/physicalproperties/util/examples/TestCondensate.java +++ b/src/test/java/neqsim/physicalproperties/util/examples/TestCondensate.java @@ -19,6 +19,7 @@ * @since 2.2.3 */ public class TestCondensate { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(TestCondensate.class); /** diff --git a/src/test/java/neqsim/physicalproperties/util/examples/TestDiffusionCoefficient.java b/src/test/java/neqsim/physicalproperties/util/examples/TestDiffusionCoefficient.java index 14acfe1caf..d0e02bcbae 100644 --- a/src/test/java/neqsim/physicalproperties/util/examples/TestDiffusionCoefficient.java +++ b/src/test/java/neqsim/physicalproperties/util/examples/TestDiffusionCoefficient.java @@ -17,6 +17,7 @@ * @since 2.2.3 */ public class TestDiffusionCoefficient { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(TestDiffusionCoefficient.class); /** diff --git a/src/test/java/neqsim/physicalproperties/util/examples/TestSolidAdsorption.java b/src/test/java/neqsim/physicalproperties/util/examples/TestSolidAdsorption.java index f05d52b8ad..949d08306d 100644 --- a/src/test/java/neqsim/physicalproperties/util/examples/TestSolidAdsorption.java +++ b/src/test/java/neqsim/physicalproperties/util/examples/TestSolidAdsorption.java @@ -17,6 +17,7 @@ * @since 2.2.3 */ public class TestSolidAdsorption { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(TestSolidAdsorption.class); /** diff --git a/src/test/java/neqsim/physicalproperties/util/examples/TestSurfaceTenison.java b/src/test/java/neqsim/physicalproperties/util/examples/TestSurfaceTenison.java index 76df911c09..6fab1021ad 100644 --- a/src/test/java/neqsim/physicalproperties/util/examples/TestSurfaceTenison.java +++ b/src/test/java/neqsim/physicalproperties/util/examples/TestSurfaceTenison.java @@ -17,6 +17,7 @@ * @since 2.2.3 */ public class TestSurfaceTenison { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(TestSurfaceTenison.class); /** diff --git a/src/test/java/neqsim/physicalproperties/util/examples/TestSurfaceTensionOde.java b/src/test/java/neqsim/physicalproperties/util/examples/TestSurfaceTensionOde.java index e0e0bdca06..61a47659ac 100644 --- a/src/test/java/neqsim/physicalproperties/util/examples/TestSurfaceTensionOde.java +++ b/src/test/java/neqsim/physicalproperties/util/examples/TestSurfaceTensionOde.java @@ -17,6 +17,7 @@ * @since 2.2.3 */ public class TestSurfaceTensionOde { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(TestSurfaceTensionOde.class); /** diff --git a/src/test/java/neqsim/process/equipment/compressor/CompressorTest.java b/src/test/java/neqsim/process/equipment/compressor/CompressorTest.java index e4eae7fa30..2dce2ab859 100644 --- a/src/test/java/neqsim/process/equipment/compressor/CompressorTest.java +++ b/src/test/java/neqsim/process/equipment/compressor/CompressorTest.java @@ -19,6 +19,7 @@ import neqsim.thermo.system.SystemSrkEos; class CompressorTest extends neqsim.NeqSimTest { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(CompressorTest.class); static neqsim.thermo.system.SystemInterface testSystem = null; diff --git a/src/test/java/neqsim/process/equipment/heatexchanger/MultiStreamHeatExchangerTest.java b/src/test/java/neqsim/process/equipment/heatexchanger/MultiStreamHeatExchangerTest.java index df33fdef9e..98bcc58a02 100644 --- a/src/test/java/neqsim/process/equipment/heatexchanger/MultiStreamHeatExchangerTest.java +++ b/src/test/java/neqsim/process/equipment/heatexchanger/MultiStreamHeatExchangerTest.java @@ -13,6 +13,7 @@ import neqsim.thermodynamicoperations.ThermodynamicOperations; public class MultiStreamHeatExchangerTest { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(MultiStreamHeatExchangerTest.class); static neqsim.thermo.system.SystemInterface testSystem; @@ -51,7 +52,8 @@ void testRun1() { // heatEx.setUAvalue(1000); heatEx.setTemperatureApproach(5); - neqsim.process.processmodel.ProcessSystem operations = new neqsim.process.processmodel.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); operations.add(stream_Hot); operations.add(stream_Cold); operations.add(stream_Cold2); @@ -76,7 +78,8 @@ void testRun1() { @Test void testRun2() { - neqsim.process.processmodel.ProcessSystem operations = new neqsim.process.processmodel.ProcessSystem(); + neqsim.process.processmodel.ProcessSystem operations = + new neqsim.process.processmodel.ProcessSystem(); Stream feed_stream = new Stream("Stream1", testSystem); feed_stream.setTemperature(30.0, "C"); diff --git a/src/test/java/neqsim/process/equipment/powergeneration/GasTurbineTest.java b/src/test/java/neqsim/process/equipment/powergeneration/GasTurbineTest.java index 8133c82c8d..bdaa774765 100644 --- a/src/test/java/neqsim/process/equipment/powergeneration/GasTurbineTest.java +++ b/src/test/java/neqsim/process/equipment/powergeneration/GasTurbineTest.java @@ -12,6 +12,7 @@ import neqsim.thermo.system.SystemSrkEos; public class GasTurbineTest extends neqsim.NeqSimTest { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(GasTurbineTest.class); static neqsim.thermo.system.SystemInterface testSystem; diff --git a/src/test/java/neqsim/process/equipment/reservoir/SimpleReservoirTest.java b/src/test/java/neqsim/process/equipment/reservoir/SimpleReservoirTest.java index 926966e6fa..d8f6073b66 100644 --- a/src/test/java/neqsim/process/equipment/reservoir/SimpleReservoirTest.java +++ b/src/test/java/neqsim/process/equipment/reservoir/SimpleReservoirTest.java @@ -8,6 +8,7 @@ import neqsim.process.equipment.stream.StreamInterface; public class SimpleReservoirTest { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(SimpleReservoirTest.class); @Test diff --git a/src/test/java/neqsim/process/equipment/splitter/ComponentSplitterTest.java b/src/test/java/neqsim/process/equipment/splitter/ComponentSplitterTest.java index 887aca9090..d5b7c0a2a8 100644 --- a/src/test/java/neqsim/process/equipment/splitter/ComponentSplitterTest.java +++ b/src/test/java/neqsim/process/equipment/splitter/ComponentSplitterTest.java @@ -17,6 +17,7 @@ import neqsim.thermo.system.SystemSrkEos; class ComponentSplitterTest { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(ComponentSplitterTest.class); static neqsim.thermo.system.SystemInterface testSystem = null; diff --git a/src/test/java/neqsim/process/measurementdevice/WellAllocatorTest.java b/src/test/java/neqsim/process/measurementdevice/WellAllocatorTest.java index 6fa8cd6295..fab6247452 100644 --- a/src/test/java/neqsim/process/measurementdevice/WellAllocatorTest.java +++ b/src/test/java/neqsim/process/measurementdevice/WellAllocatorTest.java @@ -14,6 +14,7 @@ * @author ESOL */ class WellAllocatorTest extends neqsim.NeqSimTest { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(WellAllocatorTest.class); /** diff --git a/src/test/java/neqsim/process/measurementdevice/pHProbeTest.java b/src/test/java/neqsim/process/measurementdevice/pHProbeTest.java index c25c625a7c..49309d9b09 100644 --- a/src/test/java/neqsim/process/measurementdevice/pHProbeTest.java +++ b/src/test/java/neqsim/process/measurementdevice/pHProbeTest.java @@ -12,6 +12,7 @@ import neqsim.thermo.system.SystemSrkCPAstatoil; class pHProbeTest { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(pHProbeTest.class); static SystemInterface testFluid; diff --git a/src/test/java/neqsim/process/processmodel/CombinedModelsTest.java b/src/test/java/neqsim/process/processmodel/CombinedModelsTest.java index 9228b6bb10..100dd98bf0 100644 --- a/src/test/java/neqsim/process/processmodel/CombinedModelsTest.java +++ b/src/test/java/neqsim/process/processmodel/CombinedModelsTest.java @@ -47,6 +47,7 @@ * */ public class CombinedModelsTest { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(CombinedModelsTest.class); public ProcessSystem getinletModel() { diff --git a/src/test/java/neqsim/process/processmodel/GlycolRigTest.java b/src/test/java/neqsim/process/processmodel/GlycolRigTest.java index 06c77e5711..2964576c56 100644 --- a/src/test/java/neqsim/process/processmodel/GlycolRigTest.java +++ b/src/test/java/neqsim/process/processmodel/GlycolRigTest.java @@ -20,6 +20,7 @@ * Test class for GlycolRig. */ public class GlycolRigTest extends neqsim.NeqSimTest { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(GlycolRigTest.class); ProcessSystem p; diff --git a/src/test/java/neqsim/process/processmodel/LargeCombinedModelsTest.java b/src/test/java/neqsim/process/processmodel/LargeCombinedModelsTest.java index f669ded363..6e09b0a21b 100644 --- a/src/test/java/neqsim/process/processmodel/LargeCombinedModelsTest.java +++ b/src/test/java/neqsim/process/processmodel/LargeCombinedModelsTest.java @@ -27,6 +27,7 @@ import neqsim.thermo.system.SystemPrEos; public class LargeCombinedModelsTest { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(LargeCombinedModelsTest.class); File file = new File("src/test/java/neqsim/process/processmodel"); String fileFluid1 = file.getAbsolutePath() + "/feedfluid.e300"; diff --git a/src/test/java/neqsim/process/processmodel/OilProcessTest.java b/src/test/java/neqsim/process/processmodel/OilProcessTest.java index bb871a1f16..4536fcb4fb 100644 --- a/src/test/java/neqsim/process/processmodel/OilProcessTest.java +++ b/src/test/java/neqsim/process/processmodel/OilProcessTest.java @@ -9,6 +9,7 @@ * Test class for GlycolRig. */ public class OilProcessTest extends neqsim.NeqSimTest { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(OilProcessTest.class); ProcessSystem p; diff --git a/src/test/java/neqsim/process/processmodel/ProcessSystemControllerTest.java b/src/test/java/neqsim/process/processmodel/ProcessSystemControllerTest.java index 0ec1457890..10bbad83c4 100644 --- a/src/test/java/neqsim/process/processmodel/ProcessSystemControllerTest.java +++ b/src/test/java/neqsim/process/processmodel/ProcessSystemControllerTest.java @@ -15,6 +15,7 @@ import neqsim.thermo.system.SystemInterface; public class ProcessSystemControllerTest extends neqsim.NeqSimTest { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(ProcessSystemControllerTest.class); ProcessSystem p; diff --git a/src/test/java/neqsim/process/processmodel/ProcessSystemTest.java b/src/test/java/neqsim/process/processmodel/ProcessSystemTest.java index aad7353cbc..61492b281b 100644 --- a/src/test/java/neqsim/process/processmodel/ProcessSystemTest.java +++ b/src/test/java/neqsim/process/processmodel/ProcessSystemTest.java @@ -31,6 +31,7 @@ * Class for testing ProcessSystem class. */ public class ProcessSystemTest extends neqsim.NeqSimTest { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(ProcessSystemTest.class); ProcessSystem p; diff --git a/src/test/java/neqsim/process/util/example/OnshoreProcess1.java b/src/test/java/neqsim/process/util/example/OnshoreProcess1.java index 213617b114..1bde0bb4aa 100644 --- a/src/test/java/neqsim/process/util/example/OnshoreProcess1.java +++ b/src/test/java/neqsim/process/util/example/OnshoreProcess1.java @@ -28,6 +28,7 @@ * @since 2.2.3 */ public class OnshoreProcess1 { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(OnshoreProcess1.class); /** diff --git a/src/test/java/neqsim/process/util/example/compressorTest_1.java b/src/test/java/neqsim/process/util/example/compressorTest_1.java index 371f1d57fa..dbbf7cfd92 100644 --- a/src/test/java/neqsim/process/util/example/compressorTest_1.java +++ b/src/test/java/neqsim/process/util/example/compressorTest_1.java @@ -16,6 +16,7 @@ * @since 2.2.3 */ public class compressorTest_1 { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(compressorTest_1.class); /** diff --git a/src/test/java/neqsim/process/util/example/multiThreadTest.java b/src/test/java/neqsim/process/util/example/multiThreadTest.java index bcf80e49e8..81657d93c7 100644 --- a/src/test/java/neqsim/process/util/example/multiThreadTest.java +++ b/src/test/java/neqsim/process/util/example/multiThreadTest.java @@ -23,6 +23,7 @@ * @since 2.2.3 */ public class multiThreadTest { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(multiThreadTest.class); /** diff --git a/src/test/java/neqsim/process/util/example/shtokman_MEG.java b/src/test/java/neqsim/process/util/example/shtokman_MEG.java index 560c6d2c36..5c29882b5c 100644 --- a/src/test/java/neqsim/process/util/example/shtokman_MEG.java +++ b/src/test/java/neqsim/process/util/example/shtokman_MEG.java @@ -18,6 +18,7 @@ * @since 2.2.3 */ public class shtokman_MEG { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(shtokman_MEG.class); /** diff --git a/src/test/java/neqsim/process/util/example/testGasScrubber.java b/src/test/java/neqsim/process/util/example/testGasScrubber.java index 930666cf69..8c8231f4f3 100644 --- a/src/test/java/neqsim/process/util/example/testGasScrubber.java +++ b/src/test/java/neqsim/process/util/example/testGasScrubber.java @@ -18,6 +18,7 @@ * @since 2.2.3 */ public class testGasScrubber { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(testGasScrubber.class); /** diff --git a/src/test/java/neqsim/thermo/component/AmmoniaTest.java b/src/test/java/neqsim/thermo/component/AmmoniaTest.java index 394f76a8f2..12766f4638 100644 --- a/src/test/java/neqsim/thermo/component/AmmoniaTest.java +++ b/src/test/java/neqsim/thermo/component/AmmoniaTest.java @@ -11,6 +11,7 @@ import neqsim.thermodynamicoperations.ThermodynamicOperations; public class AmmoniaTest extends neqsim.NeqSimTest { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(AmmoniaTest.class); 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 8aff402d4d..20369a424c 100644 --- a/src/test/java/neqsim/thermo/component/ComponentHydrateGFTest.java +++ b/src/test/java/neqsim/thermo/component/ComponentHydrateGFTest.java @@ -14,6 +14,7 @@ * @author ESOL */ class ComponentHydrateGFTest extends neqsim.NeqSimTest { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(ComponentHydrateGFTest.class); static SystemInterface thermoSystem = null; diff --git a/src/test/java/neqsim/thermo/system/AcidTest.java b/src/test/java/neqsim/thermo/system/AcidTest.java index 888cfa2bc0..c932d2c0a6 100644 --- a/src/test/java/neqsim/thermo/system/AcidTest.java +++ b/src/test/java/neqsim/thermo/system/AcidTest.java @@ -10,6 +10,7 @@ import neqsim.thermodynamicoperations.ThermodynamicOperations; public class AcidTest extends neqsim.NeqSimTest { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(AcidTest.class); /** diff --git a/src/test/java/neqsim/thermo/system/SystemThermoSetMolarCompositionTest.java b/src/test/java/neqsim/thermo/system/SystemThermoSetMolarCompositionTest.java index ae619dec85..f4bc938200 100644 --- a/src/test/java/neqsim/thermo/system/SystemThermoSetMolarCompositionTest.java +++ b/src/test/java/neqsim/thermo/system/SystemThermoSetMolarCompositionTest.java @@ -8,6 +8,7 @@ import org.junit.jupiter.api.Test; public class SystemThermoSetMolarCompositionTest extends neqsim.NeqSimTest { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(SystemThermoSetMolarCompositionTest.class); SystemInterface sys; diff --git a/src/test/java/neqsim/thermo/system/SystemUMRPRUMCEosNewTest.java b/src/test/java/neqsim/thermo/system/SystemUMRPRUMCEosNewTest.java index ef43ec56ac..d9fc540792 100644 --- a/src/test/java/neqsim/thermo/system/SystemUMRPRUMCEosNewTest.java +++ b/src/test/java/neqsim/thermo/system/SystemUMRPRUMCEosNewTest.java @@ -13,6 +13,7 @@ import neqsim.util.database.NeqSimDataBase; class SystemUMRPRUMCEosNewTest extends neqsim.NeqSimTest { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(SystemUMRPRUMCEosNewTest.class); static neqsim.thermo.system.SystemInterface testSystem = null; diff --git a/src/test/java/neqsim/thermo/util/example/AmineFlash.java b/src/test/java/neqsim/thermo/util/example/AmineFlash.java index a5f319b1ba..8c3ef4aab9 100644 --- a/src/test/java/neqsim/thermo/util/example/AmineFlash.java +++ b/src/test/java/neqsim/thermo/util/example/AmineFlash.java @@ -18,6 +18,7 @@ * @version $Id: $Id */ public class AmineFlash { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(AmineFlash.class); /** diff --git a/src/test/java/neqsim/thermo/util/example/BubbleFlash.java b/src/test/java/neqsim/thermo/util/example/BubbleFlash.java index b154771e45..24378d71f1 100644 --- a/src/test/java/neqsim/thermo/util/example/BubbleFlash.java +++ b/src/test/java/neqsim/thermo/util/example/BubbleFlash.java @@ -17,6 +17,7 @@ * @version $Id: $Id */ public class BubbleFlash { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(BubbleFlash.class); /** diff --git a/src/test/java/neqsim/thermo/util/example/BubbleFlashCPA.java b/src/test/java/neqsim/thermo/util/example/BubbleFlashCPA.java index 6c3aa86445..c9b348dbab 100644 --- a/src/test/java/neqsim/thermo/util/example/BubbleFlashCPA.java +++ b/src/test/java/neqsim/thermo/util/example/BubbleFlashCPA.java @@ -17,6 +17,7 @@ * @version $Id: $Id */ public class BubbleFlashCPA { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(BubbleFlashCPA.class); /** diff --git a/src/test/java/neqsim/thermo/util/example/CricondenbarTest.java b/src/test/java/neqsim/thermo/util/example/CricondenbarTest.java index a7b84c61d5..96dd26cf66 100644 --- a/src/test/java/neqsim/thermo/util/example/CricondenbarTest.java +++ b/src/test/java/neqsim/thermo/util/example/CricondenbarTest.java @@ -17,6 +17,7 @@ * @since 2.2.3 */ public class CricondenbarTest { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(CricondenbarTest.class); /** diff --git a/src/test/java/neqsim/thermo/util/example/DewPointCurve.java b/src/test/java/neqsim/thermo/util/example/DewPointCurve.java index 7915e672dd..f1dc3c1f61 100644 --- a/src/test/java/neqsim/thermo/util/example/DewPointCurve.java +++ b/src/test/java/neqsim/thermo/util/example/DewPointCurve.java @@ -17,6 +17,7 @@ * @version $Id: $Id */ public class DewPointCurve { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(DewPointCurve.class); /** diff --git a/src/test/java/neqsim/thermo/util/example/FreezeMEGwater.java b/src/test/java/neqsim/thermo/util/example/FreezeMEGwater.java index a294c3a6a6..0d85ea45c0 100644 --- a/src/test/java/neqsim/thermo/util/example/FreezeMEGwater.java +++ b/src/test/java/neqsim/thermo/util/example/FreezeMEGwater.java @@ -17,6 +17,7 @@ * @since 2.2.3 */ public class FreezeMEGwater { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(FreezeMEGwater.class); /** diff --git a/src/test/java/neqsim/thermo/util/example/FreezingPoint.java b/src/test/java/neqsim/thermo/util/example/FreezingPoint.java index 44de79fb8b..3161638306 100644 --- a/src/test/java/neqsim/thermo/util/example/FreezingPoint.java +++ b/src/test/java/neqsim/thermo/util/example/FreezingPoint.java @@ -18,6 +18,7 @@ * @version $Id: $Id */ public class FreezingPoint { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(FreezingPoint.class); /** diff --git a/src/test/java/neqsim/thermo/util/example/H2Sdistribution.java b/src/test/java/neqsim/thermo/util/example/H2Sdistribution.java index c770fe0866..a224143658 100644 --- a/src/test/java/neqsim/thermo/util/example/H2Sdistribution.java +++ b/src/test/java/neqsim/thermo/util/example/H2Sdistribution.java @@ -17,6 +17,7 @@ * @version $Id: $Id */ public class H2Sdistribution { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(H2Sdistribution.class); /** diff --git a/src/test/java/neqsim/thermo/util/example/HeatOfVaporization.java b/src/test/java/neqsim/thermo/util/example/HeatOfVaporization.java index f003e090a8..8b2597dd6a 100644 --- a/src/test/java/neqsim/thermo/util/example/HeatOfVaporization.java +++ b/src/test/java/neqsim/thermo/util/example/HeatOfVaporization.java @@ -17,6 +17,7 @@ * @since 2.2.3 */ public class HeatOfVaporization { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(HeatOfVaporization.class); /** diff --git a/src/test/java/neqsim/thermo/util/example/HydrateFlash.java b/src/test/java/neqsim/thermo/util/example/HydrateFlash.java index abde54d3a1..c329060c07 100644 --- a/src/test/java/neqsim/thermo/util/example/HydrateFlash.java +++ b/src/test/java/neqsim/thermo/util/example/HydrateFlash.java @@ -17,6 +17,7 @@ * @since 2.2.3 */ public class HydrateFlash { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(HydrateFlash.class); /** diff --git a/src/test/java/neqsim/thermo/util/example/HydrateFlash2.java b/src/test/java/neqsim/thermo/util/example/HydrateFlash2.java index bbe71bef3b..c15c76c6d6 100644 --- a/src/test/java/neqsim/thermo/util/example/HydrateFlash2.java +++ b/src/test/java/neqsim/thermo/util/example/HydrateFlash2.java @@ -17,6 +17,7 @@ * @since 2.2.3 */ public class HydrateFlash2 { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(HydrateFlash2.class); /** diff --git a/src/test/java/neqsim/thermo/util/example/LNGFlash.java b/src/test/java/neqsim/thermo/util/example/LNGFlash.java index 3d633f2218..1e5f2f8c74 100644 --- a/src/test/java/neqsim/thermo/util/example/LNGFlash.java +++ b/src/test/java/neqsim/thermo/util/example/LNGFlash.java @@ -17,6 +17,7 @@ * @since 2.2.3 */ public class LNGFlash { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(LNGFlash.class); /** diff --git a/src/test/java/neqsim/thermo/util/example/LNGfilling.java b/src/test/java/neqsim/thermo/util/example/LNGfilling.java index e7ee4553b6..882d0278c8 100644 --- a/src/test/java/neqsim/thermo/util/example/LNGfilling.java +++ b/src/test/java/neqsim/thermo/util/example/LNGfilling.java @@ -17,6 +17,7 @@ * @since 2.2.3 */ public class LNGfilling { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(LNGfilling.class); /** diff --git a/src/test/java/neqsim/thermo/util/example/LNGfreezing.java b/src/test/java/neqsim/thermo/util/example/LNGfreezing.java index db8f3cf7db..099f1f318d 100644 --- a/src/test/java/neqsim/thermo/util/example/LNGfreezing.java +++ b/src/test/java/neqsim/thermo/util/example/LNGfreezing.java @@ -17,6 +17,7 @@ * @since 2.2.3 */ public class LNGfreezing { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(LNGfreezing.class); /** diff --git a/src/test/java/neqsim/thermo/util/example/LNGfreezingTestSolid1.java b/src/test/java/neqsim/thermo/util/example/LNGfreezingTestSolid1.java index f0462aa111..c6c546139f 100644 --- a/src/test/java/neqsim/thermo/util/example/LNGfreezingTestSolid1.java +++ b/src/test/java/neqsim/thermo/util/example/LNGfreezingTestSolid1.java @@ -17,6 +17,7 @@ * @since 2.2.3 */ public class LNGfreezingTestSolid1 { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(LNGfreezingTestSolid1.class); /** diff --git a/src/test/java/neqsim/thermo/util/example/ModelTest.java b/src/test/java/neqsim/thermo/util/example/ModelTest.java index de6608a317..ab82ad89c8 100644 --- a/src/test/java/neqsim/thermo/util/example/ModelTest.java +++ b/src/test/java/neqsim/thermo/util/example/ModelTest.java @@ -17,6 +17,7 @@ * @version $Id: $Id */ public class ModelTest { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(ModelTest.class); /** diff --git a/src/test/java/neqsim/thermo/util/example/PhaseEnvelope.java b/src/test/java/neqsim/thermo/util/example/PhaseEnvelope.java index ed2f78d682..7e3636ac0c 100644 --- a/src/test/java/neqsim/thermo/util/example/PhaseEnvelope.java +++ b/src/test/java/neqsim/thermo/util/example/PhaseEnvelope.java @@ -19,6 +19,7 @@ * @version $Id: $Id */ public class PhaseEnvelope { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(PhaseEnvelope.class); /** diff --git a/src/test/java/neqsim/thermo/util/example/PhaseEnvelope2.java b/src/test/java/neqsim/thermo/util/example/PhaseEnvelope2.java index fe38d87af2..6d26265f63 100644 --- a/src/test/java/neqsim/thermo/util/example/PhaseEnvelope2.java +++ b/src/test/java/neqsim/thermo/util/example/PhaseEnvelope2.java @@ -17,6 +17,7 @@ * @since 2.2.3 */ public class PhaseEnvelope2 { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(PhaseEnvelope2.class); /** diff --git a/src/test/java/neqsim/thermo/util/example/PressureLoadingCurve.java b/src/test/java/neqsim/thermo/util/example/PressureLoadingCurve.java index fd7e0eae9c..63d9e9fff8 100644 --- a/src/test/java/neqsim/thermo/util/example/PressureLoadingCurve.java +++ b/src/test/java/neqsim/thermo/util/example/PressureLoadingCurve.java @@ -17,6 +17,7 @@ * @since 2.2.3 */ public class PressureLoadingCurve { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(PressureLoadingCurve.class); /** diff --git a/src/test/java/neqsim/thermo/util/example/ReactiveKentEisenberg.java b/src/test/java/neqsim/thermo/util/example/ReactiveKentEisenberg.java index e1db338d4d..8fe24d0ec3 100644 --- a/src/test/java/neqsim/thermo/util/example/ReactiveKentEisenberg.java +++ b/src/test/java/neqsim/thermo/util/example/ReactiveKentEisenberg.java @@ -17,6 +17,7 @@ * @version $Id: $Id */ public class ReactiveKentEisenberg { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(ReactiveKentEisenberg.class); /** diff --git a/src/test/java/neqsim/thermo/util/example/ReactiveTPflash.java b/src/test/java/neqsim/thermo/util/example/ReactiveTPflash.java index 9886af4f89..c0b5dc6de9 100644 --- a/src/test/java/neqsim/thermo/util/example/ReactiveTPflash.java +++ b/src/test/java/neqsim/thermo/util/example/ReactiveTPflash.java @@ -17,6 +17,7 @@ * @version $Id: $Id */ public class ReactiveTPflash { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(ReactiveTPflash.class); /** diff --git a/src/test/java/neqsim/thermo/util/example/ReactiveTPflash2.java b/src/test/java/neqsim/thermo/util/example/ReactiveTPflash2.java index 9c7cc86cf5..16305aa3e6 100644 --- a/src/test/java/neqsim/thermo/util/example/ReactiveTPflash2.java +++ b/src/test/java/neqsim/thermo/util/example/ReactiveTPflash2.java @@ -24,6 +24,7 @@ * @version $Id: $Id */ public class ReactiveTPflash2 { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(ReactiveTPflash2.class); /** diff --git a/src/test/java/neqsim/thermo/util/example/ReadFluidData.java b/src/test/java/neqsim/thermo/util/example/ReadFluidData.java index 7a0508f336..22249c0b50 100644 --- a/src/test/java/neqsim/thermo/util/example/ReadFluidData.java +++ b/src/test/java/neqsim/thermo/util/example/ReadFluidData.java @@ -17,6 +17,7 @@ * @since 2.2.3 */ public class ReadFluidData { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(ReadFluidData.class); /** diff --git a/src/test/java/neqsim/thermo/util/example/ReadFluidData2.java b/src/test/java/neqsim/thermo/util/example/ReadFluidData2.java index facc9da2a9..eb121ce8d5 100644 --- a/src/test/java/neqsim/thermo/util/example/ReadFluidData2.java +++ b/src/test/java/neqsim/thermo/util/example/ReadFluidData2.java @@ -19,6 +19,7 @@ * @since 2.2.3 */ public class ReadFluidData2 { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(ReadFluidData.class); /** diff --git a/src/test/java/neqsim/thermo/util/example/ScalePotentialCheck.java b/src/test/java/neqsim/thermo/util/example/ScalePotentialCheck.java index d9ee90cb10..a6388169f3 100644 --- a/src/test/java/neqsim/thermo/util/example/ScalePotentialCheck.java +++ b/src/test/java/neqsim/thermo/util/example/ScalePotentialCheck.java @@ -23,6 +23,7 @@ * @since 2.2.3 */ public class ScalePotentialCheck { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(ScalePotentialCheck.class); /** diff --git a/src/test/java/neqsim/thermo/util/example/SolidFlash.java b/src/test/java/neqsim/thermo/util/example/SolidFlash.java index d76b818593..06b584ab2f 100644 --- a/src/test/java/neqsim/thermo/util/example/SolidFlash.java +++ b/src/test/java/neqsim/thermo/util/example/SolidFlash.java @@ -17,6 +17,7 @@ * @since 2.2.3 */ public class SolidFlash { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(SolidFlash.class); /** diff --git a/src/test/java/neqsim/thermo/util/example/SulfureDeposition.java b/src/test/java/neqsim/thermo/util/example/SulfureDeposition.java index 03d87e2d17..64357dd721 100644 --- a/src/test/java/neqsim/thermo/util/example/SulfureDeposition.java +++ b/src/test/java/neqsim/thermo/util/example/SulfureDeposition.java @@ -18,6 +18,7 @@ * @version $Id: $Id */ public class SulfureDeposition { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(SulfureDeposition.class); /** diff --git a/src/test/java/neqsim/thermo/util/example/TPMultiFlash.java b/src/test/java/neqsim/thermo/util/example/TPMultiFlash.java index 92118392a4..be6388b382 100644 --- a/src/test/java/neqsim/thermo/util/example/TPMultiFlash.java +++ b/src/test/java/neqsim/thermo/util/example/TPMultiFlash.java @@ -18,6 +18,7 @@ * @version $Id: $Id */ public class TPMultiFlash { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(TPMultiFlash.class); /** diff --git a/src/test/java/neqsim/thermo/util/example/TPflash.java b/src/test/java/neqsim/thermo/util/example/TPflash.java index 20978c871e..8fac1da7bf 100644 --- a/src/test/java/neqsim/thermo/util/example/TPflash.java +++ b/src/test/java/neqsim/thermo/util/example/TPflash.java @@ -17,6 +17,7 @@ * @since 2.2.3 */ public class TPflash { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(TPflash.class); /** diff --git a/src/test/java/neqsim/thermo/util/example/TPflash1.java b/src/test/java/neqsim/thermo/util/example/TPflash1.java index 46f27681c4..49e8cde982 100644 --- a/src/test/java/neqsim/thermo/util/example/TPflash1.java +++ b/src/test/java/neqsim/thermo/util/example/TPflash1.java @@ -16,6 +16,7 @@ * @since 2.2.3 */ public class TPflash1 { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(TPflash1.class); /** diff --git a/src/test/java/neqsim/thermo/util/example/TPflash2.java b/src/test/java/neqsim/thermo/util/example/TPflash2.java index 7c02c0882a..a1b00258db 100644 --- a/src/test/java/neqsim/thermo/util/example/TPflash2.java +++ b/src/test/java/neqsim/thermo/util/example/TPflash2.java @@ -18,6 +18,7 @@ * @since 2.2.3 */ public class TPflash2 { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(TPflash2.class); /** diff --git a/src/test/java/neqsim/thermo/util/example/TPflashDehyd.java b/src/test/java/neqsim/thermo/util/example/TPflashDehyd.java index 01333f5ea8..0a294165ed 100644 --- a/src/test/java/neqsim/thermo/util/example/TPflashDehyd.java +++ b/src/test/java/neqsim/thermo/util/example/TPflashDehyd.java @@ -18,6 +18,7 @@ * @since 2.2.3 */ public class TPflashDehyd { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(TPflashDehyd.class); /** diff --git a/src/test/java/neqsim/thermo/util/example/TPflashGR.java b/src/test/java/neqsim/thermo/util/example/TPflashGR.java index 100674a6a6..2da1517be1 100644 --- a/src/test/java/neqsim/thermo/util/example/TPflashGR.java +++ b/src/test/java/neqsim/thermo/util/example/TPflashGR.java @@ -17,6 +17,7 @@ * @since 2.2.3 */ public class TPflashGR { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(TPflashGR.class); /** diff --git a/src/test/java/neqsim/thermo/util/example/TPflashMembrane.java b/src/test/java/neqsim/thermo/util/example/TPflashMembrane.java index 15e5aef14d..de72895b52 100644 --- a/src/test/java/neqsim/thermo/util/example/TPflashMembrane.java +++ b/src/test/java/neqsim/thermo/util/example/TPflashMembrane.java @@ -19,6 +19,7 @@ * @since 2.2.3 */ public class TPflashMembrane { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(TPflashMembrane.class); /** diff --git a/src/test/java/neqsim/thermo/util/example/TPflashMethanolWaterPropane.java b/src/test/java/neqsim/thermo/util/example/TPflashMethanolWaterPropane.java index 166c73677e..896b80c555 100644 --- a/src/test/java/neqsim/thermo/util/example/TPflashMethanolWaterPropane.java +++ b/src/test/java/neqsim/thermo/util/example/TPflashMethanolWaterPropane.java @@ -17,6 +17,7 @@ * @since 2.2.3 */ public class TPflashMethanolWaterPropane { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(TPflashMethanolWaterPropane.class); /** diff --git a/src/test/java/neqsim/thermo/util/example/TVPexample.java b/src/test/java/neqsim/thermo/util/example/TVPexample.java index e3a42567a2..db2201c469 100644 --- a/src/test/java/neqsim/thermo/util/example/TVPexample.java +++ b/src/test/java/neqsim/thermo/util/example/TVPexample.java @@ -17,6 +17,7 @@ * @since 2.2.3 */ public class TVPexample { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(TVPexample.class); /** diff --git a/src/test/java/neqsim/thermo/util/example/TestCSPsrk.java b/src/test/java/neqsim/thermo/util/example/TestCSPsrk.java index 3ff0195777..044cf42296 100644 --- a/src/test/java/neqsim/thermo/util/example/TestCSPsrk.java +++ b/src/test/java/neqsim/thermo/util/example/TestCSPsrk.java @@ -17,6 +17,7 @@ * @since 2.2.3 */ public class TestCSPsrk { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(TestCSPsrk.class); /** diff --git a/src/test/java/neqsim/thermo/util/example/TestCharacterizationCPA.java b/src/test/java/neqsim/thermo/util/example/TestCharacterizationCPA.java index e413a7bdb0..6b16ef4653 100644 --- a/src/test/java/neqsim/thermo/util/example/TestCharacterizationCPA.java +++ b/src/test/java/neqsim/thermo/util/example/TestCharacterizationCPA.java @@ -17,6 +17,7 @@ * @since 2.2.3 */ public class TestCharacterizationCPA { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(TestCharacterizationCPA.class); /** diff --git a/src/test/java/neqsim/thermo/util/example/TestCharacterizationCondensate.java b/src/test/java/neqsim/thermo/util/example/TestCharacterizationCondensate.java index 09380388f8..bb7e5e79fc 100644 --- a/src/test/java/neqsim/thermo/util/example/TestCharacterizationCondensate.java +++ b/src/test/java/neqsim/thermo/util/example/TestCharacterizationCondensate.java @@ -17,6 +17,7 @@ * @since 2.2.3 */ public class TestCharacterizationCondensate { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(TestCharacterizationCondensate.class); /** diff --git a/src/test/java/neqsim/thermo/util/example/TestCharacterizationCondensate1.java b/src/test/java/neqsim/thermo/util/example/TestCharacterizationCondensate1.java index 7bc5401bf3..420da89e0d 100644 --- a/src/test/java/neqsim/thermo/util/example/TestCharacterizationCondensate1.java +++ b/src/test/java/neqsim/thermo/util/example/TestCharacterizationCondensate1.java @@ -18,6 +18,7 @@ * @since 2.2.3 */ public class TestCharacterizationCondensate1 { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(TestCharacterizationCondensate1.class); /** diff --git a/src/test/java/neqsim/thermo/util/example/TestElectrolyteCPAstatoil.java b/src/test/java/neqsim/thermo/util/example/TestElectrolyteCPAstatoil.java index 460da57e5e..01e1370631 100644 --- a/src/test/java/neqsim/thermo/util/example/TestElectrolyteCPAstatoil.java +++ b/src/test/java/neqsim/thermo/util/example/TestElectrolyteCPAstatoil.java @@ -17,6 +17,7 @@ * @since 2.2.3 */ public class TestElectrolyteCPAstatoil { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(TestElectrolyteCPAstatoil.class); /** diff --git a/src/test/java/neqsim/thermo/util/example/TestFlash.java b/src/test/java/neqsim/thermo/util/example/TestFlash.java index 776cc1df4d..59f6d28ee3 100644 --- a/src/test/java/neqsim/thermo/util/example/TestFlash.java +++ b/src/test/java/neqsim/thermo/util/example/TestFlash.java @@ -20,6 +20,7 @@ * @since 2.2.3 */ public class TestFlash { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(TestFlash.class); /** diff --git a/src/test/java/neqsim/thermo/util/example/TestFluidIssues.java b/src/test/java/neqsim/thermo/util/example/TestFluidIssues.java index 7ab1512de1..21bd59ecce 100644 --- a/src/test/java/neqsim/thermo/util/example/TestFluidIssues.java +++ b/src/test/java/neqsim/thermo/util/example/TestFluidIssues.java @@ -17,6 +17,7 @@ * @since 2.2.3 */ public class TestFluidIssues { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(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 d26da314cb..b4571791ea 100644 --- a/src/test/java/neqsim/thermo/util/example/TestGEHenry.java +++ b/src/test/java/neqsim/thermo/util/example/TestGEHenry.java @@ -17,6 +17,7 @@ * @since 2.2.3 */ public class TestGEHenry { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(TestGEHenry.class); /** diff --git a/src/test/java/neqsim/thermo/util/example/TestGERG2004EOS.java b/src/test/java/neqsim/thermo/util/example/TestGERG2004EOS.java index 8e6d9fadb9..8573b3801e 100644 --- a/src/test/java/neqsim/thermo/util/example/TestGERG2004EOS.java +++ b/src/test/java/neqsim/thermo/util/example/TestGERG2004EOS.java @@ -17,6 +17,7 @@ * @version $Id: $Id */ public class TestGERG2004EOS { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(TestGERG2004EOS.class); /** diff --git a/src/test/java/neqsim/thermo/util/example/TestGERGwater.java b/src/test/java/neqsim/thermo/util/example/TestGERGwater.java index c431fcc2c1..61c049f57d 100644 --- a/src/test/java/neqsim/thermo/util/example/TestGERGwater.java +++ b/src/test/java/neqsim/thermo/util/example/TestGERGwater.java @@ -17,6 +17,7 @@ * @version $Id: $Id */ public class TestGERGwater { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(TestGERGwater.class); /** diff --git a/src/test/java/neqsim/thermo/util/example/TestISO1982.java b/src/test/java/neqsim/thermo/util/example/TestISO1982.java index cd105207e3..1de8bb612e 100644 --- a/src/test/java/neqsim/thermo/util/example/TestISO1982.java +++ b/src/test/java/neqsim/thermo/util/example/TestISO1982.java @@ -23,6 +23,7 @@ * @since 2.2.3 */ public class TestISO1982 { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(TestISO1982.class); /** diff --git a/src/test/java/neqsim/thermo/util/example/TestMBWR32.java b/src/test/java/neqsim/thermo/util/example/TestMBWR32.java index d7d3e5d39a..e4f3c1e375 100644 --- a/src/test/java/neqsim/thermo/util/example/TestMBWR32.java +++ b/src/test/java/neqsim/thermo/util/example/TestMBWR32.java @@ -17,6 +17,7 @@ * @since 2.2.3 */ public class TestMBWR32 { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(TestMBWR32.class); /** diff --git a/src/test/java/neqsim/thermo/util/example/TestMEGFlash.java b/src/test/java/neqsim/thermo/util/example/TestMEGFlash.java index 8918b0094b..0559a6d05d 100644 --- a/src/test/java/neqsim/thermo/util/example/TestMEGFlash.java +++ b/src/test/java/neqsim/thermo/util/example/TestMEGFlash.java @@ -17,6 +17,7 @@ * @since 2.2.3 */ public class TestMEGFlash { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(TestMEGFlash.class); /** diff --git a/src/test/java/neqsim/thermo/util/example/TestPCSAFT.java b/src/test/java/neqsim/thermo/util/example/TestPCSAFT.java index 70a767876e..1fb1c60d6d 100644 --- a/src/test/java/neqsim/thermo/util/example/TestPCSAFT.java +++ b/src/test/java/neqsim/thermo/util/example/TestPCSAFT.java @@ -18,6 +18,7 @@ * @since 2.2.3 */ public class TestPCSAFT { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(TestPCSAFT.class); /** diff --git a/src/test/java/neqsim/thermo/util/example/TestPCSAFT1.java b/src/test/java/neqsim/thermo/util/example/TestPCSAFT1.java index 780da5ca67..17cde18d79 100644 --- a/src/test/java/neqsim/thermo/util/example/TestPCSAFT1.java +++ b/src/test/java/neqsim/thermo/util/example/TestPCSAFT1.java @@ -17,6 +17,7 @@ * @since 2.2.3 */ public class TestPCSAFT1 { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(TestPCSAFT1.class); /** 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 a38ad1e4d9..25198678e9 100644 --- a/src/test/java/neqsim/thermo/util/example/TestPCSAFT1_1.java +++ b/src/test/java/neqsim/thermo/util/example/TestPCSAFT1_1.java @@ -17,6 +17,7 @@ * @since 2.2.3 */ public class TestPCSAFT1_1 { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(TestPCSAFT1_1.class); /** diff --git a/src/test/java/neqsim/thermo/util/example/TestPSRK.java b/src/test/java/neqsim/thermo/util/example/TestPSRK.java index da64d06df4..f0d65f443b 100644 --- a/src/test/java/neqsim/thermo/util/example/TestPSRK.java +++ b/src/test/java/neqsim/thermo/util/example/TestPSRK.java @@ -17,6 +17,7 @@ * @since 2.2.3 */ public class TestPSRK { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(TestPSRK.class); /** diff --git a/src/test/java/neqsim/thermo/util/example/TestSRKWS.java b/src/test/java/neqsim/thermo/util/example/TestSRKWS.java index 81523d9fc5..efceac43d0 100644 --- a/src/test/java/neqsim/thermo/util/example/TestSRKWS.java +++ b/src/test/java/neqsim/thermo/util/example/TestSRKWS.java @@ -17,6 +17,7 @@ * @since 2.2.3 */ public class TestSRKWS { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(TestSRKWS.class); /** diff --git a/src/test/java/neqsim/thermo/util/example/TestSurfaceTenison.java b/src/test/java/neqsim/thermo/util/example/TestSurfaceTenison.java index ba4abb8b1b..f93967d927 100644 --- a/src/test/java/neqsim/thermo/util/example/TestSurfaceTenison.java +++ b/src/test/java/neqsim/thermo/util/example/TestSurfaceTenison.java @@ -17,6 +17,7 @@ * @since 2.2.3 */ public class TestSurfaceTenison { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(TestSurfaceTenison.class); /** diff --git a/src/test/java/neqsim/thermo/util/example/TestUMRPRU.java b/src/test/java/neqsim/thermo/util/example/TestUMRPRU.java index 90fe9c0948..e76c48095e 100644 --- a/src/test/java/neqsim/thermo/util/example/TestUMRPRU.java +++ b/src/test/java/neqsim/thermo/util/example/TestUMRPRU.java @@ -17,6 +17,7 @@ * @since 2.2.3 */ public class TestUMRPRU { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(TestUMRPRU.class); /** diff --git a/src/test/java/neqsim/thermo/util/example/TestUMRPRUMC.java b/src/test/java/neqsim/thermo/util/example/TestUMRPRUMC.java index 2d20cd351e..24388adc74 100644 --- a/src/test/java/neqsim/thermo/util/example/TestUMRPRUMC.java +++ b/src/test/java/neqsim/thermo/util/example/TestUMRPRUMC.java @@ -17,6 +17,7 @@ * @since 2.2.3 */ public class TestUMRPRUMC { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(TestUMRPRUMC.class); /** diff --git a/src/test/java/neqsim/thermo/util/example/TestUNIFAC.java b/src/test/java/neqsim/thermo/util/example/TestUNIFAC.java index e3611d05b8..4e9f44b471 100644 --- a/src/test/java/neqsim/thermo/util/example/TestUNIFAC.java +++ b/src/test/java/neqsim/thermo/util/example/TestUNIFAC.java @@ -17,6 +17,7 @@ * @since 2.2.3 */ public class TestUNIFAC { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(TestUNIFAC.class); /** 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 19cf09b65d..b1668b650b 100644 --- a/src/test/java/neqsim/thermo/util/example/TestUNIFAC_1.java +++ b/src/test/java/neqsim/thermo/util/example/TestUNIFAC_1.java @@ -17,6 +17,7 @@ * @since 2.2.3 */ public class TestUNIFAC_1 { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(TestUNIFAC_1.class); /** diff --git a/src/test/java/neqsim/thermo/util/example/TestVHflash.java b/src/test/java/neqsim/thermo/util/example/TestVHflash.java index ea40e851da..91caa87bc7 100644 --- a/src/test/java/neqsim/thermo/util/example/TestVHflash.java +++ b/src/test/java/neqsim/thermo/util/example/TestVHflash.java @@ -18,6 +18,7 @@ * @since 2.2.3 */ public class TestVHflash { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(TestVHflash.class); /** diff --git a/src/test/java/neqsim/thermo/util/example/TestmercuryTPflash.java b/src/test/java/neqsim/thermo/util/example/TestmercuryTPflash.java index c738368c61..f290f7f13e 100644 --- a/src/test/java/neqsim/thermo/util/example/TestmercuryTPflash.java +++ b/src/test/java/neqsim/thermo/util/example/TestmercuryTPflash.java @@ -17,6 +17,7 @@ * @since 2.2.3 */ public class TestmercuryTPflash { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(TestmercuryTPflash.class); /** diff --git a/src/test/java/neqsim/thermo/util/example/WaxFlash.java b/src/test/java/neqsim/thermo/util/example/WaxFlash.java index 4d494018f6..405a001250 100644 --- a/src/test/java/neqsim/thermo/util/example/WaxFlash.java +++ b/src/test/java/neqsim/thermo/util/example/WaxFlash.java @@ -18,6 +18,7 @@ * @since 2.2.3 */ public class WaxFlash { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(WaxFlash.class); /** 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 ca77513a35..1c484098d7 100644 --- a/src/test/java/neqsim/thermo/util/example/longman/Problem15102009LNGfreezing.java +++ b/src/test/java/neqsim/thermo/util/example/longman/Problem15102009LNGfreezing.java @@ -17,6 +17,7 @@ * @since 2.2.3 */ public class Problem15102009LNGfreezing { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(Problem15102009LNGfreezing.class); /** 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 8445fa1709..bf7ea4e0b9 100644 --- a/src/test/java/neqsim/thermo/util/example/longman/Problem280809LNGfreezing.java +++ b/src/test/java/neqsim/thermo/util/example/longman/Problem280809LNGfreezing.java @@ -17,6 +17,7 @@ * @since 2.2.3 */ public class Problem280809LNGfreezing { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(Problem280809LNGfreezing.class); /** 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 ae7ecec594..b2392d50ce 100644 --- a/src/test/java/neqsim/thermo/util/example/longman/Problem280809LNGphaseEnvelope.java +++ b/src/test/java/neqsim/thermo/util/example/longman/Problem280809LNGphaseEnvelope.java @@ -17,6 +17,7 @@ * @since 2.2.3 */ public class Problem280809LNGphaseEnvelope { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(Problem280809LNGphaseEnvelope.class); /** diff --git a/src/test/java/neqsim/thermodynamicoperations/flashops/RachfordRiceTest.java b/src/test/java/neqsim/thermodynamicoperations/flashops/RachfordRiceTest.java index 64c893a69c..11c5130da4 100644 --- a/src/test/java/neqsim/thermodynamicoperations/flashops/RachfordRiceTest.java +++ b/src/test/java/neqsim/thermodynamicoperations/flashops/RachfordRiceTest.java @@ -6,6 +6,7 @@ import org.junit.jupiter.api.Test; public class RachfordRiceTest { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(RachfordRiceTest.class); @Test diff --git a/src/test/java/neqsim/thermodynamicoperations/flashops/SaturateWithWaterTest.java b/src/test/java/neqsim/thermodynamicoperations/flashops/SaturateWithWaterTest.java index f5fa8db8a3..411a59df91 100644 --- a/src/test/java/neqsim/thermodynamicoperations/flashops/SaturateWithWaterTest.java +++ b/src/test/java/neqsim/thermodynamicoperations/flashops/SaturateWithWaterTest.java @@ -12,6 +12,7 @@ import neqsim.thermodynamicoperations.ThermodynamicOperations; public class SaturateWithWaterTest { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(SaturateWithWaterTest.class); @Test diff --git a/src/test/java/neqsim/thermodynamicoperations/flashops/TPgradientFlashTest.java b/src/test/java/neqsim/thermodynamicoperations/flashops/TPgradientFlashTest.java index b35334569f..06a6a8ed00 100644 --- a/src/test/java/neqsim/thermodynamicoperations/flashops/TPgradientFlashTest.java +++ b/src/test/java/neqsim/thermodynamicoperations/flashops/TPgradientFlashTest.java @@ -10,6 +10,7 @@ import neqsim.thermodynamicoperations.ThermodynamicOperations; public class TPgradientFlashTest { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(TPgradientFlashTest.class); @Test diff --git a/src/test/java/neqsim/thermodynamicoperations/flashops/TVFlashTest.java b/src/test/java/neqsim/thermodynamicoperations/flashops/TVFlashTest.java index 8584361ac5..f7a5cb1a12 100644 --- a/src/test/java/neqsim/thermodynamicoperations/flashops/TVFlashTest.java +++ b/src/test/java/neqsim/thermodynamicoperations/flashops/TVFlashTest.java @@ -11,6 +11,7 @@ * Test TVFlash. */ class TVFlashTest { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(TVFlashTest.class); static neqsim.thermo.system.SystemInterface testSystem = null; diff --git a/src/test/java/neqsim/thermodynamicoperations/flashops/VUFlashTest.java b/src/test/java/neqsim/thermodynamicoperations/flashops/VUFlashTest.java index de9cb3f31d..8eeec76cb8 100644 --- a/src/test/java/neqsim/thermodynamicoperations/flashops/VUFlashTest.java +++ b/src/test/java/neqsim/thermodynamicoperations/flashops/VUFlashTest.java @@ -10,6 +10,7 @@ * Test VUFlash. */ class VUFlashTest { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(VUFlashTest.class); static neqsim.thermo.system.SystemInterface testSystem = null; diff --git a/src/test/java/neqsim/thermodynamicoperations/flashops/WaxFlashTest.java b/src/test/java/neqsim/thermodynamicoperations/flashops/WaxFlashTest.java index 4fe2b79e8c..ee9eb2c9ce 100644 --- a/src/test/java/neqsim/thermodynamicoperations/flashops/WaxFlashTest.java +++ b/src/test/java/neqsim/thermodynamicoperations/flashops/WaxFlashTest.java @@ -13,6 +13,7 @@ * @author ESOL */ class WaxFlashTest { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(WaxFlashTest.class); static neqsim.thermo.system.SystemInterface testSystem = null; diff --git a/src/test/java/neqsim/thermodynamicoperations/flashops/saturationops/bubblePointPressureFlashTest.java b/src/test/java/neqsim/thermodynamicoperations/flashops/saturationops/bubblePointPressureFlashTest.java index 382196f4e2..d99b0ed607 100644 --- a/src/test/java/neqsim/thermodynamicoperations/flashops/saturationops/bubblePointPressureFlashTest.java +++ b/src/test/java/neqsim/thermodynamicoperations/flashops/saturationops/bubblePointPressureFlashTest.java @@ -8,7 +8,9 @@ import neqsim.thermodynamicoperations.ThermodynamicOperations; public class bubblePointPressureFlashTest { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(bubblePointPressureFlashTest.class); + @Test void testRun() { SystemSrkEos fluid0_HC = new SystemSrkEos(); diff --git a/src/test/java/neqsim/thermodynamicoperations/flashops/saturationops/bubblePointTemperatureFlashTest.java b/src/test/java/neqsim/thermodynamicoperations/flashops/saturationops/bubblePointTemperatureFlashTest.java index d04c76f860..5305568137 100644 --- a/src/test/java/neqsim/thermodynamicoperations/flashops/saturationops/bubblePointTemperatureFlashTest.java +++ b/src/test/java/neqsim/thermodynamicoperations/flashops/saturationops/bubblePointTemperatureFlashTest.java @@ -8,7 +8,9 @@ import neqsim.thermodynamicoperations.ThermodynamicOperations; public class bubblePointTemperatureFlashTest { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(bubblePointTemperatureFlashTest.class); + @Test void testRun() { SystemSrkEos fluid0_HC = new SystemSrkEos(); diff --git a/src/test/java/neqsim/thermodynamicoperations/flashops/saturationops/dewPointPressureFlashTest.java b/src/test/java/neqsim/thermodynamicoperations/flashops/saturationops/dewPointPressureFlashTest.java index c7a70329c4..c5fdba258a 100644 --- a/src/test/java/neqsim/thermodynamicoperations/flashops/saturationops/dewPointPressureFlashTest.java +++ b/src/test/java/neqsim/thermodynamicoperations/flashops/saturationops/dewPointPressureFlashTest.java @@ -8,7 +8,9 @@ import neqsim.thermodynamicoperations.ThermodynamicOperations; public class dewPointPressureFlashTest { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(dewPointPressureFlashTest.class); + @Test void testRun() { SystemSrkEos fluid0_HC = new SystemSrkEos(); diff --git a/src/test/java/neqsim/thermodynamicoperations/flashops/saturationops/dewPointTemperatureFlashTest.java b/src/test/java/neqsim/thermodynamicoperations/flashops/saturationops/dewPointTemperatureFlashTest.java index 45e244e5c9..20de375fa4 100644 --- a/src/test/java/neqsim/thermodynamicoperations/flashops/saturationops/dewPointTemperatureFlashTest.java +++ b/src/test/java/neqsim/thermodynamicoperations/flashops/saturationops/dewPointTemperatureFlashTest.java @@ -8,8 +8,9 @@ import neqsim.thermodynamicoperations.ThermodynamicOperations; public class dewPointTemperatureFlashTest { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(dewPointTemperatureFlashTest.class); - + @Test void testRun() { SystemSrkEos fluid0_HC = new SystemSrkEos(); diff --git a/src/test/java/neqsim/thermodynamicoperations/util/example/CompGradientFlash.java b/src/test/java/neqsim/thermodynamicoperations/util/example/CompGradientFlash.java index 01f4b95bb9..1a8d59cf36 100644 --- a/src/test/java/neqsim/thermodynamicoperations/util/example/CompGradientFlash.java +++ b/src/test/java/neqsim/thermodynamicoperations/util/example/CompGradientFlash.java @@ -17,6 +17,7 @@ * @since 2.2.3 */ public class CompGradientFlash { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(CompGradientFlash.class); /** diff --git a/src/test/java/neqsim/thermodynamicoperations/util/example/CriticalPointFlash.java b/src/test/java/neqsim/thermodynamicoperations/util/example/CriticalPointFlash.java index 108297e27f..46dc5ac175 100644 --- a/src/test/java/neqsim/thermodynamicoperations/util/example/CriticalPointFlash.java +++ b/src/test/java/neqsim/thermodynamicoperations/util/example/CriticalPointFlash.java @@ -17,6 +17,7 @@ * @since 2.2.3 */ public class CriticalPointFlash { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(CriticalPointFlash.class); /** diff --git a/src/test/java/neqsim/thermodynamicoperations/util/example/MEGwaterComplexFlash.java b/src/test/java/neqsim/thermodynamicoperations/util/example/MEGwaterComplexFlash.java index b28d9ee513..d6ba5c6a3d 100644 --- a/src/test/java/neqsim/thermodynamicoperations/util/example/MEGwaterComplexFlash.java +++ b/src/test/java/neqsim/thermodynamicoperations/util/example/MEGwaterComplexFlash.java @@ -17,6 +17,7 @@ * @since 2.2.3 */ public class MEGwaterComplexFlash { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(MEGwaterComplexFlash.class); /** diff --git a/src/test/java/neqsim/thermodynamicoperations/util/example/OLGApropGenerator.java b/src/test/java/neqsim/thermodynamicoperations/util/example/OLGApropGenerator.java index 3708fdd719..bd840726c2 100644 --- a/src/test/java/neqsim/thermodynamicoperations/util/example/OLGApropGenerator.java +++ b/src/test/java/neqsim/thermodynamicoperations/util/example/OLGApropGenerator.java @@ -17,6 +17,7 @@ * @since 2.2.3 */ public class OLGApropGenerator { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(OLGApropGenerator.class); /** diff --git a/src/test/java/neqsim/thermodynamicoperations/util/example/OLGApropGeneratorPH.java b/src/test/java/neqsim/thermodynamicoperations/util/example/OLGApropGeneratorPH.java index b04b41b796..f6dc311e86 100644 --- a/src/test/java/neqsim/thermodynamicoperations/util/example/OLGApropGeneratorPH.java +++ b/src/test/java/neqsim/thermodynamicoperations/util/example/OLGApropGeneratorPH.java @@ -17,6 +17,7 @@ * @since 2.2.3 */ public class OLGApropGeneratorPH { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(OLGApropGeneratorPH.class); /** diff --git a/src/test/java/neqsim/thermodynamicoperations/util/example/PhaseEnvelope.java b/src/test/java/neqsim/thermodynamicoperations/util/example/PhaseEnvelope.java index 7dcba8131d..3c1a69a736 100644 --- a/src/test/java/neqsim/thermodynamicoperations/util/example/PhaseEnvelope.java +++ b/src/test/java/neqsim/thermodynamicoperations/util/example/PhaseEnvelope.java @@ -18,6 +18,7 @@ * @since 2.2.3 */ public class PhaseEnvelope { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(PhaseEnvelope.class); /** diff --git a/src/test/java/neqsim/thermodynamicoperations/util/example/SolidFlash.java b/src/test/java/neqsim/thermodynamicoperations/util/example/SolidFlash.java index d2895a7bd0..615460c11e 100644 --- a/src/test/java/neqsim/thermodynamicoperations/util/example/SolidFlash.java +++ b/src/test/java/neqsim/thermodynamicoperations/util/example/SolidFlash.java @@ -17,6 +17,7 @@ * @since 2.2.3 */ public class SolidFlash { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(SolidFlash.class); /** diff --git a/src/test/java/neqsim/thermodynamicoperations/util/example/TVflash.java b/src/test/java/neqsim/thermodynamicoperations/util/example/TVflash.java index 9659400819..06ae15e080 100644 --- a/src/test/java/neqsim/thermodynamicoperations/util/example/TVflash.java +++ b/src/test/java/neqsim/thermodynamicoperations/util/example/TVflash.java @@ -17,6 +17,7 @@ * @since 2.2.3 */ public class TVflash { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(TVflash.class); /** diff --git a/src/test/java/neqsim/thermodynamicoperations/util/example/VLSolidTPFLash.java b/src/test/java/neqsim/thermodynamicoperations/util/example/VLSolidTPFLash.java index 4425a9b30a..7f287038c9 100644 --- a/src/test/java/neqsim/thermodynamicoperations/util/example/VLSolidTPFLash.java +++ b/src/test/java/neqsim/thermodynamicoperations/util/example/VLSolidTPFLash.java @@ -17,6 +17,7 @@ * @since 2.2.3 */ public class VLSolidTPFLash { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(VLSolidTPFLash.class); /** diff --git a/src/test/java/neqsim/thermodynamicoperations/util/example/VUflash.java b/src/test/java/neqsim/thermodynamicoperations/util/example/VUflash.java index da8f9cdcc2..46e66f93ed 100644 --- a/src/test/java/neqsim/thermodynamicoperations/util/example/VUflash.java +++ b/src/test/java/neqsim/thermodynamicoperations/util/example/VUflash.java @@ -17,6 +17,7 @@ * @since 2.2.3 */ public class VUflash { + /** Logger object for class. */ static Logger logger = LogManager.getLogger(VUflash.class); /**