Remove properties folder

Author: Myoldmopar

glhe/input_processor/input_processor.py

@@ -3,10 +3,11 @@
 from pathlib import Path
 
 from jsonschema import SchemaError, ValidationError, validate
+from scp.water import Water
 
 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.base_properties import PropertiesBase
 from glhe.functions import load_json, lower_obj
 
 
@@ -33,7 +34,7 @@ def __init__(self, json_input_path: Path):
 
         # load properties for later use
         try:
-            self.fluid = get_fluid(self.input_dict['fluid'])
+            self.fluid = Water()
         except KeyError:
             pass
 

glhe/properties/base_properties.py glhe/properties.pyglhe/properties/base_properties.py renamed to glhe/properties.py

@@ -7,7 +7,7 @@
 from glhe.interface.entry import SimulationEntryPoint
 from glhe.interface.response import SimulationResponse
 from glhe.output_processor.report_types import ReportTypes
-from glhe.properties.base_properties import PropertiesBase
+from glhe.base_properties import PropertiesBase
 from glhe.functions import lin_interp
 from glhe.functions import smoothing_function
 from glhe.functions import tdma_1

glhe/properties/__init__.py

@@ -4,7 +4,7 @@
 from glhe.interface.entry import SimulationEntryPoint
 from glhe.interface.response import SimulationResponse
 from glhe.output_processor.report_types import ReportTypes
-from glhe.properties.base_properties import PropertiesBase
+from glhe.base_properties import PropertiesBase
 from glhe.topology.pipe import Pipe
 from glhe.topology.single_u_tube_grouted_segment import SingleUTubeGroutedSegment, TimeStepStructure
 from glhe.topology.single_u_tube_pass_through_segment import SingleUTubePassThroughSegment

glhe/properties/fluid_factory.py

@@ -6,7 +6,7 @@
 
 from glhe.input_processor.component_types import ComponentTypes
 from glhe.output_processor.report_types import ReportTypes
-from glhe.properties.base_properties import PropertiesBase
+from glhe.base_properties import PropertiesBase
 from glhe.topology.pipe import Pipe
 # from glhe.utilities.functions import runge_kutta_fourth_y
 

glhe/properties/soil_properties.py

@@ -1,6 +1,6 @@
 import unittest
 
-from glhe.properties.base_properties import PropertiesBase
+from glhe.base_properties import PropertiesBase
 
 
 class TestBaseProperties(unittest.TestCase):