diff --git a/code/CPFEM.f90 b/code/CPFEM.f90 index 9f3ffb4c6..4286791ba 100644 --- a/code/CPFEM.f90 +++ b/code/CPFEM.f90 @@ -121,7 +121,8 @@ subroutine CPFEM_init debug_levelBasic, & debug_levelExtensive use IO, only: IO_read_jobBinaryFile,& - IO_read_jobBinaryIntFile + IO_read_jobBinaryIntFile, & + IO_timeStamp use FEsolving, only: parallelExecution, & symmetricSolver, & restartRead, & @@ -209,6 +210,7 @@ subroutine CPFEM_init write(6,'(/,a)') '<<<+- CPFEM init -+>>>' write(6,'(a)') '$Id$' + write(6,'(a16,a)') ' Current time : ',IO_timeStamp() #include "compilation_info.f90" if (iand(debug_level(debug_CPFEM), debug_levelBasic) /= 0) then write(6,'(a32,1x,6(i8,1x))') 'CPFEM_cs: ', shape(CPFEM_cs) diff --git a/code/DAMASK_abaqus_exp.f b/code/DAMASK_abaqus_exp.f index 0d0f48c74..b92c74fcb 100644 --- a/code/DAMASK_abaqus_exp.f +++ b/code/DAMASK_abaqus_exp.f @@ -60,9 +60,13 @@ contains !-------------------- subroutine DAMASK_interface_init() !-------------------- + use IO, only: IO_timeStamp + write(6,*) write(6,*) '<<<+- DAMASK_abaqus init -+>>>' write(6,*) '$Id$' + write(6,'(a16,a)') ' Current time : ',IO_timeStamp() +#include "compilation_info.f90" write(6,*) end subroutine DAMASK_interface_init diff --git a/code/DAMASK_abaqus_std.f b/code/DAMASK_abaqus_std.f index 25a86be8b..aded27206 100644 --- a/code/DAMASK_abaqus_std.f +++ b/code/DAMASK_abaqus_std.f @@ -60,9 +60,13 @@ contains !-------------------- subroutine DAMASK_interface_init() !-------------------- + use IO, only: IO_timeStamp + write(6,*) write(6,*) '<<<+- DAMASK_abaqus init -+>>>' write(6,*) '$Id$' + write(6,'(a16,a)') ' Current time : ',IO_timeStamp() +#include "compilation_info.f90" write(6,*) end subroutine DAMASK_interface_init diff --git a/code/DAMASK_marc.f90 b/code/DAMASK_marc.f90 index d8c58989f..f8cd1483e 100644 --- a/code/DAMASK_marc.f90 +++ b/code/DAMASK_marc.f90 @@ -78,12 +78,15 @@ contains subroutine DAMASK_interface_init +use IO, only: IO_timeStamp + implicit none !$OMP CRITICAL (write2out) write(6,*) write(6,*) '<<<+- DAMASK_marc init -+>>>' write(6,*) '$Id$' + write(6,'(a16,a)') ' Current time : ',IO_timeStamp() #include "compilation_info.f90" !$OMP END CRITICAL (write2out) diff --git a/code/DAMASK_spectral_solverAL.f90 b/code/DAMASK_spectral_solverAL.f90 index 305b5800b..d393bf515 100644 --- a/code/DAMASK_spectral_solverAL.f90 +++ b/code/DAMASK_spectral_solverAL.f90 @@ -78,7 +78,8 @@ subroutine AL_init(temperature) use, intrinsic :: iso_fortran_env ! to get compiler_version and compiler_options (at least for gfortran >4.6 at the moment) use IO, only: & IO_read_JobBinaryFile, & - IO_write_JobBinaryFile + IO_write_JobBinaryFile, & + IO_timeStamp use FEsolving, only: & restartInc use DAMASK_interface, only: & @@ -120,6 +121,7 @@ subroutine AL_init(temperature) call Utilities_init() write(6,'(/,a)') ' <<<+- DAMASK_spectral_solverAL init -+>>>' write(6,'(a)') ' $Id: DAMASK_spectral_SolverAL.f90 1654 2012-08-03 09:25:48Z MPIE\m.diehl $' + write(6,'(a16,a)') ' Current time : ',IO_timeStamp() #include "compilation_info.f90" allocate (F_lastInc (3,3, res(1), res(2),res(3)), source = 0.0_pReal) diff --git a/code/DAMASK_spectral_solverBasic.f90 b/code/DAMASK_spectral_solverBasic.f90 index 5834d506d..dbfb26118 100644 --- a/code/DAMASK_spectral_solverBasic.f90 +++ b/code/DAMASK_spectral_solverBasic.f90 @@ -49,7 +49,8 @@ subroutine basic_init(temperature) use IO, only: & IO_read_JobBinaryFile, & IO_write_JobBinaryFile, & - IO_intOut + IO_intOut, & + IO_timeStamp use FEsolving, only: & restartInc use DAMASK_interface, only: & @@ -82,6 +83,7 @@ subroutine basic_init(temperature) call Utilities_Init() write(6,'(/,a)') ' <<<+- DAMASK_spectral_solverBasic init -+>>>' write(6,'(a)') ' $Id$' + write(6,'(a16,a)') ' Current time : ',IO_timeStamp() #include "compilation_info.f90" write(6,'(a,3(f12.5)/)') ' scaledDim x y z:', scaledDim diff --git a/code/DAMASK_spectral_solverBasicPETSc.f90 b/code/DAMASK_spectral_solverBasicPETSc.f90 index 28c3bf25b..e7f8c19a6 100644 --- a/code/DAMASK_spectral_solverBasicPETSc.f90 +++ b/code/DAMASK_spectral_solverBasicPETSc.f90 @@ -76,7 +76,8 @@ subroutine basicPETSc_init(temperature) use, intrinsic :: iso_fortran_env ! to get compiler_version and compiler_options (at least for gfortran >4.6 at the moment) use IO, only: & IO_read_JobBinaryFile, & - IO_write_JobBinaryFile + IO_write_JobBinaryFile, & + IO_timeStamp use FEsolving, only: & restartInc use DAMASK_interface, only: & @@ -117,6 +118,7 @@ subroutine basicPETSc_init(temperature) call Utilities_init() write(6,'(/,a)') ' <<<+- DAMASK_spectral_solverBasicPETSc init -+>>>' write(6,'(a)') ' $Id: DAMASK_spectral_SolverBasicPETSC.f90 1654 2012-08-03 09:25:48Z MPIE\m.diehl $' + write(6,'(a16,a)') ' Current time : ',IO_timeStamp() #include "compilation_info.f90" write(6,'(a,3(f12.5)/)') ' scaledDim x y z:', scaledDim diff --git a/code/DAMASK_spectral_utilities.f90 b/code/DAMASK_spectral_utilities.f90 index 845f6071a..4b19446fc 100644 --- a/code/DAMASK_spectral_utilities.f90 +++ b/code/DAMASK_spectral_utilities.f90 @@ -98,7 +98,8 @@ subroutine utilities_init() use, intrinsic :: iso_fortran_env ! to get compiler_version and compiler_options (at least for gfortran >4.6 at the moment) use IO, only: & IO_error, & - IO_warning + IO_warning, & + IO_timeStamp use numerics, only: & DAMASK_NumThreadsInt, & fftw_planner_flag, & @@ -142,6 +143,7 @@ subroutine utilities_init() divergence !< field cotaining data for FFTW in real and fourier space when debugging divergence (in place) write(6,'(/,a)') ' <<<+- DAMASK_spectral_utilities init -+>>>' write(6,'(a)') ' $Id$' + write(6,'(a16,a)') ' Current time : ',IO_timeStamp() #include "compilation_info.f90" write(6,'(a)') '' flush(6) diff --git a/code/FEsolving.f90 b/code/FEsolving.f90 index 2d56a5770..d0b5e42a0 100644 --- a/code/FEsolving.f90 +++ b/code/FEsolving.f90 @@ -85,7 +85,8 @@ subroutine FE_init IO_open_inputFile, & IO_open_logFile, & #endif - IO_warning + IO_warning, & + IO_timeStamp use DAMASK_interface implicit none @@ -101,6 +102,7 @@ subroutine FE_init write(6,'(/,a)') ' <<<+- FEsolving init -+>>>' write(6,'(a)') ' $Id$' + write(6,'(a16,a)') ' Current time : ',IO_timeStamp() #include "compilation_info.f90" modelName = getSolverJobName() diff --git a/code/IO.f90 b/code/IO.f90 index 41edced28..79c5eb92f 100644 --- a/code/IO.f90 +++ b/code/IO.f90 @@ -66,7 +66,8 @@ module IO IO_continuousIntValues, & IO_error, & IO_warning, & - IO_intOut + IO_intOut, & + IO_timeStamp #ifndef Spectral public :: & IO_open_inputFile, & @@ -99,8 +100,9 @@ contains subroutine IO_init use, intrinsic :: iso_fortran_env ! to get compiler_version and compiler_options (at least for gfortran 4.6 at the moment) - write(6,'(/,a)') ' <<<+- IO init -+>>>' - write(6,'(a)') ' $Id$' + write(6,'(/,a)') ' <<<+- IO init -+>>>' + write(6,'(a)') ' $Id$' + write(6,'(a16,a)') ' Current time : ',IO_timeStamp() #include "compilation_info.f90" end subroutine IO_init @@ -1384,6 +1386,20 @@ pure function IO_intOut(intToPrint) end function IO_intOut +!-------------------------------------------------------------------------------------------------- +!> @brief returns time stamp +!-------------------------------------------------------------------------------------------------- +function IO_timeStamp() + implicit none + character(len=10) :: IO_timeStamp + integer(pInt), dimension(8) :: values + + call DATE_AND_TIME(VALUES=values) + write(IO_timeStamp,'(i2.2,a1,i2.2,a1,i2.2)') values(5),':',values(6),':',values(7) + +end function IO_timeStamp + + !-------------------------------------------------------------------------------------------------- !> @brief write error statements to standard out and terminate the Marc/spectral run with exit #9xxx !> in ABAQUS either time step is reduced or execution terminated diff --git a/code/constitutive.f90 b/code/constitutive.f90 index 9f48535d5..50fe98c2a 100644 --- a/code/constitutive.f90 +++ b/code/constitutive.f90 @@ -92,7 +92,8 @@ subroutine constitutive_init IO_open_file, & IO_open_jobFile_stat, & IO_write_jobFile, & - IO_write_jobBinaryIntFile + IO_write_jobBinaryIntFile, & + IO_timeStamp use mesh, only: & mesh_maxNips, & mesh_NcpElems, & @@ -155,6 +156,7 @@ subroutine constitutive_init write(6,*) write(6,*) '<<<+- constitutive init -+>>>' write(6,*) '$Id$' + write(6,'(a16,a)') ' Current time : ',IO_timeStamp() #include "compilation_info.f90" !-------------------------------------------------------------------------------------------------- diff --git a/code/constitutive_dislotwin.f90 b/code/constitutive_dislotwin.f90 index 8fc2bc6b5..fdea5dc8e 100644 --- a/code/constitutive_dislotwin.f90 +++ b/code/constitutive_dislotwin.f90 @@ -155,6 +155,7 @@ character(len=1024) :: line = '' write(6,*) write(6,*) '<<<+- constitutive_',trim(constitutive_dislotwin_label),' init -+>>>' write(6,*) '$Id$' +write(6,'(a16,a)') ' Current time : ',IO_timeStamp() #include "compilation_info.f90" maxNinstance = int(count(phase_plasticity == constitutive_dislotwin_label),pInt) diff --git a/code/constitutive_j2.f90 b/code/constitutive_j2.f90 index bd9eb991e..f92d827a3 100644 --- a/code/constitutive_j2.f90 +++ b/code/constitutive_j2.f90 @@ -115,7 +115,8 @@ subroutine constitutive_j2_init(myFile) IO_stringPos, & IO_stringValue, & IO_floatValue, & - IO_error + IO_error, & + IO_timeStamp use material use debug, only: & debug_level, & @@ -136,6 +137,7 @@ subroutine constitutive_j2_init(myFile) write(6,*) write(6,*) '<<<+- constitutive_',trim(constitutive_j2_label),' init -+>>>' write(6,*) '$Id$' + write(6,'(a16,a)') ' Current time : ',IO_timeStamp() #include "compilation_info.f90" maxNinstance = int(count(phase_plasticity == constitutive_j2_label),pInt) diff --git a/code/constitutive_none.f90 b/code/constitutive_none.f90 index dddb99448..f7cc73741 100644 --- a/code/constitutive_none.f90 +++ b/code/constitutive_none.f90 @@ -85,7 +85,8 @@ subroutine constitutive_none_init(myFile) IO_stringPos, & IO_stringValue, & IO_floatValue, & - IO_error + IO_error, & + IO_timeStamp use material use debug, only: & debug_level, & @@ -105,6 +106,7 @@ subroutine constitutive_none_init(myFile) write(6,*) write(6,*) '<<<+- constitutive_',trim(constitutive_none_label),' init -+>>>' write(6,*) '$Id$' + write(6,'(a16,a)') ' Current time : ',IO_timeStamp() #include "compilation_info.f90" maxNinstance = int(count(phase_plasticity == constitutive_none_label),pInt) diff --git a/code/constitutive_nonlocal.f90 b/code/constitutive_nonlocal.f90 index 497689b36..514fd6025 100644 --- a/code/constitutive_nonlocal.f90 +++ b/code/constitutive_nonlocal.f90 @@ -217,7 +217,8 @@ use IO, only: IO_lc, & IO_stringValue, & IO_floatValue, & IO_intValue, & - IO_error + IO_error, & + IO_timeStamp use debug, only: debug_level, & debug_constitutive, & debug_levelBasic @@ -262,6 +263,7 @@ character(len=1024) :: line = '' ! to start initi write(6,*) write(6,*) '<<<+- constitutive_',trim(constitutive_nonlocal_label),' init -+>>>' write(6,*) '$Id$' + write(6,'(a16,a)') ' Current time : ',IO_timeStamp() #include "compilation_info.f90" maxNinstance = int(count(phase_plasticity == constitutive_nonlocal_label),pInt) diff --git a/code/constitutive_phenopowerlaw.f90 b/code/constitutive_phenopowerlaw.f90 index ac1dd35f0..71c11aeb6 100644 --- a/code/constitutive_phenopowerlaw.f90 +++ b/code/constitutive_phenopowerlaw.f90 @@ -142,6 +142,7 @@ subroutine constitutive_phenopowerlaw_init(myFile) write(6,*) write(6,*) '<<<+- constitutive_',trim(constitutive_phenopowerlaw_label),' init -+>>>' write(6,*) '$Id$' + write(6,'(a16,a)') ' Current time : ',IO_timeStamp() #include "compilation_info.f90" maxNinstance = int(count(phase_plasticity == constitutive_phenopowerlaw_label),pInt) diff --git a/code/constitutive_titanmod.f90 b/code/constitutive_titanmod.f90 index 7af9c4ab8..25354bc15 100644 --- a/code/constitutive_titanmod.f90 +++ b/code/constitutive_titanmod.f90 @@ -258,6 +258,7 @@ character(len=1024) :: line = '' write(6,*) write(6,*) '<<<+- constitutive_',trim(constitutive_titanmod_label),' init -+>>>' write(6,*) '$Id$' +write(6,'(a16,a)') ' Current time : ',IO_timeStamp() #include "compilation_info.f90" maxNinstance = count(phase_plasticity == constitutive_titanmod_label) diff --git a/code/crystallite.f90 b/code/crystallite.f90 index 3c8e68c04..898d4642b 100644 --- a/code/crystallite.f90 +++ b/code/crystallite.f90 @@ -180,6 +180,7 @@ subroutine crystallite_init(Temperature) write(6,'(/,a)') ' <<<+- crystallite init -+>>>' write(6,'(a)') ' $Id$' + write(6,'(a16,a)') ' Current time : ',IO_timeStamp() #include "compilation_info.f90" diff --git a/code/debug.f90 b/code/debug.f90 index b499dd97c..094ab054c 100644 --- a/code/debug.f90 +++ b/code/debug.f90 @@ -132,7 +132,8 @@ subroutine debug_init IO_stringValue, & IO_lc, & IO_floatValue, & - IO_intValue + IO_intValue, & + IO_timeStamp implicit none integer(pInt), parameter :: fileunit = 300_pInt @@ -145,6 +146,7 @@ subroutine debug_init write(6,'(/,a)') ' <<<+- debug init -+>>>' write(6,'(a)') ' $Id$' + write(6,'(a16,a)') ' Current time : ',IO_timeStamp() #include "compilation_info.f90" if (allocated(debug_StressLoopDistribution)) & diff --git a/code/homogenization.f90 b/code/homogenization.f90 index dbf3eaa02..567d4a8f6 100644 --- a/code/homogenization.f90 +++ b/code/homogenization.f90 @@ -104,7 +104,8 @@ subroutine homogenization_init(Temperature) IO_open_file, & IO_open_jobFile_stat, & IO_write_jobFile, & - IO_write_jobBinaryIntFile + IO_write_jobBinaryIntFile, & + IO_timeStamp use mesh, only: & mesh_maxNips, & mesh_NcpElems, & @@ -250,6 +251,7 @@ subroutine homogenization_init(Temperature) write(6,'(/,a)') ' <<<+- homogenization init -+>>>' write(6,'(a)') ' $Id$' + write(6,'(a16,a)') ' Current time : ',IO_timeStamp() #include "compilation_info.f90" if (iand(debug_level(debug_homogenization), debug_levelBasic) /= 0_pInt) then write(6,'(a32,1x,7(i8,1x))') 'homogenization_state0: ', shape(homogenization_state0) diff --git a/code/homogenization_RGC.f90 b/code/homogenization_RGC.f90 index c88eb02c9..6f9f2bd75 100644 --- a/code/homogenization_RGC.f90 +++ b/code/homogenization_RGC.f90 @@ -113,6 +113,7 @@ subroutine homogenization_RGC_init(myFile) write(6,'(/,3a)') ' <<<+- homogenization_',trim(homogenization_RGC_label),' init -+>>>' write(6,'(a)') ' $Id$' + write(6,'(a16,a)') ' Current time : ',IO_timeStamp() #include "compilation_info.f90" maxNinstance = int(count(homogenization_type == homogenization_RGC_label),pInt) diff --git a/code/homogenization_isostrain.f90 b/code/homogenization_isostrain.f90 index a377c1d2f..6609d0649 100644 --- a/code/homogenization_isostrain.f90 +++ b/code/homogenization_isostrain.f90 @@ -74,6 +74,7 @@ subroutine homogenization_isostrain_init(myFile) write(6,*) write(6,*) '<<<+- homogenization_',trim(homogenization_isostrain_label),' init -+>>>' write(6,*) '$Id$' + write(6,'(a16,a)') ' Current time : ',IO_timeStamp() #include "compilation_info.f90" diff --git a/code/lattice.f90 b/code/lattice.f90 index dff8f04f0..4f487221a 100644 --- a/code/lattice.f90 +++ b/code/lattice.f90 @@ -806,7 +806,8 @@ subroutine lattice_init IO_open_jobFile_stat, & IO_countSections, & IO_countTagInPart, & - IO_error + IO_error, & + IO_timeStamp use material, only: material_configfile, & material_localFileExt, & material_partPhase @@ -822,6 +823,7 @@ subroutine lattice_init write(6,*) write(6,*) '<<<+- lattice init -+>>>' write(6,*) '$Id$' + write(6,'(a16,a)') ' Current time : ',IO_timeStamp() #include "compilation_info.f90" !$OMP END CRITICAL (write2out) diff --git a/code/material.f90 b/code/material.f90 index c19ba698c..79e82a992 100644 --- a/code/material.f90 +++ b/code/material.f90 @@ -142,7 +142,8 @@ subroutine material_init use IO, only: & IO_error, & IO_open_file, & - IO_open_jobFile_stat + IO_open_jobFile_stat, & + IO_timeStamp use debug, only: & debug_level, & debug_material, & @@ -157,6 +158,7 @@ subroutine material_init write(6,'(/,a)') ' <<<+- material init -+>>>' write(6,'(a)') ' $Id$' + write(6,'(a16,a)') ' Current time : ',IO_timeStamp() #include "compilation_info.f90" diff --git a/code/math.f90 b/code/math.f90 index c970adbce..ea8feb8c0 100644 --- a/code/math.f90 +++ b/code/math.f90 @@ -258,7 +258,7 @@ subroutine math_init use, intrinsic :: iso_fortran_env ! to get compiler_version and compiler_options (at least for gfortran 4.6 at the moment) use prec, only: tol_math_check use numerics, only: fixedSeed - use IO, only: IO_error + use IO, only: IO_error, IO_timeStamp implicit none integer(pInt) :: i @@ -273,6 +273,7 @@ subroutine math_init write(6,'(/,a)') ' <<<+- math init -+>>>' write(6,'(a)') ' $Id$' + write(6,'(a16,a)') ' Current time : ',IO_timeStamp() #include "compilation_info.f90" call random_seed(size=randSize) diff --git a/code/mesh.f90 b/code/mesh.f90 index 165088212..c0398acab 100644 --- a/code/mesh.f90 +++ b/code/mesh.f90 @@ -404,6 +404,7 @@ subroutine mesh_init(ip,el) use DAMASK_interface use, intrinsic :: iso_fortran_env ! to get compiler_version and compiler_options (at least for gfortran 4.6 at the moment) use IO, only: & + IO_timeStamp, & #ifdef Abaqus IO_abaqus_hasNoPart, & #endif @@ -430,6 +431,7 @@ subroutine mesh_init(ip,el) write(6,'(/,a)') ' <<<+- mesh init -+>>>' write(6,'(a)') ' $Id$' + write(6,'(a16,a)') ' Current time : ',IO_timeStamp() #include "compilation_info.f90" if (allocated(mesh_mapFEtoCPelem)) deallocate(mesh_mapFEtoCPelem) diff --git a/code/numerics.f90 b/code/numerics.f90 index a5895045b..a26fcfff6 100644 --- a/code/numerics.f90 +++ b/code/numerics.f90 @@ -135,7 +135,8 @@ subroutine numerics_init IO_lc, & IO_floatValue, & IO_intValue, & - IO_warning + IO_warning, & + IO_timeStamp #ifndef Marc !$ use OMP_LIB, only: omp_set_num_threads ! Use the standard conforming module file for omp if not using MSC.Marc @@ -154,6 +155,7 @@ subroutine numerics_init write(6,'(/,a)') ' <<<+- numerics init -+>>>' write(6,'(a)') ' $Id$' + write(6,'(a16,a)') ' Current time : ',IO_timeStamp() #include "compilation_info.f90" !$ call GET_ENVIRONMENT_VARIABLE(NAME='DAMASK_NUM_THREADS',VALUE=DAMASK_NumThreadsString,STATUS=gotDAMASK_NUM_THREADS) ! get environment variable DAMASK_NUM_THREADS...