init reporting of constitutive_*.f90 had less/to much spaces, renamed label to LABEL because it is a parameter.

removed debug output of geom_fromEuclideanDistance.py

code/constitutive.f90

@@ -151,8 +151,8 @@ subroutine constitutive_init
  call constitutive_nonlocal_init(fileunit)  
  close(fileunit)
  
- write(6,'(/,a)')   '<<<+-  constitutive init  -+>>>'
- write(6,'(a)')     '$Id$'
+ write(6,'(/,a)')   ' <<<+-  constitutive init  -+>>>'
+ write(6,'(a)')     ' $Id$'
  write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
 #include "compilation_info.f90"
  

code/constitutive_dislotwin.f90

@@ -29,7 +29,7 @@ use prec, only: pReal,pInt
 implicit none
 
 !* Lists of states and physical parameters
-character(len=*), parameter, public :: constitutive_dislotwin_label = 'dislotwin'
+character(len=*), parameter, public :: constitutive_dislotwin_LABEL = 'dislotwin'
 character(len=18), dimension(3), parameter:: constitutive_dislotwin_listBasicSlipStates = (/'rhoEdge     ', &
                                                                                             'rhoEdgeDip  ', &
                                                                                             'accshearslip'/)
@@ -164,10 +164,9 @@ integer(pInt) :: section, maxNinstance,mySize=0_pInt,myStructure,maxTotalNslip,m
 character(len=64) tag
 character(len=1024) :: line = ''                                                                   ! to start initialized
  
-write(6,*)
-write(6,*) '<<<+-  constitutive_',trim(constitutive_dislotwin_label),' init  -+>>>'
-write(6,*) '$Id$'
-write(6,'(a16,a)')   ' Current time : ',IO_timeStamp()
+ write(6,'(/,a)')   ' <<<+-  constitutive_'//trim(constitutive_dislotwin_LABEL)//' init  -+>>>'
+ write(6,'(a)')     ' $Id$'
+ write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
 #include "compilation_info.f90"
 
 maxNinstance = int(count(phase_plasticity == constitutive_dislotwin_label),pInt)

code/constitutive_j2.f90

@@ -46,7 +46,7 @@ module constitutive_j2
  
  implicit none
  private
- character (len=*), parameter, public :: constitutive_j2_label = 'j2'
+ character (len=*), parameter, public :: constitutive_j2_LABEL = 'j2'
  
  integer(pInt),   dimension(:), allocatable, public :: &
    constitutive_j2_sizeDotState, &
@@ -134,10 +134,9 @@ subroutine constitutive_j2_init(myFile)
  character(len=64)   :: tag
  character(len=1024) :: line = ''                                                                   ! to start initialized
 
- write(6,*)
- write(6,*) '<<<+-  constitutive_',trim(constitutive_j2_label),' init  -+>>>'
- write(6,*) '$Id$'
- write(6,'(a16,a)')   ' Current time : ',IO_timeStamp()
+ write(6,'(/,a)')   ' <<<+-  constitutive_'//trim(constitutive_j2_LABEL)//' init  -+>>>'
+ write(6,'(a)')     ' $Id$'
+ write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
 #include "compilation_info.f90"
  
  maxNinstance = int(count(phase_plasticity == constitutive_j2_label),pInt)

code/constitutive_none.f90

@@ -30,7 +30,7 @@ module constitutive_none
  
  implicit none
  private
- character (len=*), parameter, public :: constitutive_none_label = 'none'
+ character (len=*), parameter, public :: constitutive_none_LABEL = 'none'
  
  integer(pInt),   dimension(:), allocatable, public :: &
    constitutive_none_sizeDotState, &
@@ -88,14 +88,14 @@ subroutine constitutive_none_init(myFile)
  implicit none
  integer(pInt), intent(in) :: myFile
  
- integer(pInt), parameter :: maxNchunks = 7_pInt
- integer(pInt), dimension(1_pInt+2_pInt*maxNchunks) :: positions
+ integer(pInt), parameter :: MAXNCHUNKS = 7_pInt
+ integer(pInt), dimension(1_pInt+2_pInt*MAXNCHUNKS) :: positions
  integer(pInt) :: section = 0_pInt, maxNinstance, i
  character(len=64)   :: tag
  character(len=1024) :: line = ''                                                                   ! to start initialized
  
- write(6,'(/,a)')   '<<<+-  constitutive_',trim(constitutive_none_label),' init  -+>>>'
- write(6,'(a)')     '$Id$'
+ write(6,'(/,a)')   ' <<<+-  constitutive_'//trim(constitutive_none_LABEL)//' init  -+>>>'
+ write(6,'(a)')     ' $Id$'
  write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
 #include "compilation_info.f90"
  
@@ -132,7 +132,7 @@ subroutine constitutive_none_init(myFile)
    endif
    if (section > 0_pInt .and. phase_plasticity(section) == constitutive_none_label) then            ! one of my sections
      i = phase_plasticityInstance(section)                                                          ! which instance of my plasticity is present phase
