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

replaced call flush(6) by flush(6), slightly improved formating for output of gfortran version

This commit is contained in:
Martin Diehl 2012-11-06 15:50:20 +00:00
parent e0dc2710b5
commit a86d528a4a
4 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
code/DAMASK_marc.f90
View File

@ -295,7 +295,7 @@ subroutine hypela2(&
calcMode = .false. ! pretend last step was collection
!$OMP CRITICAL (write2out)
write(6,'(a,i6,1x,i2)') '<< HYPELA2 >> start of analysis..! ',n(1),nn
call flush(6)
flush(6)
!$OMP END CRITICAL (write2out)
else if (inc - theInc > 1) then ! >> restart of broken analysis <<
lastIncConverged = .false. ! no Jacobian backup
@ -304,7 +304,7 @@ subroutine hypela2(&
calcMode = .true. ! pretend last step was calculation
!$OMP CRITICAL (write2out)
write(6,'(a,i6,1x,i2)') '<< HYPELA2 >> restart of analysis..! ',n(1),nn
call flush(6)
flush(6)
!$OMP END CRITICAL (write2out)
else ! >> just the next inc <<
lastIncConverged = .true. ! request Jacobian backup
@ -313,7 +313,7 @@ subroutine hypela2(&
calcMode = .true. ! assure last step was calculation
!$OMP CRITICAL (write2out)
write(6,'(a,i6,1x,i2)') '<< HYPELA2 >> new increment..! ',n(1),nn
call flush(6)
flush(6)
!$OMP END CRITICAL (write2out)
endif
else if ( timinc < theDelta ) then ! >> cutBack <<
@ -322,7 +322,7 @@ subroutine hypela2(&
calcMode = .true. ! pretend last step was calculation
!$OMP CRITICAL (write2out)
write(6,'(a,i6,1x,i2)') '<< HYPELA2 >> cutback detected..! ',n(1),nn
call flush(6)
flush(6)
!$OMP END CRITICAL (write2out)
endif ! convergence treatment end

2
code/compilation_info.f90
View File

@ -1,7 +1,7 @@
!$Id$
#ifdef __GFORTRAN__
#if __GNUC__<=4 && __GNUC_MINOR__<=5
write(6,'(3(a,i2.2))') ' Compiled with GCC version ', __GNUC__,'.',__GNUC_MINOR__,&
write(6,'(a,i1.1,a,i1.1,a,i2.2))') ' Compiled with GCC version ', __GNUC__,'.',__GNUC_MINOR__,&
'.',__GNUC_PATCHLEVEL__
#else
write(6,*) 'Compiled with ', compiler_version() !not supported by GFORTRAN 4.5 and ifort 12

2
code/homogenization.f90
View File

@ -251,7 +251,7 @@ subroutine homogenization_init(Temperature)
write(6,'(a32,1x,7(i8,1x))') 'maxSizeState: ', homogenization_maxSizeState
write(6,'(a32,1x,7(i8,1x))') 'maxSizePostResults: ', homogenization_maxSizePostResults
endif
call flush(6)
flush(6)
!$OMP END CRITICAL (write2out)
end subroutine homogenization_init

32
code/homogenization_RGC.f90
View File

@ -295,7 +295,7 @@ subroutine homogenization_RGC_partitionDeformation(&
write(6,'(1x,3(e15.8,1x))')(avgF(i,j), j = 1_pInt,3_pInt)
enddo
write(6,*)' '
call flush(6)
flush(6)
!$OMP END CRITICAL (write2out)
endif
@ -321,7 +321,7 @@ subroutine homogenization_RGC_partitionDeformation(&
write(6,'(1x,3(e15.8,1x))')(F(i,j,iGrain), j = 1_pInt,3_pInt)
enddo
write(6,*)' '
call flush(6)
flush(6)
!$OMP END CRITICAL (write2out)
endif
@ -497,7 +497,7 @@ function homogenization_RGC_updateState(&
'@ grain',stresLoc(3),'in component',stresLoc(1),stresLoc(2)
write(6,'(1x,a15,1x,e15.8,1x,a7,i3,1x,a12,i2)')'Max residual: ',residMax, &
'@ iface',residLoc(1),'in direction',residLoc(2)
call flush(6)
flush(6)
!$OMP END CRITICAL (write2out)
endif
@ -511,7 +511,7 @@ function homogenization_RGC_updateState(&
!$OMP CRITICAL (write2out)
write(6,'(1x,a55)')'... done and happy'
write(6,*)' '
call flush(6)
flush(6)
!$OMP END CRITICAL (write2out)
endif
! write(6,'(1x,a,1x,i3,1x,a6,1x,i3,1x,a12)')'RGC_updateState: ip',ip,'| el',el,'converged :)'
@ -550,7 +550,7 @@ function homogenization_RGC_updateState(&
write(6,'(1x,a30,1x,e15.8)')'Maximum relaxation rate: ',maxval(abs(drelax))/dt
write(6,'(1x,a30,1x,e15.8)')'Average relaxation rate: ',sum(abs(drelax))/dt/real(3_pInt*nIntFaceTot,pReal)
write(6,*)''
call flush(6)
flush(6)
!$OMP END CRITICAL (write2out)
endif
@ -567,7 +567,7 @@ function homogenization_RGC_updateState(&
!$OMP CRITICAL (write2out)
write(6,'(1x,a55)')'... broken'
write(6,*)' '
call flush(6)
flush(6)
!$OMP END CRITICAL (write2out)
endif
@ -582,7 +582,7 @@ function homogenization_RGC_updateState(&
!$OMP CRITICAL (write2out)
write(6,'(1x,a55)')'... not yet done'
write(6,*)' '
call flush(6)
flush(6)
!$OMP END CRITICAL (write2out)
endif
@ -641,7 +641,7 @@ function homogenization_RGC_updateState(&
write(6,'(1x,100(e11.4,1x))')(smatrix(i,j), j = 1_pInt,3_pInt*nIntFaceTot)
enddo
write(6,*)' '
call flush(6)
flush(6)
!$OMP END CRITICAL (write2out)
endif
@ -697,7 +697,7 @@ function homogenization_RGC_updateState(&
write(6,'(1x,100(e11.4,1x))')(pmatrix(i,j), j = 1_pInt,3_pInt*nIntFaceTot)
enddo
write(6,*)' '
call flush(6)
flush(6)
!$OMP END CRITICAL (write2out)
endif
@ -717,7 +717,7 @@ function homogenization_RGC_updateState(&
write(6,'(1x,100(e11.4,1x))')(rmatrix(i,j), j = 1_pInt,3_pInt*nIntFaceTot)
enddo
write(6,*)' '
call flush(6)
flush(6)
!$OMP END CRITICAL (write2out)
endif
@ -731,7 +731,7 @@ function homogenization_RGC_updateState(&
write(6,'(1x,100(e11.4,1x))')(jmatrix(i,j), j = 1_pInt,3_pInt*nIntFaceTot)
enddo
write(6,*)' '
call flush(6)
flush(6)
!$OMP END CRITICAL (write2out)
endif
@ -750,7 +750,7 @@ function homogenization_RGC_updateState(&
write(6,'(1x,100(e11.4,1x))')(jnverse(i,j), j = 1_pInt,3_pInt*nIntFaceTot)
enddo
write(6,*)' '
call flush(6)
flush(6)
!$OMP END CRITICAL (write2out)
endif
@ -768,7 +768,7 @@ function homogenization_RGC_updateState(&
!$OMP CRITICAL (write2out)
write(6,'(1x,a,1x,i3,1x,a,1x,i3,1x,a)')'RGC_updateState: ip',ip,'| el',el,'enforces cutback'
write(6,'(1x,a,1x,e15.8)')'due to large relaxation change =',maxval(abs(drelax))
call flush(6)
flush(6)
!$OMP END CRITICAL (write2out)
endif
@ -780,7 +780,7 @@ function homogenization_RGC_updateState(&
write(6,'(1x,2(e15.8,1x))')state%p(i)
enddo
write(6,*)' '
call flush(6)
flush(6)
!$OMP END CRITICAL (write2out)
endif
@ -834,7 +834,7 @@ subroutine homogenization_RGC_averageStressAndItsTangent(&
enddo
write(6,*)' '
enddo
call flush(6)
flush(6)
!$OMP END CRITICAL (write2out)
endif
@ -1247,7 +1247,7 @@ function homogenization_RGC_interfaceNormal(&
! write(6,'(1x,a32,3(1x,i3))')'Interface normal: ',intFace(1)
! write(6,'(1x,3(e15.8,1x))')(nVect(i), i = 1,3)
! write(6,*)' '
! call flush(6)
! flush(6)
! endif
endfunction