Refact fluidmechanics (#502)

* refact: autoformatting and fixing style warnings
equinor · Jul 24, 2022 · b9091fb · b9091fb
1 parent 612d650
commit b9091fb
Show file tree

Hide file tree

Showing 31 changed files with 135 additions and 136 deletions.
diff --git a/src/main/java/neqsim/fluidMechanics/flowNode/FlowNode.java b/src/main/java/neqsim/fluidMechanics/flowNode/FlowNode.java
@@ -227,8 +227,8 @@ public FlowNode clone() {
     FlowNode clonedSystem = null;
     try {
       clonedSystem = (FlowNode) super.clone();
-    } catch (Exception e) {
-      e.printStackTrace(System.err);
+    } catch (Exception ex) {
+      ex.printStackTrace();
     }
 
     clonedSystem.bulkSystem = bulkSystem.clone();

diff --git a/...java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/FluidBoundary.java b/...java/neqsim/fluidMechanics/flowNode/fluidBoundary/heatMassTransferCalc/FluidBoundary.java
@@ -143,8 +143,8 @@ public FluidBoundary clone() {
 
     try {
       clonedSystem = (FluidBoundary) super.clone();
-    } catch (Exception e) {
-      e.printStackTrace(System.err);
+    } catch (Exception ex) {
+      ex.printStackTrace();
     }
 
     clonedSystem.interphaseSystem = interphaseSystem.clone();

diff --git a/...oundary/heatMassTransferCalc/nonEquilibriumFluidBoundary/NonEquilibriumFluidBoundary.java b/...oundary/heatMassTransferCalc/nonEquilibriumFluidBoundary/NonEquilibriumFluidBoundary.java
@@ -104,8 +104,8 @@ public NonEquilibriumFluidBoundary clone() {
 
     try {
       clonedSystem = (NonEquilibriumFluidBoundary) super.clone();
-    } catch (Exception e) {
-      e.printStackTrace(System.err);
+    } catch (Exception ex) {
+      ex.printStackTrace();
     }
 
     return clonedSystem;

diff --git a/...sTransferCalc/nonEquilibriumFluidBoundary/filmModelBoundary/KrishnaStandartFilmModel.java b/...sTransferCalc/nonEquilibriumFluidBoundary/filmModelBoundary/KrishnaStandartFilmModel.java
@@ -82,8 +82,8 @@ public KrishnaStandartFilmModel clone() {
 
     try {
       clonedSystem = (KrishnaStandartFilmModel) super.clone();
-    } catch (Exception e) {
-      e.printStackTrace(System.err);
+    } catch (Exception ex) {
+      ex.printStackTrace();
     }
 
     return clonedSystem;

diff --git a/...onEquilibriumFluidBoundary/filmModelBoundary/reactiveFilmModel/ReactiveFluidBoundary.java b/...onEquilibriumFluidBoundary/filmModelBoundary/reactiveFilmModel/ReactiveFluidBoundary.java
@@ -91,8 +91,8 @@ public ReactiveFluidBoundary clone() {
 
     try {
       clonedSystem = (ReactiveFluidBoundary) super.clone();
-    } catch (Exception e) {
-      e.printStackTrace(System.err);
+    } catch (Exception ex) {
+      ex.printStackTrace();
     }
 
     return clonedSystem;

diff --git a/src/main/java/neqsim/fluidMechanics/flowNode/multiPhaseNode/MultiPhaseFlowNode.java b/src/main/java/neqsim/fluidMechanics/flowNode/multiPhaseNode/MultiPhaseFlowNode.java
@@ -45,8 +45,8 @@ public TwoPhaseFlowNode clone() {
     TwoPhaseFlowNode clonedSystem = null;
     try {
       clonedSystem = (TwoPhaseFlowNode) super.clone();
-    } catch (Exception e) {
-      e.printStackTrace(System.err);
+    } catch (Exception ex) {
+      ex.printStackTrace();
     }
 
     return clonedSystem;

diff --git a/...ain/java/neqsim/fluidMechanics/flowNode/multiPhaseNode/waxNode/WaxDepositionFlowNode.java b/...ain/java/neqsim/fluidMechanics/flowNode/multiPhaseNode/waxNode/WaxDepositionFlowNode.java
@@ -74,8 +74,8 @@ public StratifiedFlowNode clone() {
     StratifiedFlowNode clonedSystem = null;
     try {
       clonedSystem = (StratifiedFlowNode) super.clone();
-    } catch (Exception e) {
-      e.printStackTrace(System.err);
+    } catch (Exception ex) {
+      ex.printStackTrace();
     }
 
     return clonedSystem;

diff --git a/src/main/java/neqsim/fluidMechanics/flowNode/onePhaseNode/onePhaseFlowNode.java b/src/main/java/neqsim/fluidMechanics/flowNode/onePhaseNode/onePhaseFlowNode.java
@@ -50,8 +50,8 @@ public onePhaseFlowNode clone() {
     onePhaseFlowNode clonedSystem = null;
     try {
       clonedSystem = (onePhaseFlowNode) super.clone();
-    } catch (Exception e) {
-      e.printStackTrace(System.err);
+    } catch (Exception ex) {
+      ex.printStackTrace();
     }
 
     return clonedSystem;

diff --git a/...eqsim/fluidMechanics/flowNode/onePhaseNode/onePhasePipeFlowNode/onePhasePipeFlowNode.java b/...eqsim/fluidMechanics/flowNode/onePhaseNode/onePhasePipeFlowNode/onePhasePipeFlowNode.java
@@ -50,8 +50,8 @@ public onePhasePipeFlowNode clone() {
     onePhasePipeFlowNode clonedSystem = null;
     try {
       clonedSystem = (onePhasePipeFlowNode) super.clone();
-    } catch (Exception e) {
-      e.printStackTrace(System.err);
+    } catch (Exception ex) {
+      ex.printStackTrace();
     }
     return clonedSystem;
   }

diff --git a/src/main/java/neqsim/fluidMechanics/flowNode/twoPhaseNode/TwoPhaseFlowNode.java b/src/main/java/neqsim/fluidMechanics/flowNode/twoPhaseNode/TwoPhaseFlowNode.java
@@ -55,8 +55,8 @@ public TwoPhaseFlowNode clone() {
     TwoPhaseFlowNode clonedSystem = null;
     try {
       clonedSystem = (TwoPhaseFlowNode) super.clone();
-    } catch (Exception e) {
-      e.printStackTrace(System.err);
+    } catch (Exception ex) {
+      ex.printStackTrace();
     }
 
     // clonedSystem.molarMassTransferFlux = (double[])

diff --git a/...in/java/neqsim/fluidMechanics/flowNode/twoPhaseNode/twoPhasePipeFlowNode/AnnularFlow.java b/...in/java/neqsim/fluidMechanics/flowNode/twoPhaseNode/twoPhasePipeFlowNode/AnnularFlow.java
@@ -78,8 +78,8 @@ public AnnularFlow clone() {
     AnnularFlow clonedSystem = null;
     try {
       clonedSystem = (AnnularFlow) super.clone();
-    } catch (Exception e) {
-      e.printStackTrace(System.err);
+    } catch (Exception ex) {
+      ex.printStackTrace();
     }
     return clonedSystem;
   }

diff --git a/...java/neqsim/fluidMechanics/flowNode/twoPhaseNode/twoPhasePipeFlowNode/BubbleFlowNode.java b/...java/neqsim/fluidMechanics/flowNode/twoPhaseNode/twoPhasePipeFlowNode/BubbleFlowNode.java
@@ -92,8 +92,8 @@ public BubbleFlowNode clone() {
     BubbleFlowNode clonedSystem = null;
     try {
       clonedSystem = (BubbleFlowNode) super.clone();
-    } catch (Exception e) {
-      e.printStackTrace(System.err);
+    } catch (Exception ex) {
+      ex.printStackTrace();
     }
 
     return clonedSystem;

diff --git a/...ava/neqsim/fluidMechanics/flowNode/twoPhaseNode/twoPhasePipeFlowNode/DropletFlowNode.java b/...ava/neqsim/fluidMechanics/flowNode/twoPhaseNode/twoPhasePipeFlowNode/DropletFlowNode.java
@@ -93,8 +93,8 @@ public DropletFlowNode clone() {
     DropletFlowNode clonedSystem = null;
     try {
       clonedSystem = (DropletFlowNode) super.clone();
-    } catch (Exception e) {
-      e.printStackTrace(System.err);
+    } catch (Exception ex) {
+      ex.printStackTrace();
     }
 
     return clonedSystem;

diff --git a/.../neqsim/fluidMechanics/flowNode/twoPhaseNode/twoPhasePipeFlowNode/StratifiedFlowNode.java b/.../neqsim/fluidMechanics/flowNode/twoPhaseNode/twoPhasePipeFlowNode/StratifiedFlowNode.java
@@ -72,8 +72,8 @@ public StratifiedFlowNode clone() {
     StratifiedFlowNode clonedSystem = null;
     try {
       clonedSystem = (StratifiedFlowNode) super.clone();
-    } catch (Exception e) {
-      e.printStackTrace(System.err);
+    } catch (Exception ex) {
+      ex.printStackTrace();
     }
 
     return clonedSystem;

diff --git a/...uidMechanics/flowNode/twoPhaseNode/twoPhaseReactorFlowNode/TwoPhasePackedBedFlowNode.java b/...uidMechanics/flowNode/twoPhaseNode/twoPhaseReactorFlowNode/TwoPhasePackedBedFlowNode.java
@@ -73,8 +73,8 @@ public TwoPhasePackedBedFlowNode clone() {
     TwoPhasePackedBedFlowNode clonedSystem = null;
     try {
       clonedSystem = (TwoPhasePackedBedFlowNode) super.clone();
-    } catch (Exception e) {
-      e.printStackTrace(System.err);
+    } catch (Exception ex) {
+      ex.printStackTrace();
     }
 
     return clonedSystem;

diff --git a/...uidMechanics/flowNode/twoPhaseNode/twoPhaseReactorFlowNode/TwoPhaseTrayTowerFlowNode.java b/...uidMechanics/flowNode/twoPhaseNode/twoPhaseReactorFlowNode/TwoPhaseTrayTowerFlowNode.java
@@ -73,8 +73,8 @@ public TwoPhaseTrayTowerFlowNode clone() {
     TwoPhaseTrayTowerFlowNode clonedSystem = null;
     try {
       clonedSystem = (TwoPhaseTrayTowerFlowNode) super.clone();
-    } catch (Exception e) {
-      e.printStackTrace(System.err);
+    } catch (Exception ex) {
+      ex.printStackTrace();
     }
 
     return clonedSystem;

diff --git a/.../neqsim/fluidMechanics/flowNode/twoPhaseNode/twoPhaseStirredCellNode/StirredCellNode.java b/.../neqsim/fluidMechanics/flowNode/twoPhaseNode/twoPhaseStirredCellNode/StirredCellNode.java
@@ -97,8 +97,8 @@ public StirredCellNode clone() {
     StirredCellNode clonedSystem = null;
     try {
       clonedSystem = (StirredCellNode) super.clone();
-    } catch (Exception e) {
-      e.printStackTrace(System.err);
+    } catch (Exception ex) {
+      ex.printStackTrace();
     }
 
     return clonedSystem;

diff --git a/...nics/flowSolver/onePhaseFlowSolver/onePhasePipeFlowSolver/OnePhaseFixedStaggeredGrid.java b/...nics/flowSolver/onePhaseFlowSolver/onePhasePipeFlowSolver/OnePhaseFixedStaggeredGrid.java
@@ -78,8 +78,8 @@ public OnePhaseFixedStaggeredGrid clone() {
     OnePhaseFixedStaggeredGrid clonedSystem = null;
     try {
       clonedSystem = (OnePhaseFixedStaggeredGrid) super.clone();
-    } catch (Exception e) {
-      e.printStackTrace(System.err);
+    } catch (Exception ex) {
+      ex.printStackTrace();
     }
 
     return clonedSystem;

diff --git a/...echanics/flowSolver/onePhaseFlowSolver/onePhasePipeFlowSolver/OnePhasePipeFlowSolver.java b/...echanics/flowSolver/onePhaseFlowSolver/onePhasePipeFlowSolver/OnePhasePipeFlowSolver.java
@@ -76,8 +76,8 @@ public OnePhasePipeFlowSolver clone() {
     OnePhasePipeFlowSolver clonedSystem = null;
     try {
       clonedSystem = (OnePhasePipeFlowSolver) super.clone();
-    } catch (Exception e) {
-      e.printStackTrace(System.err);
+    } catch (Exception ex) {
+      ex.printStackTrace();
     }
 
     return clonedSystem;

diff --git a/...sim/fluidMechanics/flowSolver/twoPhaseFlowSolver/stirredCellSolver/StirredCellSolver.java b/...sim/fluidMechanics/flowSolver/twoPhaseFlowSolver/stirredCellSolver/StirredCellSolver.java
@@ -85,8 +85,8 @@ public TwoPhaseFixedStaggeredGridSolver clone() {
     TwoPhaseFixedStaggeredGridSolver clonedSystem = null;
     try {
       clonedSystem = (TwoPhaseFixedStaggeredGridSolver) super.clone();
-    } catch (Exception e) {
-      e.printStackTrace(System.err);
+    } catch (Exception ex) {
+      ex.printStackTrace();
     }
     return clonedSystem;
   }

diff --git a/...lowSolver/twoPhaseFlowSolver/twoPhasePipeFlowSolver/TwoPhaseFixedStaggeredGridSolver.java b/...lowSolver/twoPhaseFlowSolver/twoPhasePipeFlowSolver/TwoPhaseFixedStaggeredGridSolver.java
@@ -83,8 +83,8 @@ public TwoPhaseFixedStaggeredGridSolver clone() {
     TwoPhaseFixedStaggeredGridSolver clonedSystem = null;
     try {
       clonedSystem = (TwoPhaseFixedStaggeredGridSolver) super.clone();
-    } catch (Exception e) {
-      e.printStackTrace(System.err);
+    } catch (Exception ex) {
+      ex.printStackTrace();
     }
     return clonedSystem;
   }

diff --git a/...echanics/flowSolver/twoPhaseFlowSolver/twoPhasePipeFlowSolver/TwoPhasePipeFlowSolver.java b/...echanics/flowSolver/twoPhaseFlowSolver/twoPhasePipeFlowSolver/TwoPhasePipeFlowSolver.java
@@ -82,8 +82,8 @@ public TwoPhasePipeFlowSolver clone() {
     TwoPhasePipeFlowSolver clonedSystem = null;
     try {
       clonedSystem = (TwoPhasePipeFlowSolver) super.clone();
-    } catch (Exception e) {
-      e.printStackTrace(System.err);
+    } catch (Exception ex) {
+      ex.printStackTrace();
     }
 
     return clonedSystem;

diff --git a/src/main/java/neqsim/fluidMechanics/geometryDefinitions/GeometryDefinition.java b/src/main/java/neqsim/fluidMechanics/geometryDefinitions/GeometryDefinition.java
@@ -70,7 +70,6 @@ public void setWall(Wall wall) {
   private SurroundingEnvironment surroundingEnvironment = new SurroundingEnvironmentBaseClass();
 
   /**
-   * *
    * <p>
    * Constructor for GeometryDefinition.
    * </p>
@@ -110,8 +109,8 @@ public GeometryDefinitionInterface clone() {
     GeometryDefinitionInterface clonedGeometry = null;
     try {
       clonedGeometry = (GeometryDefinition) super.clone();
-    } catch (Exception e) {
-      e.printStackTrace(System.err);
+    } catch (Exception ex) {
+      ex.printStackTrace();
     }
 
     return clonedGeometry;

diff --git a/...ain/java/neqsim/fluidMechanics/geometryDefinitions/internalGeometry/packings/Packing.java b/...ain/java/neqsim/fluidMechanics/geometryDefinitions/internalGeometry/packings/Packing.java
@@ -51,8 +51,8 @@ public Packing(String name) {
       System.out.println("packing ok");
     }
 
-    catch (Exception e) {
-      String err = e.toString();
+    catch (Exception ex) {
+      String err = ex.toString();
       System.out.println(err);
     }
   }
@@ -80,8 +80,8 @@ public Packing(String name, String material, int size) {
       System.out.println("packing ok");
     }
 
-    catch (Exception e) {
-      String err = e.toString();
+    catch (Exception ex) {
+      String err = ex.toString();
       System.out.println(err);
     }
   }

diff --git a/src/main/java/neqsim/fluidMechanics/geometryDefinitions/pipe/PipeData.java b/src/main/java/neqsim/fluidMechanics/geometryDefinitions/pipe/PipeData.java
@@ -60,8 +60,8 @@ public PipeData clone() {
     PipeData clonedPipe = null;
     try {
       clonedPipe = (PipeData) super.clone();
-    } catch (Exception e) {
-      e.printStackTrace(System.err);
+    } catch (Exception ex) {
+      ex.printStackTrace();
     }
     return clonedPipe;
   }

diff --git a/src/main/java/neqsim/fluidMechanics/geometryDefinitions/reactor/ReactorData.java b/src/main/java/neqsim/fluidMechanics/geometryDefinitions/reactor/ReactorData.java
@@ -124,8 +124,8 @@ public ReactorData clone() {
     ReactorData clonedPipe = null;
     try {
       clonedPipe = (ReactorData) super.clone();
-    } catch (Exception e) {
-      e.printStackTrace(System.err);
+    } catch (Exception ex) {
+      ex.printStackTrace();
     }
 
     return clonedPipe;

diff --git a/src/main/java/neqsim/fluidMechanics/geometryDefinitions/stirredCell/StirredCell.java b/src/main/java/neqsim/fluidMechanics/geometryDefinitions/stirredCell/StirredCell.java
@@ -55,8 +55,8 @@ public StirredCell clone() {
     StirredCell clonedPipe = null;
     try {
       clonedPipe = (StirredCell) super.clone();
-    } catch (Exception e) {
-      e.printStackTrace(System.err);
+    } catch (Exception ex) {
+      ex.printStackTrace();
     }
     return clonedPipe;
   }

diff --git a/...mVisualization/onePhaseFlowVisualization/pipeFlowVisualization/PipeFlowVisualization.java b/...mVisualization/onePhaseFlowVisualization/pipeFlowVisualization/PipeFlowVisualization.java
@@ -113,7 +113,7 @@ public void calcPoints(String name) {
      * neqsim.dataPresentation.visAD.visAd2D.visAd2dBaseClass("title[1]", "title[2]");
      * ((neqsim.dataPresentation.visAD.visAd2D.visAd2dBaseClass) plot) .setLineXYVals(xPlace,
      * points[0]); ((neqsim.dataPresentation.visAD.visAd2D.visAd2dBaseClass) plot).setXYVals(xPlace,
-     * points[0]); } } catch (Exception e) { System.out.println(e.toString());
+     * points[0]); } } catch (Exception ex) { System.out.println(ex.toString());
      * System.out.println("plotting failed"); }
      */
   }
@@ -148,7 +148,7 @@ public void displayResult(String name) {
      * neqsim.dataPresentation.visAD.visAd2D.visAd2dBaseClass("title[1]", "title[2]");
      * ((neqsim.dataPresentation.visAD.visAd2D.visAd2dBaseClass) plot) .setLineXYVals(xPlace,
      * points[0]); ((neqsim.dataPresentation.visAD.visAd2D.visAd2dBaseClass) plot).setXYVals(xPlace,
-     * points[0]); } plot.init(); } catch (Exception e) { System.out.println(e.toString());
+     * points[0]); } plot.init(); } catch (Exception ex) { System.out.println(ex.toString());
      * System.out.println("plotting failed"); }
      */
   }

diff --git a/...woPhaseFlowVisualization/twoPhasePipeFlowVisualization/TwoPhasePipeFlowVisualization.java b/...woPhaseFlowVisualization/twoPhasePipeFlowVisualization/TwoPhasePipeFlowVisualization.java
@@ -142,7 +142,7 @@ public void displayResult(String name) {
     // plot.init();
     // }
     // catch(Exception e){
-    // System.out.println(e.toString());
+    // System.out.println(ex.toString());
     // System.out.println("plotting failed");
     // }
   }