diff --git a/src/main/java/neqsim/chemicalreactions/ChemicalReactionOperations.java b/src/main/java/neqsim/chemicalreactions/ChemicalReactionOperations.java index 5dd2aecb0..be76c0176 100644 --- a/src/main/java/neqsim/chemicalreactions/ChemicalReactionOperations.java +++ b/src/main/java/neqsim/chemicalreactions/ChemicalReactionOperations.java @@ -513,9 +513,9 @@ public void setDeltaReactionHeat(double deltaReactionHeat) { this.deltaReactionHeat = deltaReactionHeat; } - // public Matrix calcReacRates(int phase){ - // // System.out.println(" vol " + system.getPhases()[0].getMolarVolume()); - // return getReactionList().calcReacRates(system.getPhase(phase), components); + // public Matrix calcReacRates(int phaseNum){ + // // System.out.println(" vol " + system.getPhase()[0].getMolarVolume()); + // return getReactionList().calcReacRates(system.getPhase(phaseNum), components); // } // /** Setter for property reactionList. diff --git a/src/main/java/neqsim/chemicalreactions/chemicalequilibrium/ChemicalEquilibrium.java b/src/main/java/neqsim/chemicalreactions/chemicalequilibrium/ChemicalEquilibrium.java index 3f562ebbf..62499ec23 100644 --- a/src/main/java/neqsim/chemicalreactions/chemicalequilibrium/ChemicalEquilibrium.java +++ b/src/main/java/neqsim/chemicalreactions/chemicalequilibrium/ChemicalEquilibrium.java @@ -68,12 +68,12 @@ public class ChemicalEquilibrium implements java.io.Serializable { * @param b_element an array of type double * @param system a {@link neqsim.thermo.system.SystemInterface} object * @param components an array of {@link neqsim.thermo.component.ComponentInterface} objects - * @param phase a int + * @param phaseNum a int */ public ChemicalEquilibrium(double[][] A_matrix, double[] b_element, SystemInterface system, - ComponentInterface[] components, int phase) { + ComponentInterface[] components, int phaseNum) { this.system = system; - phasenumb = phase; + phasenumb = phaseNum; this.A_matrix = A_matrix; this.b_element = b_element; this.components = components; diff --git a/src/main/java/neqsim/chemicalreactions/chemicalequilibrium/LinearProgrammingChemicalEquilibrium.java b/src/main/java/neqsim/chemicalreactions/chemicalequilibrium/LinearProgrammingChemicalEquilibrium.java index df60e5f47..bdf101c55 100644 --- a/src/main/java/neqsim/chemicalreactions/chemicalequilibrium/LinearProgrammingChemicalEquilibrium.java +++ b/src/main/java/neqsim/chemicalreactions/chemicalequilibrium/LinearProgrammingChemicalEquilibrium.java @@ -60,10 +60,10 @@ public class LinearProgrammingChemicalEquilibrium * @param components an array of {@link neqsim.thermo.component.ComponentInterface} objects * @param elements an array of {@link java.lang.String} objects * @param operations a {@link neqsim.chemicalreactions.ChemicalReactionOperations} object - * @param phase a int + * @param phaseNum a int */ public LinearProgrammingChemicalEquilibrium(double[] chemRefPot, ComponentInterface[] components, - String[] elements, ChemicalReactionOperations operations, int phase) { + String[] elements, ChemicalReactionOperations operations, int phaseNum) { this.operations = operations; this.chemRefPot = chemRefPot; this.components = components; @@ -79,8 +79,8 @@ public LinearProgrammingChemicalEquilibrium(double[] chemRefPot, ComponentInterf // Commented out by Neeraj // Arrays.sort(components,new ReferencePotComparator()); // this.changePrimaryComponents(); - if (operations.calcChemRefPot(phase) != null) { - System.arraycopy(operations.calcChemRefPot(phase), 0, this.chemRefPot, 0, + if (operations.calcChemRefPot(phaseNum) != null) { + System.arraycopy(operations.calcChemRefPot(phaseNum), 0, this.chemRefPot, 0, this.chemRefPot.length); for (int i = 0; i < components.length; i++) { components[i].setReferencePotential(chemRefPot[i]); @@ -90,9 +90,9 @@ public LinearProgrammingChemicalEquilibrium(double[] chemRefPot, ComponentInterf do { System.out.println("shifting primary components....."); this.changePrimaryComponents(); - } while (operations.calcChemRefPot(phase) == null); + } while (operations.calcChemRefPot(phaseNum) == null); // System.out.println("shifting components....." ); - System.arraycopy(operations.calcChemRefPot(phase), 0, this.chemRefPot, 0, + System.arraycopy(operations.calcChemRefPot(phaseNum), 0, this.chemRefPot, 0, this.chemRefPot.length); for (int i = 0; i < components.length; i++) { components[i].setReferencePotential(chemRefPot[i]); @@ -193,9 +193,9 @@ public void changePrimaryComponents() { // Method commented out by Neeraj /* * public double[] generateInitialEstimates(SystemInterface system, double[] bVector, double - * inertMoles, int phase){ Matrix solved; Matrix atemp = new + * inertMoles, int phaseNum){ Matrix solved; Matrix atemp = new * Matrix(Amatrix).getMatrix(0,Amatrix.length-1,0,Amatrix[0].length-1).copy(); Matrix mutemp = new - * Matrix(chemRefPot,1).times(1.0/(R*system.getPhase(phase).getTemperature())). copy(); Matrix + * Matrix(chemRefPot,1).times(1.0/(R*system.getPhase(phaseNum).getTemperature())). copy(); Matrix * lagrangeTemp = atemp.transpose().solve(mutemp.transpose()).copy(); //bmatrix and Ans Added by * Neeraj //bmatrix = new Matrix(bVector,1); //int rank = atemp.rank(); * //System.out.println("Rank of A "+rank); //Ans = atemp.solve(bmatrix.transpose()); @@ -311,9 +311,9 @@ public void calcx(Matrix atemp, Matrix lagrangeTemp) { // Method added by Neeraj /* * public double[] generateInitialEstimates(SystemInterface system, double[] bVector, double - * inertMoles, int phase){ int i,j; double[] n = new double[components.length]; Matrix atemp, + * inertMoles, int phaseNum){ int i,j; double[] n = new double[components.length]; Matrix atemp, * btemp; Matrix mutemp = new - * Matrix(chemRefPot,1).times(1.0/(R*system.getPhase(phase).getTemperature())). copy(); Matrix + * Matrix(chemRefPot,1).times(1.0/(R*system.getPhase(phaseNum).getTemperature())). copy(); Matrix * ntemp; atemp = new Matrix(7,7); btemp = new Matrix(1,7); //for (i=0;i<4;i++) for (i=0;i<5;i++) * { for (j=0;j<7;j++) atemp.set(i,j,Amatrix[i][j]); btemp.set(0,i,bVector[i]); } * atemp.set(5,4,1); atemp.set(6,5,1); //atemp.set(4,4,1); //atemp.set(5,5,1); //atemp.set(6,1,1); @@ -331,16 +331,16 @@ public void calcx(Matrix atemp, Matrix lagrangeTemp) { * @param system a {@link neqsim.thermo.system.SystemInterface} object * @param bVector an array of type double * @param inertMoles a double - * @param phase a int + * @param phaseNum a int * @return an array of type double */ public double[] generateInitialEstimates(SystemInterface system, double[] bVector, - double inertMoles, int phase) { + double inertMoles, int phaseNum) { int i; int j; double rhs = 0.0; - Matrix mutemp = - new Matrix(chemRefPot, 1).times(1.0 / (R * system.getPhase(phase).getTemperature())).copy(); + Matrix mutemp = new Matrix(chemRefPot, 1) + .times(1.0 / (R * system.getPhase(phaseNum).getTemperature())).copy(); double[] v = new double[components.length + 1]; for (i = 0; i < components.length; i++) { v[i + 1] = mutemp.get(0, i); @@ -369,7 +369,7 @@ public double[] generateInitialEstimates(SystemInterface system, double[] bVecto return null; } - int compNumb = system.getPhase(phase).getNumberOfComponents(); + int compNumb = system.getPhase(phaseNum).getNumberOfComponents(); double[] lp_solution = new double[compNumb]; double[] temp = optimal.getPoint(); for (i = 0; i < compNumb - (compNumb - components.length); i++) { diff --git a/src/main/java/neqsim/datapresentation/jfreechart/Graph2b.java b/src/main/java/neqsim/datapresentation/jfreechart/Graph2b.java index c7c051f6f..e4a201c16 100644 --- a/src/main/java/neqsim/datapresentation/jfreechart/Graph2b.java +++ b/src/main/java/neqsim/datapresentation/jfreechart/Graph2b.java @@ -18,6 +18,7 @@ import org.jfree.data.xy.XYDataset; import org.jfree.data.xy.XYSeries; import org.jfree.data.xy.XYSeriesCollection; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** *

