From f2164a5bd3cb8c89c09056024b069daaf433d00d Mon Sep 17 00:00:00 2001
From: Martin Diehl <m.diehl@mpie.de>
Date: Mon, 27 Apr 2020 13:40:22 +0200
Subject: [PATCH] simplified

openMP is not used here ...
---
 src/CPFEM.f90       | 40 ++++++++++++++++++----------------------
 src/DAMASK_marc.f90 |  3 +--
 2 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/src/CPFEM.f90 b/src/CPFEM.f90
index c590a86b5..5394fc90c 100644
--- a/src/CPFEM.f90
+++ b/src/CPFEM.f90
@@ -73,28 +73,24 @@ subroutine CPFEM_initAll(el,ip)
   integer(pInt), intent(in) :: el, &                                                                !< FE el number
                                ip                                                                   !< FE integration point number
 
-  !$OMP CRITICAL(init)
-  if (.not. CPFEM_init_done) then
-    call DAMASK_interface_init
-    call prec_init
-    call IO_init
-    call numerics_init
-    call debug_init
-    call config_init
-    call math_init
-    call rotations_init
-    call HDF5_utilities_init
-    call results_init
-    call discretization_marc_init(ip, el)
-    call lattice_init
-    call material_init
-    call constitutive_init
-    call crystallite_init
-    call homogenization_init
-    call CPFEM_init
-    CPFEM_init_done = .true.
-  endif
-  !$OMP END CRITICAL(init)
+  CPFEM_init_done = .true.
+  call DAMASK_interface_init
+  call prec_init
+  call IO_init
+  call numerics_init
+  call debug_init
+  call config_init
+  call math_init
+  call rotations_init
+  call HDF5_utilities_init
+  call results_init
+  call discretization_marc_init(ip, el)
+  call lattice_init
+  call material_init
+  call constitutive_init
+  call crystallite_init
+  call homogenization_init
+  call CPFEM_init
 
 end subroutine CPFEM_initAll
 
diff --git a/src/DAMASK_marc.f90 b/src/DAMASK_marc.f90
index 9fd41459b..fa0711b02 100644
--- a/src/DAMASK_marc.f90
+++ b/src/DAMASK_marc.f90
@@ -261,11 +261,10 @@ subroutine hypela2(d,g,e,de,s,t,dt,ngens,m,nn,kcus,matus,ndi,nshear,disp, &
  endif
 
  !$ defaultNumThreadsInt = omp_get_num_threads()                                                    ! remember number of threads set by Marc
+ !$ call omp_set_num_threads(DAMASK_NumThreadsInt)                                                  ! set number of threads for parallel execution set by DAMASK_NUM_THREADS
 
  if (.not. CPFEM_init_done) call CPFEM_initAll(m(1),nn)
 
- !$ call omp_set_num_threads(DAMASK_NumThreadsInt)                                                  ! set number of threads for parallel execution set by DAMASK_NUM_THREADS
-
  computationMode = 0                                                                                ! save initialization value, since it does not result in any calculation
  if (lovl == 4 ) then                                                                               ! jacobian requested by marc
    if (timinc < theDelta .and. theInc == inc .and. lastLovl /= lovl) &                              ! first after cutback