Merge pull request #25 from urbanopt/_5G_example

Integrating 5G time series example
urbanopt · Mar 13, 2023 · 0494d98 · 0494d98
2 parents b2712ed + e6fc55c
commit 0494d98
Show file tree

Hide file tree

Showing 12 changed files with 9,614 additions and 256 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -19,17 +19,17 @@ repos:
       - id: check-yaml
       - id: debug-statements
       - id: end-of-file-fixer
-      #  - id: requirements-txt-fixer
-      - id: flake8
-        args: ['--max-line-length=140']  # default of Black
       - id: mixed-line-ending
       - id: pretty-format-json
         args: ['--autofix', '--no-sort-keys']
-  - repo: https://github.com/pycqa/isort
-    rev: 5.10.1
+  - repo: https://github.com/charliermarsh/ruff-pre-commit
+    rev: 'v0.0.254'
     hooks:
-      - id: isort
-        name: isort (python)
+      - id: ruff
+  - repo: https://github.com/psf/black
+    rev: 23.1.0
+    hooks:
+    - id: black-jupyter
   # - repo: local
   #   hooks:
   #     - id: modelica-fmt

diff --git a/README.rst b/README.rst
@@ -62,6 +62,8 @@ Matrix of Examples
 +-----------+---------------------+----------------+-----------+---------------+------------------------------------+-------------+
 | 4GDHC - 6 | 8                   | Mix            | Indirect  | 4-Pipe        | Chiller, Cooling Tower, and Boiler | -           |
 +-----------+---------------------+----------------+-----------+---------------+------------------------------------+-------------+
+| 5GDHC - 1 | 2                   | Time Series    | Indirect  | N/A           |  Infinite Heating and Cooling      | Complete    |
++-----------+---------------------+----------------+-----------+---------------+------------------------------------+-------------+
 
 
 Todos

