Skip to content

Commit

Permalink
Make minor improvements and fix bugs
Browse files Browse the repository at this point in the history
- Bug fix related to orientation assignment - users should update.
  • Loading branch information
mkasemer committed Jun 25, 2021
1 parent 32bc53e commit ac55135
Show file tree
Hide file tree
Showing 15 changed files with 10 additions and 21 deletions.
4 changes: 2 additions & 2 deletions VERSIONS
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
New in 1.2.1-3 (23 Jun 2021):
- Minor fixes.
New in 1.2.1 (25 Jun 2021):
- Bug fix related to orientation assignment - users should update.

New in 1.2.0 (11 Jun 2021):
- Amendments to simulation output: changed definition and calculation of
Expand Down
Binary file modified doc/texinfo/images/1_all.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified doc/texinfo/images/1_stressstrain.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified doc/texinfo/images/2_all.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified doc/texinfo/images/2_normalstraintime.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified doc/texinfo/images/3_all.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified doc/texinfo/images/3_all2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified doc/texinfo/images/4_all.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified doc/texinfo/images/5_all.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified doc/texinfo/images/5_eltorientations.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified doc/texinfo/images/5_stresstime.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 1 addition & 7 deletions doc/texinfo/version.texi
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,4 @@
@c Copyright (C) 1996-2021 ACME Lab
@c See the COPYING file in the top-level directory.

@iftex
@set FEPX_VERSION 1.2.1-3
@end iftex

@ifinfo
@set FEPX_VERSION 1.2.1-3
@end ifinfo
@set FEPX_VERSION 1.2.1
7 changes: 1 addition & 6 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# Top-level CMakeLists.txt for building FEPX
cmake_minimum_required(VERSION 3.0)
project(fepx Fortran)
set(FEPX_VERSION \"1.2.1-3\")
set(FEPX_VERSION \"1.2.1\")

# Prepare CMake for Fortran and locate MPI package
enable_language(Fortran)
Expand All @@ -26,11 +26,6 @@ endif(VERBOSE)

# Option to suppress IEEE warnings on program exit
option(IEEE_SUPPRESS "Suppress IEEE signals on program exit" ON)
if ((${CMAKE_Fortran_COMPILER_ID} MATCHES GNU) AND (${CMAKE_Fortran_COMPILER_VERSION} LESS 4.9.0))
message (WARNING "GNU Fortran compiler version: ${CMAKE_Fortran_COMPILER_VERSION} < 4.9.0, disabling IEEE_SUPPRESS")
set(IEEE_SUPPRESS OFF)
endif()

if(IEEE_SUPPRESS)
set(CMAKE_Fortran_FLAGS "-ffpe-summary='none'")
else(IEEE_SUPPRESS)
Expand Down
2 changes: 1 addition & 1 deletion src/fepx.f90
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ PROGRAM FEPX
& F E P X =========================='
WRITE(DFLT_U,'(A)')'Info : A finite element software package for &
& polycrystal plasticity.'
WRITE(DFLT_U,'(A)')'Info : Version 1.2.1-3'
WRITE(DFLT_U,'(A)')'Info : Version 1.2.1'
WRITE(DFLT_U,'(A,I0,A)')'Info : Running on ', NUMPROCS, ' cores.'
WRITE(DFLT_U,'(A)')'Info : <https://fepx.info>'
WRITE(DFLT_U,'(A)')'Info : Copyright (C) 1996-2021, DPLab, ACME Lab.'
Expand Down
10 changes: 5 additions & 5 deletions src/libfepx/microstructure_mod.f90
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ SUBROUTINE ASSIGN_ANGLES_PHASES(C0_ANGS, CRSS_N, RSTAR_N, WTS)
IF (ORIENTATION_OPTIONS%ORIENTATION_PARAMETERIZATION &
& .EQ. 'axis-angle') THEN
!
WHERE (I+1 .EQ. MY_UESUB) ! I+1 as UESUB is 1-indexed
WHERE (I .EQ. MY_UESUB) ! I+1 as UESUB is 1-indexed
!
AXIS(0, IGRAIN, :) = GRAIN_ORIENTATION(0, I)
AXIS(1, IGRAIN, :) = GRAIN_ORIENTATION(1, I)
Expand All @@ -177,7 +177,7 @@ SUBROUTINE ASSIGN_ANGLES_PHASES(C0_ANGS, CRSS_N, RSTAR_N, WTS)
ELSEIF (ORIENTATION_OPTIONS%ORIENTATION_PARAMETERIZATION &
& .EQ. 'euler-bunge') THEN
!
WHERE (I+1 .EQ. MY_UESUB)
WHERE (I .EQ. MY_UESUB)
!
PSI1(IGRAIN, :) = GRAIN_ORIENTATION(0, I)
PHI(IGRAIN, :) = GRAIN_ORIENTATION(1, I)
Expand All @@ -188,7 +188,7 @@ SUBROUTINE ASSIGN_ANGLES_PHASES(C0_ANGS, CRSS_N, RSTAR_N, WTS)
ELSEIF (ORIENTATION_OPTIONS%ORIENTATION_PARAMETERIZATION &
& .EQ. 'euler-kocks') THEN
!
WHERE (I+1 .EQ. MY_UESUB)
WHERE (I .EQ. MY_UESUB)
!
PSI(IGRAIN, :) = GRAIN_ORIENTATION(0, I)
THE(IGRAIN, :) = GRAIN_ORIENTATION(1, I)
Expand All @@ -199,7 +199,7 @@ SUBROUTINE ASSIGN_ANGLES_PHASES(C0_ANGS, CRSS_N, RSTAR_N, WTS)
ELSEIF (ORIENTATION_OPTIONS%ORIENTATION_PARAMETERIZATION &
& .EQ. 'rodrigues') THEN
!
WHERE (I+1 .EQ. MY_UESUB)
WHERE (I .EQ. MY_UESUB)
!
RODS(0, IGRAIN, :) = GRAIN_ORIENTATION(0, I)
RODS(1, IGRAIN, :) = GRAIN_ORIENTATION(1, I)
Expand All @@ -210,7 +210,7 @@ SUBROUTINE ASSIGN_ANGLES_PHASES(C0_ANGS, CRSS_N, RSTAR_N, WTS)
ELSEIF (ORIENTATION_OPTIONS%ORIENTATION_PARAMETERIZATION &
& .EQ. 'quaternion') THEN
!
WHERE (I+1 .EQ. MY_UESUB)
WHERE (I .EQ. MY_UESUB)
!
QUAT(0, IGRAIN, :) = GRAIN_ORIENTATION(0, I)
QUAT(1, IGRAIN, :) = GRAIN_ORIENTATION(1, I)
Expand Down

0 comments on commit ac55135

Please sign in to comment.