From a6ddbbd70c1c6c4bf1033e7e1cbc4650010615e2 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Fri, 3 Jan 2020 12:40:25 +0100 Subject: [PATCH] cleaning --- src/DAMASK_interface.f90 | 2 +- src/lattice.f90 | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/DAMASK_interface.f90 b/src/DAMASK_interface.f90 index ee8f220ae..4cf155ac1 100644 --- a/src/DAMASK_interface.f90 +++ b/src/DAMASK_interface.f90 @@ -10,7 +10,7 @@ !> and working directory. !-------------------------------------------------------------------------------------------------- #define GCC_MIN 6 -#define INTEL_MIN 1600 +#define INTEL_MIN 1700 #define PETSC_MAJOR 3 #define PETSC_MINOR_MIN 10 #define PETSC_MINOR_MAX 12 diff --git a/src/lattice.f90 b/src/lattice.f90 index d351079fb..a6c88dd34 100644 --- a/src/lattice.f90 +++ b/src/lattice.f90 @@ -483,9 +483,11 @@ module lattice lattice_slip_normal, & lattice_slip_direction, & lattice_slip_transverse, & - lattice_labels_slip + lattice_labels_slip, & + lattice_labels_twin contains + !-------------------------------------------------------------------------------------------------- !> @brief Module initialization !-------------------------------------------------------------------------------------------------- @@ -2306,14 +2308,13 @@ end subroutine buildTransformationSystem !-------------------------------------------------------------------------------------------------- !> @brief select active systems as strings !-------------------------------------------------------------------------------------------------- -function getlabels(active,potential,system,structure) result(labels) +function getlabels(active,potential,system) result(labels) integer, dimension(:), intent(in) :: & active, & !< # of active systems per family potential !< # of potential systems per family real(pReal), dimension(:,:), intent(in) :: & system - character(len=*), intent(in) :: structure !< lattice structure character(len=:), dimension(:), allocatable :: labels character(len=:), allocatable :: label