Skip to content

Commit

Permalink
Merge pull request #94 from thegridelectric/dev
Browse files Browse the repository at this point in the history
v 0.3.8: new types for simple resistive hydronic heating model
  • Loading branch information
jessicamillar authored Jun 27, 2023
2 parents 90bf76d + 9fa77c4 commit af41041
Show file tree
Hide file tree
Showing 65 changed files with 6,378 additions and 579 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,14 @@ jobs:
- name: Publish package on PyPI
if: steps.check-version.outputs.tag
uses: pypa/gh-action-pypi-publish@v1.8.5
uses: pypa/gh-action-pypi-publish@v1.8.6
with:
user: __token__
password: ${{ secrets.PYPI_TOKEN }}

- name: Publish package on TestPyPI
if: "! steps.check-version.outputs.tag"
uses: pypa/gh-action-pypi-publish@v1.8.5
uses: pypa/gh-action-pypi-publish@v1.8.6
with:
user: __token__
password: ${{ secrets.TEST_PYPI_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -154,4 +154,4 @@ jobs:
nox --session=coverage -- xml
- name: Upload coverage report
uses: codecov/codecov-action@v3.1.3
uses: codecov/codecov-action@v3.1.4
2 changes: 1 addition & 1 deletion arm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ services:
- "dev"
hostname: rabbit
container_name: atn-dev-rabbit
image: "jessmillar/dev-rabbit-arm:chaos__e58daf6__20230308"
image: "jessmillar/dev-rabbit-arm:chaos__53ea3a0__20230622"
ports:
- 1885:1885
- 4369:4369
Expand Down
12 changes: 9 additions & 3 deletions docs/apis/json/atn-params-brickstorageheater.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,19 @@
},
{
"const": "2127aba6",
"title": "VersantStorageHeatTariff",
"description": ""
"title": "VersantA1StorageHeatTariff",
"url": "https://github.com/thegridelectric/gridworks-ps/blob/dev/input_data/electricity_prices/isone/distp__w.isone.stetson__2022__gw.me.versant.a1.res.ets.csv",
"description": "Versant is a utility serving customers in Maine, and in particular serves much of the area behind the Keene Rd Constraint in the [GridWorks Millinocket Demo](https://gridworks.readthedocs.io/en/latest/millinocket-demo.html#background). Alternately known as the 'Home Eco Rate With Bonus Meter, Time-of-Use.' Look for rate A1 in Versant [rate schedules](https://www.versantpower.com/residential/rates/rates-schedules/); details are also available [here](https://drive.google.com/drive/u/0/folders/1mhIeNj2JWVyIJrQnSHmBDOkBpNnRRVKB). More: Service under this rate will be available to residential customers with thermal energy storage devices, electric battery storage devices, and/or vehicle chargers who agree to install a second metered point of delivery. The customer will be subject to inspections to ensure that the thermal storage device, electric battery storage device, and electric vehicle charger(s) are sized appropriately for residential use. If the thermal storage device, electric battery storage device, and electric vehicle charger(s) do not pass Company inspection, then the service will be denied. Service will be single-phase, alternating current, 60 hertz, at one standard secondary distribution voltage. Customers taking service under this rate schedule are responsible for paying both Distribution Service and Stranded Cost."
},
{
"const": "ea5c675a",
"title": "VersantATariff",
"description": ""
"description": "Versant is a utility serving customers in Maine, and in particular serves much of the area behind the Keene Rd Constraint in the [GridWorks Millinocket Demo](https://gridworks.readthedocs.io/en/latest/millinocket-demo.html#background). The A Tariff is their standard residential tariff. Look for rate A in Versant [rate schedules](https://www.versantpower.com/residential/rates/rates-schedules/)"
},
{
"const": "54aec3a7",
"title": "VersantA20HeatTariff",
"description": "Versant is a utility serving customers in Maine, and in particular serves much of the area behind the Keene Rd Constraint in the [GridWorks Millinocket Demo](https://gridworks.readthedocs.io/en/latest/millinocket-demo.html#background). This is an alternative tariff available for electric heat."
}
]
},
Expand Down
210 changes: 210 additions & 0 deletions docs/apis/json/atn-params-simpleresistivehydronic.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,210 @@
{
"gwapi": "001",
"type_name": "atn.params.simpleresistivehydronic",
"version": "000",
"owner": "gridworks@gridworks-consulting.com",
"description": "",
"formats": {
"LeftRightDot": {
"type": "string",
"description": "Lowercase alphanumeric words separated by periods, most significant word (on the left) starting with an alphabet character.",
"example": "dw1.isone.me.freedom.apple"
}
},
"enums": {
"DistributionTariff000": {
"type": "string",
"name": "distribution.tariff.000",
"description": "Name of distribution tariff of local network company/utility",
"oneOf": [
{
"const": "00000000",
"title": "Unknown",
"description": ""
},
{
"const": "2127aba6",
"title": "VersantA1StorageHeatTariff",
"url": "https://github.com/thegridelectric/gridworks-ps/blob/dev/input_data/electricity_prices/isone/distp__w.isone.stetson__2022__gw.me.versant.a1.res.ets.csv",
"description": "Versant is a utility serving customers in Maine, and in particular serves much of the area behind the Keene Rd Constraint in the [GridWorks Millinocket Demo](https://gridworks.readthedocs.io/en/latest/millinocket-demo.html#background). Alternately known as the 'Home Eco Rate With Bonus Meter, Time-of-Use.' Look for rate A1 in Versant [rate schedules](https://www.versantpower.com/residential/rates/rates-schedules/); details are also available [here](https://drive.google.com/drive/u/0/folders/1mhIeNj2JWVyIJrQnSHmBDOkBpNnRRVKB). More: Service under this rate will be available to residential customers with thermal energy storage devices, electric battery storage devices, and/or vehicle chargers who agree to install a second metered point of delivery. The customer will be subject to inspections to ensure that the thermal storage device, electric battery storage device, and electric vehicle charger(s) are sized appropriately for residential use. If the thermal storage device, electric battery storage device, and electric vehicle charger(s) do not pass Company inspection, then the service will be denied. Service will be single-phase, alternating current, 60 hertz, at one standard secondary distribution voltage. Customers taking service under this rate schedule are responsible for paying both Distribution Service and Stranded Cost."
},
{
"const": "ea5c675a",
"title": "VersantATariff",
"description": "Versant is a utility serving customers in Maine, and in particular serves much of the area behind the Keene Rd Constraint in the [GridWorks Millinocket Demo](https://gridworks.readthedocs.io/en/latest/millinocket-demo.html#background). The A Tariff is their standard residential tariff. Look for rate A in Versant [rate schedules](https://www.versantpower.com/residential/rates/rates-schedules/)"
},
{
"const": "54aec3a7",
"title": "VersantA20HeatTariff",
"description": "Versant is a utility serving customers in Maine, and in particular serves much of the area behind the Keene Rd Constraint in the [GridWorks Millinocket Demo](https://gridworks.readthedocs.io/en/latest/millinocket-demo.html#background). This is an alternative tariff available for electric heat."
}
]
},
"RecognizedCurrencyUnit000": {
"type": "string",
"name": "recognized.currency.unit.000",
"description": "Unit of currency",
"oneOf": [
{
"const": "00000000",
"title": "Unknown",
"description": ""
},
{
"const": "e57c5143",
"title": "USD",
"description": "US Dollar"
},
{
"const": "f7b38fc5",
"title": "GBP",
"description": "Pounds sterling"
}
]
},
"EnergySupplyType000": {
"type": "string",
"name": "energy.supply.type.000",
"description": "",
"oneOf": [
{
"const": "00000000",
"title": "Unknown",
"description": ""
},
{
"const": "cb18f937",
"title": "StandardOffer",
"description": ""
},
{
"const": "e9dc99a6",
"title": "RealtimeLocalLmp",
"description": ""
}
]
}
},
"properties": {
"GNodeAlias": {
"type": "string",
"format": "LeftRightDot",
"title": "",
"required": true
},
"HomeCity": {
"type": "string",
"title": "",
"required": true
},
"TimezoneString": {
"type": "string",
"title": "",
"required": true
},
"StorageSteps": {
"type": "integer",
"title": "",
"required": true
},
"FloSlices": {
"type": "integer",
"title": "",
"required": true
},
"SliceDurationMinutes": {
"type": "integer",
"title": "",
"required": true
},
"CurrencyUnit": {
"type": "string",
"format": "RecognizedCurrencyUnit000",
"title": "",
"required": true
},
"Tariff": {
"type": "string",
"format": "DistributionTariff000",
"title": "",
"required": true
},
"EnergyType": {
"type": "string",
"format": "EnergySupplyType000",
"title": "",
"required": true
},
"StandardOfferPriceDollarsPerMwh": {
"type": "integer",
"title": "",
"required": true
},
"DistributionTariffDollarsPerMwh": {
"type": "integer",
"title": "",
"required": true
},
"StoreSizeGallons": {
"type": "integer",
"title": "",
"required": true
},
"MaxStoreTempF": {
"type": "integer",
"title": "",
"required": true
},
"ElementMaxPowerKw": {
"type": "number",
"title": "",
"required": true
},
"RequiredSourceWaterTempF": {
"type": "integer",
"title": "",
"required": true
},
"FixedPumpGpm": {
"type": "number",
"title": "",
"required": true
},
"ReturnWaterFixedDeltaT": {
"type": "integer",
"title": "",
"required": true
},
"AnnualHvacKwhTh": {
"type": "integer",
"title": "",
"required": true
},
"AmbientPowerInKw": {
"type": "number",
"title": "",
"required": true
},
"HouseWorstCaseTempF": {
"type": "integer",
"title": "",
"required": true
},
"RoomTempF": {
"type": "integer",
"title": "",
"required": true
},
"TypeName": {
"type": "string",
"value": "atn.params.simpleresistivehydronic.000",
"title": "The type name"
},
"Version": {
"type": "string",
"title": "The type version",
"default": "000",
"required": true
}
}
}
4 changes: 2 additions & 2 deletions docs/apis/json/flo-params-brickstorageheater.json
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
"C": {
"type": "number",
"title": "",
"required": false
"required": true
},
"RealtimeElectricityPrice": {
"type": "number",
Expand Down Expand Up @@ -167,7 +167,7 @@
"type": "string",
"format": "UuidCanonicalTextual",
"title": "",
"required": false
"required": true
},
"RegPriceUid": {
"type": "string",
Expand Down
Loading

0 comments on commit af41041

Please sign in to comment.