keeping variables local

2021-02-12 15:31:43 +01:00 · 2021-02-12 15:31:43 +01:00 · 4eb2a981ca
parent a09989fe0b
commit 4eb2a981ca
6 changed files with 120 additions and 148 deletions
--- a/src/commercialFEM_fileList.f90
+++ b/src/commercialFEM_fileList.f90
@ -41,7 +41,6 @@
 #include "phase_damage_isoductile.f90"
 #include "phase_damage_anisobrittle.f90"
 #include "phase_damage_anisoductile.f90"
-#include "damage_nonlocal.f90"
 #include "homogenization.f90"
 #include "homogenization_mechanical.f90"
 #include "homogenization_mechanical_pass.f90"
--- a/src/damage_nonlocal.f90
+++ b/src/damage_nonlocal.f90
@ -1,23 +0,0 @@
-!--------------------------------------------------------------------------------------------------
-!> @author Pratheek Shanthraj, Max-Planck-Institut für Eisenforschung GmbH
-!> @brief material subroutine for non-locally evolving damage field
-!--------------------------------------------------------------------------------------------------
-module damage_nonlocal
-  use prec
-  use material
-  use config
-  use YAML_types
-  use lattice
-  use phase
-  use results
-
-  implicit none
-  private
-
-
-
-contains
-
-
-
-end module damage_nonlocal
--- a/src/grid/grid_damage_spectral.f90
+++ b/src/grid/grid_damage_spectral.f90
@ -15,7 +15,6 @@ module grid_damage_spectral
  use IO
  use spectral_utilities
  use discretization_grid
-  use damage_nonlocal
  use YAML_types
  use homogenization
  use config
--- a/src/homogenization.f90
+++ b/src/homogenization.f90
@ -12,7 +12,6 @@ module homogenization
  use material
  use phase
  use discretization
-  use damage_nonlocal
  use HDF5_utilities
  use results
  use lattice
@ -20,6 +19,37 @@ module homogenization
  implicit none
  private

+
+  enum, bind(c); enumerator :: &
+    THERMAL_ISOTHERMAL_ID, &
+    THERMAL_CONDUCTION_ID, &
+    DAMAGE_NONE_ID, &
+    DAMAGE_NONLOCAL_ID, &
+    HOMOGENIZATION_UNDEFINED_ID, &
+    HOMOGENIZATION_NONE_ID, &
+    HOMOGENIZATION_ISOSTRAIN_ID, &
+    HOMOGENIZATION_RGC_ID
+  end enum
+
+    type(tState),        allocatable, dimension(:), public :: &
+    homogState, &
+    damageState_h
+
+  integer, dimension(:), allocatable, public, protected :: &
+    homogenization_typeInstance, &                                                                  !< instance of particular type of each homogenization
+    thermal_typeInstance, &                                                                         !< instance of particular type of each thermal transport
+    damage_typeInstance                                                                             !< instance of particular type of each nonlocal damage
+
+  real(pReal), dimension(:), allocatable, public, protected :: &
+    thermal_initialT
+
+  integer(kind(THERMAL_isothermal_ID)),       dimension(:),   allocatable, public, protected :: &
+    thermal_type                                                                                    !< thermal transport model
+  integer(kind(DAMAGE_none_ID)),              dimension(:),   allocatable, public, protected :: &
+    damage_type                                                                                     !< nonlocal damage model
+  integer(kind(HOMOGENIZATION_undefined_ID)), dimension(:),   allocatable, public, protected :: &
+    homogenization_type                                                                             !< type of each homogenization
+
  type, private :: tNumerics_damage
    real(pReal) :: &
    charLength                                                                                      !< characteristic length scale for gradient problems
@ -202,7 +232,9 @@ module homogenization
    homogenization_forward, &
    homogenization_results, &
    homogenization_restartRead, &
-    homogenization_restartWrite
+    homogenization_restartWrite, &
+    THERMAL_CONDUCTION_ID, &
+    DAMAGE_NONLOCAL_ID

  public :: &
    damage_nonlocal_init, &
