diff --git a/PRIVATE b/PRIVATE index 0d572a227..888d95604 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit 0d572a2277a65097be81c31db671d4d193685831 +Subproject commit 888d956040237bb9677e46863ac38604160b0234 diff --git a/examples/configuration/Kinematics_Thermal_Expansion.config b/examples/config/Kinematics_Thermal_Expansion.config similarity index 100% rename from examples/configuration/Kinematics_Thermal_Expansion.config rename to examples/config/Kinematics_Thermal_Expansion.config diff --git a/examples/configuration/Phase_Damage.config b/examples/config/Phase_Damage.config similarity index 100% rename from examples/configuration/Phase_Damage.config rename to examples/config/Phase_Damage.config diff --git a/examples/configuration/Phase_DisloUCLA_Tungsten.config b/examples/config/Phase_DisloUCLA_Tungsten.config similarity index 100% rename from examples/configuration/Phase_DisloUCLA_Tungsten.config rename to examples/config/Phase_DisloUCLA_Tungsten.config diff --git a/examples/configuration/Phase_Dislotwin_TWIP-Steel-FeMnC.yaml b/examples/config/Phase_Dislotwin_TWIP-Steel-FeMnC.yaml similarity index 100% rename from examples/configuration/Phase_Dislotwin_TWIP-Steel-FeMnC.yaml rename to examples/config/Phase_Dislotwin_TWIP-Steel-FeMnC.yaml diff --git a/examples/configuration/Phase_Dislotwin_Tungsten.yaml b/examples/config/Phase_Dislotwin_Tungsten.yaml similarity index 100% rename from examples/configuration/Phase_Dislotwin_Tungsten.yaml rename to examples/config/Phase_Dislotwin_Tungsten.yaml diff --git a/examples/configuration/Phase_Isotropic_AluminumIsotropic.yaml b/examples/config/Phase_Isotropic_AluminumIsotropic.yaml similarity index 100% rename from examples/configuration/Phase_Isotropic_AluminumIsotropic.yaml rename to examples/config/Phase_Isotropic_AluminumIsotropic.yaml diff --git a/examples/configuration/Phase_Isotropic_FreeSurface.yaml b/examples/config/Phase_Isotropic_FreeSurface.yaml similarity index 100% rename from examples/configuration/Phase_Isotropic_FreeSurface.yaml rename to examples/config/Phase_Isotropic_FreeSurface.yaml diff --git a/examples/configuration/Phase_None_IsotropicVolumePreservation.config b/examples/config/Phase_None_IsotropicVolumePreservation.config similarity index 100% rename from examples/configuration/Phase_None_IsotropicVolumePreservation.config rename to examples/config/Phase_None_IsotropicVolumePreservation.config diff --git a/examples/configuration/Phase_None_Orthorhombic.config b/examples/config/Phase_None_Orthorhombic.config similarity index 100% rename from examples/configuration/Phase_None_Orthorhombic.config rename to examples/config/Phase_None_Orthorhombic.config diff --git a/examples/configuration/Phase_Nonlocal_Aluminum.config b/examples/config/Phase_Nonlocal_Aluminum.config similarity index 100% rename from examples/configuration/Phase_Nonlocal_Aluminum.config rename to examples/config/Phase_Nonlocal_Aluminum.config diff --git a/examples/configuration/Phase_Nonlocal_Nickel.config b/examples/config/Phase_Nonlocal_Nickel.config similarity index 100% rename from examples/configuration/Phase_Nonlocal_Nickel.config rename to examples/config/Phase_Nonlocal_Nickel.config diff --git a/examples/configuration/Phase_Phenopowerlaw_Aluminum.yaml b/examples/config/Phase_Phenopowerlaw_Aluminum.yaml similarity index 100% rename from examples/configuration/Phase_Phenopowerlaw_Aluminum.yaml rename to examples/config/Phase_Phenopowerlaw_Aluminum.yaml diff --git a/examples/configuration/Phase_Phenopowerlaw_BCC-Ferrite.yaml b/examples/config/Phase_Phenopowerlaw_BCC-Ferrite.yaml similarity index 100% rename from examples/configuration/Phase_Phenopowerlaw_BCC-Ferrite.yaml rename to examples/config/Phase_Phenopowerlaw_BCC-Ferrite.yaml diff --git a/examples/configuration/Phase_Phenopowerlaw_BCC-Martensite.yaml b/examples/config/Phase_Phenopowerlaw_BCC-Martensite.yaml similarity index 100% rename from examples/configuration/Phase_Phenopowerlaw_BCC-Martensite.yaml rename to examples/config/Phase_Phenopowerlaw_BCC-Martensite.yaml diff --git a/examples/configuration/Phase_Phenopowerlaw_Gold.yaml b/examples/config/Phase_Phenopowerlaw_Gold.yaml similarity index 100% rename from examples/configuration/Phase_Phenopowerlaw_Gold.yaml rename to examples/config/Phase_Phenopowerlaw_Gold.yaml diff --git a/examples/configuration/Phase_Phenopowerlaw_Magnesium.yaml b/examples/config/Phase_Phenopowerlaw_Magnesium.yaml similarity index 100% rename from examples/configuration/Phase_Phenopowerlaw_Magnesium.yaml rename to examples/config/Phase_Phenopowerlaw_Magnesium.yaml diff --git a/examples/configuration/Phase_Phenopowerlaw_cpTi.yaml b/examples/config/Phase_Phenopowerlaw_cpTi.yaml similarity index 100% rename from examples/configuration/Phase_Phenopowerlaw_cpTi.yaml rename to examples/config/Phase_Phenopowerlaw_cpTi.yaml diff --git a/examples/configuration/Phase_Thermal.config b/examples/config/Phase_Thermal.config similarity index 100% rename from examples/configuration/Phase_Thermal.config rename to examples/config/Phase_Thermal.config diff --git a/examples/configuration/Source_Damage_IsoBrittle.config b/examples/config/Source_Damage_IsoBrittle.config similarity index 100% rename from examples/configuration/Source_Damage_IsoBrittle.config rename to examples/config/Source_Damage_IsoBrittle.config diff --git a/examples/configuration/Source_Thermal_Dissipation.config b/examples/config/Source_Thermal_Dissipation.config similarity index 100% rename from examples/configuration/Source_Thermal_Dissipation.config rename to examples/config/Source_Thermal_Dissipation.config diff --git a/examples/configuration/debug.yaml b/examples/config/debug.yaml similarity index 100% rename from examples/configuration/debug.yaml rename to examples/config/debug.yaml diff --git a/examples/configuration/Homogenization_Isostrain_Parallel3.config b/examples/config/homogenization/Homogenization_Isostrain_Parallel3.config similarity index 100% rename from examples/configuration/Homogenization_Isostrain_Parallel3.config rename to examples/config/homogenization/Homogenization_Isostrain_Parallel3.config diff --git a/examples/configuration/Homogenization_None_Dummy.config b/examples/config/homogenization/Homogenization_None_Dummy.config similarity index 100% rename from examples/configuration/Homogenization_None_Dummy.config rename to examples/config/homogenization/Homogenization_None_Dummy.config diff --git a/examples/config/homogenization/mechanical/RGC_8grains.yaml b/examples/config/homogenization/mechanical/RGC_8grains.yaml new file mode 100644 index 000000000..0549e5ab2 --- /dev/null +++ b/examples/config/homogenization/mechanical/RGC_8grains.yaml @@ -0,0 +1,9 @@ +8Grains: + mechanical: + type: RGC + D_alpha: [4.0e-06, 4.0e-06, 2.0e-06] + a_g: [0.0, 0.0, 0.0] + c_alpha: 2.0 + cluster_size: [2, 2, 2] + output: [M, Delta_V, avg_a_dot, max_a_dot] + xi_alpha: 10.0 diff --git a/examples/config/homogenization/mechanical/isostrain_Taylor.yaml b/examples/config/homogenization/mechanical/isostrain_Taylor.yaml new file mode 100644 index 000000000..8f37a89c4 --- /dev/null +++ b/examples/config/homogenization/mechanical/isostrain_Taylor.yaml @@ -0,0 +1,2 @@ +Taylor: + mechanical: {type: isostrain} diff --git a/examples/configuration/numerics.yaml b/examples/config/numerics.yaml similarity index 100% rename from examples/configuration/numerics.yaml rename to examples/config/numerics.yaml diff --git a/examples/configuration/Homogenization_Damage_NonLocal.config b/examples/configuration/Homogenization_Damage_NonLocal.config deleted file mode 100644 index 13eb0135e..000000000 --- a/examples/configuration/Homogenization_Damage_NonLocal.config +++ /dev/null @@ -1,3 +0,0 @@ -damage nonlocal -initialDamage 1.0 -(output) damage diff --git a/examples/configuration/Homogenization_Isostrain_SX.config b/examples/configuration/Homogenization_Isostrain_SX.config deleted file mode 100644 index 40b26b554..000000000 --- a/examples/configuration/Homogenization_Isostrain_SX.config +++ /dev/null @@ -1,3 +0,0 @@ -[SX] -mech isostrain -nconstituents 1 diff --git a/examples/configuration/Homogenization_Isostrain_Taylor2.config b/examples/configuration/Homogenization_Isostrain_Taylor2.config deleted file mode 100644 index 5e1e899e7..000000000 --- a/examples/configuration/Homogenization_Isostrain_Taylor2.config +++ /dev/null @@ -1,3 +0,0 @@ -[Taylor2] -mech isostrain -nconstituents 2 \ No newline at end of file diff --git a/examples/configuration/Homogenization_RGC_8Grains.config b/examples/configuration/Homogenization_RGC_8Grains.config deleted file mode 100644 index c75c83ce0..000000000 --- a/examples/configuration/Homogenization_RGC_8Grains.config +++ /dev/null @@ -1,19 +0,0 @@ -[8Grains] -mech RGC -nconstituents 8 -clustersize 2 2 2 # product of these numbers must be equal to nconstituents(!) -clusterorientation 0.0 0.0 0.0 # orientation of cluster in terms of zxz Euler-angles in degree (random if not present) -# clusterorientation 0.0 26.57 0.0 # [012] -# clusterorientation 0.0 45.00 0.0 # [011] -# clusterorientation 0.0 26.57 24.10 # [112] -# clusterorientation 0.0 45.00 19.47 # [122] -# clusterorientation 0.0 45.00 35.26 # [111] -grainsize 4.0e-6 4.0e-6 2.0e-6 # in [m] -overproportionality 2.0e+0 # typical range between 0.001 to 1000 -scalingparameter 1.0e+1 # typical range between 0.001 to 1000 -(output) constitutivework -(output) magnitudemismatch -(output) penaltyenergy -(output) volumediscrepancy -(output) averagerelaxrate -(output) maximumrelaxrate \ No newline at end of file diff --git a/examples/configuration/Homogenization_Thermal_Conduction.config b/examples/configuration/Homogenization_Thermal_Conduction.config deleted file mode 100644 index 36fc7ea6e..000000000 --- a/examples/configuration/Homogenization_Thermal_Conduction.config +++ /dev/null @@ -1,3 +0,0 @@ -thermal conduction -t0 270.0 -(output) temperature