Make minor improvements and fix bugs

- Major code formatting changes
- Minor bug fixes

.gitignore

@@ -13,6 +13,7 @@
 *.mv*
 *.dvi
 *.info
+*.swp
 
 /lib/libf95/modules
 /lib/libparallel/modules_serial
@@ -31,3 +32,8 @@
 *.toc
 
 fepx.pdf
+
+# Ignore sed -e files
+VERSIONS-e
+*.f90-e
+*.texi-e

VERSIONS

@@ -1,3 +1,7 @@
+New in 1.1.1 (23 Nov 2020):
+- Major code formatting changes
+- Minor bug fixes
+
 New in 1.1.0 (21 Oct 2020):
 - Overhauled restart capabilities
 - Fiber averaging routines are now live

doc/texinfo/version.texi

@@ -3,9 +3,9 @@
 @c See the COPYING file in the top-level directory.
 
 @iftex
-@set FEPX_VERSION 1.1.0
+@set FEPX_VERSION 1.1.1
 @end iftex
 
 @ifinfo
-@set FEPX_VERSION 1.1.0
+@set FEPX_VERSION 1.1.1
 @end ifinfo

src/CMakeLists.txt

@@ -5,7 +5,7 @@
 # Top-level CMakeLists.txt for building FEPX
 cmake_minimum_required(VERSION 2.8)
 project(fepx Fortran)
-set(FEPX_VERSION \"1.1.0\")
+set(FEPX_VERSION \"1.1.1\")
 
 # Prepare CMake for Fortran and locate MPI package
 enable_language(Fortran)

src/fepx.f90

@@ -11,12 +11,12 @@ PROGRAM FEPX
 !-------------------------------------------------------------------------------
 !
 ! LibF95 modules
-USE INTRINSICTYPESMODULE, RK=>REAL_KIND
-USE FILESMODULE
+USE INTRINSIC_TYPES_MOD, RK=>REAL_KIND
+USE FILES_MOD
 !
 ! LibParallel modules
 USE PARALLEL_MOD
-USE GATHER_SCATTER
+USE GATHER_SCATTER_MOD
 !
 ! Driver modules
 USE DRIVER_ISO_VP_MOD
@@ -30,10 +30,9 @@ PROGRAM FEPX
 USE MICROSTRUCTURE_MOD
 USE FIBER_AVERAGE_MOD
 USE WRITE_OUTPUT_MOD
-USE DIMSMODULE
+USE DIMENSIONS_MOD
 USE UNITS_MOD
 USE SURFACE_MOD
-USE SURF_INFO_MOD
 USE QUADRATURE_MOD
 !
 IMPLICIT NONE
@@ -85,7 +84,7 @@ PROGRAM FEPX
     CALL DATE_AND_TIME(VALUES = TIMEVALUES)
     WRITE(DFLT_U,'(A)')'==========================    F   E   P   X   =========================='
     WRITE(DFLT_U,'(A)')'Info   : A finite element software package for polycrystal plasticity.'
-    WRITE(DFLT_U,'(A)')'Info   : Version 1.1.0'
+    WRITE(DFLT_U,'(A)')'Info   : Version 1.1.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-2020, DPLab, ACME Lab.'
@@ -205,9 +204,9 @@ PROGRAM FEPX
 AUTO_TIME = 0   ! (0)=No, (1):Yes
 DEF_CONTROL_BY = OPTIONS%DEF_CONTROL_BY
 !
-! Extract crystal parameters from configuration file.
+! Process crystal parameters from configuration file.
 !
-CALL READ_MATERIAL_PARAMETERS(KELAS, KEINV)
+CALL PROCESS_MATERIAL_PARAMETERS(KELAS, KEINV)
 !
 IF (MYID .EQ. 0) THEN
     !
@@ -400,21 +399,21 @@ PROGRAM FEPX
 DEALLOCATE(PART_INFO)
 DEALLOCATE(GLOBAL_INFO)
 !
-! Read load history.
+! Process load history from read-in options
 !
 SELECT CASE (DEF_CONTROL_BY)
     !
     CASE(UNIAXIAL_LOAD_TARGET, UNIAXIAL_STRAIN_TARGET)
         !
-        CALL READ_CTRL_DATA(VELOCITY)
+        CALL PROCESS_CTRL_DATA(VELOCITY)
         !
     CASE(TRIAXIAL_CONSTANT_STRAIN_RATE)
         !
-        CALL READ_CTRL_DATA_CSR(VELOCITY)
+        CALL PROCESS_CTRL_DATA_CSR(VELOCITY)
         !
     CASE(TRIAXIAL_CONSTANT_LOAD_RATE)
         !
-        CALL READ_CTRL_DATA_CLR
+        CALL PROCESS_CTRL_DATA_CLR
     !
 END SELECT
 !

src/libf95/CMakeLists.txt

@@ -5,14 +5,12 @@
 message(STATUS "Preparing library: libf95")
 
 file(GLOB libf95_src
-    IntrinsicTypesModule.f90
-    ConstantsModule.f90
-    StringsModule.f90
-    FilesModule.f90
-    TimerModule.f90
-    CommandModule.f90
-    OptimModule.f90
-    LibF95.f90
+    command_mod.f90
+    files_mod.f90
+    intrinsic_types_mod.f90
+    libf95.f90
+    strings_mod.f90
+    timer_mod.f90
     )
 
 add_library(libf95 STATIC ${libf95_src})