diff --git a/src/damage_local.f90 b/src/damage_local.f90 index aa9292f49..fdb6c2206 100644 --- a/src/damage_local.f90 +++ b/src/damage_local.f90 @@ -213,7 +213,6 @@ subroutine damage_local_results(homog,group) integer, intent(in) :: homog character(len=*), intent(in) :: group -#if defined(PETSc) || defined(DAMASK_HDF5) integer :: o, instance instance = damage_typeInstance(homog) @@ -228,7 +227,6 @@ subroutine damage_local_results(homog,group) end select enddo outputsLoop end associate -#endif end subroutine damage_local_results diff --git a/src/damage_nonlocal.f90 b/src/damage_nonlocal.f90 index 855fa0ea5..bd5a0b2e6 100644 --- a/src/damage_nonlocal.f90 +++ b/src/damage_nonlocal.f90 @@ -249,7 +249,6 @@ subroutine damage_nonlocal_results(homog,group) integer, intent(in) :: homog character(len=*), intent(in) :: group -#if defined(PETSc) || defined(DAMASK_HDF5) integer :: o, instance instance = damage_typeInstance(homog) @@ -264,7 +263,6 @@ subroutine damage_nonlocal_results(homog,group) end select enddo outputsLoop end associate -#endif end subroutine damage_nonlocal_results diff --git a/src/geometry_plastic_nonlocal.f90 b/src/geometry_plastic_nonlocal.f90 index 408306b2b..b69ab2eff 100644 --- a/src/geometry_plastic_nonlocal.f90 +++ b/src/geometry_plastic_nonlocal.f90 @@ -122,7 +122,6 @@ subroutine geometry_plastic_nonlocal_results integer, dimension(:), allocatable :: shp -#if defined(PETSc) || defined(DAMASK_HDF5) call results_openJobFile writeVolume: block @@ -151,7 +150,6 @@ subroutine geometry_plastic_nonlocal_results call results_closeJobFile -#endif end subroutine geometry_plastic_nonlocal_results diff --git a/src/plastic_disloUCLA.f90 b/src/plastic_disloUCLA.f90 index 29ef0fcc9..e64c7ae58 100644 --- a/src/plastic_disloUCLA.f90 +++ b/src/plastic_disloUCLA.f90 @@ -463,7 +463,6 @@ end subroutine plastic_disloUCLA_dependentState !> @brief writes results to HDF5 output file !-------------------------------------------------------------------------------------------------- subroutine plastic_disloUCLA_results(instance,group) -#if defined(PETSc) || defined(DAMASK_HDF5) integer, intent(in) :: instance character(len=*), intent(in) :: group @@ -491,11 +490,6 @@ subroutine plastic_disloUCLA_results(instance,group) end select enddo outputsLoop end associate - -#else - integer, intent(in) :: instance - character(len=*), intent(in) :: group -#endif end subroutine plastic_disloUCLA_results diff --git a/src/plastic_dislotwin.f90 b/src/plastic_dislotwin.f90 index 1f731a891..454ed42b1 100644 --- a/src/plastic_dislotwin.f90 +++ b/src/plastic_dislotwin.f90 @@ -926,7 +926,6 @@ end subroutine plastic_dislotwin_dependentState !> @brief writes results to HDF5 output file !-------------------------------------------------------------------------------------------------- subroutine plastic_dislotwin_results(instance,group) -#if defined(PETSc) || defined(DAMASK_HDF5) integer, intent(in) :: instance character(len=*) :: group @@ -969,11 +968,6 @@ subroutine plastic_dislotwin_results(instance,group) end select enddo outputsLoop end associate - -#else - integer, intent(in) :: instance - character(len=*) :: group -#endif end subroutine plastic_dislotwin_results diff --git a/src/plastic_isotropic.f90 b/src/plastic_isotropic.f90 index 9beb2262b..b86fff04a 100644 --- a/src/plastic_isotropic.f90 +++ b/src/plastic_isotropic.f90 @@ -373,7 +373,6 @@ end subroutine plastic_isotropic_dotState !> @brief writes results to HDF5 output file !-------------------------------------------------------------------------------------------------- subroutine plastic_isotropic_results(instance,group) -#if defined(PETSc) || defined(DAMASK_HDF5) integer, intent(in) :: instance character(len=*), intent(in) :: group @@ -388,10 +387,6 @@ subroutine plastic_isotropic_results(instance,group) end select enddo outputsLoop end associate -#else - integer, intent(in) :: instance - character(len=*) :: group -#endif end subroutine plastic_isotropic_results diff --git a/src/plastic_kinematichardening.f90 b/src/plastic_kinematichardening.f90 index 2a3dc4640..569051602 100644 --- a/src/plastic_kinematichardening.f90 +++ b/src/plastic_kinematichardening.f90 @@ -437,7 +437,6 @@ end subroutine plastic_kinehardening_deltaState !> @brief writes results to HDF5 output file !-------------------------------------------------------------------------------------------------- subroutine plastic_kinehardening_results(instance,group) -#if defined(PETSc) || defined(DAMASK_HDF5) integer, intent(in) :: instance character(len=*) :: group @@ -470,10 +469,6 @@ subroutine plastic_kinehardening_results(instance,group) end select enddo outputsLoop end associate -#else - integer, intent(in) :: instance - character(len=*) :: group -#endif end subroutine plastic_kinehardening_results diff --git a/src/plastic_nonlocal.f90 b/src/plastic_nonlocal.f90 index 5375aba49..f65fb2193 100644 --- a/src/plastic_nonlocal.f90 +++ b/src/plastic_nonlocal.f90 @@ -12,6 +12,7 @@ module plastic_nonlocal use material use lattice use rotations + use results use config use lattice use discretization @@ -1974,9 +1975,6 @@ end function getRho !> @brief writes results to HDF5 output file !-------------------------------------------------------------------------------------------------- subroutine plastic_nonlocal_results(instance,group) -#if defined(PETSc) || defined(DAMASK_HDF5) - use results, only: & - results_writeDataset integer, intent(in) :: instance character(len=*) :: group @@ -2039,10 +2037,6 @@ subroutine plastic_nonlocal_results(instance,group) end select enddo outputsLoop end associate -#else - integer, intent(in) :: instance - character(len=*) :: group -#endif end subroutine plastic_nonlocal_results diff --git a/src/plastic_phenopowerlaw.f90 b/src/plastic_phenopowerlaw.f90 index b8f5c8306..ef5bd36ef 100644 --- a/src/plastic_phenopowerlaw.f90 +++ b/src/plastic_phenopowerlaw.f90 @@ -464,7 +464,6 @@ end subroutine plastic_phenopowerlaw_dotState !> @brief writes results to HDF5 output file !-------------------------------------------------------------------------------------------------- subroutine plastic_phenopowerlaw_results(instance,group) -#if defined(PETSc) || defined(DAMASK_HDF5) integer, intent(in) :: instance character(len=*), intent(in) :: group @@ -492,11 +491,6 @@ subroutine plastic_phenopowerlaw_results(instance,group) end select enddo outputsLoop end associate - -#else - integer, intent(in) :: instance - character(len=*), intent(in) :: group -#endif end subroutine plastic_phenopowerlaw_results diff --git a/src/thermal_adiabatic.f90 b/src/thermal_adiabatic.f90 index 36dd2316b..7f2007195 100644 --- a/src/thermal_adiabatic.f90 +++ b/src/thermal_adiabatic.f90 @@ -254,7 +254,6 @@ subroutine thermal_adiabatic_results(homog,group) integer, intent(in) :: homog character(len=*), intent(in) :: group -#if defined(PETSc) || defined(DAMASK_HDF5) integer :: o, instance instance = thermal_typeInstance(homog) @@ -267,7 +266,6 @@ subroutine thermal_adiabatic_results(homog,group) 'temperature','K') end select enddo outputsLoop -#endif end subroutine thermal_adiabatic_results diff --git a/src/thermal_conduction.f90 b/src/thermal_conduction.f90 index ed25fccde..153ca12eb 100644 --- a/src/thermal_conduction.f90 +++ b/src/thermal_conduction.f90 @@ -209,7 +209,8 @@ function thermal_conduction_getSpecificHeat(ip,el) thermal_conduction_getSpecificHeat/real(homogenization_Ngrains(material_homogenizationAt(el)),pReal) end function thermal_conduction_getSpecificHeat - + + !-------------------------------------------------------------------------------------------------- !> @brief returns homogenized mass density !-------------------------------------------------------------------------------------------------- @@ -267,7 +268,6 @@ subroutine thermal_conduction_results(homog,group) integer, intent(in) :: homog character(len=*), intent(in) :: group -#if defined(PETSc) || defined(DAMASK_HDF5) integer :: o, instance instance = thermal_typeInstance(homog) @@ -280,7 +280,6 @@ subroutine thermal_conduction_results(homog,group) 'temperature','K') end select enddo outputsLoop -#endif end subroutine thermal_conduction_results