Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
@malcolm-dsider
malcolm-dsider committed Oct 9, 2023
2 parents 8642520 + 95c71d3 commit ae869d1
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 24 deletions.
2 changes: 1 addition & 1 deletion src/geophires_x/Model.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ def Calculate(self):
# if end-use option is 8 (district heating), some calculations are required prior to the reservoir and wellbore simulations
if self.surfaceplant.enduseoption.value == EndUseOptions.DISTRICT_HEATING:
self.surfaceplant.CalculateDHDemand(self) # calculate district heating demand

self.reserv.Calculate(self) # model the reservoir
self.wellbores.Calculate(self) # model the wellbores
self.surfaceplant.Calculate(self) # model the surfaceplant
Expand Down
4 changes: 2 additions & 2 deletions tests/examples/Wanju_Yuan_Closed-Loop_Geothermal_Energy_Recovery.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ Geothermal Electricity Example Problem using Percentage Thermal Drawdown Model (
Oringinally created by NREL on 3/26/2018 as Example 4
Last modified on 2/26/2023

Example X Description: This example problem considers a simple reservoir
at 2 km depth with an initial production temperature of 145deg.C. The thermal drawdown
Example X Description: This example problem considers a simple reservoir
at 2 km depth with an initial production temperature of 145deg.C. The thermal drawdown
is assumed linear at 0.5%/year. The heat is converted to electricity with a subcritical
ORC. It is accessed by a closed loop well.
----------------------------------------------------------------------------------------
Expand Down
9 changes: 4 additions & 5 deletions tests/examples/Wanju_Yuan_Closed-Loop_Geothermal_Energy_RecoveryV3_output.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Simulation Metadata
***ECONOMIC PARAMETERS***

Economic Model = BICYCLE
Accrued financing during construction: 0.00
Accrued financing during construction: 0.00
Project lifetime: 40 yr
Capacity factor: 90.0 %
Project NPV: -36.51 MUSD
Expand All @@ -38,8 +38,8 @@ Simulation Metadata
Number of Production Wells: 1
Number of Injection Wells: 0
Well depth (or total length, if not vertical): 9.0 kilometer
Water loss rate: 0.0
Pump efficiency: 80.0
Water loss rate: 0.0
Pump efficiency: 80.0
Injection temperature: 60.0 degC
Production Wellbore heat transmission calculated with Ramey's model
Average production well temperature drop: 0.0 degC
Expand All @@ -53,7 +53,7 @@ Simulation Metadata
***RESOURCE CHARACTERISTICS***

Maximum reservoir temperature: 375.0 degC
Number of segments: 1
Number of segments: 1
Geothermal gradient: 0.0262 degC/m


Expand Down Expand Up @@ -201,4 +201,3 @@ The AGS models contain an intrinsic reservoir model that doesn't expose values t
38 8.4 168.4 9.99 70.17
39 7.7 158.8 9.42 71.88
40 7.5 141.1 8.91 73.39

5 changes: 2 additions & 3 deletions tests/examples/example1_addons.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ Ramey Production Wellbore Model,1, ---
Production Wellbore Temperature Drop,.5, ---[deg.C]
Injection Wellbore Temperature Gain,0, ---[deg.C]
Production Flow Rate per Well,55, ---[kg/s]
Fracture Shape,3, ---[-]
Fracture Shape,3, ---[-]
Fracture Height,900, ---[m]
Reservoir Volume Option,3, ---[-]
Reservoir Volume,1000000000, ---[m^3]
Expand Down Expand Up @@ -75,11 +75,10 @@ Ambient Temperature,20, ---[deg.C]
**************************
Plant Lifetime,30, ---[years]
Fixed Charge Rate,.05, ---[-] between 0 and 1
Inflation Rate During Construction,0, ---[-]
Inflation Rate During Construction,0, ---[-]

***Simulation Parameters***
***************************

Print Output to Console,1, ---[-] Should be 0 (don't print results) or 1 (print results)
Time steps per year,6, ---[1/year]

10 changes: 5 additions & 5 deletions tests/examples/example1_addonsV3_output.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ Simulation Metadata
***ECONOMIC PARAMETERS***

Economic Model = Fixed Charge Rate (FCR)
Fixed Charge Rate (FCR): 5.00
Accrued financing during construction: 0.00
Fixed Charge Rate (FCR): 5.00
Accrued financing during construction: 0.00
Project lifetime: 30 yr
Capacity factor: 90.0 %
Project NPV: 51.70 MUSD
Expand All @@ -39,8 +39,8 @@ Simulation Metadata
Number of Production Wells: 2
Number of Injection Wells: 2
Well depth (or total length, if not vertical): 3.0 kilometer
Water loss rate: 2.0
Pump efficiency: 80.0
Water loss rate: 2.0
Pump efficiency: 80.0
Injection temperature: 50.0 degC
Production Wellbore heat transmission calculated with Ramey's model
Average production well temperature drop: 2.9 degC
Expand All @@ -54,7 +54,7 @@ Simulation Metadata
***RESOURCE CHARACTERISTICS***

Maximum reservoir temperature: 400.0 degC
Number of segments: 1
Number of segments: 1
Geothermal gradient: 0.0500 degC/m


Expand Down
4 changes: 2 additions & 2 deletions tests/examples/example1_outputunits.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Ramey Production Wellbore Model,1, ---
Production Wellbore Temperature Drop,.5, ---[deg.C]
Injection Wellbore Temperature Gain,0, ---[deg.C]
Production Flow Rate per Well,55, ---[kg/s]
Fracture Shape,3, ---[-]
Fracture Shape,3, ---[-]
Fracture Height,900, ---[m]
Reservoir Volume Option,3, ---[-]
Reservoir Volume,1000000000, ---[m^3]
Expand Down Expand Up @@ -39,7 +39,7 @@ Ambient Temperature,20, ---[deg.C]
**************************
Plant Lifetime,30, ---[years]
Fixed Charge Rate,.05, ---[-] between 0 and 1
Inflation Rate During Construction,0, ---[-]
Inflation Rate During Construction,0, ---[-]

***Simulation Parameters***
***************************
Expand Down
11 changes: 5 additions & 6 deletions tests/examples/example1_outputunitsV3_output.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ Simulation Metadata
***ECONOMIC PARAMETERS***

Economic Model = Fixed Charge Rate (FCR)
Fixed Charge Rate (FCR): 5.00
Accrued financing during construction: 0.00
Fixed Charge Rate (FCR): 5.00
Accrued financing during construction: 0.00
Project lifetime: 30 yr
Capacity factor: 90.0 %
Project NPV: -38.67 MUSD
Expand All @@ -39,8 +39,8 @@ Simulation Metadata
Number of Production Wells: 2
Number of Injection Wells: 2
Well depth (or total length, if not vertical): 3.0 kilometer
Water loss rate: 2.0
Pump efficiency: 80.0
Water loss rate: 2.0
Pump efficiency: 80.0
Injection temperature: 50.0 degC
Production Wellbore heat transmission calculated with Ramey's model
Average production well temperature drop: 2.9 degC
Expand All @@ -54,7 +54,7 @@ Simulation Metadata
***RESOURCE CHARACTERISTICS***

Maximum reservoir temperature: 400.0 degC
Number of segments: 1
Number of segments: 1
Geothermal gradient: 0.0500 degC/m


Expand Down Expand Up @@ -200,4 +200,3 @@ Simulation Metadata
28 42.7 429.6 280.79 13.34
29 42.7 429.6 279.24 13.81
30 35.6 358.1 277.95 14.21

0 comments on commit ae869d1

Please sign in to comment.