@ -222,6 +254,9 @@ subroutine homogenization_init()

  print'(/,a)', ' <<<+-  homogenization init  -+>>>'; flush(IO_STDOUT)

+
+  allocate(homogState      (size(material_name_homogenization)))
+  allocate(damageState_h   (size(material_name_homogenization)))
    call material_parseHomogenization
  print*, 'Homogenization parsed'

@ -516,4 +551,81 @@ function damage_nonlocal_getDiffusion(ip,el)
 end function damage_nonlocal_getDiffusion


+!--------------------------------------------------------------------------------------------------
+!> @brief parses the homogenization part from the material configuration
+! ToDo: This should be done in homogenization
+!--------------------------------------------------------------------------------------------------
+subroutine material_parseHomogenization
+
+  class(tNode), pointer :: &
+    material_homogenization, &
+    homog, &
+    homogMech, &
+    homogThermal, &
+    homogDamage
+
+  integer :: h
+
+  material_homogenization => config_material%get('homogenization')
+
+  allocate(homogenization_type(size(material_name_homogenization)),           source=HOMOGENIZATION_undefined_ID)
+  allocate(thermal_type(size(material_name_homogenization)),                  source=THERMAL_isothermal_ID)
+  allocate(damage_type (size(material_name_homogenization)),                  source=DAMAGE_none_ID)
+  allocate(homogenization_typeInstance(size(material_name_homogenization)),   source=0)
+  allocate(thermal_typeInstance(size(material_name_homogenization)),          source=0)
+  allocate(damage_typeInstance(size(material_name_homogenization)),           source=0)
+  allocate(thermal_initialT(size(material_name_homogenization)),              source=300.0_pReal)
+
+  do h=1, size(material_name_homogenization)
+    homog => material_homogenization%get(h)
+    homogMech => homog%get('mechanics')
+    select case (homogMech%get_asString('type'))
+      case('pass')
+        homogenization_type(h) = HOMOGENIZATION_NONE_ID
+      case('isostrain')
+        homogenization_type(h) = HOMOGENIZATION_ISOSTRAIN_ID
+      case('RGC')
+        homogenization_type(h) = HOMOGENIZATION_RGC_ID
+      case default
+        call IO_error(500,ext_msg=homogMech%get_asString('type'))
+    end select
+
+    homogenization_typeInstance(h) = count(homogenization_type==homogenization_type(h))
+
+    if(homog%contains('thermal')) then
+      homogThermal => homog%get('thermal')
+        thermal_initialT(h) =  homogThermal%get_asFloat('T_0',defaultVal=300.0_pReal)
+
+        select case (homogThermal%get_asString('type'))
+          case('isothermal')
+            thermal_type(h) = THERMAL_isothermal_ID
+          case('conduction')
+            thermal_type(h) = THERMAL_conduction_ID
+          case default
+            call IO_error(500,ext_msg=homogThermal%get_asString('type'))
+        end select
+    endif
+
+    if(homog%contains('damage')) then
+      homogDamage => homog%get('damage')
+        select case (homogDamage%get_asString('type'))
+          case('none')
+            damage_type(h) = DAMAGE_none_ID
+          case('nonlocal')
+            damage_type(h) = DAMAGE_nonlocal_ID
+          case default
+            call IO_error(500,ext_msg=homogDamage%get_asString('type'))
+        end select
+    endif
+  enddo
+
+  do h=1, size(material_name_homogenization)
+    homogenization_typeInstance(h)  = count(homogenization_type(1:h) == homogenization_type(h))
+    thermal_typeInstance(h)         = count(thermal_type       (1:h) == thermal_type       (h))
+    damage_typeInstance(h)          = count(damage_type        (1:h) == damage_type        (h))
+  enddo
+
+end subroutine material_parseHomogenization
+
+
 end module homogenization
--- a/src/homogenization_mechanical.f90
+++ b/src/homogenization_mechanical.f90
@ -225,8 +225,6 @@ end function mechanical_updateState
 !> @brief Write results to file.
 !--------------------------------------------------------------------------------------------------
 module subroutine mechanical_results(group_base,h)
