Skip to content

Commit 720ebe4

Browse files
asmfstatoilasmfstatoil
committed
style: alignment
1 parent 9ea88d2 commit 720ebe4

File tree

26 files changed

+653
-650
lines changed

26 files changed

+653
-650
lines changed

‎eclipse-java-google-style.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@
239239
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
240240
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
241241
<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant.count_dependent" value="16|-1|16"/>
242-
<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="100"/>
242+
<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="120"/>
243243
<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="insert"/>
244244
<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="0"/>
245245
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>

‎neqsim_formatter.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
2121
<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement" value="common_lines"/>
2222
<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
23-
<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
23+
<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="2"/>
2424
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
2525
<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration" value="common_lines"/>
2626
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
@@ -79,7 +79,7 @@
7979
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
8080
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
8181
<setting id="org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped" value="true"/>
82-
<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="80"/>
82+
<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="120"/>
8383
<setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="false"/>
8484
<setting id="org.eclipse.jdt.core.formatter.keep_method_body_on_one_line" value="one_line_never"/>
8585
<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>

‎src/main/java/neqsim/PVTsimulation/simulation/BasePVTsimulation.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,9 @@ public double getZsaturation() {
169169
}
170170

171171
/**
172-
* <p>Getter for the field <code>saturationTemperature</code>.</p>
172+
* <p>
173+
* Getter for the field <code>saturationTemperature</code>.
174+
* </p>
173175
*
174176
* @return the saturationTemperature
175177
*/

‎src/main/java/neqsim/PVTsimulation/util/parameterfitting/DensityFunction.java

+23-23
Original file line numberDiff line numberDiff line change
@@ -11,31 +11,31 @@
1111
* @version $Id: $Id
1212
*/
1313
public class DensityFunction extends LevenbergMarquardtFunction {
14-
double molarMass = 0.0;
14+
double molarMass = 0.0;
1515

16-
/**
17-
* <p>
18-
* Constructor for DensityFunction.
19-
* </p>
20-
*/
21-
public DensityFunction() {
22-
params = new double[1];
23-
}
16+
/**
17+
* <p>
18+
* Constructor for DensityFunction.
19+
* </p>
20+
*/
21+
public DensityFunction() {
22+
params = new double[1];
23+
}
2424

25-
/** {@inheritDoc} */
26-
@Override
27-
public double calcValue(double[] dependentValues) {
28-
system.setTemperature(dependentValues[0]);
29-
thermoOps.TPflash();
30-
system.initPhysicalProperties();
25+
/** {@inheritDoc} */
26+
@Override
27+
public double calcValue(double[] dependentValues) {
28+
system.setTemperature(dependentValues[0]);
29+
thermoOps.TPflash();
30+
system.initPhysicalProperties();
3131

32-
// system.display();
33-
return system.getPhase(0).getPhysicalProperties().getDensity();
34-
}
32+
// system.display();
33+
return system.getPhase(0).getPhysicalProperties().getDensity();
34+
}
3535

36-
/** {@inheritDoc} */
37-
@Override
38-
public void setFittingParams(int i, double value) {
39-
params[i] = value;
40-
}
36+
/** {@inheritDoc} */
37+
@Override
38+
public void setFittingParams(int i, double value) {
39+
params[i] = value;
40+
}
4141
}

‎src/main/java/neqsim/PVTsimulation/util/parameterfitting/FunctionJohanSverderup.java

