Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refact fluidmechanics #502

Merged
merged 6 commits into from
Jul 24, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/neqsim/fluidMechanics/flowNode/FlowNode.java
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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[])
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ public void setWall(Wall wall) {
private SurroundingEnvironment surroundingEnvironment = new SurroundingEnvironmentBaseClass();

/**
* *
* <p>
* Constructor for GeometryDefinition.
* </p>
Expand Down Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
Expand Down Expand Up @@ -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);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"); }
*/
}
Expand Down Expand Up @@ -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"); }
*/
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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");
// }
}
Expand Down
Loading