223031012
/
DAMASK_EICMD
mirror of https://github.com/achalhp/DAMASK_EICMD.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

public variables not needed anymore

This commit is contained in:
Martin Diehl 2019-12-21 10:43:36 +01:00
parent 7baf4e7f53
commit 6678770c43
2 changed files with 19 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/thermal_adiabatic.f90
View File

@ -15,13 +15,7 @@ module thermal_adiabatic
implicit none implicit none
private private
character(len=64), dimension(:,:), allocatable, target, public :: &
thermal_adiabatic_output !< name of each post result output
integer, dimension(:), allocatable, target, public :: &
thermal_adiabatic_Noutput !< number of outputs per instance of this thermal model
enum, bind(c) enum, bind(c)
enumerator :: undefined_ID, & enumerator :: undefined_ID, &
temperature_ID temperature_ID
@ -34,10 +28,6 @@ module thermal_adiabatic
type(tparameters), dimension(:), allocatable :: & type(tparameters), dimension(:), allocatable :: &
param param
integer(kind(undefined_ID)), dimension(:,:), allocatable :: &
thermal_adiabatic_outputID !< ID of each post result output
public :: & public :: &
thermal_adiabatic_init, & thermal_adiabatic_init, &
@ -67,12 +57,6 @@ subroutine thermal_adiabatic_init
allocate(param(maxNinstance)) allocate(param(maxNinstance))
allocate(thermal_adiabatic_output (maxval(homogenization_Noutput),maxNinstance))
thermal_adiabatic_output = ''
allocate(thermal_adiabatic_outputID (maxval(homogenization_Noutput),maxNinstance),source=undefined_ID)
allocate(thermal_adiabatic_Noutput (maxNinstance), source=0)
initializeInstances: do section = 1, size(thermal_type) initializeInstances: do section = 1, size(thermal_type)
if (thermal_type(section) /= THERMAL_adiabatic_ID) cycle if (thermal_type(section) /= THERMAL_adiabatic_ID) cycle
associate(prm => param(thermal_typeInstance(section)), & associate(prm => param(thermal_typeInstance(section)), &
@ -80,13 +64,12 @@ subroutine thermal_adiabatic_init
NofMyHomog=count(material_homogenizationAt==section) NofMyHomog=count(material_homogenizationAt==section)
instance = thermal_typeInstance(section) instance = thermal_typeInstance(section)
outputs = config_homogenization(section)%getStrings('(output)',defaultVal=emptyStringArray) outputs = config%getStrings('(output)',defaultVal=emptyStringArray)
allocate(prm%outputID(0))
do i=1, size(outputs) do i=1, size(outputs)
select case(outputs(i)) select case(outputs(i))
case('temperature') case('temperature')
thermal_adiabatic_Noutput(instance) = thermal_adiabatic_Noutput(instance) + 1 prm%outputID = [prm%outputID, temperature_ID]
thermal_adiabatic_outputID(thermal_adiabatic_Noutput(instance),instance) = temperature_ID
thermal_adiabatic_output(thermal_adiabatic_Noutput(instance),instance) = outputs(i)
end select end select
enddo enddo
@ -269,18 +252,19 @@ subroutine thermal_adiabatic_results(homog,group)
integer, intent(in) :: homog integer, intent(in) :: homog
character(len=*), intent(in) :: group character(len=*), intent(in) :: group
integer :: o, instance integer :: o
instance = thermal_typeInstance(homog) associate(prm => param(damage_typeInstance(homog)))
outputsLoop: do o = 1,thermal_adiabatic_Noutput(instance) outputsLoop: do o = 1,size(prm%outputID)
select case(thermal_adiabatic_outputID(o,instance)) select case(prm%outputID(o))
case (temperature_ID) case (temperature_ID)
call results_writeDataset(group,temperature(homog)%p,'T',& call results_writeDataset(group,temperature(homog)%p,'T',&
'temperature','K') 'temperature','K')
end select end select
enddo outputsLoop enddo outputsLoop
end associate
end subroutine thermal_adiabatic_results end subroutine thermal_adiabatic_results

36
src/thermal_conduction.f90
View File

@ -14,13 +14,7 @@ module thermal_conduction
implicit none implicit none
private private
character(len=64), dimension(:,:), allocatable, target, public :: &
thermal_conduction_output !< name of each post result output
integer, dimension(:), allocatable, target, public :: &
thermal_conduction_Noutput !< number of outputs per instance of this damage
enum, bind(c) enum, bind(c)
enumerator :: undefined_ID, & enumerator :: undefined_ID, &
temperature_ID temperature_ID
@ -32,11 +26,7 @@ module thermal_conduction
end type tParameters end type tParameters
type(tparameters), dimension(:), allocatable :: & type(tparameters), dimension(:), allocatable :: &
param param
integer(kind(undefined_ID)), dimension(:,:), allocatable, private :: &
thermal_conduction_outputID !< ID of each post result output
public :: & public :: &
thermal_conduction_init, & thermal_conduction_init, &
@ -70,12 +60,6 @@ subroutine thermal_conduction_init
allocate(param(maxNinstance)) allocate(param(maxNinstance))
allocate(thermal_conduction_output (maxval(homogenization_Noutput),maxNinstance))
thermal_conduction_output = ''
allocate(thermal_conduction_outputID (maxval(homogenization_Noutput),maxNinstance),source=undefined_ID)
allocate(thermal_conduction_Noutput (maxNinstance), source=0)
initializeInstances: do section = 1, size(thermal_type) initializeInstances: do section = 1, size(thermal_type)
if (thermal_type(section) /= THERMAL_conduction_ID) cycle if (thermal_type(section) /= THERMAL_conduction_ID) cycle
associate(prm => param(thermal_typeInstance(section)), & associate(prm => param(thermal_typeInstance(section)), &
@ -83,13 +67,12 @@ subroutine thermal_conduction_init
NofMyHomog=count(material_homogenizationAt==section) NofMyHomog=count(material_homogenizationAt==section)
instance = thermal_typeInstance(section) instance = thermal_typeInstance(section)
outputs = config_homogenization(section)%getStrings('(output)',defaultVal=emptyStringArray) outputs = config%getStrings('(output)',defaultVal=emptyStringArray)
allocate(prm%outputID(0))
do i=1, size(outputs) do i=1, size(outputs)
select case(outputs(i)) select case(outputs(i))
case('temperature') case('temperature')
thermal_conduction_Noutput(instance) = thermal_conduction_Noutput(instance) + 1 prm%outputID = [prm%outputID, temperature_ID]
thermal_conduction_outputID(thermal_conduction_Noutput(instance),instance) = temperature_ID
thermal_conduction_output(thermal_conduction_Noutput(instance),instance) = outputs(i)
end select end select
enddo enddo
@ -283,18 +266,19 @@ subroutine thermal_conduction_results(homog,group)
integer, intent(in) :: homog integer, intent(in) :: homog
character(len=*), intent(in) :: group character(len=*), intent(in) :: group
integer :: o, instance integer :: o
instance = thermal_typeInstance(homog) associate(prm => param(damage_typeInstance(homog)))
outputsLoop: do o = 1,thermal_conduction_Noutput(instance) outputsLoop: do o = 1,size(prm%outputID)
select case(thermal_conduction_outputID(o,instance)) select case(prm%outputID(o))
case (temperature_ID) case (temperature_ID)
call results_writeDataset(group,temperature(homog)%p,'T',& call results_writeDataset(group,temperature(homog)%p,'T',&
'temperature','K') 'temperature','K')
end select end select
enddo outputsLoop enddo outputsLoop
end associate
end subroutine thermal_conduction_results end subroutine thermal_conduction_results