Skip to content
Merged
Show file tree
Hide file tree
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
4 changes: 4 additions & 0 deletions opgee/etc/opgee.xml
Original file line number Diff line number Diff line change
Expand Up @@ -577,6 +577,10 @@
<Contains>gas</Contains>
</Stream>

<Stream name="prod exported gas" src="ProductionBoundary" dst="TransmissionCompressor">
<Contains>exported gas</Contains>
</Stream>

<Stream src="GasPartition" dst="ProductionBoundary">
<Contains>exported gas</Contains>
</Stream>
Expand Down
2 changes: 1 addition & 1 deletion opgee/process.py
Original file line number Diff line number Diff line change
Expand Up @@ -1032,7 +1032,7 @@ def run(self, analysis):
if not is_chosen_boundary:
for in_stream in self.inputs:
if in_stream.is_uninitialized():
break
continue
contents = in_stream.contents
if len(contents) != 1:
raise ModelValidationError(f"Streams to and from boundaries must have only a "
Expand Down
4 changes: 2 additions & 2 deletions opgee/processes/crude_oil_storage.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ def __init__(self, name, **kwargs):

def cache_attributes(self):
self.oil_sands_mine = self.field.oil_sands_mine
self.f_FG_CS_VRU = self.attr("f_FG_CS_VRU")
self.f_FG_CS_FL = self.attr("f_FG_CS_FL")
self.f_FG_CS_VRU = self.attr("f_FG_CS_VRU") # default 0.9
self.f_FG_CS_FL = self.attr("f_FG_CS_FL") # default 0.1

def run(self, analysis):
self.print_running_msg()
Expand Down
4 changes: 2 additions & 2 deletions opgee/processes/transmission_compressor.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def __init__(self, *args, **kwargs):

# TODO: avoid process names in contents.
self._required_inputs = [
"gas",
".*gas",
]

self._required_outputs = [
Expand Down Expand Up @@ -63,7 +63,7 @@ def cache_attributes(self):
def run(self, analysis):
self.print_running_msg()

input = self.find_input_stream("gas")
input = self.find_input_streams(".*gas", regex=True, combine=True)

if input.is_uninitialized():
return
Expand Down
Loading