-  use material, only: &
-    material_homogenization_type => homogenization_type

  character(len=*), intent(in) :: group_base
  integer, intent(in)          :: h
@ -236,7 +234,7 @@ module subroutine mechanical_results(group_base,h)
  group = trim(group_base)//'/mech'
  call results_closeGroup(results_addGroup(group))

-  select case(material_homogenization_type(h))
+  select case(homogenization_type(h))

    case(HOMOGENIZATION_rgc_ID)
      call mechanical_RGC_results(homogenization_typeInstance(h),group)
--- a/src/material.f90
+++ b/src/material.f90
@ -6,50 +6,26 @@
 !--------------------------------------------------------------------------------------------------
 module material
  use prec
-  use math
  use config
  use results
  use IO
  use rotations
  use discretization
+  use YAML_types

  implicit none
  private

-  enum, bind(c); enumerator :: &
-    THERMAL_ISOTHERMAL_ID, &
-    THERMAL_CONDUCTION_ID, &
-    DAMAGE_NONE_ID, &
-    DAMAGE_NONLOCAL_ID, &
-    HOMOGENIZATION_UNDEFINED_ID, &
-    HOMOGENIZATION_NONE_ID, &
-    HOMOGENIZATION_ISOSTRAIN_ID, &
-    HOMOGENIZATION_RGC_ID
-  end enum
+  integer, dimension(:), allocatable, public, protected :: &
+    homogenization_Nconstituents                                                                 !< number of grains in each homogenization

  character(len=:), public, protected, allocatable, dimension(:) :: &
    material_name_phase, &                                                                          !< name of each phase
    material_name_homogenization                                                                    !< name of each homogenization

-  integer(kind(THERMAL_isothermal_ID)),       dimension(:),   allocatable, public, protected :: &
-    thermal_type                                                                                    !< thermal transport model
-  integer(kind(DAMAGE_none_ID)),              dimension(:),   allocatable, public, protected :: &
-    damage_type                                                                                     !< nonlocal damage model
-  integer(kind(HOMOGENIZATION_undefined_ID)), dimension(:),   allocatable, public, protected :: &
-    homogenization_type                                                                             !< type of each homogenization
-
  integer, public, protected :: &
    homogenization_maxNconstituents                                                                 !< max number of grains in any USED homogenization

-  integer, dimension(:), allocatable, public, protected :: &
-    homogenization_Nconstituents, &                                                                 !< number of grains in each homogenization
-    homogenization_typeInstance, &                                                                  !< instance of particular type of each homogenization
-    thermal_typeInstance, &                                                                         !< instance of particular type of each thermal transport
-    damage_typeInstance                                                                             !< instance of particular type of each nonlocal damage
-
-  real(pReal), dimension(:), allocatable, public, protected :: &
-    thermal_initialT                                                                                !< initial temperature per each homogenization
-
  integer, dimension(:),     allocatable, public, protected :: &                                    ! (elem)
    material_homogenizationAt, &                                                                    !< homogenization ID of each element
    material_homogenizationAt2, &                                                                   !< per cell
@ -63,23 +39,11 @@ module material
  integer, dimension(:,:,:), allocatable, public, protected :: &                                    ! (constituent,IP,elem)
    material_phaseMemberAt                                                                          !< position of the element within its phase instance

-  type(tState),        allocatable, dimension(:), public :: &
-    homogState, &
-    damageState_h
-
  type(Rotation), dimension(:,:,:), allocatable, public, protected :: &
    material_orientation0                                                                           !< initial orientation of each grain,IP,element

  public :: &
-    material_init, &
-    THERMAL_ISOTHERMAL_ID, &
-    THERMAL_CONDUCTION_ID, &
-    DAMAGE_NONE_ID, &
-    DAMAGE_NONLOCAL_ID, &
-    HOMOGENIZATION_NONE_ID, &
-    HOMOGENIZATION_ISOSTRAIN_ID, &
-    HOMOGENIZATION_RGC_ID, &
-    material_parseHomogenization
+    material_init

 contains

