From 4cf08e4e742dbf3cb21f4df31942cbf328dca80d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=85smund=20V=C3=A5ge=20Fannemel?= <34712686+asmfstatoil@users.noreply.github.com> Date: Wed, 23 Aug 2023 09:37:03 +0200 Subject: [PATCH] refact: remove unused constructors (#815) * refact: removed unused ctors * hasRections -> hasReactions --- .../ChemicalReactionOperations.java | 21 ++++++++++++------- .../LinearProgrammingChemicalEquilibrium.java | 7 ------- .../ChemicalReactionList.java | 7 ------- .../chemicalReactions/kinetics/Kinetics.java | 12 ++++------- .../dataPresentation/SampleXYDataSource.java | 7 ------- .../heatMassTransferCalc/FluidBoundary.java | 7 ------- .../EquilibriumFluidBoundary.java | 7 ------- .../NonEquilibriumFluidBoundary.java | 7 ------- .../KrishnaStandartFilmModel.java | 7 ------- .../ReactiveFluidBoundary.java | 7 ------- .../ReactiveKrishnaStandartFilmModel.java | 7 ------- .../waxNode/WaxDepositionFlowNode.java | 7 +------ .../util/monitor/HeaterResponse.java | 7 ------- .../util/monitor/PumpResponse.java | 7 ------- .../util/monitor/SeparatorResponse.java | 7 ------- .../util/monitor/StreamResponse.java | 6 ------ .../monitor/ThreePhaseSeparatorResponse.java | 7 ------- .../neqsim/thermo/system/SystemThermo.java | 2 +- .../constants/FurstElectrolyteConstants.java | 9 ++++---- 19 files changed, 23 insertions(+), 125 deletions(-) diff --git a/src/main/java/neqsim/chemicalReactions/ChemicalReactionOperations.java b/src/main/java/neqsim/chemicalReactions/ChemicalReactionOperations.java index 10b4a533a..3c28a545a 100644 --- a/src/main/java/neqsim/chemicalReactions/ChemicalReactionOperations.java +++ b/src/main/java/neqsim/chemicalReactions/ChemicalReactionOperations.java @@ -52,13 +52,6 @@ public class ChemicalReactionOperations Kinetics kineticsSolver; LinearProgrammingChemicalEquilibrium initCalc; - /** - *
- * Constructor for ChemicalReactionOperations. - *
- */ - public ChemicalReactionOperations() {} - /** ** Constructor for ChemicalReactionOperations. @@ -67,7 +60,6 @@ public ChemicalReactionOperations() {} * @param system a {@link neqsim.thermo.system.SystemInterface} object */ public ChemicalReactionOperations(SystemInterface system) { - initCalc = new LinearProgrammingChemicalEquilibrium(); boolean newcomps = true; int old = system.getPhase(0).getNumberOfComponents(); this.system = system; @@ -292,8 +284,21 @@ public String[] getAllElements() { *
* * @return a boolean + * @deprecated Replaced by hasReactions() */ + @Deprecated public boolean hasRections() { + return this.hasReactions(); + } + + /** + *+ * hasRections. + *
+ * + * @return a boolean + */ + public boolean hasReactions() { return components.length > 0; } diff --git a/src/main/java/neqsim/chemicalReactions/chemicalEquilibriaum/LinearProgrammingChemicalEquilibrium.java b/src/main/java/neqsim/chemicalReactions/chemicalEquilibriaum/LinearProgrammingChemicalEquilibrium.java index 30ccb7e13..2cb1fce75 100644 --- a/src/main/java/neqsim/chemicalReactions/chemicalEquilibriaum/LinearProgrammingChemicalEquilibrium.java +++ b/src/main/java/neqsim/chemicalReactions/chemicalEquilibriaum/LinearProgrammingChemicalEquilibrium.java @@ -51,13 +51,6 @@ public class LinearProgrammingChemicalEquilibrium ChemicalReactionOperations operations; - /** - *- * Constructor for LinearProgrammingChemicalEquilibrium. - *
- */ - public LinearProgrammingChemicalEquilibrium() {} - /** ** Constructor for LinearProgrammingChemicalEquilibrium. diff --git a/src/main/java/neqsim/chemicalReactions/chemicalReaction/ChemicalReactionList.java b/src/main/java/neqsim/chemicalReactions/chemicalReaction/ChemicalReactionList.java index fd76986e6..44de80d17 100644 --- a/src/main/java/neqsim/chemicalReactions/chemicalReaction/ChemicalReactionList.java +++ b/src/main/java/neqsim/chemicalReactions/chemicalReaction/ChemicalReactionList.java @@ -37,13 +37,6 @@ public class ChemicalReactionList implements ThermodynamicConstantsInterface { double[][] tempReacMatrix; double[][] tempStocMatrix; - /** - *
- * Constructor for ChemicalReactionList. - *
- */ - public ChemicalReactionList() {} - /** ** readReactions. diff --git a/src/main/java/neqsim/chemicalReactions/kinetics/Kinetics.java b/src/main/java/neqsim/chemicalReactions/kinetics/Kinetics.java index ecc03c6f6..80b922cf4 100644 --- a/src/main/java/neqsim/chemicalReactions/kinetics/Kinetics.java +++ b/src/main/java/neqsim/chemicalReactions/kinetics/Kinetics.java @@ -25,13 +25,6 @@ public class Kinetics implements java.io.Serializable { double phiInfinite = 0.0; boolean isIrreversible; - /** - *
- * Constructor for Kinetics. - *
- */ - public Kinetics() {} - /** *
* Constructor for Kinetics.
@@ -62,7 +55,10 @@ public void calcKinetics() {}
*/
public double calcReacMatrix(PhaseInterface phase, PhaseInterface interPhase, int comp) {
ChemicalReaction reaction;
- double reacCoef = 0.0, irr = 0.0, ktemp = 0.0, exponent = 0.0;
+ double reacCoef = 0.0;
+ double irr = 0.0;
+ double ktemp = 0.0;
+ double exponent = 0.0;
Iterator
* Constructor for SampleXYDataSource.
diff --git a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/FluidBoundary.java b/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/FluidBoundary.java
index 2fd33b1aa..0656a2906 100644
--- a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/FluidBoundary.java
+++ b/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/FluidBoundary.java
@@ -61,13 +61,6 @@ public abstract class FluidBoundary implements FluidBoundaryInterface, java.io.S
protected double[] prandtlNumber;
protected int solverType = 0;
- /**
- *
- * Constructor for FluidBoundary.
- *
* Constructor for FluidBoundary.
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 87f1bdeb6..bdba40544 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
@@ -19,13 +19,6 @@ public class EquilibriumFluidBoundary
extends neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.FluidBoundary {
private static final long serialVersionUID = 1000;
- /**
- *
- * Constructor for EquilibriumFluidBoundary.
- *
* Constructor for EquilibriumFluidBoundary.
diff --git a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/nonEquilibriumFluidBoundary/NonEquilibriumFluidBoundary.java b/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/nonEquilibriumFluidBoundary/NonEquilibriumFluidBoundary.java
index 9e1db0eec..4458546fc 100644
--- a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/nonEquilibriumFluidBoundary/NonEquilibriumFluidBoundary.java
+++ b/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/nonEquilibriumFluidBoundary/NonEquilibriumFluidBoundary.java
@@ -26,13 +26,6 @@ public abstract class NonEquilibriumFluidBoundary
public double[][] molFractionDifference;
- /**
- *
- * Constructor for NonEquilibriumFluidBoundary.
- *
* Constructor for NonEquilibriumFluidBoundary.
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 b9a562bde..bc527dfac 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
@@ -27,13 +27,6 @@ public class KrishnaStandartFilmModel extends
Matrix redCorrectionMatrix;
Matrix betaMatrix;
- /**
- *
- * Constructor for KrishnaStandartFilmModel.
- *
* Constructor for KrishnaStandartFilmModel.
diff --git a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/nonEquilibriumFluidBoundary/filmModelBoundary/reactiveFilmModel/ReactiveFluidBoundary.java b/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/nonEquilibriumFluidBoundary/filmModelBoundary/reactiveFilmModel/ReactiveFluidBoundary.java
index fa2eb461a..1f57f0147 100644
--- a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/nonEquilibriumFluidBoundary/filmModelBoundary/reactiveFilmModel/ReactiveFluidBoundary.java
+++ b/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/nonEquilibriumFluidBoundary/filmModelBoundary/reactiveFilmModel/ReactiveFluidBoundary.java
@@ -26,13 +26,6 @@ public abstract class ReactiveFluidBoundary extends KrishnaStandartFilmModel {
public double[][] molFractionDifference;
- /**
- *
- * Constructor for ReactiveFluidBoundary.
- *
* Constructor for ReactiveFluidBoundary.
diff --git a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/nonEquilibriumFluidBoundary/filmModelBoundary/reactiveFilmModel/ReactiveKrishnaStandartFilmModel.java b/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/nonEquilibriumFluidBoundary/filmModelBoundary/reactiveFilmModel/ReactiveKrishnaStandartFilmModel.java
index b65f1e4f9..eee40422b 100644
--- a/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/nonEquilibriumFluidBoundary/filmModelBoundary/reactiveFilmModel/ReactiveKrishnaStandartFilmModel.java
+++ b/src/main/java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/nonEquilibriumFluidBoundary/filmModelBoundary/reactiveFilmModel/ReactiveKrishnaStandartFilmModel.java
@@ -26,13 +26,6 @@ public class ReactiveKrishnaStandartFilmModel extends KrishnaStandartFilmModel {
int enhancementType = 1;
- /**
- *
- * Constructor for ReactiveKrishnaStandartFilmModel.
- *
* Constructor for ReactiveKrishnaStandartFilmModel.
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 cfbeb3850..7a7eb9444 100644
--- a/src/main/java/neqsim/fluidMechanics/flowNode/multiPhaseNode/waxNode/WaxDepositionFlowNode.java
+++ b/src/main/java/neqsim/fluidMechanics/flowNode/multiPhaseNode/waxNode/WaxDepositionFlowNode.java
@@ -60,12 +60,7 @@ public WaxDepositionFlowNode(SystemInterface system, GeometryDefinitionInterface
*/
public WaxDepositionFlowNode(SystemInterface system, SystemInterface interphaseSystem,
GeometryDefinitionInterface pipe) {
- super(system, pipe);
- this.flowNodeType = "wax deposition node";
- this.interphaseTransportCoefficient = new InterphaseStratifiedFlow(this);
- this.fluidBoundary =
- new neqsim.fluidMechanics.flowNode.fluidBoundary.heatMassTransferCalc.nonEquilibriumFluidBoundary.filmModelBoundary.KrishnaStandartFilmModel(
- this);
+ this(system, pipe);
}
/** {@inheritDoc} */
diff --git a/src/main/java/neqsim/processSimulation/util/monitor/HeaterResponse.java b/src/main/java/neqsim/processSimulation/util/monitor/HeaterResponse.java
index fde87bc08..283ba84cb 100644
--- a/src/main/java/neqsim/processSimulation/util/monitor/HeaterResponse.java
+++ b/src/main/java/neqsim/processSimulation/util/monitor/HeaterResponse.java
@@ -17,13 +17,6 @@ public class HeaterResponse {
public Double dischargeTemperature;
public Double duty;
- /**
- *
- * Constructor for HeaterResponse.
- *
* Constructor for HeaterResponse.
diff --git a/src/main/java/neqsim/processSimulation/util/monitor/PumpResponse.java b/src/main/java/neqsim/processSimulation/util/monitor/PumpResponse.java
index 677826920..b33c98f31 100644
--- a/src/main/java/neqsim/processSimulation/util/monitor/PumpResponse.java
+++ b/src/main/java/neqsim/processSimulation/util/monitor/PumpResponse.java
@@ -29,13 +29,6 @@ public class PumpResponse {
public Double massflow;
public Integer speed;
- /**
- *
- * Constructor for PumpResponse.
- *
* Constructor for PumpResponse.
diff --git a/src/main/java/neqsim/processSimulation/util/monitor/SeparatorResponse.java b/src/main/java/neqsim/processSimulation/util/monitor/SeparatorResponse.java
index 756230a71..b8510364c 100644
--- a/src/main/java/neqsim/processSimulation/util/monitor/SeparatorResponse.java
+++ b/src/main/java/neqsim/processSimulation/util/monitor/SeparatorResponse.java
@@ -17,13 +17,6 @@ public class SeparatorResponse {
public Double massflow;
public Fluid gasFluid, liquidFluid, oilFluid, waterFluid;
- /**
- *
- * Constructor for SeparatorResponse.
- *
* Constructor for SeparatorResponse.
diff --git a/src/main/java/neqsim/processSimulation/util/monitor/StreamResponse.java b/src/main/java/neqsim/processSimulation/util/monitor/StreamResponse.java
index 113f47053..fea4ade7d 100644
--- a/src/main/java/neqsim/processSimulation/util/monitor/StreamResponse.java
+++ b/src/main/java/neqsim/processSimulation/util/monitor/StreamResponse.java
@@ -21,12 +21,6 @@ public class StreamResponse {
public Double massflowOil;
public Double massflowAqueous;
- /**
- * Constructor for StreamResponse. Constructor for StreamResponse.
- * Constructor for ThreePhaseSeparatorResponse.
- *
* Constructor for ThreePhaseSeparatorResponse.
diff --git a/src/main/java/neqsim/thermo/system/SystemThermo.java b/src/main/java/neqsim/thermo/system/SystemThermo.java
index b4ea48097..a59ab638f 100644
--- a/src/main/java/neqsim/thermo/system/SystemThermo.java
+++ b/src/main/java/neqsim/thermo/system/SystemThermo.java
@@ -2269,7 +2269,7 @@ public void setPhysicalPropertyModel(int type) {
@Override
public void chemicalReactionInit() {
chemicalReactionOperations = new ChemicalReactionOperations(this);
- chemicalSystem = chemicalReactionOperations.hasRections();
+ chemicalSystem = chemicalReactionOperations.hasReactions();
}
/** {@inheritDoc} */
diff --git a/src/main/java/neqsim/thermo/util/constants/FurstElectrolyteConstants.java b/src/main/java/neqsim/thermo/util/constants/FurstElectrolyteConstants.java
index 5bf1bae41..0a960a4ae 100644
--- a/src/main/java/neqsim/thermo/util/constants/FurstElectrolyteConstants.java
+++ b/src/main/java/neqsim/thermo/util/constants/FurstElectrolyteConstants.java
@@ -14,7 +14,7 @@
* @author esol
* @version $Id: $Id
*/
-public class FurstElectrolyteConstants implements java.io.Serializable {
+public final class FurstElectrolyteConstants implements java.io.Serializable {
private static final long serialVersionUID = 1000;
// public static double[] furstParams = {0.0982e-6, 7.003e-6, 77.22e-6,
@@ -50,12 +50,11 @@ public class FurstElectrolyteConstants implements java.io.Serializable {
// 0.0000001880, 0.0000014139, 0.0000284666, 0.0000389043, -0.0000000451,
// 0.0000088136
+
/**
- *
- * Constructor for FurstElectrolyteConstants.
- *