From 403ac693dab87d752961bd8732ea77c8f9213204 Mon Sep 17 00:00:00 2001 From: Philip Eisenlohr Date: Thu, 17 Dec 2020 18:08:55 -0500 Subject: [PATCH] need to pass init argument to dict superclass --- python/damask/_configmaterial.py | 15 +++++++++------ .../tests/reference/ConfigMaterial/material.yaml | 10 +++++----- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/python/damask/_configmaterial.py b/python/damask/_configmaterial.py index 17d8c796d..ed72aa27d 100644 --- a/python/damask/_configmaterial.py +++ b/python/damask/_configmaterial.py @@ -9,12 +9,15 @@ from . import Orientation class ConfigMaterial(Config): """Material configuration.""" - def __init__(self): - """Initialize object with all required dictionary keys.""" - super().__init__() - self['material'] = [] - self['homogenization'] = {} - self['phase'] = {} + _defaults = {'material': [], + 'homogenization': {}, + 'phase': {}} + + def __init__(self,d={}): + """Initialize object with default dictionary keys.""" + super().__init__(d) + for k,v in self._defaults.items(): + if k not in self: self[k] = v def save(self,fname='material.yaml',**kwargs): """ diff --git a/python/tests/reference/ConfigMaterial/material.yaml b/python/tests/reference/ConfigMaterial/material.yaml index 933e295b3..fbba6a631 100644 --- a/python/tests/reference/ConfigMaterial/material.yaml +++ b/python/tests/reference/ConfigMaterial/material.yaml @@ -1,10 +1,10 @@ homogenization: SX: - N_constituents: 2 - mech: {type: none} + N_constituents: 1 + mechanics: {type: none} Taylor: N_constituents: 2 - mech: {type: isostrain} + mechanics: {type: isostrain} material: - constituents: @@ -34,11 +34,11 @@ material: phase: Aluminum: lattice: cF - mech: + mechanics: output: [F, P, F_e, F_p, L_p] elasticity: {C_11: 106.75e9, C_12: 60.41e9, C_44: 28.34e9, type: hooke} Steel: lattice: cI - mech: + mechanics: output: [F, P, F_e, F_p, L_p] elasticity: {C_11: 233.3e9, C_12: 135.5e9, C_44: 118.0e9, type: hooke}