+26-27
Original file line numberDiff line numberDiff line change
@@ -12,35 +12,34 @@
1212
* @version $Id: $Id
1313
*/
1414
public class FunctionJohanSverderup extends LevenbergMarquardtFunction {
15-
double molarMass = 0.0;
15+
double molarMass = 0.0;
1616

17-
/**
18-
* <p>
19-
* Constructor for FunctionJohanSverderup.
20-
* </p>
21-
*/
22-
public FunctionJohanSverderup() {
23-
params = new double[1];
24-
}
17+
/**
18+
* <p>
19+
* Constructor for FunctionJohanSverderup.
20+
* </p>
21+
*/
22+
public FunctionJohanSverderup() {
23+
params = new double[1];
24+
}
2525

26-
/** {@inheritDoc} */
27-
@Override
28-
public double calcValue(double[] dependentValues) {
29-
system.addComponent("methane",
30-
-system.getPhase(0).getComponent("methane").getNumberOfmoles());
31-
system.addComponent("methane", params[0]);
32-
system.init_x_y();
33-
system.init(1);
34-
system.setPressure(system.getPressure() - 25.0);
35-
SaturationPressure satCalc = new SaturationPressure(system);
36-
double satPres = satCalc.calcSaturationPressure();
26+
/** {@inheritDoc} */
27+
@Override
28+
public double calcValue(double[] dependentValues) {
29+
system.addComponent("methane", -system.getPhase(0).getComponent("methane").getNumberOfmoles());
30+
system.addComponent("methane", params[0]);
31+
system.init_x_y();
32+
system.init(1);
33+
system.setPressure(system.getPressure() - 25.0);
34+
SaturationPressure satCalc = new SaturationPressure(system);
35+
double satPres = satCalc.calcSaturationPressure();
3736

38-
return satPres;
39-
}
37+
return satPres;
38+
}
4039

41-
/** {@inheritDoc} */
42-
@Override
43-
public void setFittingParams(int i, double value) {
44-
params[i] = value;
45-
}
40+
/** {@inheritDoc} */
41+
@Override
42+
public void setFittingParams(int i, double value) {
43+
params[i] = value;
44+
}
4645
}

‎src/main/java/neqsim/PVTsimulation/util/parameterfitting/SaturationPressureFunction.java

