Add 5g to sysparams

geojson_modelica_translator/geojson/urbanopt_geojson.py

@@ -93,13 +93,18 @@ def __init__(self, filename, building_ids=None):
         self.buildings = []
         for feature in self.data.features:
             if feature["properties"]["type"] == "Building":
-                building = UrbanOptLoad(feature)
-                if not building_ids or building.id in building_ids:
-                    errors = self.schemas.validate("building", building.feature.properties)
-                    if errors:
-                        building_errors[building.id] = errors
-                    else:
-                        self.buildings.append(building)
+                # Don't validate features with 'detailed_model_filename' in the building properties
+                # Buildings defined by an osm don't have all keys in geojson, they'll always fail validation
+                if "detailed_model_filename" in feature["properties"]:
+                    continue
+                else:
+                    building = UrbanOptLoad(feature)
+                    if not building_ids or building.id in building_ids:
+                        errors = self.schemas.validate("building", building.feature.properties)
+                        if errors:
+                            building_errors[building.id] = errors
+                        else:
+                            self.buildings.append(building)
 
         if building_errors:
             formatted_errors = ''

geojson_modelica_translator/geojson_modelica_translator.py

@@ -172,7 +172,7 @@ def __init__(
         self._system_parameters = SystemParameters(sys_params_filepath)
 
         geojson_ids = self._system_parameters.get_default(
-            '$.buildings.custom[*].geojson_id',
+            '$.buildings.[*].geojson_id',
             []
         )
         self._geojson = UrbanOptGeoJson(geojson_filepath, geojson_ids)

geojson_modelica_translator/model_connectors/couplings/templates/Network2Pipe_HeatingPlant/ComponentDefinitions.mopt

@@ -7,6 +7,6 @@
   // TODO: This should not be here, it is entirely plant specific and should be moved elsewhere
   // but since it requires a connect statement we must put it here for now...
   Modelica.Blocks.Sources.RealExpression TDisSetHeaWat_{{ coupling.id }}(
-    each y=273.15+{{ sys_params.district_system.default.central_heating_plant_parameters.temp_setpoint_hhw }})
+    each y=273.15+{{ sys_params.district_system.fourthGDHC.central_heating_plant_parameters.temp_setpoint_hhw }})
     "District side heating water supply temperature set point."
     annotation (Placement({{ diagram.transformation.t_dis_set_hea_wat.real_expression }}));

geojson_modelica_translator/model_connectors/couplings/templates/NetworkHeatedWaterStub_HeatingPlant/ComponentDefinitions.mopt

