From 646f6329773c5c9ab8b35ff7f14f718c62726102 Mon Sep 17 00:00:00 2001 From: Pratheek Shanthraj Date: Fri, 7 Nov 2014 12:15:28 +0000 Subject: [PATCH] no need to pass fileunit during init of none types --- code/constitutive.f90 | 8 ++++---- code/constitutive_none.f90 | 3 +-- code/damage_none.f90 | 3 +-- code/thermal_isothermal.f90 | 3 +-- code/vacancy_constant.f90 | 3 +-- 5 files changed, 8 insertions(+), 12 deletions(-) diff --git a/code/constitutive.f90 b/code/constitutive.f90 index b15856f54..19a03e6db 100644 --- a/code/constitutive.f90 +++ b/code/constitutive.f90 @@ -189,7 +189,7 @@ subroutine constitutive_init(temperature_init) ! parse plasticities from config file if (.not. IO_open_jobFile_stat(FILEUNIT,material_localFileExt)) & ! no local material configuration present... call IO_open_file(FILEUNIT,material_configFile) ! ... open material.config file - if (any(phase_plasticity == PLASTICITY_NONE_ID)) call constitutive_none_init(FILEUNIT) + if (any(phase_plasticity == PLASTICITY_NONE_ID)) call constitutive_none_init if (any(phase_plasticity == PLASTICITY_J2_ID)) call constitutive_j2_init(FILEUNIT) if (any(phase_plasticity == PLASTICITY_PHENOPOWERLAW_ID)) call constitutive_phenopowerlaw_init(FILEUNIT) if (any(phase_plasticity == PLASTICITY_DISLOTWIN_ID)) call constitutive_dislotwin_init(FILEUNIT) @@ -205,7 +205,7 @@ subroutine constitutive_init(temperature_init) ! parse damage from config file if (.not. IO_open_jobFile_stat(FILEUNIT,material_localFileExt)) & ! no local material configuration present... call IO_open_file(FILEUNIT,material_configFile) ! ... open material.config file - if (any(phase_damage == LOCAL_DAMAGE_none_ID)) call damage_none_init(FILEUNIT) + if (any(phase_damage == LOCAL_DAMAGE_none_ID)) call damage_none_init if (any(phase_damage == LOCAL_DAMAGE_isoBrittle_ID)) call damage_isoBrittle_init(FILEUNIT) if (any(phase_damage == LOCAL_DAMAGE_isoductile_ID)) call damage_isoDuctile_init(FILEUNIT) if (any(phase_damage == LOCAL_DAMAGE_anisoBrittle_ID)) call damage_anisoBrittle_init(FILEUNIT) @@ -217,7 +217,7 @@ subroutine constitutive_init(temperature_init) ! parse thermal from config file if (.not. IO_open_jobFile_stat(FILEUNIT,material_localFileExt)) & ! no local material configuration present... call IO_open_file(FILEUNIT,material_configFile) ! ... open material.config file - if (any(phase_thermal == LOCAL_THERMAL_isothermal_ID)) call thermal_isothermal_init(FILEUNIT,temperature_init) + if (any(phase_thermal == LOCAL_THERMAL_isothermal_ID)) call thermal_isothermal_init(temperature_init) if (any(phase_thermal == LOCAL_THERMAL_adiabatic_ID)) call thermal_adiabatic_init(FILEUNIT,temperature_init) close(FILEUNIT) @@ -225,7 +225,7 @@ subroutine constitutive_init(temperature_init) ! parse vacancy model from config file if (.not. IO_open_jobFile_stat(FILEUNIT,material_localFileExt)) & ! no local material configuration present... call IO_open_file(FILEUNIT,material_configFile) ! ... open material.config file - if (any(phase_vacancy == LOCAL_VACANCY_constant_ID)) call vacancy_constant_init(FILEUNIT) + if (any(phase_vacancy == LOCAL_VACANCY_constant_ID)) call vacancy_constant_init if (any(phase_vacancy == LOCAL_VACANCY_generation_ID)) call vacancy_generation_init(FILEUNIT) close(FILEUNIT) diff --git a/code/constitutive_none.f90 b/code/constitutive_none.f90 index 417752b9d..00a9be1ca 100644 --- a/code/constitutive_none.f90 +++ b/code/constitutive_none.f90 @@ -27,7 +27,7 @@ contains !> @brief module initialization !> @details reads in material parameters, allocates arrays, and does sanity checks !-------------------------------------------------------------------------------------------------- -subroutine constitutive_none_init(fileUnit) +subroutine constitutive_none_init use, intrinsic :: iso_fortran_env ! to get compiler_version and compiler_options (at least for gfortran 4.6 at the moment) use debug, only: & debug_level, & @@ -49,7 +49,6 @@ subroutine constitutive_none_init(fileUnit) implicit none - integer(pInt), intent(in) :: fileUnit integer(pInt) :: & maxNinstance, & phase, & diff --git a/code/damage_none.f90 b/code/damage_none.f90 index 157c122e5..330455f8f 100644 --- a/code/damage_none.f90 +++ b/code/damage_none.f90 @@ -27,7 +27,7 @@ contains !> @brief module initialization !> @details reads in material parameters, allocates arrays, and does sanity checks !-------------------------------------------------------------------------------------------------- -subroutine damage_none_init(fileUnit) +subroutine damage_none_init use, intrinsic :: iso_fortran_env ! to get compiler_version and compiler_options (at least for gfortran 4.6 at the moment) use debug, only: & debug_level, & @@ -49,7 +49,6 @@ subroutine damage_none_init(fileUnit) implicit none - integer(pInt), intent(in) :: fileUnit integer(pInt) :: & maxNinstance, & phase, & diff --git a/code/thermal_isothermal.f90 b/code/thermal_isothermal.f90 index 12234c264..7b5de282b 100644 --- a/code/thermal_isothermal.f90 +++ b/code/thermal_isothermal.f90 @@ -31,7 +31,7 @@ contains !> @brief module initialization !> @details reads in material parameters, allocates arrays, and does sanity checks !-------------------------------------------------------------------------------------------------- -subroutine thermal_isothermal_init(fileUnit,temperature_init) +subroutine thermal_isothermal_init(temperature_init) use, intrinsic :: iso_fortran_env ! to get compiler_version and compiler_options (at least for gfortran 4.6 at the moment) use debug, only: & debug_level, & @@ -54,7 +54,6 @@ subroutine thermal_isothermal_init(fileUnit,temperature_init) implicit none real(pReal), intent(in) :: temperature_init !< initial temperature - integer(pInt), intent(in) :: fileUnit integer(pInt) :: & maxNinstance, & phase, & diff --git a/code/vacancy_constant.f90 b/code/vacancy_constant.f90 index a1d973159..b7aaf7e00 100644 --- a/code/vacancy_constant.f90 +++ b/code/vacancy_constant.f90 @@ -26,7 +26,7 @@ contains !> @brief module initialization !> @details reads in material parameters, allocates arrays, and does sanity checks !-------------------------------------------------------------------------------------------------- -subroutine vacancy_constant_init(fileUnit) +subroutine vacancy_constant_init use, intrinsic :: iso_fortran_env ! to get compiler_version and compiler_options (at least for gfortran 4.6 at the moment) use debug, only: & debug_level, & @@ -48,7 +48,6 @@ subroutine vacancy_constant_init(fileUnit) implicit none - integer(pInt), intent(in) :: fileUnit integer(pInt) :: & maxNinstance, & phase, &