Skip to content

Commit 4d309c7

Browse files
marlenelundmarlenelund
authored
Merge pull request #1 from Statoil/errorHandlingForIOC
replacing system.out with logging part 1
2 parents 9b16b9c + 12cf657 commit 4d309c7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+228
-154
lines changed

‎dist/NeqSimSource.jar‎

-2.27 MB
Binary file not shown.

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
package neqsim.thermo.component;
77

88
import neqsim.thermo.phase.PhaseInterface;
9+
import org.apache.log4j.Logger;
910

1011
/**
1112
*
@@ -26,8 +27,8 @@ public class ComponentHydrateKluda extends Component {
2627
double cavNumb[][] = new double[2][2]; //[structure][cavitytype]
2728
double cavprwat[][] = new double[2][2]; //[structure][cavitytype]
2829
double reffug[] = new double[20];
30+
static Logger logger = Logger.getLogger(ComponentHydrateKluda.class);
2931

30-
;
3132

3233
/** Creates new Class */
3334
public ComponentHydrateKluda() {
@@ -85,21 +86,21 @@ public double fugcoef(PhaseInterface phase, int numberOfComps, double temp, doub
8586
for (int j = 0; j < phase.getNumberOfComponents(); j++) {
8687
//System.out.println(phase.getComponent(j));
8788
tempy += ((ComponentHydrateKluda) phase.getComponent(j)).calcYKI(hydrateStructure, cavType, phase);
88-
System.out.println("tempny " + tempy);
89+
logger.info("tempny " + tempy);
8990
//System.out.println("temp ny " + this);//phase.getComponent(j));
9091
}
9192
val += cavprwat[hydrateStructure][cavType] * Math.log(1.0 - tempy);
9293
}
93-
System.out.println("val " + (val));
94-
System.out.println("fugasityCoeffisient bef " + fugasityCoeffisient);
94+
logger.info("val " + (val));
95+
logger.info("fugasityCoeffisient bef " + fugasityCoeffisient);
9596
double solvol = 1.0 / 906.0 * getMolarMass();
9697
fugasityCoeffisient = Math.exp(val) * getEmptyHydrateStructureVapourPressure(hydrateStructure, temp) * Math.exp(solvol / (R * temp) * ((pres - getEmptyHydrateStructureVapourPressure(hydrateStructure, temp))) * 1e5) / pres;
9798
//fugasityCoeffisient = getAntoineVaporPressure(temp)/pres;
9899
//logFugasityCoeffisient = Math.log(fugasityCoeffisient);
99100
//logFugasityCoeffisient += val*boltzmannConstant/R;
100101

101102
//fugasityCoeffisient = Math.exp(logFugasityCoeffisient);
102-
System.out.println("fugasityCoeffisient " + fugasityCoeffisient);
103+
logger.info("fugasityCoeffisient " + fugasityCoeffisient);
103104
} while (Math.abs((fugasityCoeffisient - fugold) / fugold) > 1e-8);
104105
} else {
105106
fugasityCoeffisient = 1e5;

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

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
package neqsim.thermo.component;
77

88
import neqsim.thermo.phase.PhaseInterface;
9+
import org.apache.log4j.Logger;
910

1011
/**
1112
*
@@ -18,6 +19,7 @@ public class ComponentHydratePVTsim extends ComponentHydrate {
1819

1920
double Ak[][] = new double[2][2]; //[structure][cavitytype]
2021
double Bk[][] = new double[2][2]; //[structure][cavitytype]
22+
static Logger logger = Logger.getLogger(ComponentHydratePVTsim.class);
2123

2224
public ComponentHydratePVTsim() {
2325
}
@@ -29,13 +31,13 @@ public ComponentHydratePVTsim(String component_name, double moles, double molesI
2931
java.sql.ResultSet dataSet = null;
3032
try {
3133
if (!component_name.equals("default")) {
32-
System.out.println("reading hydrate parameters ..............");
34+
logger.info("reading hydrate parameters ..............");
3335
try {
3436
dataSet = database.getResultSet(("SELECT * FROM COMP WHERE name='" + component_name + "'"));
3537
dataSet.next();
3638
} catch (Exception e) {
3739
dataSet.close();
38-
System.out.println("no parameters in tempcomp -- trying comp.. " + component_name);
40+
logger.info("no parameters in tempcomp -- trying comp.. " + component_name);
3941
dataSet = database.getResultSet(("SELECT * FROM COMP WHERE name='" + component_name + "'"));
4042
dataSet.next();
4143
}
@@ -50,14 +52,14 @@ public ComponentHydratePVTsim(String component_name, double moles, double molesI
5052
Bk[1][1] = Double.parseDouble(dataSet.getString("HydrateB2Large"));
5153
}
5254
} catch (Exception e) {
53-
System.out.println("error in ComponentHydratePVTsim");
55+
logger.error("error in ComponentHydratePVTsim");
5456
e.printStackTrace();
5557
} finally {
5658
try {
5759
dataSet.close();
5860
database.getConnection().close();
5961
} catch (Exception e) {
60-
System.out.println("error closing comp hydrate database....." + component_name);
62+
logger.error("error closing comp hydrate database....." + component_name);
6163
// e.printStackTrace();
6264
}
6365
}
@@ -101,7 +103,7 @@ public double fugcoef(PhaseInterface phase, int numberOfComps, double temp, doub
101103
double refWaterFugacity = refPhase.getComponent("water").fugcoef(refPhase) * pres;
102104
double alphaWater = reffug[getComponentNumber()];
103105
double wateralphaRef = Math.log(refWaterFugacity / alphaWater);
104-
System.out.println("wateralphaRef " + wateralphaRef + " refFUgalpha " + alphaWater + " refFug " + refWaterFugacity);
106+
logger.info("wateralphaRef " + wateralphaRef + " refFUgalpha " + alphaWater + " refFug " + refWaterFugacity);
105107

106108

107109
double val = 0.0;
@@ -116,8 +118,8 @@ public double fugcoef(PhaseInterface phase, int numberOfComps, double temp, doub
116118
}
117119
val += getCavprwat()[hydrateStructure][cavType] * Math.log(1.0 - tempy);
118120
}
119-
System.out.println("val " + val + " structure " + hydrateStructure);
120-
System.out.println("emty " + calcDeltaChemPot(phase, numberOfComps, temp, pres, hydrateStructure));
121+
logger.info("val " + val + " structure " + hydrateStructure);
122+
logger.info("emty " + calcDeltaChemPot(phase, numberOfComps, temp, pres, hydrateStructure));
121123
// tempfugcoef = refWaterFugacity * Math.exp(val + calcDeltaChemPot(phase, numberOfComps, temp, pres, hydrateStruct) + wateralphaRef) / (pres);
122124
fugasityCoeffisient = alphaWater * Math.exp(val + calcDeltaChemPot(phase, numberOfComps, temp, pres, hydrateStructure) + wateralphaRef) / pres;
123125
if (fugasityCoeffisient < maxFug) {

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
package neqsim.thermo.component;
77

88
import neqsim.thermo.phase.PhaseInterface;
9+
import org.apache.log4j.Logger;
910

1011
/**
1112
*
@@ -20,6 +21,7 @@ public class ComponentHydrateStatoil extends ComponentHydrate {
2021
double cavRadius[][] = new double[2][2];
2122
double cavNumb[][] = new double[2][2];
2223
double cavprwat[][] = new double[2][2];
24+
static Logger logger = Logger.getLogger(ComponentHydrateStatoil.class);
2325

2426
/** Creates new Class */
2527
public ComponentHydrateStatoil() {
@@ -123,10 +125,10 @@ public double potIntegral(int stucture, int cavityType, PhaseInterface phase) {
123125
}
124126
//System.out.println("integral " + val);
125127
if (Double.isNaN(val)) {
126-
System.out.println("val NaN ...");
128+
logger.error("val NaN ...");
127129
}
128130
if (Double.isInfinite(val)) {
129-
System.out.println("val Infinite ...");
131+
logger.error("val Infinite ...");
130132
}
131133
return val;
132134
}
@@ -138,10 +140,10 @@ public double getPot(double radius, int struccture, int cavityType, PhaseInterfa
138140
pot = Math.exp(-pot / (phase.getTemperature())) * radius * radius;
139141
//System.out.println("pot " + pot);
140142
if (Double.isNaN(pot)) {
141-
System.out.println("pot NaN ...");
143+
logger.error("pot NaN ...");
142144
}
143145
if (Double.isInfinite(pot)) {
144-
System.out.println("pot Infinite ...");
146+
logger.error("pot Infinite ...");
145147
}
146148
// System.out.println("pot " +pot);
147149
return pot;
@@ -155,10 +157,10 @@ public double delt(double n, double radius, int struccture, int cavityType) {
155157
// System.out.println("diff2 " + diff2);
156158
// System.out.println("delt " + delt);
157159
if (Double.isNaN(delt)) {
158-
System.out.println("delt NaN ...");
160+
logger.error("delt NaN ...");
159161
}
160162
if (Double.isInfinite(delt)) {
161-
System.out.println("delt Infinite ...");
163+
logger.error("delt Infinite ...");
162164
}
163165
return delt;
164166
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
package neqsim.thermo.component;
66

77
import neqsim.thermo.phase.PhaseInterface;
8+
import org.apache.log4j.Logger;
89

910
/**
1011
*
@@ -13,6 +14,7 @@
1314
public class ComponentWonWax extends ComponentSolid {
1415

1516
private static final long serialVersionUID = 1000;
17+
static Logger logger = Logger.getLogger(ComponentWonWax.class);
1618

1719
/**
1820
* Creates new SolidComponent
@@ -42,7 +44,7 @@ public double fugcoef2(PhaseInterface phase1) {
4244

4345

4446
double solidActivityCoefficient = getWonActivityCoeficient(phase1);
45-
System.out.println("activity coef Won " + solidActivityCoefficient);
47+
logger.info("activity coef Won " + solidActivityCoefficient);
4648
SolidFug = getx() * liquidPhaseFugacity * Math.exp(-getHeatOfFusion() / (R * phase1.getTemperature()) * (1.0 - phase1.getTemperature() / getTriplePointTemperature()));
4749

4850
fugasityCoeffisient = solidActivityCoefficient * SolidFug / (phase1.getPressure() * getx());

‎src/main/java/neqsim/thermo/component/atractiveEosTerm/AtractiveTermBaseClass.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
package neqsim.thermo.component.atractiveEosTerm;
2424

2525
import neqsim.thermo.component.ComponentEosInterface;
26+
import org.apache.log4j.Logger;
2627

2728
/**
2829
*
@@ -37,14 +38,17 @@ public class AtractiveTermBaseClass implements AtractiveTermInterface, Cloneable
3738
protected double m;
3839
protected double parameters[] = new double[3];
3940
protected double parametersSolid[] = new double[3];
41+
42+
static Logger logger = Logger.getLogger(AtractiveTermBaseClass.class);
43+
4044
/** Creates new AtractiveTermBaseClass */
4145
public AtractiveTermBaseClass(ComponentEosInterface component) {
4246
this.component = component;
4347
}
4448

4549
public void setm(double val){
4650
this.m = val;
47-
System.out.println("does not solve for accentric when new m is set... in AccentricBase class");
51+
logger.info("does not solve for accentric when new m is set... in AccentricBase class");
4852
}
4953

5054
public Object clone(){

‎src/main/java/neqsim/thermo/mixingRule/EosMixingRules.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import neqsim.thermo.phase.PhaseGEUnifacPSRK;
2121
import neqsim.thermo.phase.PhaseGEUnifacUMRPRU;
2222
import neqsim.thermo.phase.PhaseInterface;
23+
import org.apache.log4j.Logger;
2324

2425
/**
2526
* @author Even Solbraa
@@ -43,6 +44,8 @@ public class EosMixingRules extends Object implements Cloneable, java.io.Seriali
4344
public double nEOSkij = 3.0;
4445
public static boolean calcEOSInteractionParameters = false;
4546
private int bmixType = 0;
47+
48+
static Logger logger = Logger.getLogger(EosMixingRules.class);
4649

4750
/**
4851
* Creates new EosMixingRules
@@ -1785,7 +1788,7 @@ public EosMixingRulesInterface getMixingRule(int i, PhaseInterface phase) {
17851788
dataSet.close();
17861789
}
17871790
} catch (Exception e) {
1788-
System.out.println("err closing dataSet IN MIX...");
1791+
logger.error("err closing dataSet IN MIX...");
17891792
e.printStackTrace();
17901793
}
17911794
}
@@ -1802,7 +1805,7 @@ public EosMixingRulesInterface getMixingRule(int i, PhaseInterface phase) {
18021805
database.getConnection().close();
18031806
}
18041807
} catch (Exception e) {
1805-
System.out.println("error closing database.....");
1808+
logger.error("error closing database.....");
18061809
e.printStackTrace();
18071810
}
18081811

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

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import static neqsim.thermo.ThermodynamicConstantsInterface.referencePressure;
2828
import neqsim.thermo.component.ComponentInterface;
2929
import neqsim.thermo.system.SystemInterface;
30+
import org.apache.log4j.Logger;
3031

3132
/**
3233
*
@@ -56,6 +57,7 @@ abstract class Phase extends Object implements PhaseInterface, ThermodynamicCons
5657
int phaseType = 0, phaseTypeAtLastPhysPropUpdate = 0;
5758
protected String phaseTypeName = "gas";
5859
String phaseTypeNameAtLastPhysPropUpdate = "";
60+
static Logger logger = Logger.getLogger(Phase.class);
5961

6062
// Class methods
6163
/**
@@ -103,13 +105,13 @@ public void removeComponent(String componentName, double moles, double molesInPh
103105
temp.add(this.componentArray[i]);
104106
}
105107
}
106-
System.out.println("length " + temp.size());
108+
logger.info("length " + temp.size());
107109
for (int i = 0; i < temp.size(); i++) {
108110
this.componentArray[i] = (ComponentInterface) temp.get(i);
109111
this.getComponent(i).setComponentNumber(i);
110112
}
111113
} catch (Exception e) {
112-
System.out.println("not able to remove " + componentName);
114+
logger.error("not able to remove " + componentName);
113115
}
114116

115117
// componentArray = (ComponentInterface[])temp.toArray();
@@ -354,7 +356,7 @@ public void setPhysicalProperties(int type) {
354356
physicalProperty = new neqsim.physicalProperties.physicalPropertySystem.liquidPhysicalProperties.CO2waterPhysicalProperties(this, 0, 0);
355357
}
356358
} else if (type == 5) {
357-
System.out.println("Physical properties: Amine model");
359+
logger.info("Physical properties: Amine model");
358360
if (phaseTypeName.equals("gas")) {
359361
physicalProperty = new neqsim.physicalProperties.physicalPropertySystem.gasPhysicalProperties.GasPhysicalProperties(this, 0, 0);
360362
} else {
@@ -364,7 +366,7 @@ public void setPhysicalProperties(int type) {
364366
//System.out.println("Physical properties: common HC model");
365367
physicalProperty = new neqsim.physicalProperties.physicalPropertySystem.commonPhasePhysicalProperties.DefaultPhysicalProperties(this, 0, 0);
366368
} else {
367-
System.out.println("error selecting physical properties model.\n Continue using default model...");
369+
logger.error("error selecting physical properties model.\n Continue using default model...");
368370
setPhysicalProperties();
369371
}
370372
phaseTypeAtLastPhysPropUpdate = phaseType;
@@ -650,22 +652,22 @@ public double getCvres() {
650652
}
651653

652654
public double getHresTP() {
653-
System.out.println("feil Hres");
655+
logger.error("error Hres");
654656
return 0;
655657
}
656658

657659
public double getHresdP() {
658-
System.out.println(" getHresdP feil Hres - not implemented?");
660+
logger.error(" getHresdP error Hres - not implemented?");
659661
return 0;
660662
}
661663

662664
public double getGresTP() {
663-
System.out.println("feil Gres");
665+
logger.error("error Gres");
664666
return 0;
665667
}
666668

667669
public double getSresTV() {
668-
System.out.println("feil Hres");
670+
logger.error("error Hres");
669671
return 0;
670672
}
671673

@@ -1322,7 +1324,7 @@ public double getpH_old() {
13221324
return -neqsim.MathLib.generalMath.GeneralMath.log10(componentArray[i].getx() * getActivityCoefficient(i));
13231325
}
13241326
}
1325-
System.out.println("no H3Oplus");
1327+
logger.info("no H3Oplus");
13261328
return 7.0;
13271329
}
13281330

@@ -1337,10 +1339,10 @@ public ComponentInterface getComponent(String name) {
13371339
return componentArray[i];
13381340
}
13391341
}
1340-
System.out.println("could not find component... " + name + " ..returning null");
1342+
logger.error("could not find component... " + name + " ..returning null");
13411343
} catch (Exception e) {
1342-
System.out.println("component not found.... " + name);
1343-
System.out.println("returning first component..." + componentArray[0].getName());
1344+
logger.error("component not found.... " + name);
1345+
logger.error("returning first component..." + componentArray[0].getName());
13441346
e.printStackTrace();
13451347
}
13461348
return componentArray[0];

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
package neqsim.thermo.phase;
88

99
import neqsim.thermo.component.ComponentBWRS;
10+
import org.apache.log4j.Logger;
1011

1112
/**
1213
*
@@ -20,6 +21,8 @@ public class PhaseBWRSEos extends PhaseSrkEos{
2021
int OP = 9;
2122
int OE = 6;
2223

24+
static Logger logger = Logger.getLogger(PhaseBWRSEos.class);
25+
2326
/** Creates new P((ComponentBWRS)componentArray[0]).getBP(i)haseSrkEos */
2427
public PhaseBWRSEos() {
2528
super();
@@ -228,7 +231,7 @@ public double getFexpdT(){
228231
public double calcPressure2(){
229232
// System.out.println("here............");
230233
double temp=0.0;
231-
System.out.println("molar density " + getMolarDensity());
234+
logger.info("molar density " + getMolarDensity());
232235
for(int i=0;i<OP;i++){
233236
temp += ((ComponentBWRS)componentArray[0]).getBP(i)*Math.pow(getMolarDensity(),1.0+i);
234237
}
@@ -252,7 +255,7 @@ public void calcPVT(){
252255
temp += Math.exp(-((ComponentBWRS)componentArray[0]).getGammaBWRS()*Math.pow(moldens[j],2.0))*((ComponentBWRS)componentArray[0]).getBE(i)*Math.pow(moldens[j],3.0+2.0*i);
253256
}
254257
pres[j] = temp/100.0;
255-
System.out.println("moldens " + moldens[j]*16.01 + " pres " + pres[j]);
258+
logger.info("moldens " + moldens[j]*16.01 + " pres " + pres[j]);
256259
}
257260
}
258261

@@ -369,7 +372,7 @@ public double molarVolume2(double pressure, double temperature, double A, double
369372
iterations++;
370373
guesPres = -R*temperature*dFdV() + R*temperature/getMolarVolume();
371374
guesPresdV = -R*temperature*dFdVdV() - getNumberOfMolesInPhase()*R*temperature/Math.pow(getTotalVolume(),2.0);
372-
System.out.println("gues pres " + guesPres);
375+
logger.info("gues pres " + guesPres);
373376
setMolarVolume(getMolarVolume() - 1.0 / (guesPresdV * getNumberOfMolesInPhase()) * (guesPres - pressure) / 50.0);
374377
Z = pressure*getMolarVolume()/(R*temperature);
375378
}

0 commit comments

Comments
 (0)