223031012
/
DAMASK_EICMD
mirror of https://github.com/achalhp/DAMASK_EICMD.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed writing out of initial configuration for spectral solver in case of ngrains != 1, small formating improvements in other files

This commit is contained in:
Martin Diehl 2013-07-01 06:40:09 +00:00
parent 40ace5c666
commit 6ec57db0c6
4 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/DAMASK_spectral_driver.f90
View File

@ -369,7 +369,7 @@ program DAMASK_spectral_Driver
write(resUnit) 'increments', loadCases%incs ! one entry per currentLoadCase write(resUnit) 'increments', loadCases%incs ! one entry per currentLoadCase
write(resUnit) 'startingIncrement', restartInc - 1_pInt ! start with writing out the previous inc write(resUnit) 'startingIncrement', restartInc - 1_pInt ! start with writing out the previous inc
write(resUnit) 'eoh' ! end of header write(resUnit) 'eoh' ! end of header
write(resUnit) materialpoint_results(1_pInt:materialpoint_sizeResults,1,1_pInt:product(grid)) ! initial (non-deformed or read-in) results write(resUnit) materialpoint_results ! initial (non-deformed or read-in) results
open(newunit=statUnit,file=trim(getSolverWorkingDirectoryName())//trim(getSolverJobName())//& open(newunit=statUnit,file=trim(getSolverWorkingDirectoryName())//trim(getSolverJobName())//&
'.sta',form='FORMATTED',status='REPLACE') '.sta',form='FORMATTED',status='REPLACE')
write(statUnit,'(a)') 'Increment Time CutbackLevel Converged IterationsNeeded' ! statistics file write(statUnit,'(a)') 'Increment Time CutbackLevel Converged IterationsNeeded' ! statistics file

3
code/FEsolving.f90
View File

@ -183,8 +183,7 @@ subroutine FE_init
if (iand(debug_level(debug_FEsolving),debug_levelBasic) /= 0_pInt) then if (iand(debug_level(debug_FEsolving),debug_levelBasic) /= 0_pInt) then
write(6,*) 'restart writing: ', restartWrite write(6,*) 'restart writing: ', restartWrite
write(6,*) 'restart reading: ', restartRead write(6,*) 'restart reading: ', restartRead
if (restartRead) write(6,*) 'restart Job: ', trim(modelName) if (restartRead) write(6,'(a,/)') 'restart Job: '//trim(modelName)
write(6,*)
endif endif
end subroutine FE_init end subroutine FE_init

4
code/homogenization.f90
View File

@ -153,9 +153,7 @@ subroutine homogenization_init(Temperature)
case default case default
knownHomogenization = .false. knownHomogenization = .false.
end select end select
write(fileunit,*) write(fileunit,'(/,a,/)') '['//trim(homogenization_name(p))//']'
write(fileunit,'(a)') '['//trim(homogenization_name(p))//']'
write(fileunit,*)
if (knownHomogenization) then if (knownHomogenization) then
write(fileunit,'(a)') '(type)'//char(9)//trim(homogenization_type(p)) write(fileunit,'(a)') '(type)'//char(9)//trim(homogenization_type(p))
write(fileunit,'(a,i4)') '(ngrains)'//char(9),homogenization_Ngrains(p) write(fileunit,'(a,i4)') '(ngrains)'//char(9),homogenization_Ngrains(p)

14
code/homogenization_isostrain.f90
View File

@ -68,17 +68,15 @@ subroutine homogenization_isostrain_init(myFile)
integer(pInt), dimension(1_pInt+2_pInt*maxNchunks) :: positions integer(pInt), dimension(1_pInt+2_pInt*maxNchunks) :: positions
integer(pInt) section, i, j, output, mySize integer(pInt) section, i, j, output, mySize
integer :: maxNinstance, k ! no pInt (stores a system dependen value from 'count' integer :: maxNinstance, k ! no pInt (stores a system dependen value from 'count'
character(len=65536) :: tag character(len=65536) :: &
character(len=65536) :: line = '' ! to start initialized tag = '', &
line = '' ! to start initialized
write(6,'(/,a)') ' <<<+- homogenization_'//trim(homogenization_isostrain_label)//' init -+>>>'
write(6,*) write(6,'(a)') ' $Id$'
write(6,*) '<<<+- homogenization_',trim(homogenization_isostrain_label),' init -+>>>' write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
write(6,*) '$Id$'
write(6,'(a16,a)') ' Current time : ',IO_timeStamp()
#include "compilation_info.f90" #include "compilation_info.f90"
maxNinstance = count(homogenization_type == homogenization_isostrain_label) maxNinstance = count(homogenization_type == homogenization_isostrain_label)
if (maxNinstance == 0) return if (maxNinstance == 0) return