@@ -5,7 +5,7 @@
     "Secondary loop heated water flow rate."
     annotation (Placement({{ diagram.transformation.sec_mas_flo_rat.real_expression }}));
   Modelica.Blocks.Sources.RealExpression TDisSetHeaWat_{{ coupling.id }}(
-    each y=273.15+{{ sys_params.district_system.default.central_heating_plant_parameters.temp_setpoint_hhw }})
+    each y=273.15+{{ sys_params.district_system.fourthGDHC.central_heating_plant_parameters.temp_setpoint_hhw }})
     "District side heating water supply temperature set point."
     annotation (Placement({{ diagram.transformation.t_dis_set_hea_wat.real_expression }}));
   Modelica.Blocks.Sources.BooleanConstant mPum_flow_{{ coupling.id }}(

geojson_modelica_translator/model_connectors/energy_transfer_systems/cooling_indirect.py

@@ -67,7 +67,7 @@ def to_modelica(self, scaffold):
 
         ets_data = self.system_parameters.get_param_by_building_id(
             self._geojson_load_id,
-            'ets_model_parameters.indirect'
+            'ets_indirect_parameters'
         )
 
         combined_template_data = {**ets_data, **self.district_template_data}

geojson_modelica_translator/model_connectors/energy_transfer_systems/heating_indirect.py

@@ -67,7 +67,7 @@ def to_modelica(self, scaffold):
 
         ets_data = self.system_parameters.get_param_by_building_id(
             self._geojson_load_id,
-            "ets_model_parameters.indirect"
+            "ets_indirect_parameters"
         )
 
         combined_template_data = {**ets_data, **self.district_template_data}

geojson_modelica_translator/model_connectors/load_connectors/load_base.py

@@ -75,58 +75,58 @@ def __init__(self, system_parameters, geojson_load):
         # test_base.py and test_time_series.py test these cases
         if system_parameters is not None:
             if self.system_parameters.get_param_by_building_id(
-                    self.building_id, "ets_model_parameters.indirect") is not None:
+                    self.building_id, "ets_indirect_parameters") is not None:
                 self.ets_template_data = {
                     "heat_flow_nominal": self.system_parameters.get_param_by_building_id(
-                        self.building_id, "ets_model_parameters.indirect.heat_flow_nominal"
+                        self.building_id, "ets_indirect_parameters.heat_flow_nominal"
                     ),
                     "heat_exchanger_efficiency": self.system_parameters.get_param_by_building_id(
-                        self.building_id, "ets_model_parameters.indirect.heat_exchanger_efficiency"
+                        self.building_id, "ets_indirect_parameters.heat_exchanger_efficiency"
                     ),
                     "nominal_mass_flow_district": self.system_parameters.get_param_by_building_id(
-                        self.building_id, "ets_model_parameters.indirect.nominal_mass_flow_district"
+                        self.building_id, "ets_indirect_parameters.nominal_mass_flow_district"
                     ),
                     "nominal_mass_flow_building": self.system_parameters.get_param_by_building_id(
-                        self.building_id, "ets_model_parameters.indirect.nominal_mass_flow_building"
+                        self.building_id, "ets_indirect_parameters.nominal_mass_flow_building"
                     ),
                     "valve_pressure_drop": self.system_parameters.get_param_by_building_id(
-                        self.building_id, "ets_model_parameters.indirect.valve_pressure_drop"
+                        self.building_id, "ets_indirect_parameters.valve_pressure_drop"
                     ),
                     "heat_exchanger_secondary_pressure_drop": self.system_parameters.get_param_by_building_id(
-                        self.building_id, "ets_model_parameters.indirect.heat_exchanger_secondary_pressure_drop"
+                        self.building_id, "ets_indirect_parameters.heat_exchanger_secondary_pressure_drop"
                     ),
                     "heat_exchanger_primary_pressure_drop": self.system_parameters.get_param_by_building_id(
-                        self.building_id, "ets_model_parameters.indirect.heat_exchanger_primary_pressure_drop"
+                        self.building_id, "ets_indirect_parameters.heat_exchanger_primary_pressure_drop"
                     ),
                     "cooling_supply_water_temperature_building": convert_c_to_k(self.system_parameters.get_param_by_building_id(
-                        self.building_id, "ets_model_parameters.indirect.cooling_supply_water_temperature_building"
+                        self.building_id, "ets_indirect_parameters.cooling_supply_water_temperature_building"
                     )),
                     "heating_supply_water_temperature_building": convert_c_to_k(self.system_parameters.get_param_by_building_id(
-                        self.building_id, "ets_model_parameters.indirect.heating_supply_water_temperature_building"
+                        self.building_id, "ets_indirect_parameters.heating_supply_water_temperature_building"
                     )),
                     "delta_temp_chw_building": self.system_parameters.get_param_by_building_id(
-                        self.building_id, "ets_model_parameters.indirect.delta_temp_chw_building"
+                        self.building_id, "ets_indirect_parameters.delta_temp_chw_building"
                     ),
                     "delta_temp_chw_district": self.system_parameters.get_param_by_building_id(
-                        self.building_id, "ets_model_parameters.indirect.delta_temp_chw_district"
+                        self.building_id, "ets_indirect_parameters.delta_temp_chw_district"
                     ),
                     "delta_temp_hw_building": self.system_parameters.get_param_by_building_id(
-                        self.building_id, "ets_model_parameters.indirect.delta_temp_hw_building"
+                        self.building_id, "ets_indirect_parameters.delta_temp_hw_building"
                     ),
                     "delta_temp_hw_district": self.system_parameters.get_param_by_building_id(
-                        self.building_id, "ets_model_parameters.indirect.delta_temp_hw_district"
+                        self.building_id, "ets_indirect_parameters.delta_temp_hw_district"
                     ),
                     "cooling_controller_y_max": self.system_parameters.get_param_by_building_id(
-                        self.building_id, "ets_model_parameters.indirect.cooling_controller_y_max"
+                        self.building_id, "ets_indirect_parameters.cooling_controller_y_max"
                     ),
                     "cooling_controller_y_min": self.system_parameters.get_param_by_building_id(
-                        self.building_id, "ets_model_parameters.indirect.cooling_controller_y_min"
+                        self.building_id, "ets_indirect_parameters.cooling_controller_y_min"
                     ),
                     "heating_controller_y_max": self.system_parameters.get_param_by_building_id(
-                        self.building_id, "ets_model_parameters.indirect.heating_controller_y_max"
+                        self.building_id, "ets_indirect_parameters.heating_controller_y_max"
                     ),
                     "heating_controller_y_min": self.system_parameters.get_param_by_building_id(
-                        self.building_id, "ets_model_parameters.indirect.heating_controller_y_min"
+                        self.building_id, "ets_indirect_parameters.heating_controller_y_min"
                     )
                 }
             else:
