From ceb385ef39a09828eca0cc7b01327d19883e8030 Mon Sep 17 00:00:00 2001
From: Martin Diehl <m.diehl@mpie.de>
Date: Sun, 23 Sep 2018 21:31:30 +0200
Subject: [PATCH] calcMode not needed for spectral and FEM

---
 src/CPFEM2.f90          | 8 +++-----
 src/DAMASK_FEM.f90      | 2 +-
 src/DAMASK_spectral.f90 | 2 +-
 src/mesh.f90            | 2 +-
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/CPFEM2.f90 b/src/CPFEM2.f90
index 89e65f5fd..1d1fb8342 100644
--- a/src/CPFEM2.f90
+++ b/src/CPFEM2.f90
@@ -18,7 +18,7 @@ contains
 !--------------------------------------------------------------------------------------------------
 !> @brief call (thread safe) all module initializations
 !--------------------------------------------------------------------------------------------------
-subroutine CPFEM_initAll(el,ip)
+subroutine CPFEM_initAll()
  use prec, only: &
    pInt
  use prec, only: &
@@ -55,10 +55,8 @@ subroutine CPFEM_initAll(el,ip)
 #endif
 
  implicit none
- integer(pInt), intent(in) ::                        el, &                                          !< FE el number
-                                                     ip                                             !< FE integration point number
 
- call DAMASK_interface_init                                                                    ! Spectral and FEM interface to commandline
+ call DAMASK_interface_init                                                                         ! Spectral and FEM interface to commandline
  call prec_init
  call IO_init
 #ifdef FEM
@@ -69,7 +67,7 @@ subroutine CPFEM_initAll(el,ip)
  call config_init
  call math_init
  call FE_init
- call mesh_init(ip, el)                                                                        ! pass on coordinates to alter calcMode of first ip
+ call mesh_init
  call lattice_init
  call material_init
  call constitutive_init
diff --git a/src/DAMASK_FEM.f90 b/src/DAMASK_FEM.f90
index ee425585c..f561e38bd 100644
--- a/src/DAMASK_FEM.f90
+++ b/src/DAMASK_FEM.f90
@@ -142,7 +142,7 @@ program DAMASK_FEM
    quit
 !--------------------------------------------------------------------------------------------------
 ! init DAMASK (all modules)
- call CPFEM_initAll(el = 1_pInt, ip = 1_pInt)
+ call CPFEM_initAll
    write(6,'(/,a)')   ' <<<+-  DAMASK_FEM init  -+>>>'
    write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
 #include "compilation_info.f90"
diff --git a/src/DAMASK_spectral.f90 b/src/DAMASK_spectral.f90
index ee5af421c..bab5cfd5c 100644
--- a/src/DAMASK_spectral.f90
+++ b/src/DAMASK_spectral.f90
@@ -154,7 +154,7 @@ program DAMASK_spectral
 
 !--------------------------------------------------------------------------------------------------
 ! init DAMASK (all modules)
- call CPFEM_initAll(el = 1_pInt, ip = 1_pInt)
+ call CPFEM_initAll
  write(6,'(/,a)')   ' <<<+-  DAMASK_spectral init  -+>>>'
  write(6,'(/,a,/)') ' Roters et al., Computational Materials Science, 2018'
  write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
diff --git a/src/mesh.f90 b/src/mesh.f90
index 19035b067..356594e53 100644
--- a/src/mesh.f90
+++ b/src/mesh.f90
@@ -497,7 +497,7 @@ subroutine mesh_init(ip,el)
  integer :: ierr, worldsize
 #endif
  integer(pInt), parameter :: FILEUNIT = 222_pInt
- integer(pInt), intent(in) :: el, ip
+ integer(pInt), intent(in), optional :: el, ip
  integer(pInt) :: j
  logical :: myDebug