Skip to content

Commit e9eacdb

Browse files
asmfstatoilasmfstatoil
authored
chore: fixed warnings (#1073)
* chore: fixed warnings
1 parent 2a89f70 commit e9eacdb

File tree

17 files changed

+166
-163
lines changed

17 files changed

+166
-163
lines changed

‎src/main/java/neqsim/processSimulation/mechanicalDesign/designStandards/AdsorptionDehydrationDesignStandard.java

+14-14
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,9 @@ public class AdsorptionDehydrationDesignStandard extends DesignStandard {
2929
public AdsorptionDehydrationDesignStandard(String name, MechanicalDesign equipmentInn) {
3030
super(name, equipmentInn);
3131

32-
final neqsim.util.database.NeqSimProcessDesignDataBase database =
33-
new neqsim.util.database.NeqSimProcessDesignDataBase();
34-
java.sql.ResultSet dataSet = null;
35-
try {
32+
try (neqsim.util.database.NeqSimProcessDesignDataBase database =
33+
new neqsim.util.database.NeqSimProcessDesignDataBase()) {
34+
java.sql.ResultSet dataSet = null;
3635
try {
3736
dataSet = database.getResultSet(
3837
("SELECT * FROM technicalrequirements_process WHERE EQUIPMENTTYPE='Adsorber Dehydration' AND Company='"
@@ -45,18 +44,19 @@ public AdsorptionDehydrationDesignStandard(String name, MechanicalDesign equipme
4544
}
4645
} catch (Exception ex) {
4746
logger.error(ex.getMessage(), ex);
48-
}
49-
} catch (Exception ex) {
50-
logger.error(ex.getMessage(), ex);
51-
} finally {
52-
try {
53-
if (dataSet != null) {
54-
dataSet.close();
47+
} finally {
48+
try {
49+
if (dataSet != null) {
50+
dataSet.close();
51+
}
52+
} catch (Exception ex) {
53+
System.out.println("error closing database.....GasScrubberDesignStandard");
54+
logger.error(ex.getMessage(), ex);
5555
}
56-
} catch (Exception ex) {
57-
System.out.println("error closing database.....GasScrubberDesignStandard");
58-
logger.error(ex.getMessage(), ex);
5956
}
57+
} catch (Exception e) {
58+
// TODO Auto-generated catch block
59+
e.printStackTrace();
6060
}
6161
}
6262

‎src/main/java/neqsim/processSimulation/mechanicalDesign/designStandards/CompressorDesignStandard.java

+16-13
Original file line numberDiff line numberDiff line change
@@ -29,22 +29,25 @@ public class CompressorDesignStandard extends DesignStandard {
2929
public CompressorDesignStandard(String name, MechanicalDesign equipmentInn) {
3030
super(name, equipmentInn);
3131

32-
neqsim.util.database.NeqSimProcessDesignDataBase database =
33-
new neqsim.util.database.NeqSimProcessDesignDataBase();
34-
35-
try (java.sql.ResultSet dataSet = database.getResultSet(
36-
("SELECT * FROM technicalrequirements_process WHERE EQUIPMENTTYPE='Compressor' AND Company='"
37-
+ standardName + "'"))) {
38-
while (dataSet.next()) {
39-
String specName = dataSet.getString("SPECIFICATION");
40-
if (specName.equals("compressorFactor")) {
41-
compressorFactor = Double.parseDouble(dataSet.getString("MAXVALUE"));
32+
try (neqsim.util.database.NeqSimProcessDesignDataBase database =
33+
new neqsim.util.database.NeqSimProcessDesignDataBase()) {
34+
try (java.sql.ResultSet dataSet = database.getResultSet(
35+
("SELECT * FROM technicalrequirements_process WHERE EQUIPMENTTYPE='Compressor' AND Company='"
36+
+ standardName + "'"))) {
37+
while (dataSet.next()) {
38+
String specName = dataSet.getString("SPECIFICATION");
39+
if (specName.equals("compressorFactor")) {
40+
compressorFactor = Double.parseDouble(dataSet.getString("MAXVALUE"));
41+
}
4242
}
43+
} catch (Exception ex) {
44+
logger.error(ex.getMessage(), ex);
4345
}
44-
} catch (Exception ex) {
45-
logger.error(ex.getMessage(), ex);
46+
// gasLoadFactor = Double.parseDouble(dataSet.getString("gasloadfactor"));
47+
} catch (Exception e) {
48+
// TODO Auto-generated catch block
49+
e.printStackTrace();
4650
}
47-
// gasLoadFactor = Double.parseDouble(dataSet.getString("gasloadfactor"));
4851
}
4952

5053
/**

‎src/main/java/neqsim/processSimulation/mechanicalDesign/designStandards/GasScrubberDesignStandard.java

+16-16
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,9 @@ public class GasScrubberDesignStandard extends DesignStandard {
3333
public GasScrubberDesignStandard(String name, MechanicalDesign equipmentInn) {
3434
super(name, equipmentInn);
3535

36-
neqsim.util.database.NeqSimProcessDesignDataBase database =
37-
new neqsim.util.database.NeqSimProcessDesignDataBase();
38-
java.sql.ResultSet dataSet = null;
39-
try {
36+
try (neqsim.util.database.NeqSimProcessDesignDataBase database =
37+
new neqsim.util.database.NeqSimProcessDesignDataBase()) {
38+
java.sql.ResultSet dataSet = null;
4039
try {
4140
dataSet = database.getResultSet(
4241
("SELECT * FROM technicalrequirements_process WHERE EQUIPMENTTYPE='Gas scrubber' AND Company='"
@@ -53,22 +52,23 @@ public GasScrubberDesignStandard(String name, MechanicalDesign equipmentInn) {
5352
designFactorVolumeFlow = Double.parseDouble(dataSet.getString("MINVALUE"));
5453
}
5554
}
56-
} catch (Exception ex) {
57-
logger.error(ex.getMessage(), ex);
58-
}
5955

60-
// gasLoadFactor = Double.parseDouble(dataSet.getString("gasloadfactor"));
61-
} catch (Exception ex) {
62-
logger.error(ex.getMessage(), ex);
63-
} finally {
64-
try {
65-
if (dataSet != null) {
66-
dataSet.close();
67-
}
56+
// gasLoadFactor = Double.parseDouble(dataSet.getString("gasloadfactor"));
6857
} catch (Exception ex) {
69-
System.out.println("error closing database.....GasScrubberDesignStandard");
7058
logger.error(ex.getMessage(), ex);
59+
} finally {
60+
try {
61+
if (dataSet != null) {
62+
dataSet.close();
63+
}
64+
} catch (Exception ex) {
65+
System.out.println("error closing database.....GasScrubberDesignStandard");
66+
logger.error(ex.getMessage(), ex);
67+
}
7168
}
69+
} catch (Exception e) {
70+
// TODO Auto-generated catch block
71+
e.printStackTrace();
7272
}
7373
}
7474

‎src/main/java/neqsim/processSimulation/mechanicalDesign/designStandards/MaterialPipeDesignStandard.java

+18-14
Original file line numberDiff line numberDiff line change
@@ -144,21 +144,25 @@ public void readMaterialDesignStandard(String specNo, String grade) {
144144
this.grade = grade;
145145
specificationNumber = specNo;
146146

147-
neqsim.util.database.NeqSimProcessDesignDataBase database =
148-
new neqsim.util.database.NeqSimProcessDesignDataBase();
149-
try (java.sql.ResultSet dataSet =
150-
database.getResultSet(("SELECT * FROM materialpipeproperties WHERE specificationNumber='"
151-
+ specificationNumber + "' AND grade='" + grade + "'"))) {
152-
while (dataSet.next()) {
153-
minimumYeildStrength =
154-
(Double.parseDouble(dataSet.getString("minimumYeildStrength"))) * 0.00689475729;
155-
// design factor table has to be developed
156-
// Efactor table has to be implemented
157-
// temperatureDeratingFactor has to be implemented
147+
try (neqsim.util.database.NeqSimProcessDesignDataBase database =
148+
new neqsim.util.database.NeqSimProcessDesignDataBase()) {
149+
try (java.sql.ResultSet dataSet =
150+
database.getResultSet(("SELECT * FROM materialpipeproperties WHERE specificationNumber='"
151+
+ specificationNumber + "' AND grade='" + grade + "'"))) {
152+
while (dataSet.next()) {
153+
minimumYeildStrength =
154+
(Double.parseDouble(dataSet.getString("minimumYeildStrength"))) * 0.00689475729;
155+
// design factor table has to be developed
156+
// Efactor table has to be implemented
157+
// temperatureDeratingFactor has to be implemented
158+
}
159+
} catch (Exception ex) {
160+
logger.error(ex.getMessage(), ex);
158161
}
159-
} catch (Exception ex) {
160-
logger.error(ex.getMessage(), ex);
162+
// gasLoadFactor = Double.parseDouble(dataSet.getString("gasloadfactor"));
163+
} catch (Exception e) {
164+
// TODO Auto-generated catch block
165+
e.printStackTrace();
161166
}
162-
// gasLoadFactor = Double.parseDouble(dataSet.getString("gasloadfactor"));
163167
}
164168
}

‎src/main/java/neqsim/processSimulation/mechanicalDesign/designStandards/MaterialPlateDesignStandard.java

+16-16
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,9 @@ public void readMaterialDesignStandard(String name, String specNo, String grade,
8080
specificationNumber = specNo;
8181
divisionClassNumber = divClassNo;
8282

83-
neqsim.util.database.NeqSimProcessDesignDataBase database =
84-
new neqsim.util.database.NeqSimProcessDesignDataBase();
85-
java.sql.ResultSet dataSet = null;
86-
try {
83+
try (neqsim.util.database.NeqSimProcessDesignDataBase database =
84+
new neqsim.util.database.NeqSimProcessDesignDataBase()) {
85+
java.sql.ResultSet dataSet = null;
8786
try {
8887
dataSet =
8988
database.getResultSet(("SELECT * FROM materialplateproperties WHERE materialName='"
@@ -97,22 +96,23 @@ public void readMaterialDesignStandard(String name, String specNo, String grade,
9796
(Double.parseDouble(dataSet.getString("divisionClass2"))) * 0.00689475729; // MPa
9897
}
9998
}
100-
} catch (Exception ex) {
101-
logger.error(ex.getMessage(), ex);
102-
}
10399

104-
// gasLoadFactor = Double.parseDouble(dataSet.getString("gasloadfactor"));
105-
} catch (Exception ex) {
106-
logger.error(ex.getMessage(), ex);
107-
} finally {
108-
try {
109-
if (dataSet != null) {
110-
dataSet.close();
111-
}
100+
// gasLoadFactor = Double.parseDouble(dataSet.getString("gasloadfactor"));
112101
} catch (Exception ex) {
113-
System.out.println("error closing database.....GasScrubberDesignStandard");
114102
logger.error(ex.getMessage(), ex);
103+
} finally {
104+
try {
105+
if (dataSet != null) {
106+
dataSet.close();
107+
}
108+
} catch (Exception ex) {
109+
System.out.println("error closing database.....GasScrubberDesignStandard");
110+
logger.error(ex.getMessage(), ex);
111+
}
115112
}
113+
} catch (Exception e) {
114+
// TODO Auto-generated catch block
115+
e.printStackTrace();
116116
}
117117
}
118118
}

‎src/main/java/neqsim/processSimulation/mechanicalDesign/designStandards/PipelineDesignStandard.java

+15-12
Original file line numberDiff line numberDiff line change
@@ -34,20 +34,23 @@ public PipelineDesignStandard(String name, MechanicalDesign equipmentInn) {
3434
// double jointEfficiency =
3535
// equipment.getJointEfficiencyStandard().getJEFactor();
3636

37-
neqsim.util.database.NeqSimProcessDesignDataBase database =
38-
new neqsim.util.database.NeqSimProcessDesignDataBase();
39-
40-
try (java.sql.ResultSet dataSet = database.getResultSet(
41-
("SELECT * FROM technicalrequirements_process WHERE EQUIPMENTTYPE='Pipeline' AND Company='"
42-
+ standardName + "'"))) {
43-
while (dataSet.next()) {
44-
String specName = dataSet.getString("SPECIFICATION");
45-
if (specName.equals("safetyFactor")) {
46-
safetyFactor = Double.parseDouble(dataSet.getString("MAXVALUE"));
37+
try (neqsim.util.database.NeqSimProcessDesignDataBase database =
38+
new neqsim.util.database.NeqSimProcessDesignDataBase()) {
39+
try (java.sql.ResultSet dataSet = database.getResultSet(
40+
("SELECT * FROM technicalrequirements_process WHERE EQUIPMENTTYPE='Pipeline' AND Company='"
41+
+ standardName + "'"))) {
42+
while (dataSet.next()) {
43+
String specName = dataSet.getString("SPECIFICATION");
44+
if (specName.equals("safetyFactor")) {
45+
safetyFactor = Double.parseDouble(dataSet.getString("MAXVALUE"));
46+
}
4747
}
48+
} catch (Exception ex) {
49+
logger.error(ex.getMessage(), ex);
4850
}
49-
} catch (Exception ex) {
50-
logger.error(ex.getMessage(), ex);
51+
} catch (Exception e) {
52+
// TODO Auto-generated catch block
53+
e.printStackTrace();
5154
}
5255
}
5356

‎src/main/java/neqsim/processSimulation/mechanicalDesign/designStandards/SeparatorDesignStandard.java

+16-16
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,9 @@ public void setFg(double Fg) {
5353
*/
5454
public SeparatorDesignStandard(String name, MechanicalDesign equipmentInn) {
5555
super(name, equipmentInn);
56-
neqsim.util.database.NeqSimProcessDesignDataBase database =
57-
new neqsim.util.database.NeqSimProcessDesignDataBase();
58-
java.sql.ResultSet dataSet = null;
59-
try {
56+
try (neqsim.util.database.NeqSimProcessDesignDataBase database =
57+
new neqsim.util.database.NeqSimProcessDesignDataBase()) {
58+
java.sql.ResultSet dataSet = null;
6059
try {
6160
dataSet = database.getResultSet(
6261
("SELECT * FROM technicalrequirements_process WHERE EQUIPMENTTYPE='Separator' AND Company='"
@@ -76,22 +75,23 @@ public SeparatorDesignStandard(String name, MechanicalDesign equipmentInn) {
7675
+ Double.parseDouble(dataSet.getString("MINVALUE"))) / 2.0;
7776
}
7877
}
79-
} catch (Exception ex) {
80-
logger.error(ex.getMessage(), ex);
81-
}
8278

83-
// gasLoadFactor = Double.parseDouble(dataSet.getString("gasloadfactor"));
84-
} catch (Exception ex) {
85-
logger.error(ex.getMessage(), ex);
86-
} finally {
87-
try {
88-
if (dataSet != null) {
89-
dataSet.close();
90-
}
79+
// gasLoadFactor = Double.parseDouble(dataSet.getString("gasloadfactor"));
9180
} catch (Exception ex) {
92-
System.out.println("error closing database.....GasScrubberDesignStandard");
9381
logger.error(ex.getMessage(), ex);
82+
} finally {
83+
try {
84+
if (dataSet != null) {
85+
dataSet.close();
86+
}
87+
} catch (Exception ex) {
88+
System.out.println("error closing database.....GasScrubberDesignStandard");
89+
logger.error(ex.getMessage(), ex);
90+
}
9491
}
92+
} catch (Exception e) {
93+
// TODO Auto-generated catch block
94+
e.printStackTrace();
9595
}
9696
}
9797

‎src/main/java/neqsim/processSimulation/processEquipment/splitter/Splitter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ public void runTransient(double dt, UUID id) {
249249
run(id);
250250
increaseTime(dt);
251251
} else {
252-
Mixer mixer = new Mixer();
252+
Mixer mixer = new Mixer("tmpMixer");
253253
for (int i = 0; i < splitStream.length; i++) {
254254
splitStream[i].setPressure(inletStream.getPressure());
255255
splitStream[i].setTemperature(inletStream.getTemperature("C"), "C");

‎src/main/java/neqsim/thermo/component/ComponentHydrate.java

+13-13
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,10 @@ public ComponentHydrate(String name, double moles, double molesInPhase, int comp
7373
reffug[0] = 10.0;
7474
reffug[1] = 1.0;
7575

76-
java.sql.ResultSet dataSet = null;
77-
try (neqsim.util.database.NeqSimDataBase database = new neqsim.util.database.NeqSimDataBase()) {
78-
if (!name.equals("default")) {
76+
if (!name.equals("default")) {
77+
java.sql.ResultSet dataSet = null;
78+
try (neqsim.util.database.NeqSimDataBase database =
79+
new neqsim.util.database.NeqSimDataBase()) {
7980
try {
8081
if (NeqSimDataBase.createTemporaryTables()) {
8182
dataSet = database.getResultSet(("SELECT * FROM comptemp WHERE name='" + name + "'"));
@@ -95,16 +96,16 @@ public ComponentHydrate(String name, double moles, double molesInPhase, int comp
9596
lennardJonesEnergyParameterHydrate = Double.parseDouble(dataSet.getString("LJepsHYDRATE"));
9697
sphericalCoreRadiusHydrate =
9798
Double.parseDouble(dataSet.getString("SphericalCoreRadiusHYDRATE"));
98-
}
99-
} catch (Exception ex) {
100-
logger.error("error in comp", ex);
101-
} finally {
102-
try {
103-
if (dataSet != null) {
104-
dataSet.close();
105-
}
10699
} catch (Exception ex) {
107-
logger.error("error closing database.....", ex);
100+
logger.error("error in comp", ex);
101+
} finally {
102+
try {
103+
if (dataSet != null) {
104+
dataSet.close();
105+
}
106+
} catch (Exception ex) {
107+
logger.error("error closing database.....", ex);
108+
}
108109
}
109110
}
110111
}
@@ -736,4 +737,3 @@ public double[][] getCavprwat() {
736737
return cavprwat;
737738
}
738739
}
739-

‎src/main/java/neqsim/thermo/phase/PhaseEos.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,7 @@ public void displayInteractionCoefficients(String intType) {
8080
@Override
8181
public void init(double totalNumberOfMoles, int numberOfComponents, int initType, PhaseType pt,
8282
double beta) {
83-
// Replace with pt != PhaseType.GAS?
84-
if (pt.getValue() > 1) {
83+
if (pt != PhaseType.GAS) {
8584
pt = PhaseType.LIQUID;
8685
}
8786
if (!mixingRuleDefined) {

‎src/main/java/neqsim/thermo/phase/PhaseType.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
package neqsim.thermo.phase;
22

3-
import java.io.Serializable;
43
import neqsim.util.exception.InvalidInputException;
54

65
/**
76
* Types of phases.
87
*
98
* @author ASMF
109
*/
11-
public enum PhaseType implements Serializable {
10+
public enum PhaseType {
1211
LIQUID("liquid", 0), GAS("gas", 1), OIL("oil", 2), AQUEOUS("aqueous", 3), HYDRATE("hydrate",
1312
4), WAX("wax", 5), SOLID("solid", 6), SOLIDCOMPLEX("solidComplex", 7);
1413

0 commit comments

Comments
 (0)