diff --git a/examples/time_series_5g/time_series_5g_sys_params.json b/examples/time_series_5g/time_series_5g_sys_params.json
@@ -0,0 +1,89 @@
+{
+  "weather": "USA_CA_San.Francisco.Intl.AP.724940_TMY3.mos",
+  "buildings": [
+    {
+      "geojson_id": "5a6b99ec37f4de7f94020090",
+      "load_model": "time_series",
+      "load_model_parameters": {
+        "time_series": {
+          "filepath": "time_series_large_office_2013_5B.mos",
+          "delta_temp_air_cooling": 10,
+          "delta_temp_air_heating": 18,
+          "has_liquid_heating": true,
+          "has_electric_heating": false,
+          "has_liquid_cooling": true,
+          "has_electric_cooling": false,
+          "temp_chw_supply": 15,
+          "temp_chw_return": 12,
+          "temp_hw_supply": 40,
+          "temp_hw_return": 35,
+          "temp_setpoint_cooling": 24,
+          "temp_setpoint_heating": 20
+        }
+      },
+      "ets_model": "Fifth Gen Heat Pump",
+      "fifth_gen_ets_parameters": {
+        "supply_water_temperature_building": 15
+      }
+    },
+    {
+      "geojson_id": "abcdefghijklmnopqrstuvwx",
+      "load_model": "time_series",
+      "load_model_parameters": {
+        "time_series": {
+          "filepath": "time_series_large_office_2013_5B.mos",
+          "delta_temp_air_cooling": 10,
+          "delta_temp_air_heating": 18,
+          "has_liquid_heating": true,
+          "has_electric_heating": false,
+          "has_liquid_cooling": true,
+          "has_electric_cooling": false,
+          "temp_chw_supply": 15,
+          "temp_chw_return": 12,
+          "temp_hw_supply": 40,
+          "temp_hw_return": 35,
+          "temp_setpoint_cooling": 24,
+          "temp_setpoint_heating": 20
+        }
+      },
+      "ets_model": "Fifth Gen Heat Pump",
+      "fifth_gen_ets_parameters": {
+        "supply_water_temperature_building": 15
+      }
+    }
+  ],
+  "district_system": {
+    "fifth_generation": {
+      "central_cooling_plant_parameters": {
+        "heat_flow_nominal": 7999,
+        "cooling_tower_fan_power_nominal": 4999,
+        "mass_chw_flow_nominal": 9.9,
+        "chiller_water_flow_minimum": 9.9,
+        "mass_cw_flow_nominal": 9.9,
+        "chw_pump_head": 300000,
+        "cw_pump_head": 200000,
+        "pressure_drop_chw_nominal": 5999,
+        "pressure_drop_cw_nominal": 5999,
+        "pressure_drop_setpoint": 49999,
+        "temp_setpoint_chw": 6,
+        "pressure_drop_chw_valve_nominal": 5999,
+        "pressure_drop_cw_pum_nominal": 5999,
+        "temp_air_wb_nominal": 24.9,
+        "temp_cw_in_nominal": 34.9,
+        "cooling_tower_water_temperature_difference_nominal": 6.56,
+        "delta_temp_approach": 3.25,
+        "ratio_water_air_nominal": 0.6
+      },
+      "central_heating_plant_parameters": {
+        "heat_flow_nominal": 8001,
+        "mass_hhw_flow_nominal": 11,
+        "boiler_water_flow_minimum": 11,
+        "pressure_drop_hhw_nominal": 55001,
+        "pressure_drop_setpoint": 50000,
+        "temp_setpoint_hhw": 7,
+        "pressure_drop_hhw_valve_nominal": 6001,
+        "chp_installed": false
+      }
+    }
+  }
+}
diff --git a/examples/time_series_5g/time_series_ex1.json b/examples/time_series_5g/time_series_ex1.json
@@ -0,0 +1,103 @@
+{
+  "type": "FeatureCollection",
+  "features": [
+    {
+      "type": "Feature",
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [
+              -105.18596629732914,
+              39.79767675062061
+            ],
+            [
+              -105.18596629732914,
+              39.7973830919949
+            ],
+            [
+              -105.18539945823584,
+              39.7973830919949
+            ],
+            [
+              -105.18539945823584,
+              39.79767675062061
+            ],
+            [
+              -105.18596629732914,
+              39.79767675062061
+            ]
+          ]
+        ]
+      },
+      "properties": {
+        "id": "5a6b99ec37f4de7f94020090",
+        "type": "Building",
+        "geometryType": "Rectangle",
+        "name": "Small Office",
+        "footprint_area": 17059,
+        "footprint_perimeter": 533,
+        "project_id": "5a6b8adf37f4de7f94020084",
+        "updated_at": "2018-01-31T20:36:55.936Z",
+        "created_at": "2018-01-26T21:13:16.655Z",
+        "building_type": "Office",
+        "number_of_stories": 3,
+        "height": 9,
+        "number_of_stories_above_ground": 3,
+        "building_status": "Proposed",
+        "include_in_energy_analysis": true,
+        "floor_area": 51177,
+        "year_built": 2010
+      }
+    },
+    {
+      "type": "Feature",
+      "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+          [
+            [
+              -105.18596629732914,
+              39.79767675062061
+            ],
+            [
+              -105.18596629732914,
+              39.7973830919949
+            ],
+            [
+              -105.18539945823584,
+              39.7973830919949
+            ],
+            [
+              -105.18539945823584,
+              39.79767675062061
+            ],
+            [
+              -105.18596629732914,
+              39.79767675062061
+            ]
+          ]
+        ]
+      },
+      "properties": {
+        "id": "abcdefghijklmnopqrstuvwx",
+        "type": "Building",
+        "geometryType": "Rectangle",
+        "name": "Small Office",
+        "footprint_area": 17059,
+        "footprint_perimeter": 533,
+        "project_id": "5a6b8adf37f4de7f94020084",
+        "updated_at": "2018-01-31T20:36:55.936Z",
+        "created_at": "2018-01-26T21:13:16.655Z",
+        "building_type": "Office",
+        "number_of_stories": 3,
+        "height": 9,
+        "number_of_stories_above_ground": 3,
+        "building_status": "Proposed",
+        "include_in_energy_analysis": true,
+        "floor_area": 51177,
+        "year_built": 2010
+      }
+    }
+  ]
+}