From ce1bb589c7992927b553892d81bf518ab7abb365 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Thu, 18 Apr 2019 15:30:54 +0200 Subject: [PATCH] complicated use statements confuse CMake probably we should adopt a similar "use" policy in Fortran as recommended for Python "import" and have all imports at the beginning https://www.python.org/dev/peps/pep-0008/ --- src/plastic_disloUCLA.f90 | 10 +--------- src/plastic_dislotwin.f90 | 10 +--------- src/plastic_isotropic.f90 | 13 +------------ src/plastic_kinematichardening.f90 | 13 +------------ src/plastic_none.f90 | 8 +------- src/plastic_nonlocal.f90 | 10 +--------- src/plastic_phenopowerlaw.f90 | 10 +--------- 7 files changed, 7 insertions(+), 67 deletions(-) diff --git a/src/plastic_disloUCLA.f90 b/src/plastic_disloUCLA.f90 index 88aa27432..ccb37be48 100644 --- a/src/plastic_disloUCLA.f90 +++ b/src/plastic_disloUCLA.f90 @@ -121,15 +121,7 @@ subroutine plastic_disloUCLA_init() math_expand use IO, only: & IO_error - use material, only: & - phase_plasticity, & - phase_plasticityInstance, & - phase_Noutput, & - material_allocatePlasticState, & - PLASTICITY_DISLOUCLA_label, & - PLASTICITY_DISLOUCLA_ID, & - material_phase, & - plasticState + use material use config, only: & config_phase use lattice diff --git a/src/plastic_dislotwin.f90 b/src/plastic_dislotwin.f90 index cb13265b4..ed6638c4f 100644 --- a/src/plastic_dislotwin.f90 +++ b/src/plastic_dislotwin.f90 @@ -185,15 +185,7 @@ subroutine plastic_dislotwin_init PI use IO, only: & IO_error - use material, only: & - phase_plasticity, & - phase_plasticityInstance, & - phase_Noutput, & - material_allocatePlasticState, & - PLASTICITY_DISLOTWIN_label, & - PLASTICITY_DISLOTWIN_ID, & - material_phase, & - plasticState + use material use config, only: & config_phase use lattice diff --git a/src/plastic_isotropic.f90 b/src/plastic_isotropic.f90 index 05a31ab75..45bc136db 100644 --- a/src/plastic_isotropic.f90 +++ b/src/plastic_isotropic.f90 @@ -91,18 +91,7 @@ subroutine plastic_isotropic_init debug_levelBasic use IO, only: & IO_error - use material, only: & -#ifdef DEBUG - phasememberAt, & -#endif - phase_plasticity, & - phase_plasticityInstance, & - phase_Noutput, & - material_allocatePlasticState, & - PLASTICITY_ISOTROPIC_label, & - PLASTICITY_ISOTROPIC_ID, & - material_phase, & - plasticState + use material use config, only: & config_phase use lattice diff --git a/src/plastic_kinematichardening.f90 b/src/plastic_kinematichardening.f90 index 0a4a6b3bc..6890c7006 100644 --- a/src/plastic_kinematichardening.f90 +++ b/src/plastic_kinematichardening.f90 @@ -112,18 +112,7 @@ subroutine plastic_kinehardening_init math_expand use IO, only: & IO_error - use material, only: & -#ifdef DEBUG - phasememberAt, & -#endif - phase_plasticity, & - phase_plasticityInstance, & - phase_Noutput, & - material_allocatePlasticState, & - PLASTICITY_kinehardening_label, & - PLASTICITY_kinehardening_ID, & - material_phase, & - plasticState + use material use config, only: & config_phase use lattice diff --git a/src/plastic_none.f90 b/src/plastic_none.f90 index f8a64b55b..fb19a9968 100644 --- a/src/plastic_none.f90 +++ b/src/plastic_none.f90 @@ -23,13 +23,7 @@ subroutine plastic_none_init debug_level, & debug_constitutive, & debug_levelBasic - use material, only: & - phase_plasticity, & - material_allocatePlasticState, & - PLASTICITY_NONE_label, & - PLASTICITY_NONE_ID, & - material_phase, & - plasticState + use material implicit none integer :: & diff --git a/src/plastic_nonlocal.f90 b/src/plastic_nonlocal.f90 index f5f48ed11..19f6b38cc 100644 --- a/src/plastic_nonlocal.f90 +++ b/src/plastic_nonlocal.f90 @@ -248,15 +248,7 @@ subroutine plastic_nonlocal_init debug_levelBasic use mesh, only: & theMesh - use material, only: & - phase_plasticity, & - phase_plasticityInstance, & - phase_Noutput, & - PLASTICITY_NONLOCAL_label, & - PLASTICITY_NONLOCAL_ID, & - plasticState, & - material_phase, & - material_allocatePlasticState + use material use config use lattice diff --git a/src/plastic_phenopowerlaw.f90 b/src/plastic_phenopowerlaw.f90 index 4124856d1..8e7ee82d0 100644 --- a/src/plastic_phenopowerlaw.f90 +++ b/src/plastic_phenopowerlaw.f90 @@ -116,15 +116,7 @@ subroutine plastic_phenopowerlaw_init math_expand use IO, only: & IO_error - use material, only: & - phase_plasticity, & - phase_plasticityInstance, & - phase_Noutput, & - material_allocatePlasticState, & - PLASTICITY_PHENOPOWERLAW_LABEL, & - PLASTICITY_PHENOPOWERLAW_ID, & - material_phase, & - plasticState + use material use config, only: & config_phase use lattice