Remove static variables (#513)

* removed static variables from gerg * removed more static variables in fluid creator * removed static variable from cricondebar calc * removed static variables
equinor · Aug 27, 2022 · 26ddd27 · 26ddd27
1 parent ffe027c
commit 26ddd27
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 49 deletions.
diff --git a/src/main/java/neqsim/processSimulation/measurementDevice/CricondenbarAnalyser.java b/src/main/java/neqsim/processSimulation/measurementDevice/CricondenbarAnalyser.java
@@ -17,11 +17,6 @@
 public class CricondenbarAnalyser extends MeasurementDeviceBaseClass {
   private static final long serialVersionUID = 1000;
   static Logger logger = LogManager.getLogger(CricondenbarAnalyser.class);
-
-  protected int streamNumber = 0;
-
-  /** Constant <code>numberOfStreams=0</code>. */
-  protected static int numberOfStreams = 0;
   protected StreamInterface stream = null;
 
   /**
@@ -40,8 +35,6 @@ public CricondenbarAnalyser() {}
    */
   public CricondenbarAnalyser(StreamInterface stream) {
     this.stream = stream;
-    numberOfStreams++;
-    streamNumber = numberOfStreams;
     unit = "K";
     setConditionAnalysisMaxDeviation(1.0);
   }

diff --git a/...ava/neqsim/processSimulation/measurementDevice/HydrateEquilibriumTemperatureAnalyser.java b/...ava/neqsim/processSimulation/measurementDevice/HydrateEquilibriumTemperatureAnalyser.java
@@ -17,10 +17,6 @@
 public class HydrateEquilibriumTemperatureAnalyser extends MeasurementDeviceBaseClass {
   private static final long serialVersionUID = 1000;
   static Logger logger = LogManager.getLogger(HydrateEquilibriumTemperatureAnalyser.class);
-
-  protected int streamNumber = 0;
-  /** Constant <code>numberOfStreams=0</code> */
-  protected static int numberOfStreams = 0;
   protected StreamInterface stream = null;
   private double referencePressure = 0;
 
@@ -40,8 +36,6 @@ public HydrateEquilibriumTemperatureAnalyser() {}
    */
   public HydrateEquilibriumTemperatureAnalyser(StreamInterface stream) {
     this.stream = stream;
-    numberOfStreams++;
-    streamNumber = numberOfStreams;
     unit = "K";
     setConditionAnalysisMaxDeviation(1.0);
   }

diff --git a/src/main/java/neqsim/processSimulation/measurementDevice/MolarMassAnalyser.java b/src/main/java/neqsim/processSimulation/measurementDevice/MolarMassAnalyser.java
@@ -12,10 +12,6 @@
  */
 public class MolarMassAnalyser extends MeasurementDeviceBaseClass {
     private static final long serialVersionUID = 1000;
-
-    protected int streamNumber = 0;
-    /** Constant <code>numberOfStreams=0</code> */
-    protected static int numberOfStreams = 0;
     protected StreamInterface stream = null;
 
     /**
@@ -39,8 +35,6 @@ public MolarMassAnalyser() {
     public MolarMassAnalyser(StreamInterface stream) {
         this();
         this.stream = stream;
-        numberOfStreams++;
-        streamNumber = numberOfStreams;
     }
 
     /** {@inheritDoc} */

diff --git a/src/main/java/neqsim/processSimulation/measurementDevice/PressureTransmitter.java b/src/main/java/neqsim/processSimulation/measurementDevice/PressureTransmitter.java
@@ -12,10 +12,6 @@
  */
 public class PressureTransmitter extends MeasurementDeviceBaseClass {
     private static final long serialVersionUID = 1000;
-
-    protected int streamNumber = 0;
-    /** Constant <code>numberOfStreams=0</code> */
-    protected static int numberOfStreams = 0;
     protected StreamInterface stream = null;
 
     /**
@@ -39,8 +35,6 @@ public PressureTransmitter() {
     public PressureTransmitter(StreamInterface stream) {
         this();
         this.stream = stream;
-        numberOfStreams++;
-        streamNumber = numberOfStreams;
     }
 
     /** {@inheritDoc} */

diff --git a/src/main/java/neqsim/processSimulation/measurementDevice/TemperatureTransmitter.java b/src/main/java/neqsim/processSimulation/measurementDevice/TemperatureTransmitter.java
@@ -18,10 +18,6 @@
  */
 public class TemperatureTransmitter extends MeasurementDeviceBaseClass {
     private static final long serialVersionUID = 1000;
-
-    protected int streamNumber = 0;
-    /** Constant <code>numberOfStreams=0</code> */
-    protected static int numberOfStreams = 0;
     protected StreamInterface stream = null;
 
     public TemperatureTransmitter() {
@@ -40,8 +36,6 @@ public TemperatureTransmitter() {
     public TemperatureTransmitter(StreamInterface stream) {
         this();
         this.stream = stream;
-        numberOfStreams++;
-        streamNumber = numberOfStreams;
     }
 
     /** {@inheritDoc} */

diff --git a/src/main/java/neqsim/processSimulation/measurementDevice/VolumeFlowTransmitter.java b/src/main/java/neqsim/processSimulation/measurementDevice/VolumeFlowTransmitter.java
@@ -12,10 +12,6 @@
  */
 public class VolumeFlowTransmitter extends MeasurementDeviceBaseClass {
     private static final long serialVersionUID = 1000;
-
-    protected int streamNumber = 0;
-    /** Constant <code>numberOfStreams=0</code> */
-    protected static int numberOfStreams = 0;
     protected StreamInterface stream = null;
     private int measuredPhaseNumber = 0;
 
@@ -36,8 +32,6 @@ public VolumeFlowTransmitter() {}
      */
     public VolumeFlowTransmitter(StreamInterface stream) {
         this.stream = stream;
-        numberOfStreams++;
-        streamNumber = numberOfStreams;
         name = "volume flow rate";
         unit = "m^3/hr";
     }

diff --git a/src/main/java/neqsim/processSimulation/measurementDevice/WaterContentAnalyser.java b/src/main/java/neqsim/processSimulation/measurementDevice/WaterContentAnalyser.java
@@ -12,10 +12,6 @@
  */
 public class WaterContentAnalyser extends MeasurementDeviceBaseClass {
     private static final long serialVersionUID = 1000;
-
-    protected int streamNumber = 0;
-    /** Constant <code>numberOfStreams=0</code> */
-    protected static int numberOfStreams = 0;
     protected StreamInterface stream = null;
 
     /**
@@ -35,8 +31,6 @@ public WaterContentAnalyser() {}
      */
     public WaterContentAnalyser(StreamInterface stream) {
         this.stream = stream;
-        numberOfStreams++;
-        streamNumber = numberOfStreams;
         name = "water analyser";
         unit = "kg/day";
     }

diff --git a/src/main/java/neqsim/processSimulation/measurementDevice/WaterDewPointAnalyser.java b/src/main/java/neqsim/processSimulation/measurementDevice/WaterDewPointAnalyser.java
@@ -18,10 +18,6 @@
 public class WaterDewPointAnalyser extends MeasurementDeviceBaseClass {
   private static final long serialVersionUID = 1000;
   static Logger logger = LogManager.getLogger(WaterDewPointAnalyser.class);
-
-  protected int streamNumber = 0;
-  /** Constant <code>numberOfStreams=0</code> */
-  protected static int numberOfStreams = 0;
   protected StreamInterface stream = null;
   private double referencePressure = 70.0;
   private String method = "Bukacek";
@@ -42,8 +38,6 @@ public WaterDewPointAnalyser() {}
    */
   public WaterDewPointAnalyser(StreamInterface stream) {
     this.stream = stream;
-    numberOfStreams++;
-    streamNumber = numberOfStreams;
     unit = "K";
     setConditionAnalysisMaxDeviation(1.0);
   }