-
Notifications
You must be signed in to change notification settings - Fork 29
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
add totals as measurements #284
Merged
Merged
Changes from all commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
35d30f2
add totals as measurements
olwijn a0099a3
Merge branch 'master' into matchtotals
olwijn c923fb8
fixed formatting
olwijn c27bdce
add WWIT and WGIT as observations
olwijn 2473423
extended observation test file with cumulative rates
olwijn c23d83f
fixed error in ProductionData.csv
olwijn 0bd324f
fixed formatting observation templates
olwijn 9008270
fixed bugs in yamlobs template
olwijn 2cfae7b
Merge branch 'master' into matchtotals
olwijn 68df07a
Merge branch 'master' into matchtotals
olwijn 1a5fa28
Merge branch 'matchtotals' of github.com:olwijn/flownet into matchtotals
olwijn 08e0253
updated CHANGELOG.md
olwijn 6b91364
Merge branch 'master' into matchtotals
olelod File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -202,6 +202,9 @@ def _calculate_wconhist(self): | |
oil_rate=value["WOPR"], | ||
water_rate=value["WWPR"], | ||
gas_rate=value["WGPR"], | ||
oil_total=value["WOPT"], | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Recalculating could potentially mean that one doesn't have to supply this at all. |
||
water_total=value["WWPT"], | ||
gas_total=value["WGPT"], | ||
bhp=value["WBHP"], | ||
thp=value["WTHP"], | ||
) | ||
|
@@ -230,6 +233,7 @@ def _calculate_wconinjh(self): | |
inj_type="WATER", | ||
status=value["WSTAT"], | ||
rate=value["WWIR"], | ||
total=value["WWIT"], | ||
bhp=value["WBHP"], | ||
thp=value["WTHP"], | ||
inj_control_mode=self._inj_control_mode, | ||
|
@@ -243,6 +247,7 @@ def _calculate_wconinjh(self): | |
inj_type="GAS", | ||
status=value["WSTAT"], | ||
rate=value["WGIR"], | ||
total=value["WGIT"], | ||
bhp=value["WBHP"], | ||
thp=value["WTHP"], | ||
inj_control_mode=self._inj_control_mode, | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When adding WOPT (or WGPT or WWPT), should we allow for also adding WOPR (or WGPR or WWPR)? Conditioning on both rates and cumulatives i guess is kind of a messy thing with all the correlation going on. Should we add a check in the config_parser to make sure both are not defined?
Update: Let's leave it for now and add an issue on it so we don't forget about it completely
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I will make a new issue suggesting this and add an item to the CHANGELOG