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

Checking if AMFG works #2

Open
wants to merge 141 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
Show all changes
141 commits
Select commit Hold shift + click to select a range
74efec3
Initial commit
fmortier Oct 5, 2023
de4e144
First iteration of co2 mass maps.
AudunSektnanNR Jun 21, 2023
0dc7b4b
Update README.md
fmortier Oct 6, 2023
f1eed68
Update README.md
fmortier Oct 9, 2023
cb1fe57
Add all files for CO2 containment, plume extent and plume area, copie…
AudunSektnanNR Oct 9, 2023
5443e1f
Merge pull request #1 from equinor/br_as
AudunSektnanNR Oct 9, 2023
907b2e3
Second iteration of co2 mass maps.
AudunSektnanNR Oct 10, 2023
8b7dcc3
Fix a bug related to dataio output with diffdates
jcrivenaes Oct 12, 2023
88ad2c5
Create ccs_scripts.yml
AudunSektnanNR Oct 16, 2023
70764b3
Add pyproject.toml.
AudunSektnanNR Oct 16, 2023
06a566b
Try to fix pytest.
AudunSektnanNR Oct 16, 2023
5a4bfc0
Add init-file
AudunSektnanNR Oct 16, 2023
4099002
Add Reek data for tests.
AudunSektnanNR Oct 16, 2023
4b86e74
Add gitignore.
AudunSektnanNR Oct 16, 2023
d32b93d
Minor fix.
AudunSektnanNR Oct 16, 2023
6415d19
Add .flake8
AudunSektnanNR Oct 16, 2023
25bdb11
Minor change.
AudunSektnanNR Oct 16, 2023
808f0f0
Minor fix flake8.
AudunSektnanNR Oct 16, 2023
971187d
Minor fix, black formating checks.
AudunSektnanNR Oct 16, 2023
16a40ce
Create codecov.yml
AudunSektnanNR Oct 16, 2023
abaf8b6
Add init for tests.
AudunSektnanNR Oct 16, 2023
bfa472d
Update codecov.yml
AudunSektnanNR Oct 16, 2023
a43010e
Update codecov.yml
AudunSektnanNR Oct 16, 2023
a73c131
Update codecov.yml
AudunSektnanNR Oct 16, 2023
401b292
Update ccs_scripts.yml
AudunSektnanNR Oct 18, 2023
4d7d6a1
Third iteration of co2 mass maps.
AudunSektnanNR Oct 19, 2023
3e248d1
Fourth iteration of co2 mass maps.
AudunSektnanNR Oct 19, 2023
7c853f5
Replace usage of the deprecated pkg_resource
JHolba Oct 23, 2023
880d4f3
CO2 mass into List of GridProperty
jorgesicachanr Oct 27, 2023
95ae516
Update grid3d_co2_mass.py
jorgesicachanr Oct 27, 2023
157034c
Add SECURITY.md
tnatt Oct 31, 2023
e9a4b56
Add co2_mass_property_to_map to grid3d_co2_mass
jorgesicachanr Nov 8, 2023
ed8c37d
Temporary solution to issue
jorgesicachanr Nov 8, 2023
f8c5dbc
Create config_co2_mass.yml
jorgesicachanr Nov 8, 2023
3c83181
Latest small changes
jorgesicachanr Nov 8, 2023
9e1cdf5
Update grid3d_co2_mass.py
jorgesicachanr Nov 8, 2023
bf5987c
Update grid3d_co2_mass.py
jorgesicachanr Nov 8, 2023
54e9da0
Merge pull request #1 from jorgesicachanr/patch-1
AudunSektnanNR Nov 8, 2023
094a20f
Move to pyproject.toml based package
mferrera Nov 9, 2023
83b4322
Use default factory in `RootConfig` dataclass
mferrera Nov 9, 2023
4b7e8bd
Lint with isort
mferrera Nov 9, 2023
c4e129d
Lint with flake8
mferrera Nov 9, 2023
6f34ca3
Lint with black
mferrera Nov 9, 2023
0606329
Update ci workflows
mferrera Nov 9, 2023
508f21b
Pin numpy<2
mferrera Nov 9, 2023
21c6ae8
Add PyPI publish workflow
mferrera Nov 9, 2023
6e795b0
Update README
mferrera Nov 9, 2023
f134c00
Co2 mass maps: Minor iteration.
Nov 13, 2023
8e820ae
Merge pull request #1 from AudunSektnanNR/co2_mass_maps2
jorgesicachanr Nov 13, 2023
0605921
Example of yml config file for CO2 mass maps
jorgesicachanr Nov 13, 2023
414c583
Update co2_mass_yaml_example.yml
jorgesicachanr Nov 13, 2023
52c804a
Replace ecl with resdata
DanSava Nov 17, 2023
042b256
Fix lint after ecl -> resdata.
AudunSektnanNR Nov 21, 2023
f29717f
Update _co2_mass.py to compute CO2 mass per phase
jorgesicachanr Nov 22, 2023
188522c
Update grid3d_co2_mass.py for co2 maps per phase
jorgesicachanr Nov 22, 2023
ec72873
Add #!/usr/bin/env python to grid3d_co2_mass.py
jorgesicachanr Nov 22, 2023
21280a6
Changing CR/LF for LF
jorgesicachanr Nov 22, 2023
d43fcc7
Solve numerical issues in co2_molar_volume calculations
jorgesicachanr Oct 19, 2023
21c2b8d
Solving issue with zone input
jorgesicachanr Oct 19, 2023
526f16e
Flatten zone.values.data correctly
jorgesicachanr Oct 20, 2023
ceb71e4
Last few changes
jorgesicachanr Oct 20, 2023
549376f
Reformatted code with black
jorgesicachanr Oct 20, 2023
c1b87fe
Update co2_calculation.py
jorgesicachanr Oct 20, 2023
93c30da
Add line at the top of the script.
AudunSektnanNR Nov 2, 2023
6b72c1b
Make calc_type_input required instead of optional.
AudunSektnanNR Nov 2, 2023
47abca8
CCS-40: First attempt at fix.
Nov 5, 2023
fefa1a0
CCS-40: Some fixes.
AudunSektnanNR Nov 5, 2023
83db381
CCS-40: Minor fixes.
AudunSektnanNR Nov 6, 2023
4dcbf9e
Removal of volume actual simple
FredrikNevjenNR Nov 14, 2023
6298561
Removal of simple volume
FredrikNevjenNR Nov 14, 2023
c294062
New default output names
FredrikNevjenNR Nov 15, 2023
5c503de
Require well name OR coords
FredrikNevjenNR Nov 16, 2023
d36db6f
Require well name OR coords
FredrikNevjenNR Nov 16, 2023
9b5c7ff
Minor fix, documentation
FredrikNevjenNR Nov 16, 2023
45b8068
Accept abs paths or root_dir and rel
FredrikNevjenNR Nov 21, 2023
497c15d
Remove hack
FredrikNevjenNR Nov 21, 2023
764d218
Remove extension from grid input
FredrikNevjenNR Nov 21, 2023
e603c73
Fix test scripts according to script changes
FredrikNevjenNR Nov 21, 2023
292bc7b
Minor fix
FredrikNevjenNR Nov 21, 2023
c8f8d56
Fix formatting and tests
FredrikNevjenNR Nov 21, 2023
7e54370
Fix formatting
FredrikNevjenNR Nov 21, 2023
0a1b261
Set default root_dir. Unify date format.
FredrikNevjenNR Nov 21, 2023
b34c55e
Keep only date_list
FredrikNevjenNR Nov 23, 2023
ac061d9
Fix grammar
FredrikNevjenNR Nov 23, 2023
4db6c5c
Fix bug in water density calculation
FredrikNevjenNR Nov 23, 2023
2b1ec54
Change outputname to plume_x
FredrikNevjenNR Nov 23, 2023
6e1a8ad
Unify capitalization of date in header of output
FredrikNevjenNR Nov 23, 2023
55a97f2
Remove . in line 20
jorgesicachanr Nov 27, 2023
10a5500
Export CO2 mass gridproperties in the /grid folder
jorgesicachanr Nov 27, 2023
eca937f
Add aggregated example nr 6 to docs (#104)
asnyv Nov 28, 2023
1b5e40d
Create GRID3D_CO2_MASS
jorgesicachanr Nov 28, 2023
e972100
Delete tests/yaml/co2_mass_yaml_example.yml
jorgesicachanr Nov 28, 2023
4587fa0
Merge pull request #2 from jorgesicachanr/patch-1
AudunSektnanNR Nov 29, 2023
90539b0
Update _co2_mass.py
jorgesicachanr Dec 4, 2023
6e81bf2
Merge pull request #3 from jorgesicachanr/patch-1
AudunSektnanNR Dec 4, 2023
dd6b688
Update _co2_mass.py
jorgesicachanr Dec 4, 2023
b7998dc
Enable choice of which maps to produce
jorgesicachanr Dec 6, 2023
0e5241b
Add mode option to CO2MassSettings in _config.py
jorgesicachanr Dec 6, 2023
21f6eb3
grid3d_co2_mass.py with choice of maps to produce
jorgesicachanr Dec 6, 2023
8ca7895
Update _co2_mass.py
jorgesicachanr Dec 6, 2023
b91593b
maps for mode in grid3d_co2_mass.py
jorgesicachanr Dec 6, 2023
c470e9c
maps for mode in _config.py
jorgesicachanr Dec 6, 2023
a1c8769
maps for mode in _co2_mass.py
jorgesicachanr Dec 6, 2023
fdf1deb
Dealing with empty 'maps'
jorgesicachanr Dec 6, 2023
4d983d4
Update _co2_mass.py
jorgesicachanr Dec 6, 2023
b959ad2
Update _co2_mass.py
jorgesicachanr Dec 6, 2023
84354aa
Update README.md
fmortier Dec 11, 2023
75ed900
Merge latest code developments into main branch (#68)
AudunSektnanNR Dec 12, 2023
7907ee7
Update README.md
AudunSektnanNR Dec 19, 2023
a8a0d90
Clean _co2_mass.py
jorgesicachanr Dec 20, 2023
06057cc
Clean grid3d_co2_mass.py
jorgesicachanr Dec 20, 2023
a77bcaf
Merge pull request #4 from jorgesicachanr/patch-1
AudunSektnanNR Dec 20, 2023
01c47f4
Hack for aggregate maps and YAML support for zone file (#5)
FredrikNevjenNR Dec 21, 2023
b06da46
Naming convention for mass files (#6)
FredrikNevjenNR Dec 22, 2023
a24bca7
Update migration_time1.yml
jorgesicachanr Jan 4, 2024
8ac6490
Update test_scripts.yml
jorgesicachanr Jan 4, 2024
062bf47
Update migration_time1.yml
jorgesicachanr Jan 4, 2024
50c66c0
Update _grid_aggregation.py
jorgesicachanr Jan 4, 2024
a6c0fb4
Update _grid_aggregation.py
jorgesicachanr Jan 4, 2024
623f6c2
Fix formatting and clean up code
FredrikNevjenNR Jan 4, 2024
2ed2912
Update migration_time1.yml
jorgesicachanr Jan 4, 2024
bb3df3c
Update migration_time1.yml
jorgesicachanr Jan 4, 2024
af03e5d
Update migration_time1.yml
jorgesicachanr Jan 4, 2024
d666b26
Update migration_time1.yml
jorgesicachanr Jan 4, 2024
ce96562
Update migration_time1.yml
jorgesicachanr Jan 4, 2024
1bb3c08
Update migration_time1.yml
jorgesicachanr Jan 4, 2024
c872c92
Update test_grid3d_migration_time.py
jorgesicachanr Jan 4, 2024
781a4a4
Remove TODO
FredrikNevjenNR Jan 5, 2024
fd5c691
Remove unused code
FredrikNevjenNR Jan 5, 2024
8ac39b4
Merge pull request #8 from AudunSektnanNR/branch_fn
FredrikNevjenNR Jan 5, 2024
ffe151b
Merge branch 'master' into develop
FredrikNevjenNR Jan 5, 2024
e3ea406
Squashed 'ccs_subscript_test/' content from commit 7907ee7
jorgesicachanr Jan 17, 2024
eaba568
Merge commit 'e3ea406d6f9848b49ba5d6b8a9dec435f0aa076e' as 'ccs_subsc…
jorgesicachanr Jan 17, 2024
8b9d46d
Your commit message here
jorgesicachanr Jan 17, 2024
66764a7
Add 'ccs_scripts_js/' from commit '7907ee763c1e5d9ec16df8889e7ba4ca6e…
jorgesicachanr Jan 17, 2024
8a28e13
Handle duplicate code
jorgesicachanr Jan 23, 2024
42b1476
Solved conflicts
jorgesicachanr Jan 23, 2024
9fe36c0
Merge remote-tracking branch 'origin/patch-1' into myfork_patch-2
jorgesicachanr Jan 23, 2024
d122455
Merge remote-tracking branch 'origin/patch-1' into patch-2
jorgesicachanr Jan 23, 2024
c40f9ac
Few small changes
jorgesicachanr Jan 23, 2024
772cabc
Edit sample config file
jorgesicachanr Jan 23, 2024
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
4 changes: 4 additions & 0 deletions .flake8
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[flake8]
max-line-length = 88
ignore = E402, W503, E203, C901
exclude = docs/conf.py, version.py
14 changes: 8 additions & 6 deletions .github/actions/build-xtgeoapp-grd3dmaps/action.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Build
description: builds xtgeoapp-grd3dmaps
description: Builds xtgeoapp-grd3dmaps

inputs:
python-version:
@@ -9,14 +9,16 @@ runs:
using: "composite"
steps:
- name: Set up Python
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: ${{ inputs.python-version }}

- name: Upgrade pip
run: python -m pip install "pip<22.0.4"
- name: Install xtgeoapp-grd3maps
run: |
python -m pip install -U pip
pip install .
shell: bash

- name: install xtgeoapp-grd3maps
run: pip install .
- name: List all installed packages
run: pip freeze
shell: bash
2 changes: 1 addition & 1 deletion .github/actions/test_setup/action.yml
Original file line number Diff line number Diff line change
@@ -11,5 +11,5 @@ runs:
- uses: "./.github/actions/build-xtgeoapp-grd3dmaps"
with:
python-version: ${{ inputs.python-version }}
- run: pip install -r requirements/requirements_tests.txt
- run: pip install ".[tests]"
shell: bash
37 changes: 37 additions & 0 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: Publish to PyPI

on:
release:
types: [published]

jobs:
pypi-publish:
name: Upload release to PyPI
runs-on: ubuntu-latest
environment:
name: pypi
url: https://pypi.org/p/xtgeoapp-grd3dmaps
permissions:
id-token: write

steps:
- name: Checkout
uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Set up Python 3.8
uses: actions/setup-python@v4
with:
python-version: 3.8

- name: Install build dependencies
run: |
pip install -U pip
pip install build

- name: Build distributions
run: python -m build

- name: Publish package distributions to PyPI
uses: pypa/gh-action-pypi-publish@release/v1
43 changes: 43 additions & 0 deletions .github/workflows/style.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
name: Style

on:
push:
branches:
- main
pull_request:
branches:
- main
release:
types:
- published
schedule:
# Run nightly to check that tests are working with latest dependencies
- cron: "0 0 * * *"

jobs:
style:
strategy:
matrix:
python-version: ["3.8", "3.9", "3.10", "3.11"]
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0

- uses: "./.github/actions/test_setup"
with:
python-version: ${{ matrix.python-version }}

- name: Lint with isort
if: ${{ always() }}
run: isort --check-only --profile black src tests

- name: Lint with black
if: ${{ always() }}
run: black --check src tests

- name: Lint with flake8
if: ${{ always() }}
run: flake8 src tests
61 changes: 61 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
name: Tests

on:
push:
branches:
- main
pull_request:
branches:
- main
release:
types:
- published
schedule:
# Run nightly to check that tests are working with latest dependencies
- cron: "0 0 * * *"

jobs:
testing:
strategy:
matrix:
python-version: ["3.8", "3.9", "3.10", "3.11"]
os: [ubuntu-latest]
include:
- os: macos-latest
python-version: 3.8
- os: windows-latest
python-version: 3.8
runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0

- uses: "./.github/actions/test_setup"
with:
python-version: ${{ matrix.python-version }}

- name: Run test
run: pytest -n 4 tests/test_scripts --disable-warnings

test_vs_ert:
strategy:
matrix:
python-version: ["3.8", "3.9", "3.10"]
os: [ubuntu-latest]
runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0

- uses: "./.github/actions/test_setup"
with:
python-version: ${{ matrix.python-version }}

- name: Run test vs ERT
run: |
pip install ert
pytest -n auto tests/test_vs_ert --disable-warnings
4 changes: 2 additions & 2 deletions .github/workflows/test_scripts.yml
Original file line number Diff line number Diff line change
@@ -2,9 +2,9 @@ name: Tests

on:
push:
branches: [main]
branches: [master]
pull_request:
branches: [main]
branches: [master]

jobs:
testing:
26 changes: 0 additions & 26 deletions .github/workflows/test_vs_ert.yml

This file was deleted.

1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -44,6 +44,7 @@ coverage.xml
.hypothesis/
TMP/
src/xtgeoapp_grd3dmaps/_theversion.py
src/xtgeoapp_grd3dmaps/version.py

# Translations
*.mo
32 changes: 32 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# xtgeoapp-grd3dmaps

[![tests](https://github.com/equinor/xtgeoapp-grd3dmaps/actions/workflows/test.yml/badge.svg)](https://github.com/equinor/xtgeoapp-grd3dmaps/actions/workflows/test.yml)
![Python Version](https://img.shields.io/badge/python-3.8%20|%203.9%20|%203.10%20|%203.11-blue.svg)
[![License: GPL v3](https://img.shields.io/github/license/equinor/subscript)](https://www.gnu.org/licenses/gpl-3.0)
[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)

Various scripts for generating maps from 3D grid properties.

## Scripts included

| Script | Description |
|-------------------------|---------------------|
| `grid3d_hc_thickness` | Make Hydrocarbon thickness maps from Eclipse and/or Roff input |
| `grid3d_average_map` | Make average maps from a 3D grid parameter, Eclipse or Roff input |
| `grid3d_aggregate_map` | Make aggregated maps (min/max/mean/sum) from a 3D grid parameter, Eclipse or Roff input |
| `grid3d_migration_time` | Make migration time maps aimed at tracking plume migration in CCS applications |

## Features

- From Eclipse files (EGRID, INIT, UNRST) and/or RMS binary ROFF
make HCPV thickness maps, or make weighted average maps
- No need to invoke RMS
- Efficient in FMU work flows
- HC thickness maps and average maps for property differences is
supported (see examples in YAML config files)
- Outputs PNG figures and Irap (RMS) binary maps
- Simple configuration through a YAML file
- Configuration from YAML can be overriden by command line options
- From version 1.3, output via `fmu-dataio`_ (to `sumo`_) is supported.
See [fmu-dataio](https://github.com/equinor/fmu-dataio/) and
[fmu-sumo](https://github.com/equinor/fmu-sumo)
51 changes: 0 additions & 51 deletions README.rst

This file was deleted.

16 changes: 16 additions & 0 deletions SECURITY.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
If you discover a security vulnerability in this project, please follow these steps to responsibly disclose it:

1. **Do not** create a public GitHub issue for the vulnerability.
2. Follow our guideline for Responsible Disclosure Policy at [https://www.equinor.com/about-us/csirt](https://www.equinor.com/about-us/csirt) to report the issue

The following information will help us triage your report more quickly:

- Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.)
- Full paths of source file(s) related to the manifestation of the issue
- The location of the affected source code (tag/branch/commit or direct URL)
- Any special configuration required to reproduce the issue
- Step-by-step instructions to reproduce the issue
- Proof-of-concept or exploit code (if possible)
- Impact of the issue, including how an attacker might exploit the issue

We prefer all communications to be in English.
3 changes: 3 additions & 0 deletions ccs_scripts_js/.flake8
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[flake8]
max-line-length = 88
ignore = E203, W503
Loading