From ed1be8c21c4e45673d4c99d5d5e5be1826c9870d Mon Sep 17 00:00:00 2001 From: Sharan Roongta Date: Thu, 29 Oct 2020 13:50:12 +0100 Subject: [PATCH 1/6] consistent output names --- PRIVATE | 2 +- examples/SpectralMethod/Polycrystal/material.yaml | 2 +- src/crystallite.f90 | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/PRIVATE b/PRIVATE index 1e8c66897..0ce46aeb2 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit 1e8c66897820468ab46958d995005e2b69204d0e +Subproject commit 0ce46aeb2dc74566642a4076b4218f809977e503 diff --git a/examples/SpectralMethod/Polycrystal/material.yaml b/examples/SpectralMethod/Polycrystal/material.yaml index 0717d4eab..04775be4c 100644 --- a/examples/SpectralMethod/Polycrystal/material.yaml +++ b/examples/SpectralMethod/Polycrystal/material.yaml @@ -110,7 +110,7 @@ phase: Aluminum: elasticity: {C_11: 106.75e9, C_12: 60.41e9, C_44: 28.34e9, type: hooke} generic: - output: [F, P, Fe, Fp, Lp, O] + output: [F, P, F_e, F_p, L_p, O] lattice: fcc plasticity: N_sl: [12] diff --git a/src/crystallite.f90 b/src/crystallite.f90 index c00b076a3..f2b305aa2 100644 --- a/src/crystallite.f90 +++ b/src/crystallite.f90 @@ -759,23 +759,23 @@ subroutine crystallite_results selected_tensors = select_tensors(crystallite_partitionedF,p) call results_writeDataset(group,selected_tensors,output_constituent(p)%label(o),& 'deformation gradient','1') - case('Fe') + case('F_e') selected_tensors = select_tensors(crystallite_Fe,p) call results_writeDataset(group,selected_tensors,output_constituent(p)%label(o),& 'elastic deformation gradient','1') - case('Fp') + case('F_p') selected_tensors = select_tensors(crystallite_Fp,p) call results_writeDataset(group,selected_tensors,output_constituent(p)%label(o),& 'plastic deformation gradient','1') - case('Fi') + case('F_i') selected_tensors = select_tensors(crystallite_Fi,p) call results_writeDataset(group,selected_tensors,output_constituent(p)%label(o),& 'inelastic deformation gradient','1') - case('Lp') + case('L_p') selected_tensors = select_tensors(crystallite_Lp,p) call results_writeDataset(group,selected_tensors,output_constituent(p)%label(o),& 'plastic velocity gradient','1/s') - case('Li') + case('L_i') selected_tensors = select_tensors(crystallite_Li,p) call results_writeDataset(group,selected_tensors,output_constituent(p)%label(o),& 'inelastic velocity gradient','1/s') From ae60262fc267fdbdaf5bac9f5abfdc1bdd0bd4f2 Mon Sep 17 00:00:00 2001 From: Sharan Roongta Date: Thu, 29 Oct 2020 21:00:54 +0100 Subject: [PATCH 2/6] updated reference results --- PRIVATE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PRIVATE b/PRIVATE index 0ce46aeb2..6f1eb049c 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit 0ce46aeb2dc74566642a4076b4218f809977e503 +Subproject commit 6f1eb049c012916651018deaf57b49351a034243 From 146ca100e8db0beeed7abdc552d3293e81769fab Mon Sep 17 00:00:00 2001 From: Sharan Roongta Date: Fri, 30 Oct 2020 13:36:53 +0100 Subject: [PATCH 3/6] take care of restart files --- src/crystallite.f90 | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/crystallite.f90 b/src/crystallite.f90 index f2b305aa2..0366d3586 100644 --- a/src/crystallite.f90 +++ b/src/crystallite.f90 @@ -1557,11 +1557,11 @@ subroutine crystallite_restartWrite fileHandle = HDF5_openFile(fileName,'a') call HDF5_write(fileHandle,crystallite_partitionedF,'F') - call HDF5_write(fileHandle,crystallite_Fp, 'Fp') - call HDF5_write(fileHandle,crystallite_Fi, 'Fi') - call HDF5_write(fileHandle,crystallite_Lp, 'Lp') - call HDF5_write(fileHandle,crystallite_Li, 'Li') - call HDF5_write(fileHandle,crystallite_S, 'S') + call HDF5_write(fileHandle,crystallite_Fp, 'F_p') + call HDF5_write(fileHandle,crystallite_Fi, 'F_i') + call HDF5_write(fileHandle,crystallite_Lp, 'L_p') + call HDF5_write(fileHandle,crystallite_Li, 'L_i') + call HDF5_write(fileHandle,crystallite_S, 'S') groupHandle = HDF5_addGroup(fileHandle,'constituent') do i = 1,size(material_name_phase) @@ -1598,10 +1598,10 @@ subroutine crystallite_restartRead fileHandle = HDF5_openFile(fileName) call HDF5_read(fileHandle,crystallite_F0, 'F') - call HDF5_read(fileHandle,crystallite_Fp0,'Fp') - call HDF5_read(fileHandle,crystallite_Fi0,'Fi') - call HDF5_read(fileHandle,crystallite_Lp0,'Lp') - call HDF5_read(fileHandle,crystallite_Li0,'Li') + call HDF5_read(fileHandle,crystallite_Fp0,'F_p') + call HDF5_read(fileHandle,crystallite_Fi0,'F_i') + call HDF5_read(fileHandle,crystallite_Lp0,'L_p') + call HDF5_read(fileHandle,crystallite_Li0,'L_i') call HDF5_read(fileHandle,crystallite_S0, 'S') groupHandle = HDF5_openGroup(fileHandle,'constituent') From 8b6ae8ed88b4eb4a30b22db9b8d2f5ac5301c92b Mon Sep 17 00:00:00 2001 From: Sharan Roongta Date: Fri, 30 Oct 2020 13:59:25 +0100 Subject: [PATCH 4/6] merged latest development test repo --- PRIVATE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PRIVATE b/PRIVATE index 6f1eb049c..c3aa5acec 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit 6f1eb049c012916651018deaf57b49351a034243 +Subproject commit c3aa5acec28d4d6526bf7fe4c3afc0dc4cb2afbe From 4d150f7e857f948678a4846a13e308348eaa01d9 Mon Sep 17 00:00:00 2001 From: Sharan Roongta Date: Sat, 31 Oct 2020 18:01:53 +0100 Subject: [PATCH 5/6] recent PRIVATE repo --- PRIVATE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PRIVATE b/PRIVATE index c3aa5acec..57d3d5837 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit c3aa5acec28d4d6526bf7fe4c3afc0dc4cb2afbe +Subproject commit 57d3d5837a2b01a907cbd5266619ea265cab1374 From 92577efd6828b62e5ead96d5a8a28255889aca75 Mon Sep 17 00:00:00 2001 From: Sharan Roongta Date: Sun, 1 Nov 2020 23:01:21 +0100 Subject: [PATCH 6/6] latest test repo --- PRIVATE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PRIVATE b/PRIVATE index 57d3d5837..e2301f7d1 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit 57d3d5837a2b01a907cbd5266619ea265cab1374 +Subproject commit e2301f7d12ff0ae12218d9b58e33a814eb5431c9