From 0701b535fc086d0381a86927bf03e09a7628eb01 Mon Sep 17 00:00:00 2001 From: Yi-Chin Yang Date: Mon, 16 Apr 2018 16:14:17 +0200 Subject: [PATCH 1/8] DAMASK overview reference independently of selected solver --- src/DAMASK_abaqus_exp.f | 1 + src/DAMASK_abaqus_std.f | 1 + src/DAMASK_marc.f90 | 1 + src/spectral_interface.f90 | 1 + 4 files changed, 4 insertions(+) diff --git a/src/DAMASK_abaqus_exp.f b/src/DAMASK_abaqus_exp.f index 1fab2472d..dc755f2e8 100644 --- a/src/DAMASK_abaqus_exp.f +++ b/src/DAMASK_abaqus_exp.f @@ -37,6 +37,7 @@ subroutine DAMASK_interface_init dateAndTime ! type default integer call date_and_time(values = dateAndTime) write(6,'(/,a)') ' <<<+- DAMASK_abaqus_exp -+>>>' + write(6,'(/,a)') ' Roters et. al, Computational Materials Science, 2018' write(6,'(/,a)') ' Version: '//DAMASKVERSION write(6,'(a,2(i2.2,a),i4.4)') ' Date: ',dateAndTime(3),'/',& dateAndTime(2),'/',& diff --git a/src/DAMASK_abaqus_std.f b/src/DAMASK_abaqus_std.f index d15682c58..cf60781ce 100644 --- a/src/DAMASK_abaqus_std.f +++ b/src/DAMASK_abaqus_std.f @@ -37,6 +37,7 @@ subroutine DAMASK_interface_init dateAndTime ! type default integer call date_and_time(values = dateAndTime) write(6,'(/,a)') ' <<<+- DAMASK_abaqus_std -+>>>' + write(6,'(/,a)') ' Roters et. al, Computational Materials Science, 2018' write(6,'(/,a)') ' Version: '//DAMASKVERSION write(6,'(a,2(i2.2,a),i4.4)') ' Date: ',dateAndTime(3),'/',& dateAndTime(2),'/',& diff --git a/src/DAMASK_marc.f90 b/src/DAMASK_marc.f90 index 27640e5f2..fe636dc52 100644 --- a/src/DAMASK_marc.f90 +++ b/src/DAMASK_marc.f90 @@ -54,6 +54,7 @@ subroutine DAMASK_interface_init call date_and_time(values = dateAndTime) write(6,'(/,a)') ' <<<+- DAMASK_Marc -+>>>' + write(6,'(/,a)') ' Roters et. al, Computational Materials Science, 2018' write(6,'(/,a)') ' Version: '//DAMASKVERSION write(6,'(a,2(i2.2,a),i4.4)') ' Date: ',dateAndTime(3),'/',& dateAndTime(2),'/',& diff --git a/src/spectral_interface.f90 b/src/spectral_interface.f90 index b45e8316c..677ab8220 100644 --- a/src/spectral_interface.f90 +++ b/src/spectral_interface.f90 @@ -115,6 +115,7 @@ subroutine DAMASK_interface_init() call date_and_time(values = dateAndTime) write(6,'(/,a)') ' <<<+- DAMASK_spectral -+>>>' + write(6,'(/,a)') ' Roters et. al, Computational Materials Science, 2018' write(6,'(/,a)') ' Version: '//DAMASKVERSION write(6,'(a,2(i2.2,a),i4.4)') ' Date: ',dateAndTime(3),'/',& dateAndTime(2),'/',& From afcaafa798e01bbe5607fa3e42548e9484548ba7 Mon Sep 17 00:00:00 2001 From: Yi-Chin Yang Date: Tue, 17 Apr 2018 08:20:41 +0200 Subject: [PATCH 2/8] Reference for homogenization_RGC added --- src/homogenization_RGC.f90 | 2 ++ 1 file changed, 2 insertions(+) mode change 100644 => 100755 src/homogenization_RGC.f90 diff --git a/src/homogenization_RGC.f90 b/src/homogenization_RGC.f90 old mode 100644 new mode 100755 index 611268393..6cf584a53 --- a/src/homogenization_RGC.f90 +++ b/src/homogenization_RGC.f90 @@ -116,6 +116,8 @@ subroutine homogenization_RGC_init(fileUnit) line = '' write(6,'(/,a)') ' <<<+- homogenization_'//HOMOGENIZATION_RGC_label//' init -+>>>' + write(6,'(/,a)') ' Tjahjanto et. al, Modelling and Simulation in Materials Science and Engineering, 18:015006, 2010' + write(6,'(/,a)') ' doi: 10.1088/0965-0393/18/1/015006.' write(6,'(a15,a)') ' Current time: ',IO_timeStamp() #include "compilation_info.f90" From 86683674c08941b237ef624577c4dd9b615479a5 Mon Sep 17 00:00:00 2001 From: Yi-Chin Yang Date: Tue, 17 Apr 2018 14:52:50 +0200 Subject: [PATCH 3/8] mod --- src/DAMASK_spectral.f90 | 1 + src/homogenization_RGC.f90 | 6 ++++-- src/spectral_damage.f90 | 2 ++ src/spectral_mech_AL.f90 | 2 ++ src/spectral_mech_Basic.f90 | 2 ++ src/spectral_mech_Polarisation.f90 | 2 ++ src/spectral_thermal.f90 | 2 ++ src/spectral_utilities.f90 | 2 ++ 8 files changed, 17 insertions(+), 2 deletions(-) mode change 100755 => 100644 src/homogenization_RGC.f90 diff --git a/src/DAMASK_spectral.f90 b/src/DAMASK_spectral.f90 index 068aebbc6..c68511cb7 100644 --- a/src/DAMASK_spectral.f90 +++ b/src/DAMASK_spectral.f90 @@ -161,6 +161,7 @@ program DAMASK_spectral ! init DAMASK (all modules) call CPFEM_initAll(el = 1_pInt, ip = 1_pInt) write(6,'(/,a)') ' <<<+- DAMASK_spectral init -+>>>' + write(6,'(/,a)') ' Roters et. al, Computational Materials Science, 2018' write(6,'(a15,a)') ' Current time: ',IO_timeStamp() #include "compilation_info.f90" diff --git a/src/homogenization_RGC.f90 b/src/homogenization_RGC.f90 old mode 100755 new mode 100644 index 6cf584a53..0d84af38b --- a/src/homogenization_RGC.f90 +++ b/src/homogenization_RGC.f90 @@ -116,8 +116,10 @@ subroutine homogenization_RGC_init(fileUnit) line = '' write(6,'(/,a)') ' <<<+- homogenization_'//HOMOGENIZATION_RGC_label//' init -+>>>' - write(6,'(/,a)') ' Tjahjanto et. al, Modelling and Simulation in Materials Science and Engineering, 18:015006, 2010' - write(6,'(/,a)') ' doi: 10.1088/0965-0393/18/1/015006.' + write(6,'(/,a)') ' Tjahjanto et. al, International Journal of Material Forming, 2(1):939–942, 2009 ' + write(6,'(/,a)') ' doi: 10.1007/s12289-009-0619-1 ' + write(6,'(/,a)') ' Tjahjanto et. al, Modelling and Simulation in Materials Science and Engineering, 18:015006, 2010 ' + write(6,'(/,a)') ' doi: 10.1088/0965-0393/18/1/015006 ' write(6,'(a15,a)') ' Current time: ',IO_timeStamp() #include "compilation_info.f90" diff --git a/src/spectral_damage.f90 b/src/spectral_damage.f90 index 1ac3c4c73..1618f854a 100644 --- a/src/spectral_damage.f90 +++ b/src/spectral_damage.f90 @@ -103,6 +103,8 @@ subroutine spectral_damage_init() SNESVISetVariableBounds write(6,'(/,a)') ' <<<+- spectral_damage init -+>>>' + write(6,'(/,a)') ' Shanthraj et. al, Handbook of Mechanics of Materials, volume in press, ' + write(6,'(/,a)') ' chapter Spectral Solvers for Crystal Plasticity and Multi-Physics Simulations. Springer, 2018 ' write(6,'(a15,a)') ' Current time: ',IO_timeStamp() #include "compilation_info.f90" diff --git a/src/spectral_mech_AL.f90 b/src/spectral_mech_AL.f90 index 27a1def0c..91c93bb53 100644 --- a/src/spectral_mech_AL.f90 +++ b/src/spectral_mech_AL.f90 @@ -147,6 +147,8 @@ subroutine AL_init SNESSetFromOptions write(6,'(/,a)') ' <<<+- DAMASK_spectral_solverAL init -+>>>' + write(6,'(/,a)') ' Shanthraj et. al, International Journal of Plasticity, 66:31–45, 2015 ' + write(6,'(/,a)') ' doi: 10.1016/j.ijplas.2014.02.006 ' write(6,'(a15,a)') ' Current time: ',IO_timeStamp() #include "compilation_info.f90" diff --git a/src/spectral_mech_Basic.f90 b/src/spectral_mech_Basic.f90 index 171eeacad..82f2576d9 100644 --- a/src/spectral_mech_Basic.f90 +++ b/src/spectral_mech_Basic.f90 @@ -135,6 +135,8 @@ subroutine basicPETSc_init SNESSetFromOptions write(6,'(/,a)') ' <<<+- DAMASK_spectral_solverBasicPETSc init -+>>>' + write(6,'(/,a)') ' Shanthraj et. al, International Journal of Plasticity, 66:31–45, 2015 ' + write(6,'(/,a)') ' doi: 10.1016/j.ijplas.2014.02.006 ' write(6,'(a15,a)') ' Current time: ',IO_timeStamp() #include "compilation_info.f90" diff --git a/src/spectral_mech_Polarisation.f90 b/src/spectral_mech_Polarisation.f90 index acd713c70..a3b1e9f7e 100644 --- a/src/spectral_mech_Polarisation.f90 +++ b/src/spectral_mech_Polarisation.f90 @@ -145,6 +145,8 @@ subroutine Polarisation_init SNESSetFromOptions write(6,'(/,a)') ' <<<+- DAMASK_spectral_solverPolarisation init -+>>>' + write(6,'(/,a)') ' Shanthraj et. al, International Journal of Plasticity, 66:31–45, 2015 ' + write(6,'(/,a)') ' doi: 10.1016/j.ijplas.2014.02.006 ' write(6,'(a15,a)') ' Current time: ',IO_timeStamp() #include "compilation_info.f90" diff --git a/src/spectral_thermal.f90 b/src/spectral_thermal.f90 index f89184543..a3dd468a4 100644 --- a/src/spectral_thermal.f90 +++ b/src/spectral_thermal.f90 @@ -103,6 +103,8 @@ subroutine spectral_thermal_init mainProcess: if (worldrank == 0_pInt) then write(6,'(/,a)') ' <<<+- spectral_thermal init -+>>>' + write(6,'(/,a)') ' Shanthraj et. al, Handbook of Mechanics of Materials, volume in press, ' + write(6,'(/,a)') ' chapter Spectral Solvers for Crystal Plasticity and Multi-Physics Simulations. Springer, 2018 ' write(6,'(a15,a)') ' Current time: ',IO_timeStamp() #include "compilation_info.f90" endif mainProcess diff --git a/src/spectral_utilities.f90 b/src/spectral_utilities.f90 index e3383f3d1..18e628bd4 100644 --- a/src/spectral_utilities.f90 +++ b/src/spectral_utilities.f90 @@ -216,6 +216,8 @@ subroutine utilities_init() tensorSize = 9_C_INTPTR_T write(6,'(/,a)') ' <<<+- spectral_utilities init -+>>>' + write(6,'(/,a)') ' Eisenlohr et. al, International Journal of Plasticity, 46:37–53, 2013 ' + write(6,'(/,a)') ' doi: 10.1016/j.ijplas.2012.09.012 ' write(6,'(a15,a)') ' Current time: ',IO_timeStamp() #include "compilation_info.f90" From d6d9d6e1bbc8ff157273d1c27760d2fc1bfc215e Mon Sep 17 00:00:00 2001 From: Yi-Chin Yang Date: Tue, 17 Apr 2018 15:07:16 +0200 Subject: [PATCH 4/8] edit --- src/homogenization_RGC.f90 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/homogenization_RGC.f90 b/src/homogenization_RGC.f90 index 0d84af38b..47505c3e5 100644 --- a/src/homogenization_RGC.f90 +++ b/src/homogenization_RGC.f90 @@ -117,9 +117,9 @@ subroutine homogenization_RGC_init(fileUnit) write(6,'(/,a)') ' <<<+- homogenization_'//HOMOGENIZATION_RGC_label//' init -+>>>' write(6,'(/,a)') ' Tjahjanto et. al, International Journal of Material Forming, 2(1):939–942, 2009 ' - write(6,'(/,a)') ' doi: 10.1007/s12289-009-0619-1 ' + write(6,'(/,a)') ' doi: 10.1007/s12289-009-0619-1 ' write(6,'(/,a)') ' Tjahjanto et. al, Modelling and Simulation in Materials Science and Engineering, 18:015006, 2010 ' - write(6,'(/,a)') ' doi: 10.1088/0965-0393/18/1/015006 ' + write(6,'(/,a)') ' doi: 10.1088/0965-0393/18/1/015006 ' write(6,'(a15,a)') ' Current time: ',IO_timeStamp() #include "compilation_info.f90" From 41967da684bd240ac61628fe25f7a6d20d3e6da2 Mon Sep 17 00:00:00 2001 From: Yi-Chin Yang Date: Tue, 17 Apr 2018 15:09:12 +0200 Subject: [PATCH 5/8] edit --- src/spectral_damage.f90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/spectral_damage.f90 b/src/spectral_damage.f90 index 1618f854a..ad4df0a57 100644 --- a/src/spectral_damage.f90 +++ b/src/spectral_damage.f90 @@ -104,7 +104,7 @@ subroutine spectral_damage_init() write(6,'(/,a)') ' <<<+- spectral_damage init -+>>>' write(6,'(/,a)') ' Shanthraj et. al, Handbook of Mechanics of Materials, volume in press, ' - write(6,'(/,a)') ' chapter Spectral Solvers for Crystal Plasticity and Multi-Physics Simulations. Springer, 2018 ' + write(6,'(/,a)') ' chapter Spectral Solvers for Crystal Plasticity and Multi-Physics Simulations. Springer, 2018 ' write(6,'(a15,a)') ' Current time: ',IO_timeStamp() #include "compilation_info.f90" From fc3abd4f399b6220eb57b458052a4514270dfe14 Mon Sep 17 00:00:00 2001 From: Yi-Chin Yang Date: Tue, 17 Apr 2018 15:22:18 +0200 Subject: [PATCH 6/8] References for spectral solvers --- src/spectral_interface.f90 | 2 +- src/spectral_mech_AL.f90 | 6 +++--- src/spectral_mech_Basic.f90 | 6 +++--- src/spectral_mech_Polarisation.f90 | 6 +++--- src/spectral_thermal.f90 | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/spectral_interface.f90 b/src/spectral_interface.f90 index 677ab8220..ba644ea9c 100644 --- a/src/spectral_interface.f90 +++ b/src/spectral_interface.f90 @@ -115,7 +115,7 @@ subroutine DAMASK_interface_init() call date_and_time(values = dateAndTime) write(6,'(/,a)') ' <<<+- DAMASK_spectral -+>>>' - write(6,'(/,a)') ' Roters et. al, Computational Materials Science, 2018' + write(6,'(/,a)') ' Roters et. al, Computational Materials Science, 2018' write(6,'(/,a)') ' Version: '//DAMASKVERSION write(6,'(a,2(i2.2,a),i4.4)') ' Date: ',dateAndTime(3),'/',& dateAndTime(2),'/',& diff --git a/src/spectral_mech_AL.f90 b/src/spectral_mech_AL.f90 index 91c93bb53..86e38c81c 100644 --- a/src/spectral_mech_AL.f90 +++ b/src/spectral_mech_AL.f90 @@ -147,9 +147,9 @@ subroutine AL_init SNESSetFromOptions write(6,'(/,a)') ' <<<+- DAMASK_spectral_solverAL init -+>>>' - write(6,'(/,a)') ' Shanthraj et. al, International Journal of Plasticity, 66:31–45, 2015 ' - write(6,'(/,a)') ' doi: 10.1016/j.ijplas.2014.02.006 ' - write(6,'(a15,a)') ' Current time: ',IO_timeStamp() + write(6,'(/,a)') ' Shanthraj et. al, International Journal of Plasticity, 66:31–45, 2015 ' + write(6,'(/,a)') ' doi: 10.1016/j.ijplas.2014.02.006 ' + write(6,'(a15,a)') ' Current time: ',IO_timeStamp() #include "compilation_info.f90" !-------------------------------------------------------------------------------------------------- diff --git a/src/spectral_mech_Basic.f90 b/src/spectral_mech_Basic.f90 index 82f2576d9..080874ec1 100644 --- a/src/spectral_mech_Basic.f90 +++ b/src/spectral_mech_Basic.f90 @@ -135,9 +135,9 @@ subroutine basicPETSc_init SNESSetFromOptions write(6,'(/,a)') ' <<<+- DAMASK_spectral_solverBasicPETSc init -+>>>' - write(6,'(/,a)') ' Shanthraj et. al, International Journal of Plasticity, 66:31–45, 2015 ' - write(6,'(/,a)') ' doi: 10.1016/j.ijplas.2014.02.006 ' - write(6,'(a15,a)') ' Current time: ',IO_timeStamp() + write(6,'(/,a)') ' Shanthraj et. al, International Journal of Plasticity, 66:31–45, 2015 ' + write(6,'(/,a)') ' doi: 10.1016/j.ijplas.2014.02.006 ' + write(6,'(a15,a)') ' Current time: ',IO_timeStamp() #include "compilation_info.f90" !-------------------------------------------------------------------------------------------------- diff --git a/src/spectral_mech_Polarisation.f90 b/src/spectral_mech_Polarisation.f90 index a3b1e9f7e..cafddd611 100644 --- a/src/spectral_mech_Polarisation.f90 +++ b/src/spectral_mech_Polarisation.f90 @@ -145,9 +145,9 @@ subroutine Polarisation_init SNESSetFromOptions write(6,'(/,a)') ' <<<+- DAMASK_spectral_solverPolarisation init -+>>>' - write(6,'(/,a)') ' Shanthraj et. al, International Journal of Plasticity, 66:31–45, 2015 ' - write(6,'(/,a)') ' doi: 10.1016/j.ijplas.2014.02.006 ' - write(6,'(a15,a)') ' Current time: ',IO_timeStamp() + write(6,'(/,a)') ' Shanthraj et. al, International Journal of Plasticity, 66:31–45, 2015 ' + write(6,'(/,a)') ' doi: 10.1016/j.ijplas.2014.02.006 ' + write(6,'(a15,a)') ' Current time: ',IO_timeStamp() #include "compilation_info.f90" !-------------------------------------------------------------------------------------------------- diff --git a/src/spectral_thermal.f90 b/src/spectral_thermal.f90 index a3dd468a4..51805cc4b 100644 --- a/src/spectral_thermal.f90 +++ b/src/spectral_thermal.f90 @@ -103,9 +103,9 @@ subroutine spectral_thermal_init mainProcess: if (worldrank == 0_pInt) then write(6,'(/,a)') ' <<<+- spectral_thermal init -+>>>' - write(6,'(/,a)') ' Shanthraj et. al, Handbook of Mechanics of Materials, volume in press, ' + write(6,'(/,a)') ' Shanthraj et. al, Handbook of Mechanics of Materials, volume in press, ' write(6,'(/,a)') ' chapter Spectral Solvers for Crystal Plasticity and Multi-Physics Simulations. Springer, 2018 ' - write(6,'(a15,a)') ' Current time: ',IO_timeStamp() + write(6,'(a15,a)') ' Current time: ',IO_timeStamp() #include "compilation_info.f90" endif mainProcess From 258be943c754d528fae34b2148426757665c6409 Mon Sep 17 00:00:00 2001 From: Yi-Chin Yang Date: Tue, 17 Apr 2018 15:25:27 +0200 Subject: [PATCH 7/8] No tab allowed --- src/spectral_thermal.f90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/spectral_thermal.f90 b/src/spectral_thermal.f90 index 51805cc4b..b021f0c48 100644 --- a/src/spectral_thermal.f90 +++ b/src/spectral_thermal.f90 @@ -104,7 +104,7 @@ subroutine spectral_thermal_init mainProcess: if (worldrank == 0_pInt) then write(6,'(/,a)') ' <<<+- spectral_thermal init -+>>>' write(6,'(/,a)') ' Shanthraj et. al, Handbook of Mechanics of Materials, volume in press, ' - write(6,'(/,a)') ' chapter Spectral Solvers for Crystal Plasticity and Multi-Physics Simulations. Springer, 2018 ' + write(6,'(/,a)') ' chapter Spectral Solvers for Crystal Plasticity and Multi-Physics Simulations. Springer, 2018 ' write(6,'(a15,a)') ' Current time: ',IO_timeStamp() #include "compilation_info.f90" endif mainProcess From b7d622c32db1eb0900011845bd8908d2f741aa92 Mon Sep 17 00:00:00 2001 From: Yi-Chin Yang Date: Tue, 17 Apr 2018 15:39:08 +0200 Subject: [PATCH 8/8] No tab allowed --- src/spectral_damage.f90 | 4 ++-- src/spectral_utilities.f90 | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/spectral_damage.f90 b/src/spectral_damage.f90 index ad4df0a57..03bb5766b 100644 --- a/src/spectral_damage.f90 +++ b/src/spectral_damage.f90 @@ -103,8 +103,8 @@ subroutine spectral_damage_init() SNESVISetVariableBounds write(6,'(/,a)') ' <<<+- spectral_damage init -+>>>' - write(6,'(/,a)') ' Shanthraj et. al, Handbook of Mechanics of Materials, volume in press, ' - write(6,'(/,a)') ' chapter Spectral Solvers for Crystal Plasticity and Multi-Physics Simulations. Springer, 2018 ' + write(6,'(/,a)') ' Shanthraj et. al, Handbook of Mechanics of Materials, volume in press, ' + write(6,'(/,a)') ' chapter Spectral Solvers for Crystal Plasticity and Multi-Physics Simulations. Springer, 2018 ' write(6,'(a15,a)') ' Current time: ',IO_timeStamp() #include "compilation_info.f90" diff --git a/src/spectral_utilities.f90 b/src/spectral_utilities.f90 index 18e628bd4..c5497c613 100644 --- a/src/spectral_utilities.f90 +++ b/src/spectral_utilities.f90 @@ -215,9 +215,9 @@ subroutine utilities_init() vecSize = 3_C_INTPTR_T, & tensorSize = 9_C_INTPTR_T - write(6,'(/,a)') ' <<<+- spectral_utilities init -+>>>' - write(6,'(/,a)') ' Eisenlohr et. al, International Journal of Plasticity, 46:37–53, 2013 ' - write(6,'(/,a)') ' doi: 10.1016/j.ijplas.2012.09.012 ' + write(6,'(/,a)') ' <<<+- spectral_utilities init -+>>>' + write(6,'(/,a)') ' Eisenlohr et. al, International Journal of Plasticity, 46:37–53, 2013 ' + write(6,'(/,a)') ' doi: 10.1016/j.ijplas.2012.09.012 ' write(6,'(a15,a)') ' Current time: ',IO_timeStamp() #include "compilation_info.f90"