From dabfa6d2e60228005fe245cbdec7dd479526e8a0 Mon Sep 17 00:00:00 2001 From: Pratheek Shanthraj Date: Fri, 26 Sep 2014 16:07:26 +0000 Subject: [PATCH] renamed get/put thermal to get/put temperature and thermal_none to thermal_isothermal --- code/DAMASK_abaqus_exp.f | 2 +- code/DAMASK_abaqus_std.f | 2 +- code/DAMASK_marc.f90 | 2 +- code/constitutive.f90 | 18 +++++++++--------- code/homogenization.f90 | 36 ++++++++++++++++++------------------ code/material.f90 | 20 ++++++++++---------- code/thermal_none.f90 | 30 +++++++++++++++--------------- 7 files changed, 55 insertions(+), 55 deletions(-) diff --git a/code/DAMASK_abaqus_exp.f b/code/DAMASK_abaqus_exp.f index 186f88ea4..7cf65e9c8 100644 --- a/code/DAMASK_abaqus_exp.f +++ b/code/DAMASK_abaqus_exp.f @@ -84,7 +84,7 @@ end module DAMASK_interface #include "lattice.f90" #include "damage_none.f90" #include "damage_brittle.f90" -#include "thermal_none.f90" +#include "thermal_isothermal.f90" #include "thermal_adiabatic.f90" #include "constitutive_none.f90" #include "constitutive_j2.f90" diff --git a/code/DAMASK_abaqus_std.f b/code/DAMASK_abaqus_std.f index 852781c9c..a2c68e5a8 100644 --- a/code/DAMASK_abaqus_std.f +++ b/code/DAMASK_abaqus_std.f @@ -84,7 +84,7 @@ end module DAMASK_interface #include "lattice.f90" #include "damage_none.f90" #include "damage_brittle.f90" -#include "thermal_none.f90" +#include "thermal_isothermal.f90" #include "thermal_adiabatic.f90" #include "constitutive_none.f90" #include "constitutive_j2.f90" diff --git a/code/DAMASK_marc.f90 b/code/DAMASK_marc.f90 index 6dbbbf203..87ebd2e20 100644 --- a/code/DAMASK_marc.f90 +++ b/code/DAMASK_marc.f90 @@ -113,7 +113,7 @@ end module DAMASK_interface #include "lattice.f90" #include "damage_none.f90" #include "damage_brittle.f90" -#include "thermal_none.f90" +#include "thermal_isothermal.f90" #include "thermal_adiabatic.f90" #include "constitutive_none.f90" #include "constitutive_j2.f90" diff --git a/code/constitutive.f90 b/code/constitutive.f90 index b4da11b92..2e69459f1 100644 --- a/code/constitutive.f90 +++ b/code/constitutive.f90 @@ -109,12 +109,12 @@ subroutine constitutive_init LOCAL_DAMAGE_NONE_ID, & LOCAL_DAMAGE_BRITTLE_ID, & LOCAL_DAMAGE_DUCTILE_ID, & - LOCAL_THERMAL_none_ID, & + LOCAL_THERMAL_ISOTHERMAL_ID, & LOCAL_THERMAL_HEATGEN_ID, & LOCAL_DAMAGE_NONE_label, & LOCAL_DAMAGE_BRITTLE_label, & LOCAL_DAMAGE_DUCTILE_label, & - LOCAL_THERMAL_none_label, & + LOCAL_THERMAL_ISOTHERMAL_label, & LOCAL_THERMAL_HEATGEN_label, & plasticState, & damageState, & @@ -132,7 +132,7 @@ subroutine constitutive_init use damage_none use damage_brittle use damage_ductile - use thermal_none + use thermal_isothermal use thermal_adiabatic implicit none integer(pInt), parameter :: FILEUNIT = 200_pInt @@ -177,7 +177,7 @@ subroutine constitutive_init ! parse thermal from config file if (.not. IO_open_jobFile_stat(FILEUNIT,material_localFileExt)) & ! no local material configuration present... call IO_open_file(FILEUNIT,material_configFile) ! ... open material.config file - if (any(phase_thermal == LOCAL_THERMAL_none_ID)) call thermal_none_init(FILEUNIT) + if (any(phase_thermal == LOCAL_THERMAL_ISOTHERMAL_ID)) call thermal_isothermal_init(FILEUNIT) ! if (any(phase_thermal == LOCAL_THERMAL_HEATGEN_ID)) call thermal_heatgen_init(FILEUNIT) close(FILEUNIT) @@ -273,8 +273,8 @@ subroutine constitutive_init instance = phase_thermalInstance(phase) ! which instance is present phase knownThermal = .true. select case(phase_thermal(phase)) ! split per constititution - case (LOCAL_THERMAL_none_ID) - outputName = LOCAL_THERMAL_NONE_label + case (LOCAL_THERMAL_ISOTHERMAL_ID) + outputName = LOCAL_THERMAL_ISOTHERMAL_label thisNoutput => null() thisOutput => null() thisSize => null() @@ -288,7 +288,7 @@ subroutine constitutive_init end select if (knownThermal) then write(FILEUNIT,'(a)') '(thermal)'//char(9)//trim(outputName) - if (phase_thermal(phase) /= LOCAL_THERMAL_none_ID) then + if (phase_thermal(phase) /= LOCAL_THERMAL_ISOTHERMAL_ID) then do e = 1_pInt,thisNoutput(instance) write(FILEUNIT,'(a,i4)') trim(thisOutput(e,instance))//char(9),thisSize(e,instance) enddo @@ -917,7 +917,7 @@ function constitutive_getAdiabaticThermal(ipc, ip, el) pReal use material, only: & material_phase, & - LOCAL_THERMAL_none_ID, & + LOCAL_THERMAL_ISOTHERMAL_ID, & LOCAL_THERMAL_HEATGEN_ID, & phase_thermal use thermal_adiabatic, only: & @@ -933,7 +933,7 @@ function constitutive_getAdiabaticThermal(ipc, ip, el) real(pReal) :: constitutive_getAdiabaticThermal select case (phase_thermal(material_phase(ipc,ip,el))) - case (LOCAL_THERMAL_none_ID) + case (LOCAL_THERMAL_ISOTHERMAL_ID) constitutive_getAdiabaticThermal = lattice_referenceTemperature(material_phase(ipc,ip,el)) case (LOCAL_THERMAL_HEATGEN_ID) diff --git a/code/homogenization.f90 b/code/homogenization.f90 index 60b644d4f..6441df65b 100644 --- a/code/homogenization.f90 +++ b/code/homogenization.f90 @@ -64,10 +64,10 @@ module homogenization public :: & homogenization_init, & materialpoint_stressAndItsTangent, & - field_getDAMAGE, & - field_putDAMAGE, & - field_getThermal, & - field_putThermal, & + field_getLocalDamage, & + field_putFieldDamage, & + field_getLocalTemperature, & + field_putFieldTemperature, & field_getDamageMobility, & field_getDamageDiffusion33, & field_getThermalConductivity33, & @@ -1129,7 +1129,7 @@ end function field_getDamageMobility !-------------------------------------------------------------------------------------------------- !> @brief ToDo !-------------------------------------------------------------------------------------------------- -real(pReal) function field_getDAMAGE(ip,el) +real(pReal) function field_getLocalDamage(ip,el) use mesh, only: & mesh_element use material, only: & @@ -1146,20 +1146,20 @@ real(pReal) function field_getDAMAGE(ip,el) !-------------------------------------------------------------------------------------------------- ! computing the damage value needed to be passed to field solver - field_getDAMAGE =0.0_pReal + field_getLocalDamage =0.0_pReal do ipc = 1, homogenization_Ngrains(mesh_element(3,el)) - field_getDAMAGE = field_getDAMAGE + constitutive_getLocalDamage(ipc,ip,el) + field_getLocalDamage = field_getLocalDamage + constitutive_getLocalDamage(ipc,ip,el) enddo - field_getDAMAGE = field_getDAMAGE /homogenization_Ngrains(mesh_element(3,el)) + field_getLocalDamage = field_getLocalDamage /homogenization_Ngrains(mesh_element(3,el)) -end function field_getDAMAGE +end function field_getLocalDamage !-------------------------------------------------------------------------------------------------- !> @brief Sets the regularised damage value in field state !-------------------------------------------------------------------------------------------------- -subroutine field_putDAMAGE(ip,el,fieldDamageValue) ! naming scheme +subroutine field_putFieldDamage(ip,el,fieldDamageValue) ! naming scheme use material, only: & fieldDamage, & material_homog, & @@ -1181,12 +1181,12 @@ subroutine field_putDAMAGE(ip,el,fieldDamageValue) ! naming scheme end select -end subroutine field_putDAMAGE +end subroutine field_putFieldDamage !-------------------------------------------------------------------------------------------------- !> @brief ToDo !-------------------------------------------------------------------------------------------------- -real(pReal) function field_getThermal(ip,el) +real(pReal) function field_getLocalTemperature(ip,el) use mesh, only: & mesh_element use material, only: & @@ -1202,18 +1202,18 @@ real(pReal) function field_getThermal(ip,el) ipc - field_getThermal = 0.0_pReal + field_getLocalTemperature = 0.0_pReal do ipc = 1, homogenization_Ngrains(mesh_element(3,el)) - field_getThermal = field_getThermal + constitutive_getAdiabaticThermal(ipc,ip,el) ! array/function/subroutine which is faster + field_getLocalTemperature = field_getLocalTemperature + constitutive_getAdiabaticThermal(ipc,ip,el) ! array/function/subroutine which is faster enddo - field_getThermal = field_getThermal /homogenization_Ngrains(mesh_element(3,el)) + field_getLocalTemperature = field_getLocalTemperature /homogenization_Ngrains(mesh_element(3,el)) -end function field_getThermal +end function field_getLocalTemperature !-------------------------------------------------------------------------------------------------- !> @brief Sets the regularised temperature value in field state !-------------------------------------------------------------------------------------------------- -subroutine field_putThermal(ip,el,fieldThermalValue) +subroutine field_putFieldTemperature(ip,el,fieldThermalValue) use material, only: & material_homog, & fieldThermal, & @@ -1235,7 +1235,7 @@ subroutine field_putThermal(ip,el,fieldThermalValue) end select -end subroutine field_putThermal +end subroutine field_putFieldTemperature !-------------------------------------------------------------------------------------------------- !> @brief return array of homogenization results for post file inclusion. call only, diff --git a/code/material.f90 b/code/material.f90 index 24b2348e9..2917abe12 100644 --- a/code/material.f90 +++ b/code/material.f90 @@ -30,7 +30,7 @@ module material LOCAL_DAMAGE_NONE_label = 'none', & LOCAL_DAMAGE_BRITTLE_label = 'brittle', & LOCAL_DAMAGE_DUCTILE_label = 'ductile', & - LOCAL_THERMAL_NONE_label = 'none', & + LOCAL_THERMAL_ISOTHERMAL_label = 'isothermal', & LOCAL_THERMAL_HEATGEN_label = 'heatgen', & FIELD_DAMAGE_LOCAL_label = 'local', & FIELD_DAMAGE_NONLOCAL_label = 'nonlocal', & @@ -64,7 +64,7 @@ module material end enum enum, bind(c) - enumerator :: LOCAL_THERMAL_NONE_ID, & + enumerator :: LOCAL_THERMAL_ISOTHERMAL_ID, & LOCAL_THERMAL_HEATGEN_ID end enum enum, bind(c) @@ -96,13 +96,13 @@ module material phase_elasticity !< elasticity of each phase integer(kind(PLASTICITY_undefined_ID)), dimension(:), allocatable, public, protected :: & phase_plasticity !< plasticity of each phase - integer(kind(LOCAL_DAMAGE_none_ID)), dimension(:), allocatable, public, protected :: & + integer(kind(LOCAL_DAMAGE_none_ID)), dimension(:), allocatable, public, protected :: & phase_damage !< local damage of each phase - integer(kind(LOCAL_THERMAL_none_ID)), dimension(:), allocatable, public, protected :: & + integer(kind(LOCAL_THERMAL_isothermal_ID)), dimension(:), allocatable, public, protected :: & phase_thermal !< local thermal of each phase - integer(kind(FIELD_DAMAGE_LOCAL_ID)), dimension(:), allocatable, public, protected :: & + integer(kind(FIELD_DAMAGE_LOCAL_ID)), dimension(:), allocatable, public, protected :: & field_damage_type !< field damage of each phase - integer(kind(FIELD_THERMAL_ADIABATIC_ID)), dimension(:), allocatable, public, protected :: & + integer(kind(FIELD_THERMAL_ADIABATIC_ID)), dimension(:), allocatable, public, protected :: & field_thermal_type !< field thermal of each phase integer(kind(HOMOGENIZATION_undefined_ID)), dimension(:), allocatable, public, protected :: & @@ -216,7 +216,7 @@ module material LOCAL_DAMAGE_none_ID, & LOCAL_DAMAGE_brittle_ID, & LOCAL_DAMAGE_ductile_ID, & - LOCAL_THERMAL_none_ID, & + LOCAL_THERMAL_isothermal_ID, & LOCAL_THERMAL_heatgen_ID, & FIELD_DAMAGE_LOCAL_ID, & FIELD_DAMAGE_NONLOCAL_ID, & @@ -717,7 +717,7 @@ subroutine material_parsePhase(fileUnit,myPart) allocate(phase_plasticityInstance(Nsections), source=0_pInt) allocate(phase_damage(Nsections) , source=LOCAL_DAMAGE_none_ID) allocate(phase_damageInstance(Nsections), source=0_pInt) - allocate(phase_thermal(Nsections) , source=LOCAL_THERMAL_none_ID) + allocate(phase_thermal(Nsections) , source=LOCAL_THERMAL_isothermal_ID) allocate(phase_thermalInstance(Nsections), source=0_pInt) allocate(phase_Noutput(Nsections), source=0_pInt) allocate(phase_localPlasticity(Nsections), source=.false.) @@ -791,8 +791,8 @@ subroutine material_parsePhase(fileUnit,myPart) phase_damageInstance(section) = count(phase_damage(1:section) == phase_damage(section)) ! count instances case ('thermal') select case (IO_lc(IO_stringValue(line,positions,2_pInt))) - case (LOCAL_THERMAL_NONE_label) - phase_thermal(section) = LOCAL_THERMAL_none_ID + case (LOCAL_THERMAL_ISOTHERMAL_label) + phase_thermal(section) = LOCAL_THERMAL_isothermal_ID case (LOCAL_THERMAL_HEATGEN_label) phase_thermal(section) = LOCAL_THERMAL_HEATGEN_ID case default diff --git a/code/thermal_none.f90 b/code/thermal_none.f90 index 0f903555c..54936e292 100644 --- a/code/thermal_none.f90 +++ b/code/thermal_none.f90 @@ -1,24 +1,24 @@ !-------------------------------------------------------------------------------------------------- -! $Id: thermal_none.f90 3148 2014-05-27 14:46:03Z MPIE\m.diehl $ +! $Id: thermal_isothermal.f90 3148 2014-05-27 14:46:03Z MPIE\m.diehl $ !-------------------------------------------------------------------------------------------------- !> @author Franz Roters, Max-Planck-Institut für Eisenforschung GmbH !> @author Philip Eisenlohr, Max-Planck-Institut für Eisenforschung GmbH !> @brief material subroutine for purely elastic material !-------------------------------------------------------------------------------------------------- -module thermal_none +module thermal_isothermal use prec, only: & pInt implicit none private integer(pInt), dimension(:), allocatable, public, protected :: & - thermal_none_sizePostResults + thermal_isothermal_sizePostResults integer(pInt), dimension(:,:), allocatable, target, public :: & - thermal_none_sizePostResult !< size of each post result output + thermal_isothermal_sizePostResult !< size of each post result output public :: & - thermal_none_init + thermal_isothermal_init contains @@ -27,7 +27,7 @@ contains !> @brief module initialization !> @details reads in material parameters, allocates arrays, and does sanity checks !-------------------------------------------------------------------------------------------------- -subroutine thermal_none_init(fileUnit) +subroutine thermal_isothermal_init(fileUnit) use, intrinsic :: iso_fortran_env ! to get compiler_version and compiler_options (at least for gfortran 4.6 at the moment) use debug, only: & debug_level, & @@ -40,8 +40,8 @@ subroutine thermal_none_init(fileUnit) use material, only: & phase_thermal, & phase_Noutput, & - LOCAL_THERMAL_NONE_label, & - LOCAL_THERMAL_NONE_ID, & + LOCAL_THERMAL_ISOTHERMAL_label, & + LOCAL_THERMAL_ISOTHERMAL_ID, & material_phase, & thermalState, & MATERIAL_partPhase @@ -56,12 +56,12 @@ subroutine thermal_none_init(fileUnit) sizeState, & sizeDotState - write(6,'(/,a)') ' <<<+- thermal_'//LOCAL_THERMAL_NONE_label//' init -+>>>' - write(6,'(a)') ' $Id: thermal_none.f90 3148 2014-05-27 14:46:03Z MPIE\m.diehl $' + write(6,'(/,a)') ' <<<+- thermal_'//LOCAL_THERMAL_ISOTHERMAL_label//' init -+>>>' + write(6,'(a)') ' $Id: thermal_isothermal.f90 3148 2014-05-27 14:46:03Z MPIE\m.diehl $' write(6,'(a15,a)') ' Current time: ',IO_timeStamp() #include "compilation_info.f90" - maxNinstance = int(count(phase_thermal == LOCAL_THERMAL_NONE_ID),pInt) + maxNinstance = int(count(phase_thermal == LOCAL_THERMAL_ISOTHERMAL_ID),pInt) if (maxNinstance == 0_pInt) return if (iand(debug_level(debug_constitutive),debug_levelBasic) /= 0_pInt) & @@ -70,7 +70,7 @@ subroutine thermal_none_init(fileUnit) initializeInstances: do phase = 1_pInt, size(phase_thermal) NofMyPhase=count(material_phase==phase) - if (phase_thermal(phase) == LOCAL_THERMAL_none_ID) then + if (phase_thermal(phase) == LOCAL_THERMAL_ISOTHERMAL_ID) then sizeState = 0_pInt thermalState(phase)%sizeState = sizeState sizeDotState = sizeState @@ -94,8 +94,8 @@ subroutine thermal_none_init(fileUnit) allocate(thermalState(phase)%RKCK45dotState (6,sizeDotState,NofMyPhase)) endif enddo initializeInstances - allocate(thermal_none_sizePostResults(maxNinstance), source=0_pInt) + allocate(thermal_isothermal_sizePostResults(maxNinstance), source=0_pInt) -end subroutine thermal_none_init +end subroutine thermal_isothermal_init -end module thermal_none +end module thermal_isothermal