From 2c8fd880c032ac75441044c0db924da0bf6f9d59 Mon Sep 17 00:00:00 2001 From: Test User Date: Fri, 24 Aug 2018 13:39:06 +0200 Subject: [PATCH 1/6] [skip ci] updated version information after successful test of v2.0.2-403-g4867dfa2 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 25c6284d7..0f9d611c0 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v2.0.2-394-g51dbc6c4 +v2.0.2-403-g4867dfa2 From 22a232ad0860e6ec19a8c7af8b96e6877532bdc9 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sat, 25 Aug 2018 15:50:43 +0200 Subject: [PATCH 2/6] bug: memory access out of bounds introduced when moderninzing reading in of parameters --- src/lattice.f90 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lattice.f90 b/src/lattice.f90 index ca1cd597a..550b4c5c9 100644 --- a/src/lattice.f90 +++ b/src/lattice.f90 @@ -1278,7 +1278,7 @@ subroutine lattice_init integer(pInt) :: Nphases character(len=65536) :: & tag = '' - integer(pInt) :: section = 0_pInt,i,p + integer(pInt) :: i,p real(pReal), dimension(:), allocatable :: & temp, & CoverA, & !< c/a ratio for low symmetry type lattice @@ -1388,9 +1388,9 @@ subroutine lattice_init tag = config_phase(p)%getString('trans_lattice_structure',defaultVal=tag) select case(trim(tag)) case('bcc') - trans_lattice_structure(section) = LATTICE_bcc_ID + trans_lattice_structure(p) = LATTICE_bcc_ID case('hex','hexagonal') - trans_lattice_structure(section) = LATTICE_hex_ID + trans_lattice_structure(p) = LATTICE_hex_ID end select lattice_C66(1,1,p) = config_phase(p)%getFloat('c11',defaultVal=0.0_pReal) From a4638881569e17945d6c0bbc35ab383a5a10f3a9 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sat, 25 Aug 2018 15:51:28 +0200 Subject: [PATCH 3/6] test in PRIVATE improved --- PRIVATE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PRIVATE b/PRIVATE index dfd67ea44..81fd7109f 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit dfd67ea44ba88ee1e0a33266a3986c64137908cf +Subproject commit 81fd7109fea8456b8eecaaef0eec041edcce7792 From 7af7e45b6da5c3254e6a404912f05f9ada33591b Mon Sep 17 00:00:00 2001 From: Test User Date: Sun, 26 Aug 2018 05:02:31 +0200 Subject: [PATCH 4/6] [skip ci] updated version information after successful test of v2.0.2-409-gac011684 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 5a1edffc9..390024a1f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v2.0.2-401-ga3b472a7 +v2.0.2-409-gac011684 From 241b2ade8b015ecc0d6debd97c9fcf015e6aeedf Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sun, 26 Aug 2018 11:40:38 +0200 Subject: [PATCH 5/6] more portable way to define PI https://software.intel.com/en-us/forums/intel-visual-fortran-compiler-for-windows/topic/490432 and compiler will not complain about truncation --- PRIVATE | 2 +- src/math.f90 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/PRIVATE b/PRIVATE index 81fd7109f..a764ade04 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit 81fd7109fea8456b8eecaaef0eec041edcce7792 +Subproject commit a764ade044735df35fac93a5204446291ee29abc diff --git a/src/math.f90 b/src/math.f90 index 955be4457..4179d6edc 100644 --- a/src/math.f90 +++ b/src/math.f90 @@ -12,7 +12,7 @@ module math implicit none private - real(pReal), parameter, public :: PI = 3.141592653589793_pReal !< ratio of a circle's circumference to its diameter + real(pReal), parameter, public :: PI = acos(-1.0_pReal) !< ratio of a circle's circumference to its diameter real(pReal), parameter, public :: INDEG = 180.0_pReal/PI !< conversion from radian into degree real(pReal), parameter, public :: INRAD = PI/180.0_pReal !< conversion from degree into radian complex(pReal), parameter, public :: TWOPIIMG = (0.0_pReal,2.0_pReal)*(PI,0.0_pReal) !< Re(0.0), Im(2xPi) From a5f139b786b33c7ddac12818214b7d9868ff279f Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sun, 26 Aug 2018 11:53:18 +0200 Subject: [PATCH 6/6] unused variables --- src/plastic_isotropic.f90 | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/plastic_isotropic.f90 b/src/plastic_isotropic.f90 index 264fe7e18..d65fe583f 100644 --- a/src/plastic_isotropic.f90 +++ b/src/plastic_isotropic.f90 @@ -109,11 +109,9 @@ use IO type(tParameters), pointer :: prm integer(pInt) :: & - o, & phase, & instance, & maxNinstance, & - mySize, & sizeDotState, & sizeState, & sizeDeltaState @@ -136,7 +134,6 @@ use IO plastic_isotropic_output = '' allocate(plastic_isotropic_Noutput(maxNinstance), source=0_pInt) -! inernal variable allocate(param(maxNinstance)) ! one container of parameters per instance allocate(state(maxNinstance)) ! internal state aliases allocate(dotState(maxNinstance))