Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

check_swatinit changed tolerance for comparing SWAT and SWATINIT #694

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
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
8 changes: 4 additions & 4 deletions src/subscript/check_swatinit/check_swatinit.py
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ def qc_flag(qc_frame: pd.DataFrame) -> pd.DataFrame:

contact = "OWC" if "OWC" in qc_frame else "GWC"

# Eclipse and libecl does not calculate cell centres to the same decimals.
# Eclipse and ResData does not calculate cell centres to the same decimals.
# Add some tolerance when testing towards fluid contacts.
contacttolerance = 1e-4

Expand All @@ -338,7 +338,7 @@ def qc_flag(qc_frame: pd.DataFrame) -> pd.DataFrame:

# SWATINIT accepted and PC is scaled.
qc_col[
np.isclose(qc_frame["SWAT"], qc_frame["SWATINIT"], atol=1e-6)
np.isclose(qc_frame["SWAT"], qc_frame["SWATINIT"], atol=1e-3)
& (qc_frame["SWATINIT"] < 1)
] = __PC_SCALED__

Expand All @@ -347,7 +347,7 @@ def qc_flag(qc_frame: pd.DataFrame) -> pd.DataFrame:
# matches PCOW_MAX and PC_SCALING is 1. We denote this as __PC_SCALED__
# because it is "scaled" by 1.
qc_col[
np.isclose(qc_frame["SWAT"], qc_frame["SWATINIT"], atol=1e-6)
np.isclose(qc_frame["SWAT"], qc_frame["SWATINIT"], atol=1e-3)
& np.isclose(qc_frame["PC_SCALING"], 1)
] = __PC_SCALED__

Expand All @@ -363,7 +363,7 @@ def qc_flag(qc_frame: pd.DataFrame) -> pd.DataFrame:
if "OIP_INIT" in qc_frame and "PC_SCALING" in qc_frame:
qc_col[
(~np.isclose(qc_frame["OIP_INIT"], 0))
& (~np.isclose(qc_frame["SWAT"], qc_frame["SWATINIT"], atol=1e-6))
& (~np.isclose(qc_frame["SWAT"], qc_frame["SWATINIT"], atol=1e-3))
& (~pd.isnull(qc_frame["PC_SCALING"]))
] = __FINE_EQUIL__

Expand Down