From 63c104b3748fadd85f0d78f6aadbb372da2e6a81 Mon Sep 17 00:00:00 2001 From: Pratheek Shanthraj Date: Mon, 12 Mar 2018 17:35:54 +0100 Subject: [PATCH 01/27] more work to get testing to work --- PRIVATE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PRIVATE b/PRIVATE index 8546f9bda..1be6a4f1a 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit 8546f9bda04b58c3b26979048288a8a01f607876 +Subproject commit 1be6a4f1a313f7e34035b52be67092ddc13db68b From 52c9954ca4dae3c2bfdeb69c9868175bb1bbfe04 Mon Sep 17 00:00:00 2001 From: Pratheek Shanthraj Date: Mon, 12 Mar 2018 17:44:37 +0100 Subject: [PATCH 02/27] Revert "more work to get testing to work" This reverts commit 63c104b3748fadd85f0d78f6aadbb372da2e6a81. --- PRIVATE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PRIVATE b/PRIVATE index 1be6a4f1a..8546f9bda 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit 1be6a4f1a313f7e34035b52be67092ddc13db68b +Subproject commit 8546f9bda04b58c3b26979048288a8a01f607876 From fb710dda0a6dc621746833b59739586c9d5af2b4 Mon Sep 17 00:00:00 2001 From: Test User Date: Mon, 12 Mar 2018 22:56:52 +0100 Subject: [PATCH 03/27] [skip ci] updated version information after successful test of v2.0.1-1110-g52c9954 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index becfecaca..6cd6d15e3 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v2.0.1-1107-g2c3eae6 +v2.0.1-1110-g52c9954 From 0570a49ed598e9bd219cfc452d51cde797729045 Mon Sep 17 00:00:00 2001 From: Philip Eisenlohr Date: Tue, 27 Mar 2018 16:53:49 -0400 Subject: [PATCH 04/27] fixed broken logic of restoring and preventing immutable microstructures --- processing/pre/geom_grainGrowth.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/processing/pre/geom_grainGrowth.py b/processing/pre/geom_grainGrowth.py index 90c24219c..f1394cb5f 100755 --- a/processing/pre/geom_grainGrowth.py +++ b/processing/pre/geom_grainGrowth.py @@ -109,14 +109,6 @@ for name in filenames: for smoothIter in range(options.N): - # replace immutable microstructures with closest mutable ones - index = ndimage.morphology.distance_transform_edt(np.in1d(microstructure,options.immutable).reshape(grid), - return_distances = False, - return_indices = True) - microstructure = microstructure[index[0], - index[1], - index[2]] - interfaceEnergy = np.zeros(microstructure.shape,dtype=np.float32) for i in (-1,0,1): for j in (-1,0,1): @@ -182,8 +174,16 @@ for name in filenames: grid[1]/2:-grid[1]/2, grid[2]/2:-grid[2]/2] # extent grains into interface region + # replace immutable microstructures with closest mutable ones + index = ndimage.morphology.distance_transform_edt(np.in1d(microstructure,options.immutable).reshape(grid), + return_distances = False, + return_indices = True) + microstructure = microstructure[index[0], + index[1], + index[2]] + immutable = np.zeros(microstructure.shape, dtype=np.bool) - # find locations where immutable microstructures have been (or are now) + # find locations where immutable microstructures have been in original structure for micro in options.immutable: immutable += microstructure_original == micro From 1b12457fe6c542e549637e6f10d135ed9c9c9c40 Mon Sep 17 00:00:00 2001 From: Philip Eisenlohr Date: Fri, 30 Mar 2018 11:48:02 -0400 Subject: [PATCH 05/27] vicinityOffset to specific triggering IDs instead of just any other ID --- processing/pre/geom_vicinityOffset.py | 30 ++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/processing/pre/geom_vicinityOffset.py b/processing/pre/geom_vicinityOffset.py index d4eb8e097..c172171b7 100755 --- a/processing/pre/geom_vicinityOffset.py +++ b/processing/pre/geom_vicinityOffset.py @@ -10,13 +10,24 @@ import damask scriptName = os.path.splitext(os.path.basename(__file__))[0] scriptID = ' '.join([scriptName,damask.version]) +def taintedNeighborhood(stencil,trigger=[],size=1): + + me = stencil[stencil.shape[0]//2] + if len(trigger) == 0: + return np.any(stencil != me) + if me in trigger: + trigger = set(trigger) + trigger.remove(me) + trigger = list(trigger) + return np.any(np.in1d(stencil,np.array(trigger))) + #-------------------------------------------------------------------------------------------------- # MAIN #-------------------------------------------------------------------------------------------------- parser = OptionParser(option_class=damask.extendableOption, usage='%prog options [file[s]]', description = """ -Offset microstructure index for points which see a microstructure different from themselves within a given (cubic) vicinity, -i.e. within the region close to a grain/phase boundary. +Offset microstructure index for points which see a microstructure different from themselves +(or listed as triggers) within a given (cubic) vicinity, i.e. within the region close to a grain/phase boundary. """, version = scriptID) @@ -29,6 +40,9 @@ parser.add_option('-m', '--microstructureoffset', type = 'int', metavar = 'int', help = 'offset (positive or negative) for tagged microstructure indices. '+ '"0" selects maximum microstructure index [%default]') +parser.add_option('-t', '--trigger', + action = 'extend', dest = 'trigger', metavar = '', + help = 'list of microstructure indices triggering a change') parser.add_option('-n', '--nonperiodic', dest = 'mode', action = 'store_const', const = 'nearest', @@ -36,10 +50,13 @@ parser.add_option('-n', '--nonperiodic', parser.set_defaults(vicinity = 1, offset = 0, + trigger = [], mode = 'wrap', ) (options, filenames) = parser.parse_args() +options.trigger = np.array(options.trigger, dtype=int) + # --- loop over input files ------------------------------------------------------------------------- @@ -84,9 +101,12 @@ for name in filenames: if options.offset == 0: options.offset = microstructure.max() - microstructure = np.where(ndimage.filters.maximum_filter(microstructure,size=1+2*options.vicinity,mode=options.mode) == - ndimage.filters.minimum_filter(microstructure,size=1+2*options.vicinity,mode=options.mode), - microstructure, microstructure + options.offset) + microstructure = np.where(ndimage.filters.generic_filter(microstructure, + taintedNeighborhood, + size=1+2*options.vicinity,mode=options.mode, + extra_arguments=(), + extra_keywords={"trigger":options.trigger,"size":1+2*options.vicinity}), + microstructure + options.offset,microstructure) newInfo['microstructures'] = microstructure.max() From b429068aa43ffbfa06447cedd560b15d29c6614e Mon Sep 17 00:00:00 2001 From: Philip Eisenlohr Date: Fri, 30 Mar 2018 11:54:15 -0400 Subject: [PATCH 06/27] adopted new reference result for grainGrowth test --- PRIVATE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PRIVATE b/PRIVATE index 8546f9bda..af8516892 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit 8546f9bda04b58c3b26979048288a8a01f607876 +Subproject commit af851689285b8c1a633495219abd9dbbd5a11c69 From de2b00151aaeee70a67fec392842111ae93b36d2 Mon Sep 17 00:00:00 2001 From: Test User Date: Sat, 31 Mar 2018 03:17:37 +0200 Subject: [PATCH 07/27] [skip ci] updated version information after successful test of v2.0.1-1115-gb429068 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 6cd6d15e3..35415784e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v2.0.1-1110-g52c9954 +v2.0.1-1115-gb429068 From ea9434432e71d03fa57e4e8eae587061713bb3e0 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Mon, 9 Apr 2018 15:04:37 +0200 Subject: [PATCH 08/27] added reference for the tungsten model --- src/plastic_disloUCLA.f90 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/plastic_disloUCLA.f90 b/src/plastic_disloUCLA.f90 index 9c0a6c494..8d44d28c8 100644 --- a/src/plastic_disloUCLA.f90 +++ b/src/plastic_disloUCLA.f90 @@ -176,6 +176,8 @@ subroutine plastic_disloUCLA_init(fileUnit) real(pReal), dimension(:), allocatable :: tempPerSlip write(6,'(/,a)') ' <<<+- constitutive_'//PLASTICITY_DISLOUCLA_label//' init -+>>>' + write(6,'(/,a)') ' Cereceda et. al, International Journal of Plasticity 78, 2016, 242-256' + write(6,'(/,a)') ' http://dx.doi.org/10.1016/j.ijplas.2015.09.002' write(6,'(a15,a)') ' Current time: ',IO_timeStamp() #include "compilation_info.f90" From 0701b535fc086d0381a86927bf03e09a7628eb01 Mon Sep 17 00:00:00 2001 From: Yi-Chin Yang Date: Mon, 16 Apr 2018 16:14:17 +0200 Subject: [PATCH 09/27] 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 10/27] 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 3bd09fe837f97a10790bbd41765cc71e178a7349 Mon Sep 17 00:00:00 2001 From: Sharan Roongta Date: Tue, 17 Apr 2018 14:42:04 +0200 Subject: [PATCH 11/27] fixed typo --- src/homogenization_RGC.f90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/homogenization_RGC.f90 b/src/homogenization_RGC.f90 index 611268393..e1f4f4cee 100644 --- a/src/homogenization_RGC.f90 +++ b/src/homogenization_RGC.f90 @@ -69,7 +69,7 @@ module homogenization_RGC contains !-------------------------------------------------------------------------------------------------- -!> @brief allocates all neccessary fields, reads information from material configuration file +!> @brief allocates all necessary fields, reads information from material configuration file !-------------------------------------------------------------------------------------------------- subroutine homogenization_RGC_init(fileUnit) #if defined(__GFORTRAN__) || __INTEL_COMPILER >= 1800 From 86683674c08941b237ef624577c4dd9b615479a5 Mon Sep 17 00:00:00 2001 From: Yi-Chin Yang Date: Tue, 17 Apr 2018 14:52:50 +0200 Subject: [PATCH 12/27] 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 13/27] 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 14/27] 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 15/27] 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 16/27] 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 17/27] 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" From 3fca8da6aa0fc78ac90c232b088af83cad4ecaad Mon Sep 17 00:00:00 2001 From: Sharan Roongta Date: Tue, 17 Apr 2018 15:51:59 +0200 Subject: [PATCH 18/27] Citations in plastic_twin --- src/plastic_dislotwin.f90 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/plastic_dislotwin.f90 b/src/plastic_dislotwin.f90 index c7aaf5400..68c45fd8e 100644 --- a/src/plastic_dislotwin.f90 +++ b/src/plastic_dislotwin.f90 @@ -265,6 +265,10 @@ subroutine plastic_dislotwin_init(fileUnit) real(pReal), dimension(:), allocatable :: tempPerSlip, tempPerTwin, tempPerTrans write(6,'(/,a)') ' <<<+- constitutive_'//PLASTICITY_DISLOTWIN_label//' init -+>>>' + write(6,'(/,a)') ' A. Ma and F. Roters, Acta Materialia, 52(12):3603–3612, 2004' + write(6,'(/,a)') ' https://doi.org/10.1016/j.actamat.2004.04.012' + write(6,'(/,a)') ' F.Roters et. al , Computational Materials Science, 39:91–95, 2007' + write(6,'(/,a)') ' https://doi.org/10.1016/j.commatsci.2006.04.014' write(6,'(a15,a)') ' Current time: ',IO_timeStamp() #include "compilation_info.f90" From 90a1af509660391a7624621aa0e62d298d5822b6 Mon Sep 17 00:00:00 2001 From: Sharan Roongta Date: Wed, 18 Apr 2018 14:18:48 +0200 Subject: [PATCH 19/27] Cited HybridIA algorithm --- src/IO.f90 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/IO.f90 b/src/IO.f90 index 9e8033f73..0812977b8 100644 --- a/src/IO.f90 +++ b/src/IO.f90 @@ -560,6 +560,9 @@ function IO_hybridIA(Nast,ODFfileName) IO_hybridIA = 0.0_pReal ! initialize return value for case of error write(6,'(/,a,/)',advance='no') ' Using linear ODF file: '//trim(ODFfileName) + write(6,'(/,a)') 'Eisenlohr et.al, Computational Materials Science, 42(4):670–678, 2008' + write(6,'(/,a)') 'https://doi.org/10.1016/j.commatsci.2007.09.015' + !-------------------------------------------------------------------------------------------------- ! parse header of ODF file From 451e9f245a7ed7a478a01b1d88d73ee8933c8c0f Mon Sep 17 00:00:00 2001 From: Sharan Roongta Date: Wed, 18 Apr 2018 15:01:03 +0200 Subject: [PATCH 20/27] Removing some typos in citations --- src/DAMASK_abaqus_exp.f | 2 +- src/DAMASK_abaqus_std.f | 2 +- src/DAMASK_marc.f90 | 2 +- src/homogenization_RGC.f90 | 8 ++++---- src/plastic_isotropic.f90 | 2 ++ src/spectral_mech_AL.f90 | 4 ++-- src/spectral_mech_Basic.f90 | 4 ++-- src/spectral_mech_Polarisation.f90 | 4 ++-- src/spectral_thermal.f90 | 4 ++-- src/spectral_utilities.f90 | 4 ++-- 10 files changed, 19 insertions(+), 17 deletions(-) diff --git a/src/DAMASK_abaqus_exp.f b/src/DAMASK_abaqus_exp.f index dc755f2e8..a8a3a7496 100644 --- a/src/DAMASK_abaqus_exp.f +++ b/src/DAMASK_abaqus_exp.f @@ -37,7 +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)') ' 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 cf60781ce..fafe339f3 100644 --- a/src/DAMASK_abaqus_std.f +++ b/src/DAMASK_abaqus_std.f @@ -37,7 +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)') ' 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 fe636dc52..034aaf6f2 100644 --- a/src/DAMASK_marc.f90 +++ b/src/DAMASK_marc.f90 @@ -54,7 +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)') ' 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/homogenization_RGC.f90 b/src/homogenization_RGC.f90 index acf8f5a0f..6595b4093 100644 --- a/src/homogenization_RGC.f90 +++ b/src/homogenization_RGC.f90 @@ -116,10 +116,10 @@ subroutine homogenization_RGC_init(fileUnit) line = '' 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)') ' 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)') ' https://doi.org/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)') ' https://doi.org/10.1088/0965-0393/18/1/015006' write(6,'(a15,a)') ' Current time: ',IO_timeStamp() #include "compilation_info.f90" diff --git a/src/plastic_isotropic.f90 b/src/plastic_isotropic.f90 index 2ba1238b2..0bd207c63 100644 --- a/src/plastic_isotropic.f90 +++ b/src/plastic_isotropic.f90 @@ -150,6 +150,8 @@ subroutine plastic_isotropic_init(fileUnit) integer(pInt) :: NipcMyPhase write(6,'(/,a)') ' <<<+- constitutive_'//PLASTICITY_ISOTROPIC_label//' init -+>>>' + write(6,'(/,a)') ' Ma et.al, Computational Materials Science, 109:323–329, 2015' + write(6,'(/,a)') ' https://doi.org/10.1016/j.commatsci.2015.07.041' 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 86e38c81c..be950e6d8 100644 --- a/src/spectral_mech_AL.f90 +++ b/src/spectral_mech_AL.f90 @@ -147,8 +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,'(/,a)') ' Shanthraj et. al, International Journal of Plasticity, 66:31–45, 2015' + write(6,'(/,a)') ' https://doi.org/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 080874ec1..c0e45eda9 100644 --- a/src/spectral_mech_Basic.f90 +++ b/src/spectral_mech_Basic.f90 @@ -135,8 +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,'(/,a)') ' Shanthraj et. al, International Journal of Plasticity, 66:31–45, 2015' + write(6,'(/,a)') ' https://doi.org/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 cafddd611..89fd8a6e0 100644 --- a/src/spectral_mech_Polarisation.f90 +++ b/src/spectral_mech_Polarisation.f90 @@ -145,8 +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,'(/,a)') ' Shanthraj et. al, International Journal of Plasticity, 66:31–45, 2015' + write(6,'(/,a)') ' https://doi.org/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 b021f0c48..14207d6f4 100644 --- a/src/spectral_thermal.f90 +++ b/src/spectral_thermal.f90 @@ -103,8 +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,'(/,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 c5497c613..db54f0361 100644 --- a/src/spectral_utilities.f90 +++ b/src/spectral_utilities.f90 @@ -216,8 +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,'(/,a)') ' Eisenlohr et. al, International Journal of Plasticity, 46:37–53, 2013' + write(6,'(/,a)') ' https://doi.org/10.1016/j.ijplas.2012.09.012' write(6,'(a15,a)') ' Current time: ',IO_timeStamp() #include "compilation_info.f90" From 71d23274e744a2f8d561439c45227b46fde8464e Mon Sep 17 00:00:00 2001 From: Sharan Roongta Date: Wed, 18 Apr 2018 15:22:19 +0200 Subject: [PATCH 21/27] A citation on twinning was missing --- src/plastic_dislotwin.f90 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/plastic_dislotwin.f90 b/src/plastic_dislotwin.f90 index 68c45fd8e..ebba33f65 100644 --- a/src/plastic_dislotwin.f90 +++ b/src/plastic_dislotwin.f90 @@ -269,6 +269,8 @@ subroutine plastic_dislotwin_init(fileUnit) write(6,'(/,a)') ' https://doi.org/10.1016/j.actamat.2004.04.012' write(6,'(/,a)') ' F.Roters et. al , Computational Materials Science, 39:91–95, 2007' write(6,'(/,a)') ' https://doi.org/10.1016/j.commatsci.2006.04.014' + write(6,'(/,a)') ' Wong et.al, Acta Materialia, 118:140–151, 2016' + write(6,'(/,a)') ' https://doi.org/10.1016/j.actamat.2016.07.032' write(6,'(a15,a)') ' Current time: ',IO_timeStamp() #include "compilation_info.f90" From 488ff6bb2d73633501f2b5ae034c5a7b43a92188 Mon Sep 17 00:00:00 2001 From: Sharan Roongta Date: Wed, 18 Apr 2018 15:30:54 +0200 Subject: [PATCH 22/27] Rectifying a typo --- src/IO.f90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/IO.f90 b/src/IO.f90 index 0812977b8..263ad82cb 100644 --- a/src/IO.f90 +++ b/src/IO.f90 @@ -560,7 +560,7 @@ function IO_hybridIA(Nast,ODFfileName) IO_hybridIA = 0.0_pReal ! initialize return value for case of error write(6,'(/,a,/)',advance='no') ' Using linear ODF file: '//trim(ODFfileName) - write(6,'(/,a)') 'Eisenlohr et.al, Computational Materials Science, 42(4):670–678, 2008' + write(6,'(/,a)') 'Eisenlohr et. al, Computational Materials Science, 42(4):670–678, 2008' write(6,'(/,a)') 'https://doi.org/10.1016/j.commatsci.2007.09.015' From e90861956de798022818b0b96d769eb117a17408 Mon Sep 17 00:00:00 2001 From: Yi-Chin Yang Date: Sun, 22 Apr 2018 09:32:59 +0200 Subject: [PATCH 23/27] "et al." instead of "et. al" abbreviates "et alii", meaning "and others" --- src/DAMASK_abaqus_exp.f | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/DAMASK_abaqus_exp.f b/src/DAMASK_abaqus_exp.f index a8a3a7496..cfd02cbed 100644 --- a/src/DAMASK_abaqus_exp.f +++ b/src/DAMASK_abaqus_exp.f @@ -37,7 +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)') ' 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 35a4fdc3580247a90473730e585a0e894d189b89 Mon Sep 17 00:00:00 2001 From: Yi-Chin Yang Date: Sun, 22 Apr 2018 10:07:49 +0200 Subject: [PATCH 24/27] "et al." instead of "et. al" abbreviates "et alii", meaning "and others" --- src/DAMASK_abaqus_std.f | 2 +- src/DAMASK_marc.f90 | 2 +- src/DAMASK_spectral.f90 | 2 +- src/IO.f90 | 2 +- src/homogenization_RGC.f90 | 4 ++-- src/plastic_disloUCLA.f90 | 2 +- src/plastic_dislotwin.f90 | 4 ++-- src/plastic_isotropic.f90 | 2 +- src/spectral_damage.f90 | 2 +- src/spectral_interface.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 +- 15 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/DAMASK_abaqus_std.f b/src/DAMASK_abaqus_std.f index fafe339f3..e91cbb0bb 100644 --- a/src/DAMASK_abaqus_std.f +++ b/src/DAMASK_abaqus_std.f @@ -37,7 +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)') ' 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 034aaf6f2..81465350c 100644 --- a/src/DAMASK_marc.f90 +++ b/src/DAMASK_marc.f90 @@ -54,7 +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)') ' 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_spectral.f90 b/src/DAMASK_spectral.f90 index c68511cb7..5bb882e2d 100644 --- a/src/DAMASK_spectral.f90 +++ b/src/DAMASK_spectral.f90 @@ -161,7 +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,'(/,a)') ' Roters et al., Computational Materials Science, 2018' write(6,'(a15,a)') ' Current time: ',IO_timeStamp() #include "compilation_info.f90" diff --git a/src/IO.f90 b/src/IO.f90 index 263ad82cb..7291f36ad 100644 --- a/src/IO.f90 +++ b/src/IO.f90 @@ -560,7 +560,7 @@ function IO_hybridIA(Nast,ODFfileName) IO_hybridIA = 0.0_pReal ! initialize return value for case of error write(6,'(/,a,/)',advance='no') ' Using linear ODF file: '//trim(ODFfileName) - write(6,'(/,a)') 'Eisenlohr et. al, Computational Materials Science, 42(4):670–678, 2008' + write(6,'(/,a)') 'Eisenlohr et al., Computational Materials Science, 42(4):670–678, 2008' write(6,'(/,a)') 'https://doi.org/10.1016/j.commatsci.2007.09.015' diff --git a/src/homogenization_RGC.f90 b/src/homogenization_RGC.f90 index 6595b4093..fe9885215 100644 --- a/src/homogenization_RGC.f90 +++ b/src/homogenization_RGC.f90 @@ -116,9 +116,9 @@ subroutine homogenization_RGC_init(fileUnit) line = '' 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)') ' Tjahjanto et al., International Journal of Material Forming, 2(1):939–942, 2009' write(6,'(/,a)') ' https://doi.org/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)') ' Tjahjanto et al., Modelling and Simulation in Materials Science and Engineering, 18:015006, 2010' write(6,'(/,a)') ' https://doi.org/10.1088/0965-0393/18/1/015006' write(6,'(a15,a)') ' Current time: ',IO_timeStamp() #include "compilation_info.f90" diff --git a/src/plastic_disloUCLA.f90 b/src/plastic_disloUCLA.f90 index 8d44d28c8..514652397 100644 --- a/src/plastic_disloUCLA.f90 +++ b/src/plastic_disloUCLA.f90 @@ -176,7 +176,7 @@ subroutine plastic_disloUCLA_init(fileUnit) real(pReal), dimension(:), allocatable :: tempPerSlip write(6,'(/,a)') ' <<<+- constitutive_'//PLASTICITY_DISLOUCLA_label//' init -+>>>' - write(6,'(/,a)') ' Cereceda et. al, International Journal of Plasticity 78, 2016, 242-256' + write(6,'(/,a)') ' Cereceda et al., International Journal of Plasticity 78, 2016, 242-256' write(6,'(/,a)') ' http://dx.doi.org/10.1016/j.ijplas.2015.09.002' write(6,'(a15,a)') ' Current time: ',IO_timeStamp() #include "compilation_info.f90" diff --git a/src/plastic_dislotwin.f90 b/src/plastic_dislotwin.f90 index ebba33f65..e0da954a6 100644 --- a/src/plastic_dislotwin.f90 +++ b/src/plastic_dislotwin.f90 @@ -267,9 +267,9 @@ subroutine plastic_dislotwin_init(fileUnit) write(6,'(/,a)') ' <<<+- constitutive_'//PLASTICITY_DISLOTWIN_label//' init -+>>>' write(6,'(/,a)') ' A. Ma and F. Roters, Acta Materialia, 52(12):3603–3612, 2004' write(6,'(/,a)') ' https://doi.org/10.1016/j.actamat.2004.04.012' - write(6,'(/,a)') ' F.Roters et. al , Computational Materials Science, 39:91–95, 2007' + write(6,'(/,a)') ' F.Roters et al., Computational Materials Science, 39:91–95, 2007' write(6,'(/,a)') ' https://doi.org/10.1016/j.commatsci.2006.04.014' - write(6,'(/,a)') ' Wong et.al, Acta Materialia, 118:140–151, 2016' + write(6,'(/,a)') ' Wong et al., Acta Materialia, 118:140–151, 2016' write(6,'(/,a)') ' https://doi.org/10.1016/j.actamat.2016.07.032' write(6,'(a15,a)') ' Current time: ',IO_timeStamp() #include "compilation_info.f90" diff --git a/src/plastic_isotropic.f90 b/src/plastic_isotropic.f90 index 0bd207c63..4679d654d 100644 --- a/src/plastic_isotropic.f90 +++ b/src/plastic_isotropic.f90 @@ -150,7 +150,7 @@ subroutine plastic_isotropic_init(fileUnit) integer(pInt) :: NipcMyPhase write(6,'(/,a)') ' <<<+- constitutive_'//PLASTICITY_ISOTROPIC_label//' init -+>>>' - write(6,'(/,a)') ' Ma et.al, Computational Materials Science, 109:323–329, 2015' + write(6,'(/,a)') ' Ma et al., Computational Materials Science, 109:323–329, 2015' write(6,'(/,a)') ' https://doi.org/10.1016/j.commatsci.2015.07.041' 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 03bb5766b..c6caf410d 100644 --- a/src/spectral_damage.f90 +++ b/src/spectral_damage.f90 @@ -103,7 +103,7 @@ 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)') ' 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_interface.f90 b/src/spectral_interface.f90 index ba644ea9c..eca92df9d 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 be950e6d8..67eda6f42 100644 --- a/src/spectral_mech_AL.f90 +++ b/src/spectral_mech_AL.f90 @@ -147,7 +147,7 @@ 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)') ' Shanthraj et al., International Journal of Plasticity, 66:31–45, 2015' write(6,'(/,a)') ' https://doi.org/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 c0e45eda9..bef70153d 100644 --- a/src/spectral_mech_Basic.f90 +++ b/src/spectral_mech_Basic.f90 @@ -135,7 +135,7 @@ 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)') ' Shanthraj et al., International Journal of Plasticity, 66:31–45, 2015' write(6,'(/,a)') ' https://doi.org/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 89fd8a6e0..02e0e0ab8 100644 --- a/src/spectral_mech_Polarisation.f90 +++ b/src/spectral_mech_Polarisation.f90 @@ -145,7 +145,7 @@ 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)') ' Shanthraj et al., International Journal of Plasticity, 66:31–45, 2015' write(6,'(/,a)') ' https://doi.org/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 14207d6f4..ff318f395 100644 --- a/src/spectral_thermal.f90 +++ b/src/spectral_thermal.f90 @@ -103,7 +103,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)') ' 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 db54f0361..4289d7829 100644 --- a/src/spectral_utilities.f90 +++ b/src/spectral_utilities.f90 @@ -216,7 +216,7 @@ 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)') ' Eisenlohr et al., International Journal of Plasticity, 46:37–53, 2013' write(6,'(/,a)') ' https://doi.org/10.1016/j.ijplas.2012.09.012' write(6,'(a15,a)') ' Current time: ',IO_timeStamp() #include "compilation_info.f90" From ac6cbe2920f9fbc4a765f5ce2950125ae26f84a2 Mon Sep 17 00:00:00 2001 From: Test User Date: Mon, 23 Apr 2018 04:51:22 +0200 Subject: [PATCH 25/27] [skip ci] updated version information after successful test of v2.0.1-1136-ge588fe3 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 35415784e..5cf2a8f37 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v2.0.1-1115-gb429068 +v2.0.1-1136-ge588fe3 From fcac08cdcef0ad09e50e516ad3b453f753026ca5 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Mon, 23 Apr 2018 21:31:57 +0200 Subject: [PATCH 26/27] helps to identify the PETSc version --- DAMASK_prerequisites.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/DAMASK_prerequisites.sh b/DAMASK_prerequisites.sh index 12dd9bd07..3f5e25a71 100755 --- a/DAMASK_prerequisites.sh +++ b/DAMASK_prerequisites.sh @@ -68,6 +68,7 @@ echo PYTHONPATH: $PYTHONPATH echo SHELL: $SHELL echo PETSC_ARCH: $PETSC_ARCH echo PETSC_DIR: $PETSC_DIR +ls $PETSC_DIR/lib echo echo ============================================================================================== echo Python From 58f9fab0902c7504042e4646d4c5f9a4c31d8e1f Mon Sep 17 00:00:00 2001 From: Test User Date: Tue, 24 Apr 2018 06:50:08 +0200 Subject: [PATCH 27/27] [skip ci] updated version information after successful test of v2.0.1-1138-gfcac08c --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 5cf2a8f37..488dd8695 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v2.0.1-1136-ge588fe3 +v2.0.1-1138-gfcac08c