223031012
/
DAMASK_EICMD
mirror of https://github.com/achalhp/DAMASK_EICMD.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

cleaning

This commit is contained in:
Martin Diehl 2020-01-03 12:40:25 +01:00
parent d81dc01ce0
commit a6ddbbd70c
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/DAMASK_interface.f90
View File

@ -10,7 +10,7 @@
!> and working directory. !> and working directory.
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
#define GCC_MIN 6 #define GCC_MIN 6
#define INTEL_MIN 1600 #define INTEL_MIN 1700
#define PETSC_MAJOR 3 #define PETSC_MAJOR 3
#define PETSC_MINOR_MIN 10 #define PETSC_MINOR_MIN 10
#define PETSC_MINOR_MAX 12 #define PETSC_MINOR_MAX 12

7
src/lattice.f90
View File

@ -483,9 +483,11 @@ module lattice
lattice_slip_normal, & lattice_slip_normal, &
lattice_slip_direction, & lattice_slip_direction, &
lattice_slip_transverse, & lattice_slip_transverse, &
lattice_labels_slip lattice_labels_slip, &
lattice_labels_twin
contains contains
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
!> @brief Module initialization !> @brief Module initialization
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
@ -2306,14 +2308,13 @@ end subroutine buildTransformationSystem
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
!> @brief select active systems as strings !> @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) :: & integer, dimension(:), intent(in) :: &
active, & !< # of active systems per family active, & !< # of active systems per family
potential !< # of potential systems per family potential !< # of potential systems per family
real(pReal), dimension(:,:), intent(in) :: & real(pReal), dimension(:,:), intent(in) :: &
system system
character(len=*), intent(in) :: structure !< lattice structure
character(len=:), dimension(:), allocatable :: labels character(len=:), dimension(:), allocatable :: labels
character(len=:), allocatable :: label character(len=:), allocatable :: label