Skip to content

Commit e610d14

Browse files
authored
Added Vega EOS modell(helmholtz free energy) for helium (#1278)
* Added Vega EOS modell(helmholtz free energy) for helium * Update Vega.java * Ran mvn javadoc:fix
1 parent d7cf0b1 commit e610d14

File tree

8 files changed

+1112
-13
lines changed

8 files changed

+1112
-13
lines changed

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

+19-6
Original file line numberDiff line numberDiff line change
@@ -2230,6 +2230,20 @@ public double[] getProperties_GERG2008() {
22302230

22312231
/** {@inheritDoc} */
22322232
@Override
2233+
2234+
public double getDensity_Vega() {
2235+
neqsim.thermo.util.Vega.NeqSimVega test = new neqsim.thermo.util.Vega.NeqSimVega(this);
2236+
return test.getDensity();
2237+
}
2238+
2239+
/** {@inheritDoc} */
2240+
@Override
2241+
public double[] getProperties_Vega() {
2242+
neqsim.thermo.util.Vega.NeqSimVega test = new neqsim.thermo.util.Vega.NeqSimVega(this);
2243+
return test.propertiesVega();
2244+
}
2245+
2246+
22332247
public double getDensity_Leachman(String hydrogenType) {
22342248
neqsim.thermo.util.leachman.NeqSimLeachman test =
22352249
new neqsim.thermo.util.leachman.NeqSimLeachman(this, hydrogenType);
@@ -2260,18 +2274,17 @@ public double[] getProperties_Leachman(String hydrogenType) {
22602274

22612275

22622276
/**
2263-
* Gets the Leachman properties of a phase using the default hydrogen type ('normal').
2264-
* This method prints a warning if no hydrogen type is specified.
2265-
*
2266-
* @return an array of properties of type double.
2267-
*/
2277+
* Gets the Leachman properties of a phase using the default hydrogen type ('normal').
2278+
* This method prints a warning if no hydrogen type is specified.
2279+
*
2280+
* @return an array of properties of type double.
2281+
*/
22682282
public double[] getProperties_Leachman() {
22692283
// Warn the user and use the default hydrogen type
22702284
System.out.println("No hydrogen type specified. Using default type: 'normal'.");
22712285
return getProperties_Leachman("normal");
22722286
}
22732287

2274-
22752288
/** {@inheritDoc} */
22762289
@Override
22772290
public double getDensity_AGA8() {

src/main/java/neqsim/thermo/phase/PhaseHydrate.java

+2
Original file line numberDiff line numberDiff line change
@@ -111,11 +111,13 @@ public void init(double totalNumberOfMoles, int numberOfComponents, int initType
111111
setType(PhaseType.HYDRATE);
112112
}
113113

114+
/** {@inheritDoc} */
114115
@Override
115116
public MixingRulesInterface getMixingRule() {
116117
return null;
117118
}
118119

120+
/** {@inheritDoc} */
119121
@Override
120122
public void setMixingRuleGEModel(String name) {}
121123

src/main/java/neqsim/thermo/phase/PhaseInterface.java

+24-5
Original file line numberDiff line numberDiff line change
@@ -419,10 +419,10 @@ public default void initPhysicalProperties(String name) {
419419
*/
420420
public double[] getProperties_GERG2008();
421421

422-
422+
423423
/**
424424
* method to get Leachman density of a phase using the Leachman EoS.
425-
*
425+
*
426426
* @param hydrogenType Supported types are 'normal', 'para', 'ortho'
427427
* @return density with unit kg/m3
428428
*/
@@ -441,18 +441,37 @@ public default void initPhysicalProperties(String name) {
441441
* </p>
442442
*
443443
* @return an array of type double
444+
* @param hydrogenType a {@link java.lang.String} object
444445
*/
445-
446446
public double[] getProperties_Leachman(String hydrogenType);
447447

448448
/**
449449
* Overloaded method to get the Leachman properties with default hydrogen type ('normal').
450450
*
451451
* @return density with unit kg/m3
452452
*/
453-
454453
public double[] getProperties_Leachman();
455454

455+
456+
457+
458+
/**
459+
* method to get helium density of a phase using the Vega EoS.
460+
*
461+
* @return density with unit kg/m3
462+
*/
463+
public double getDensity_Vega();
464+
465+
/**
466+
* <p>
467+
* method to get helium properties of a phase using the Vega EoS.
468+
* </p>
469+
*
470+
* @return an array of type double
471+
*/
472+
public double[] getProperties_Vega();
473+
474+
456475
/**
457476
* method to get density of a phase note: does not use Peneloux volume correction.
458477
*
@@ -725,7 +744,7 @@ public default void initPhysicalProperties(String name) {
725744

726745
/**
727746
* Normalize property <code>x</code>.
728-
*
747+
*
729748
* <p>
730749
* Property <code>x</code> is the mole fraction of a component in a specific phase. Normalizing,
731750
* means that the sum of <code>x</code> for all Components in a phase equal 1.0.

0 commit comments

Comments
 (0)