From 6ec57db0c6cf35783fe11bdbd8d6890c80942679 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Mon, 1 Jul 2013 06:40:09 +0000 Subject: [PATCH] fixed writing out of initial configuration for spectral solver in case of ngrains != 1, small formating improvements in other files --- code/DAMASK_spectral_driver.f90 | 2 +- code/FEsolving.f90 | 3 +-- code/homogenization.f90 | 4 +--- code/homogenization_isostrain.f90 | 14 ++++++-------- 4 files changed, 9 insertions(+), 14 deletions(-) diff --git a/code/DAMASK_spectral_driver.f90 b/code/DAMASK_spectral_driver.f90 index 28832cdeb..7c5b5faf7 100644 --- a/code/DAMASK_spectral_driver.f90 +++ b/code/DAMASK_spectral_driver.f90 @@ -369,7 +369,7 @@ program DAMASK_spectral_Driver write(resUnit) 'increments', loadCases%incs ! one entry per currentLoadCase write(resUnit) 'startingIncrement', restartInc - 1_pInt ! start with writing out the previous inc 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())//& '.sta',form='FORMATTED',status='REPLACE') write(statUnit,'(a)') 'Increment Time CutbackLevel Converged IterationsNeeded' ! statistics file diff --git a/code/FEsolving.f90 b/code/FEsolving.f90 index 8fcb19b64..b365acc12 100644 --- a/code/FEsolving.f90 +++ b/code/FEsolving.f90 @@ -183,8 +183,7 @@ subroutine FE_init if (iand(debug_level(debug_FEsolving),debug_levelBasic) /= 0_pInt) then write(6,*) 'restart writing: ', restartWrite write(6,*) 'restart reading: ', restartRead - if (restartRead) write(6,*) 'restart Job: ', trim(modelName) - write(6,*) + if (restartRead) write(6,'(a,/)') 'restart Job: '//trim(modelName) endif end subroutine FE_init diff --git a/code/homogenization.f90 b/code/homogenization.f90 index 9e7da70c3..f6a498b31 100644 --- a/code/homogenization.f90 +++ b/code/homogenization.f90 @@ -153,9 +153,7 @@ subroutine homogenization_init(Temperature) case default knownHomogenization = .false. end select - write(fileunit,*) - write(fileunit,'(a)') '['//trim(homogenization_name(p))//']' - write(fileunit,*) + write(fileunit,'(/,a,/)') '['//trim(homogenization_name(p))//']' if (knownHomogenization) then write(fileunit,'(a)') '(type)'//char(9)//trim(homogenization_type(p)) write(fileunit,'(a,i4)') '(ngrains)'//char(9),homogenization_Ngrains(p) diff --git a/code/homogenization_isostrain.f90 b/code/homogenization_isostrain.f90 index c08387fe8..b08b1a40a 100644 --- a/code/homogenization_isostrain.f90 +++ b/code/homogenization_isostrain.f90 @@ -68,17 +68,15 @@ subroutine homogenization_isostrain_init(myFile) integer(pInt), dimension(1_pInt+2_pInt*maxNchunks) :: positions integer(pInt) section, i, j, output, mySize integer :: maxNinstance, k ! no pInt (stores a system dependen value from 'count' - character(len=65536) :: tag - character(len=65536) :: line = '' ! to start initialized + character(len=65536) :: & + tag = '', & + line = '' ! to start initialized - - write(6,*) - write(6,*) '<<<+- homogenization_',trim(homogenization_isostrain_label),' init -+>>>' - write(6,*) '$Id$' - write(6,'(a16,a)') ' Current time : ',IO_timeStamp() + write(6,'(/,a)') ' <<<+- homogenization_'//trim(homogenization_isostrain_label)//' init -+>>>' + write(6,'(a)') ' $Id$' + write(6,'(a15,a)') ' Current time: ',IO_timeStamp() #include "compilation_info.f90" - maxNinstance = count(homogenization_type == homogenization_isostrain_label) if (maxNinstance == 0) return