diff --git a/code/DAMASK_abaqus_exp.f b/code/DAMASK_abaqus_exp.f index 84715e2d4..37ee9db76 100644 --- a/code/DAMASK_abaqus_exp.f +++ b/code/DAMASK_abaqus_exp.f @@ -196,7 +196,7 @@ subroutine vumat(nBlock, nDir, nshr, nStateV, nFieldV, nProps, lAnneal, & integer(pInt) :: computationMode, n, i, cp_en !$ integer :: defaultNumThreadsInt !< default value set by Abaqus !$ include "omp_lib.h" - ! temp is intent(in) + enerInternNew = 0.0_pReal enerInelasNew = 0.0_pReal @@ -205,23 +205,19 @@ subroutine vumat(nBlock, nDir, nshr, nStateV, nFieldV, nProps, lAnneal, & computationMode = CPFEM_CALCRESULTS ! always calculate do n = 1,nblock(1) ! loop over vector of IPs - temp = tempOld(n) + temp = tempOld(n) ! temp is intent(in) if ( .not. CPFEM_init_done ) then call CPFEM_initAll(temp,nBlock(4_pInt+n),nBlock(2)) outdatedByNewInc = .false. if (iand(debug_level(debug_abaqus),debug_levelBasic) /= 0) then - !$OMP CRITICAL (write2out) - write(6,'(i8,1x,i2,1x,a)') nBlock(4_pInt+n),nBlock(2),'first call special case..!'; flush(6) - !$OMP END CRITICAL (write2out) + write(6,'(i8,1x,i2,1x,a)') nBlock(4_pInt+n),nBlock(2),'first call special case..!'; flush(6) endif else if (theTime < totalTime) then ! reached convergence outdatedByNewInc = .true. if (iand(debug_level(debug_abaqus),debug_levelBasic) /= 0) then - !$OMP CRITICAL (write2out) - write (6,'(i8,1x,i2,1x,a)') nBlock(4_pInt+n),nBlock(2),'lastIncConverged + outdated'; flush(6) - !$OMP END CRITICAL (write2out) + write (6,'(i8,1x,i2,1x,a)') nBlock(4_pInt+n),nBlock(2),'lastIncConverged + outdated'; flush(6) endif endif @@ -237,10 +233,8 @@ subroutine vumat(nBlock, nDir, nshr, nStateV, nFieldV, nProps, lAnneal, & theTime = totalTime ! record current starting time if (iand(debug_level(debug_abaqus),debug_levelBasic) /= 0) then - !$OMP CRITICAL (write2out) - write(6,'(a,i8,i2,a)') '(',nBlock(4_pInt+n),nBlock(2),')'; flush(6) - write(6,'(a,l1)') 'Aging Results: ', iand(computationMode, CPFEM_AGERESULTS) /= 0_pInt - !$OMP END CRITICAL (write2out) + write(6,'(a,i8,i2,a)') '(',nBlock(4_pInt+n),nBlock(2),')'; flush(6) + write(6,'(a,l1)') 'Aging Results: ', iand(computationMode, CPFEM_AGERESULTS) /= 0_pInt endif defgrd0 = 0.0_pReal defgrd1 = 0.0_pReal @@ -302,7 +296,7 @@ subroutine quit(mpie_error) pInt implicit none - integer(pInt) mpie_error + integer(pInt) :: mpie_error flush(6) call xplb_exit diff --git a/code/DAMASK_abaqus_std.f b/code/DAMASK_abaqus_std.f index 6236701ae..0c6435f30 100644 --- a/code/DAMASK_abaqus_std.f +++ b/code/DAMASK_abaqus_std.f @@ -213,12 +213,10 @@ subroutine UMAT(STRESS,STATEV,DDSDDE,SSE,SPD,SCD,& !$ call omp_set_num_threads(DAMASK_NumThreadsInt) ! set number of threads for parallel execution set by DAMASK_NUM_THREADS if (iand(debug_level(debug_abaqus),debug_levelBasic) /= 0 .and. noel == 1 .and. npt == 1) then - !$OMP CRITICAL (write2out) write(6,*) 'el',noel,'ip',npt write(6,*) 'got kInc as',kInc write(6,*) 'got dStran',dStran flush(6) - !$OMP END CRITICAL (write2out) endif if (.not. CPFEM_init_done) call CPFEM_initAll(temperature,noel,npt) @@ -232,26 +230,17 @@ subroutine UMAT(STRESS,STATEV,DDSDDE,SSE,SPD,SCD,& lastIncConverged = .false. ! no Jacobian backup outdatedByNewInc = .false. ! no aging of state calcMode = .false. ! pretend last step was collection - !$OMP CRITICAL (write2out) - write (6,'(i8,1x,i2,1x,a)') noel,npt,'<< UMAT >> start of analysis..!' - flush(6) - !$OMP END CRITICAL (write2out) + write (6,'(i8,1x,i2,1x,a)') noel,npt,'<< UMAT >> start of analysis..!';flush(6) else if (kInc - theInc > 1) then ! >> restart of broken analysis << lastIncConverged = .false. ! no Jacobian backup outdatedByNewInc = .false. ! no aging of state calcMode = .true. ! pretend last step was calculation - !$OMP CRITICAL (write2out) - write (6,'(i8,1x,i2,1x,a)') noel,npt,'<< UMAT >> restart of analysis..!' - flush(6) - !$OMP END CRITICAL (write2out) + write (6,'(i8,1x,i2,1x,a)') noel,npt,'<< UMAT >> restart of analysis..!';flush(6) else ! >> just the next inc << lastIncConverged = .true. ! request Jacobian backup outdatedByNewInc = .true. ! request aging of state calcMode = .true. ! assure last step was calculation - !$OMP CRITICAL (write2out) - write (6,'(i8,1x,i2,1x,a)') noel,npt,'<< UMAT >> new increment..!' - flush(6) - !$OMP END CRITICAL (write2out) + write (6,'(i8,1x,i2,1x,a)') noel,npt,'<< UMAT >> new increment..!';flush(6) endif else if ( dtime < theDelta ) then ! >> cutBack << lastIncConverged = .false. ! no Jacobian backup @@ -259,10 +248,7 @@ subroutine UMAT(STRESS,STATEV,DDSDDE,SSE,SPD,SCD,& terminallyIll = .false. cycleCounter = -1 ! first calc step increments this to cycle = 0 calcMode = .true. ! pretend last step was calculation - !$OMP CRITICAL (write2out) - write(6,'(i8,1x,i2,1x,a)') noel,npt,'<< UMAT >> cutback detected..!' - flush(6) - !$OMP END CRITICAL (write2out) + write(6,'(i8,1x,i2,1x,a)') noel,npt,'<< UMAT >> cutback detected..!';flush(6) endif ! convergence treatment end @@ -315,10 +301,8 @@ subroutine UMAT(STRESS,STATEV,DDSDDE,SSE,SPD,SCD,& lastStep = kStep ! record step number if (iand(debug_level(debug_abaqus),debug_levelBasic) /= 0) then - !$OMP CRITICAL (write2out) write(6,'(a16,1x,i2,1x,a,i8,a,i8,1x,i5,a)') 'computationMode',computationMode,'(',cp_en,':',noel,npt,')' flush(6) - !$OMP END CRITICAL (write2out) endif call CPFEM_general(computationMode,usePingPong,dfgrd0,dfgrd1,temperature,dtime,noel,npt,stress_h,ddsdde_h) @@ -360,7 +344,7 @@ subroutine quit(mpie_error) pInt implicit none - integer(pInt) mpie_error + integer(pInt) :: mpie_error flush(6) call xit