From 81d0002a49a2b03f0b184130d3909b4bcb60a8a7 Mon Sep 17 00:00:00 2001 From: Philip Eisenlohr Date: Sat, 5 Aug 2023 11:50:03 -0400 Subject: [PATCH] corrected remaining instances of phenopowerlaw configuration --- PRIVATE | 2 +- examples/Marc/material.yaml | 8 ++++---- examples/mesh/material.yaml | 8 ++++---- .../resources/Result/12grains6x7x8.material.yaml | 16 ++++++++-------- .../resources/Result/4grains2x4x3.material.yaml | 16 ++++++++-------- .../6grains6x7x8_single_phase.material.yaml | 8 ++++---- 6 files changed, 29 insertions(+), 29 deletions(-) diff --git a/PRIVATE b/PRIVATE index 4e1957339..671e09508 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit 4e195733964bfa36de70abb768a65a7216180d0f +Subproject commit 671e09508137c7041f272009db654e46b9c0dcdc diff --git a/examples/Marc/material.yaml b/examples/Marc/material.yaml index c0a7be647..be915189a 100644 --- a/examples/Marc/material.yaml +++ b/examples/Marc/material.yaml @@ -13,12 +13,12 @@ phase: plastic: type: phenopowerlaw N_sl: [12] - a_sl: 2.25 + a_sl: [2.25] atol_xi: 1.0 - dot_gamma_0_sl: 0.001 - h_0_sl-sl: 75.e+6 + dot_gamma_0_sl: [0.001] + h_0_sl-sl: [75.e+6] h_sl-sl: [1, 1, 1.4, 1.4, 1.4, 1.4, 1.4] - n_sl: 20 + n_sl: [20] output: [xi_sl] xi_0_sl: [31.e+6] xi_inf_sl: [63.e+6] diff --git a/examples/mesh/material.yaml b/examples/mesh/material.yaml index 94bbaa98f..cfa4b4464 100644 --- a/examples/mesh/material.yaml +++ b/examples/mesh/material.yaml @@ -12,12 +12,12 @@ phase: plastic: type: phenopowerlaw N_sl: [12] - a_sl: 2.25 + a_sl: [2.25] atol_xi: 1.0 - dot_gamma_0_sl: 0.001 - h_0_sl-sl: 75.e+6 + dot_gamma_0_sl: [0.001] + h_0_sl-sl: [75.e+6] h_sl-sl: [1, 1, 1.4, 1.4, 1.4, 1.4, 1.4] - n_sl: 20 + n_sl: [20] output: [xi_sl] xi_0_sl: [31.e+6] xi_inf_sl: [63.e+6] diff --git a/python/tests/resources/Result/12grains6x7x8.material.yaml b/python/tests/resources/Result/12grains6x7x8.material.yaml index a74e266c3..06045a746 100644 --- a/python/tests/resources/Result/12grains6x7x8.material.yaml +++ b/python/tests/resources/Result/12grains6x7x8.material.yaml @@ -12,12 +12,12 @@ phase: elastic: {C_11: 106.75e9, C_12: 60.41e9, C_44: 28.34e9, type: Hooke} plastic: N_sl: [12] - a_sl: 2.25 + a_sl: [2.25] atol_xi: 1.0 - dot_gamma_0_sl: 0.001 - h_0_sl-sl: 75e6 + dot_gamma_0_sl: [0.001] + h_0_sl-sl: [75e6] h_sl-sl: [1, 1, 1.4, 1.4, 1.4, 1.4, 1.4] - n_sl: 20 + n_sl: [20] output: [xi_sl] type: phenopowerlaw xi_0_sl: [31e6] @@ -29,12 +29,12 @@ phase: elastic: {C_11: 106.75e9, C_12: 60.41e9, C_44: 28.34e9, type: Hooke} plastic: N_sl: [12] - a_sl: 2.25 + a_sl: [2.25] atol_xi: 1.0 - dot_gamma_0_sl: 0.001 - h_0_sl-sl: 75e6 + dot_gamma_0_sl: [0.001] + h_0_sl-sl: [75e6] h_sl-sl: [1, 1.4, 1, 1.4, 1.4, 1.4, 1.4] - n_sl: 20 + n_sl: [20] output: [xi_sl] type: phenopowerlaw xi_0_sl: [31e6] diff --git a/python/tests/resources/Result/4grains2x4x3.material.yaml b/python/tests/resources/Result/4grains2x4x3.material.yaml index 96be5f483..642b7843b 100644 --- a/python/tests/resources/Result/4grains2x4x3.material.yaml +++ b/python/tests/resources/Result/4grains2x4x3.material.yaml @@ -644,12 +644,12 @@ phase: elastic: {C_11: 106.75e9, C_12: 60.41e9, C_44: 28.34e9, type: Hooke} plastic: N_sl: [12] - a_sl: 2.25 + a_sl: [2.25] atol_xi: 1.0 - dot_gamma_0_sl: 0.001 - h_0_sl-sl: 75e6 + dot_gamma_0_sl: [0.001] + h_0_sl-sl: [75e6] h_sl-sl: [1, 1, 1.4, 1.4, 1.4, 1.4, 1.4] - n_sl: 20 + n_sl: [20] output: [xi_sl] type: phenopowerlaw xi_0_sl: [31e6] @@ -661,12 +661,12 @@ phase: elastic: {C_11: 106.75e9, C_12: 60.41e9, C_44: 28.34e9, type: Hooke} plastic: N_sl: [12] - a_sl: 2.25 + a_sl: [2.25] atol_xi: 1.0 - dot_gamma_0_sl: 0.001 - h_0_sl-sl: 75e6 + dot_gamma_0_sl: [0.001] + h_0_sl-sl: [75e6] h_sl-sl: [1, 1.4, 1, 1.4, 1.4, 1.4, 1.4] - n_sl: 20 + n_sl: [20] output: [xi_sl] type: phenopowerlaw xi_0_sl: [31e6] diff --git a/python/tests/resources/Result/6grains6x7x8_single_phase.material.yaml b/python/tests/resources/Result/6grains6x7x8_single_phase.material.yaml index 0f7bf5450..f820e1011 100644 --- a/python/tests/resources/Result/6grains6x7x8_single_phase.material.yaml +++ b/python/tests/resources/Result/6grains6x7x8_single_phase.material.yaml @@ -12,12 +12,12 @@ phase: elastic: {C_11: 106.75e9, C_12: 60.41e9, C_44: 28.34e9, type: Hooke} plastic: N_sl: [12] - a_sl: 2.25 + a_sl: [2.25] atol_xi: 1.0 - dot_gamma_0_sl: 0.001 - h_0_sl-sl: 75e6 + dot_gamma_0_sl: [0.001] + h_0_sl-sl: [75e6] h_sl-sl: [1, 1, 1.4, 1.4, 1.4, 1.4, 1.4] - n_sl: 20 + n_sl: [20] output: [xi_sl] type: phenopowerlaw xi_0_sl: [31e6]