Skip to content

Commit

Permalink
Linting
Browse files Browse the repository at this point in the history
  • Loading branch information
berland committed Jun 26, 2019
1 parent 7c68b17 commit 6d9c7a0
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 36 deletions.
22 changes: 13 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,29 @@

Python module for relative permeability/SCAL support in reservoir simulation

### Feature overview
## Feature overview

* API to create relative permeability curves through correlations or tables
* Similar for capillary pressure.
* Consistency checks for three-phase setups, makes your oil-water tables and gas-oil tables compatible
* Support for handling uncertainty, doing book-keeping for low, base and high cases, and the possiblity
to interpolate between these cases using a number from -1 to +1.
* API to create relative permeability curves through correlations or tables

* Similar for capillary pressure.

* Consistency checks for three-phase setups, makes your oil-water tables and gas-oil tables compatible

* Support for handling uncertainty, doing book-keeping for low, base and high cases, and the possiblity
to interpolate between these cases using a number from -1 to +1.

## Scripts

There will eventually be some end-user scripts for this module
* create_relperm.py - will read configation from Excel worksheets with parameters, and produce Eclipse include files
* interpolate_relperm.py - reads low-base-high Eclipse include files, and interpolates between them

* create_relperm.py - will read configation from Excel worksheets with parameters, and produce Eclipse include files
* interpolate_relperm.py - reads low-base-high Eclipse include files, and interpolates between them

## Library usage

Illustrative example of how to produce a SWOF include file for Eclipse
with a Corey relative permeability curve

```python
from pyscal import WaterOil

Expand Down Expand Up @@ -51,4 +56,3 @@ SWOF
1.0000000 1.0000000 0.0000000 0
/
```

2 changes: 1 addition & 1 deletion bandit.yml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
skips: ['B101']
skips: ['B101', 'B311']
2 changes: 1 addition & 1 deletion pyscal/gasoil.py
Original file line number Diff line number Diff line change
Expand Up @@ -570,7 +570,7 @@ def plotkrgkrog(

if not ax:
matplotlib.style.use("ggplot")
fig, useax = matplotlib.pyplot.subplots()
_, useax = matplotlib.pyplot.subplots()
else:
useax = ax
self.table.plot(
Expand Down
1 change: 0 additions & 1 deletion pyscal/scalrecommendation.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# -*- coding: utf-8 -*-

import math
import copy
import numpy as np
import pandas as pd
Expand Down
3 changes: 0 additions & 3 deletions pyscal/wateroilgas.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# -*- coding: utf-8 -*-

import math
import copy
import numpy as np
import pandas as pd

Expand Down Expand Up @@ -155,7 +153,6 @@ def run_eclipse_test(self):
import tempfile
import os
import subprocess
import re

ecldeckbeforeprops = """RUNSPEC
DIMENS
Expand Down
3 changes: 0 additions & 3 deletions tests/test_gasoil.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
from __future__ import division
from __future__ import print_function

import os
import sys
import pytest
from hypothesis import given
import hypothesis.strategies as st

Expand Down
5 changes: 0 additions & 5 deletions tests/test_wateroil.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,9 @@
from __future__ import division
from __future__ import print_function

import os
import sys
import pytest
from hypothesis import given
import hypothesis.strategies as st

import pandas as pd

from pyscal import WaterOil


Expand Down
8 changes: 0 additions & 8 deletions tests/test_wateroil_pc.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,6 @@
from __future__ import division
from __future__ import print_function

import os
import sys
import pytest
from hypothesis import given
import hypothesis.strategies as st

import pandas as pd

from pyscal import WaterOil


Expand Down
5 changes: 0 additions & 5 deletions tests/test_wateroil_saturation.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,9 @@
from __future__ import division
from __future__ import print_function

import os
import sys
import pytest
from hypothesis import given
import hypothesis.strategies as st

import pandas as pd

from pyscal import WaterOil


Expand Down

0 comments on commit 6d9c7a0

Please sign in to comment.