+43-43
Original file line numberDiff line numberDiff line change
@@ -13,51 +13,51 @@
1313
* @version $Id: $Id
1414
*/
1515
public class SaturationPressureFunction extends LevenbergMarquardtFunction {
16-
double molarMass = 0.0;
16+
double molarMass = 0.0;
1717

18-
/**
19-
* <p>
20-
* Constructor for SaturationPressureFunction.
21-
* </p>
22-
*/
23-
public SaturationPressureFunction() {
24-
params = new double[1];
25-
}
26-
27-
/** {@inheritDoc} */
28-
@Override
29-
public double calcValue(double[] dependentValues) {
30-
int plusNumber = 0;
31-
molarMass = params[0];
32-
for (int i = 0; i < system.getPhase(0).getNumberOfComponents(); i++) {
33-
if (system.getPhase(0).getComponent(i).isIsPlusFraction()) {
34-
plusNumber = i;
35-
}
36-
}
37-
SystemInterface tempSystem = system.clone();
38-
tempSystem.resetCharacterisation();
39-
tempSystem.createDatabase(true);
40-
tempSystem.setMixingRule(system.getMixingRule());
18+
/**
19+
* <p>
20+
* Constructor for SaturationPressureFunction.
21+
* </p>
22+
*/
23+
public SaturationPressureFunction() {
24+
params = new double[1];
25+
}
4126

42-
tempSystem.getPhase(0).getComponent(plusNumber).setMolarMass(molarMass);
43-
tempSystem.getPhase(1).getComponent(plusNumber).setMolarMass(molarMass);
44-
tempSystem.setTemperature(dependentValues[0]);
45-
tempSystem.setPressure(50.0);
46-
tempSystem.getCharacterization().characterisePlusFraction();
47-
tempSystem.createDatabase(true);
48-
tempSystem.setMixingRule(system.getMixingRule());
49-
tempSystem.init(0);
50-
tempSystem.init(1);
51-
// \\tempSystem.display();
52-
SaturationPressure satCalc = new SaturationPressure(tempSystem);
53-
double satPres = satCalc.calcSaturationPressure();
54-
// tempSystem.display();
55-
return satPres;
27+
/** {@inheritDoc} */
28+
@Override
29+
public double calcValue(double[] dependentValues) {
30+
int plusNumber = 0;
31+
molarMass = params[0];
32+
for (int i = 0; i < system.getPhase(0).getNumberOfComponents(); i++) {
33+
if (system.getPhase(0).getComponent(i).isIsPlusFraction()) {
34+
plusNumber = i;
35+
}
5636
}
37+
SystemInterface tempSystem = system.clone();
38+
tempSystem.resetCharacterisation();
39+
tempSystem.createDatabase(true);
40+
tempSystem.setMixingRule(system.getMixingRule());
5741

58-
/** {@inheritDoc} */
59-
@Override
60-
public void setFittingParams(int i, double value) {
61-
params[i] = value;
62-
}
42+
tempSystem.getPhase(0).getComponent(plusNumber).setMolarMass(molarMass);
43+
tempSystem.getPhase(1).getComponent(plusNumber).setMolarMass(molarMass);
44+
tempSystem.setTemperature(dependentValues[0]);
45+
tempSystem.setPressure(50.0);
46+
tempSystem.getCharacterization().characterisePlusFraction();
47+
tempSystem.createDatabase(true);
48+
tempSystem.setMixingRule(system.getMixingRule());
49+
tempSystem.init(0);
50+
tempSystem.init(1);
51+
// \\tempSystem.display();
52+
SaturationPressure satCalc = new SaturationPressure(tempSystem);
53+
double satPres = satCalc.calcSaturationPressure();
54+
// tempSystem.display();
55+
return satPres;
56+
}
57+
58+
/** {@inheritDoc} */
59+
@Override
60+
public void setFittingParams(int i, double value) {
61+
params[i] = value;
62+
}
6363
}

‎src/main/java/neqsim/PVTsimulation/util/parameterfitting/ViscosityFunction.java

+41-41
Original file line numberDiff line numberDiff line change
@@ -12,51 +12,51 @@
1212
* @version $Id: $Id
1313
*/
1414
public class ViscosityFunction extends LevenbergMarquardtFunction {
15-
double molarMass = 0.0;
16-
boolean includeWaxEmulsionViscosity = true;
15+
double molarMass = 0.0;
16+
boolean includeWaxEmulsionViscosity = true;
1717

18-
/**
19-
* <p>
20-
* Constructor for ViscosityFunction.
21-
* </p>
22-
*/
23-
public ViscosityFunction() {
24-
params = new double[1];
25-
}
18+
/**
19+
* <p>
20+
* Constructor for ViscosityFunction.
21+
* </p>
22+
*/
23+
public ViscosityFunction() {
24+
params = new double[1];
25+
}
2626

27-
/**
28-
* <p>
29-
* Constructor for ViscosityFunction.
30-
* </p>
31-
*
32-
* @param includeWax a boolean
33-
*/
34-
public ViscosityFunction(boolean includeWax) {
35-
params = new double[1];
36-
includeWaxEmulsionViscosity = includeWax;
37-
}
27+
/**
28+
* <p>
29+
* Constructor for ViscosityFunction.
30+
* </p>
31+
*
32+
* @param includeWax a boolean
33+
*/
34+
public ViscosityFunction(boolean includeWax) {
35+
params = new double[1];
36+
includeWaxEmulsionViscosity = includeWax;
37+
}
3838

39-
/** {@inheritDoc} */
40-
@Override
41-
public double calcValue(double[] dependentValues) {
42-
thermoOps.TPflash();
43-
system.initPhysicalProperties();
44-
double waxFraction = 0.0;
45-
if (system.hasPhaseType("wax") && includeWaxEmulsionViscosity) {
46-
waxFraction = system.getWtFraction(system.getPhaseNumberOfPhase("wax"));
47-
return system.getPhase(0).getPhysicalProperties().getViscosityOfWaxyOil(waxFraction,
48-
dependentValues[0]); // %wax
49-
}
50-
// system.display();
51-
return system.getPhase(0).getPhysicalProperties().getViscosity(); // %wax
39+
/** {@inheritDoc} */
40+
@Override
41+
public double calcValue(double[] dependentValues) {
42+
thermoOps.TPflash();
43+
system.initPhysicalProperties();
44+
double waxFraction = 0.0;
45+
if (system.hasPhaseType("wax") && includeWaxEmulsionViscosity) {
46+
waxFraction = system.getWtFraction(system.getPhaseNumberOfPhase("wax"));
47+
return system.getPhase(0).getPhysicalProperties().getViscosityOfWaxyOil(waxFraction,
48+
dependentValues[0]); // %wax
5249
}
50+
// system.display();
51+
return system.getPhase(0).getPhysicalProperties().getViscosity(); // %wax
52+
}
5353

54-
/** {@inheritDoc} */
55-
@Override
56-
public void setFittingParams(int i, double value) {
57-
params[i] = value;
54+
/** {@inheritDoc} */
55+
@Override
56+
public void setFittingParams(int i, double value) {
57+
params[i] = value;
5858

59-
((FrictionTheoryViscosityMethod) system.getPhase(0).getPhysicalProperties()
60-
.getViscosityModel()).setTBPviscosityCorrection(value);
61-
}
59+
((FrictionTheoryViscosityMethod) system.getPhase(0).getPhysicalProperties().getViscosityModel())
60+
.setTBPviscosityCorrection(value);
61+
}
6262
}

0 commit comments

Comments
 (0)