markus/lib-paveit-demo
1
0
Fork 0
Code Pull Requests Activity

shift parameter and definition of Bitumen to material.py

Browse Source
This commit is contained in:
Markus Clauß
2023-05-23 10:26:21 +02:00
parent 9562ecabfa
commit 4e5b3aa212
2 changed files with 23 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/paveit/datamodels/material.py
View File

@@ -6,6 +6,8 @@ from mongoengine import *
from .project import Project from .project import Project
from .usermanagement import Organisation, User from .usermanagement import Organisation, User
from .norm_specification import DeliveryGrain from .norm_specification import DeliveryGrain
from .enumeration import BitumenCategoryEnum, NormEnum
class Material(Document): class Material(Document):
@@ -56,14 +58,28 @@ class Asphalt(Material):
young_modulus = DictField() young_modulus = DictField()
fatigue = DictField() fatigue = DictField()
# Bitumen
class BitumenParameterStrassenbaubitumen(EnumerateBase):
penetration = FloatField(min_value=0, max_value=1000)
softening_point = FloatField(min_value=0, max_value =500)
flash_point = FloatField(min_value=0, max_value=500)
solubility = FloatField(default=99.0, min_value=0, max_value=100)
fraass_breaking_point = FloatField(min_value=-100, max_value=100)
hardening_resistance_penetration = FloatField(min_value=0, max_value=100)
hardening_resistance_softening_point= FloatField(min_value=0, max_value=100)
hardening_resistance_masschange = FloatField(min_value=0, max_value=100)
class Bitumen(Material): class Bitumen(Material):
norm = StringField(required=False, default='TP Asphalt Teil 24')
name = StringField() name = StringField()
material = StringField()
young_modulus = DictField() category = EnumField(BitumenCategoryEnum, required=True)
norm = EnumField(NormEnum, default=NormEnum.TLBitumen2019)
parameter = ReferenceField(EnumerateBase)
limits = LazyReferenceField(EnumerateBase)
class Bitumenemulsion(Material): class Bitumenemulsion(Material):

19
src/paveit/datamodels/norm_specification.py
View File

@@ -21,18 +21,7 @@ class DeliveryGrain(EnumerateBase):
norm = StringField(required=True, default='TL Gestein-StB 04 (2018)') norm = StringField(required=True, default='TL Gestein-StB 04 (2018)')
# Bitumen # Bitumen
class BitumenParameterStrassenbaubitumen(EnumerateBase):
norm = EnumField(NormEnum, default=NormEnum.TLBitumen2019)
penetration = FloatField(min_value=0, max_value=1000)
softening_point = FloatField(min_value=0, max_value =500)
flash_point = FloatField(min_value=0, max_value=500)
solubility = FloatField(default=99.0, min_value=0, max_value=100)
fraass_breaking_point = FloatField(min_value=-100, max_value=100)
hardening_resistance_penetration = FloatField(min_value=0, max_value=100)
hardening_resistance_softening_point= FloatField(min_value=0, max_value=100)
hardening_resistance_masschange = FloatField(min_value=0, max_value=100)
class BitumenParameterLimitsStrassenbaubitumen(EnumerateBase): class BitumenParameterLimitsStrassenbaubitumen(EnumerateBase):
@@ -93,14 +82,6 @@ class BitumenParameterLimitsStrassenbaubitumen(EnumerateBase):
hardening_resistance_masschange_max = FloatField(min_value=0, max_value=100) hardening_resistance_masschange_max = FloatField(min_value=0, max_value=100)
class Bitumen(EnumerateBase):
name = StringField()
category = EnumField(BitumenCategoryEnum, required=True)
norm = EnumField(NormEnum, required=True)
parameter = ReferenceField(EnumerateBase)
limits = LazyReferenceField(EnumerateBase)
# Asphalt # Asphalt
class Asphalt(EnumerateBase): class Asphalt(EnumerateBase):