@ -90,14 +54,13 @@ subroutine material_init(restart)

  logical, intent(in) :: restart

+
  print'(/,a)', ' <<<+-  material init  -+>>>'; flush(IO_STDOUT)


  call material_parseMaterial
  print*, 'Material parsed'

-  allocate(homogState      (size(material_name_homogenization)))
-  allocate(damageState_h   (size(material_name_homogenization)))

  if (.not. restart) then
    call results_openJobFile
@ -109,82 +72,6 @@ subroutine material_init(restart)
 end subroutine material_init


-!--------------------------------------------------------------------------------------------------
-!> @brief parses the homogenization part from the material configuration
-! ToDo: This should be done in homogenization
-!--------------------------------------------------------------------------------------------------
-subroutine material_parseHomogenization
-
-  class(tNode), pointer :: &
-    material_homogenization, &
-    homog, &
-    homogMech, &
-    homogThermal, &
-    homogDamage
-
-  integer :: h
-
-  material_homogenization => config_material%get('homogenization')
-
-  allocate(homogenization_type(size(material_name_homogenization)),           source=HOMOGENIZATION_undefined_ID)
-  allocate(thermal_type(size(material_name_homogenization)),                  source=THERMAL_isothermal_ID)
-  allocate(damage_type (size(material_name_homogenization)),                  source=DAMAGE_none_ID)
-  allocate(homogenization_typeInstance(size(material_name_homogenization)),   source=0)
-  allocate(thermal_typeInstance(size(material_name_homogenization)),          source=0)
-  allocate(damage_typeInstance(size(material_name_homogenization)),           source=0)
-  allocate(thermal_initialT(size(material_name_homogenization)),              source=300.0_pReal)
-
-  do h=1, size(material_name_homogenization)
-    homog => material_homogenization%get(h)
-    homogMech => homog%get('mechanics')
-    select case (homogMech%get_asString('type'))
-      case('pass')
-        homogenization_type(h) = HOMOGENIZATION_NONE_ID
-      case('isostrain')
-        homogenization_type(h) = HOMOGENIZATION_ISOSTRAIN_ID
-      case('RGC')
-        homogenization_type(h) = HOMOGENIZATION_RGC_ID
-      case default
-        call IO_error(500,ext_msg=homogMech%get_asString('type'))
-    end select
-
-    homogenization_typeInstance(h) = count(homogenization_type==homogenization_type(h))
-
-    if(homog%contains('thermal')) then
-      homogThermal => homog%get('thermal')
-        thermal_initialT(h) =  homogThermal%get_asFloat('T_0',defaultVal=300.0_pReal)
-
-        select case (homogThermal%get_asString('type'))
-          case('isothermal')
-            thermal_type(h) = THERMAL_isothermal_ID
-          case('conduction')
-            thermal_type(h) = THERMAL_conduction_ID
-          case default
-            call IO_error(500,ext_msg=homogThermal%get_asString('type'))
-        end select
-    endif
-
-    if(homog%contains('damage')) then
-      homogDamage => homog%get('damage')
-        select case (homogDamage%get_asString('type'))
-          case('none')
-            damage_type(h) = DAMAGE_none_ID
-          case('nonlocal')
-            damage_type(h) = DAMAGE_nonlocal_ID
-          case default
-            call IO_error(500,ext_msg=homogDamage%get_asString('type'))
-        end select
-    endif
-  enddo
-
-  do h=1, size(material_name_homogenization)
-    homogenization_typeInstance(h)  = count(homogenization_type(1:h) == homogenization_type(h))
-    thermal_typeInstance(h)         = count(thermal_type       (1:h) == thermal_type       (h))
-    damage_typeInstance(h)          = count(damage_type        (1:h) == damage_type        (h))
-  enddo
-
-end subroutine material_parseHomogenization
-

 !--------------------------------------------------------------------------------------------------
 !> @brief parses the material part in the material configuration file