new names part 2

This commit is contained in:
Martin Diehl 2020-10-02 17:51:33 +02:00
parent 1b18cae46b
commit 3d49678e93
1 changed files with 22 additions and 22 deletions

View File

@ -27,34 +27,34 @@ class ConfigMaterial(Config):
def is_complete(self):
"""Check for completeness."""
ok = True
for top_level in ['homogenization','phase','microstructure']:
for top_level in ['homogenization','phase','material']:
# ToDo: With python 3.8 as prerequisite we can shorten with :=
ok &= top_level in self
if top_level not in self: print(f'{top_level} entry missing')
if ok:
ok &= len(self['microstructure']) > 0
if len(self['microstructure']) < 1: print('Incomplete microstructure definition')
ok &= len(self['material']) > 0
if len(self['material']) < 1: print('Incomplete material definition')
if ok:
homogenization = set()
phase = set()
for i,v in enumerate(self['microstructure']):
for i,v in enumerate(self['material']):
if 'homogenization' in v:
homogenization.add(v['homogenization'])
else:
print(f'No homogenization specified in microstructure {i}')
print(f'No homogenization specified in material {i}')
ok = False
if 'constituents' in v:
for ii,vv in enumerate(v['constituents']):
if 'orientation' not in vv:
print('No orientation specified in constituent {ii} of microstructure {i}')
if 'O' not in vv:
print('No orientation specified in constituent {ii} of material {i}')
ok = False
if 'phase' in vv:
phase.add(vv['phase'])
else:
print(f'No phase specified in constituent {ii} of microstructure {i}')
print(f'No phase specified in constituent {ii} of material {i}')
ok = False
for k,v in self['phase'].items():
@ -92,42 +92,42 @@ class ConfigMaterial(Config):
print(f"Invalid lattice: '{s}' in phase '{k}'")
ok = False
if 'microstructure' in self:
for i,v in enumerate(self['microstructure']):
if 'material' in self:
for i,v in enumerate(self['material']):
if 'constituents' in v:
f = 0.0
for c in v['constituents']:
f+= float(c['fraction'])
if 'orientation' in c:
if 'O' in c:
try:
Rotation.from_quaternion(c['orientation'])
Rotation.from_quaternion(c['O'])
except ValueError:
o = c['orientation']
print(f"Invalid orientation: '{o}' in microstructure '{i}'")
o = c['O']
print(f"Invalid orientation: '{o}' in material '{i}'")
ok = False
if not np.isclose(f,1.0):
print(f"Invalid total fraction '{f}' in microstructure '{i}'")
print(f"Invalid total fraction '{f}' in material '{i}'")
ok = False
return ok
def microstructure_rename_phase(self,mapping,ID=None,constituent=None):
def material_rename_phase(self,mapping,ID=None,constituent=None):
"""
Change phase name in microstructure.
Change phase name in material.
Parameters
----------
mapping: dictionary
Mapping from old name to new name
ID: list of ints, optional
Limit renaming to selected microstructure IDs.
Limit renaming to selected material IDs.
constituent: list of ints, optional
Limit renaming to selected constituents.
"""
dup = copy.deepcopy(self)
for i,m in enumerate(dup['microstructure']):
for i,m in enumerate(dup['material']):
if ID and i not in ID: continue
for c in m['constituents']:
if constituent is not None and c not in constituent: continue
@ -138,9 +138,9 @@ class ConfigMaterial(Config):
return dup
def microstructure_rename_homogenization(self,mapping,ID=None):
def material_rename_homogenization(self,mapping,ID=None):
"""
Change homogenization name in microstructure.
Change homogenization name in material.
Parameters
----------
@ -151,7 +151,7 @@ class ConfigMaterial(Config):
"""
dup = copy.deepcopy(self)
for i,m in enumerate(dup['microstructure']):
for i,m in enumerate(dup['material']):
if ID and i not in ID: continue
try:
m['homogenization'] = mapping[m['homogenization']]