determining output size was overly complicated

general cleaning
2019-02-12 23:20:24 +01:00 · 2019-02-12 23:20:24 +01:00 · 69d53ed869
parent be7f740e65
commit 69d53ed869
2 changed files with 23 additions and 68 deletions
--- a/src/thermal_adiabatic.f90
+++ b/src/thermal_adiabatic.f90
@ -69,7 +69,7 @@ subroutine thermal_adiabatic_init
   config_homogenization

 implicit none
- integer(pInt) :: maxNinstance,mySize=0_pInt,section,instance,o,i
+ integer(pInt) :: maxNinstance,section,instance,i
 integer(pInt) :: sizeState
 integer(pInt) :: NofMyHomog   
 character(len=65536),   dimension(0), parameter :: emptyStringArray = [character(len=65536)::]
@ -100,36 +100,24 @@ subroutine thermal_adiabatic_init
             thermal_adiabatic_Noutput(instance) = thermal_adiabatic_Noutput(instance) + 1_pInt
             thermal_adiabatic_outputID(thermal_adiabatic_Noutput(instance),instance) = temperature_ID
             thermal_adiabatic_output(thermal_adiabatic_Noutput(instance),instance) = outputs(i)
+             thermal_adiabatic_sizePostResult(thermal_adiabatic_Noutput(instance),instance) = 1_pInt
     end select
   enddo

-!--------------------------------------------------------------------------------------------------
-!  Determine size of postResults array
-     outputsLoop: do o = 1_pInt,thermal_adiabatic_Noutput(instance)
-       select case(thermal_adiabatic_outputID(o,instance))
-         case(temperature_ID)
-           mySize = 1_pInt
-       end select
- 
-       if (mySize > 0_pInt) then  ! any meaningful output found
-          thermal_adiabatic_sizePostResult(o,instance) = mySize
-       endif
-     enddo outputsLoop
-
 ! allocate state arrays
-     sizeState = 1_pInt
-     thermalState(section)%sizeState = sizeState
-     thermalState(section)%sizePostResults = sum(thermal_adiabatic_sizePostResult(:,instance))
-     allocate(thermalState(section)%state0   (sizeState,NofMyHomog), source=thermal_initialT(section))
-     allocate(thermalState(section)%subState0(sizeState,NofMyHomog), source=thermal_initialT(section))
-     allocate(thermalState(section)%state    (sizeState,NofMyHomog), source=thermal_initialT(section))
+   sizeState = 1_pInt
+   thermalState(section)%sizeState = sizeState
+   thermalState(section)%sizePostResults = sum(thermal_adiabatic_sizePostResult(:,instance))
+   allocate(thermalState(section)%state0   (sizeState,NofMyHomog), source=thermal_initialT(section))
+   allocate(thermalState(section)%subState0(sizeState,NofMyHomog), source=thermal_initialT(section))
+   allocate(thermalState(section)%state    (sizeState,NofMyHomog), source=thermal_initialT(section))

-     nullify(thermalMapping(section)%p)
-     thermalMapping(section)%p => mappingHomogenization(1,:,:)
-     deallocate(temperature(section)%p)
-     temperature(section)%p => thermalState(section)%state(1,:)
-     deallocate(temperatureRate(section)%p)
-     allocate  (temperatureRate(section)%p(NofMyHomog), source=0.0_pReal)
+   nullify(thermalMapping(section)%p)
+   thermalMapping(section)%p => mappingHomogenization(1,:,:)
+   deallocate(temperature(section)%p)
+   temperature(section)%p => thermalState(section)%state(1,:)
+   deallocate(temperatureRate(section)%p)
+   allocate  (temperatureRate(section)%p(NofMyHomog), source=0.0_pReal)
     
 enddo initializeInstances
 
@ -186,8 +174,6 @@ end function thermal_adiabatic_updateState
 !> @brief returns heat generation rate
 !--------------------------------------------------------------------------------------------------
 subroutine thermal_adiabatic_getSourceAndItsTangent(Tdot, dTdot_dT, T, ip, el)
- use math, only: &
-   math_Mandel6to33
 use material, only: &
   homogenization_Ngrains, &
   mappingHomogenization, &
@ -219,14 +205,12 @@ subroutine thermal_adiabatic_getSourceAndItsTangent(Tdot, dTdot_dT, T, ip, el)
 integer(pInt) :: &
   phase, &
   homog, &
-   offset, &
   instance, &
   grain, &
   source, &
   constituent
   
 homog  = mappingHomogenization(2,ip,el)
- offset = mappingHomogenization(1,ip,el)
 instance = thermal_typeInstance(homog)
  
 Tdot = 0.0_pReal
@ -268,12 +252,9 @@ function thermal_adiabatic_getSpecificHeat(ip,el)
   lattice_specificHeat
 use material, only: &
   homogenization_Ngrains, &
-   mappingHomogenization, &
   material_phase
 use mesh, only: &
   mesh_element
- use crystallite, only: &
-   crystallite_push33ToRef

 implicit none
 integer(pInt), intent(in) :: &
@ -282,11 +263,10 @@ function thermal_adiabatic_getSpecificHeat(ip,el)
 real(pReal) :: &
   thermal_adiabatic_getSpecificHeat
 integer(pInt) :: &
-   homog, grain
+   grain
  
 thermal_adiabatic_getSpecificHeat = 0.0_pReal
 
