Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,6 @@ ENV/
# SNYK
.dccache
poetry.lock

test_gasoilprocess.zip
test_gasoilprocess.neqsim
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
# See https://pre-commit.com/hooks.html for more hooks
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v3.2.0
rev: v5.0.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
- id: check-yaml
- id: check-added-large-files
- repo: https://github.com/psf/black
rev: 23.12.1
rev: 24.10.0
hooks:
- id: black
18 changes: 9 additions & 9 deletions examples/propertiesDataframes.py
Original file line number Diff line number Diff line change
Expand Up @@ -146,9 +146,9 @@ def calcProperties(frame):
frame["gasmolfraction[mol/mol]"] = gascondensateFluid.getMoleFraction(
phaseNumber
)
frame[
"gasvolumefraction[mol/mol]"
] = gascondensateFluid.getCorrectedVolumeFraction(phaseNumber)
frame["gasvolumefraction[mol/mol]"] = (
gascondensateFluid.getCorrectedVolumeFraction(phaseNumber)
)
frame["gasthermalconductivity[W/mK]"] = gascondensateFluid.getPhase(
phaseNumber
).getThermalConductivity("W/mK")
Expand All @@ -164,9 +164,9 @@ def calcProperties(frame):
frame["oilmolfraction[mol/mol]"] = gascondensateFluid.getMoleFraction(
phaseNumber
)
frame[
"oilvolumefraction[mol/mol]"
] = gascondensateFluid.getCorrectedVolumeFraction(phaseNumber)
frame["oilvolumefraction[mol/mol]"] = (
gascondensateFluid.getCorrectedVolumeFraction(phaseNumber)
)
frame["oilthermalconductivity[W/mK]"] = gascondensateFluid.getPhase(
phaseNumber
).getThermalConductivity("W/mK")
Expand All @@ -179,9 +179,9 @@ def calcProperties(frame):
frame["oilmolfraction[mol/mol]"] = gascondensateFluid.getMoleFraction(
phaseNumber
)
frame[
"oilvolumefraction[mol/mol]"
] = gascondensateFluid.getCorrectedVolumeFraction(phaseNumber)
frame["oilvolumefraction[mol/mol]"] = (
gascondensateFluid.getCorrectedVolumeFraction(phaseNumber)
)
frame["oilthermalconductivity[W/mK]"] = gascondensateFluid.getPhase(
phaseNumber
).getThermalConductivity("W/mK")
Expand Down
1 change: 0 additions & 1 deletion src/neqsim/__init__.py → neqsim/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"""

from neqsim.neqsimpython import jneqsim, jpype
import gzip


def methods(checkClass):
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading