diff --git a/src/DAMASK_marc.f90 b/src/DAMASK_marc.f90 index 09c4eef43..7789fc58c 100644 --- a/src/DAMASK_marc.f90 +++ b/src/DAMASK_marc.f90 @@ -176,6 +176,7 @@ subroutine hypela2(d,g,e,de,s,t,dt,ngens,m,nn,kcus,matus,ndi,nshear,disp, & use prec use DAMASK_interface use numerics + use YAML_types use FEsolving use debug use discretization_marc @@ -253,8 +254,19 @@ subroutine hypela2(d,g,e,de,s,t,dt,ngens,m,nn,kcus,matus,ndi,nshear,disp, & lastIncConverged = .false., & !< needs description outdatedByNewInc = .false., & !< needs description CPFEM_init_done = .false. !< remember whether init has been done already + class(tNode), pointer :: & + debug_Marc - if(debug_marc_basic) then + defaultNumThreadsInt = omp_get_num_threads() ! remember number of threads set by Marc + call omp_set_num_threads(1) ! no openMP + + if (.not. CPFEM_init_done) then + CPFEM_init_done = .true. + call CPFEM_initAll + endif + + debug_Marc => debug_root%get('marc',defaultVal=emptyList) + if(debug_Marc%contains('basic')) then write(6,'(a,/,i8,i8,i2)') ' MSC.MARC information on shape of element(2), IP:', m, nn write(6,'(a,2(i1))') ' Jacobian: ', ngens,ngens write(6,'(a,i1)') ' Direct stress: ', ndi @@ -269,13 +281,6 @@ subroutine hypela2(d,g,e,de,s,t,dt,ngens,m,nn,kcus,matus,ndi,nshear,disp, & transpose(ffn1) endif - defaultNumThreadsInt = omp_get_num_threads() ! remember number of threads set by Marc - call omp_set_num_threads(1) ! no openMP - - if (.not. CPFEM_init_done) then - CPFEM_init_done = .true. - call CPFEM_initAll - endif computationMode = 0 ! save initialization value, since it does not result in any calculation if (lovl == 4 ) then ! jacobian requested by marc diff --git a/src/debug.f90 b/src/debug.f90 index f83c80967..32fc8433a 100644 --- a/src/debug.f90 +++ b/src/debug.f90 @@ -17,9 +17,6 @@ module debug class(tNode), pointer, public :: & debug_root - logical, public :: & - debug_marc_basic = .false. - public :: debug_init contains @@ -33,8 +30,6 @@ subroutine debug_init character(len=:), allocatable :: & debug_input, & debug_inFlow - class(tNode), pointer :: & - debug_Marc logical :: fexist write(6,'(/,a)') ' <<<+- debug init -+>>>' @@ -48,8 +43,6 @@ subroutine debug_init debug_input = IO_read('debug.yaml') debug_inFlow = to_flow(debug_input) debug_root => parse_flow(debug_inFlow,defaultVal=emptyDict) - debug_Marc => debug_root%get('marc',defaultVal=emptyList) - debug_marc_basic = debug_Marc%contains('basic') endif fileExists end subroutine debug_init