From 3e8bcd322595550ccd353fbcef65269f2ff9d2e0 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Fri, 26 Mar 2021 09:19:59 +0100 Subject: [PATCH] cleaning examples, using consistent names - examples in repository should only show the most basic steps - MSC.Marc, marc => Marc --- PRIVATE | 2 +- examples/{MSC.Marc => Marc}/material.config | 0 examples/{MSC.Marc => Marc}/rotation.mud | Bin .../EshelbyInclusion/config/elastic_Ti.config | 7 - .../config/elastic_fullyAnisotropic.config | 11 - .../config/elastic_isotropic.config | 4 - .../EshelbyInclusion/config/thermal.config | 3 - .../config/thermalExpansion_Ti.config | 8 - .../thermalExpansion_fullyAnisotropic.config | 9 - .../config/thermalExpansion_isotropic.config | 6 - .../EshelbyInclusion/geom/Ti_Ti.geom | 427 ------------------ .../geom/isotropic_anisotropic.geom | 427 ------------------ .../geom/isotropic_isotropic.geom | 427 ------------------ .../geom/isotropic_rotated.geom | 427 ------------------ .../EshelbyInclusion/material.config | 122 ----- .../EshelbyInclusion/numerics.config | 5 - .../EshelbyInclusion/thermal.load | 1 - .../Homogenization_Damage_NonLocal.config | 0 .../Homogenization_Isostrain_Parallel3.config | 0 .../Homogenization_Isostrain_SX.config | 0 .../Homogenization_Isostrain_Taylor2.config | 0 .../Homogenization_None_Dummy.config | 0 .../Homogenization_RGC_8Grains.config | 0 .../Homogenization_Thermal_Conduction.config | 0 .../Kinematics_Thermal_Expansion.config | 0 .../Phase_Damage.config | 0 .../Phase_DisloUCLA_Tungsten.config | 0 .../Phase_Dislotwin_TWIP-Steel-FeMnC.yaml | 0 .../Phase_Dislotwin_Tungsten.yaml | 0 .../Phase_Isotropic_AluminumIsotropic.yaml | 0 .../Phase_Isotropic_FreeSurface.yaml | 0 ...se_None_IsotropicVolumePreservation.config | 0 .../Phase_None_Orthorhombic.config | 0 .../Phase_Nonlocal_Aluminum.config | 0 .../Phase_Nonlocal_Nickel.config | 0 .../Phase_Phenopowerlaw_Aluminum.yaml | 0 .../Phase_Phenopowerlaw_BCC-Ferrite.yaml | 0 .../Phase_Phenopowerlaw_BCC-Martensite.yaml | 0 .../Phase_Phenopowerlaw_Gold.yaml | 0 .../Phase_Phenopowerlaw_Magnesium.yaml | 0 .../Phase_Phenopowerlaw_cpTi.yaml | 0 .../Phase_Thermal.config | 0 .../Source_Damage_IsoBrittle.config | 0 .../Source_Thermal_Dissipation.config | 0 .../{ConfigFiles => configuration}/debug.yaml | 0 .../numerics.yaml | 0 python/damask/solver/_marc.py | 2 +- src/{DAMASK_marc.f90 => DAMASK_Marc.f90} | 0 48 files changed, 2 insertions(+), 1886 deletions(-) rename examples/{MSC.Marc => Marc}/material.config (100%) rename examples/{MSC.Marc => Marc}/rotation.mud (100%) delete mode 100644 examples/SpectralMethod/EshelbyInclusion/config/elastic_Ti.config delete mode 100644 examples/SpectralMethod/EshelbyInclusion/config/elastic_fullyAnisotropic.config delete mode 100644 examples/SpectralMethod/EshelbyInclusion/config/elastic_isotropic.config delete mode 100644 examples/SpectralMethod/EshelbyInclusion/config/thermal.config delete mode 100644 examples/SpectralMethod/EshelbyInclusion/config/thermalExpansion_Ti.config delete mode 100644 examples/SpectralMethod/EshelbyInclusion/config/thermalExpansion_fullyAnisotropic.config delete mode 100644 examples/SpectralMethod/EshelbyInclusion/config/thermalExpansion_isotropic.config delete mode 100644 examples/SpectralMethod/EshelbyInclusion/geom/Ti_Ti.geom delete mode 100644 examples/SpectralMethod/EshelbyInclusion/geom/isotropic_anisotropic.geom delete mode 100644 examples/SpectralMethod/EshelbyInclusion/geom/isotropic_isotropic.geom delete mode 100644 examples/SpectralMethod/EshelbyInclusion/geom/isotropic_rotated.geom delete mode 100644 examples/SpectralMethod/EshelbyInclusion/material.config delete mode 100644 examples/SpectralMethod/EshelbyInclusion/numerics.config delete mode 100644 examples/SpectralMethod/EshelbyInclusion/thermal.load rename examples/{ConfigFiles => configuration}/Homogenization_Damage_NonLocal.config (100%) rename examples/{ConfigFiles => configuration}/Homogenization_Isostrain_Parallel3.config (100%) rename examples/{ConfigFiles => configuration}/Homogenization_Isostrain_SX.config (100%) rename examples/{ConfigFiles => configuration}/Homogenization_Isostrain_Taylor2.config (100%) rename examples/{ConfigFiles => configuration}/Homogenization_None_Dummy.config (100%) rename examples/{ConfigFiles => configuration}/Homogenization_RGC_8Grains.config (100%) rename examples/{ConfigFiles => configuration}/Homogenization_Thermal_Conduction.config (100%) rename examples/{ConfigFiles => configuration}/Kinematics_Thermal_Expansion.config (100%) rename examples/{ConfigFiles => configuration}/Phase_Damage.config (100%) rename examples/{ConfigFiles => configuration}/Phase_DisloUCLA_Tungsten.config (100%) rename examples/{ConfigFiles => configuration}/Phase_Dislotwin_TWIP-Steel-FeMnC.yaml (100%) rename examples/{ConfigFiles => configuration}/Phase_Dislotwin_Tungsten.yaml (100%) rename examples/{ConfigFiles => configuration}/Phase_Isotropic_AluminumIsotropic.yaml (100%) rename examples/{ConfigFiles => configuration}/Phase_Isotropic_FreeSurface.yaml (100%) rename examples/{ConfigFiles => configuration}/Phase_None_IsotropicVolumePreservation.config (100%) rename examples/{ConfigFiles => configuration}/Phase_None_Orthorhombic.config (100%) rename examples/{ConfigFiles => configuration}/Phase_Nonlocal_Aluminum.config (100%) rename examples/{ConfigFiles => configuration}/Phase_Nonlocal_Nickel.config (100%) rename examples/{ConfigFiles => configuration}/Phase_Phenopowerlaw_Aluminum.yaml (100%) rename examples/{ConfigFiles => configuration}/Phase_Phenopowerlaw_BCC-Ferrite.yaml (100%) rename examples/{ConfigFiles => configuration}/Phase_Phenopowerlaw_BCC-Martensite.yaml (100%) rename examples/{ConfigFiles => configuration}/Phase_Phenopowerlaw_Gold.yaml (100%) rename examples/{ConfigFiles => configuration}/Phase_Phenopowerlaw_Magnesium.yaml (100%) rename examples/{ConfigFiles => configuration}/Phase_Phenopowerlaw_cpTi.yaml (100%) rename examples/{ConfigFiles => configuration}/Phase_Thermal.config (100%) rename examples/{ConfigFiles => configuration}/Source_Damage_IsoBrittle.config (100%) rename examples/{ConfigFiles => configuration}/Source_Thermal_Dissipation.config (100%) rename examples/{ConfigFiles => configuration}/debug.yaml (100%) rename examples/{ConfigFiles => configuration}/numerics.yaml (100%) rename src/{DAMASK_marc.f90 => DAMASK_Marc.f90} (100%) diff --git a/PRIVATE b/PRIVATE index 6abcd3dba..65c7fc8fa 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit 6abcd3dba91f37c747eae04c6695949e819ec54b +Subproject commit 65c7fc8fa91a65c5bc4d164b4417e4c60aac3e76 diff --git a/examples/MSC.Marc/material.config b/examples/Marc/material.config similarity index 100% rename from examples/MSC.Marc/material.config rename to examples/Marc/material.config diff --git a/examples/MSC.Marc/rotation.mud b/examples/Marc/rotation.mud similarity index 100% rename from examples/MSC.Marc/rotation.mud rename to examples/Marc/rotation.mud diff --git a/examples/SpectralMethod/EshelbyInclusion/config/elastic_Ti.config b/examples/SpectralMethod/EshelbyInclusion/config/elastic_Ti.config deleted file mode 100644 index b103eb112..000000000 --- a/examples/SpectralMethod/EshelbyInclusion/config/elastic_Ti.config +++ /dev/null @@ -1,7 +0,0 @@ -elasticity hooke - -c11 160.0e9 -c12 90.0e9 -c13 66.0e9 -c33 181.7e9 -c44 46.5e9 diff --git a/examples/SpectralMethod/EshelbyInclusion/config/elastic_fullyAnisotropic.config b/examples/SpectralMethod/EshelbyInclusion/config/elastic_fullyAnisotropic.config deleted file mode 100644 index 700a37dbd..000000000 --- a/examples/SpectralMethod/EshelbyInclusion/config/elastic_fullyAnisotropic.config +++ /dev/null @@ -1,11 +0,0 @@ -elasticity hooke - -c11 100.0e9 -c22 100.0e9 -c33 100.0e9 -c12 0.0e9 -c13 0.0e9 -c23 0.0e9 -c44 50.0e9 -c55 50.0e9 -c66 50.0e9 diff --git a/examples/SpectralMethod/EshelbyInclusion/config/elastic_isotropic.config b/examples/SpectralMethod/EshelbyInclusion/config/elastic_isotropic.config deleted file mode 100644 index 7574e9301..000000000 --- a/examples/SpectralMethod/EshelbyInclusion/config/elastic_isotropic.config +++ /dev/null @@ -1,4 +0,0 @@ -elasticity hooke - -c11 100.0e9 -c12 0.0e9 diff --git a/examples/SpectralMethod/EshelbyInclusion/config/thermal.config b/examples/SpectralMethod/EshelbyInclusion/config/thermal.config deleted file mode 100644 index 50e50f3b3..000000000 --- a/examples/SpectralMethod/EshelbyInclusion/config/thermal.config +++ /dev/null @@ -1,3 +0,0 @@ -reference_temperature 300.0 -specific_heat 1 -mass_density 1 diff --git a/examples/SpectralMethod/EshelbyInclusion/config/thermalExpansion_Ti.config b/examples/SpectralMethod/EshelbyInclusion/config/thermalExpansion_Ti.config deleted file mode 100644 index 5457be845..000000000 --- a/examples/SpectralMethod/EshelbyInclusion/config/thermalExpansion_Ti.config +++ /dev/null @@ -1,8 +0,0 @@ -(kinematics) thermal_expansion -thermal_expansion11 9.5e-6 -thermal_expansion22 9.5e-6 -thermal_expansion33 5.6e-6 - -(source) thermal_externalheat -externalheat_time 0 500 500.001 1000 # 500 secs supplying 1 Watt, then removing 1 Watt -externalheat_rate 1 1 -1 -1 diff --git a/examples/SpectralMethod/EshelbyInclusion/config/thermalExpansion_fullyAnisotropic.config b/examples/SpectralMethod/EshelbyInclusion/config/thermalExpansion_fullyAnisotropic.config deleted file mode 100644 index 7190656d3..000000000 --- a/examples/SpectralMethod/EshelbyInclusion/config/thermalExpansion_fullyAnisotropic.config +++ /dev/null @@ -1,9 +0,0 @@ -(kinematics) thermal_expansion -thermal_expansion11 5e-6 -thermal_expansion22 10e-6 -thermal_expansion33 20e-6 -lattice_structure orthorhombic - -(source) thermal_externalheat -externalheat_time 0 500 500.001 1000 # 500 secs supplying 1 Watt, then removing 1 Watt -externalheat_rate 1 1 -1 -1 diff --git a/examples/SpectralMethod/EshelbyInclusion/config/thermalExpansion_isotropic.config b/examples/SpectralMethod/EshelbyInclusion/config/thermalExpansion_isotropic.config deleted file mode 100644 index 5d039bec9..000000000 --- a/examples/SpectralMethod/EshelbyInclusion/config/thermalExpansion_isotropic.config +++ /dev/null @@ -1,6 +0,0 @@ -(kinematics) thermal_expansion -thermal_expansion11 10e-6 - -(source) thermal_externalheat -externalheat_time 0 500 500.001 1000 # 500 secs supplying 1 Watt, then removing 1 Watt -externalheat_rate 1 1 -1 -1 diff --git a/examples/SpectralMethod/EshelbyInclusion/geom/Ti_Ti.geom b/examples/SpectralMethod/EshelbyInclusion/geom/Ti_Ti.geom deleted file mode 100644 index 28b49f368..000000000 --- a/examples/SpectralMethod/EshelbyInclusion/geom/Ti_Ti.geom +++ /dev/null @@ -1,427 +0,0 @@ -9 header -geom_addPrimitive v2.0.1-1073-gc544fa1 -c 32 32 32 -d -16 -16 -16 inclusion.geom -geom_canvas v2.0.1-1073-gc544fa1 -o 16 16 16 -g 32 32 32 -geom_translate v2.0.1-1073-gc544fa1 -s 1,2,2,6 Ti_Ti.geom -geom_pack v2.0.1-1073-gc544fa1 Ti_Ti.geom isotropic_anisotropic.geom isotropic_isotropic.geom isotropic_rotated.geom -grid a 32 b 32 c 32 -size x 0.5 y 0.5 z 0.5 -origin x 0.25 y 0.25 z 0.25 -homogenization 1 -microstructures 2 -8623 of 2 -2 of 6 -29 of 2 -4 of 6 -27 of 2 -6 of 6 -26 of 2 -6 of 6 -27 of 2 -4 of 6 -29 of 2 -2 of 6 -798 of 2 -2 of 6 -28 of 2 -6 of 6 -25 of 2 -8 of 6 -24 of 2 -8 of 6 -23 of 2 -10 of 6 -22 of 2 -10 of 6 -23 of 2 -8 of 6 -24 of 2 -8 of 6 -25 of 2 -6 of 6 -28 of 2 -2 of 6 -701 of 2 -4 of 6 -26 of 2 -8 of 6 -23 of 2 -10 of 6 -22 of 2 -10 of 6 -21 of 2 -12 of 6 -20 of 2 -12 of 6 -20 of 2 -12 of 6 -20 of 2 -12 of 6 -21 of 2 -10 of 6 -22 of 2 -10 of 6 -23 of 2 -8 of 6 -26 of 2 -4 of 6 -637 of 2 -2 of 6 -27 of 2 -8 of 6 -23 of 2 -10 of 6 -21 of 2 -12 of 6 -20 of 2 -12 of 6 -20 of 2 -12 of 6 -19 of 2 -14 of 6 -18 of 2 -14 of 6 -19 of 2 -12 of 6 -20 of 2 -12 of 6 -20 of 2 -12 of 6 -21 of 2 -10 of 6 -23 of 2 -8 of 6 -27 of 2 -2 of 6 -604 of 2 -6 of 6 -24 of 2 -10 of 6 -21 of 2 -12 of 6 -20 of 2 -12 of 6 -19 of 2 -14 of 6 -18 of 2 -14 of 6 -18 of 2 -14 of 6 -18 of 2 -14 of 6 -18 of 2 -14 of 6 -18 of 2 -14 of 6 -19 of 2 -12 of 6 -20 of 2 -12 of 6 -21 of 2 -10 of 6 -24 of 2 -6 of 6 -572 of 2 -2 of 6 -27 of 2 -8 of 6 -23 of 2 -10 of 6 -21 of 2 -12 of 6 -19 of 2 -14 of 6 -18 of 2 -14 of 6 -18 of 2 -14 of 6 -17 of 2 -16 of 6 -16 of 2 -16 of 6 -17 of 2 -14 of 6 -18 of 2 -14 of 6 -18 of 2 -14 of 6 -19 of 2 -12 of 6 -21 of 2 -10 of 6 -23 of 2 -8 of 6 -27 of 2 -2 of 6 -541 of 2 -4 of 6 -26 of 2 -8 of 6 -22 of 2 -12 of 6 -20 of 2 -12 of 6 -19 of 2 -14 of 6 -18 of 2 -14 of 6 -17 of 2 -16 of 6 -16 of 2 -16 of 6 -16 of 2 -16 of 6 -16 of 2 -16 of 6 -17 of 2 -14 of 6 -18 of 2 -14 of 6 -19 of 2 -12 of 6 -20 of 2 -12 of 6 -22 of 2 -8 of 6 -26 of 2 -4 of 6 -539 of 2 -6 of 6 -24 of 2 -10 of 6 -21 of 2 -12 of 6 -19 of 2 -14 of 6 -18 of 2 -14 of 6 -17 of 2 -16 of 6 -16 of 2 -16 of 6 -16 of 2 -16 of 6 -16 of 2 -16 of 6 -16 of 2 -16 of 6 -16 of 2 -16 of 6 -17 of 2 -14 of 6 -18 of 2 -14 of 6 -19 of 2 -12 of 6 -21 of 2 -10 of 6 -24 of 2 -6 of 6 -538 of 2 -6 of 6 -24 of 2 -10 of 6 -21 of 2 -12 of 6 -19 of 2 -14 of 6 -18 of 2 -14 of 6 -17 of 2 -16 of 6 -16 of 2 -16 of 6 -16 of 2 -16 of 6 -16 of 2 -16 of 6 -16 of 2 -16 of 6 -16 of 2 -16 of 6 -17 of 2 -14 of 6 -18 of 2 -14 of 6 -19 of 2 -12 of 6 -21 of 2 -10 of 6 -24 of 2 -6 of 6 -539 of 2 -4 of 6 -26 of 2 -8 of 6 -22 of 2 -12 of 6 -20 of 2 -12 of 6 -19 of 2 -14 of 6 -18 of 2 -14 of 6 -17 of 2 -16 of 6 -16 of 2 -16 of 6 -16 of 2 -16 of 6 -16 of 2 -16 of 6 -17 of 2 -14 of 6 -18 of 2 -14 of 6 -19 of 2 -12 of 6 -20 of 2 -12 of 6 -22 of 2 -8 of 6 -26 of 2 -4 of 6 -541 of 2 -2 of 6 -27 of 2 -8 of 6 -23 of 2 -10 of 6 -21 of 2 -12 of 6 -19 of 2 -14 of 6 -18 of 2 -14 of 6 -18 of 2 -14 of 6 -17 of 2 -16 of 6 -16 of 2 -16 of 6 -17 of 2 -14 of 6 -18 of 2 -14 of 6 -18 of 2 -14 of 6 -19 of 2 -12 of 6 -21 of 2 -10 of 6 -23 of 2 -8 of 6 -27 of 2 -2 of 6 -572 of 2 -6 of 6 -24 of 2 -10 of 6 -21 of 2 -12 of 6 -20 of 2 -12 of 6 -19 of 2 -14 of 6 -18 of 2 -14 of 6 -18 of 2 -14 of 6 -18 of 2 -14 of 6 -18 of 2 -14 of 6 -18 of 2 -14 of 6 -19 of 2 -12 of 6 -20 of 2 -12 of 6 -21 of 2 -10 of 6 -24 of 2 -6 of 6 -604 of 2 -2 of 6 -27 of 2 -8 of 6 -23 of 2 -10 of 6 -21 of 2 -12 of 6 -20 of 2 -12 of 6 -20 of 2 -12 of 6 -19 of 2 -14 of 6 -18 of 2 -14 of 6 -19 of 2 -12 of 6 -20 of 2 -12 of 6 -20 of 2 -12 of 6 -21 of 2 -10 of 6 -23 of 2 -8 of 6 -27 of 2 -2 of 6 -637 of 2 -4 of 6 -26 of 2 -8 of 6 -23 of 2 -10 of 6 -22 of 2 -10 of 6 -21 of 2 -12 of 6 -20 of 2 -12 of 6 -20 of 2 -12 of 6 -20 of 2 -12 of 6 -21 of 2 -10 of 6 -22 of 2 -10 of 6 -23 of 2 -8 of 6 -26 of 2 -4 of 6 -701 of 2 -2 of 6 -28 of 2 -6 of 6 -25 of 2 -8 of 6 -24 of 2 -8 of 6 -23 of 2 -10 of 6 -22 of 2 -10 of 6 -23 of 2 -8 of 6 -24 of 2 -8 of 6 -25 of 2 -6 of 6 -28 of 2 -2 of 6 -798 of 2 -2 of 6 -29 of 2 -4 of 6 -27 of 2 -6 of 6 -26 of 2 -6 of 6 -27 of 2 -4 of 6 -29 of 2 -2 of 6 -8623 of 2 diff --git a/examples/SpectralMethod/EshelbyInclusion/geom/isotropic_anisotropic.geom b/examples/SpectralMethod/EshelbyInclusion/geom/isotropic_anisotropic.geom deleted file mode 100644 index 3d4d3eab5..000000000 --- a/examples/SpectralMethod/EshelbyInclusion/geom/isotropic_anisotropic.geom +++ /dev/null @@ -1,427 +0,0 @@ -9 header -geom_addPrimitive v2.0.1-1073-gc544fa1 -c 32 32 32 -d -16 -16 -16 inclusion.geom -geom_canvas v2.0.1-1073-gc544fa1 -o 16 16 16 -g 32 32 32 -geom_translate v2.0.1-1073-gc544fa1 -s 2,4 isotropic_anisotropic.geom -geom_pack v2.0.1-1073-gc544fa1 Ti_Ti.geom isotropic_anisotropic.geom isotropic_isotropic.geom isotropic_rotated.geom -grid a 32 b 32 c 32 -size x 0.5 y 0.5 z 0.5 -origin x 0.25 y 0.25 z 0.25 -homogenization 1 -microstructures 2 -8623 of 1 -2 of 4 -29 of 1 -4 of 4 -27 of 1 -6 of 4 -26 of 1 -6 of 4 -27 of 1 -4 of 4 -29 of 1 -2 of 4 -798 of 1 -2 of 4 -28 of 1 -6 of 4 -25 of 1 -8 of 4 -24 of 1 -8 of 4 -23 of 1 -10 of 4 -22 of 1 -10 of 4 -23 of 1 -8 of 4 -24 of 1 -8 of 4 -25 of 1 -6 of 4 -28 of 1 -2 of 4 -701 of 1 -4 of 4 -26 of 1 -8 of 4 -23 of 1 -10 of 4 -22 of 1 -10 of 4 -21 of 1 -12 of 4 -20 of 1 -12 of 4 -20 of 1 -12 of 4 -20 of 1 -12 of 4 -21 of 1 -10 of 4 -22 of 1 -10 of 4 -23 of 1 -8 of 4 -26 of 1 -4 of 4 -637 of 1 -2 of 4 -27 of 1 -8 of 4 -23 of 1 -10 of 4 -21 of 1 -12 of 4 -20 of 1 -12 of 4 -20 of 1 -12 of 4 -19 of 1 -14 of 4 -18 of 1 -14 of 4 -19 of 1 -12 of 4 -20 of 1 -12 of 4 -20 of 1 -12 of 4 -21 of 1 -10 of 4 -23 of 1 -8 of 4 -27 of 1 -2 of 4 -604 of 1 -6 of 4 -24 of 1 -10 of 4 -21 of 1 -12 of 4 -20 of 1 -12 of 4 -19 of 1 -14 of 4 -18 of 1 -14 of 4 -18 of 1 -14 of 4 -18 of 1 -14 of 4 -18 of 1 -14 of 4 -18 of 1 -14 of 4 -19 of 1 -12 of 4 -20 of 1 -12 of 4 -21 of 1 -10 of 4 -24 of 1 -6 of 4 -572 of 1 -2 of 4 -27 of 1 -8 of 4 -23 of 1 -10 of 4 -21 of 1 -12 of 4 -19 of 1 -14 of 4 -18 of 1 -14 of 4 -18 of 1 -14 of 4 -17 of 1 -16 of 4 -16 of 1 -16 of 4 -17 of 1 -14 of 4 -18 of 1 -14 of 4 -18 of 1 -14 of 4 -19 of 1 -12 of 4 -21 of 1 -10 of 4 -23 of 1 -8 of 4 -27 of 1 -2 of 4 -541 of 1 -4 of 4 -26 of 1 -8 of 4 -22 of 1 -12 of 4 -20 of 1 -12 of 4 -19 of 1 -14 of 4 -18 of 1 -14 of 4 -17 of 1 -16 of 4 -16 of 1 -16 of 4 -16 of 1 -16 of 4 -16 of 1 -16 of 4 -17 of 1 -14 of 4 -18 of 1 -14 of 4 -19 of 1 -12 of 4 -20 of 1 -12 of 4 -22 of 1 -8 of 4 -26 of 1 -4 of 4 -539 of 1 -6 of 4 -24 of 1 -10 of 4 -21 of 1 -12 of 4 -19 of 1 -14 of 4 -18 of 1 -14 of 4 -17 of 1 -16 of 4 -16 of 1 -16 of 4 -16 of 1 -16 of 4 -16 of 1 -16 of 4 -16 of 1 -16 of 4 -16 of 1 -16 of 4 -17 of 1 -14 of 4 -18 of 1 -14 of 4 -19 of 1 -12 of 4 -21 of 1 -10 of 4 -24 of 1 -6 of 4 -538 of 1 -6 of 4 -24 of 1 -10 of 4 -21 of 1 -12 of 4 -19 of 1 -14 of 4 -18 of 1 -14 of 4 -17 of 1 -16 of 4 -16 of 1 -16 of 4 -16 of 1 -16 of 4 -16 of 1 -16 of 4 -16 of 1 -16 of 4 -16 of 1 -16 of 4 -17 of 1 -14 of 4 -18 of 1 -14 of 4 -19 of 1 -12 of 4 -21 of 1 -10 of 4 -24 of 1 -6 of 4 -539 of 1 -4 of 4 -26 of 1 -8 of 4 -22 of 1 -12 of 4 -20 of 1 -12 of 4 -19 of 1 -14 of 4 -18 of 1 -14 of 4 -17 of 1 -16 of 4 -16 of 1 -16 of 4 -16 of 1 -16 of 4 -16 of 1 -16 of 4 -17 of 1 -14 of 4 -18 of 1 -14 of 4 -19 of 1 -12 of 4 -20 of 1 -12 of 4 -22 of 1 -8 of 4 -26 of 1 -4 of 4 -541 of 1 -2 of 4 -27 of 1 -8 of 4 -23 of 1 -10 of 4 -21 of 1 -12 of 4 -19 of 1 -14 of 4 -18 of 1 -14 of 4 -18 of 1 -14 of 4 -17 of 1 -16 of 4 -16 of 1 -16 of 4 -17 of 1 -14 of 4 -18 of 1 -14 of 4 -18 of 1 -14 of 4 -19 of 1 -12 of 4 -21 of 1 -10 of 4 -23 of 1 -8 of 4 -27 of 1 -2 of 4 -572 of 1 -6 of 4 -24 of 1 -10 of 4 -21 of 1 -12 of 4 -20 of 1 -12 of 4 -19 of 1 -14 of 4 -18 of 1 -14 of 4 -18 of 1 -14 of 4 -18 of 1 -14 of 4 -18 of 1 -14 of 4 -18 of 1 -14 of 4 -19 of 1 -12 of 4 -20 of 1 -12 of 4 -21 of 1 -10 of 4 -24 of 1 -6 of 4 -604 of 1 -2 of 4 -27 of 1 -8 of 4 -23 of 1 -10 of 4 -21 of 1 -12 of 4 -20 of 1 -12 of 4 -20 of 1 -12 of 4 -19 of 1 -14 of 4 -18 of 1 -14 of 4 -19 of 1 -12 of 4 -20 of 1 -12 of 4 -20 of 1 -12 of 4 -21 of 1 -10 of 4 -23 of 1 -8 of 4 -27 of 1 -2 of 4 -637 of 1 -4 of 4 -26 of 1 -8 of 4 -23 of 1 -10 of 4 -22 of 1 -10 of 4 -21 of 1 -12 of 4 -20 of 1 -12 of 4 -20 of 1 -12 of 4 -20 of 1 -12 of 4 -21 of 1 -10 of 4 -22 of 1 -10 of 4 -23 of 1 -8 of 4 -26 of 1 -4 of 4 -701 of 1 -2 of 4 -28 of 1 -6 of 4 -25 of 1 -8 of 4 -24 of 1 -8 of 4 -23 of 1 -10 of 4 -22 of 1 -10 of 4 -23 of 1 -8 of 4 -24 of 1 -8 of 4 -25 of 1 -6 of 4 -28 of 1 -2 of 4 -798 of 1 -2 of 4 -29 of 1 -4 of 4 -27 of 1 -6 of 4 -26 of 1 -6 of 4 -27 of 1 -4 of 4 -29 of 1 -2 of 4 -8623 of 1 diff --git a/examples/SpectralMethod/EshelbyInclusion/geom/isotropic_isotropic.geom b/examples/SpectralMethod/EshelbyInclusion/geom/isotropic_isotropic.geom deleted file mode 100644 index bf63f03d7..000000000 --- a/examples/SpectralMethod/EshelbyInclusion/geom/isotropic_isotropic.geom +++ /dev/null @@ -1,427 +0,0 @@ -9 header -geom_addPrimitive v2.0.1-1073-gc544fa1 -c 32 32 32 -d -16 -16 -16 inclusion.geom -geom_canvas v2.0.1-1073-gc544fa1 -o 16 16 16 -g 32 32 32 -geom_translate v2.0.1-1073-gc544fa1 -s 2,3 isotropic_isotropic.geom -geom_pack v2.0.1-1073-gc544fa1 Ti_Ti.geom isotropic_anisotropic.geom isotropic_isotropic.geom isotropic_rotated.geom -grid a 32 b 32 c 32 -size x 0.5 y 0.5 z 0.5 -origin x 0.25 y 0.25 z 0.25 -homogenization 1 -microstructures 2 -8623 of 1 -2 of 3 -29 of 1 -4 of 3 -27 of 1 -6 of 3 -26 of 1 -6 of 3 -27 of 1 -4 of 3 -29 of 1 -2 of 3 -798 of 1 -2 of 3 -28 of 1 -6 of 3 -25 of 1 -8 of 3 -24 of 1 -8 of 3 -23 of 1 -10 of 3 -22 of 1 -10 of 3 -23 of 1 -8 of 3 -24 of 1 -8 of 3 -25 of 1 -6 of 3 -28 of 1 -2 of 3 -701 of 1 -4 of 3 -26 of 1 -8 of 3 -23 of 1 -10 of 3 -22 of 1 -10 of 3 -21 of 1 -12 of 3 -20 of 1 -12 of 3 -20 of 1 -12 of 3 -20 of 1 -12 of 3 -21 of 1 -10 of 3 -22 of 1 -10 of 3 -23 of 1 -8 of 3 -26 of 1 -4 of 3 -637 of 1 -2 of 3 -27 of 1 -8 of 3 -23 of 1 -10 of 3 -21 of 1 -12 of 3 -20 of 1 -12 of 3 -20 of 1 -12 of 3 -19 of 1 -14 of 3 -18 of 1 -14 of 3 -19 of 1 -12 of 3 -20 of 1 -12 of 3 -20 of 1 -12 of 3 -21 of 1 -10 of 3 -23 of 1 -8 of 3 -27 of 1 -2 of 3 -604 of 1 -6 of 3 -24 of 1 -10 of 3 -21 of 1 -12 of 3 -20 of 1 -12 of 3 -19 of 1 -14 of 3 -18 of 1 -14 of 3 -18 of 1 -14 of 3 -18 of 1 -14 of 3 -18 of 1 -14 of 3 -18 of 1 -14 of 3 -19 of 1 -12 of 3 -20 of 1 -12 of 3 -21 of 1 -10 of 3 -24 of 1 -6 of 3 -572 of 1 -2 of 3 -27 of 1 -8 of 3 -23 of 1 -10 of 3 -21 of 1 -12 of 3 -19 of 1 -14 of 3 -18 of 1 -14 of 3 -18 of 1 -14 of 3 -17 of 1 -16 of 3 -16 of 1 -16 of 3 -17 of 1 -14 of 3 -18 of 1 -14 of 3 -18 of 1 -14 of 3 -19 of 1 -12 of 3 -21 of 1 -10 of 3 -23 of 1 -8 of 3 -27 of 1 -2 of 3 -541 of 1 -4 of 3 -26 of 1 -8 of 3 -22 of 1 -12 of 3 -20 of 1 -12 of 3 -19 of 1 -14 of 3 -18 of 1 -14 of 3 -17 of 1 -16 of 3 -16 of 1 -16 of 3 -16 of 1 -16 of 3 -16 of 1 -16 of 3 -17 of 1 -14 of 3 -18 of 1 -14 of 3 -19 of 1 -12 of 3 -20 of 1 -12 of 3 -22 of 1 -8 of 3 -26 of 1 -4 of 3 -539 of 1 -6 of 3 -24 of 1 -10 of 3 -21 of 1 -12 of 3 -19 of 1 -14 of 3 -18 of 1 -14 of 3 -17 of 1 -16 of 3 -16 of 1 -16 of 3 -16 of 1 -16 of 3 -16 of 1 -16 of 3 -16 of 1 -16 of 3 -16 of 1 -16 of 3 -17 of 1 -14 of 3 -18 of 1 -14 of 3 -19 of 1 -12 of 3 -21 of 1 -10 of 3 -24 of 1 -6 of 3 -538 of 1 -6 of 3 -24 of 1 -10 of 3 -21 of 1 -12 of 3 -19 of 1 -14 of 3 -18 of 1 -14 of 3 -17 of 1 -16 of 3 -16 of 1 -16 of 3 -16 of 1 -16 of 3 -16 of 1 -16 of 3 -16 of 1 -16 of 3 -16 of 1 -16 of 3 -17 of 1 -14 of 3 -18 of 1 -14 of 3 -19 of 1 -12 of 3 -21 of 1 -10 of 3 -24 of 1 -6 of 3 -539 of 1 -4 of 3 -26 of 1 -8 of 3 -22 of 1 -12 of 3 -20 of 1 -12 of 3 -19 of 1 -14 of 3 -18 of 1 -14 of 3 -17 of 1 -16 of 3 -16 of 1 -16 of 3 -16 of 1 -16 of 3 -16 of 1 -16 of 3 -17 of 1 -14 of 3 -18 of 1 -14 of 3 -19 of 1 -12 of 3 -20 of 1 -12 of 3 -22 of 1 -8 of 3 -26 of 1 -4 of 3 -541 of 1 -2 of 3 -27 of 1 -8 of 3 -23 of 1 -10 of 3 -21 of 1 -12 of 3 -19 of 1 -14 of 3 -18 of 1 -14 of 3 -18 of 1 -14 of 3 -17 of 1 -16 of 3 -16 of 1 -16 of 3 -17 of 1 -14 of 3 -18 of 1 -14 of 3 -18 of 1 -14 of 3 -19 of 1 -12 of 3 -21 of 1 -10 of 3 -23 of 1 -8 of 3 -27 of 1 -2 of 3 -572 of 1 -6 of 3 -24 of 1 -10 of 3 -21 of 1 -12 of 3 -20 of 1 -12 of 3 -19 of 1 -14 of 3 -18 of 1 -14 of 3 -18 of 1 -14 of 3 -18 of 1 -14 of 3 -18 of 1 -14 of 3 -18 of 1 -14 of 3 -19 of 1 -12 of 3 -20 of 1 -12 of 3 -21 of 1 -10 of 3 -24 of 1 -6 of 3 -604 of 1 -2 of 3 -27 of 1 -8 of 3 -23 of 1 -10 of 3 -21 of 1 -12 of 3 -20 of 1 -12 of 3 -20 of 1 -12 of 3 -19 of 1 -14 of 3 -18 of 1 -14 of 3 -19 of 1 -12 of 3 -20 of 1 -12 of 3 -20 of 1 -12 of 3 -21 of 1 -10 of 3 -23 of 1 -8 of 3 -27 of 1 -2 of 3 -637 of 1 -4 of 3 -26 of 1 -8 of 3 -23 of 1 -10 of 3 -22 of 1 -10 of 3 -21 of 1 -12 of 3 -20 of 1 -12 of 3 -20 of 1 -12 of 3 -20 of 1 -12 of 3 -21 of 1 -10 of 3 -22 of 1 -10 of 3 -23 of 1 -8 of 3 -26 of 1 -4 of 3 -701 of 1 -2 of 3 -28 of 1 -6 of 3 -25 of 1 -8 of 3 -24 of 1 -8 of 3 -23 of 1 -10 of 3 -22 of 1 -10 of 3 -23 of 1 -8 of 3 -24 of 1 -8 of 3 -25 of 1 -6 of 3 -28 of 1 -2 of 3 -798 of 1 -2 of 3 -29 of 1 -4 of 3 -27 of 1 -6 of 3 -26 of 1 -6 of 3 -27 of 1 -4 of 3 -29 of 1 -2 of 3 -8623 of 1 diff --git a/examples/SpectralMethod/EshelbyInclusion/geom/isotropic_rotated.geom b/examples/SpectralMethod/EshelbyInclusion/geom/isotropic_rotated.geom deleted file mode 100644 index 66f8a8f1a..000000000 --- a/examples/SpectralMethod/EshelbyInclusion/geom/isotropic_rotated.geom +++ /dev/null @@ -1,427 +0,0 @@ -9 header -geom_addPrimitive v2.0.1-1073-gc544fa1 -c 32 32 32 -d -16 -16 -16 inclusion.geom -geom_canvas v2.0.1-1073-gc544fa1 -o 16 16 16 -g 32 32 32 -geom_translate v2.0.1-1073-gc544fa1 -s 2,5 isotropic_rotated.geom -geom_pack v2.0.1-1073-gc544fa1 Ti_Ti.geom isotropic_anisotropic.geom isotropic_isotropic.geom isotropic_rotated.geom -grid a 32 b 32 c 32 -size x 0.5 y 0.5 z 0.5 -origin x 0.25 y 0.25 z 0.25 -homogenization 1 -microstructures 2 -8623 of 1 -2 of 5 -29 of 1 -4 of 5 -27 of 1 -6 of 5 -26 of 1 -6 of 5 -27 of 1 -4 of 5 -29 of 1 -2 of 5 -798 of 1 -2 of 5 -28 of 1 -6 of 5 -25 of 1 -8 of 5 -24 of 1 -8 of 5 -23 of 1 -10 of 5 -22 of 1 -10 of 5 -23 of 1 -8 of 5 -24 of 1 -8 of 5 -25 of 1 -6 of 5 -28 of 1 -2 of 5 -701 of 1 -4 of 5 -26 of 1 -8 of 5 -23 of 1 -10 of 5 -22 of 1 -10 of 5 -21 of 1 -12 of 5 -20 of 1 -12 of 5 -20 of 1 -12 of 5 -20 of 1 -12 of 5 -21 of 1 -10 of 5 -22 of 1 -10 of 5 -23 of 1 -8 of 5 -26 of 1 -4 of 5 -637 of 1 -2 of 5 -27 of 1 -8 of 5 -23 of 1 -10 of 5 -21 of 1 -12 of 5 -20 of 1 -12 of 5 -20 of 1 -12 of 5 -19 of 1 -14 of 5 -18 of 1 -14 of 5 -19 of 1 -12 of 5 -20 of 1 -12 of 5 -20 of 1 -12 of 5 -21 of 1 -10 of 5 -23 of 1 -8 of 5 -27 of 1 -2 of 5 -604 of 1 -6 of 5 -24 of 1 -10 of 5 -21 of 1 -12 of 5 -20 of 1 -12 of 5 -19 of 1 -14 of 5 -18 of 1 -14 of 5 -18 of 1 -14 of 5 -18 of 1 -14 of 5 -18 of 1 -14 of 5 -18 of 1 -14 of 5 -19 of 1 -12 of 5 -20 of 1 -12 of 5 -21 of 1 -10 of 5 -24 of 1 -6 of 5 -572 of 1 -2 of 5 -27 of 1 -8 of 5 -23 of 1 -10 of 5 -21 of 1 -12 of 5 -19 of 1 -14 of 5 -18 of 1 -14 of 5 -18 of 1 -14 of 5 -17 of 1 -16 of 5 -16 of 1 -16 of 5 -17 of 1 -14 of 5 -18 of 1 -14 of 5 -18 of 1 -14 of 5 -19 of 1 -12 of 5 -21 of 1 -10 of 5 -23 of 1 -8 of 5 -27 of 1 -2 of 5 -541 of 1 -4 of 5 -26 of 1 -8 of 5 -22 of 1 -12 of 5 -20 of 1 -12 of 5 -19 of 1 -14 of 5 -18 of 1 -14 of 5 -17 of 1 -16 of 5 -16 of 1 -16 of 5 -16 of 1 -16 of 5 -16 of 1 -16 of 5 -17 of 1 -14 of 5 -18 of 1 -14 of 5 -19 of 1 -12 of 5 -20 of 1 -12 of 5 -22 of 1 -8 of 5 -26 of 1 -4 of 5 -539 of 1 -6 of 5 -24 of 1 -10 of 5 -21 of 1 -12 of 5 -19 of 1 -14 of 5 -18 of 1 -14 of 5 -17 of 1 -16 of 5 -16 of 1 -16 of 5 -16 of 1 -16 of 5 -16 of 1 -16 of 5 -16 of 1 -16 of 5 -16 of 1 -16 of 5 -17 of 1 -14 of 5 -18 of 1 -14 of 5 -19 of 1 -12 of 5 -21 of 1 -10 of 5 -24 of 1 -6 of 5 -538 of 1 -6 of 5 -24 of 1 -10 of 5 -21 of 1 -12 of 5 -19 of 1 -14 of 5 -18 of 1 -14 of 5 -17 of 1 -16 of 5 -16 of 1 -16 of 5 -16 of 1 -16 of 5 -16 of 1 -16 of 5 -16 of 1 -16 of 5 -16 of 1 -16 of 5 -17 of 1 -14 of 5 -18 of 1 -14 of 5 -19 of 1 -12 of 5 -21 of 1 -10 of 5 -24 of 1 -6 of 5 -539 of 1 -4 of 5 -26 of 1 -8 of 5 -22 of 1 -12 of 5 -20 of 1 -12 of 5 -19 of 1 -14 of 5 -18 of 1 -14 of 5 -17 of 1 -16 of 5 -16 of 1 -16 of 5 -16 of 1 -16 of 5 -16 of 1 -16 of 5 -17 of 1 -14 of 5 -18 of 1 -14 of 5 -19 of 1 -12 of 5 -20 of 1 -12 of 5 -22 of 1 -8 of 5 -26 of 1 -4 of 5 -541 of 1 -2 of 5 -27 of 1 -8 of 5 -23 of 1 -10 of 5 -21 of 1 -12 of 5 -19 of 1 -14 of 5 -18 of 1 -14 of 5 -18 of 1 -14 of 5 -17 of 1 -16 of 5 -16 of 1 -16 of 5 -17 of 1 -14 of 5 -18 of 1 -14 of 5 -18 of 1 -14 of 5 -19 of 1 -12 of 5 -21 of 1 -10 of 5 -23 of 1 -8 of 5 -27 of 1 -2 of 5 -572 of 1 -6 of 5 -24 of 1 -10 of 5 -21 of 1 -12 of 5 -20 of 1 -12 of 5 -19 of 1 -14 of 5 -18 of 1 -14 of 5 -18 of 1 -14 of 5 -18 of 1 -14 of 5 -18 of 1 -14 of 5 -18 of 1 -14 of 5 -19 of 1 -12 of 5 -20 of 1 -12 of 5 -21 of 1 -10 of 5 -24 of 1 -6 of 5 -604 of 1 -2 of 5 -27 of 1 -8 of 5 -23 of 1 -10 of 5 -21 of 1 -12 of 5 -20 of 1 -12 of 5 -20 of 1 -12 of 5 -19 of 1 -14 of 5 -18 of 1 -14 of 5 -19 of 1 -12 of 5 -20 of 1 -12 of 5 -20 of 1 -12 of 5 -21 of 1 -10 of 5 -23 of 1 -8 of 5 -27 of 1 -2 of 5 -637 of 1 -4 of 5 -26 of 1 -8 of 5 -23 of 1 -10 of 5 -22 of 1 -10 of 5 -21 of 1 -12 of 5 -20 of 1 -12 of 5 -20 of 1 -12 of 5 -20 of 1 -12 of 5 -21 of 1 -10 of 5 -22 of 1 -10 of 5 -23 of 1 -8 of 5 -26 of 1 -4 of 5 -701 of 1 -2 of 5 -28 of 1 -6 of 5 -25 of 1 -8 of 5 -24 of 1 -8 of 5 -23 of 1 -10 of 5 -22 of 1 -10 of 5 -23 of 1 -8 of 5 -24 of 1 -8 of 5 -25 of 1 -6 of 5 -28 of 1 -2 of 5 -798 of 1 -2 of 5 -29 of 1 -4 of 5 -27 of 1 -6 of 5 -26 of 1 -6 of 5 -27 of 1 -4 of 5 -29 of 1 -2 of 5 -8623 of 1 diff --git a/examples/SpectralMethod/EshelbyInclusion/material.config b/examples/SpectralMethod/EshelbyInclusion/material.config deleted file mode 100644 index cd926ba67..000000000 --- a/examples/SpectralMethod/EshelbyInclusion/material.config +++ /dev/null @@ -1,122 +0,0 @@ -#-------------------# - -#-------------------# - -[direct] -mech none - -thermal adiabatic -t0 330.0 -(output) temperature - -#-------------------# - -#-------------------# - -#................. -[isotropic matrix] - -lattice_structure iso -plasticity none -{config/elastic_isotropic.config} -{config/thermal.config} - -(output) f -(output) p -(output) fe -(output) fi -(output) fp - -#................. -[Ti matrix] - -lattice_structure hex -c/a 1.587 -plasticity none -{config/elastic_Ti.config} -{config/thermal.config} - -(output) f -(output) p -(output) fe -(output) fi -(output) fp - -#................. -[isotropic inclusion] - -lattice_structure iso -plasticity none -{config/elastic_isotropic.config} -{config/thermal.config} -{config/thermalExpansion_isotropic.config} - -(output) f -(output) p -(output) fe -(output) fi -(output) fp - -#................. -[anisotropic inclusion] - -lattice_structure orthorhombic -plasticity none -{config/elastic_fullyAnisotropic.config} -{config/thermal.config} -{config/thermalExpansion_fullyAnisotropic.config} - -(output) f -(output) p -(output) fe -(output) fi -(output) fp - -#................. -[Ti inclusion] - -lattice_structure hex -c/a 1.587 -plasticity none -{config/elastic_Ti.config} -{config/thermal.config} -{config/thermalExpansion_Ti.config} - -(output) f -(output) p -(output) fe -(output) fi -(output) fp - -#--------------------------# - -#--------------------------# - -[isotropic matrix] -(constituent) phase 1 texture 1 fraction 1.0 - -[Ti matrix] -(constituent) phase 2 texture 1 fraction 1.0 - -[isotropic inclusion] -(constituent) phase 3 texture 1 fraction 1.0 - -[anisotropic inclusion] -(constituent) phase 4 texture 1 fraction 1.0 - -[rotated inclusion] -(constituent) phase 4 texture 2 fraction 1.0 - -[Ti inclusion] -(constituent) phase 5 texture 1 fraction 1.0 - -#--------------------------# - -#--------------------------# - -[cube] -(gauss) phi1 0.0 Phi 0.0 phi2 0.0 - -[rotated] -(gauss) phi1 0.0 Phi 45.0 phi2 0.0 - diff --git a/examples/SpectralMethod/EshelbyInclusion/numerics.config b/examples/SpectralMethod/EshelbyInclusion/numerics.config deleted file mode 100644 index 191c204c8..000000000 --- a/examples/SpectralMethod/EshelbyInclusion/numerics.config +++ /dev/null @@ -1,5 +0,0 @@ -#spectralsolver polarisation -spectralderivative fwbw_difference -err_div_tolrel 1e-3 -itmin 2 -petsc_options -mech_snes_type anderson -mech_snes_anderson_beta 1.0 -mech_snes_anderson_restart 10 -thermal_snes_type anderson -thermal_snes_anderson_beta 1.0 diff --git a/examples/SpectralMethod/EshelbyInclusion/thermal.load b/examples/SpectralMethod/EshelbyInclusion/thermal.load deleted file mode 100644 index a13aaa9e3..000000000 --- a/examples/SpectralMethod/EshelbyInclusion/thermal.load +++ /dev/null @@ -1 +0,0 @@ -Fdot 0 0 0 0 0 0 0 0 0 stress * * * * * * * * * time 1000 incs 10 diff --git a/examples/ConfigFiles/Homogenization_Damage_NonLocal.config b/examples/configuration/Homogenization_Damage_NonLocal.config similarity index 100% rename from examples/ConfigFiles/Homogenization_Damage_NonLocal.config rename to examples/configuration/Homogenization_Damage_NonLocal.config diff --git a/examples/ConfigFiles/Homogenization_Isostrain_Parallel3.config b/examples/configuration/Homogenization_Isostrain_Parallel3.config similarity index 100% rename from examples/ConfigFiles/Homogenization_Isostrain_Parallel3.config rename to examples/configuration/Homogenization_Isostrain_Parallel3.config diff --git a/examples/ConfigFiles/Homogenization_Isostrain_SX.config b/examples/configuration/Homogenization_Isostrain_SX.config similarity index 100% rename from examples/ConfigFiles/Homogenization_Isostrain_SX.config rename to examples/configuration/Homogenization_Isostrain_SX.config diff --git a/examples/ConfigFiles/Homogenization_Isostrain_Taylor2.config b/examples/configuration/Homogenization_Isostrain_Taylor2.config similarity index 100% rename from examples/ConfigFiles/Homogenization_Isostrain_Taylor2.config rename to examples/configuration/Homogenization_Isostrain_Taylor2.config diff --git a/examples/ConfigFiles/Homogenization_None_Dummy.config b/examples/configuration/Homogenization_None_Dummy.config similarity index 100% rename from examples/ConfigFiles/Homogenization_None_Dummy.config rename to examples/configuration/Homogenization_None_Dummy.config diff --git a/examples/ConfigFiles/Homogenization_RGC_8Grains.config b/examples/configuration/Homogenization_RGC_8Grains.config similarity index 100% rename from examples/ConfigFiles/Homogenization_RGC_8Grains.config rename to examples/configuration/Homogenization_RGC_8Grains.config diff --git a/examples/ConfigFiles/Homogenization_Thermal_Conduction.config b/examples/configuration/Homogenization_Thermal_Conduction.config similarity index 100% rename from examples/ConfigFiles/Homogenization_Thermal_Conduction.config rename to examples/configuration/Homogenization_Thermal_Conduction.config diff --git a/examples/ConfigFiles/Kinematics_Thermal_Expansion.config b/examples/configuration/Kinematics_Thermal_Expansion.config similarity index 100% rename from examples/ConfigFiles/Kinematics_Thermal_Expansion.config rename to examples/configuration/Kinematics_Thermal_Expansion.config diff --git a/examples/ConfigFiles/Phase_Damage.config b/examples/configuration/Phase_Damage.config similarity index 100% rename from examples/ConfigFiles/Phase_Damage.config rename to examples/configuration/Phase_Damage.config diff --git a/examples/ConfigFiles/Phase_DisloUCLA_Tungsten.config b/examples/configuration/Phase_DisloUCLA_Tungsten.config similarity index 100% rename from examples/ConfigFiles/Phase_DisloUCLA_Tungsten.config rename to examples/configuration/Phase_DisloUCLA_Tungsten.config diff --git a/examples/ConfigFiles/Phase_Dislotwin_TWIP-Steel-FeMnC.yaml b/examples/configuration/Phase_Dislotwin_TWIP-Steel-FeMnC.yaml similarity index 100% rename from examples/ConfigFiles/Phase_Dislotwin_TWIP-Steel-FeMnC.yaml rename to examples/configuration/Phase_Dislotwin_TWIP-Steel-FeMnC.yaml diff --git a/examples/ConfigFiles/Phase_Dislotwin_Tungsten.yaml b/examples/configuration/Phase_Dislotwin_Tungsten.yaml similarity index 100% rename from examples/ConfigFiles/Phase_Dislotwin_Tungsten.yaml rename to examples/configuration/Phase_Dislotwin_Tungsten.yaml diff --git a/examples/ConfigFiles/Phase_Isotropic_AluminumIsotropic.yaml b/examples/configuration/Phase_Isotropic_AluminumIsotropic.yaml similarity index 100% rename from examples/ConfigFiles/Phase_Isotropic_AluminumIsotropic.yaml rename to examples/configuration/Phase_Isotropic_AluminumIsotropic.yaml diff --git a/examples/ConfigFiles/Phase_Isotropic_FreeSurface.yaml b/examples/configuration/Phase_Isotropic_FreeSurface.yaml similarity index 100% rename from examples/ConfigFiles/Phase_Isotropic_FreeSurface.yaml rename to examples/configuration/Phase_Isotropic_FreeSurface.yaml diff --git a/examples/ConfigFiles/Phase_None_IsotropicVolumePreservation.config b/examples/configuration/Phase_None_IsotropicVolumePreservation.config similarity index 100% rename from examples/ConfigFiles/Phase_None_IsotropicVolumePreservation.config rename to examples/configuration/Phase_None_IsotropicVolumePreservation.config diff --git a/examples/ConfigFiles/Phase_None_Orthorhombic.config b/examples/configuration/Phase_None_Orthorhombic.config similarity index 100% rename from examples/ConfigFiles/Phase_None_Orthorhombic.config rename to examples/configuration/Phase_None_Orthorhombic.config diff --git a/examples/ConfigFiles/Phase_Nonlocal_Aluminum.config b/examples/configuration/Phase_Nonlocal_Aluminum.config similarity index 100% rename from examples/ConfigFiles/Phase_Nonlocal_Aluminum.config rename to examples/configuration/Phase_Nonlocal_Aluminum.config diff --git a/examples/ConfigFiles/Phase_Nonlocal_Nickel.config b/examples/configuration/Phase_Nonlocal_Nickel.config similarity index 100% rename from examples/ConfigFiles/Phase_Nonlocal_Nickel.config rename to examples/configuration/Phase_Nonlocal_Nickel.config diff --git a/examples/ConfigFiles/Phase_Phenopowerlaw_Aluminum.yaml b/examples/configuration/Phase_Phenopowerlaw_Aluminum.yaml similarity index 100% rename from examples/ConfigFiles/Phase_Phenopowerlaw_Aluminum.yaml rename to examples/configuration/Phase_Phenopowerlaw_Aluminum.yaml diff --git a/examples/ConfigFiles/Phase_Phenopowerlaw_BCC-Ferrite.yaml b/examples/configuration/Phase_Phenopowerlaw_BCC-Ferrite.yaml similarity index 100% rename from examples/ConfigFiles/Phase_Phenopowerlaw_BCC-Ferrite.yaml rename to examples/configuration/Phase_Phenopowerlaw_BCC-Ferrite.yaml diff --git a/examples/ConfigFiles/Phase_Phenopowerlaw_BCC-Martensite.yaml b/examples/configuration/Phase_Phenopowerlaw_BCC-Martensite.yaml similarity index 100% rename from examples/ConfigFiles/Phase_Phenopowerlaw_BCC-Martensite.yaml rename to examples/configuration/Phase_Phenopowerlaw_BCC-Martensite.yaml diff --git a/examples/ConfigFiles/Phase_Phenopowerlaw_Gold.yaml b/examples/configuration/Phase_Phenopowerlaw_Gold.yaml similarity index 100% rename from examples/ConfigFiles/Phase_Phenopowerlaw_Gold.yaml rename to examples/configuration/Phase_Phenopowerlaw_Gold.yaml diff --git a/examples/ConfigFiles/Phase_Phenopowerlaw_Magnesium.yaml b/examples/configuration/Phase_Phenopowerlaw_Magnesium.yaml similarity index 100% rename from examples/ConfigFiles/Phase_Phenopowerlaw_Magnesium.yaml rename to examples/configuration/Phase_Phenopowerlaw_Magnesium.yaml diff --git a/examples/ConfigFiles/Phase_Phenopowerlaw_cpTi.yaml b/examples/configuration/Phase_Phenopowerlaw_cpTi.yaml similarity index 100% rename from examples/ConfigFiles/Phase_Phenopowerlaw_cpTi.yaml rename to examples/configuration/Phase_Phenopowerlaw_cpTi.yaml diff --git a/examples/ConfigFiles/Phase_Thermal.config b/examples/configuration/Phase_Thermal.config similarity index 100% rename from examples/ConfigFiles/Phase_Thermal.config rename to examples/configuration/Phase_Thermal.config diff --git a/examples/ConfigFiles/Source_Damage_IsoBrittle.config b/examples/configuration/Source_Damage_IsoBrittle.config similarity index 100% rename from examples/ConfigFiles/Source_Damage_IsoBrittle.config rename to examples/configuration/Source_Damage_IsoBrittle.config diff --git a/examples/ConfigFiles/Source_Thermal_Dissipation.config b/examples/configuration/Source_Thermal_Dissipation.config similarity index 100% rename from examples/ConfigFiles/Source_Thermal_Dissipation.config rename to examples/configuration/Source_Thermal_Dissipation.config diff --git a/examples/ConfigFiles/debug.yaml b/examples/configuration/debug.yaml similarity index 100% rename from examples/ConfigFiles/debug.yaml rename to examples/configuration/debug.yaml diff --git a/examples/ConfigFiles/numerics.yaml b/examples/configuration/numerics.yaml similarity index 100% rename from examples/ConfigFiles/numerics.yaml rename to examples/configuration/numerics.yaml diff --git a/python/damask/solver/_marc.py b/python/damask/solver/_marc.py index f6c81da9f..14e21144a 100644 --- a/python/damask/solver/_marc.py +++ b/python/damask/solver/_marc.py @@ -49,7 +49,7 @@ class Marc: optimization = '', ): - usersub = Path(os.environ['DAMASK_ROOT'])/'src/DAMASK_marc' + usersub = Path(os.environ['DAMASK_ROOT'])/'src/DAMASK_Marc' usersub = usersub.parent/(usersub.name + ('.f90' if compile else '.marc')) if not usersub.is_file(): raise FileNotFoundError(f'subroutine ({"source" if compile else "binary"}) "{usersub}" not found') diff --git a/src/DAMASK_marc.f90 b/src/DAMASK_Marc.f90 similarity index 100% rename from src/DAMASK_marc.f90 rename to src/DAMASK_Marc.f90