Skip to content

Commit 0e6fc83

Browse files
committed
Gutted so much out, test_a "runs", but not "well" or "correct" :-|
1 parent 2ab0ccc commit 0e6fc83

41 files changed

Lines changed: 306 additions & 1107 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

glhe/aggregation.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ class BaseAgg:
1111
def __init__(self, inputs: dict):
1212
# g-function values
1313
if 'g-function-path' in inputs:
14-
p = Path(inputs['g-function-path'])
14+
# TODO: Get from inputs p = Path(inputs['g-function-path'])
15+
p = Path('/home/edwin/Projects/GLHE/validation/MFRTRT_EWT_g_functions/EWT_experimental_g_functions.csv')
1516
if not p.is_absolute():
1617
p = Path.cwd() / inputs['g-function-path']
1718
self.interp_g = Interpolator1DFromFile(p)
@@ -23,6 +24,7 @@ def __init__(self, inputs: dict):
2324

2425
# g_b-function values
2526
self.interp_g_b = None
27+
inputs['g_b-function-path'] = '/home/edwin/Projects/GLHE/validation/MFRTRT_LTS/g_b.csv'
2628
if 'g_b-function-path' in inputs:
2729
p = Path(inputs['g_b-function-path'])
2830
if not p.is_absolute():
@@ -140,7 +142,7 @@ def __init__(self, inputs: dict):
140142
self.bins_per_level = inputs['number-bins-per-level']
141143

142144
# total simulation runtime to make available for method
143-
run_time = inputs['runtime']
145+
run_time = 14400 # TODO: Get from inputs inputs['runtime']
144146

145147
# time step for method
146148
# starts at 1 hr steps

glhe/functions.py

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,23 @@
1414
from glhe.constants import SEC_IN_HOUR
1515

1616

17+
def init_temp():
18+
"""
19+
Initial temperature for all temperature variables. Valid at t=0.
20+
21+
:return: Initial temperature
22+
"""
23+
return 20 # TODO: Use something from inputs
24+
25+
26+
def get_definition_object(inputs: dict, obj_type_to_find: str, obj_name: str):
27+
for obj_type in inputs:
28+
if obj_type_to_find == obj_type:
29+
for obj in inputs[obj_type_to_find]:
30+
if obj['name'] == obj_name:
31+
return obj
32+
33+
1734
def smoothing_function(x: float, a: float, b: float) -> float:
1835
"""
1936
Sigmoid smoothing function
Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
from glhe.ground_temps.base import BaseGroundTemp
2-
3-
4-
class Constant(BaseGroundTemp):
1+
class Constant:
52
"""
63
Constant ground temperature model.
74
"""

glhe/input_processor/__init__.py

Whitespace-only changes.

glhe/input_processor/component_types.py

Lines changed: 0 additions & 23 deletions
This file was deleted.

glhe/input_processor/input_processor.py

Lines changed: 0 additions & 103 deletions
This file was deleted.

glhe/input_processor/plant_loop_component_factory.py

Lines changed: 0 additions & 31 deletions
This file was deleted.

glhe/input_processor/schema/borehole-definitions.jsonschema

Lines changed: 0 additions & 18 deletions
This file was deleted.

glhe/input_processor/schema/borehole.jsonschema

Lines changed: 0 additions & 34 deletions
This file was deleted.

glhe/input_processor/schema/flow-profile.jsonschema

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)