-     positions = IO_stringPos(line,maxNchunks)
+     positions = IO_stringPos(line,MAXNCHUNKS)
      tag = IO_lc(IO_stringValue(line,positions,1_pInt))                                             ! extract key
      select case(tag)
        case ('plasticity','elasticity')

code/constitutive_phenopowerlaw.f90

@@ -30,7 +30,7 @@ module constitutive_phenopowerlaw
  implicit none
  private
  character (len=*), parameter, public :: &
-   constitutive_phenopowerlaw_label = 'phenopowerlaw'
+   constitutive_phenopowerlaw_LABEL = 'phenopowerlaw'
     
  integer(pInt), dimension(:), allocatable, public :: &
    constitutive_phenopowerlaw_sizeDotState, &
@@ -129,8 +129,8 @@ subroutine constitutive_phenopowerlaw_init(myFile)
 
  implicit none
  integer(pInt), intent(in) :: myFile
- integer(pInt), parameter :: maxNchunks = lattice_maxNinteraction + 1_pInt
- integer(pInt), dimension(1+2*maxNchunks) :: positions
+ integer(pInt), parameter :: MAXNCHUNKS = lattice_maxNinteraction + 1_pInt
+ integer(pInt), dimension(1+2*MAXNCHUNKS) :: positions
  integer(pInt), dimension(6) :: configNchunks
  integer(pInt) :: section, maxNinstance, i,j,k, f,o, &
                   Nchunks_SlipSlip, Nchunks_SlipTwin, Nchunks_TwinSlip, Nchunks_TwinTwin, &
@@ -139,10 +139,9 @@ subroutine constitutive_phenopowerlaw_init(myFile)
  character(len=64)   :: tag
  character(len=1024) :: line = ''                                                                   ! to start initialized
  
- write(6,*)
- write(6,*) '<<<+-  constitutive_',trim(constitutive_phenopowerlaw_label),' init  -+>>>'
- write(6,*) '$Id$'
- write(6,'(a16,a)')   ' Current time : ',IO_timeStamp()
+ write(6,'(/,a)')   ' <<<+-  constitutive_'//trim(constitutive_phenopowerlaw_LABEL)//' init  -+>>>'
+ write(6,'(a)')     ' $Id$'
+ write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
 #include "compilation_info.f90"
  
  maxNinstance = int(count(phase_plasticity == constitutive_phenopowerlaw_label),pInt)
@@ -256,7 +255,7 @@ subroutine constitutive_phenopowerlaw_init(myFile)
    endif
    if (section > 0_pInt .and. phase_plasticity(section) == constitutive_phenopowerlaw_label) then   ! one of my sections
      i = phase_plasticityInstance(section)                                                          ! which instance of my plasticity is present phase
-     positions = IO_stringPos(line,maxNchunks)
+     positions = IO_stringPos(line,MAXNCHUNKS)
      tag = IO_lc(IO_stringValue(line,positions,1_pInt))                                             ! extract key
      select case(tag)
        case ('plasticity','elasticity')

code/constitutive_titanmod.f90

@@ -52,7 +52,7 @@ module constitutive_titanmod
 implicit none
 !* Lists of states and physical parameters
 character(len=*), parameter, public :: &
-  constitutive_titanmod_label = 'titanmod'
+  constitutive_titanmod_LABEL = 'titanmod'
 character(len=18), dimension(3), parameter :: &
   constitutive_titanmod_listBasicSlipStates = ['rho_edge    ', &
                                                 'rho_screw   ', &
@@ -255,10 +255,9 @@ integer :: maxNinstance !no pInt
 character(len=64)   :: tag
 character(len=1024) :: line = ''                                                                   ! to start initialized
  
-write(6,*)
-write(6,*) '<<<+-  constitutive_',trim(constitutive_titanmod_label),' init  -+>>>'
-write(6,*) '$Id$'
-write(6,'(a16,a)')   ' Current time : ',IO_timeStamp()
+ write(6,'(/,a)')   ' <<<+-  constitutive_'//trim(constitutive_titanmod_LABEL)//' init  -+>>>'
+ write(6,'(a)')     ' $Id$'
+ write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
 #include "compilation_info.f90"
 
 maxNinstance = count(phase_plasticity == constitutive_titanmod_label)

processing/pre/geom_fromEuclideanDistance.py

@@ -140,7 +140,6 @@ for i,feature in enumerate(features):
         feature_list.append(i)                                                                      # remember valid features
         break
 
-print feature_list
 #--- setup file handles ---------------------------------------------------------------------------  
 files = []
 if filenames == []:
@@ -150,7 +149,6 @@ if filenames == []:
                 'croak':sys.stderr,
                })
 else:
-  print [string.split(''.join((features[feature]['names'])),sep='(')[0] for feature in feature_list]
   for name in filenames:
     if os.path.exists(name):
       files.append({'name':name,