renamed debug variables, plus additional "beautification".

renamed "logscale" header info to "log scales" in accordance with plural versions of similar variables.
This commit is contained in:
Philip Eisenlohr 2012-01-12 10:23:05 +00:00
parent 55639f3362
commit 7103a44d45
2 changed files with 89 additions and 84 deletions

View File

@ -40,7 +40,10 @@ program DAMASK_spectral
use DAMASK_interface use DAMASK_interface
use prec, only: pInt, pReal, DAMASK_NaN use prec, only: pInt, pReal, DAMASK_NaN
use IO use IO
use debug, only: spectral_debug_verbosity use debug, only: debug_spectral, &
debug_spectralGeneral, &
debug_spectralDivergence, &
debug_spectralRestart
use math use math
use kdtree2_module use kdtree2_module
use mesh, only: mesh_ipCenterOfGravity use mesh, only: mesh_ipCenterOfGravity
@ -57,14 +60,13 @@ program DAMASK_spectral
real(pReal), dimension(9) :: temp_valueVector ! stores information temporarily from loadcase file real(pReal), dimension(9) :: temp_valueVector ! stores information temporarily from loadcase file
logical, dimension(9) :: temp_maskVector logical, dimension(9) :: temp_maskVector
integer(pInt), parameter :: maxNchunksLoadcase = & integer(pInt), parameter :: maxNchunksLoadcase = &
(1_pInt + 9_pInt)*3_pInt + & ! deformation, rotation, and stress (1_pInt + 9_pInt)*3_pInt + & ! deformation, rotation, and stress
(1_pInt + 1_pInt)*5_pInt + & ! time, (log)incs, temp, restartfrequency, and outputfrequency (1_pInt + 1_pInt)*5_pInt + & ! time, (log)incs, temp, restartfrequency, and outputfrequency
1_pInt ! dropguessing 1_pInt, & ! dropguessing
integer(pInt), dimension (1_pInt + maxNchunksLoadcase*2_pInt) :: posLoadcase maxNchunksGeom = 7_pInt ! 4 identifiers, 3 values
integer(pInt), parameter :: maxNchunksGeom = 7_pInt ! 4 identifiers, 3 values myUnit = 234_pInt
integer(pInt), dimension (1_pInt + maxNchunksGeom*2_pInt) :: posGeom integer(pInt), dimension (1_pInt + maxNchunksLoadcase*2_pInt) :: positions ! this is longer than needed for geometry parsing
integer(pInt) :: headerLength, N_l=0_pInt, N_t=0_pInt, N_n=0_pInt, N_Fdot=0_pInt integer(pInt) :: headerLength, N_l=0_pInt, N_t=0_pInt, N_n=0_pInt, N_Fdot=0_pInt
integer(pInt), parameter :: myUnit = 234_pInt
character(len=1024) :: path, line, keyword character(len=1024) :: path, line, keyword
logical :: gotResolution =.false., gotDimension =.false., gotHomogenization = .false. logical :: gotResolution =.false., gotDimension =.false., gotHomogenization = .false.
type bc_type type bc_type
@ -75,7 +77,7 @@ program DAMASK_spectral
temperature ! isothermal starting conditions temperature ! isothermal starting conditions
integer(pInt) :: steps, & ! number of steps integer(pInt) :: steps, & ! number of steps
outputfrequency, & ! frequency of result writes outputfrequency, & ! frequency of result writes
restartfrequency, & ! frequency of result writes restartfrequency, & ! frequency of restart writes
logscale ! linear/logaritmic time step flag logscale ! linear/logaritmic time step flag
logical :: followFormerTrajectory,& ! follow trajectory of former loadcase logical :: followFormerTrajectory,& ! follow trajectory of former loadcase
velGradApplied ! decide wether velocity gradient or fdot is given velGradApplied ! decide wether velocity gradient or fdot is given
@ -84,8 +86,8 @@ program DAMASK_spectral
logical, dimension(9) :: maskStressVector ! linear mask of boundary conditions logical, dimension(9) :: maskStressVector ! linear mask of boundary conditions
end type end type
type(bc_type), allocatable, dimension(:) :: bc type(bc_type), allocatable, dimension(:) :: bc
type(bc_type) :: bc_init type(bc_type) :: bc_default
character(len=3) :: loadcase_string character(len=6) :: loadcase_string
! variables storing information from geom file ! variables storing information from geom file
real(pReal) :: wgt real(pReal) :: wgt
@ -146,17 +148,17 @@ program DAMASK_spectral
! --- debugging variables ! --- debugging variables
real(pReal), dimension(:,:,:,:), allocatable :: divergence real(pReal), dimension(:,:,:,:), allocatable :: divergence
real(pReal) :: p_real_avg, err_div_max, err_real_div_avg, err_real_div_max real(pReal) :: p_real_avg, err_div_max, err_real_div_avg, err_real_div_max
logical :: debugGeneral = .false., debugDivergence = .false., debugRestart = .false. logical :: debugGeneral, debugDivergence, debugRestart
! --- initialize default value for loadcase ! --- initialize default value for loadcase
bc_init%deformation = zeroes; bc_init%stress = zeroes; bc_init%rotation = zeroes bc_default%steps = 0_pInt; bc_default%timeIncrement = 0.0_pReal
bc_init%timeIncrement = 0.0_pReal; bc_init%temperature = 300.0_pReal bc_default%temperature = 300.0_pReal; bc_default%logscale = 0_pInt
bc_init%steps = 0_pInt; bc_init%logscale = 0_pInt bc_default%outputfrequency = 1_pInt; bc_default%restartfrequency = 0_pInt
bc_init%outputfrequency = 1_pInt; bc_init%restartfrequency = 0_pInt bc_default%deformation = zeroes; bc_default%stress = zeroes
bc_init%maskDeformation = .false.; bc_init%maskStress = .false. bc_default%maskDeformation = .false.; bc_default%maskStress = .false.
bc_init%maskStressVector = .false.; bc_init%velGradApplied = .false. bc_default%velGradApplied = .false.; bc_default%maskStressVector = .false.
bc_init%followFormerTrajectory = .true. bc_default%followFormerTrajectory = .true.
bc_init%rotation = math_I3 ! assume no rotation bc_default%rotation = math_I3 ! assume no rotation
! --- initializing model size independed parameters ! --- initializing model size independed parameters
!$ call omp_set_num_threads(DAMASK_NumThreadsInt) ! set number of threads for parallel execution set by DAMASK_NUM_THREADS !$ call omp_set_num_threads(DAMASK_NumThreadsInt) ! set number of threads for parallel execution set by DAMASK_NUM_THREADS
@ -178,9 +180,9 @@ program DAMASK_spectral
do do
read(myUnit,'(a1024)',END = 100) line read(myUnit,'(a1024)',END = 100) line
if (IO_isBlank(line)) cycle ! skip empty lines if (IO_isBlank(line)) cycle ! skip empty lines
posLoadcase = IO_stringPos(line,maxNchunksLoadcase) positions = IO_stringPos(line,maxNchunksLoadcase)
do i = 1_pInt, maxNchunksLoadcase, 1_pInt ! reading compulsory parameters for loadcase do i = 1_pInt, maxNchunksLoadcase, 1_pInt ! reading compulsory parameters for loadcase
select case (IO_lc(IO_stringValue(line,posLoadcase,i))) select case (IO_lc(IO_stringValue(line,positions,i)))
case('l', 'velocitygrad', 'velgrad','velocitygradient') case('l', 'velocitygrad', 'velgrad','velocitygradient')
N_l = N_l + 1_pInt N_l = N_l + 1_pInt
case('fdot') case('fdot')
@ -206,61 +208,61 @@ program DAMASK_spectral
read(myUnit,'(a1024)',END = 101) line read(myUnit,'(a1024)',END = 101) line
if (IO_isBlank(line)) cycle ! skip empty lines if (IO_isBlank(line)) cycle ! skip empty lines
loadcase = loadcase + 1_pInt loadcase = loadcase + 1_pInt
bc(loadcase) = bc_init bc(loadcase) = bc_default
posLoadcase = IO_stringPos(line,maxNchunksLoadcase) positions = IO_stringPos(line,maxNchunksLoadcase)
do j = 1_pInt,maxNchunksLoadcase do j = 1_pInt,maxNchunksLoadcase
select case (IO_lc(IO_stringValue(line,posLoadcase,j))) select case (IO_lc(IO_stringValue(line,positions,j)))
case('fdot','l','velocitygrad','velgrad','velocitygradient') ! assign values for the deformation BC matrix case('fdot','l','velocitygrad','velgrad','velocitygradient') ! assign values for the deformation BC matrix
bc(loadcase)%velGradApplied = (IO_lc(IO_stringValue(line,posLoadcase,j)) == 'l' .or. & ! in case of given L, set flag to true bc(loadcase)%velGradApplied = (IO_lc(IO_stringValue(line,positions,j)) == 'l' .or. & ! in case of given L, set flag to true
IO_lc(IO_stringValue(line,posLoadcase,j)) == 'velocitygrad' .or. & IO_lc(IO_stringValue(line,positions,j)) == 'velocitygrad' .or. &
IO_lc(IO_stringValue(line,posLoadcase,j)) == 'velgrad' .or. & IO_lc(IO_stringValue(line,positions,j)) == 'velgrad' .or. &
IO_lc(IO_stringValue(line,posLoadcase,j)) == 'velocitygradient') IO_lc(IO_stringValue(line,positions,j)) == 'velocitygradient')
temp_valueVector = 0.0_pReal temp_valueVector = 0.0_pReal
temp_maskVector = .false. temp_maskVector = .false.
forall (k = 1_pInt:9_pInt) temp_maskVector(k) = IO_stringValue(line,posLoadcase,j+k) /= '*' forall (k = 1_pInt:9_pInt) temp_maskVector(k) = IO_stringValue(line,positions,j+k) /= '*'
do k = 1_pInt,9_pInt do k = 1_pInt,9_pInt
if (temp_maskVector(k)) temp_valueVector(k) = IO_floatValue(line,posLoadcase,j+k) if (temp_maskVector(k)) temp_valueVector(k) = IO_floatValue(line,positions,j+k)
enddo enddo
bc(loadcase)%maskDeformation = transpose(reshape(temp_maskVector,(/3,3/))) bc(loadcase)%maskDeformation = transpose(reshape(temp_maskVector,(/3,3/)))
bc(loadcase)%deformation = math_plain9to33(temp_valueVector) bc(loadcase)%deformation = math_plain9to33(temp_valueVector)
case('p', 'pk1', 'piolakirchhoff', 'stress') case('p', 'pk1', 'piolakirchhoff', 'stress')
temp_valueVector = 0.0_pReal temp_valueVector = 0.0_pReal
forall (k = 1_pInt:9_pInt) bc(loadcase)%maskStressVector(k) = IO_stringValue(line,posLoadcase,j+k) /= '*' forall (k = 1_pInt:9_pInt) bc(loadcase)%maskStressVector(k) = IO_stringValue(line,positions,j+k) /= '*'
do k = 1_pInt,9_pInt do k = 1_pInt,9_pInt
if (bc(loadcase)%maskStressVector(k)) temp_valueVector(k) = IO_floatValue(line,posLoadcase,j+k) ! assign values for the bc(loadcase)%stress matrix if (bc(loadcase)%maskStressVector(k)) temp_valueVector(k) = IO_floatValue(line,positions,j+k) ! assign values for the bc(loadcase)%stress matrix
enddo enddo
bc(loadcase)%maskStress = transpose(reshape(bc(loadcase)%maskStressVector,(/3,3/))) bc(loadcase)%maskStress = transpose(reshape(bc(loadcase)%maskStressVector,(/3,3/)))
bc(loadcase)%stress = math_plain9to33(temp_valueVector) bc(loadcase)%stress = math_plain9to33(temp_valueVector)
case('t','time','delta') ! increment time case('t','time','delta') ! increment time
bc(loadcase)%timeIncrement = IO_floatValue(line,posLoadcase,j+1_pInt) bc(loadcase)%timeIncrement = IO_floatValue(line,positions,j+1_pInt)
case('temp','temperature') ! starting temperature case('temp','temperature') ! starting temperature
bc(loadcase)%temperature = IO_floatValue(line,posLoadcase,j+1_pInt) bc(loadcase)%temperature = IO_floatValue(line,positions,j+1_pInt)
case('n','incs','increments','steps') ! steps case('n','incs','increments','steps') ! number of increments
bc(loadcase)%steps = IO_intValue(line,posLoadcase,j+1_pInt) bc(loadcase)%steps = IO_intValue(line,positions,j+1_pInt)
case('logincs','logsteps') ! true, if log scale case('logincs','logincrements','logsteps') ! number of increments (switch to log time scaling)
bc(loadcase)%steps = IO_intValue(line,posLoadcase,j+1_pInt) bc(loadcase)%steps = IO_intValue(line,positions,j+1_pInt)
bc(loadcase)%logscale = 1_pInt bc(loadcase)%logscale = 1_pInt
case('f','freq','frequency','outputfreq') ! frequency of result writings case('f','freq','frequency','outputfreq') ! frequency of result writings
bc(loadcase)%outputfrequency = IO_intValue(line,posLoadcase,j+1_pInt) bc(loadcase)%outputfrequency = IO_intValue(line,positions,j+1_pInt)
case('r','restart','restartwrite') ! frequency of writing restart information case('r','restart','restartwrite') ! frequency of writing restart information
bc(loadcase)%restartfrequency = max(0_pInt,IO_intValue(line,posLoadcase,j+1_pInt)) bc(loadcase)%restartfrequency = max(0_pInt,IO_intValue(line,positions,j+1_pInt))
case('guessreset','dropguessing') case('guessreset','dropguessing')
bc(loadcase)%followFormerTrajectory = .false. ! do not continue to predict deformation along former trajectory bc(loadcase)%followFormerTrajectory = .false. ! do not continue to predict deformation along former trajectory
case('euler') ! rotation of loadcase given in euler angles case('euler') ! rotation of loadcase given in euler angles
p = 0_pInt ! assuming values given in radians p = 0_pInt ! assuming values given in radians
l = 1_pInt ! assuming keyword indicating degree/radians l = 1_pInt ! assuming keyword indicating degree/radians
select case (IO_lc(IO_stringValue(line,posLoadcase,j+1_pInt))) select case (IO_lc(IO_stringValue(line,positions,j+1_pInt)))
case('deg','degree') case('deg','degree')
p = 1_pInt ! for conversion from degree to radian p = 1_pInt ! for conversion from degree to radian
case('rad','radian') case('rad','radian')
case default case default
l = 0_pInt ! imediately reading in angles, assuming radians l = 0_pInt ! immediately reading in angles, assuming radians
end select end select
forall(k = 1_pInt:3_pInt) temp33_Real(k,1) = IO_floatValue(line,posLoadcase,j+l+k) * real(p,pReal) * inRad forall(k = 1_pInt:3_pInt) temp33_Real(k,1) = IO_floatValue(line,positions,j+l+k) * real(p,pReal) * inRad
bc(loadcase)%rotation = math_EulerToR(temp33_Real(:,1)) bc(loadcase)%rotation = math_EulerToR(temp33_Real(:,1))
case('rotation','rot') ! assign values for the rotation of loadcase matrix case('rotation','rot') ! assign values for the rotation of loadcase matrix
temp_valueVector = 0.0_pReal temp_valueVector = 0.0_pReal
forall (k = 1_pInt:9_pInt) temp_valueVector(k) = IO_floatValue(line,posLoadcase,j+k) forall (k = 1_pInt:9_pInt) temp_valueVector(k) = IO_floatValue(line,positions,j+k)
bc(loadcase)%rotation = math_plain9to33(temp_valueVector) bc(loadcase)%rotation = math_plain9to33(temp_valueVector)
end select end select
enddo; enddo enddo; enddo
@ -274,10 +276,10 @@ program DAMASK_spectral
call IO_error(error_ID=101_pInt,ext_msg = trim(path)//InputFileExtension) call IO_error(error_ID=101_pInt,ext_msg = trim(path)//InputFileExtension)
rewind(myUnit) rewind(myUnit)
read(myUnit,'(a1024)') line read(myUnit,'(a1024)') line
posGeom = IO_stringPos(line,2_pInt) positions = IO_stringPos(line,2_pInt)
keyword = IO_lc(IO_StringValue(line,posGeom,2_pInt)) keyword = IO_lc(IO_StringValue(line,positions,2_pInt))
if (keyword(1:4) == 'head') then if (keyword(1:4) == 'head') then
headerLength = IO_intValue(line,posGeom,1_pInt) + 1_pInt headerLength = IO_intValue(line,positions,1_pInt) + 1_pInt
else else
call IO_error(error_ID=42_pInt) call IO_error(error_ID=42_pInt)
endif endif
@ -285,33 +287,33 @@ program DAMASK_spectral
rewind(myUnit) rewind(myUnit)
do i = 1_pInt, headerLength do i = 1_pInt, headerLength
read(myUnit,'(a1024)') line read(myUnit,'(a1024)') line
posGeom = IO_stringPos(line,maxNchunksGeom) positions = IO_stringPos(line,maxNchunksGeom)
select case ( IO_lc(IO_StringValue(line,posGeom,1)) ) select case ( IO_lc(IO_StringValue(line,positions,1)) )
case ('dimension') case ('dimension')
gotDimension = .true. gotDimension = .true.
do j = 2_pInt,6_pInt,2_pInt do j = 2_pInt,6_pInt,2_pInt
select case (IO_lc(IO_stringValue(line,posGeom,j))) select case (IO_lc(IO_stringValue(line,positions,j)))
case('x') case('x')
geomdimension(1) = IO_floatValue(line,posGeom,j+1_pInt) geomdimension(1) = IO_floatValue(line,positions,j+1_pInt)
case('y') case('y')
geomdimension(2) = IO_floatValue(line,posGeom,j+1_pInt) geomdimension(2) = IO_floatValue(line,positions,j+1_pInt)
case('z') case('z')
geomdimension(3) = IO_floatValue(line,posGeom,j+1_pInt) geomdimension(3) = IO_floatValue(line,positions,j+1_pInt)
end select end select
enddo enddo
case ('homogenization') case ('homogenization')
gotHomogenization = .true. gotHomogenization = .true.
homog = IO_intValue(line,posGeom,2_pInt) homog = IO_intValue(line,positions,2_pInt)
case ('resolution') case ('resolution')
gotResolution = .true. gotResolution = .true.
do j = 2_pInt,6_pInt,2_pInt do j = 2_pInt,6_pInt,2_pInt
select case (IO_lc(IO_stringValue(line,posGeom,j))) select case (IO_lc(IO_stringValue(line,positions,j)))
case('a') case('a')
res(1) = IO_intValue(line,posGeom,j+1_pInt) res(1) = IO_intValue(line,positions,j+1_pInt)
case('b') case('b')
res(2) = IO_intValue(line,posGeom,j+1_pInt) res(2) = IO_intValue(line,positions,j+1_pInt)
case('c') case('c')
res(3) = IO_intValue(line,posGeom,j+1_pInt) res(3) = IO_intValue(line,positions,j+1_pInt)
end select end select
enddo enddo
case ('picture') case ('picture')
@ -331,9 +333,9 @@ program DAMASK_spectral
call CPFEM_initAll(bc(1)%temperature,1_pInt,1_pInt) call CPFEM_initAll(bc(1)%temperature,1_pInt,1_pInt)
! --- debugging parameters ! --- debugging parameters
if (iand(spectral_debug_verbosity,1_pInt)==1_pInt) debugGeneral = .true. debugGeneral = iand(debug_spectral,debug_spectralGeneral) > 0_pInt
if (iand(spectral_debug_verbosity,2_pInt)==2_pInt) debugDivergence = .true. debugDivergence = iand(debug_spectral,debug_spectralDivergence) > 0_pInt
if (iand(spectral_debug_verbosity,4_pInt)==4_pInt) debugRestart = .true. debugRestart = iand(debug_spectral,debug_spectralRestart) > 0_pInt
! --- output of geometry ! --- output of geometry
print '(a)', '' print '(a)', ''
@ -360,10 +362,10 @@ program DAMASK_spectral
errorID = 0_pInt errorID = 0_pInt
do loadcase = 1_pInt, N_Loadcases do loadcase = 1_pInt, N_Loadcases
write (loadcase_string, '(i3)' ) loadcase write (loadcase_string, '(i6)' ) loadcase
print '(a)', '=============================================================' print '(a)', '============================================================='
print '(a,i5)', 'loadcase: ', loadcase print '(a,i6)', 'loadcase: ', loadcase
if (.not. bc(loadcase)%followFormerTrajectory) print '(a)', 'drop guessing along trajectory' if (.not. bc(loadcase)%followFormerTrajectory) print '(a)', 'drop guessing along trajectory'
if (bc(loadcase)%velGradApplied) then if (bc(loadcase)%velGradApplied) then
@ -429,7 +431,7 @@ program DAMASK_spectral
allocate (c_reduced(size_reduced,size_reduced)); c_reduced = 0.0_pReal allocate (c_reduced(size_reduced,size_reduced)); c_reduced = 0.0_pReal
allocate (s_reduced(size_reduced,size_reduced)); s_reduced = 0.0_pReal allocate (s_reduced(size_reduced,size_reduced)); s_reduced = 0.0_pReal
timeinc = bc(loadcase)%timeIncrement/bc(loadcase)%steps ! only valid for given linear time scale. will be overwritten later in case loglinear scale is used timeinc = bc(loadcase)%timeIncrement/bc(loadcase)%steps ! only valid for given linear time scale. will be overwritten later in case logarithmic scale is used
fDot = bc(loadcase)%deformation ! only valid for given fDot. will be overwritten later in case L is given fDot = bc(loadcase)%deformation ! only valid for given fDot. will be overwritten later in case L is given
!************************************************************* !*************************************************************
@ -437,14 +439,14 @@ program DAMASK_spectral
do step = 1_pInt, bc(loadcase)%steps do step = 1_pInt, bc(loadcase)%steps
!************************************************************* !*************************************************************
! forwarding time ! forwarding time
if (bc(loadcase)%logscale == 1_pInt) then ! loglinear scale if (bc(loadcase)%logscale == 1_pInt) then ! logarithmic scale
if (loadcase == 1_pInt) then ! 1st loadcase of loglinear scale if (loadcase == 1_pInt) then ! 1st loadcase of logarithmic scale
if (step == 1_pInt) then ! 1st step of 1st loadcase of loglinear scale if (step == 1_pInt) then ! 1st step of 1st loadcase of logarithmic scale
timeinc = bc(1)%timeIncrement*(2.0_pReal**real( 1_pInt-bc(1)%steps ,pReal)) ! assume 1st step is equal to 2nd timeinc = bc(1)%timeIncrement*(2.0_pReal**real( 1_pInt-bc(1)%steps ,pReal)) ! assume 1st step is equal to 2nd
else ! not-1st step of 1st loadcase of loglinear scale else ! not-1st step of 1st loadcase of logarithmic scale
timeinc = bc(1)%timeIncrement*(2.0_pReal**real(step-1_pInt-bc(1)%steps ,pReal)) timeinc = bc(1)%timeIncrement*(2.0_pReal**real(step-1_pInt-bc(1)%steps ,pReal))
endif endif
else ! not-1st loadcase of loglinear scale else ! not-1st loadcase of logarithmic scale
timeinc = time0 *( (1.0_pReal + bc(loadcase)%timeIncrement/time0 )**real( step/bc(loadcase)%steps ,pReal) & timeinc = time0 *( (1.0_pReal + bc(loadcase)%timeIncrement/time0 )**real( step/bc(loadcase)%steps ,pReal) &
-(1.0_pReal + bc(loadcase)%timeIncrement/time0 )**real( (step-1_pInt)/bc(loadcase)%steps ,pReal) ) -(1.0_pReal + bc(loadcase)%timeIncrement/time0 )**real( (step-1_pInt)/bc(loadcase)%steps ,pReal) )
endif endif
@ -586,18 +588,18 @@ program DAMASK_spectral
!$OMP CRITICAL (write2out) !$OMP CRITICAL (write2out)
open(538,file=trim(getSolverWorkingDirectoryName())//trim(getSolverJobName())& open(538,file=trim(getSolverWorkingDirectoryName())//trim(getSolverJobName())&
//'.spectralOut',form='UNFORMATTED',status='REPLACE') //'.spectralOut',form='UNFORMATTED',status='REPLACE')
write(538), 'load', trim(getLoadcaseName()) write(538), 'load', trim(getLoadcaseName())
write(538), 'workingdir', trim(getSolverWorkingDirectoryName()) write(538), 'workingdir', trim(getSolverWorkingDirectoryName())
write(538), 'geometry', trim(getSolverJobName())//InputFileExtension write(538), 'geometry', trim(getSolverJobName())//InputFileExtension
write(538), 'resolution', res write(538), 'resolution', res
write(538), 'dimension', geomdimension write(538), 'dimension', geomdimension
write(538), 'materialpoint_sizeResults', materialpoint_sizeResults write(538), 'materialpoint_sizeResults', materialpoint_sizeResults
write(538), 'loadcases', N_Loadcases write(538), 'loadcases', N_Loadcases
write(538), 'logscale', bc(1:N_Loadcases)%logscale ! one entry per loadcase (0: linear, 1: log)
write(538), 'frequencies', bc(1:N_Loadcases)%outputfrequency ! one entry per loadcase write(538), 'frequencies', bc(1:N_Loadcases)%outputfrequency ! one entry per loadcase
write(538), 'times', bc(1:N_Loadcases)%timeIncrement ! one entry per loadcase write(538), 'times', bc(1:N_Loadcases)%timeIncrement ! one entry per loadcase
write(538), 'logscales', bc(1:N_Loadcases)%logscale ! one entry per loadcase (0: linear, 1: log)
bc(1)%steps= bc(1)%steps + 1_pInt bc(1)%steps= bc(1)%steps + 1_pInt
write(538), 'increments', bc(1:N_Loadcases)%steps ! one entry per loadcase ToDo: rename keyword to steps write(538), 'increments', bc(1:N_Loadcases)%steps ! one entry per loadcase
bc(1)%steps= bc(1)%steps - 1_pInt bc(1)%steps= bc(1)%steps - 1_pInt
write(538), 'startingIncrement', restartReadStep -1_pInt ! start with writing out the previous step write(538), 'startingIncrement', restartReadStep -1_pInt ! start with writing out the previous step
write(538), 'eoh' ! end of header write(538), 'eoh' ! end of header

View File

@ -25,6 +25,9 @@ use prec
implicit none implicit none
character(len=64), parameter :: debug_configFile = 'debug.config' ! name of configuration file character(len=64), parameter :: debug_configFile = 'debug.config' ! name of configuration file
integer(pInt), parameter :: debug_spectralGeneral = 1_pInt, &
debug_spectralDivergence = 2_pInt, &
debug_spectralRestart = 4_pInt
integer(pInt), dimension(:,:), allocatable :: debug_StressLoopDistribution integer(pInt), dimension(:,:), allocatable :: debug_StressLoopDistribution
integer(pInt), dimension(:,:), allocatable :: debug_LeapfrogBreakDistribution integer(pInt), dimension(:,:), allocatable :: debug_LeapfrogBreakDistribution
@ -51,7 +54,7 @@ real(pReal) :: debug_jacobianMax
real(pReal) :: debug_jacobianMin real(pReal) :: debug_jacobianMin
logical :: debug_selectiveDebugger = .true. logical :: debug_selectiveDebugger = .true.
integer(pInt) :: debug_verbosity = 1_pInt integer(pInt) :: debug_verbosity = 1_pInt
integer(pInt) :: spectral_debug_verbosity = 0_pInt integer(pInt) :: debug_spectral = 0_pInt
CONTAINS CONTAINS
@ -126,11 +129,11 @@ subroutine debug_init()
case ('(spectral)') case ('(spectral)')
select case(IO_lc(IO_stringValue(line,positions,2))) select case(IO_lc(IO_stringValue(line,positions,2)))
case('general') case('general')
spectral_debug_verbosity = ior(spectral_debug_verbosity, 1) debug_spectral = ior(debug_spectral, debug_spectralGeneral)
case('divergence') case('divergence')
spectral_debug_verbosity = ior(spectral_debug_verbosity, 2) debug_spectral = ior(debug_spectral, debug_spectralDivergence)
case('restart') case('restart')
spectral_debug_verbosity = ior(spectral_debug_verbosity, 4) debug_spectral = ior(debug_spectral, debug_spectralRestart)
endselect endselect
endselect endselect
enddo enddo
@ -175,9 +178,9 @@ subroutine debug_init()
debug_g = 0_pInt debug_g = 0_pInt
endif endif
!$OMP CRITICAL (write2out) ! bitwise coded !$OMP CRITICAL (write2out) ! bitwise coded
if (iand(spectral_debug_verbosity,1_pInt)==1_pInt) write(6,'(a)') ' Spectral General Debugging' if (iand(debug_spectral,debug_spectralGeneral) > 0_pInt) write(6,'(a)') ' spectral general debugging'
if (iand(spectral_debug_verbosity,2_pInt)==2_pInt) write(6,'(a)') ' Spectral Divergence Debugging' if (iand(debug_spectral,debug_spectralDivergence) > 0_pInt) write(6,'(a)') ' spectral divergence debugging'
if (iand(spectral_debug_verbosity,4_pInt)==4_pInt) write(6,'(a)') ' Spectral Restart Debugging' if (iand(debug_spectral,debug_spectalRestart) > 0_pInt) write(6,'(a)') ' spectral restart debugging'
!$OMP END CRITICAL (write2out) !$OMP END CRITICAL (write2out)
endsubroutine endsubroutine