- homog  = mappingHomogenization(2,ip,el)
  
 do grain = 1, homogenization_Ngrains(mesh_element(3,el))
   thermal_adiabatic_getSpecificHeat = thermal_adiabatic_getSpecificHeat + &
@ -311,8 +291,6 @@ function thermal_adiabatic_getMassDensity(ip,el)
   material_phase
 use mesh, only: &
   mesh_element
- use crystallite, only: &
-   crystallite_push33ToRef
   
 implicit none
 integer(pInt), intent(in) :: &
@ -321,11 +299,10 @@ function thermal_adiabatic_getMassDensity(ip,el)
 real(pReal) :: &
   thermal_adiabatic_getMassDensity
 integer(pInt) :: &
-   homog, grain
+   grain
  
 thermal_adiabatic_getMassDensity = 0.0_pReal

- homog  = mappingHomogenization(2,ip,el)
  
 do grain = 1, homogenization_Ngrains(mesh_element(3,el))
   thermal_adiabatic_getMassDensity = thermal_adiabatic_getMassDensity + &
@ -346,7 +323,7 @@ function thermal_adiabatic_postResults(homog,instance,of) result(postResults)
   temperature

 implicit none
- integer(pInt),              intent(in) :: &
+ integer(pInt), intent(in) :: &
   homog, &
   instance, &
   of
--- a/src/thermal_conduction.f90
+++ b/src/thermal_conduction.f90
@ -70,7 +70,7 @@ subroutine thermal_conduction_init
   config_homogenization

 implicit none
- integer(pInt) :: maxNinstance,mySize=0_pInt,section,instance,o,i
+ integer(pInt) :: maxNinstance,section,instance,i
 integer(pInt) :: sizeState
 integer(pInt) :: NofMyHomog   
 character(len=65536),   dimension(0), parameter :: emptyStringArray = [character(len=65536)::]
@ -101,21 +101,10 @@ subroutine thermal_conduction_init
             thermal_conduction_Noutput(instance) = thermal_conduction_Noutput(instance) + 1_pInt
             thermal_conduction_outputID(thermal_conduction_Noutput(instance),instance) = temperature_ID
             thermal_conduction_output(thermal_conduction_Noutput(instance),instance) = outputs(i)
+             thermal_conduction_sizePostResult(thermal_conduction_Noutput(instance),instance) = 1_pInt
     end select
   enddo

-!--------------------------------------------------------------------------------------------------
-!  Determine size of postResults array
-   outputsLoop: do o = 1_pInt,thermal_conduction_Noutput(instance)
-     select case(thermal_conduction_outputID(o,instance))
-      case(temperature_ID)
-         mySize = 1_pInt
-     end select
- 
-     if (mySize > 0_pInt) then  ! any meaningful output found
-       thermal_conduction_sizePostResult(o,instance) = mySize
-     endif
-   enddo outputsLoop

 ! allocate state arrays
   sizeState = 0_pInt
@ -224,7 +213,6 @@ function thermal_conduction_getConductivity33(ip,el)
   lattice_thermalConductivity33
 use material, only: &
   homogenization_Ngrains, &
-   mappingHomogenization, &
   material_phase
 use mesh, only: &
   mesh_element
@ -238,10 +226,8 @@ function thermal_conduction_getConductivity33(ip,el)
 real(pReal), dimension(3,3) :: &
   thermal_conduction_getConductivity33
 integer(pInt) :: &
-   homog, &
   grain
   
- homog  = mappingHomogenization(2,ip,el)
  
 thermal_conduction_getConductivity33 = 0.0_pReal
 do grain = 1, homogenization_Ngrains(mesh_element(3,el))
@ -263,12 +249,9 @@ function thermal_conduction_getSpecificHeat(ip,el)
   lattice_specificHeat
 use material, only: &
   homogenization_Ngrains, &
-   mappingHomogenization, &
   material_phase
 use mesh, only: &
   mesh_element
- use crystallite, only: &
-   crystallite_push33ToRef

 implicit none
 integer(pInt), intent(in) :: &
@ -277,11 +260,10 @@ function thermal_conduction_getSpecificHeat(ip,el)
 real(pReal) :: &
   thermal_conduction_getSpecificHeat
 integer(pInt) :: &
-   homog, grain
+   grain
  
 thermal_conduction_getSpecificHeat = 0.0_pReal
 
- homog  = mappingHomogenization(2,ip,el)
  
 do grain = 1, homogenization_Ngrains(mesh_element(3,el))
   thermal_conduction_getSpecificHeat = thermal_conduction_getSpecificHeat + &
@ -301,12 +283,9 @@ function thermal_conduction_getMassDensity(ip,el)
   lattice_massDensity
 use material, only: &
   homogenization_Ngrains, &
-   mappingHomogenization, &
   material_phase
 use mesh, only: &
   mesh_element
- use crystallite, only: &
-   crystallite_push33ToRef

 implicit none
 integer(pInt), intent(in) :: &
@ -315,11 +294,10 @@ function thermal_conduction_getMassDensity(ip,el)
 real(pReal) :: &
   thermal_conduction_getMassDensity
 integer(pInt) :: &
-   homog, grain
+   grain
  
 thermal_conduction_getMassDensity = 0.0_pReal
 
- homog  = mappingHomogenization(2,ip,el)
  
 do grain = 1, homogenization_Ngrains(mesh_element(3,el))
   thermal_conduction_getMassDensity = thermal_conduction_getMassDensity &