From 2029b23f9807ff7b86b3d96d62c805aeb92c1abb Mon Sep 17 00:00:00 2001 From: Franz Roters Date: Mon, 31 Aug 2009 15:09:15 +0000 Subject: [PATCH] added version information to all files do NOT edit text like this: $Id: constitutive_phenopowerlaw.f90 406 2009-08-31 14:13:10Z MPIE\f.roters $ --- code/CPFEM.f90 | 5 +++++ code/FEsolving.f90 | 3 ++- code/IO.f90 | 13 +++++++++++-- code/constitutive.f90 | 3 ++- code/constitutive_dislobased.f90 | 3 ++- code/constitutive_j2.f90 | 3 ++- code/constitutive_nonlocal.f90 | 3 ++- code/crystallite.f90 | 3 ++- code/debug.f90 | 3 ++- code/homogenization.f90 | 3 ++- code/homogenization_RGC.f90 | 7 ++++++- code/homogenization_isostrain.f90 | 7 ++++++- code/lattice.f90 | 3 ++- code/makeMe.py | 2 +- code/material.config | 2 ++ code/material.f90 | 3 ++- code/math.f90 | 7 ++++++- code/mesh.f90 | 3 ++- code/mpie_cpfem_marc.f90 | 10 ++++++++++ code/numerics.config | 2 +- code/numerics.f90 | 2 ++ code/prec.f90 | 13 ++++++++++++- code/todo.txt | 1 + 23 files changed, 85 insertions(+), 19 deletions(-) diff --git a/code/CPFEM.f90 b/code/CPFEM.f90 index 6a3457a64..f8e71e3ec 100644 --- a/code/CPFEM.f90 +++ b/code/CPFEM.f90 @@ -1,3 +1,4 @@ +!* $Id$ !############################################################## MODULE CPFEM !############################################################## @@ -42,6 +43,7 @@ subroutine CPFEM_init() !$OMP CRITICAL (write2out) write(6,*) write(6,*) '<<<+- cpfem init -+>>>' + write(6,*) '$Id$' write(6,*) write(6,'(a32,x,6(i5,x))') 'CPFEM_cs: ', shape(CPFEM_cs) write(6,'(a32,x,6(i5,x))') 'CPFEM_dcsdE: ', shape(CPFEM_dcsdE) @@ -165,6 +167,8 @@ subroutine CPFEM_general(mode, ffn, ffn1, Temperature, dt, element, IP, cauchySt ! initialization step (three dimensional stress state check missing?) if (.not. CPFEM_init_done) then + call prec_init() + call IO_init() call numerics_init() call debug_init() call math_init() @@ -176,6 +180,7 @@ subroutine CPFEM_general(mode, ffn, ffn1, Temperature, dt, element, IP, cauchySt call crystallite_init(Temperature) ! (have to) use temperature of first IP for whole model call homogenization_init(Temperature) call CPFEM_init() + call mpie_cpfem_init() CPFEM_init_done = .true. endif diff --git a/code/FEsolving.f90 b/code/FEsolving.f90 index 4a464d530..32ce3a40b 100644 --- a/code/FEsolving.f90 +++ b/code/FEsolving.f90 @@ -1,4 +1,4 @@ - +!* 'Id' !############################################################## MODULE FEsolving !############################################################## @@ -34,6 +34,7 @@ write(6,*) write(6,*) '<<<+- FEsolving init -+>>>' + write(6,*) '$Id$' write(6,*) if (IO_open_inputFile(fileunit)) then diff --git a/code/IO.f90 b/code/IO.f90 index f953c2193..c0a4b3678 100644 --- a/code/IO.f90 +++ b/code/IO.f90 @@ -1,4 +1,4 @@ - +!* $Id$ !############################################################## MODULE IO !############################################################## @@ -24,7 +24,16 @@ ! subroutine IO_warning(ID) !--------------------------- - +!******************************************************************** +! output version number +!******************************************************************** +subroutine IO_init + write(6,*) + write(6,*) '<<<+- IO init -+>>>' + write(6,*) '$Id$' + write(6,*) + return +end subroutine !******************************************************************** ! open existing file to given unit diff --git a/code/constitutive.f90 b/code/constitutive.f90 index befb3d2a3..ee3af4fdb 100644 --- a/code/constitutive.f90 +++ b/code/constitutive.f90 @@ -1,4 +1,4 @@ - +!* $Id$ !************************************ !* Module: CONSTITUTIVE * !************************************ @@ -174,6 +174,7 @@ subroutine constitutive_init() write(6,*) write(6,*) '<<<+- constitutive init -+>>>' + write(6,*) '$Id$' write(6,*) write(6,'(a32,x,7(i5,x))') 'constitutive_state0: ', shape(constitutive_state0) write(6,'(a32,x,7(i5,x))') 'constitutive_partionedState0: ', shape(constitutive_partionedState0) diff --git a/code/constitutive_dislobased.f90 b/code/constitutive_dislobased.f90 index 8bee0dd4d..4041d507b 100644 --- a/code/constitutive_dislobased.f90 +++ b/code/constitutive_dislobased.f90 @@ -1,4 +1,4 @@ - +!* $Id$ !************************************ !* Module: CONSTITUTIVE * !************************************ @@ -156,6 +156,7 @@ subroutine constitutive_dislobased_init(file) write(6,*) write(6,'(a20,a20,a12)') '<<<+- constitutive_',constitutive_dislobased_label,' init -+>>>' + write(6,*) '$Id$' write(6,*) maxNinstance = count(phase_constitution == constitutive_dislobased_label) diff --git a/code/constitutive_j2.f90 b/code/constitutive_j2.f90 index 19366e136..978c499e0 100644 --- a/code/constitutive_j2.f90 +++ b/code/constitutive_j2.f90 @@ -1,4 +1,4 @@ - +!* $Id$ !***************************************************** !* Module: CONSTITUTIVE_J2 * !***************************************************** @@ -76,6 +76,7 @@ subroutine constitutive_j2_init(file) write(6,*) write(6,'(a20,a20,a12)') '<<<+- constitutive_',constitutive_j2_label,' init -+>>>' + write(6,*) '$Id$' write(6,*) maxNinstance = count(phase_constitution == constitutive_j2_label) diff --git a/code/constitutive_nonlocal.f90 b/code/constitutive_nonlocal.f90 index 207c4a5ea..10e40d49d 100644 --- a/code/constitutive_nonlocal.f90 +++ b/code/constitutive_nonlocal.f90 @@ -1,4 +1,4 @@ - +!* $Id$ !************************************ !* Module: CONSTITUTIVE_NONLOCAL * !************************************ @@ -158,6 +158,7 @@ character(len=1024) line write(6,*) write(6,'(a20,a20,a12)') '<<<+- constitutive_',constitutive_nonlocal_label,' init -+>>>' +write(6,*) '$Id$' write(6,*) maxNinstance = count(phase_constitution == constitutive_nonlocal_label) diff --git a/code/crystallite.f90 b/code/crystallite.f90 index a55a8f0b0..41a5f1234 100644 --- a/code/crystallite.f90 +++ b/code/crystallite.f90 @@ -1,4 +1,4 @@ - +!* $Id$ !*************************************** !* Module: CRYSTALLITE * !*************************************** @@ -165,6 +165,7 @@ subroutine crystallite_init(Temperature) !$OMP CRITICAL (write2out) write(6,*) write(6,*) '<<<+- crystallite init -+>>>' + write(6,*) '$Id$' write(6,*) write(6,'(a35,x,7(i5,x))') 'crystallite_Nresults: ', crystallite_Nresults write(6,*) diff --git a/code/debug.f90 b/code/debug.f90 index 652689dcf..ce30d4d33 100644 --- a/code/debug.f90 +++ b/code/debug.f90 @@ -1,4 +1,4 @@ - +!* $Id$ !############################################################## MODULE debug !############################################################## @@ -34,6 +34,7 @@ subroutine debug_init() write(6,*) write(6,*) '<<<+- debug init -+>>>' + write(6,*) '$Id$' write(6,*) allocate(debug_StressLoopDistribution(nStress)) ; debug_StressLoopDistribution = 0_pInt diff --git a/code/homogenization.f90 b/code/homogenization.f90 index 036c794ee..05e47b936 100644 --- a/code/homogenization.f90 +++ b/code/homogenization.f90 @@ -1,4 +1,4 @@ - +!* $Id$ !*************************************** !* Module: HOMOGENIZATION * !*************************************** @@ -139,6 +139,7 @@ subroutine homogenization_init(Temperature) !$OMP CRITICAL (write2out) write(6,*) write(6,*) '<<<+- homogenization init -+>>>' + write(6,*) '$Id$' write(6,*) write(6,'(a32,x,7(i5,x))') 'homogenization_state0: ', shape(homogenization_state0) write(6,'(a32,x,7(i5,x))') 'homogenization_subState0: ', shape(homogenization_subState0) diff --git a/code/homogenization_RGC.f90 b/code/homogenization_RGC.f90 index 081a40795..fcc764359 100644 --- a/code/homogenization_RGC.f90 +++ b/code/homogenization_RGC.f90 @@ -1,4 +1,4 @@ - +!* $Id$ !***************************************************** !* Module: HOMOGENIZATION_RGC * !***************************************************** @@ -55,6 +55,11 @@ subroutine homogenization_RGC_init(& character(len=64) tag character(len=1024) line + write(6,*) + write(6,'(a20,a20,a12)') '<<<+- homogenization',homogenization_RGC_label,' init -+>>>' + write(6,*) '$Id$' + write(6,*) + maxNinstance = count(homogenization_type == homogenization_RGC_label) if (maxNinstance == 0) return diff --git a/code/homogenization_isostrain.f90 b/code/homogenization_isostrain.f90 index 35362cb36..26f9da3e7 100644 --- a/code/homogenization_isostrain.f90 +++ b/code/homogenization_isostrain.f90 @@ -1,4 +1,4 @@ - +!* $Id$ !***************************************************** !* Module: HOMOGENIZATION_ISOSTRAIN * !***************************************************** @@ -53,6 +53,11 @@ subroutine homogenization_isostrain_init(& character(len=64) tag character(len=1024) line + write(6,*) + write(6,'(a20,a20,a12)') '<<<+- homogenization',homogenization_isostrain_label,' init -+>>>' + write(6,*) '$Id$' + write(6,*) + maxNinstance = count(homogenization_type == homogenization_isostrain_label) if (maxNinstance == 0) return diff --git a/code/lattice.f90 b/code/lattice.f90 index 5fcfb4d83..f018edd4e 100644 --- a/code/lattice.f90 +++ b/code/lattice.f90 @@ -1,4 +1,4 @@ - +!* $Id$ !************************************ !* Module: LATTICE * !************************************ @@ -654,6 +654,7 @@ subroutine lattice_init() write(6,*) write(6,*) '<<<+- lattice init -+>>>' + write(6,*) '$Id$' write(6,*) if(.not. IO_open_file(fileunit,material_configFile)) call IO_error (100) ! corrupt config file diff --git a/code/makeMe.py b/code/makeMe.py index d11af349c..7b41433ce 100755 --- a/code/makeMe.py +++ b/code/makeMe.py @@ -1,5 +1,5 @@ #!/usr/bin/env python - +# $Id$ import os,sys sys.argv += ['' for i in range(2 - len(sys.argv))] diff --git a/code/material.config b/code/material.config index 2dc17bbda..a47ea938b 100644 --- a/code/material.config +++ b/code/material.config @@ -1,4 +1,6 @@ ##################### +# $Id$ +##################### ##################### diff --git a/code/material.f90 b/code/material.f90 index f3fac60c7..b0375d9e4 100644 --- a/code/material.f90 +++ b/code/material.f90 @@ -1,4 +1,4 @@ - +!* $Id$ !************************************ !* Module: MATERIAL * !************************************ @@ -77,6 +77,7 @@ subroutine material_init() write(6,*) write(6,*) '<<<+- material init -+>>>' + write(6,*) '$Id$' write(6,*) if(.not. IO_open_file(fileunit,material_configFile)) call IO_error (100) ! corrupt config file diff --git a/code/math.f90 b/code/math.f90 index 0dfae69c7..65b506dbb 100644 --- a/code/math.f90 +++ b/code/math.f90 @@ -1,4 +1,4 @@ - +!* $Id$ !############################################################## MODULE math !############################################################## @@ -219,6 +219,11 @@ real(pReal), dimension(132,3), parameter :: sym = & integer (pInt), dimension(1) :: randInit integer (pInt) seed + write(6,*) + write(6,*) '<<<+- math init -+>>>' + write(6,*) '$Id$' + write(6,*) + if (fixedSeed > 0_pInt) then randInit = fixedSeed call random_seed(put=randInit) diff --git a/code/mesh.f90 b/code/mesh.f90 index b0d3569fc..1ff6b4b51 100644 --- a/code/mesh.f90 +++ b/code/mesh.f90 @@ -1,4 +1,4 @@ - +!* $Id$ !############################################################## MODULE mesh !############################################################## @@ -195,6 +195,7 @@ write(6,*) write(6,*) '<<<+- mesh init -+>>>' + write(6,*) '$Id$' write(6,*) mesh_Nelems = 0_pInt diff --git a/code/mpie_cpfem_marc.f90 b/code/mpie_cpfem_marc.f90 index 3623f201f..63f6e1354 100644 --- a/code/mpie_cpfem_marc.f90 +++ b/code/mpie_cpfem_marc.f90 @@ -1,3 +1,4 @@ +!* $Id$ !******************************************************************** ! Material subroutine for MSC.Marc ! @@ -6,6 +7,7 @@ ! L. Hantcherli, ! W.A. Counts ! D.D. Tjahjanto +! C. Kords ! ! MPI fuer Eisenforschung, Duesseldorf ! @@ -34,6 +36,14 @@ ! - creeps: timinc !******************************************************************** ! +subroutine mpie_cpfem_init + write(6,*) + write(6,*) '<<<+- mpie_cpfem init -+>>>' + write(6,*) '$Id$' + write(6,*) + return +end subroutine + include "prec.f90" ! uses nothing else include "IO.f90" ! uses prec include "numerics.f90" ! uses prec, IO diff --git a/code/numerics.config b/code/numerics.config index 537352a62..47d74be97 100644 --- a/code/numerics.config +++ b/code/numerics.config @@ -1,4 +1,4 @@ - +### $Id$ ### ### numerical parameters ### relevantStrain 1.0e-9 # strain increment considered significant diff --git a/code/numerics.f90 b/code/numerics.f90 index 29480fec0..009ba0d07 100644 --- a/code/numerics.f90 +++ b/code/numerics.f90 @@ -1,3 +1,4 @@ +!* $Id$ !############################################################## MODULE numerics !############################################################## @@ -66,6 +67,7 @@ subroutine numerics_init() write(6,*) write(6,*) '<<<+- numerics init -+>>>' + write(6,*) '$Id$' write(6,*) ! initialize all parameters with standard values diff --git a/code/prec.f90 b/code/prec.f90 index 33d1f4d41..7a1e79e5e 100644 --- a/code/prec.f90 +++ b/code/prec.f90 @@ -1,4 +1,4 @@ - +!* $Id$ !############################################################## MODULE prec !############################################################## @@ -14,4 +14,15 @@ real(pReal), dimension(:), pointer :: p end type p_vec +CONTAINS + +subroutine prec_init + write(6,*) + write(6,*) '<<<+- prec init -+>>>' + write(6,*) '$Id$' + write(6,*) + return +end subroutine + + END MODULE prec diff --git a/code/todo.txt b/code/todo.txt index ceec8baf9..8014eef24 100644 --- a/code/todo.txt +++ b/code/todo.txt @@ -1,3 +1,4 @@ +$Id$ Things to be implemented into the code # adopt CPFEM_GIA8.f90 to new scheme, use "select case" to switch between homogenization schemes in CPFEM.f90