@@ -148,7 +148,7 @@ def add_building(self, urbanopt_building, mapper=None):
         # TODO: Abstract out the GeoJSON functionality
         if mapper is None:
             if self.system_parameters:
-                for building in self.system_parameters.get_default('$.buildings.custom', []):
+                for building in self.system_parameters.get_default('$.buildings', []):
                     # Only look at buildings in the sys-param file, not necessarily the entire feature file
                     if urbanopt_building.feature.properties["id"] == building["geojson_id"]:
                         try:

geojson_modelica_translator/model_connectors/load_connectors/teaser.py

@@ -139,7 +139,7 @@ def to_modelica(self, scaffold, keep_original_models=False):
 
             prj.used_library_calc = "IBPSA"
             prj.number_of_elements_calc = self.system_parameters.get_param_by_building_id(
-                self.building_id, "load_model_parameters.rc.order", default=2
+                self.building_id, "load_model_parameters.rc.order"
             )
             prj.merge_windows_calc = False
 
@@ -310,15 +310,15 @@ def post_process(self, scaffold, keep_original_models=False):
             )
 
             fraction_latent_person = self.system_parameters.get_param(
-                "buildings.default.load_model_parameters.rc.fraction_latent_person", default=1.25
+                "buildings.load_model_parameters.rc.fraction_latent_person", default=1.25
             )
 
             use_moisture_balance = self.system_parameters.get_param(
-                "buildings.default.load_model_parameters.rc.use_moisture_balance", default='false'
+                "buildings.load_model_parameters.rc.use_moisture_balance", default='false'
             )
 
             n_ports = self.system_parameters.get_param(
-                "buildings.default.load_model_parameters.rc.nPorts", default=0
+                "buildings.load_model_parameters.rc.nPorts", default=0
             )
 
             # create a new parameter for fraction latent person
@@ -372,7 +372,7 @@ def post_process(self, scaffold, keep_original_models=False):
 
             # add new port connections
             rc_order = self.system_parameters.get_param_by_building_id(
-                self.building_id, "load_model_parameters.rc.order", default=2
+                self.building_id, "load_model_parameters.rc.order"
             )
             thermal_zone_name = None
             thermal_zone_type = None
@@ -643,7 +643,7 @@ def post_process(self, scaffold, keep_original_models=False):
             )
         else:
             raise Exception(
-                f"Missing MOS weather file for Spawn: {building_template_data['mos_weather']['mos_weather_filename']}")
+                f"Missing MOS weather file for Teaser: {building_template_data['mos_weather']['mos_weather_filename']}")
         # end of what AA added 9/24
 
         # remaining clean up tasks across the entire exported project

geojson_modelica_translator/model_connectors/model_base.py

