From 869307c5ecda89b712267de5103b8c2af16cf220 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sun, 7 Feb 2021 15:05:38 +0100 Subject: [PATCH] temperature not needed for pure mechanics would also require to define thermal homogenization --- PRIVATE | 2 +- examples/SpectralMethod/Polycrystal/shearXY.yaml | 3 --- examples/SpectralMethod/Polycrystal/shearZX.yaml | 3 --- examples/SpectralMethod/Polycrystal/tensionX.yaml | 3 --- python/damask/_configmaterial.py | 14 +++++++------- 5 files changed, 8 insertions(+), 17 deletions(-) diff --git a/PRIVATE b/PRIVATE index d90babadf..91a4329a6 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit d90babadfb0a33afa1b793044cc4efd4d7430731 +Subproject commit 91a4329a6fe073fc2ef17e5c2c8e2f796e3b897b diff --git a/examples/SpectralMethod/Polycrystal/shearXY.yaml b/examples/SpectralMethod/Polycrystal/shearXY.yaml index fe746e7ac..58471e8f1 100644 --- a/examples/SpectralMethod/Polycrystal/shearXY.yaml +++ b/examples/SpectralMethod/Polycrystal/shearXY.yaml @@ -3,9 +3,6 @@ solver: mechanical: spectral_basic -initial_conditions: - T: 300 #in Kelvin - loadstep: - boundary_conditions: mechanical: diff --git a/examples/SpectralMethod/Polycrystal/shearZX.yaml b/examples/SpectralMethod/Polycrystal/shearZX.yaml index 5d977b4ba..a32fafb85 100644 --- a/examples/SpectralMethod/Polycrystal/shearZX.yaml +++ b/examples/SpectralMethod/Polycrystal/shearZX.yaml @@ -3,9 +3,6 @@ solver: mechanical: spectral_basic -initial_conditions: - T: 300 #in Kelvin - loadstep: - boundary_conditions: mechanical: diff --git a/examples/SpectralMethod/Polycrystal/tensionX.yaml b/examples/SpectralMethod/Polycrystal/tensionX.yaml index 0809fd53d..870755d58 100644 --- a/examples/SpectralMethod/Polycrystal/tensionX.yaml +++ b/examples/SpectralMethod/Polycrystal/tensionX.yaml @@ -3,9 +3,6 @@ solver: mechanical: spectral_basic -initial_conditions: - T: 300 #in Kelvin - loadstep: - boundary_conditions: mechanical: diff --git a/python/damask/_configmaterial.py b/python/damask/_configmaterial.py index d3ed972e3..0adc494b8 100644 --- a/python/damask/_configmaterial.py +++ b/python/damask/_configmaterial.py @@ -168,11 +168,11 @@ class ConfigMaterial(Config): ok = False 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['v']) + for i,m in enumerate(self['material']): + if 'constituents' in m: + v = 0.0 + for c in m['constituents']: + v+= float(c['v']) if 'O' in c: try: Rotation.from_quaternion(c['O']) @@ -180,8 +180,8 @@ class ConfigMaterial(Config): 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 material '{i}'") + if not np.isclose(v,1.0): + print(f"Invalid total fraction (v) '{v}' in material '{i}'") ok = False return ok