Skip to content

Small fix to allow 1D domains #33

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.

Sign up for GitHub

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

Merged
daavid00 merged 1 commit into from
Jan 8, 2026
Merged

Small fix to allow 1D domains #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .github/workflows/CI.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:

- name: Run the tests
run: |
pytest -x --cov=expreccs --cov-report term-missing tests/
pytest --cov=expreccs --exitfirst --cov-report term-missing tests/

- name: Build documentation
run: |
Expand Down
4 changes: 2 additions & 2 deletions src/expreccs/templates/decks/reference.mako
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,9 +257,9 @@ BASIC=2 DEN PCGW FLOWS${" FLOWS-" if dic["iterations"] > 0 else ""} /
WELSPECS
% for i in range(len(dic['reference_wellijk'])):
% if i < len(dic["site_wellijk"]):
INJS${i} G1 ${dic['reference_wellijk'][i][0]} ${dic['reference_wellijk'][i][1]} 1* GAS /
INJS${i} G1 ${dic['reference_wellijk'][i][0]} ${dic['reference_wellijk'][i][1]} 1* ${'GAS 'if dic['inj'][0][1][2*i] > 0 else 'WAT'} /
% else:
INJR${i-len(dic["site_wellijk"])} G1 ${dic['reference_wellijk'][i][0]} ${dic['reference_wellijk'][i][1]} 1* GAS /
INJR${i-len(dic["site_wellijk"])} G1 ${dic['reference_wellijk'][i][0]} ${dic['reference_wellijk'][i][1]} 1* ${'GAS 'if dic['inj'][0][1][2*i] > 0 else 'WAT'} /
% endif
% endfor
/
Expand Down
4 changes: 2 additions & 2 deletions src/expreccs/templates/decks/regional.mako
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,9 +205,9 @@ BASIC=2 DEN PCGW FLOWS${" FLOWS-" if dic["iterations"] > 0 else ""} /
WELSPECS
% for i in range(len(dic['regional_wellijk'])):
% if i < len(dic["site_wellijk"]):
INJS${i} G1 ${dic['regional_wellijk'][i][0]} ${dic['regional_wellijk'][i][1]} 1* GAS /
INJS${i} G1 ${dic['regional_wellijk'][i][0]} ${dic['regional_wellijk'][i][1]} 1* ${'GAS 'if dic['inj'][0][1][2*i] > 0 else 'WAT'} /
% else:
INJR${i-len(dic["site_wellijk"])} G1 ${dic['regional_wellijk'][i][0]} ${dic['regional_wellijk'][i][1]} 1* GAS /
INJR${i-len(dic["site_wellijk"])} G1 ${dic['regional_wellijk'][i][0]} ${dic['regional_wellijk'][i][1]} 1* ${'GAS 'if dic['inj'][0][1][2*i] > 0 else 'WAT'} /
% endif
% endfor
/
Expand Down
2 changes: 1 addition & 1 deletion src/expreccs/templates/decks/site.mako
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ BASIC=2 DEN PCGW FLOWS${" FLOWS-" if dic["iterations"] > 0 else ""} /

WELSPECS
% for i in range(len(dic['site_wellijk'])):
INJS${i} G1 ${dic['site_wellijk'][i][0]} ${dic['site_wellijk'][i][1]} 1* GAS /
INJS${i} G1 ${dic['site_wellijk'][i][0]} ${dic['site_wellijk'][i][1]} 1* ${'GAS 'if dic['inj'][0][1][2*i] > 0 else 'WAT'} /
% endfor
% if dic['site_bctype'][0] == 'wells':
BCINJ0 W ${mt.ceil(dic['site_num_cells'][0]/2)} 1 1* WAT /
Expand Down
23 changes: 12 additions & 11 deletions src/expreccs/utils/mapproperties.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,18 +320,19 @@ def positions_site(dic):
dic["site_wellijk"][j].append(
pd.Series(np.abs(well_coord - midpoints)).argmin() + 1
)
for k, cord in enumerate(["xmx", "ymy", "zmz"]):
midpoints = dic[f"site_{cord}_mid"]
if k < 2:
dic["site_fault"][0][k] = pd.Series(
np.abs(dic["fault_site"][0][k] - midpoints)
if dic["fault_site"][-1][0] != 1 and dic["fault_site"][-1][1] != 1:
for k, cord in enumerate(["xmx", "ymy", "zmz"]):
midpoints = dic[f"site_{cord}_mid"]
if k < 2:
dic["site_fault"][0][k] = pd.Series(
np.abs(dic["fault_site"][0][k] - midpoints)
).argmin()
dic["site_fault"][1][k] = pd.Series(
np.abs(dic["fault_site"][1][k] - midpoints)
).argmin()
dic["site_sensor"][k] = pd.Series(
np.abs(dic["sensor_coords"][k] - midpoints)
).argmin()
dic["site_fault"][1][k] = pd.Series(
np.abs(dic["fault_site"][1][k] - midpoints)
).argmin()
dic["site_sensor"][k] = pd.Series(
np.abs(dic["sensor_coords"][k] - midpoints)
).argmin()


def positions_reference(dic):
Expand Down