From 03a68248b564d0605c24e5146bf03246752d67c8 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Fri, 6 Nov 2020 13:25:00 +0100 Subject: [PATCH] polishing --- python/tests/reference/Result/material.config | 126 ------------------ .../Result/{tensionY.load => tensionY.yaml} | 0 src/HDF5_utilities.f90 | 2 +- src/crystallite.f90 | 2 +- 4 files changed, 2 insertions(+), 128 deletions(-) delete mode 100644 python/tests/reference/Result/material.config rename python/tests/reference/Result/{tensionY.load => tensionY.yaml} (100%) diff --git a/python/tests/reference/Result/material.config b/python/tests/reference/Result/material.config deleted file mode 100644 index 4820b1eed..000000000 --- a/python/tests/reference/Result/material.config +++ /dev/null @@ -1,126 +0,0 @@ - -[none] -mech none -ngrains 1 - - -[Grain1] -(gauss) phi1 358.98 Phi 65.62 phi2 24.48 -[Grain2] -(gauss) phi1 121.05 Phi 176.11 phi2 295.73 -[Grain3] -(gauss) phi1 43.79 Phi 113.76 phi2 345.90 -[Grain4] -(gauss) phi1 265.15 Phi 62.52 phi2 299.71 -[Grain5] -(gauss) phi1 221.23 Phi 26.54 phi2 207.05 -[Grain6] -(gauss) phi1 249.81 Phi 61.47 phi2 152.14 -[Grain7] -(gauss) phi1 332.45 Phi 99.16 phi2 345.34 -[Grain8] -(gauss) phi1 312.27 Phi 118.27 phi2 181.59 -[Grain9] -(gauss) phi1 303.10 Phi 48.21 phi2 358.03 -[Grain10] -(gauss) phi1 338.26 Phi 48.11 phi2 176.78 -[Grain11] -(gauss) phi1 115.17 Phi 56.54 phi2 223.84 -[Grain12] -(gauss) phi1 281.04 Phi 97.48 phi2 27.94 - - -[Grain1] -crystallite 1 -(constituent) phase 1 texture 1 fraction 1.0 -[Grain2] -crystallite 1 -(constituent) phase 1 texture 2 fraction 1.0 -[Grain3] -crystallite 1 -(constituent) phase 1 texture 3 fraction 1.0 -[Grain4] -crystallite 1 -(constituent) phase 1 texture 4 fraction 1.0 -[Grain5] -crystallite 1 -(constituent) phase 1 texture 5 fraction 1.0 -[Grain6] -crystallite 1 -(constituent) phase 1 texture 6 fraction 1.0 -[Grain7] -crystallite 1 -(constituent) phase 2 texture 7 fraction 1.0 -[Grain8] -crystallite 1 -(constituent) phase 2 texture 8 fraction 1.0 -[Grain9] -crystallite 1 -(constituent) phase 2 texture 9 fraction 1.0 -[Grain10] -crystallite 1 -(constituent) phase 2 texture 10 fraction 1.0 -[Grain11] -crystallite 1 -(constituent) phase 2 texture 11 fraction 1.0 -[Grain12] -crystallite 1 -(constituent) phase 2 texture 12 fraction 1.0 - - -[pheno_fcc] -elasticity hooke -plasticity phenopowerlaw - -(output) orientation # quaternion -(output) F # deformation gradient tensor -(output) Fe # elastic deformation gradient tensor -(output) Fp # plastic deformation gradient tensor -(output) P # first Piola-Kichhoff stress tensor -(output) Lp # plastic velocity gradient tensor - - -lattice_structure fcc -Nslip 12 # per family -Ntwin 0 # per family - -c11 106.75e9 -c12 60.41e9 -c44 28.34e9 - -gdot0_slip 0.001 -n_slip 20 -tau0_slip 31e6 # per family -tausat_slip 63e6 # per family -a_slip 2.25 -h0_slipslip 75e6 -interaction_slipslip 1 1 1.4 1.4 1.4 1.4 -atol_resistance 1 - -[pheno_bcc] -elasticity hooke -plasticity phenopowerlaw - -(output) orientation # quaternion -(output) F # deformation gradient tensor -(output) Fe # elastic deformation gradient tensor -(output) Fp # plastic deformation gradient tensor -(output) P # first Piola-Kichhoff stress tensor -(output) Lp # plastic velocity gradient tensor - - -lattice_structure bcc -Nslip 12 # per family - -c11 106.75e9 -c12 60.41e9 -c44 28.34e9 - -gdot0_slip 0.001 -n_slip 20 -tau0_slip 31e6 # per family -tausat_slip 63e6 # per family -a_slip 2.25 -h0_slipslip 75e6 -interaction_slipslip 1 1 1.4 1.4 1.4 1.4 -atol_resistance 1 diff --git a/python/tests/reference/Result/tensionY.load b/python/tests/reference/Result/tensionY.yaml similarity index 100% rename from python/tests/reference/Result/tensionY.load rename to python/tests/reference/Result/tensionY.yaml diff --git a/src/HDF5_utilities.f90 b/src/HDF5_utilities.f90 index 78c6e922e..4084b2325 100644 --- a/src/HDF5_utilities.f90 +++ b/src/HDF5_utilities.f90 @@ -297,7 +297,7 @@ subroutine HDF5_addAttribute_str(loc_id,attrLabel,attrValue,path) integer :: hdferr character(len=:), allocatable :: p character(len=:,kind=C_CHAR), allocatable,target :: attrValue_ - type(c_ptr),target,dimension(1) :: ptr + type(c_ptr), target, dimension(1) :: ptr if (present(path)) then p = trim(path) diff --git a/src/crystallite.f90 b/src/crystallite.f90 index 2c5ede5af..8a0789fca 100644 --- a/src/crystallite.f90 +++ b/src/crystallite.f90 @@ -736,7 +736,7 @@ subroutine crystallite_results integer :: p,o real(pReal), allocatable, dimension(:,:,:) :: selected_tensors type(rotation), allocatable, dimension(:) :: selected_rotations - character(len=:),allocatable :: group,structureLabel + character(len=:), allocatable :: group,structureLabel do p=1,size(material_name_phase) group = trim('current/constituent')//'/'//trim(material_name_phase(p))//'/generic'