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

corrected reading in of ABAQUS debug modes and made numbering scheme for debugging depending on variables hoping to prevent these errors in debug.f90 

Put all (now public) logicals in FEsolving.f90 again into one specification statement
This commit is contained in:
Martin Diehl 2012-03-21 18:04:52 +00:00
parent 15dd860de9
commit 44d8282863
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
code/FEsolving.f90
View File

@ -42,8 +42,11 @@ module FEsolving
restartWrite = .false., & restartWrite = .false., &
restartRead = .false., & restartRead = .false., &
terminallyIll = .false., & terminallyIll = .false., &
parallelExecution = .true., & parallelExecution = .true., &
lastMode = .true. lastMode = .true., &
lastIncConverged = .false., &
outdatedByNewInc = .false., &
cutBack = .false.
integer(pInt), dimension(:,:), allocatable, public :: & integer(pInt), dimension(:,:), allocatable, public :: &
FEsolving_execIP FEsolving_execIP
@ -57,11 +60,6 @@ module FEsolving
logical, dimension(:,:), allocatable, public :: & logical, dimension(:,:), allocatable, public :: &
calcMode calcMode
logical, public :: &
lastIncConverged = .false., &
outdatedByNewInc = .false., &
cutBack = .false.
public :: FE_init public :: FE_init
contains contains

16
code/debug.f90
View File

@ -34,7 +34,7 @@ module debug
debug_levelBasic = 2_pInt**1_pInt, & debug_levelBasic = 2_pInt**1_pInt, &
debug_levelExtensive = 2_pInt**2_pInt debug_levelExtensive = 2_pInt**2_pInt
integer(pInt), parameter, private :: & integer(pInt), parameter, private :: &
debug_maxForAll = debug_levelExtensive debug_maxForAll = debug_levelExtensive ! must be set to the last bitcode used by (potentially) all debug types
integer(pInt), parameter, public :: & integer(pInt), parameter, public :: &
debug_spectralRestart = debug_maxForAll*2_pInt**1_pInt, & debug_spectralRestart = debug_maxForAll*2_pInt**1_pInt, &
debug_spectralFFTW = debug_maxForAll*2_pInt**2_pInt, & debug_spectralFFTW = debug_maxForAll*2_pInt**2_pInt, &
@ -53,8 +53,10 @@ module debug
debug_CPFEM = 10_pInt, & debug_CPFEM = 10_pInt, &
debug_spectral = 11_pInt, & debug_spectral = 11_pInt, &
debug_abaqus = 12_pInt debug_abaqus = 12_pInt
integer(pInt), parameter, private :: &
debug_maxWhat = debug_abaqus ! must be set to the maximum defined debug type
integer(pInt), dimension(12+2), public :: & ! 11 for specific, and 2 for "all" and "other" integer(pInt), dimension(debug_maxWhat+2_pInt), public :: & ! specific ones, and 2 for "all" and "other"
debug_what = 0_pInt debug_what = 0_pInt
integer(pInt), public :: & integer(pInt), public :: &
@ -197,9 +199,9 @@ subroutine debug_init
case ('abaqus') case ('abaqus')
what = debug_abaqus what = debug_abaqus
case ('all') case ('all')
what = 12_pInt what = debug_maxWhat + 1_pInt
case ('other') case ('other')
what = 13_pInt what = debug_maxWhat + 2_pInt
end select end select
if(what /= 0) then if(what /= 0) then
do i = 2_pInt, maxNchunks do i = 2_pInt, maxNchunks
@ -222,9 +224,9 @@ subroutine debug_init
enddo enddo
100 close(fileunit) 100 close(fileunit)
do i = 1_pInt, 11_pInt do i = 1_pInt, debug_maxWhat
if(debug_what(i) == 0) debug_what(i) = ior(debug_what(i), debug_what(13)) if(debug_what(i) == 0) debug_what(i) = ior(debug_what(i), debug_what(debug_maxWhat + 2_pInt)) ! fill undefined debug types with levels specified by "other"
debug_what(i) = ior(debug_what(i), debug_what(12)) debug_what(i) = ior(debug_what(i), debug_what(debug_maxWhat + 1_pInt)) ! fill all debug types with levels specified by "all"
enddo enddo
if (iand(debug_what(debug_debug),debug_levelBasic) /= 0) then if (iand(debug_what(debug_debug),debug_levelBasic) /= 0) then