Skip to content

Commit e31b7c8

Browse files
committed
updates
1 parent 9a144e4 commit e31b7c8

2 files changed

Lines changed: 10 additions & 9 deletions

File tree

examples/fluidCreation.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,10 +169,10 @@
169169
oil_plus.addComponent("n-hexane", 3.0)
170170

171171
# Add C7+ as plus fraction (32 mol%, MW=200 g/mol, density=800 kg/m³)
172-
oil_plus.addPlusFraction("C7+", 32.0, 0.200, 800.0)
172+
oil_plus.addPlusFraction("C7", 32.0, 0.200, 800.0)
173173

174174
# Characterize the plus fraction into 6 pseudo-components
175-
oil_plus.getCharacterization().setNumberOfPseudoComponents(6)
175+
oil_plus.getCharacterization().getLumpingModel().setNumberOfPseudoComponents(6)
176176
oil_plus.getCharacterization().characterisePlusFraction()
177177

178178
oil_plus.setMixingRule("classic")

examples/multiphaseMeter.py

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -384,13 +384,14 @@
384384
fluidDefinedComponents = createfluid2(
385385
definedComponents, definedmolefractions, "mol/sec"
386386
)
387-
characterizedFluid = addOilFractions(
387+
addOilFractions(
388388
fluidDefinedComponents,
389389
oilComponents,
390390
oilComponentsMoleFractions,
391391
oilComponentsMolarMass,
392392
oilComponentsRelativeDensity,
393393
)
394+
characterizedFluid = fluidDefinedComponents
394395

395396
characterizedFluid.setTemperature(15.0, "C")
396397
characterizedFluid.setPressure(1.0, "atm")
@@ -545,12 +546,12 @@
545546
oilDensity = numpy.zeros((numP, numT))
546547
GORcalc = numpy.zeros((numP, numT))
547548
GORactual = numpy.zeros((numP, numT))
548-
gasViscosity[:] = np.NaN
549-
oilViscosity[:] = np.NaN
550-
gasDensity[:] = np.NaN
551-
oilDensity[:] = np.NaN
552-
GORcalc[:] = np.NaN
553-
GORactual[:] = np.NaN
549+
gasViscosity[:] = np.nan
550+
oilViscosity[:] = np.nan
551+
gasDensity[:] = np.nan
552+
oilDensity[:] = np.nan
553+
GORcalc[:] = np.nan
554+
GORactual[:] = np.nan
554555

555556
for i in range(len(temperatures)):
556557
for j in range(len(pressures)):

0 commit comments

Comments
 (0)