From cf36d4534f850d6b1ae58df7c752bc72bc0f6aea Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Fri, 3 Feb 2017 20:16:25 +0100 Subject: [PATCH] adjusting to development branch --- src/.gitignore | 2 ++ src/lattice.f90 | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/.gitignore b/src/.gitignore index bd6d66f85..c90e213cf 100644 --- a/src/.gitignore +++ b/src/.gitignore @@ -1,3 +1,5 @@ +DAMASK_marc*.f90 Makefile cmake_install.cmake quit__genmod.f90 +*.marc diff --git a/src/lattice.f90 b/src/lattice.f90 index 88f2ca007..184c85937 100644 --- a/src/lattice.f90 +++ b/src/lattice.f90 @@ -835,7 +835,6 @@ module lattice ],pReal),[ 4_pInt + 4_pInt,LATTICE_hex_Ncleavage]) - !-------------------------------------------------------------------------------------------------- ! body centered tetragonal integer(pInt), dimension(LATTICE_maxNslipFamily), parameter, public :: &