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.

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

Jump to bottom

Checking if AMFG works #2

Open
wants to merge 141 commits into
base: master
Choose a base branch
from
Open

Checking if AMFG works #2

wants to merge 141 commits into from

Conversation

jorgesicachanr
Copy link
Owner

No description provided.

fmortier and others added 30 commits October 5, 2023 14:54
@fmortier
Initial commit
74efec3
@AudunSektnanNR
First iteration of co2 mass maps.
de4e144
@fmortier
Update README.md
0dc7b4b 
Add more information on general strategy of ccs-scripts, relevant scripts contained in repository, etc.
Will be further updated in the future.
@fmortier
Update README.md
f1eed68
@AudunSektnanNR
Add all files for CO2 containment, plume extent and plume area, copie…
cb1fe57 
…d from branch in subscript-repo.
@AudunSektnanNR
Merge pull request #1 from equinor/br_as
5443e1f 
Add all files for CO2 containment, plume extent and plume area, ...
@AudunSektnanNR
Second iteration of co2 mass maps.
907b2e3
@jcrivenaes
Fix a bug related to dataio output with diffdates
8b7dcc3
@AudunSektnanNR
Create ccs_scripts.yml
88ad2c5
@AudunSektnanNR
Add pyproject.toml.
70764b3
@AudunSektnanNR
Try to fix pytest.
06a566b
@AudunSektnanNR
Add init-file
5a4bfc0
@AudunSektnanNR
Add Reek data for tests.
4099002
@AudunSektnanNR
Add gitignore.
4b86e74
@AudunSektnanNR
Minor fix.
d32b93d
@AudunSektnanNR
Add .flake8
6415d19
@AudunSektnanNR
Minor change.
25bdb11
@AudunSektnanNR
Minor fix flake8.
808f0f0
@AudunSektnanNR
Minor fix, black formating checks.
971187d
@AudunSektnanNR
Create codecov.yml
16a40ce
@AudunSektnanNR
Add init for tests.
abaf8b6
@AudunSektnanNR
Update codecov.yml
bfa472d
@AudunSektnanNR
Update codecov.yml
a43010e
@AudunSektnanNR
Update codecov.yml
a73c131
@AudunSektnanNR
Update ccs_scripts.yml
401b292
@AudunSektnanNR
Third iteration of co2 mass maps.
4d7d6a1
@AudunSektnanNR
Fourth iteration of co2 mass maps.
3e248d1
@JHolba @mferrera
Replace usage of the deprecated pkg_resource
7c853f5
@jorgesicachanr
CO2 mass into List of GridProperty
880d4f3
@jorgesicachanr
Update grid3d_co2_mass.py
95ae516
AudunSektnanNR and others added 30 commits December 20, 2023 15:32
@AudunSektnanNR
Merge pull request AudunSektnanNR#4 from jorgesicachanr/patch-1
a77bcaf 
Changes to decide which co2 maps to produce (total, free, dissolved)
@FredrikNevjenNR
Hack for aggregate maps and YAML support for zone file (AudunSektnanNR#5
01c47f4 
)

* Add (temporary) hack in aggregate maps

* Allow zone source file to be given in YAML-format
@FredrikNevjenNR
Naming convention for mass files (AudunSektnanNR#6)
b06da46 
* Add (temporary) hack in aggregate maps

* Allow zone source file to be given in YAML-format

* Naming convention for mass files
@jorgesicachanr
Update migration_time1.yml
a24bca7
@jorgesicachanr
Update test_scripts.yml
8ac6490
@jorgesicachanr
Update migration_time1.yml
062bf47
@jorgesicachanr
Update _grid_aggregation.py
50c66c0
@jorgesicachanr
Update _grid_aggregation.py
a6c0fb4
@FredrikNevjenNR
Fix formatting and clean up code
623f6c2
@jorgesicachanr
Update migration_time1.yml
2ed2912
@jorgesicachanr
Update migration_time1.yml
bb3df3c
@jorgesicachanr
Update migration_time1.yml
af03e5d
@jorgesicachanr
Update migration_time1.yml
d666b26
@jorgesicachanr
Update migration_time1.yml
ce96562
@jorgesicachanr
Update migration_time1.yml
1bb3c08
@jorgesicachanr
Update test_grid3d_migration_time.py
c872c92
@FredrikNevjenNR
Remove TODO
781a4a4
@FredrikNevjenNR
Remove unused code
fd5c691
@FredrikNevjenNR
Merge pull request AudunSektnanNR#8 from AudunSektnanNR/branch_fn
8ac39b4 
Fix formatting and clean up code
@FredrikNevjenNR
Merge branch 'master' into develop
ffe151b
@jorgesicachanr
Squashed 'ccs_subscript_test/' content from commit 7907ee7
e3ea406 
git-subtree-dir: ccs_subscript_test
git-subtree-split: 7907ee7
@jorgesicachanr
Merge commit 'e3ea406d6f9848b49ba5d6b8a9dec435f0aa076e' as 'ccs_subsc…
eaba568 
…ript_test'
@jorgesicachanr
Your commit message here
8b9d46d
@jorgesicachanr
Add 'ccs_scripts_js/' from commit '7907ee763c1e5d9ec16df8889e7ba4ca6e…
66764a7 
…80c09e'

git-subtree-dir: ccs_scripts_js
git-subtree-mainline: 8b9d46d
git-subtree-split: 7907ee7
@jorgesicachanr
Handle duplicate code
8a28e13
@jorgesicachanr
Solved conflicts
42b1476
@jorgesicachanr
Merge remote-tracking branch 'origin/patch-1' into myfork_patch-2
9fe36c0
@jorgesicachanr
Merge remote-tracking branch 'origin/patch-1' into patch-2
d122455
@jorgesicachanr
Few small changes
c40f9ac
@jorgesicachanr
Edit sample config file
772cabc
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@jorgesicachanr @fmortier @AudunSektnanNR @jcrivenaes @JHolba @tnatt @mferrera @DanSava @FredrikNevjenNR @asnyv