Skip to content

Commit

Permalink
Merge branch 'dev' into feat/github-actions
Browse files Browse the repository at this point in the history
mbarlow12 committed Oct 22, 2024

Verified

This commit was signed with the committer’s verified signature.
liamhuber Liam Huber
2 parents 34a21d0 + 8be6d72 commit 0765f29
Showing 3 changed files with 63 additions and 52 deletions.
102 changes: 62 additions & 40 deletions opgee/etc/opgee.xml
Original file line number Diff line number Diff line change
@@ -19,50 +19,72 @@
</Analysis>

<Field name="gas_lifting_field" modifies="template">
<A name="API">32.0</A>
<A name="GLIR">30.26</A>
<A name="GOR">584.29</A>
<A name="WIR">1.5</A>
<A name="WOR">0.5</A>
<A name="age">12.0</A>
<A name="country">Angola</A>
<A name="depth">3937.0</A>
<A name="downhole_pump">0</A>
<A name="frac_transport_barge">0.0</A>
<A name="frac_transport_pipeline">0.0</A>
<A name="frac_transport_rail">0.0</A>
<A name="frac_transport_tanker">1.0</A>
<A name="fraction_elec_onsite">1.0</A>
<A name="fraction_water_reinjected">1.0</A>
<A name="gas_flooding">0</A>
<A name="gas_lifting">1</A>
<A name="name">Girassol</A>
<A name="natural_gas_reinjection">1</A>
<A name="num_prod_wells">24</A>
<A name="num_water_inj_wells">20</A>
<A name="oil_prod">175000.0</A>
<A name="oil_sands_mine">None</A>
<A name="prod_index">90.9</A>
<A name="res_press">3655.0</A>
<A name="steam_flooding">0</A>
<A name="transport_dist_barge">0.0</A>
<A name="transport_dist_pipeline">0.0</A>
<A name="transport_dist_rail">0.0</A>
<A name="transport_dist_tanker">7984.0</A>
<A name="water_flooding">0</A>
<A name="water_reinjection">1</A>
<A name="well_diam">8.0</A>
<A name="frac_transport_rail">1</A>

<Process class="CrudeOilDewatering">
<A name="heater_treater">0</A>
<A name="downhole_pump">1</A>
<A name="water_reinjection">0</A>
<A name="natural_gas_reinjection">0</A>
<A name="water_flooding">0</A>
<A name="gas_lifting">0</A>
<A name="gas_flooding">0</A>
<A name="steam_flooding">0</A>
<A name="country">Venezuela</A>
<A name="name">Hamaca</A>
<A name="age">13.0</A>
<A name="depth">2200.0</A>
<A name="oil_prod">158441.0</A>
<A name="num_prod_wells">190</A>
<A name="num_water_inj_wells">0</A>
<A name="well_diam">5.5</A>
<A name="prod_index">10.0</A>
<A name="res_press">950.0</A>
<A name="res_temp">109.6</A>
<A name="offshore">0.0</A>
<A name="API">8.6</A>
<A name="gas_comp_N2">0.1</A>
<A name="gas_comp_CO2">5.9</A>
<A name="gas_comp_C1">91.9</A>
<A name="gas_comp_C2">0.86</A>
<A name="gas_comp_C3">0.39</A>
<A name="gas_comp_C4">0.85</A>
<A name="gas_comp_H2S">0.0</A>
<A name="GOR">111.0</A>
<A name="WOR">0.1</A>
<A name="WIR">1.1</A>
<A name="GLIR">363.8</A>
<A name="GFIR">166.5</A>
<A name="flood_gas_type">NG</A>
<A name="SOR">0.0</A>
<A name="fraction_elec_onsite">1.0</A>
<A name="fraction_remaining_gas_inj">0.0</A>
<A name="fraction_water_reinjected">0.0</A>
<A name="fraction_steam_cogen">0.0</A>
<A name="fraction_steam_solar">0.0</A>
<Process class="CrudeOilDewatering">
<A name="heater_treater">1</A>
</Process>
<Process class="DownholePump">
<A name="eta_pump_well">50</A>
</Process>
<A name="stabilizer_column">0</A>
<A name="upgrader_type">Delayed coking</A>
<A name="gas_processing_path">Acid Wet Gas</A>
<A name="FOR">99.9</A>
<A name="frac_venting">0.002</A>
<Process class="HeavyOilDilution">
<A name="fraction_diluent">0.0</A>
</Process>
<A name="frac_transport_tanker">1.0</A>
<A name="frac_transport_barge">0.0</A>
<A name="frac_transport_pipeline">1.0</A>
<A name="frac_transport_rail">0.0</A>
<A name="frac_transport_truck">0.0</A>
<A name="transport_dist_tanker">2443.0</A>
<A name="transport_dist_barge">500.0</A>
<A name="transport_dist_pipeline">140.0</A>
<A name="transport_dist_rail">800.0</A>
<A name="transport_dist_truck">100.0</A>
<A name="oil_sands_mine">None</A>
<A name="oil_processing_path">Upgrading</A>
<A name="frac_CO2_breakthrough">59</A>
<A name="ecosystem_richness">High carbon</A>
<A name="field_development_intensity">High</A>
<A name="prod_water_inlet_temp">140.0</A>
</Field>

<Field name="template">
4 changes: 0 additions & 4 deletions opgee/processes/heavy_oil_upgrading.py
Original file line number Diff line number Diff line change
@@ -150,10 +150,6 @@ def calculate_mass_rate_from_volume_rate(volume_rate, gas_comp):
coke_to_heat = \
ureg.Quantity(max(0, (coke_dict.sum() - coke_to_stockpile_and_transport).to("tonne/day").m), "tonne/day")

if self.field.get_process_data("frac_coke_exported") is None:
self.field.save_process_data(
frac_coke_exported=d["Coke yield per bbl SCO output"]["Fraction coke exported"])

coke_to_transport = self.find_output_stream("petrocoke")
coke_to_transport.set_solid_flow_rate("PC", coke_to_stockpile_and_transport)
coke_to_transport.set_tp(STP)
9 changes: 1 addition & 8 deletions opgee/processes/petrocoke_transport.py
Original file line number Diff line number Diff line change
@@ -38,15 +38,8 @@ def run(self, analysis):
petrocoke_mass_rate = input_coke.solid_flow_rate("PC")
petrocoke_LHV_rate = petrocoke_mass_rate * self.petro_coke_heating_value

self.frac_coke_exported = field.get_process_data("frac_coke_exported").m

petrocoke_to_market = self.find_output_stream("petrocoke for market")
petrocoke_to_market = self.find_output_stream("petrocoke")
petrocoke_to_market.copy_flow_rates_from(input_coke)
petrocoke_to_market.multiply_flow_rates(self.frac_coke_exported)

petrocoke_to_export = self.find_output_stream("exported petrocoke")
petrocoke_to_export.copy_flow_rates_from(input_coke)
petrocoke_to_export.multiply_flow_rates(1 - self.frac_coke_exported)

# energy use
energy_use = self.energy

0 comments on commit 0765f29

Please sign in to comment.