further cleaning

src/CPFEM2.f90

@@ -22,6 +22,9 @@ module CPFEM2
   use homogenization
   use constitutive
   use crystallite
+#ifdef FEM
+  use FEM_Zoo
+#endif
 
   implicit none
   private
@@ -37,11 +40,7 @@ contains
 !--------------------------------------------------------------------------------------------------
 !> @brief call (thread safe) all module initializations
 !--------------------------------------------------------------------------------------------------
-subroutine CPFEM_initAll()
+subroutine CPFEM_initAll
-#ifdef FEM
- use FEM_Zoo, only: &
-   FEM_Zoo_init
-#endif
 
   call DAMASK_interface_init                                                                         ! Spectral and FEM interface to commandline
   call prec_init

src/FEsolving.f90

@@ -6,6 +6,9 @@
 !--------------------------------------------------------------------------------------------------
 module FEsolving
   use prec
+  use debug
+  use IO
+  use DAMASK_interface
    
   implicit none
   private
@@ -41,21 +44,6 @@ contains
 !> solver the information is provided by the interface module
 !--------------------------------------------------------------------------------------------------
 subroutine FE_init
- use debug, only: &
-   debug_level, &
-   debug_FEsolving, &
-   debug_levelBasic
- use IO, only: &
-   IO_stringPos, &
-   IO_stringValue, &
-   IO_intValue, &
-   IO_lc, &
-#if defined(Marc4DAMASK) || defined(Abaqus)
-   IO_open_inputFile, &
-   IO_open_logFile, &
-#endif
-   IO_warning
- use DAMASK_interface
  
 #if defined(Marc4DAMASK) || defined(Abaqus)
   integer, parameter :: &
@@ -121,7 +109,7 @@ subroutine FE_init
        .and. IO_lc(IO_stringValue(line,chunkPos,4)) == 'id' )    &
          modelName = IO_StringValue(line,chunkPos,6)
     enddo
-#else                                                                                               ! QUESTION: is this meaningful for the spectral/FEM case?
+#else
     call IO_open_inputFile(FILEUNIT,modelName)
     rewind(FILEUNIT)
     do

src/element.f90

@@ -4,6 +4,7 @@
 !--------------------------------------------------------------------------------------------------
 module element
   use prec
+  use IO
  
   implicit none
   private 
@@ -805,8 +806,6 @@ module element
  contains
  
  subroutine tElement_init(self,elemType)
-   use IO, only: &
-     IO_error
 
    class(tElement) :: self
    integer, intent(in) :: elemType

src/numerics.f90

@@ -5,6 +5,13 @@
 !--------------------------------------------------------------------------------------------------
 module numerics
  use prec
+ use IO
+
+#ifdef PETSc
+#include <petsc/finclude/petscsys.h>
+   use petscsys
+#endif
+!$ use OMP_LIB
 
  implicit none
  private
@@ -113,21 +120,6 @@ contains
 ! a sanity check
 !--------------------------------------------------------------------------------------------------
 subroutine numerics_init
- use IO, only: &
-   IO_read_ASCII, &
-   IO_error, &
-   IO_isBlank, &
-   IO_stringPos, &
-   IO_stringValue, &
-   IO_lc, &
-   IO_floatValue, &
-   IO_intValue, &
-   IO_warning
-#ifdef PETSc
-#include <petsc/finclude/petscsys.h>
-   use petscsys
-#endif
-!$ use OMP_LIB, only: omp_set_num_threads
 !$ integer ::                                gotDAMASK_NUM_THREADS = 1
  integer :: i,j, ierr
  integer, allocatable, dimension(:) :: chunkPos

src/thermal_isothermal.f90

@@ -3,6 +3,9 @@
 !> @brief material subroutine for isothermal temperature field
 !--------------------------------------------------------------------------------------------------
 module thermal_isothermal
+  use prec
+  use config
+  use material
 
   implicit none
   private
@@ -15,12 +18,7 @@ contains
 !--------------------------------------------------------------------------------------------------
 !> @brief allocates all neccessary fields, reads information from material configuration file
 !--------------------------------------------------------------------------------------------------
-subroutine thermal_isothermal_init()
+subroutine thermal_isothermal_init
- use prec, only: &
-   pReal
- use config, only: &
-   material_Nhomogenization
- use material
  
   integer :: &
     homog, &
@@ -45,7 +43,6 @@ subroutine thermal_isothermal_init()
 
   enddo initializeInstances
 
-
 end subroutine thermal_isothermal_init
 
 end module thermal_isothermal