Skip to content

Commit 48f15b4

Browse files
Remove value declarations that are redundant with the default value
1 parent a216a1a commit 48f15b4

11 files changed

+1
-142
lines changed

src/geophires_x/AGSEconomics.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ def __init__(self, model: Model):
5353

5454
self.O_and_M_cost_plant = self.ParameterDict[self.O_and_M_cost_plant.Name] = floatParameter(
5555
"Operation & Maintenance Cost of Surface Plant",
56-
value=0.015,
5756
DefaultValue=0.015,
5857
Min=0.0,
5958
Max=0.2,
@@ -66,7 +65,6 @@ def __init__(self, model: Model):
6665
self.Direct_use_heat_cost_per_kWth = self.ParameterDict[
6766
self.Direct_use_heat_cost_per_kWth.Name] = floatParameter(
6867
"Capital Cost for Surface Plant for Direct-use System",
69-
value=100.0,
7068
DefaultValue=100.0,
7169
Min=0.0,
7270
Max=10000.0,
@@ -77,7 +75,7 @@ def __init__(self, model: Model):
7775
ErrMessage="assume default Capital cost for surface plant for direct-use system (100 $/kWth)"
7876
)
7977
self.Power_plant_cost_per_kWe = self.ParameterDict[self.Power_plant_cost_per_kWe.Name] = floatParameter(
80-
"Capital Cost for Power Plant for Electricity Generation", value=3000.0,
78+
"Capital Cost for Power Plant for Electricity Generation",
8179
DefaultValue=3000.0,
8280
Min=0.0,
8381
Max=10000.0,

src/geophires_x/AGSWellBores.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,6 @@ def __init__(self, model: Model):
517517

518518
self.Fluid = self.ParameterDict[self.Fluid.Name] = intParameter(
519519
"Heat Transfer Fluid",
520-
value=WorkingFluid.WATER,
521520
DefaultValue=WorkingFluid.WATER,
522521
AllowableRange=[1, 2],
523522
UnitType=Units.NONE,
@@ -526,7 +525,6 @@ def __init__(self, model: Model):
526525
)
527526
self.Configuration = self.ParameterDict[self.Configuration.Name] = intParameter(
528527
"Closed-loop Configuration",
529-
value=Configuration.COAXIAL,
530528
DefaultValue=Configuration.COAXIAL,
531529
AllowableRange=[1, 2],
532530
UnitType=Units.NONE,
@@ -537,7 +535,6 @@ def __init__(self, model: Model):
537535
# Input data for subsurface condition
538536
self.Nonvertical_length = self.ParameterDict[self.Nonvertical_length.Name] = floatParameter(
539537
"Total Nonvertical Length",
540-
value=1000.0,
541538
DefaultValue=1000.0,
542539
Min=1000.0,
543540
Max=20000.0,
@@ -550,7 +547,6 @@ def __init__(self, model: Model):
550547

551548
self.WaterThermalConductivity = self.ParameterDict[self.WaterThermalConductivity.Name] = floatParameter(
552549
"Water Thermal Conductivity",
553-
value=0.6,
554550
DefaultValue=0.6,
555551
Min=0.0,
556552
Max=100.0,
@@ -563,7 +559,6 @@ def __init__(self, model: Model):
563559

564560
self.nonverticalwellborediameter = self.ParameterDict[self.nonverticalwellborediameter.Name] = floatParameter(
565561
"Nonvertical Wellbore Diameter",
566-
value=0.156,
567562
DefaultValue=0.156,
568563
Min=0.01,
569564
Max=100.0,
@@ -575,7 +570,6 @@ def __init__(self, model: Model):
575570
)
576571
self.numnonverticalsections = self.ParameterDict[self.numnonverticalsections.Name] = intParameter(
577572
"Number of Multilateral Sections",
578-
value=1,
579573
DefaultValue=1,
580574
AllowableRange=list(range(0, 101, 1)),
581575
UnitType=Units.NONE,
@@ -584,7 +578,6 @@ def __init__(self, model: Model):
584578
)
585579
self.time_operation = self.ParameterDict[self.time_operation.Name] = floatParameter(
586580
"Closed Loop Calculation Start Year",
587-
value=0.01,
588581
DefaultValue=0.01,
589582
Min=0.01,
590583
Max=100.0,
@@ -596,7 +589,6 @@ def __init__(self, model: Model):
596589
)
597590
self.NonverticalsCased = self.ParameterDict[self.NonverticalsCased.Name] = boolParameter(
598591
"Multilaterals Cased",
599-
value=False,
600592
DefaultValue=False,
601593
Required=False,
602594
Provided=False,

src/geophires_x/CylindricalReservoir.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ def __init__(self, model: Model):
4343

4444
self.InputDepth = self.ParameterDict[self.InputDepth.Name] = floatParameter(
4545
"Cylindrical Reservoir Input Depth",
46-
value=3.0,
4746
DefaultValue=3.0,
4847
Min=0.1,
4948
Max=15,
@@ -57,7 +56,6 @@ def __init__(self, model: Model):
5756

5857
self.OutputDepth = self.ParameterDict[self.OutputDepth.Name] = floatParameter(
5958
"Cylindrical Reservoir Output Depth",
60-
value=self.InputDepth.value,
6159
DefaultValue=self.InputDepth.value,
6260
Min=0.1,
6361
Max=15,
@@ -70,7 +68,6 @@ def __init__(self, model: Model):
7068
)
7169
self.Length = self.ParameterDict[self.Length.Name] = floatParameter(
7270
"Cylindrical Reservoir Length",
73-
value=4.0,
7471
DefaultValue=4.0,
7572
Min=0.1,
7673
Max=10.0,
@@ -83,7 +80,6 @@ def __init__(self, model: Model):
8380
)
8481
self.RadiusOfEffect = self.ParameterDict[self.RadiusOfEffect.Name] = floatParameter(
8582
"Cylindrical Reservoir Radius of Effect",
86-
value=30.0,
8783
DefaultValue=30.0,
8884
Min=0,
8985
Max=1000.0,
@@ -96,7 +92,6 @@ def __init__(self, model: Model):
9692
)
9793
self.RadiusOfEffectFactor = self.ParameterDict[self.RadiusOfEffectFactor.Name] = floatParameter(
9894
"Cylindrical Reservoir Radius of Effect Factor",
99-
value=1.0,
10095
DefaultValue=1.0,
10196
Min=0.0,
10297
Max=10.0,
@@ -114,7 +109,6 @@ def __init__(self, model: Model):
114109
# internal values required for calculations
115110
self.depth = self.ParameterDict[self.depth.Name] = floatParameter(
116111
"Drilled length",
117-
value=0.0,
118112
DefaultValue=0.0,
119113
Min=0.0,
120114
Max=150,
@@ -127,7 +121,6 @@ def __init__(self, model: Model):
127121
)
128122
self.waterloss = self.ParameterDict[self.waterloss.Name] = floatParameter(
129123
"Water Loss Fraction",
130-
value=0.0,
131124
DefaultValue=0.0,
132125
Min=0.0,
133126
Max=0.99,

0 commit comments

Comments
 (0)