HDF5 out is always on
This commit is contained in:
parent
6425c37f2d
commit
af6973adf6
|
@ -213,7 +213,6 @@ subroutine damage_local_results(homog,group)
|
||||||
|
|
||||||
integer, intent(in) :: homog
|
integer, intent(in) :: homog
|
||||||
character(len=*), intent(in) :: group
|
character(len=*), intent(in) :: group
|
||||||
#if defined(PETSc) || defined(DAMASK_HDF5)
|
|
||||||
integer :: o, instance
|
integer :: o, instance
|
||||||
|
|
||||||
instance = damage_typeInstance(homog)
|
instance = damage_typeInstance(homog)
|
||||||
|
@ -228,7 +227,6 @@ subroutine damage_local_results(homog,group)
|
||||||
end select
|
end select
|
||||||
enddo outputsLoop
|
enddo outputsLoop
|
||||||
end associate
|
end associate
|
||||||
#endif
|
|
||||||
|
|
||||||
end subroutine damage_local_results
|
end subroutine damage_local_results
|
||||||
|
|
||||||
|
|
|
@ -249,7 +249,6 @@ subroutine damage_nonlocal_results(homog,group)
|
||||||
|
|
||||||
integer, intent(in) :: homog
|
integer, intent(in) :: homog
|
||||||
character(len=*), intent(in) :: group
|
character(len=*), intent(in) :: group
|
||||||
#if defined(PETSc) || defined(DAMASK_HDF5)
|
|
||||||
integer :: o, instance
|
integer :: o, instance
|
||||||
|
|
||||||
instance = damage_typeInstance(homog)
|
instance = damage_typeInstance(homog)
|
||||||
|
@ -264,7 +263,6 @@ subroutine damage_nonlocal_results(homog,group)
|
||||||
end select
|
end select
|
||||||
enddo outputsLoop
|
enddo outputsLoop
|
||||||
end associate
|
end associate
|
||||||
#endif
|
|
||||||
|
|
||||||
end subroutine damage_nonlocal_results
|
end subroutine damage_nonlocal_results
|
||||||
|
|
||||||
|
|
|
@ -122,7 +122,6 @@ subroutine geometry_plastic_nonlocal_results
|
||||||
|
|
||||||
integer, dimension(:), allocatable :: shp
|
integer, dimension(:), allocatable :: shp
|
||||||
|
|
||||||
#if defined(PETSc) || defined(DAMASK_HDF5)
|
|
||||||
call results_openJobFile
|
call results_openJobFile
|
||||||
|
|
||||||
writeVolume: block
|
writeVolume: block
|
||||||
|
@ -151,7 +150,6 @@ subroutine geometry_plastic_nonlocal_results
|
||||||
|
|
||||||
|
|
||||||
call results_closeJobFile
|
call results_closeJobFile
|
||||||
#endif
|
|
||||||
|
|
||||||
end subroutine geometry_plastic_nonlocal_results
|
end subroutine geometry_plastic_nonlocal_results
|
||||||
|
|
||||||
|
|
|
@ -463,7 +463,6 @@ end subroutine plastic_disloUCLA_dependentState
|
||||||
!> @brief writes results to HDF5 output file
|
!> @brief writes results to HDF5 output file
|
||||||
!--------------------------------------------------------------------------------------------------
|
!--------------------------------------------------------------------------------------------------
|
||||||
subroutine plastic_disloUCLA_results(instance,group)
|
subroutine plastic_disloUCLA_results(instance,group)
|
||||||
#if defined(PETSc) || defined(DAMASK_HDF5)
|
|
||||||
|
|
||||||
integer, intent(in) :: instance
|
integer, intent(in) :: instance
|
||||||
character(len=*), intent(in) :: group
|
character(len=*), intent(in) :: group
|
||||||
|
@ -492,11 +491,6 @@ subroutine plastic_disloUCLA_results(instance,group)
|
||||||
enddo outputsLoop
|
enddo outputsLoop
|
||||||
end associate
|
end associate
|
||||||
|
|
||||||
#else
|
|
||||||
integer, intent(in) :: instance
|
|
||||||
character(len=*), intent(in) :: group
|
|
||||||
#endif
|
|
||||||
|
|
||||||
end subroutine plastic_disloUCLA_results
|
end subroutine plastic_disloUCLA_results
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -926,7 +926,6 @@ end subroutine plastic_dislotwin_dependentState
|
||||||
!> @brief writes results to HDF5 output file
|
!> @brief writes results to HDF5 output file
|
||||||
!--------------------------------------------------------------------------------------------------
|
!--------------------------------------------------------------------------------------------------
|
||||||
subroutine plastic_dislotwin_results(instance,group)
|
subroutine plastic_dislotwin_results(instance,group)
|
||||||
#if defined(PETSc) || defined(DAMASK_HDF5)
|
|
||||||
|
|
||||||
integer, intent(in) :: instance
|
integer, intent(in) :: instance
|
||||||
character(len=*) :: group
|
character(len=*) :: group
|
||||||
|
@ -970,11 +969,6 @@ subroutine plastic_dislotwin_results(instance,group)
|
||||||
enddo outputsLoop
|
enddo outputsLoop
|
||||||
end associate
|
end associate
|
||||||
|
|
||||||
#else
|
|
||||||
integer, intent(in) :: instance
|
|
||||||
character(len=*) :: group
|
|
||||||
#endif
|
|
||||||
|
|
||||||
end subroutine plastic_dislotwin_results
|
end subroutine plastic_dislotwin_results
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -373,7 +373,6 @@ end subroutine plastic_isotropic_dotState
|
||||||
!> @brief writes results to HDF5 output file
|
!> @brief writes results to HDF5 output file
|
||||||
!--------------------------------------------------------------------------------------------------
|
!--------------------------------------------------------------------------------------------------
|
||||||
subroutine plastic_isotropic_results(instance,group)
|
subroutine plastic_isotropic_results(instance,group)
|
||||||
#if defined(PETSc) || defined(DAMASK_HDF5)
|
|
||||||
|
|
||||||
integer, intent(in) :: instance
|
integer, intent(in) :: instance
|
||||||
character(len=*), intent(in) :: group
|
character(len=*), intent(in) :: group
|
||||||
|
@ -388,10 +387,6 @@ subroutine plastic_isotropic_results(instance,group)
|
||||||
end select
|
end select
|
||||||
enddo outputsLoop
|
enddo outputsLoop
|
||||||
end associate
|
end associate
|
||||||
#else
|
|
||||||
integer, intent(in) :: instance
|
|
||||||
character(len=*) :: group
|
|
||||||
#endif
|
|
||||||
|
|
||||||
end subroutine plastic_isotropic_results
|
end subroutine plastic_isotropic_results
|
||||||
|
|
||||||
|
|
|
@ -437,7 +437,6 @@ end subroutine plastic_kinehardening_deltaState
|
||||||
!> @brief writes results to HDF5 output file
|
!> @brief writes results to HDF5 output file
|
||||||
!--------------------------------------------------------------------------------------------------
|
!--------------------------------------------------------------------------------------------------
|
||||||
subroutine plastic_kinehardening_results(instance,group)
|
subroutine plastic_kinehardening_results(instance,group)
|
||||||
#if defined(PETSc) || defined(DAMASK_HDF5)
|
|
||||||
|
|
||||||
integer, intent(in) :: instance
|
integer, intent(in) :: instance
|
||||||
character(len=*) :: group
|
character(len=*) :: group
|
||||||
|
@ -470,10 +469,6 @@ subroutine plastic_kinehardening_results(instance,group)
|
||||||
end select
|
end select
|
||||||
enddo outputsLoop
|
enddo outputsLoop
|
||||||
end associate
|
end associate
|
||||||
#else
|
|
||||||
integer, intent(in) :: instance
|
|
||||||
character(len=*) :: group
|
|
||||||
#endif
|
|
||||||
|
|
||||||
end subroutine plastic_kinehardening_results
|
end subroutine plastic_kinehardening_results
|
||||||
|
|
||||||
|
|
|
@ -12,6 +12,7 @@ module plastic_nonlocal
|
||||||
use material
|
use material
|
||||||
use lattice
|
use lattice
|
||||||
use rotations
|
use rotations
|
||||||
|
use results
|
||||||
use config
|
use config
|
||||||
use lattice
|
use lattice
|
||||||
use discretization
|
use discretization
|
||||||
|
@ -1974,9 +1975,6 @@ end function getRho
|
||||||
!> @brief writes results to HDF5 output file
|
!> @brief writes results to HDF5 output file
|
||||||
!--------------------------------------------------------------------------------------------------
|
!--------------------------------------------------------------------------------------------------
|
||||||
subroutine plastic_nonlocal_results(instance,group)
|
subroutine plastic_nonlocal_results(instance,group)
|
||||||
#if defined(PETSc) || defined(DAMASK_HDF5)
|
|
||||||
use results, only: &
|
|
||||||
results_writeDataset
|
|
||||||
|
|
||||||
integer, intent(in) :: instance
|
integer, intent(in) :: instance
|
||||||
character(len=*) :: group
|
character(len=*) :: group
|
||||||
|
@ -2039,10 +2037,6 @@ subroutine plastic_nonlocal_results(instance,group)
|
||||||
end select
|
end select
|
||||||
enddo outputsLoop
|
enddo outputsLoop
|
||||||
end associate
|
end associate
|
||||||
#else
|
|
||||||
integer, intent(in) :: instance
|
|
||||||
character(len=*) :: group
|
|
||||||
#endif
|
|
||||||
|
|
||||||
end subroutine plastic_nonlocal_results
|
end subroutine plastic_nonlocal_results
|
||||||
|
|
||||||
|
|
|
@ -464,7 +464,6 @@ end subroutine plastic_phenopowerlaw_dotState
|
||||||
!> @brief writes results to HDF5 output file
|
!> @brief writes results to HDF5 output file
|
||||||
!--------------------------------------------------------------------------------------------------
|
!--------------------------------------------------------------------------------------------------
|
||||||
subroutine plastic_phenopowerlaw_results(instance,group)
|
subroutine plastic_phenopowerlaw_results(instance,group)
|
||||||
#if defined(PETSc) || defined(DAMASK_HDF5)
|
|
||||||
|
|
||||||
integer, intent(in) :: instance
|
integer, intent(in) :: instance
|
||||||
character(len=*), intent(in) :: group
|
character(len=*), intent(in) :: group
|
||||||
|
@ -493,11 +492,6 @@ subroutine plastic_phenopowerlaw_results(instance,group)
|
||||||
enddo outputsLoop
|
enddo outputsLoop
|
||||||
end associate
|
end associate
|
||||||
|
|
||||||
#else
|
|
||||||
integer, intent(in) :: instance
|
|
||||||
character(len=*), intent(in) :: group
|
|
||||||
#endif
|
|
||||||
|
|
||||||
end subroutine plastic_phenopowerlaw_results
|
end subroutine plastic_phenopowerlaw_results
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -254,7 +254,6 @@ subroutine thermal_adiabatic_results(homog,group)
|
||||||
|
|
||||||
integer, intent(in) :: homog
|
integer, intent(in) :: homog
|
||||||
character(len=*), intent(in) :: group
|
character(len=*), intent(in) :: group
|
||||||
#if defined(PETSc) || defined(DAMASK_HDF5)
|
|
||||||
integer :: o, instance
|
integer :: o, instance
|
||||||
|
|
||||||
instance = thermal_typeInstance(homog)
|
instance = thermal_typeInstance(homog)
|
||||||
|
@ -267,7 +266,6 @@ subroutine thermal_adiabatic_results(homog,group)
|
||||||
'temperature','K')
|
'temperature','K')
|
||||||
end select
|
end select
|
||||||
enddo outputsLoop
|
enddo outputsLoop
|
||||||
#endif
|
|
||||||
|
|
||||||
end subroutine thermal_adiabatic_results
|
end subroutine thermal_adiabatic_results
|
||||||
|
|
||||||
|
|
|
@ -210,6 +210,7 @@ function thermal_conduction_getSpecificHeat(ip,el)
|
||||||
|
|
||||||
end function thermal_conduction_getSpecificHeat
|
end function thermal_conduction_getSpecificHeat
|
||||||
|
|
||||||
|
|
||||||
!--------------------------------------------------------------------------------------------------
|
!--------------------------------------------------------------------------------------------------
|
||||||
!> @brief returns homogenized mass density
|
!> @brief returns homogenized mass density
|
||||||
!--------------------------------------------------------------------------------------------------
|
!--------------------------------------------------------------------------------------------------
|
||||||
|
@ -267,7 +268,6 @@ subroutine thermal_conduction_results(homog,group)
|
||||||
|
|
||||||
integer, intent(in) :: homog
|
integer, intent(in) :: homog
|
||||||
character(len=*), intent(in) :: group
|
character(len=*), intent(in) :: group
|
||||||
#if defined(PETSc) || defined(DAMASK_HDF5)
|
|
||||||
integer :: o, instance
|
integer :: o, instance
|
||||||
|
|
||||||
instance = thermal_typeInstance(homog)
|
instance = thermal_typeInstance(homog)
|
||||||
|
@ -280,7 +280,6 @@ subroutine thermal_conduction_results(homog,group)
|
||||||
'temperature','K')
|
'temperature','K')
|
||||||
end select
|
end select
|
||||||
enddo outputsLoop
|
enddo outputsLoop
|
||||||
#endif
|
|
||||||
|
|
||||||
end subroutine thermal_conduction_results
|
end subroutine thermal_conduction_results
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue