eliminate properties manager, flatten properties management

glhe/input_processor/input_processor.py

@@ -4,7 +4,9 @@
 
 from jsonschema import SchemaError, ValidationError, validate
 
-from glhe.properties.props_manager import PropsMGR
+from glhe.ground_temps.ground_temp_factory import make_ground_temp_model
+from glhe.properties.fluid_factory import get_fluid
+from glhe.properties.base_properties import PropertiesBase
 from glhe.utilities.functions import load_json, lower_obj
 
 
@@ -30,8 +32,20 @@ def __init__(self, json_input_path: Path):
         self.validate_inputs(self.input_dict)
 
         # load properties for later use
-        self.props_mgr = PropsMGR()
-        self.props_mgr.load_properties(self.input_dict)
+        try:
+            self.fluid = get_fluid(self.input_dict['fluid'])
+        except KeyError:
+            pass
+
+        try:
+            self.soil = PropertiesBase(self.input_dict['soil'])
+            try:
+                self.soil.get_temp = make_ground_temp_model(self.input_dict['ground-temperature-model']).get_temp
+            except KeyError:
+                pass
+
+        except KeyError:
+            pass
 
     @staticmethod
     def validate_inputs(input_dict: dict) -> None:

glhe/profiles/constant_load.py

@@ -26,7 +26,7 @@ def simulate_time_step(self, inputs: SimulationResponse) -> SimulationResponse:
         if flow_rate == 0:
             return inputs
 
-        specific_heat = self.ip.props_mgr.fluid.cp(self.inlet_temp)
+        specific_heat = self.ip.fluid.cp(self.inlet_temp)
         self.outlet_temp = self.load / (flow_rate * specific_heat) + self.inlet_temp
         return SimulationResponse(inputs.time, inputs.time_step, inputs.flow_rate, self.outlet_temp)
 

glhe/profiles/external_load.py

@@ -37,7 +37,7 @@ def simulate_time_step(self, inputs: SimulationResponse) -> SimulationResponse:
         inlet_temp = inputs.temperature
 
         self.load = self.get_value(t + dt)
-        specific_heat = self.ip.props_mgr.fluid.cp(inlet_temp)
+        specific_heat = self.ip.fluid.cp(inlet_temp)
         self.outlet_temp = self.load / (flow_rate * specific_heat) + inlet_temp
         return SimulationResponse(inputs.time, inputs.time_step, inputs.flow_rate, self.outlet_temp)
 

glhe/profiles/pulse_load.py

@@ -29,7 +29,7 @@ def simulate_time_step(self, inputs: SimulationResponse) -> SimulationResponse:
 
             inlet_temp = inputs.temperature
 
-            specific_heat = self.ip.props_mgr.fluid.cp(inlet_temp)
+            specific_heat = self.ip.fluid.cp(inlet_temp)
             self.outlet_temp = self.load / (flow_rate * specific_heat) + inlet_temp
             return SimulationResponse(inputs.time, inputs.time_step, inputs.flow_rate, self.outlet_temp)
         else:

glhe/profiles/sinusoid_load.py

@@ -34,7 +34,7 @@ def simulate_time_step(self, inputs: SimulationResponse) -> SimulationResponse:
         inlet_temp = inputs.temperature
 
         self.load = self.amplitude * sin(2 * pi * (t + dt) / self.period) + self.offset
-        specific_heat = self.ip.props_mgr.fluid.cp(inlet_temp)
+        specific_heat = self.ip.fluid.cp(inlet_temp)
         self.outlet_temp = self.load / (flow_rate * specific_heat) + inlet_temp
         return SimulationResponse(inputs.time, inputs.time_step, inputs.flow_rate, self.outlet_temp)
 

glhe/profiles/synthetic_load.py

@@ -121,7 +121,7 @@ def simulate_time_step(self, inputs: SimulationResponse) -> SimulationResponse:
         inlet_temp = inputs.temperature
 
         self.load = self.get_value(t + dt)
-        specific_heat = self.ip.props_mgr.fluid.cp(inlet_temp)
+        specific_heat = self.ip.fluid.cp(inlet_temp)
         self.outlet_temp = self.load / (flow_rate * specific_heat) + inlet_temp
         return SimulationResponse(inputs.time, inputs.time_step, inputs.flow_rate, self.outlet_temp)
 

glhe/topology/ground_heat_exchanger_long_time_step.py

@@ -21,8 +21,8 @@ def __init__(self, inputs: dict, ip: InputProcessor, op: OutputProcessor):
         self.op = op
 
         # props instances
-        self.fluid = ip.props_mgr.fluid
-        self.soil = ip.props_mgr.soil
+        self.fluid = ip.fluid
+        self.soil = ip.soil
 
         # geometry and other config parameters needed externally
         self.h = inputs['length']

glhe/topology/ground_heat_exchanger_short_time_step.py

@@ -29,8 +29,8 @@ def __init__(self, inputs: dict, ip: InputProcessor, op: OutputProcessor):
         self.op = op
 
         # props instances
-        self.fluid = ip.props_mgr.fluid
-        self.soil = ip.props_mgr.soil
+        self.fluid = ip.fluid
+        self.soil = ip.soil
 
         # init paths
         self.paths = []

glhe/topology/pipe.py

@@ -33,7 +33,7 @@ def __init__(self, inputs, ip, op):
         PropertiesBase.__init__(self, pipe_props)
 
         # local fluids reference
-        self.fluid = self.ip.props_mgr.fluid
+        self.fluid = self.ip.fluid
 
         # key geometric parameters
         self.inner_diameter = pipe_props["inner-diameter"]

glhe/topology/single_u_tube_grouted_borehole.py

@@ -26,8 +26,8 @@ def __init__(self, inputs, ip, op):
         self.ip = ip
         self.op = op
 
-        self.fluid = ip.props_mgr.fluid
-        self.soil = ip.props_mgr.soil
+        self.fluid = ip.fluid
+        self.soil = ip.soil
 
         # get borehole definition data
         if 'average-borehole' in inputs:

glhe/topology/single_u_tube_grouted_segment.py

@@ -26,8 +26,8 @@ class SingleUTubeGroutedSegment:
 
     def __init__(self, inputs, ip, op):
         self.name = inputs['segment-name']
-        self.fluid = ip.props_mgr.fluid
-        self.soil = ip.props_mgr.soil
+        self.fluid = ip.fluid
+        self.soil = ip.soil
 
         if 'average-pipe' in inputs:
             pipe_inputs = {'average-pipe': inputs['average-pipe'], 'length': inputs['length']}

glhe/topology/swedish_heat_pump.py

@@ -29,7 +29,7 @@ def __init__(self, inputs, ip, op):
         self.op = op
 
         # local fluids reference
-        self.fluid = self.ip.props_mgr.fluid
+        self.fluid = self.ip.fluid
 
         # input data
         self.max_htg_set_point = inputs['max-heating-set-point']