Skip to content

Commit

Permalink
fix(model): Remove north from Model properties
Browse files Browse the repository at this point in the history
After some discussions with @mostaphaRoudsari , we have decided that the north should not be a property of the Model for the same reason why we don't have the location as a part of the model. The north direction is a property of the simulation assets like the skies used in Radiance or the simulation parameters used in our EnergyPlus.
  • Loading branch information
chriswmackey committed May 8, 2020
1 parent ed02042 commit 3454944
Show file tree
Hide file tree
Showing 4 changed files with 400 additions and 417 deletions.
9 changes: 1 addition & 8 deletions dragonfly_schema/energy/properties.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
from honeybee_schema.energy.programtype import ProgramTypeAbridged, ProgramType
from honeybee_schema.energy.hvac import IdealAirSystemAbridged

from honeybee_schema.energy.properties import TerrianTypes
from honeybee_schema.energy.construction import OpaqueConstructionAbridged, \
WindowConstructionAbridged, ShadeConstruction, AirBoundaryConstructionAbridged, \
OpaqueConstruction, WindowConstruction, AirBoundaryConstruction
Expand Down Expand Up @@ -104,20 +103,14 @@ class ContextShadeEnergyPropertiesAbridged(NoExtraBaseModel):
max_length=100,
description='Name of a schedule to set the transmittance of the ContextShade, '
'which can vary throughout the simulation. If None, the ContextShade will '
'be completely opauqe.'
'be completely opaque.'
)


class ModelEnergyProperties(NoExtraBaseModel):

type: constr(regex='^ModelEnergyProperties$') = 'ModelEnergyProperties'

terrain_type: TerrianTypes = Field(
default=TerrianTypes.city,
description='Text for the terrain in which the model sits. This is used '
'to determine the wind profile over the height of the buildings.'
)

global_construction_set: str = Field(
default=None,
min_length=1,
Expand Down
10 changes: 2 additions & 8 deletions dragonfly_schema/model.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""Model schema and the 3 geometry objects that define it."""
from pydantic import BaseModel, Field, root_validator, constr, conlist
from pydantic import BaseModel, Field, validator, root_validator, constr, conlist
from typing import List, Union
from enum import Enum

from honeybee_schema._base import IDdBaseModel
from honeybee_schema.model import Face3D, Units
Expand Down Expand Up @@ -245,13 +246,6 @@ class Model(IDdBaseModel):
description='A list of ContextShades in the model.'
)

north_angle: float = Field(
default=0,
ge=0,
lt=360,
description='The clockwise north direction in degrees.'
)

units: Units = Field(
default=Units.meters,
description='Text indicating the units in which the model geometry exists. '
Expand Down
Loading

0 comments on commit 3454944

Please sign in to comment.