@@ -302,6 +303,7 @@ public ChartPanel getChartPanel() { * * @param args the command line arguments */ + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { new Graph2b().setVisible(true); } 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 1436b1b18..35ba6ecae 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 @@ -6,6 +6,7 @@ import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; import neqsim.thermodynamicoperations.ThermodynamicOperations; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** *

@@ -69,6 +70,7 @@ public double[] calcFluxes() { * @param args an array of {@link java.lang.String} objects */ @SuppressWarnings("unused") + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { System.out.println("Starter....."); SystemSrkEos testSystem = new SystemSrkEos(295.3, 11.0); diff --git a/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/finitevolumeboundary/fluidboundarysystem/fluidboundarynonreactive/FluidBoundarySystemNonReactive.java b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/finitevolumeboundary/fluidboundarysystem/fluidboundarynonreactive/FluidBoundarySystemNonReactive.java index 197789d2e..cd4ea529e 100644 --- a/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/finitevolumeboundary/fluidboundarysystem/fluidboundarynonreactive/FluidBoundarySystemNonReactive.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/finitevolumeboundary/fluidboundarysystem/fluidboundarynonreactive/FluidBoundarySystemNonReactive.java @@ -9,6 +9,7 @@ import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.system.SystemFurstElectrolyteEos; import neqsim.thermo.system.SystemInterface; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** *

@@ -58,8 +59,10 @@ public void createSystem() { * * @param args an array of {@link java.lang.String} objects */ + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { - SystemInterface testSystem = new SystemFurstElectrolyteEos(275.3, ThermodynamicConstantsInterface.referencePressure); + SystemInterface testSystem = + new SystemFurstElectrolyteEos(275.3, ThermodynamicConstantsInterface.referencePressure); PipeData pipe1 = new PipeData(10.0, 0.025); testSystem.addComponent("methane", 0.061152181, 0); diff --git a/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/finitevolumeboundary/fluidboundarysystem/fluidboundarysystemreactive/FluidBoundarySystemReactive.java b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/finitevolumeboundary/fluidboundarysystem/fluidboundarysystemreactive/FluidBoundarySystemReactive.java index ad7983910..be9626abc 100644 --- a/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/finitevolumeboundary/fluidboundarysystem/fluidboundarysystemreactive/FluidBoundarySystemReactive.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/fluidboundary/heatmasstransfercalc/finitevolumeboundary/fluidboundarysystem/fluidboundarysystemreactive/FluidBoundarySystemReactive.java @@ -15,6 +15,7 @@ import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.system.SystemFurstElectrolyteEos; import neqsim.thermo.system.SystemInterface; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** *

@@ -65,6 +66,7 @@ public void createSystem() { * * @param args an array of {@link java.lang.String} objects */ + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { SystemInterface testSystem = new SystemFurstElectrolyteEos(275.3, ThermodynamicConstantsInterface.referencePressure); 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 442794db6..6d7584dee 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 @@ -8,6 +8,7 @@ import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; import neqsim.thermodynamicoperations.ThermodynamicOperations; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** *

@@ -340,6 +341,7 @@ public void solve() { * @param args an array of {@link java.lang.String} objects */ @SuppressWarnings("unused") + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { System.out.println("Starter....."); SystemSrkEos testSystem = new SystemSrkEos(295.3, 3.0); 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 a377e786c..572467e8e 100644 --- a/src/main/java/neqsim/fluidmechanics/flownode/multiphasenode/waxnode/WaxDepositionFlowNode.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/multiphasenode/waxnode/WaxDepositionFlowNode.java @@ -9,6 +9,7 @@ import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; import neqsim.thermodynamicoperations.ThermodynamicOperations; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** *

@@ -119,6 +120,7 @@ public FlowNodeInterface getNextNode() { * @param args an array of {@link java.lang.String} objects */ @SuppressWarnings("unused") + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { SystemInterface testSystem = new SystemSrkEos(273.15 + 40.0, 10.0); // SystemInterface testSystem = new SystemSrkCPAstatoil(275.3, 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 5118c45d9..5ae2b7869 100644 --- a/src/main/java/neqsim/fluidmechanics/flownode/onephasenode/onephasepipeflownode/onePhasePipeFlowNode.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/onephasenode/onephasepipeflownode/onePhasePipeFlowNode.java @@ -8,6 +8,7 @@ import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; import neqsim.thermodynamicoperations.ThermodynamicOperations; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** *

@@ -71,6 +72,7 @@ public double calcReynoldsNumber() { * * @param args an array of {@link java.lang.String} objects */ + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { System.out.println("Starter....."); SystemSrkEos testSystem = new SystemSrkEos(300.3, 200.0); 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 76efa73c7..6084d82b8 100644 --- a/src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasepipeflownode/AnnularFlow.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasepipeflownode/AnnularFlow.java @@ -11,6 +11,7 @@ import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkCPAstatoil; import neqsim.thermodynamicoperations.ThermodynamicOperations; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** *

@@ -123,6 +124,7 @@ public FlowNodeInterface getNextNode() { * @param args an array of {@link java.lang.String} objects */ @SuppressWarnings("unused") + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { System.out.println("Starter....."); String fileName = "c:/labsim/exp-heat.txt"; 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 abe935a4d..d3e3af1cd 100644 --- a/src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasepipeflownode/BubbleFlowNode.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasepipeflownode/BubbleFlowNode.java @@ -7,6 +7,7 @@ import neqsim.fluidmechanics.geometrydefinitions.pipe.PipeData; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** *

@@ -150,6 +151,7 @@ public FlowNodeInterface getNextNode() { * @param args an array of {@link java.lang.String} objects */ @SuppressWarnings("unused") + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { SystemInterface testSystem = new neqsim.thermo.system.SystemSrkSchwartzentruberEos(295.3, 50.01325); 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 209e4e437..1f99e5598 100644 --- a/src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasepipeflownode/DropletFlowNode.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasepipeflownode/DropletFlowNode.java @@ -8,6 +8,7 @@ import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkCPAstatoil; import neqsim.thermodynamicoperations.ThermodynamicOperations; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** *

@@ -232,6 +233,7 @@ public static void mainOld(String[] args) { * * @param args an array of {@link java.lang.String} objects */ + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { SystemInterface testSystem = new SystemSrkCPAstatoil(273.15 + 5.0, 10.0e-3); 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 661abe17c..e1dc967ba 100644 --- a/src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasepipeflownode/StratifiedFlowNode.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasepipeflownode/StratifiedFlowNode.java @@ -7,6 +7,7 @@ import neqsim.fluidmechanics.geometrydefinitions.pipe.PipeData; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** *

@@ -122,6 +123,7 @@ public FlowNodeInterface getNextNode() { * @param args an array of {@link java.lang.String} objects */ @SuppressWarnings("unused") + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { // SystemInterface testSystem = new SystemSrkEos(273.15 + 11.0, 60.0); SystemInterface testSystem = new neqsim.thermo.system.SystemSrkCPAstatoil(325.3, 100.0); 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 8ef909856..6c698b3f4 100644 --- a/src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasereactorflownode/TwoPhasePackedBedFlowNode.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasereactorflownode/TwoPhasePackedBedFlowNode.java @@ -9,6 +9,7 @@ import neqsim.thermo.system.SystemFurstElectrolyteEos; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** *

@@ -216,6 +217,7 @@ public void update() { * * @param args an array of {@link java.lang.String} objects */ + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { SystemInterface testSystem = new SystemFurstElectrolyteEos(313.315, 50.01325); // SystemInterface testSystem = new SystemSrkEos(295.3, 100.01325); 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 e93b2fc50..c04cee9a7 100644 --- a/src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasereactorflownode/TwoPhaseTrayTowerFlowNode.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasereactorflownode/TwoPhaseTrayTowerFlowNode.java @@ -9,6 +9,7 @@ import neqsim.thermo.system.SystemFurstElectrolyteEos; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** *

@@ -127,6 +128,7 @@ public FlowNodeInterface getNextNode() { * @param args an array of {@link java.lang.String} objects */ @SuppressWarnings("unused") + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { /* * System.out.println("Starter....."); SystemSrkEos testSystem = new SystemSrkEos(275.3, 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 7d076f4f8..61e93cb4d 100644 --- a/src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasestirredcellnode/StirredCellNode.java +++ b/src/main/java/neqsim/fluidmechanics/flownode/twophasenode/twophasestirredcellnode/StirredCellNode.java @@ -8,6 +8,7 @@ import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkCPAstatoil; import neqsim.thermodynamicoperations.ThermodynamicOperations; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** *

@@ -225,6 +226,7 @@ public void setDt(double dt) { * @param args an array of {@link java.lang.String} objects */ @SuppressWarnings("unused") + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { // SystemInterface testSystem = new SystemFurstElectrolyteEos(275.3, // ThermodynamicConstantsInterface.referencePressure); 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 95c81f082..89bc531d9 100644 --- a/src/main/java/neqsim/fluidmechanics/flowsolver/twophaseflowsolver/stirredcellsolver/StirredCellSolver.java +++ b/src/main/java/neqsim/fluidmechanics/flowsolver/twophaseflowsolver/stirredcellsolver/StirredCellSolver.java @@ -266,13 +266,13 @@ public void initTemperature(int phaseNum) { * initPhaseFraction. *

* - * @param phase a int + * @param phaseNum a int */ - public void initPhaseFraction(int phase) { + public void initPhaseFraction(int phaseNum) { for (int i = 0; i < numberOfNodes; i++) { - pipe.getNode(i).setPhaseFraction(phase, - pipe.getNode(i).getPhaseFraction(phase) + 0.8 * diffMatrix.get(i, 0)); - pipe.getNode(i).setPhaseFraction(0, 1.0 - pipe.getNode(i).getPhaseFraction(phase)); + pipe.getNode(i).setPhaseFraction(phaseNum, + pipe.getNode(i).getPhaseFraction(phaseNum) + 0.8 * diffMatrix.get(i, 0)); + pipe.getNode(i).setPhaseFraction(0, 1.0 - pipe.getNode(i).getPhaseFraction(phaseNum)); pipe.getNode(i).init(); } } 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 56aa0aeff..da4687961 100644 --- a/src/main/java/neqsim/fluidmechanics/flowsystem/twophaseflowsystem/shipsystem/LNGship.java +++ b/src/main/java/neqsim/fluidmechanics/flowsystem/twophaseflowsystem/shipsystem/LNGship.java @@ -11,6 +11,7 @@ import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** *

@@ -404,6 +405,7 @@ public String[][] getResults(String name) { * * @param args an array of {@link java.lang.String} objects */ + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { // thermo.system.SystemInterface testSystem = new // thermo.system.SystemGERG2004Eos(273.15 - 161.4, 1.0); 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 258dd391e..d9ac4c512 100644 --- a/src/main/java/neqsim/fluidmechanics/flowsystem/twophaseflowsystem/stirredcellsystem/StirredCellSystem.java +++ b/src/main/java/neqsim/fluidmechanics/flowsystem/twophaseflowsystem/stirredcellsystem/StirredCellSystem.java @@ -2,6 +2,7 @@ import java.util.UUID; import neqsim.thermo.system.SystemInterface; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** *

@@ -105,6 +106,7 @@ public void solveTransient(int solverType, UUID id) { * * @param args an array of {@link java.lang.String} objects */ + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { // Initierer et nyt rorsystem neqsim.fluidmechanics.flowsystem.FlowSystemInterface pipe = new StirredCellSystem(); 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 714b4ffb8..caab7846a 100644 --- a/src/main/java/neqsim/fluidmechanics/flowsystem/twophaseflowsystem/twophasepipeflowsystem/TwoPhasePipeFlowSystem.java +++ b/src/main/java/neqsim/fluidmechanics/flowsystem/twophaseflowsystem/twophasepipeflowsystem/TwoPhasePipeFlowSystem.java @@ -1,6 +1,7 @@ package neqsim.fluidmechanics.flowsystem.twophaseflowsystem.twophasepipeflowsystem; import java.util.UUID; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** *

@@ -114,6 +115,7 @@ public void solveTransient(int type, UUID id) { * @param args an array of {@link java.lang.String} objects */ @SuppressWarnings("unused") + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { // Initierer et nyt rorsystem neqsim.fluidmechanics.flowsystem.FlowSystemInterface pipe = new TwoPhasePipeFlowSystem(); 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 5d34bb84e..8b7dc7507 100644 --- a/src/main/java/neqsim/fluidmechanics/flowsystem/twophaseflowsystem/twophasepipeflowsystem/TwoPhasePipeFlowSystemReac.java +++ b/src/main/java/neqsim/fluidmechanics/flowsystem/twophaseflowsystem/twophasepipeflowsystem/TwoPhasePipeFlowSystemReac.java @@ -4,6 +4,7 @@ import neqsim.thermo.system.SystemFurstElectrolyteEos; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** *

@@ -30,6 +31,7 @@ public TwoPhasePipeFlowSystemReac() {} * * @param args an array of {@link java.lang.String} objects */ + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { // Initierer et nyt rorsystem neqsim.fluidmechanics.flowsystem.FlowSystemInterface pipe = new TwoPhasePipeFlowSystemReac(); 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 58b65849b..4bf8d58dc 100644 --- a/src/main/java/neqsim/fluidmechanics/flowsystem/twophaseflowsystem/twophasereactorflowsystem/TwoPhaseReactorFlowSystem.java +++ b/src/main/java/neqsim/fluidmechanics/flowsystem/twophaseflowsystem/twophasereactorflowsystem/TwoPhaseReactorFlowSystem.java @@ -2,6 +2,7 @@ import java.util.UUID; import neqsim.fluidmechanics.util.fluidmechanicsvisualization.flowsystemvisualization.twophaseflowvisualization.twophasepipeflowvisualization.TwoPhasePipeFlowVisualization; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** *

@@ -103,6 +104,7 @@ public void solveTransient(int type, UUID id) { * @param args an array of {@link java.lang.String} objects */ @SuppressWarnings("unused") + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { // Initierer et nyt rorsystem neqsim.fluidmechanics.flowsystem.FlowSystemInterface pipe = new TwoPhaseReactorFlowSystem(); diff --git a/src/main/java/neqsim/mathlib/nonlinearsolver/NewtonRhapson.java b/src/main/java/neqsim/mathlib/nonlinearsolver/NewtonRhapson.java index 268d95095..82f47acb8 100644 --- a/src/main/java/neqsim/mathlib/nonlinearsolver/NewtonRhapson.java +++ b/src/main/java/neqsim/mathlib/nonlinearsolver/NewtonRhapson.java @@ -6,6 +6,8 @@ package neqsim.mathlib.nonlinearsolver; +import neqsim.util.ExcludeFromJacocoGeneratedReport; + /** *

* newtonRhapson class. @@ -208,6 +210,7 @@ public double solve1order(double xin) { * * @param args an array of {@link java.lang.String} objects */ + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { NewtonRhapson test = new NewtonRhapson(); test.setOrder(3); diff --git a/src/main/java/neqsim/mathlib/nonlinearsolver/SysNewtonRhapson.java b/src/main/java/neqsim/mathlib/nonlinearsolver/SysNewtonRhapson.java index 25789e61b..2d4f86719 100644 --- a/src/main/java/neqsim/mathlib/nonlinearsolver/SysNewtonRhapson.java +++ b/src/main/java/neqsim/mathlib/nonlinearsolver/SysNewtonRhapson.java @@ -3,6 +3,7 @@ import Jama.Matrix; import neqsim.thermo.phase.PhaseType; import neqsim.thermo.system.SystemInterface; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** *

@@ -468,6 +469,7 @@ public void solve(int np) { * * @param args an array of {@link java.lang.String} objects */ + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { /* * sysNewtonRhapson test=new sysNewtonRhapson(); double[] constants = new double[]{0.4,0.4}; diff --git a/src/main/java/neqsim/physicalproperties/interfaceproperties/solidadsorption/AdsorptionInterface.java b/src/main/java/neqsim/physicalproperties/interfaceproperties/solidadsorption/AdsorptionInterface.java index 532270f61..47b3911aa 100644 --- a/src/main/java/neqsim/physicalproperties/interfaceproperties/solidadsorption/AdsorptionInterface.java +++ b/src/main/java/neqsim/physicalproperties/interfaceproperties/solidadsorption/AdsorptionInterface.java @@ -14,9 +14,9 @@ public interface AdsorptionInterface extends neqsim.thermo.ThermodynamicConstant * calcAdsorption. *

* - * @param phase a int + * @param phaseNum a int */ - public void calcAdsorption(int phase); + public void calcAdsorption(int phaseNum); /** *

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 22cd962a3..62cf8e3b4 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 @@ -9,6 +9,7 @@ import neqsim.statistics.parameterfitting.nonlinearparameterfitting.LevenbergMarquardt; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkCPAstatoil; +import neqsim.util.ExcludeFromJacocoGeneratedReport; import neqsim.util.database.NeqSimDataBase; /** @@ -29,13 +30,14 @@ public class TestParachorFit { * * @param args an array of {@link java.lang.String} objects */ + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { LevenbergMarquardt optim = new LevenbergMarquardt(); ArrayList sampleList = new ArrayList(); try (NeqSimDataBase database = new NeqSimDataBase(); ResultSet dataSet = database - .getResultSet("SELECT * FROM purecomponentsurfacetension WHERE ComponentName='MEG'")) { + .getResultSet("SELECT * FROM purecomponentsurfacetension WHERE ComponentName='MEG'")) { while (dataSet.next()) { ParachorFunction function = new ParachorFunction(); double guess[] = {207.2}; // methane 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 28de6d91e..bf555c1a5 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 @@ -9,6 +9,7 @@ import neqsim.statistics.parameterfitting.nonlinearparameterfitting.LevenbergMarquardt; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; +import neqsim.util.ExcludeFromJacocoGeneratedReport; import neqsim.util.database.NeqSimDataBase; /** @@ -29,6 +30,7 @@ public class TestChungFit { * * @param args an array of {@link java.lang.String} objects */ + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { LevenbergMarquardt optim = new LevenbergMarquardt(); ArrayList sampleList = new ArrayList(); 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 144a86bc0..c1c5e445b 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 @@ -9,6 +9,7 @@ import neqsim.statistics.parameterfitting.nonlinearparameterfitting.LevenbergMarquardt; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; +import neqsim.util.ExcludeFromJacocoGeneratedReport; import neqsim.util.database.NeqSimExperimentDatabase; /** @@ -29,6 +30,7 @@ public class TestViscosityFit { * * @param args an array of {@link java.lang.String} objects */ + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { LevenbergMarquardt optim = new LevenbergMarquardt(); ArrayList sampleList = new ArrayList(); diff --git a/src/main/java/neqsim/process/equipment/compressor/Compressor.java b/src/main/java/neqsim/process/equipment/compressor/Compressor.java index 45e141555..4323d3677 100644 --- a/src/main/java/neqsim/process/equipment/compressor/Compressor.java +++ b/src/main/java/neqsim/process/equipment/compressor/Compressor.java @@ -1468,10 +1468,11 @@ public double getActualCompressionRatio() { } /** + * {@inheritDoc} + * *

* Set CompressorChartType *

- * */ public void setCompressorChartType(String type) { if (type.equals("simple") || type.equals("fan law")) { diff --git a/src/main/java/neqsim/process/equipment/compressor/CompressorChart.java b/src/main/java/neqsim/process/equipment/compressor/CompressorChart.java index 2dfa7dfa6..b1e859a7e 100644 --- a/src/main/java/neqsim/process/equipment/compressor/CompressorChart.java +++ b/src/main/java/neqsim/process/equipment/compressor/CompressorChart.java @@ -76,12 +76,6 @@ public void addCurve(double speed, double[] flow, double[] head, double[] polytr * The method takes chart conditions and initializes internal variables for different performance * parameters based on input arrays for speed, flow, head, and polytropic efficiency. It also * normalizes these parameters by calculating reduced values based on speed. - * - * @param chartConditions An array of conditions used for the compressor chart. (Currently unused) - * @param speed An array representing the compressor speed values. - * @param flow A 2D array representing the flow rates at different speeds. - * @param head A 2D array representing the head values at different speeds. - * @param polyEff A 2D array representing the polytropic efficiency values at different speeds. */ @Override public void setCurves(double[] chartConditions, double[] speed, double[][] flow, double[][] head, diff --git a/src/main/java/neqsim/process/equipment/compressor/CompressorChartAlternativeMapLookup.java b/src/main/java/neqsim/process/equipment/compressor/CompressorChartAlternativeMapLookup.java index 8aa221c57..b188b364d 100644 --- a/src/main/java/neqsim/process/equipment/compressor/CompressorChartAlternativeMapLookup.java +++ b/src/main/java/neqsim/process/equipment/compressor/CompressorChartAlternativeMapLookup.java @@ -11,6 +11,7 @@ import neqsim.process.equipment.stream.Stream; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** * This class is an implementation of the compressor chart class that uses Fan laws and "double" @@ -122,6 +123,8 @@ */ /** + *

CompressorChartAlternativeMapLookup class.

+ * * @author asmund * @version $Id: $Id */ @@ -171,14 +174,10 @@ public void addCurve(double speed, double[] flow, double[] head, double[] polytr /** {@inheritDoc} */ /** + * {@inheritDoc} + * * Sets the compressor curves based on the provided chart conditions, speed, flow, head, and * polytropic efficiency values. - * - * @param chartConditions an array of chart conditions (not used in this method) - * @param speed an array of speed values for the compressor - * @param flow a 2D array of flow values corresponding to each speed - * @param head a 2D array of head values corresponding to each speed - * @param polyEff a 2D array of polytropic efficiency values corresponding to each speed */ @Override public void setCurves(double[] chartConditions, double[] speed, double[][] flow, double[][] head, @@ -207,6 +206,7 @@ public void setCurves(double[] chartConditions, double[] speed, double[][] flow, * lowest reference speed is returned. If the given speed is higher than the highest reference * speed, the highest reference speed is returned. * + * @return an ArrayList of the closest reference speeds * @param speed the speed to find the closest reference speeds for * @return an ArrayList of the closest reference speeds */ @@ -242,14 +242,12 @@ public ArrayList getClosestRefSpeeds(double speed) { /** {@inheritDoc} */ /** + * {@inheritDoc} + * * Calculates the polytropic head for a given flow and speed. * * This method interpolates the polytropic head values from reference speeds closest to the given * speed and averages them to estimate the polytropic head at the specified flow and speed. - * - * @param flow the flow rate for which the polytropic head is to be calculated - * @param speed the speed at which the polytropic head is to be calculated - * @return the calculated polytropic head */ @Override public double getPolytropicHead(double flow, double speed) { @@ -277,13 +275,11 @@ public double getPolytropicHead(double flow, double speed) { /** {@inheritDoc} */ /** + * {@inheritDoc} + * * Calculates the polytropic efficiency of the compressor for a given flow and speed. The method * interpolates the efficiency values from reference speed curves and averages them to estimate * the efficiency at the specified conditions. - * - * @param flow the flow rate through the compressor - * @param speed the rotational speed of the compressor - * @return the polytropic efficiency at the specified flow and speed */ @Override public double getPolytropicEfficiency(double flow, double speed) { @@ -479,6 +475,7 @@ public void setStoneWallCurve(StoneWallCurve stoneWallCurve) { * * @param args an array of {@link java.lang.String} objects */ + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { SystemInterface testFluid = new SystemSrkEos(298.15, 50.0); diff --git a/src/main/java/neqsim/process/equipment/compressor/CompressorChartAlternativeMapLookupExtrapolate.java b/src/main/java/neqsim/process/equipment/compressor/CompressorChartAlternativeMapLookupExtrapolate.java index 01ab16f5d..634b1fd62 100644 --- a/src/main/java/neqsim/process/equipment/compressor/CompressorChartAlternativeMapLookupExtrapolate.java +++ b/src/main/java/neqsim/process/equipment/compressor/CompressorChartAlternativeMapLookupExtrapolate.java @@ -6,6 +6,11 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +/** + *

CompressorChartAlternativeMapLookupExtrapolate class.

+ * + * @author ASMF + */ public class CompressorChartAlternativeMapLookupExtrapolate extends CompressorChartAlternativeMapLookup { private static final long serialVersionUID = 1000; @@ -13,16 +18,14 @@ public class CompressorChartAlternativeMapLookupExtrapolate /** + * {@inheritDoc} + * * Retrieves the closest reference speeds to the given speed from the compressor chart values. The * method returns a list containing one or two speeds: - If the given speed matches a reference * speed, the list contains only that speed. - If the given speed is between two reference speeds, * the list contains both speeds. - If the given speed is less than the lowest reference speed, * the list contains the lowest reference speed. - If the given speed is greater than the highest * reference speed, the list contains the highest reference speed. - * - * @param speed the speed to find the closest reference speeds for. - * @return a list of the closest reference speeds. - * @throws IllegalStateException if no reference speeds are available in the chart values. */ @Override public ArrayList getClosestRefSpeeds(double speed) { @@ -59,12 +62,10 @@ public ArrayList getClosestRefSpeeds(double speed) { } /** + * {@inheritDoc} + * * Calculates the polytropic head for a given flow and speed by interpolating or extrapolating * between reference compressor curves. - * - * @param flow the flow rate for which the polytropic head is to be calculated - * @param speed the speed at which the compressor is operating - * @return the polytropic head corresponding to the given flow and speed */ @Override public double getPolytropicHead(double flow, double speed) { @@ -95,14 +96,10 @@ public double getPolytropicHead(double flow, double speed) { } /** + * {@inheritDoc} + * * Calculates the polytropic efficiency for a given flow and speed by interpolating or * extrapolating between reference compressor curves. - * - * @param flow the flow rate for which the polytropic efficiency is to be calculated - * @param speed the speed at which the compressor is operating - * @return the polytropic efficiency at the given flow and speed - * @throws IllegalArgumentException if no valid reference speeds are found for the given speed or - * if the curve data for a reference speed is invalid */ @Override public double getPolytropicEfficiency(double flow, double speed) { diff --git a/src/main/java/neqsim/process/equipment/compressor/CompressorChartGenerator.java b/src/main/java/neqsim/process/equipment/compressor/CompressorChartGenerator.java index da9621590..b9e72d03f 100644 --- a/src/main/java/neqsim/process/equipment/compressor/CompressorChartGenerator.java +++ b/src/main/java/neqsim/process/equipment/compressor/CompressorChartGenerator.java @@ -2,12 +2,12 @@ /** * Compressor chart generator. - * + * * This class generates a compressor chart based on the provided compressor and the specified * generation option. - * + * * Supports generating normal curves and alternative curves. - * + * * @author Even Solbraa */ public class CompressorChartGenerator { diff --git a/src/main/java/neqsim/process/equipment/compressor/CompressorInterface.java b/src/main/java/neqsim/process/equipment/compressor/CompressorInterface.java index 103bd51e2..866bbb839 100644 --- a/src/main/java/neqsim/process/equipment/compressor/CompressorInterface.java +++ b/src/main/java/neqsim/process/equipment/compressor/CompressorInterface.java @@ -140,6 +140,7 @@ public interface CompressorInterface extends ProcessEquipmentInterface, TwoPortI * Set CompressorChartType *

* + * @param type a {@link java.lang.String} object */ public void setCompressorChartType(String type); diff --git a/src/main/java/neqsim/process/equipment/distillation/DistillationColumn.java b/src/main/java/neqsim/process/equipment/distillation/DistillationColumn.java index 9ad4fe7c6..fe14b7652 100644 --- a/src/main/java/neqsim/process/equipment/distillation/DistillationColumn.java +++ b/src/main/java/neqsim/process/equipment/distillation/DistillationColumn.java @@ -545,6 +545,7 @@ public void energyBalanceCheck() { * * @param args an array of {@link java.lang.String} objects */ + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { neqsim.thermo.system.SystemInterface testSystem = new neqsim.thermo.system.SystemSrkEos((273.15 - 0.0), 15.000); diff --git a/src/main/java/neqsim/process/equipment/pipeline/AdiabaticPipe.java b/src/main/java/neqsim/process/equipment/pipeline/AdiabaticPipe.java index a2180457e..92670db88 100644 --- a/src/main/java/neqsim/process/equipment/pipeline/AdiabaticPipe.java +++ b/src/main/java/neqsim/process/equipment/pipeline/AdiabaticPipe.java @@ -352,6 +352,7 @@ public void setOutletElevation(double outletElevation) { * * @param name an array of {@link java.lang.String} objects */ + @ExcludeFromJacocoGeneratedReport public static void main(String[] name) { neqsim.thermo.system.SystemInterface testSystem = new neqsim.thermo.system.SystemSrkEos((273.15 + 5.0), 220.00); diff --git a/src/main/java/neqsim/process/equipment/pipeline/IncompressiblePipeFlow.java b/src/main/java/neqsim/process/equipment/pipeline/IncompressiblePipeFlow.java index f3bb588f6..3c5fa68c1 100644 --- a/src/main/java/neqsim/process/equipment/pipeline/IncompressiblePipeFlow.java +++ b/src/main/java/neqsim/process/equipment/pipeline/IncompressiblePipeFlow.java @@ -4,6 +4,7 @@ import neqsim.process.equipment.stream.Stream; import neqsim.process.equipment.stream.StreamInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** *

@@ -127,6 +128,7 @@ public void run(UUID id) { * * @param name an array of {@link java.lang.String} objects */ + @ExcludeFromJacocoGeneratedReport public static void main(String[] name) { neqsim.thermo.system.SystemInterface testSystem = new neqsim.thermo.system.SystemSrkEos((273.15 + 25.0), 10.00); diff --git a/src/main/java/neqsim/process/equipment/pump/PumpChart.java b/src/main/java/neqsim/process/equipment/pump/PumpChart.java index 2f1ab98e1..4a5614a27 100644 --- a/src/main/java/neqsim/process/equipment/pump/PumpChart.java +++ b/src/main/java/neqsim/process/equipment/pump/PumpChart.java @@ -10,6 +10,7 @@ import neqsim.process.equipment.stream.Stream; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** *

@@ -222,6 +223,7 @@ public void setReferenceConditions(double refMW, double refTemperature, double r * * @param args an array of {@link java.lang.String} objects */ + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { SystemInterface testFluid = new SystemSrkEos(298.15, 50.0); testFluid.addComponent("water", 1.0); diff --git a/src/main/java/neqsim/process/equipment/reservoir/SimpleReservoir.java b/src/main/java/neqsim/process/equipment/reservoir/SimpleReservoir.java index f8772243d..6fbd9ad21 100644 --- a/src/main/java/neqsim/process/equipment/reservoir/SimpleReservoir.java +++ b/src/main/java/neqsim/process/equipment/reservoir/SimpleReservoir.java @@ -605,6 +605,7 @@ public void displayResult() { * * @param args an array of {@link java.lang.String} objects */ + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { neqsim.thermo.system.SystemInterface testSystem = new neqsim.thermo.system.SystemSrkEos((273.15 + 100.0), 200.00); diff --git a/src/main/java/neqsim/process/equipment/subsea/SubseaWell.java b/src/main/java/neqsim/process/equipment/subsea/SubseaWell.java index 05e37d730..ff66433fe 100644 --- a/src/main/java/neqsim/process/equipment/subsea/SubseaWell.java +++ b/src/main/java/neqsim/process/equipment/subsea/SubseaWell.java @@ -9,6 +9,7 @@ import neqsim.process.equipment.util.Adjuster; import neqsim.process.equipment.valve.ThrottlingValve; import neqsim.process.processmodel.ProcessSystem; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** *

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

* * @param name Name of well - * @param instream a {@link neqsim.process.equipment.stream.StreamInterface} - * object + * @param instream a {@link neqsim.process.equipment.stream.StreamInterface} object */ public SubseaWell(String name, StreamInterface instream) { super(name); @@ -45,8 +45,7 @@ public SubseaWell(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; @@ -84,6 +83,7 @@ public void run(UUID id) { * * @param args an array of {@link java.lang.String} objects */ + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { neqsim.thermo.system.SystemInterface testSystem = new neqsim.thermo.system.SystemSrkEos((273.15 + 100.0), 250.00); diff --git a/src/main/java/neqsim/process/equipment/util/Adjuster.java b/src/main/java/neqsim/process/equipment/util/Adjuster.java index 4d63a671c..98f0da49d 100644 --- a/src/main/java/neqsim/process/equipment/util/Adjuster.java +++ b/src/main/java/neqsim/process/equipment/util/Adjuster.java @@ -304,6 +304,7 @@ public void setError(double error) { * * @param args an array of {@link java.lang.String} objects */ + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { // test code for adjuster... neqsim.thermo.system.SystemInterface testSystem = diff --git a/src/main/java/neqsim/process/equipment/util/Recycle.java b/src/main/java/neqsim/process/equipment/util/Recycle.java index ecaaa7d2c..9e3fbeb66 100644 --- a/src/main/java/neqsim/process/equipment/util/Recycle.java +++ b/src/main/java/neqsim/process/equipment/util/Recycle.java @@ -476,7 +476,7 @@ public void setTemperature(double temp) { * Setter for the tolerance fields. *

* Set tolerances to tolerance input. - * + * * @param tolerance the tolerance to set */ public void setTolerance(double tolerance) { diff --git a/src/main/java/neqsim/process/equipment/util/SetPoint.java b/src/main/java/neqsim/process/equipment/util/SetPoint.java index 637ba348f..6f9bbf1d8 100644 --- a/src/main/java/neqsim/process/equipment/util/SetPoint.java +++ b/src/main/java/neqsim/process/equipment/util/SetPoint.java @@ -203,6 +203,7 @@ public void displayResult() {} * * @param args an array of {@link java.lang.String} objects */ + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { // test code for adjuster... neqsim.thermo.system.SystemInterface testSystem = diff --git a/src/main/java/neqsim/process/equipment/util/StreamTransition.java b/src/main/java/neqsim/process/equipment/util/StreamTransition.java index 4fa88b92b..b9bc7ab41 100644 --- a/src/main/java/neqsim/process/equipment/util/StreamTransition.java +++ b/src/main/java/neqsim/process/equipment/util/StreamTransition.java @@ -75,6 +75,7 @@ public void displayResult() { * * @param args an array of {@link java.lang.String} objects */ + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { ProcessSystem offshoreProcessoperations = ProcessSystem.open("c:/temp/offshorePro.neqsim"); ProcessSystem TEGprocess = ProcessSystem.open("c:/temp//TEGprocessHX.neqsim"); diff --git a/src/main/java/neqsim/process/measurementdevice/simpleflowregime/SevereSlugAnalyser.java b/src/main/java/neqsim/process/measurementdevice/simpleflowregime/SevereSlugAnalyser.java index b0d18128e..fbd445407 100644 --- a/src/main/java/neqsim/process/measurementdevice/simpleflowregime/SevereSlugAnalyser.java +++ b/src/main/java/neqsim/process/measurementdevice/simpleflowregime/SevereSlugAnalyser.java @@ -9,6 +9,7 @@ import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** *

@@ -418,9 +419,7 @@ public double getSimulationTime() { * Calculating the universal gas constant. *

* - * @param fluid a - * {@link neqsim.process.measurementdevice.simpleflowregime.FluidSevereSlug} - * object + * @param fluid a {@link neqsim.process.measurementdevice.simpleflowregime.FluidSevereSlug} object * @return a double */ public double gasConst(FluidSevereSlug fluid) { @@ -437,8 +436,7 @@ public double gasConst(FluidSevereSlug fluid) { * * @param pipe a {@link neqsim.process.measurementdevice.simpleflowregime.Pipe} object * @param severeSlug a - * {@link neqsim.process.measurementdevice.simpleflowregime.SevereSlugAnalyser} - * object + * {@link neqsim.process.measurementdevice.simpleflowregime.SevereSlugAnalyser} object * @return a double */ public double slugHoldUp(Pipe pipe, SevereSlugAnalyser severeSlug) { @@ -457,13 +455,10 @@ public double slugHoldUp(Pipe pipe, SevereSlugAnalyser severeSlug) { * stratifiedHoldUp. *

* - * @param fluid a - * {@link neqsim.process.measurementdevice.simpleflowregime.FluidSevereSlug} - * object + * @param fluid a {@link neqsim.process.measurementdevice.simpleflowregime.FluidSevereSlug} object * @param pipe a {@link neqsim.process.measurementdevice.simpleflowregime.Pipe} object * @param severeSlug a - * {@link neqsim.process.measurementdevice.simpleflowregime.SevereSlugAnalyser} - * object + * {@link neqsim.process.measurementdevice.simpleflowregime.SevereSlugAnalyser} object * @return a double */ public double stratifiedHoldUp(FluidSevereSlug fluid, Pipe pipe, SevereSlugAnalyser severeSlug) { @@ -523,13 +518,10 @@ public double stratifiedHoldUp(FluidSevereSlug fluid, Pipe pipe, SevereSlugAnaly * runSevereSlug. *

* - * @param fluid a - * {@link neqsim.process.measurementdevice.simpleflowregime.FluidSevereSlug} - * object + * @param fluid a {@link neqsim.process.measurementdevice.simpleflowregime.FluidSevereSlug} object * @param pipe a {@link neqsim.process.measurementdevice.simpleflowregime.Pipe} object * @param severeSlug a - * {@link neqsim.process.measurementdevice.simpleflowregime.SevereSlugAnalyser} - * object + * {@link neqsim.process.measurementdevice.simpleflowregime.SevereSlugAnalyser} object */ public void runSevereSlug(FluidSevereSlug fluid, Pipe pipe, SevereSlugAnalyser severeSlug) { resPres = new double[severeSlug.getNumberOfTimeSteps()]; @@ -633,13 +625,10 @@ public void runSevereSlug(FluidSevereSlug fluid, Pipe pipe, SevereSlugAnalyser s * checkFlowRegime. *

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

* - * @param fluid a - * {@link neqsim.process.measurementdevice.simpleflowregime.FluidSevereSlug} - * object + * @param fluid a {@link neqsim.process.measurementdevice.simpleflowregime.FluidSevereSlug} object * @param pipe a {@link neqsim.process.measurementdevice.simpleflowregime.Pipe} object * @param severeSlug a - * {@link neqsim.process.measurementdevice.simpleflowregime.SevereSlugAnalyser} - * object + * {@link neqsim.process.measurementdevice.simpleflowregime.SevereSlugAnalyser} object * @return a double */ public double getMeasuredValue(FluidSevereSlug fluid, Pipe pipe, SevereSlugAnalyser severeSlug) { @@ -764,13 +750,10 @@ public String getPredictedFlowRegime() { * getPredictedFlowRegime. *

* - * @param fluid a - * {@link neqsim.process.measurementdevice.simpleflowregime.FluidSevereSlug} - * object + * @param fluid a {@link neqsim.process.measurementdevice.simpleflowregime.FluidSevereSlug} object * @param pipe a {@link neqsim.process.measurementdevice.simpleflowregime.Pipe} object * @param severeSlug a - * {@link neqsim.process.measurementdevice.simpleflowregime.SevereSlugAnalyser} - * object + * {@link neqsim.process.measurementdevice.simpleflowregime.SevereSlugAnalyser} object * @return a {@link java.lang.String} object */ public String getPredictedFlowRegime(FluidSevereSlug fluid, Pipe pipe, @@ -786,6 +769,7 @@ public String getPredictedFlowRegime(FluidSevereSlug fluid, Pipe pipe, * * @param args an array of {@link java.lang.String} objects */ + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { neqsim.thermo.system.SystemInterface testSystem = new neqsim.thermo.system.SystemSrkEos((273.15 + 15.0), 10); diff --git a/src/main/java/neqsim/process/mechanicaldesign/pipeline/PipelineMechanicalDesign.java b/src/main/java/neqsim/process/mechanicaldesign/pipeline/PipelineMechanicalDesign.java index fca0221bd..21f5e6888 100644 --- a/src/main/java/neqsim/process/mechanicaldesign/pipeline/PipelineMechanicalDesign.java +++ b/src/main/java/neqsim/process/mechanicaldesign/pipeline/PipelineMechanicalDesign.java @@ -6,6 +6,7 @@ import neqsim.process.mechanicaldesign.MechanicalDesign; import neqsim.process.mechanicaldesign.designstandards.MaterialPipeDesignStandard; import neqsim.process.mechanicaldesign.designstandards.PipelineDesignStandard; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** *

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

* - * @param equipment a {@link neqsim.process.equipment.ProcessEquipmentInterface} - * object + * @param equipment a {@link neqsim.process.equipment.ProcessEquipmentInterface} object */ public PipelineMechanicalDesign(ProcessEquipmentInterface equipment) { super(equipment); @@ -96,6 +96,7 @@ public void calcDesign() { * * @param args an array of {@link java.lang.String} objects */ + @ExcludeFromJacocoGeneratedReport public static void main(String args[]) { neqsim.thermo.system.SystemInterface testSystem = new neqsim.thermo.system.SystemSrkEos((273.15 + 20.0), 90.00); diff --git a/src/main/java/neqsim/process/processmodel/ProcessSystem.java b/src/main/java/neqsim/process/processmodel/ProcessSystem.java index c0d62ff15..183cb34c8 100644 --- a/src/main/java/neqsim/process/processmodel/ProcessSystem.java +++ b/src/main/java/neqsim/process/processmodel/ProcessSystem.java @@ -737,7 +737,7 @@ public void setName(String name) { /** * Setter for the field runStep. - * + * * @param runStep A boolean value if run only one iteration */ public void setRunStep(boolean runStep) { @@ -746,7 +746,7 @@ public void setRunStep(boolean runStep) { /** * Getter for the field runStep. - * + * * @return A boolean value if run only one iteration */ public boolean isRunStep() { diff --git a/src/main/java/neqsim/process/processmodel/processmodules/AdsorptionDehydrationlModule.java b/src/main/java/neqsim/process/processmodel/processmodules/AdsorptionDehydrationlModule.java index 98030a05e..c2c0c725f 100644 --- a/src/main/java/neqsim/process/processmodel/processmodules/AdsorptionDehydrationlModule.java +++ b/src/main/java/neqsim/process/processmodel/processmodules/AdsorptionDehydrationlModule.java @@ -10,6 +10,7 @@ import neqsim.process.equipment.stream.StreamInterface; import neqsim.process.processmodel.ProcessModuleBaseClass; import neqsim.thermo.ThermodynamicConstantsInterface; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** *

@@ -201,6 +202,7 @@ public void setDesign() { * * @param args an array of {@link java.lang.String} objects */ + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { neqsim.thermo.system.SystemInterface testSystem = new neqsim.thermo.system.SystemSrkEos((273.15 + 30.0), 10.0); @@ -214,8 +216,7 @@ public static void main(String[] args) { Separator separator = new Separator("Separator 1", inletStream); neqsim.process.processmodel.processmodules.AdsorptionDehydrationlModule adsorptionPlant = - new neqsim.process.processmodel.processmodules.AdsorptionDehydrationlModule( - "absPlant"); + new neqsim.process.processmodel.processmodules.AdsorptionDehydrationlModule("absPlant"); adsorptionPlant.addInputStream("gasStreamToAdsorber", separator.getGasOutStream()); adsorptionPlant.setSpecification("water dew point temperature", 273.15 - 100.0); adsorptionPlant.setSpecification("designFlow", 20.0e6); // MSm^3/day diff --git a/src/main/java/neqsim/process/processmodel/processmodules/DPCUModule.java b/src/main/java/neqsim/process/processmodel/processmodules/DPCUModule.java index ce65827ae..eabd133b8 100644 --- a/src/main/java/neqsim/process/processmodel/processmodules/DPCUModule.java +++ b/src/main/java/neqsim/process/processmodel/processmodules/DPCUModule.java @@ -286,6 +286,7 @@ public void displayResult() { * * @param args an array of {@link java.lang.String} objects */ + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { neqsim.thermo.system.SystemInterface testSystem = new neqsim.thermo.system.SystemSrkEos(273.15 + 7.5, 110.0); diff --git a/src/main/java/neqsim/process/processmodel/processmodules/GlycolDehydrationlModule.java b/src/main/java/neqsim/process/processmodel/processmodules/GlycolDehydrationlModule.java index 095f33fb1..db5c69554 100644 --- a/src/main/java/neqsim/process/processmodel/processmodules/GlycolDehydrationlModule.java +++ b/src/main/java/neqsim/process/processmodel/processmodules/GlycolDehydrationlModule.java @@ -440,6 +440,7 @@ public void setDesign() { * * @param args an array of {@link java.lang.String} objects */ + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { neqsim.thermo.system.SystemInterface testSystem = new neqsim.thermo.system.SystemSrkCPAstatoil((273.15 + 40.0), 70.0); diff --git a/src/main/java/neqsim/process/processmodel/processmodules/MEGReclaimerModule.java b/src/main/java/neqsim/process/processmodel/processmodules/MEGReclaimerModule.java index f428f5189..18808aee0 100644 --- a/src/main/java/neqsim/process/processmodel/processmodules/MEGReclaimerModule.java +++ b/src/main/java/neqsim/process/processmodel/processmodules/MEGReclaimerModule.java @@ -11,6 +11,7 @@ import neqsim.process.equipment.stream.StreamInterface; import neqsim.process.equipment.valve.ThrottlingValve; import neqsim.process.processmodel.ProcessModuleBaseClass; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** *

@@ -158,6 +159,7 @@ public void setOperationPressure(double pressure) { * * @param args an array of {@link java.lang.String} objects */ + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { neqsim.thermo.system.SystemInterface testSystem = new neqsim.thermo.system.SystemSrkEos((273.15 + 30.0), 10.0); diff --git a/src/main/java/neqsim/process/processmodel/processmodules/MixerGasProcessingModule.java b/src/main/java/neqsim/process/processmodel/processmodules/MixerGasProcessingModule.java index 91c42bbf0..a970ac5c5 100644 --- a/src/main/java/neqsim/process/processmodel/processmodules/MixerGasProcessingModule.java +++ b/src/main/java/neqsim/process/processmodel/processmodules/MixerGasProcessingModule.java @@ -11,6 +11,7 @@ import neqsim.process.equipment.stream.StreamInterface; import neqsim.process.equipment.util.Recycle; import neqsim.process.processmodel.ProcessModuleBaseClass; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** *

@@ -214,6 +215,7 @@ public void setSpecification(String specificationName, double value) { * @param args an array of {@link java.lang.String} objects */ @SuppressWarnings("unused") + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { neqsim.thermo.system.SystemInterface testSystem = new neqsim.thermo.system.SystemSrkCPAstatoil(273.15 + 50, 65); diff --git a/src/main/java/neqsim/process/processmodel/processmodules/PropaneCoolingModule.java b/src/main/java/neqsim/process/processmodel/processmodules/PropaneCoolingModule.java index ef073bf6e..156f93451 100644 --- a/src/main/java/neqsim/process/processmodel/processmodules/PropaneCoolingModule.java +++ b/src/main/java/neqsim/process/processmodel/processmodules/PropaneCoolingModule.java @@ -9,6 +9,7 @@ import neqsim.process.equipment.stream.StreamInterface; import neqsim.process.equipment.valve.ThrottlingValve; import neqsim.process.processmodel.ProcessModuleBaseClass; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** *

@@ -173,6 +174,7 @@ public void setSpecification(String specificationName, double value) { * * @param args an array of {@link java.lang.String} objects */ + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { neqsim.thermo.system.SystemInterface testSystem = new neqsim.thermo.system.SystemSrkEos(273.15 - 20, 1); diff --git a/src/main/java/neqsim/process/processmodel/processmodules/SeparationTrainModule.java b/src/main/java/neqsim/process/processmodel/processmodules/SeparationTrainModule.java index 5b2f55cc0..ffafa4557 100644 --- a/src/main/java/neqsim/process/processmodel/processmodules/SeparationTrainModule.java +++ b/src/main/java/neqsim/process/processmodel/processmodules/SeparationTrainModule.java @@ -13,6 +13,7 @@ import neqsim.process.equipment.util.Recycle; import neqsim.process.equipment.valve.ThrottlingValve; import neqsim.process.processmodel.ProcessModuleBaseClass; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** *

@@ -228,6 +229,7 @@ public void setSpecification(String specificationName, double value) { * @param args an array of {@link java.lang.String} objects */ @SuppressWarnings("unused") + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { neqsim.thermo.system.SystemInterface testSystem = new neqsim.thermo.system.SystemSrkEos(273.15 + 50, 65); diff --git a/src/main/java/neqsim/process/processmodel/processmodules/SeparationTrainModuleSimple.java b/src/main/java/neqsim/process/processmodel/processmodules/SeparationTrainModuleSimple.java index aa5de67a4..af73a8692 100644 --- a/src/main/java/neqsim/process/processmodel/processmodules/SeparationTrainModuleSimple.java +++ b/src/main/java/neqsim/process/processmodel/processmodules/SeparationTrainModuleSimple.java @@ -13,6 +13,7 @@ import neqsim.process.equipment.util.Recycle; import neqsim.process.equipment.valve.ThrottlingValve; import neqsim.process.processmodel.ProcessModuleBaseClass; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** *

@@ -223,6 +224,7 @@ public void setSpecification(String specificationName, double value) { * @param args an array of {@link java.lang.String} objects */ @SuppressWarnings("unused") + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { neqsim.thermo.system.SystemInterface testSystem = new neqsim.thermo.system.SystemSrkEos(273.15 + 50, 65); diff --git a/src/main/java/neqsim/process/processmodel/processmodules/WellFluidModule.java b/src/main/java/neqsim/process/processmodel/processmodules/WellFluidModule.java index 1d8c3a5e2..09127f61a 100644 --- a/src/main/java/neqsim/process/processmodel/processmodules/WellFluidModule.java +++ b/src/main/java/neqsim/process/processmodel/processmodules/WellFluidModule.java @@ -11,6 +11,7 @@ import neqsim.process.equipment.valve.ThrottlingValve; import neqsim.process.processmodel.ProcessModuleBaseClass; import neqsim.thermo.ThermodynamicConstantsInterface; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** *

@@ -215,6 +216,7 @@ public void setSpecification(String specificationName, double value) { * @param args an array of {@link java.lang.String} objects */ @SuppressWarnings("unused") + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { neqsim.thermo.system.SystemInterface testSystem = new neqsim.thermo.system.SystemSrkEos(273.15 + 50, 65); diff --git a/src/main/java/neqsim/pvtsimulation/simulation/ConstantMassExpansion.java b/src/main/java/neqsim/pvtsimulation/simulation/ConstantMassExpansion.java index b3c90595d..171114dc5 100644 --- a/src/main/java/neqsim/pvtsimulation/simulation/ConstantMassExpansion.java +++ b/src/main/java/neqsim/pvtsimulation/simulation/ConstantMassExpansion.java @@ -10,6 +10,7 @@ import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** *

@@ -245,6 +246,7 @@ public void runTuning() { * * @param args an array of {@link java.lang.String} objects */ + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { SystemInterface tempSystem = new SystemSrkEos(273.15 + 73.0, 10.0); tempSystem.addComponent("nitrogen", 0.972); diff --git a/src/main/java/neqsim/pvtsimulation/simulation/ConstantVolumeDepletion.java b/src/main/java/neqsim/pvtsimulation/simulation/ConstantVolumeDepletion.java index 33740395d..67875605a 100644 --- a/src/main/java/neqsim/pvtsimulation/simulation/ConstantVolumeDepletion.java +++ b/src/main/java/neqsim/pvtsimulation/simulation/ConstantVolumeDepletion.java @@ -10,6 +10,7 @@ import neqsim.statistics.parameterfitting.nonlinearparameterfitting.LevenbergMarquardt; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** *

@@ -246,6 +247,7 @@ public void runTuning() { * * @param args an array of {@link java.lang.String} objects */ + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { SystemInterface tempSystem = new SystemSrkEos(298.0, 211.0); /* diff --git a/src/main/java/neqsim/pvtsimulation/simulation/DensitySim.java b/src/main/java/neqsim/pvtsimulation/simulation/DensitySim.java index 01b3a1e11..37f75e074 100644 --- a/src/main/java/neqsim/pvtsimulation/simulation/DensitySim.java +++ b/src/main/java/neqsim/pvtsimulation/simulation/DensitySim.java @@ -9,6 +9,7 @@ import neqsim.statistics.parameterfitting.nonlinearparameterfitting.LevenbergMarquardt; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** *

@@ -144,6 +145,7 @@ public void runCalc() { * @param args an array of {@link java.lang.String} objects */ @SuppressWarnings("unused") + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { SystemInterface tempSystem = new SystemSrkEos(298.0, 10.0); // tempSystem.addComponent("n-heptane", 6.78); diff --git a/src/main/java/neqsim/pvtsimulation/simulation/DifferentialLiberation.java b/src/main/java/neqsim/pvtsimulation/simulation/DifferentialLiberation.java index a24eb284e..e3f414c79 100644 --- a/src/main/java/neqsim/pvtsimulation/simulation/DifferentialLiberation.java +++ b/src/main/java/neqsim/pvtsimulation/simulation/DifferentialLiberation.java @@ -6,6 +6,7 @@ import neqsim.thermo.phase.PhaseType; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** *

@@ -198,13 +199,13 @@ && getThermoSystem().hasPhaseType(PhaseType.OIL)) { } /** - * * *

- * main + * main. *

* * @param args an array of {@link java.lang.String} objects */ + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { SystemInterface tempSystem = new SystemSrkEos(273.15 + 83.5, 450.0); tempSystem.addComponent("nitrogen", 0.586); diff --git a/src/main/java/neqsim/pvtsimulation/simulation/GOR.java b/src/main/java/neqsim/pvtsimulation/simulation/GOR.java index bb46db0b1..0c59d81ac 100644 --- a/src/main/java/neqsim/pvtsimulation/simulation/GOR.java +++ b/src/main/java/neqsim/pvtsimulation/simulation/GOR.java @@ -4,6 +4,7 @@ import neqsim.thermo.phase.PhaseType; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** *

@@ -100,6 +101,7 @@ && getThermoSystem().getPhase(0).getType() == PhaseType.GAS) { * * @param args an array of {@link java.lang.String} objects */ + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { SystemInterface tempSystem = new SystemSrkEos(298.0, 1.0); tempSystem.addComponent("nitrogen", 0.64); diff --git a/src/main/java/neqsim/pvtsimulation/simulation/SlimTubeSim.java b/src/main/java/neqsim/pvtsimulation/simulation/SlimTubeSim.java index c04a1ca02..a7694f52e 100644 --- a/src/main/java/neqsim/pvtsimulation/simulation/SlimTubeSim.java +++ b/src/main/java/neqsim/pvtsimulation/simulation/SlimTubeSim.java @@ -6,6 +6,7 @@ import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; import neqsim.thermodynamicoperations.ThermodynamicOperations; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** *

@@ -214,6 +215,7 @@ public void run() { * * @param args an array of {@link java.lang.String} objects */ + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { SystemInterface gasSystem = new SystemSrkEos(298.0, 200.0); gasSystem.addComponent("CO2", 10.0); diff --git a/src/main/java/neqsim/pvtsimulation/simulation/SwellingTest.java b/src/main/java/neqsim/pvtsimulation/simulation/SwellingTest.java index 87e397194..037f3f741 100644 --- a/src/main/java/neqsim/pvtsimulation/simulation/SwellingTest.java +++ b/src/main/java/neqsim/pvtsimulation/simulation/SwellingTest.java @@ -4,6 +4,7 @@ import org.apache.logging.log4j.Logger; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** *

@@ -109,6 +110,7 @@ public void runCalc() { * * @param args an array of {@link java.lang.String} objects */ + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { SystemInterface oilSystem = new SystemSrkEos(298.0, 50); oilSystem.addComponent("methane", 5.01); diff --git a/src/main/java/neqsim/pvtsimulation/simulation/ViscositySim.java b/src/main/java/neqsim/pvtsimulation/simulation/ViscositySim.java index 2e55dd3ea..5c61c3774 100644 --- a/src/main/java/neqsim/pvtsimulation/simulation/ViscositySim.java +++ b/src/main/java/neqsim/pvtsimulation/simulation/ViscositySim.java @@ -9,6 +9,7 @@ import neqsim.statistics.parameterfitting.nonlinearparameterfitting.LevenbergMarquardt; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** *

@@ -142,6 +143,7 @@ public void runCalc() { * @param args an array of {@link java.lang.String} objects */ @SuppressWarnings("unused") + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { SystemInterface tempSystem = new SystemSrkEos(298.0, 10.0); // tempSystem.addComponent("n-heptane", 6.78); diff --git a/src/main/java/neqsim/pvtsimulation/simulation/ViscosityWaxOilSim.java b/src/main/java/neqsim/pvtsimulation/simulation/ViscosityWaxOilSim.java index 2b2d543b5..6e9ac7d5b 100644 --- a/src/main/java/neqsim/pvtsimulation/simulation/ViscosityWaxOilSim.java +++ b/src/main/java/neqsim/pvtsimulation/simulation/ViscosityWaxOilSim.java @@ -9,6 +9,7 @@ import neqsim.statistics.parameterfitting.nonlinearparameterfitting.LevenbergMarquardt; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** *

@@ -154,6 +155,7 @@ public void runCalc() { * @param args an array of {@link java.lang.String} objects */ @SuppressWarnings("unused") + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { SystemInterface tempSystem = new SystemSrkEos(298.0, 10.0); // tempSystem.addComponent("n-heptane", 6.78); diff --git a/src/main/java/neqsim/pvtsimulation/simulation/WaxFractionSim.java b/src/main/java/neqsim/pvtsimulation/simulation/WaxFractionSim.java index 8b71d5321..7cccca857 100644 --- a/src/main/java/neqsim/pvtsimulation/simulation/WaxFractionSim.java +++ b/src/main/java/neqsim/pvtsimulation/simulation/WaxFractionSim.java @@ -8,6 +8,7 @@ import neqsim.statistics.parameterfitting.SampleValue; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; +import neqsim.util.ExcludeFromJacocoGeneratedReport; import neqsim.util.database.NeqSimDataBase; /** @@ -149,6 +150,7 @@ public void runCalc() { * * @param args an array of {@link java.lang.String} objects */ + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { NeqSimDataBase.setConnectionString( "jdbc:derby:C:/Users/esol/OneDrive - Equinor/temp/neqsimthermodatabase"); diff --git a/src/main/java/neqsim/pvtsimulation/util/parameterfitting/TestFitToOilFieldFluid.java b/src/main/java/neqsim/pvtsimulation/util/parameterfitting/TestFitToOilFieldFluid.java index 0ba007ef6..4bd897907 100644 --- a/src/main/java/neqsim/pvtsimulation/util/parameterfitting/TestFitToOilFieldFluid.java +++ b/src/main/java/neqsim/pvtsimulation/util/parameterfitting/TestFitToOilFieldFluid.java @@ -8,6 +8,7 @@ import neqsim.statistics.parameterfitting.nonlinearparameterfitting.LevenbergMarquardt; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** *

@@ -27,6 +28,7 @@ public class TestFitToOilFieldFluid { * * @param args an array of {@link java.lang.String} objects */ + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { ArrayList sampleList = new ArrayList(); diff --git a/src/main/java/neqsim/pvtsimulation/util/parameterfitting/TestSaturationPresFunction.java b/src/main/java/neqsim/pvtsimulation/util/parameterfitting/TestSaturationPresFunction.java index c794a7cfe..334df2a26 100644 --- a/src/main/java/neqsim/pvtsimulation/util/parameterfitting/TestSaturationPresFunction.java +++ b/src/main/java/neqsim/pvtsimulation/util/parameterfitting/TestSaturationPresFunction.java @@ -8,6 +8,7 @@ import neqsim.statistics.parameterfitting.nonlinearparameterfitting.LevenbergMarquardt; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** *

@@ -27,6 +28,7 @@ public class TestSaturationPresFunction { * * @param args an array of {@link java.lang.String} objects */ + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { ArrayList sampleList = new ArrayList(); diff --git a/src/main/java/neqsim/pvtsimulation/util/parameterfitting/TestWaxTuning.java b/src/main/java/neqsim/pvtsimulation/util/parameterfitting/TestWaxTuning.java index be7af60eb..5cefe5f6f 100644 --- a/src/main/java/neqsim/pvtsimulation/util/parameterfitting/TestWaxTuning.java +++ b/src/main/java/neqsim/pvtsimulation/util/parameterfitting/TestWaxTuning.java @@ -8,6 +8,7 @@ import neqsim.statistics.parameterfitting.nonlinearparameterfitting.LevenbergMarquardt; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** *

@@ -27,6 +28,7 @@ public class TestWaxTuning { * * @param args an array of {@link java.lang.String} objects */ + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { ArrayList sampleList = new ArrayList(); 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 2412d8835..58e48696d 100644 --- a/src/main/java/neqsim/standards/oilquality/Standard_ASTM_D6377.java +++ b/src/main/java/neqsim/standards/oilquality/Standard_ASTM_D6377.java @@ -6,6 +6,7 @@ import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; import neqsim.thermodynamicoperations.ThermodynamicOperations; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** *

@@ -202,6 +203,7 @@ public void setReferenceTemperature(double refTemp, String refTempUnit) { * * @param args an array of {@link java.lang.String} objects */ + @ExcludeFromJacocoGeneratedReport public static void main(String args[]) { SystemInterface testSystem = new SystemSrkEos(273.15 + 2.0, 1.0); testSystem.addComponent("methane", 0.0006538); diff --git a/src/main/java/neqsim/statistics/experimentalsamplecreation/readdatafromfile/DataReader.java b/src/main/java/neqsim/statistics/experimentalsamplecreation/readdatafromfile/DataReader.java index d0d6dd2e0..e42ccd81e 100644 --- a/src/main/java/neqsim/statistics/experimentalsamplecreation/readdatafromfile/DataReader.java +++ b/src/main/java/neqsim/statistics/experimentalsamplecreation/readdatafromfile/DataReader.java @@ -11,6 +11,7 @@ import java.util.StringTokenizer; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** *

@@ -92,6 +93,7 @@ public ArrayList getSampleObjectList() { * @param args an array of {@link java.lang.String} objects */ @SuppressWarnings("unused") + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { DataReader reader = new DataReader("31011222"); } 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 d4ea0db39..8c67be761 100644 --- a/src/main/java/neqsim/statistics/experimentalsamplecreation/readdatafromfile/wettedwallcolumnreader/WettedWallDataReader.java +++ b/src/main/java/neqsim/statistics/experimentalsamplecreation/readdatafromfile/wettedwallcolumnreader/WettedWallDataReader.java @@ -11,6 +11,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import neqsim.statistics.experimentalsamplecreation.readdatafromfile.DataReader; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** *

@@ -98,6 +99,7 @@ public void readData() { * * @param args an array of {@link java.lang.String} objects */ + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { WettedWallDataReader reader = new WettedWallDataReader("31011222"); int i = 0; diff --git a/src/main/java/neqsim/statistics/experimentalsamplecreation/samplecreator/wettedwallcolumnsamplecreator/WettedWallColumnSampleCreator.java b/src/main/java/neqsim/statistics/experimentalsamplecreation/samplecreator/wettedwallcolumnsamplecreator/WettedWallColumnSampleCreator.java index 0428c1dfb..c340851c2 100644 --- a/src/main/java/neqsim/statistics/experimentalsamplecreation/samplecreator/wettedwallcolumnsamplecreator/WettedWallColumnSampleCreator.java +++ b/src/main/java/neqsim/statistics/experimentalsamplecreation/samplecreator/wettedwallcolumnsamplecreator/WettedWallColumnSampleCreator.java @@ -16,6 +16,7 @@ import neqsim.thermo.ThermodynamicConstantsInterface; import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** *

@@ -205,6 +206,7 @@ public void calcdPdt() { * * @param args an array of {@link java.lang.String} objects */ + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { WettedWallColumnSampleCreator creator = new WettedWallColumnSampleCreator("31011250"); ExperimentalEquipmentData eq = new WettedWallColumnData(0.025, 1.48, 4.9); diff --git a/src/main/java/neqsim/statistics/parameterfitting/nonlinearparameterfitting/LevenbergMarquardt.java b/src/main/java/neqsim/statistics/parameterfitting/nonlinearparameterfitting/LevenbergMarquardt.java index 335d3778a..b7bd6efc8 100644 --- a/src/main/java/neqsim/statistics/parameterfitting/nonlinearparameterfitting/LevenbergMarquardt.java +++ b/src/main/java/neqsim/statistics/parameterfitting/nonlinearparameterfitting/LevenbergMarquardt.java @@ -8,6 +8,7 @@ import Jama.Matrix; import neqsim.statistics.parameterfitting.StatisticsBaseClass; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** *

@@ -120,6 +121,7 @@ public void solve() { * * @param args an array of {@link java.lang.String} objects */ + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { /* * LevenbergMarquardt optim = new LevenbergMarquardt(); TestFunction testFunction = new diff --git a/src/main/java/neqsim/thermo/Fluid.java b/src/main/java/neqsim/thermo/Fluid.java index d89bb48c1..45a93ffbb 100644 --- a/src/main/java/neqsim/thermo/Fluid.java +++ b/src/main/java/neqsim/thermo/Fluid.java @@ -2,6 +2,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** *

@@ -271,6 +272,7 @@ public void addComponment(String name) { * * @param args an array of {@link java.lang.String} objects */ + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { neqsim.thermo.Fluid fluidCreator = new neqsim.thermo.Fluid(); diff --git a/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermInterface.java b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermInterface.java index da96f8890..0f8ddec50 100644 --- a/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermInterface.java +++ b/src/main/java/neqsim/thermo/component/attractiveeosterm/AttractiveTermInterface.java @@ -120,5 +120,10 @@ public interface AttractiveTermInterface extends Cloneable, java.io.Serializable */ public AttractiveTermInterface clone(); + /** + *

getm.

+ * + * @return a double + */ public double getm(); } diff --git a/src/main/java/neqsim/thermo/phase/PhaseGE.java b/src/main/java/neqsim/thermo/phase/PhaseGE.java index 875d89d0c..95e68862f 100644 --- a/src/main/java/neqsim/thermo/phase/PhaseGE.java +++ b/src/main/java/neqsim/thermo/phase/PhaseGE.java @@ -51,10 +51,10 @@ public PhaseGE() { * @param beta a double * @param numberOfComponents a int * @param pt the PhaseType of the phase - * @param phase a int + * @param phaseNum a int */ public void init(double temperature, double pressure, double totalNumberOfMoles, double beta, - int numberOfComponents, PhaseType pt, int phase) { + int numberOfComponents, PhaseType pt, int phaseNum) { if (totalNumberOfMoles <= 0) { // todo: throw this exception? /* diff --git a/src/main/java/neqsim/thermo/phase/PhasePCSAFT.java b/src/main/java/neqsim/thermo/phase/PhasePCSAFT.java index f9d1ccb24..a8a34e14c 100644 --- a/src/main/java/neqsim/thermo/phase/PhasePCSAFT.java +++ b/src/main/java/neqsim/thermo/phase/PhasePCSAFT.java @@ -83,8 +83,7 @@ public class PhasePCSAFT extends PhaseSrkEos { * Constructor for PhasePCSAFT. *

*/ - public PhasePCSAFT() { - } + public PhasePCSAFT() {} /** {@inheritDoc} */ @Override @@ -1113,16 +1112,16 @@ public double getF2dispZHCdm() { * @param temperature a double * @param A a double * @param B a double - * @param phase a int + * @param phaseNum a int * @return a double * @throws neqsim.util.exception.IsNaNException if any. * @throws neqsim.util.exception.TooManyIterationsException if any. */ - public double molarVolume22(double pressure, double temperature, double A, double B, int phase) + public double molarVolume22(double pressure, double temperature, double A, double B, int phaseNum) throws neqsim.util.exception.IsNaNException, neqsim.util.exception.TooManyIterationsException { double volume = - phase == 0 ? getB() / (2.0 / (2.0 + temperature / getPseudoCriticalTemperature())) + phaseNum == 0 ? getB() / (2.0 / (2.0 + temperature / getPseudoCriticalTemperature())) : (numberOfMolesInPhase * temperature * R) / pressure; setMolarVolume(volume / numberOfMolesInPhase); double oldMolarVolume = 0; diff --git a/src/main/java/neqsim/thermo/system/SystemInterface.java b/src/main/java/neqsim/thermo/system/SystemInterface.java index 54d0d1856..165beb286 100644 --- a/src/main/java/neqsim/thermo/system/SystemInterface.java +++ b/src/main/java/neqsim/thermo/system/SystemInterface.java @@ -188,10 +188,10 @@ public default void addComponents(String[] names, double[] moles) { *

* * @param addSystem a {@link neqsim.thermo.system.SystemInterface} object - * @param phase phase number of phase to add fluid to + * @param phaseNum phase number of phase to add fluid to * @return SystemInterface */ - public SystemInterface addFluid(SystemInterface addSystem, int phase); + public SystemInterface addFluid(SystemInterface addSystem, int phaseNum); /** *

@@ -1412,10 +1412,10 @@ public default int getPhaseNumberOfPhase(String phaseTypeName) { *

* * @param prop a {@link java.lang.String} object - * @param phase a int + * @param phaseNum a int * @return a double */ - public double getProperty(String prop, int phase); + public double getProperty(String prop, int phaseNum); /** *

@@ -1424,10 +1424,10 @@ public default int getPhaseNumberOfPhase(String phaseTypeName) { * * @param prop a {@link java.lang.String} object * @param compName a {@link java.lang.String} object - * @param phase a int + * @param phaseNum a int * @return a double */ - public double getProperty(String prop, String compName, int phase); + public double getProperty(String prop, String compName, int phaseNum); /** *

@@ -1704,9 +1704,9 @@ public default void init() { * density, fugacities and Z-factor 2: 1 + calculation of enthalpy, entropy, Cp, Cv, and * most other thermodynamic properties 3: 1+2 + Calculation of composition derivatives of * fugacity coefficients. - * @param phase a int + * @param phaseNum a int */ - public void init(int number, int phase); + public void init(int number, int phaseNum); /** *

@@ -2113,9 +2113,9 @@ public default void prettyPrint() { * setAllComponentsInPhase. *

* - * @param phase a int + * @param phaseNum a int */ - public void setAllComponentsInPhase(int phase); + public void setAllComponentsInPhase(int phaseNum); /** * Set phase type of all phases. @@ -2582,9 +2582,9 @@ public default void setPhysicalPropertyModel(int type) { * * @param model a {@link java.lang.String} object * @param val a double - * @param phase a int + * @param phaseNum a int */ - public void tuneModel(String model, double val, int phase); + public void tuneModel(String model, double val, int phaseNum); /** *

@@ -2662,5 +2662,10 @@ public default void setPhysicalPropertyModel(int type) { */ public void setForceSinglePhase(String phasetypename); + /** + *

isInitialized.

+ * + * @return a boolean + */ public boolean isInitialized(); } diff --git a/src/main/java/neqsim/thermo/system/SystemThermo.java b/src/main/java/neqsim/thermo/system/SystemThermo.java index d6df2fc94..cc38f26d1 100644 --- a/src/main/java/neqsim/thermo/system/SystemThermo.java +++ b/src/main/java/neqsim/thermo/system/SystemThermo.java @@ -107,6 +107,11 @@ public abstract class SystemThermo implements SystemInterface { // Initialization boolean isInitialized = false; + /** + *

isInitialized.

+ * + * @return a boolean + */ public boolean isInitialized() { return isInitialized; } @@ -434,7 +439,7 @@ public void addComponent(String componentName, double value, String unitName) { /** {@inheritDoc} */ @Override - public void addComponent(String componentName, double value, String name, int phase) { + public void addComponent(String componentName, double value, String name, int phaseNum) { componentName = ComponentInterface.getComponentNameFromAlias(componentName); if (!neqsim.util.database.NeqSimDataBase.hasComponent(componentName)) { @@ -459,7 +464,7 @@ public void addComponent(String componentName, double value, String name, int ph new neqsim.util.unit.RateUnit(value, name, molarmass, stddens, boilp); double SIval = unit.getSIvalue(); // System.out.println("number of moles " + SIval); - this.addComponent(componentName, SIval, phase); + this.addComponent(componentName, SIval, phaseNum); } /** {@inheritDoc} */ @@ -506,10 +511,10 @@ public SystemInterface addFluid(SystemInterface addSystem) { /** {@inheritDoc} */ @Override - public SystemInterface addFluid(SystemInterface addSystem, int phase) { + public SystemInterface addFluid(SystemInterface addSystem, int phaseNum) { for (int i = 0; i < addSystem.getPhase(0).getNumberOfComponents(); i++) { addComponent(addSystem.getPhase(0).getComponent(i).getComponentName(), - addSystem.getPhase(0).getComponent(i).getNumberOfmoles(), phase); + addSystem.getPhase(0).getComponent(i).getNumberOfmoles(), phaseNum); } return this; } @@ -2816,26 +2821,26 @@ public double getProperty(String prop) { /** {@inheritDoc} */ @Override - public double getProperty(String prop, int phase) { + public double getProperty(String prop, int phaseNum) { initPhysicalProperties(); if (prop.equals("temperature")) { - return getPhase(phase).getTemperature(); + return getPhase(phaseNum).getTemperature(); } else if (prop.equals("pressure")) { - return getPhase(phase).getPressure(); + return getPhase(phaseNum).getPressure(); } else if (prop.equals("compressibility")) { - return getPhase(phase).getZ(); + return getPhase(phaseNum).getZ(); } else if (prop.equals("density")) { - return getPhase(phase).getPhysicalProperties().getDensity(); + return getPhase(phaseNum).getPhysicalProperties().getDensity(); } else if (prop.equals("beta")) { - return getPhase(phase).getBeta(); + return getPhase(phaseNum).getBeta(); } else if (prop.equals("enthalpy")) { - return getPhase(phase).getEnthalpy(); + return getPhase(phaseNum).getEnthalpy(); } else if (prop.equals("entropy")) { - return getPhase(phase).getEntropy(); + return getPhase(phaseNum).getEntropy(); } else if (prop.equals("viscosity")) { - return getPhase(phase).getPhysicalProperties().getViscosity(); + return getPhase(phaseNum).getPhysicalProperties().getViscosity(); } else if (prop.equals("conductivity")) { - return getPhase(phase).getPhysicalProperties().getConductivity(); + return getPhase(phaseNum).getPhysicalProperties().getConductivity(); } else { return 1.0; } @@ -2843,15 +2848,15 @@ public double getProperty(String prop, int phase) { /** {@inheritDoc} */ @Override - public double getProperty(String prop, String compName, int phase) { + public double getProperty(String prop, String compName, int phaseNum) { if (prop.equals("molefraction")) { - return getPhase(phase).getComponent(compName).getx(); + return getPhase(phaseNum).getComponent(compName).getx(); } else if (prop.equals("fugacitycoefficient")) { - return getPhase(phase).getComponent(compName).getFugacityCoefficient(); + return getPhase(phaseNum).getComponent(compName).getFugacityCoefficient(); } else if (prop.equals("logfugdT")) { - return getPhase(phase).getComponent(compName).getdfugdt(); + return getPhase(phaseNum).getComponent(compName).getdfugdt(); } else if (prop.equals("logfugdP")) { - return getPhase(phase).getComponent(compName).getdfugdp(); + return getPhase(phaseNum).getComponent(compName).getdfugdp(); } else { return 1.0; } @@ -3155,11 +3160,11 @@ public void init(int type) { /** {@inheritDoc} */ @Override - public void init(int type, int phase) { + public void init(int type, int phaseNum) { if (this.numericDerivatives) { - initNumeric(type, phase); + initNumeric(type, phaseNum); } else { - initAnalytic(type, phase); + initAnalytic(type, phaseNum); } } @@ -3268,33 +3273,33 @@ public void initAnalytic(int type) { *

* * @param type a int - * @param phase a int + * @param phaseNum a int */ - public void initAnalytic(int type, int phase) { + public void initAnalytic(int type, int phaseNum) { if (type == 0) { beta[0] = 1.0; - phaseIndex[phase] = phase; + phaseIndex[phaseNum] = phaseNum; } - if (isPhase(phase)) { - getPhase(phase).init(getTotalNumberOfMoles(), numberOfComponents, type, - phaseType[phaseIndex[phase]], beta[phaseIndex[phase]]); + if (isPhase(phaseNum)) { + getPhase(phaseNum).init(getTotalNumberOfMoles(), numberOfComponents, type, + phaseType[phaseIndex[phaseNum]], beta[phaseIndex[phaseNum]]); if (type > 0) { for (int j = 0; j < numberOfComponents; j++) { - getPhase(phase).getComponent(j).fugcoef(getPhase(phase)); + getPhase(phaseNum).getComponent(j).fugcoef(getPhase(phaseNum)); } } if (type > 1) { for (int j = 0; j < numberOfComponents; j++) { - getPhase(phase).getComponent(j).logfugcoefdT(getPhase(phase)); - getPhase(phase).getComponent(j).logfugcoefdP(getPhase(phase)); + getPhase(phaseNum).getComponent(j).logfugcoefdT(getPhase(phaseNum)); + getPhase(phaseNum).getComponent(j).logfugcoefdP(getPhase(phaseNum)); } } if (type > 2) { for (int j = 0; j < numberOfComponents; j++) { - getPhase(phase).getComponent(j).logfugcoefdT(getPhase(phase)); - getPhase(phase).getComponent(j).logfugcoefdP(getPhase(phase)); - getPhase(phase).getComponent(j).logfugcoefdN(getPhase(phase)); + getPhase(phaseNum).getComponent(j).logfugcoefdT(getPhase(phaseNum)); + getPhase(phaseNum).getComponent(j).logfugcoefdP(getPhase(phaseNum)); + getPhase(phaseNum).getComponent(j).logfugcoefdN(getPhase(phaseNum)); } } } @@ -4874,8 +4879,8 @@ public void setTemperature(double newTemperature) { /** {@inheritDoc} */ @Override - public final void setTemperature(double newTemperature, int phase) { - getPhase(phaseIndex[phase]).setTemperature(newTemperature); + public final void setTemperature(double newTemperature, int phaseNum) { + getPhase(phaseIndex[phaseNum]).setTemperature(newTemperature); } /** {@inheritDoc} */ @@ -4967,14 +4972,14 @@ public void setUseTVasIndependentVariables(boolean useTVasIndependentVariables) /** {@inheritDoc} */ @Override - public void tuneModel(String model, double val, int phase) { + public void tuneModel(String model, double val, int phaseNum) { if (model.equals("viscosity")) { - getPhase(phase).getPhysicalProperties().getViscosityModel().tuneModel(val, - getPhase(phase).getTemperature(), getPhase(phase).getPressure()); + getPhase(phaseNum).getPhysicalProperties().getViscosityModel().tuneModel(val, + getPhase(phaseNum).getTemperature(), getPhase(phaseNum).getPressure()); for (int i = 0; i < getMaxNumberOfPhases(); i++) { for (int j = 0; j < numberOfPhases; j++) { getPhase(i).getComponent(j) - .setCriticalViscosity(getPhase(phase).getComponent(j).getCriticalViscosity()); + .setCriticalViscosity(getPhase(phaseNum).getComponent(j).getCriticalViscosity()); } } } 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 888fc98c4..156d40bcb 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 @@ -5,6 +5,7 @@ import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkCPAstatoil; import neqsim.thermodynamicoperations.ThermodynamicOperations; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** *

@@ -23,6 +24,7 @@ public class TPflash_benchmark_fullcomp { * @param args an array of {@link java.lang.String} objects */ @SuppressWarnings("unused") + @ExcludeFromJacocoGeneratedReport public static void main(String args[]) { double[][] points; diff --git a/src/main/java/neqsim/thermo/util/empiric/DuanSun.java b/src/main/java/neqsim/thermo/util/empiric/DuanSun.java index fa0d24847..80a1c75ed 100644 --- a/src/main/java/neqsim/thermo/util/empiric/DuanSun.java +++ b/src/main/java/neqsim/thermo/util/empiric/DuanSun.java @@ -6,6 +6,7 @@ import neqsim.thermo.system.SystemElectrolyteCPAstatoil; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** *

@@ -637,6 +638,7 @@ public double calcCO2solubility(double temperature, double pressure, double sali * * @param args an array of {@link java.lang.String} objects */ + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { DuanSun testDuanSun = new DuanSun(); diff --git a/src/main/java/neqsim/thermo/util/empiric/Water.java b/src/main/java/neqsim/thermo/util/empiric/Water.java index 9d4c17ec0..eab8aa7e3 100644 --- a/src/main/java/neqsim/thermo/util/empiric/Water.java +++ b/src/main/java/neqsim/thermo/util/empiric/Water.java @@ -1,5 +1,7 @@ package neqsim.thermo.util.empiric; +import neqsim.util.ExcludeFromJacocoGeneratedReport; + /** *

* Water class. @@ -46,6 +48,7 @@ public double density() { * @param args an array of {@link java.lang.String} objects */ @SuppressWarnings("unused") + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { Water testWater = new Water(); System.out.println("water density " + Water.waterDensity(273.15 + 4)); diff --git a/src/main/java/neqsim/thermo/util/gerg/DETAIL.java b/src/main/java/neqsim/thermo/util/gerg/DETAIL.java index 2d2b5dfd7..deb6020e2 100644 --- a/src/main/java/neqsim/thermo/util/gerg/DETAIL.java +++ b/src/main/java/neqsim/thermo/util/gerg/DETAIL.java @@ -3,6 +3,7 @@ import org.netlib.util.StringW; import org.netlib.util.doubleW; import org.netlib.util.intW; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** *

@@ -1509,6 +1510,7 @@ public void SetupDetail() { * @param args an array of {@link java.lang.String} objects */ @SuppressWarnings("unused") + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { DETAIL test = new DETAIL(); test.SetupDetail(); diff --git a/src/main/java/neqsim/thermo/util/gerg/GERG2008.java b/src/main/java/neqsim/thermo/util/gerg/GERG2008.java index 640d61869..6044ea53e 100644 --- a/src/main/java/neqsim/thermo/util/gerg/GERG2008.java +++ b/src/main/java/neqsim/thermo/util/gerg/GERG2008.java @@ -3,6 +3,7 @@ import org.netlib.util.StringW; import org.netlib.util.doubleW; import org.netlib.util.intW; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** *

@@ -3230,6 +3231,7 @@ public void SetupGERG() { * @param args an array of {@link java.lang.String} objects */ @SuppressWarnings("unused") + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { GERG2008 test = new GERG2008(); test.SetupGERG(); diff --git a/src/main/java/neqsim/thermo/util/gerg/NeqSimAGA8Detail.java b/src/main/java/neqsim/thermo/util/gerg/NeqSimAGA8Detail.java index 4728b99ec..65cf1c4e7 100644 --- a/src/main/java/neqsim/thermo/util/gerg/NeqSimAGA8Detail.java +++ b/src/main/java/neqsim/thermo/util/gerg/NeqSimAGA8Detail.java @@ -7,6 +7,7 @@ import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; import neqsim.thermodynamicoperations.ThermodynamicOperations; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** *

@@ -329,6 +330,7 @@ public void normalizeComposition() { * * @param args an array of {@link java.lang.String} objects */ + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { // test HitHub SystemInterface fluid1 = new SystemSrkEos(); diff --git a/src/main/java/neqsim/thermo/util/gerg/NeqSimGERG2008.java b/src/main/java/neqsim/thermo/util/gerg/NeqSimGERG2008.java index 7be99ce1a..04bb95842 100644 --- a/src/main/java/neqsim/thermo/util/gerg/NeqSimGERG2008.java +++ b/src/main/java/neqsim/thermo/util/gerg/NeqSimGERG2008.java @@ -7,6 +7,7 @@ import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; import neqsim.thermodynamicoperations.ThermodynamicOperations; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** *

@@ -337,6 +338,7 @@ public void normalizeComposition() { * * @param args an array of {@link java.lang.String} objects */ + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { // test HitHub SystemInterface fluid1 = new SystemSrkEos(); diff --git a/src/main/java/neqsim/thermo/util/jni/GERG2004EOS.java b/src/main/java/neqsim/thermo/util/jni/GERG2004EOS.java index 4d3e2a4d7..90ecd6af8 100644 --- a/src/main/java/neqsim/thermo/util/jni/GERG2004EOS.java +++ b/src/main/java/neqsim/thermo/util/jni/GERG2004EOS.java @@ -6,6 +6,8 @@ package neqsim.thermo.util.jni; +import neqsim.util.ExcludeFromJacocoGeneratedReport; + /** *

* GERG2004EOS class. @@ -499,6 +501,7 @@ public GERG2004EOS() { * @param args an array of {@link java.lang.String} objects */ @SuppressWarnings("unused") + @ExcludeFromJacocoGeneratedReport public static void main(String args[]) { GERG2004EOS gergEOS = new GERG2004EOS(); double c1 = 298.0, c2 = 0.1, c3 = 0.90, c4 = 0.1, c5 = 0, c6 = 0, c7 = 0, c8 = 0, c9 = 0, diff --git a/src/main/java/neqsim/thermo/util/referenceequations/methaneBWR32.java b/src/main/java/neqsim/thermo/util/referenceequations/methaneBWR32.java index ec45a4124..4da9394fa 100644 --- a/src/main/java/neqsim/thermo/util/referenceequations/methaneBWR32.java +++ b/src/main/java/neqsim/thermo/util/referenceequations/methaneBWR32.java @@ -1,5 +1,7 @@ package neqsim.thermo.util.referenceequations; +import neqsim.util.ExcludeFromJacocoGeneratedReport; + /** *

* methaneBWR32 class. @@ -102,6 +104,7 @@ public double molDens(double temp, double pres, boolean gas) { * @param args an array of {@link java.lang.String} objects */ @SuppressWarnings("unused") + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { methaneBWR32 testMet = new methaneBWR32(); double pres = testMet.calcPressure(0.04, 298.0); diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/CalcIonicComposition.java b/src/main/java/neqsim/thermodynamicoperations/flashops/CalcIonicComposition.java index 1c196c670..3776c9519 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/CalcIonicComposition.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/CalcIonicComposition.java @@ -33,11 +33,11 @@ public class CalcIonicComposition extends Flash { *

* * @param system a {@link neqsim.thermo.system.SystemInterface} object - * @param phase a int + * @param phaseNum a int */ - public CalcIonicComposition(SystemInterface system, int phase) { + public CalcIonicComposition(SystemInterface system, int phaseNum) { this.system = system; - phaseNumber = phase; + phaseNumber = phaseNum; } /** {@inheritDoc} */ diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/SaturateWithWater.java b/src/main/java/neqsim/thermodynamicoperations/flashops/SaturateWithWater.java index fe5e23ac5..368cc8b04 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/SaturateWithWater.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/SaturateWithWater.java @@ -6,6 +6,7 @@ import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkCPAstatoil; import neqsim.thermodynamicoperations.ThermodynamicOperations; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** *

@@ -98,6 +99,7 @@ public void run() { * * @param args an array of {@link java.lang.String} objects */ + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { SystemInterface testSystem = new SystemSrkCPAstatoil(273.15 + 70.0, 150.0); diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/TPgradientFlash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/TPgradientFlash.java index 0a5648335..f6b608a9f 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/TPgradientFlash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/TPgradientFlash.java @@ -12,6 +12,8 @@ /** * TPgradientFlash class handles thermodynamic calculations with temperature and pressure gradients. + * + * @author ASMF */ public class TPgradientFlash extends Flash { private static final long serialVersionUID = 1000; diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/TSFlash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/TSFlash.java index c0e78f14e..ef7f4e418 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/TSFlash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/TSFlash.java @@ -9,6 +9,7 @@ import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; import neqsim.thermodynamicoperations.ThermodynamicOperations; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** *

@@ -102,6 +103,7 @@ public void run() { * * @param args an array of {@link java.lang.String} objects */ + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { SystemInterface testSystem = new SystemSrkEos(373.15, 45.551793); diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/VHflashQfunc.java b/src/main/java/neqsim/thermodynamicoperations/flashops/VHflashQfunc.java index c036a4cc9..1504e1f2c 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/VHflashQfunc.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/VHflashQfunc.java @@ -5,6 +5,7 @@ import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; import neqsim.thermodynamicoperations.ThermodynamicOperations; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** *

@@ -152,6 +153,7 @@ public org.jfree.chart.JFreeChart getJFreeChart(String name) { * * @param args an array of {@link java.lang.String} objects */ + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { SystemInterface testSystem = new SystemSrkEos(273.15 + 55, 50.0); diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/VSflash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/VSflash.java index 617727e02..62a2ee746 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/VSflash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/VSflash.java @@ -3,6 +3,7 @@ import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; import neqsim.thermodynamicoperations.ThermodynamicOperations; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** *

@@ -153,6 +154,7 @@ public org.jfree.chart.JFreeChart getJFreeChart(String name) { * * @param args an array of {@link java.lang.String} objects */ + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { SystemInterface testSystem = new SystemSrkEos(273.15 + 55, 50.0); diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/VUflashQfunc.java b/src/main/java/neqsim/thermodynamicoperations/flashops/VUflashQfunc.java index e3e8ad546..081b71e0f 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/VUflashQfunc.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/VUflashQfunc.java @@ -11,6 +11,7 @@ import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; import neqsim.thermodynamicoperations.ThermodynamicOperations; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** *

@@ -158,6 +159,7 @@ public org.jfree.chart.JFreeChart getJFreeChart(String name) { * * @param args an array of {@link java.lang.String} objects */ + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { SystemInterface testSystem = new SystemSrkEos(273.15 + 55, 50.0); diff --git a/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/HydrateInhibitorConcentrationFlash.java b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/HydrateInhibitorConcentrationFlash.java index e3d5956fb..f64d2f038 100644 --- a/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/HydrateInhibitorConcentrationFlash.java +++ b/src/main/java/neqsim/thermodynamicoperations/flashops/saturationops/HydrateInhibitorConcentrationFlash.java @@ -5,6 +5,7 @@ import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkCPAstatoil; import neqsim.thermodynamicoperations.ThermodynamicOperations; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** *

@@ -95,6 +96,7 @@ public void printToFile(String name) {} * * @param args an array of {@link java.lang.String} objects */ + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { SystemInterface testSystem = new SystemSrkCPAstatoil(273.15 + 0, 100.0); diff --git a/src/main/java/neqsim/util/ExcludeFromJacocoGeneratedReport.java b/src/main/java/neqsim/util/ExcludeFromJacocoGeneratedReport.java index afadaa282..edccb1b00 100644 --- a/src/main/java/neqsim/util/ExcludeFromJacocoGeneratedReport.java +++ b/src/main/java/neqsim/util/ExcludeFromJacocoGeneratedReport.java @@ -5,6 +5,11 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +/** + *

ExcludeFromJacocoGeneratedReport class.

+ * + * @author ASMF + */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.METHOD) public @interface ExcludeFromJacocoGeneratedReport { 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 48dc2d7f7..ca77513a3 100644 --- a/src/test/java/neqsim/thermo/util/example/longman/Problem15102009LNGfreezing.java +++ b/src/test/java/neqsim/thermo/util/example/longman/Problem15102009LNGfreezing.java @@ -5,6 +5,7 @@ import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; import neqsim.thermodynamicoperations.ThermodynamicOperations; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** *

@@ -25,6 +26,7 @@ public class Problem15102009LNGfreezing { * * @param args an array of {@link java.lang.String} objects */ + @ExcludeFromJacocoGeneratedReport public static void main(String args[]) { SystemInterface testSystem = new SystemSrkEos(200, 11.44); testSystem.addComponent("methane", 100 - 33.4); 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 023b9f63a..ae7ecec59 100644 --- a/src/test/java/neqsim/thermo/util/example/longman/Problem280809LNGphaseEnvelope.java +++ b/src/test/java/neqsim/thermo/util/example/longman/Problem280809LNGphaseEnvelope.java @@ -5,6 +5,7 @@ import neqsim.thermo.system.SystemGERG2004Eos; import neqsim.thermo.system.SystemInterface; import neqsim.thermodynamicoperations.ThermodynamicOperations; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** *

@@ -25,6 +26,7 @@ public class Problem280809LNGphaseEnvelope { * * @param args an array of {@link java.lang.String} objects */ + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { SystemInterface testSystem = new SystemGERG2004Eos(230, 50.00); testSystem.addComponent("methane", 0.80); diff --git a/src/test/java/neqsim/thermodynamicoperations/util/example/CompGradientFlash.java b/src/test/java/neqsim/thermodynamicoperations/util/example/CompGradientFlash.java index efd785937..01f4b95bb 100644 --- a/src/test/java/neqsim/thermodynamicoperations/util/example/CompGradientFlash.java +++ b/src/test/java/neqsim/thermodynamicoperations/util/example/CompGradientFlash.java @@ -5,6 +5,7 @@ import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; import neqsim.thermodynamicoperations.ThermodynamicOperations; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** *

@@ -25,6 +26,7 @@ public class CompGradientFlash { * * @param args an array of {@link java.lang.String} objects */ + @ExcludeFromJacocoGeneratedReport public static void main(String args[]) { SystemInterface testSystem = new SystemSrkEos(273.15 + 0, 80.0); // 30.01325); diff --git a/src/test/java/neqsim/thermodynamicoperations/util/example/CriticalPointFlash.java b/src/test/java/neqsim/thermodynamicoperations/util/example/CriticalPointFlash.java index 24af048b3..108297e27 100644 --- a/src/test/java/neqsim/thermodynamicoperations/util/example/CriticalPointFlash.java +++ b/src/test/java/neqsim/thermodynamicoperations/util/example/CriticalPointFlash.java @@ -5,6 +5,7 @@ import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; import neqsim.thermodynamicoperations.ThermodynamicOperations; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** *

@@ -25,6 +26,7 @@ public class CriticalPointFlash { * * @param args an array of {@link java.lang.String} objects */ + @ExcludeFromJacocoGeneratedReport public static void main(String[] args) { SystemInterface testSystem = new SystemSrkEos(300, 80.01325); diff --git a/src/test/java/neqsim/thermodynamicoperations/util/example/MEGwaterComplexFlash.java b/src/test/java/neqsim/thermodynamicoperations/util/example/MEGwaterComplexFlash.java index 145496e68..b28d9ee51 100644 --- a/src/test/java/neqsim/thermodynamicoperations/util/example/MEGwaterComplexFlash.java +++ b/src/test/java/neqsim/thermodynamicoperations/util/example/MEGwaterComplexFlash.java @@ -5,6 +5,7 @@ import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkCPAstatoil; import neqsim.thermodynamicoperations.ThermodynamicOperations; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** *

@@ -25,6 +26,7 @@ public class MEGwaterComplexFlash { * * @param args an array of {@link java.lang.String} objects */ + @ExcludeFromJacocoGeneratedReport public static void main(String args[]) { SystemInterface testSystem = new SystemSrkCPAstatoil(273.15 + 50, 1.0); testSystem.addComponent("methane", 0.01); diff --git a/src/test/java/neqsim/thermodynamicoperations/util/example/OLGApropGenerator.java b/src/test/java/neqsim/thermodynamicoperations/util/example/OLGApropGenerator.java index 7e94d235d..3708fdd71 100644 --- a/src/test/java/neqsim/thermodynamicoperations/util/example/OLGApropGenerator.java +++ b/src/test/java/neqsim/thermodynamicoperations/util/example/OLGApropGenerator.java @@ -5,6 +5,7 @@ import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; import neqsim.thermodynamicoperations.ThermodynamicOperations; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** *

@@ -25,6 +26,7 @@ public class OLGApropGenerator { * * @param args an array of {@link java.lang.String} objects */ + @ExcludeFromJacocoGeneratedReport public static void main(String args[]) { SystemInterface testSystem = new SystemSrkEos(273.15, 10.0); testSystem.addComponent("nitrogen", 0.01848); diff --git a/src/test/java/neqsim/thermodynamicoperations/util/example/OLGApropGeneratorPH.java b/src/test/java/neqsim/thermodynamicoperations/util/example/OLGApropGeneratorPH.java index 7e0bd1d04..b04b41b79 100644 --- a/src/test/java/neqsim/thermodynamicoperations/util/example/OLGApropGeneratorPH.java +++ b/src/test/java/neqsim/thermodynamicoperations/util/example/OLGApropGeneratorPH.java @@ -5,6 +5,7 @@ import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; import neqsim.thermodynamicoperations.ThermodynamicOperations; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** *

@@ -25,6 +26,7 @@ public class OLGApropGeneratorPH { * * @param args an array of {@link java.lang.String} objects */ + @ExcludeFromJacocoGeneratedReport public static void main(String args[]) { SystemInterface testSystem = new SystemSrkEos(383.15, 1.0); // testSystem.addComponent("ethane", 10.0); diff --git a/src/test/java/neqsim/thermodynamicoperations/util/example/PhaseEnvelope.java b/src/test/java/neqsim/thermodynamicoperations/util/example/PhaseEnvelope.java index a3e07721a..7dcba8131 100644 --- a/src/test/java/neqsim/thermodynamicoperations/util/example/PhaseEnvelope.java +++ b/src/test/java/neqsim/thermodynamicoperations/util/example/PhaseEnvelope.java @@ -6,6 +6,7 @@ import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; import neqsim.thermodynamicoperations.ThermodynamicOperations; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /* *

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

@@ -27,6 +28,7 @@ public class PhaseEnvelope { * @param args an array of {@link java.lang.String} objects */ @SuppressWarnings("unused") + @ExcludeFromJacocoGeneratedReport public static void main(String args[]) { // String[] components=neqsim.util.database.NeqSimDataBase.getComponentNames(); diff --git a/src/test/java/neqsim/thermodynamicoperations/util/example/SolidFlash.java b/src/test/java/neqsim/thermodynamicoperations/util/example/SolidFlash.java index f348152dd..d2895a7bd 100644 --- a/src/test/java/neqsim/thermodynamicoperations/util/example/SolidFlash.java +++ b/src/test/java/neqsim/thermodynamicoperations/util/example/SolidFlash.java @@ -5,6 +5,7 @@ import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemUMRPRUMCEos; import neqsim.thermodynamicoperations.ThermodynamicOperations; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** *

@@ -25,6 +26,7 @@ public class SolidFlash { * * @param args an array of {@link java.lang.String} objects */ + @ExcludeFromJacocoGeneratedReport public static void main(String args[]) { SystemInterface testSystem = new SystemUMRPRUMCEos(273.15 - 30, 18.0); // testSystem.addComponent("nitrogen", 83.33); diff --git a/src/test/java/neqsim/thermodynamicoperations/util/example/TVflash.java b/src/test/java/neqsim/thermodynamicoperations/util/example/TVflash.java index aaba3299e..965940081 100644 --- a/src/test/java/neqsim/thermodynamicoperations/util/example/TVflash.java +++ b/src/test/java/neqsim/thermodynamicoperations/util/example/TVflash.java @@ -5,6 +5,7 @@ import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; import neqsim.thermodynamicoperations.ThermodynamicOperations; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** *

@@ -25,6 +26,7 @@ public class TVflash { * * @param args an array of {@link java.lang.String} objects */ + @ExcludeFromJacocoGeneratedReport public static void main(String args[]) { // SystemInterface testSystem2 = // util.serialization.SerializationManager.open("c:/test.fluid"); diff --git a/src/test/java/neqsim/thermodynamicoperations/util/example/VLSolidTPFLash.java b/src/test/java/neqsim/thermodynamicoperations/util/example/VLSolidTPFLash.java index 61e012341..4425a9b30 100644 --- a/src/test/java/neqsim/thermodynamicoperations/util/example/VLSolidTPFLash.java +++ b/src/test/java/neqsim/thermodynamicoperations/util/example/VLSolidTPFLash.java @@ -5,6 +5,7 @@ import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemPrEos; import neqsim.thermodynamicoperations.ThermodynamicOperations; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** *

@@ -25,6 +26,7 @@ public class VLSolidTPFLash { * * @param args an array of {@link java.lang.String} objects */ + @ExcludeFromJacocoGeneratedReport public static void main(String args[]) { SystemInterface testSystem = new SystemPrEos(208.2, 18.34); testSystem.addComponent("nitrogen", 0.379); diff --git a/src/test/java/neqsim/thermodynamicoperations/util/example/VUflash.java b/src/test/java/neqsim/thermodynamicoperations/util/example/VUflash.java index cc6918925..da8f9cdcc 100644 --- a/src/test/java/neqsim/thermodynamicoperations/util/example/VUflash.java +++ b/src/test/java/neqsim/thermodynamicoperations/util/example/VUflash.java @@ -5,6 +5,7 @@ import neqsim.thermo.system.SystemInterface; import neqsim.thermo.system.SystemSrkEos; import neqsim.thermodynamicoperations.ThermodynamicOperations; +import neqsim.util.ExcludeFromJacocoGeneratedReport; /** *

@@ -25,6 +26,7 @@ public class VUflash { * * @param args an array of {@link java.lang.String} objects */ + @ExcludeFromJacocoGeneratedReport public static void main(String args[]) { SystemInterface testSystem = new SystemSrkEos(273.15 + 15, 10.01325);