@@ -46,7 +46,7 @@
 
 logger = logging.getLogger(__name__)
 logging.basicConfig(
-    level=logging.DEBUG,
+    level=logging.INFO,
     format='%(asctime)s - %(levelname)s: %(message)s',
     datefmt='%d-%b-%y %H:%M:%S',
 )
@@ -90,10 +90,10 @@ def __init__(self, system_parameters, template_dir):
         if system_parameters is not None:
             self.district_template_data = {
                 "temp_setpoint_hhw": self.system_parameters.get_param(
-                    "$.district_system.default.central_heating_plant_parameters.temp_setpoint_hhw"
+                    "$.district_system.fourthGDHC.central_heating_plant_parameters.temp_setpoint_hhw"
                 ),
                 "temp_setpoint_chw": self.system_parameters.get_param(
-                    "$.district_system.default.central_cooling_plant_parameters.temp_setpoint_chw"
+                    "$.district_system.fourthGDHC.central_cooling_plant_parameters.temp_setpoint_chw"
                 ),
             }
 

geojson_modelica_translator/model_connectors/plants/chp.py

@@ -52,7 +52,7 @@ def __init__(self, system_parameters):
         super().__init__(system_parameters)
         self.id = 'chpPla_' + simple_uuid()
         self.chp_installed = self.system_parameters.get_param(
-            "$.district_system.default.central_heating_plant_parameters.chp_installed"
+            "$.district_system.fourthGDHC.central_heating_plant_parameters.chp_installed"
         )
         if not self.chp_installed:
             self.required_mo_files.append(Path(self.template_dir) / 'CentralHeatingPlant.mo')
@@ -75,30 +75,30 @@ def to_modelica(self, scaffold):
             template_data = {
                 "nominal_values": {
                     "heat_flow_nominal": self.system_parameters.get_param(
-                        "$.district_system.default.central_heating_plant_parameters.heat_flow_nominal"
+                        "$.district_system.fourthGDHC.central_heating_plant_parameters.heat_flow_nominal"
                     ),
                     "mass_hhw_flow_nominal": self.system_parameters.get_param(
-                        "$.district_system.default.central_heating_plant_parameters.mass_hhw_flow_nominal"
+                        "$.district_system.fourthGDHC.central_heating_plant_parameters.mass_hhw_flow_nominal"
                     ),
                     "boiler_water_flow_minimum": self.system_parameters.get_param(
-                        "$.district_system.default.central_heating_plant_parameters.boiler_water_flow_minimum"
+                        "$.district_system.fourthGDHC.central_heating_plant_parameters.boiler_water_flow_minimum"
                     ),
                     "pressure_drop_hhw_nominal": self.system_parameters.get_param(
-                        "$.district_system.default.central_heating_plant_parameters.pressure_drop_hhw_nominal"
+                        "$.district_system.fourthGDHC.central_heating_plant_parameters.pressure_drop_hhw_nominal"
                     ),
                     "pressure_drop_setpoint": self.system_parameters.get_param(
-                        "$.district_system.default.central_heating_plant_parameters.pressure_drop_setpoint"
+                        "$.district_system.fourthGDHC.central_heating_plant_parameters.pressure_drop_setpoint"
                     ),
                     "temp_setpoint_hhw": convert_c_to_k(self.system_parameters.get_param(
-                        "$.district_system.default.central_heating_plant_parameters.temp_setpoint_hhw"
+                        "$.district_system.fourthGDHC.central_heating_plant_parameters.temp_setpoint_hhw"
                     )),
                     "pressure_drop_hhw_valve_nominal": self.system_parameters.get_param(
-                        "$.district_system.default.central_heating_plant_parameters.pressure_drop_hhw_valve_nominal"
+                        "$.district_system.fourthGDHC.central_heating_plant_parameters.pressure_drop_hhw_valve_nominal"
                     ),
                 },
                 "signals": {
                     "thermal_following": str(self.system_parameters.get_param(
-                        "$.district_system.default.central_heating_plant_parameters.chp_thermal_following"
+                        "$.district_system.fourthGDHC.central_heating_plant_parameters.chp_thermal_following"
                     )).lower(),  # Booleans in Python start with a capital letter. Modelica wants it lowercase, hence this.
                 },
             }