Skip to content

Commit 79e0023

Browse files
Bartek Florczyk Vik (CCI RPT RES1)Bartek Florczyk Vik (CCI RPT RES1)
authored andcommitted
Fix formatting issues noted in review
1 parent 0ca5762 commit 79e0023

4 files changed

Lines changed: 9 additions & 17 deletions

File tree

docs/make_plots.py

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -552,9 +552,6 @@ def make_gasoil_condensate_cid2(show: bool = True) -> None:
552552
if show:
553553
plt.show()
554554

555-
# check_table(wog.gasoil.table)
556-
# check_table(wog.wateroil.table)
557-
558555

559556
def make_wateroil_condensate_idc2(show: bool = True) -> None:
560557
plt.xkcd()
@@ -699,12 +696,6 @@ def make_gaswater_condensate_icd2(show: bool = True) -> None:
699696
arrowprops={"arrowstyle": "->"},
700697
xytext=(swl + 0.1, krgend - 0.1),
701698
)
702-
# axes.annotate(
703-
# "KRWEND",
704-
# xy=(1 - sgrw, krwend),
705-
# arrowprops={"arrowstyle": "->"},
706-
# xytext=(1 - sgrw - 0.13, krwmax - 0.15),
707-
# )
708699
axes.annotate(
709700
"KRWEND",
710701
xy=(1 - sgrw, krwend),

docs/modelling.rst

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,10 @@ dropout can occur it should be modelled as a three-phase simulation.
134134
-
135135

136136
Wet gas/condensate field (ICD2, CID2, IDC2)
137-
---------------------------------------------------
137+
-------------------------------------------
138138

139-
This field scenario is for a three-phase Eclipse simulation allowing for condendsate dropout (oil displacing gas) in addition to water displacing both gas and oil.
139+
This field scenario is for a three-phase Eclipse simulation allowing for condendsate
140+
dropout (oil displacing gas) in addition to water displacing both gas and oil.
140141
The figure below illustrates different regions and processes in a wet gas/condensate field.
141142

142143
.. image:: images/wet-condensate_field_illustration.png
@@ -157,7 +158,7 @@ Following processes are associated with the regions depicted in the figure above
157158
* - 3
158159
- CID2 & IDC2
159160

160-
Three-Phase Consistency Requirements:
161+
Three-phase consistency requirements:
161162

162163
- **SWL**: The same input must be used for all three flow scenarios.
163164
- The following relationships must hold: **SGRW** = **SGCR** = **SGRO** = **SORW**
@@ -207,7 +208,7 @@ This is the main process for a gas/condensate field.
207208

208209
Oil displacing gas (CID2)
209210
~~~~~~~~~~~~~~~~~~~~~~~~~~
210-
This is the process for condendsate dropout.
211+
This is the process for condensate dropout.
211212

212213
.. image:: images/gasoil-condensate-cid2.png
213214
:width: 600

src/pyscal/factory.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1411,12 +1411,12 @@ def check_deprecated(params: dict[str, Any]) -> None:
14111411
# Remove this block in pyscal 1.x
14121412
if "krowend" in params and "kroend" not in params:
14131413
raise ValueError(
1414-
"krowend is not supported by pyscal for WaterOil and GasOil objects."
1414+
"krowend is not supported by pyscal for WaterOil and GasOil objects. "
14151415
"Use kroend"
14161416
)
14171417
if "krogend" in params and "kroend" not in params:
14181418
raise ValueError(
1419-
"krogend is not supported by pyscal for WaterOil and GasOil objects."
1419+
"krogend is not supported by pyscal for WaterOil and GasOil objects. "
14201420
"Use kroend"
14211421
)
14221422

tests/test_factory.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1128,10 +1128,10 @@ def test_check_deprecated_krowgend():
11281128
"""Up until pyscal 0.5.x, krogend and krowend were parameters
11291129
to the oil curve parametrization for WaterOil and GasOil. From
11301130
pyscal 0.6.0, krogend and krowend are merged to kroend.
1131-
After pyscal 0.8 presence of krogend and krowend is a ValueError
1131+
After pyscal 0.8 presence of krogend and krowend is a ValueError.
11321132
After pyscal 0.16 presence krogend and krowend is accepted as
11331133
parameters for create_wateroilgas, but is still ValueError for
1134-
create_water_oil and create_gas_oil is a
1134+
create_water_oil and create_gas_oil.
11351135
"""
11361136
with pytest.raises(ValueError):
11371137
create_water_oil({"swl": 0.1, "nw": 2, "now": 2, "krowend": 0.4})

0 commit comments

Comments
 (0)