corrected reporting to statistics file (*.sta)

This commit is contained in:
Martin Diehl 2013-01-11 10:40:16 +00:00
parent 4c145376a0
commit 645b2605e1
6 changed files with 24 additions and 18 deletions

View File

@ -212,9 +212,9 @@ end subroutine AL_init
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
type(tSolutionState) function & type(tSolutionState) function &
AL_solution(incInfoIn,guess,timeinc,timeinc_old,P_BC,F_BC,temperature_bc,rotation_BC) AL_solution(incInfoIn,guess,timeinc,timeinc_old,P_BC,F_BC,temperature_bc,rotation_BC)
use numerics, only: & use numerics, only: &
update_gamma update_gamma, &
itmax
use math, only: & use math, only: &
math_mul33x33 ,& math_mul33x33 ,&
math_rotate_backward33 math_rotate_backward33
@ -354,9 +354,12 @@ type(tSolutionState) function &
AL_solution%termIll = terminallyIll AL_solution%termIll = terminallyIll
terminallyIll = .false. terminallyIll = .false.
if (reason > 0 ) then if (reason < 1 ) then
AL_solution%converged = .false.
AL_solution%iterationsNeeded = itmax
else
AL_solution%converged = .true. AL_solution%converged = .true.
AL_solution%iterationsNeeded = reportIter AL_solution%iterationsNeeded = reportIter - 1_pInt
endif endif
end function AL_solution end function AL_solution

View File

@ -274,6 +274,7 @@ type(tSolutionState) function &
! iteration till converged ! iteration till converged
if (.not. restartRead) ForwardData = .True. if (.not. restartRead) ForwardData = .True.
iter = 0_pInt iter = 0_pInt
basic_solution%iterationsNeeded = itmax
convergenceLoop: do while(iter < itmax) convergenceLoop: do while(iter < itmax)
iter = iter + 1_pInt iter = iter + 1_pInt
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------

View File

@ -194,7 +194,8 @@ end subroutine basicPETSc_init
type(tSolutionState) function & type(tSolutionState) function &
basicPETSc_solution(incInfoIn,guess,timeinc,timeinc_old,P_BC,F_BC,temperature_bc,rotation_BC) basicPETSc_solution(incInfoIn,guess,timeinc,timeinc_old,P_BC,F_BC,temperature_bc,rotation_BC)
use numerics, only: & use numerics, only: &
update_gamma update_gamma, &
itmax
use math, only: & use math, only: &
math_mul33x33 ,& math_mul33x33 ,&
math_rotate_backward33 math_rotate_backward33
@ -313,10 +314,13 @@ type(tSolutionState) function &
call SNESGetConvergedReason(snes,reason,ierr); CHKERRQ(ierr) call SNESGetConvergedReason(snes,reason,ierr); CHKERRQ(ierr)
basicPETSc_solution%termIll = terminallyIll basicPETSc_solution%termIll = terminallyIll
terminallyIll = .false. terminallyIll = .false.
BasicPETSC_solution%converged =.false.
if (reason > 0 ) then if (reason < 1) then
BasicPETSC_solution%converged = .true. basicPETSC_solution%converged = .false.
BasicPETSC_solution%iterationsNeeded = reportIter basicPETSC_solution%iterationsNeeded = itmax
else
basicPETSC_solution%converged = .true.
basicPETSC_solution%iterationsNeeded = reportIter - 1_pInt
endif endif
end function BasicPETSc_solution end function BasicPETSc_solution

View File

@ -113,6 +113,7 @@ subroutine utilities_init()
debug_spectralDivergence, & debug_spectralDivergence, &
debug_spectralRestart, & debug_spectralRestart, &
debug_spectralFFTW, & debug_spectralFFTW, &
debug_spectralPETSc, &
debug_spectralRotation debug_spectralRotation
#ifdef PETSc #ifdef PETSc
use debug, only: & use debug, only: &

View File

@ -1003,7 +1003,7 @@ end function IO_lc
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
!> @brief in place change of character in line to lower case !> @brief in place change of character in line to lower case
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
subroutine IO_lcInplace(line) pure subroutine IO_lcInplace(line)
implicit none implicit none
character(26), parameter :: lower = 'abcdefghijklmnopqrstuvwxyz' character(26), parameter :: lower = 'abcdefghijklmnopqrstuvwxyz'
@ -1652,7 +1652,7 @@ end function abaqus_assembleInputFile
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
!> @brief hybrid IA repetition counter !> @brief hybrid IA repetition counter
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
integer(pInt) function hybridIA_reps(dV_V,steps,C) integer(pInt) pure function hybridIA_reps(dV_V,steps,C)
implicit none implicit none
integer(pInt), intent(in), dimension(3) :: & integer(pInt), intent(in), dimension(3) :: &
@ -1661,7 +1661,6 @@ integer(pInt) function hybridIA_reps(dV_V,steps,C)
dV_V dV_V
real(pReal), intent(in) :: & real(pReal), intent(in) :: &
C C
integer(pInt) :: phi1,Phi,phi2 integer(pInt) :: phi1,Phi,phi2
hybridIA_reps = 0_pInt hybridIA_reps = 0_pInt

View File

@ -162,7 +162,7 @@ function homogenization_isostrain_stateInit(myInstance)
homogenization_isostrain_stateInit = 0.0_pReal homogenization_isostrain_stateInit = 0.0_pReal
endfunction homogenization_isostrain_stateInit end function homogenization_isostrain_stateInit
!******************************************************************** !********************************************************************
@ -263,7 +263,7 @@ end subroutine homogenization_isostrain_averageStressAndItsTangent
!******************************************************************** !********************************************************************
! derive average stress and stiffness from constituent quantities ! derive average stress and stiffness from constituent quantities
!******************************************************************** !********************************************************************
function homogenization_isostrain_averageTemperature(& pure function homogenization_isostrain_averageTemperature(&
Temperature, & ! temperature Temperature, & ! temperature
ip, & ! my integration point ip, & ! my integration point
el & ! my element el & ! my element
@ -317,8 +317,6 @@ pure function homogenization_isostrain_postResults(&
end select end select
enddo enddo
return
end function homogenization_isostrain_postResults end function homogenization_isostrain_postResults
end module homogenization_isostrain end module homogenization_isostrain