modernized

- no pInt
- consistent 2-blank indentation
- use of parameter structure

src/source_thermal_dissipation.f90

@@ -6,28 +6,23 @@
 !--------------------------------------------------------------------------------------------------
 module source_thermal_dissipation
   use prec, only: &
-   pReal, &
+    pReal
-   pInt
  
   implicit none
   private
- integer(pInt),                       dimension(:),           allocatable,         public, protected :: &
+  integer,           dimension(:),   allocatable,         public, protected :: &
     source_thermal_dissipation_offset, &                                                                 !< which source is my current thermal dissipation mechanism?
     source_thermal_dissipation_instance                                                                  !< instance of thermal dissipation source mechanism
  
- integer(pInt),                       dimension(:,:),         allocatable, target, public :: &
+  integer,           dimension(:,:), allocatable, target, public :: &
     source_thermal_dissipation_sizePostResult                                                            !< size of each post result output
  
   character(len=64), dimension(:,:), allocatable, target, public :: &
     source_thermal_dissipation_output                                                                    !< name of each post result output
  
- real(pReal),                         dimension(:),           allocatable,        private :: &
-   source_thermal_dissipation_coldworkCoeff
-
-
   type, private :: tParameters                                                                       !< container type for internal constitutive parameters
     real(pReal) :: &
-     coldworkCoeff
+      kappa
   end type tParameters
  
   type(tParameters), dimension(:),   allocatable, private :: param                                     !< containers of constitutive parameters (len Ninstance)
@@ -56,26 +51,27 @@ subroutine source_thermal_dissipation_init
     phase_Noutput, &
     SOURCE_thermal_dissipation_label, &
     SOURCE_thermal_dissipation_ID, &
-   material_phase, &  
+    material_phase
-   sourceState
   use config, only: &
     config_phase, &
     material_Nphase
  
   implicit none
- integer(pInt) :: Ninstance,instance,source,sourceOffset
+  integer :: Ninstance,instance,source,sourceOffset
- integer(pInt) :: NofMyPhase,p   
+  integer :: NofMyPhase,p   
  
   write(6,'(/,a)')   ' <<<+-  source_'//SOURCE_thermal_dissipation_label//' init  -+>>>'
  
   
- Ninstance = int(count(phase_source == SOURCE_thermal_dissipation_ID),pInt)
+  Ninstance = count(phase_source == SOURCE_thermal_dissipation_ID)
- if (Ninstance == 0_pInt) return
+  if (Ninstance == 0) return
- if (iand(debug_level(debug_constitutive),debug_levelBasic) /= 0_pInt) &
+  if (iand(debug_level(debug_constitutive),debug_levelBasic) /= 0) &
     write(6,'(a16,1x,i5,/)') '# instances:',Ninstance
   
- allocate(source_thermal_dissipation_offset(material_Nphase), source=0_pInt)
+  allocate(source_thermal_dissipation_offset(material_Nphase), source=0)
- allocate(source_thermal_dissipation_instance(material_Nphase), source=0_pInt)
+  allocate(source_thermal_dissipation_instance(material_Nphase), source=0)
+  allocate(param(Ninstance))
+  
   do p = 1, material_Nphase
     source_thermal_dissipation_instance(p) = count(phase_source(:,1:p) == SOURCE_thermal_dissipation_ID)
     do source = 1, phase_Nsources(p)
@@ -84,20 +80,18 @@ subroutine source_thermal_dissipation_init
     enddo    
   enddo
     
- allocate(source_thermal_dissipation_sizePostResult(maxval(phase_Noutput),Ninstance),source=0_pInt)
+  allocate(source_thermal_dissipation_sizePostResult(maxval(phase_Noutput),Ninstance),source=0)
   allocate(source_thermal_dissipation_output  (maxval(phase_Noutput),Ninstance))
            source_thermal_dissipation_output = ''
  
- allocate(source_thermal_dissipation_coldworkCoeff(Ninstance),                       source=0.0_pReal) 
-
   do p=1, size(config_phase)
     if (all(phase_source(:,p) /= SOURCE_THERMAL_DISSIPATION_ID)) cycle
     instance = source_thermal_dissipation_instance(p)
-   source_thermal_dissipation_coldworkCoeff(instance) = config_phase(p)%getFloat('dissipation_coldworkcoeff')
+    param(instance)%kappa = config_phase(p)%getFloat('dissipation_coldworkcoeff')
     NofMyPhase=count(material_phase==p)
     sourceOffset = source_thermal_dissipation_offset(p)
  
-   call material_allocateSourceState(p,sourceOffset,NofMyPhase,0_pInt,0_pInt,0_pInt)
+    call material_allocateSourceState(p,sourceOffset,NofMyPhase,0,0,0)
   
   enddo
   
@@ -110,7 +104,7 @@ end subroutine source_thermal_dissipation_init
 subroutine source_thermal_dissipation_getRateAndItsTangent(TDot, dTDOT_dT, Tstar, Lp, phase)
 
   implicit none
- integer(pInt), intent(in) :: &
+  integer, intent(in) :: &
     phase
   real(pReal),  intent(in), dimension(3,3) :: &
     Tstar
@@ -119,12 +113,12 @@ subroutine source_thermal_dissipation_getRateAndItsTangent(TDot, dTDOT_dT, Tstar
   real(pReal),  intent(out) :: &
     TDot, &
     dTDOT_dT
- integer(pInt) :: &
+  integer :: &
     instance
  
   instance = source_thermal_dissipation_instance(phase)
   
- TDot = source_thermal_dissipation_coldworkCoeff(instance)*sum(abs(Tstar*Lp))
+  TDot = param(instance)%kappa*sum(abs(Tstar*Lp))
   dTDOT_dT = 0.0_pReal       
  
 end subroutine source_thermal_dissipation_getRateAndItsTangent