From 643ed894475fac19af90f0353edf7cf99a259da1 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Tue, 12 Mar 2019 00:07:44 +0100 Subject: [PATCH] not needed anymore --- src/DAMASK_grid.f90 | 13 +++---------- src/FEM_zoo.f90 | 11 ----------- src/FEsolving.f90 | 10 +--------- src/IO.f90 | 18 +----------------- src/compilation_info.f90 | 0 src/mesh_FEM.f90 | 4 ---- src/plastic_none.f90 | 25 +++++++------------------ 7 files changed, 12 insertions(+), 69 deletions(-) delete mode 100644 src/compilation_info.f90 diff --git a/src/DAMASK_grid.f90 b/src/DAMASK_grid.f90 index c572da760..0fca252fc 100644 --- a/src/DAMASK_grid.f90 +++ b/src/DAMASK_grid.f90 @@ -7,11 +7,6 @@ !> results !-------------------------------------------------------------------------------------------------- program DAMASK_spectral -#if defined(__GFORTRAN__) || __INTEL_COMPILER >= 1800 - use, intrinsic :: iso_fortran_env, only: & - compiler_version, & - compiler_options -#endif #include use PETScsys use prec, only: & @@ -35,8 +30,7 @@ program DAMASK_spectral IO_error, & IO_lc, & IO_intOut, & - IO_warning, & - IO_timeStamp + IO_warning use debug, only: & debug_level, & debug_spectral, & @@ -155,10 +149,9 @@ program DAMASK_spectral ! init DAMASK (all modules) call CPFEM_initAll write(6,'(/,a)') ' <<<+- DAMASK_spectral init -+>>>' - write(6,'(/,a,/)') ' Roters et al., Computational Materials Science, 2018' - write(6,'(a15,a)') ' Current time: ',IO_timeStamp() -#include "compilation_info.f90" + write(6,'(/,a)') ' Shanthraj et al., Handbook of Mechanics of Materials, 2019' + write(6,'(a)') ' https://doi.org/10.1007/978-981-10-6855-3_80' call results_openJobFile() call results_closeJobFile() diff --git a/src/FEM_zoo.f90 b/src/FEM_zoo.f90 index 6abdfe883..53ef4655d 100644 --- a/src/FEM_zoo.f90 +++ b/src/FEM_zoo.f90 @@ -34,20 +34,9 @@ contains !> @brief initializes FEM interpolation data !-------------------------------------------------------------------------------------------------- subroutine FEM_Zoo_init -#if defined(__GFORTRAN__) || __INTEL_COMPILER >= 1800 - use, intrinsic :: iso_fortran_env, only: & - compiler_version, & - compiler_options -#endif - use IO, only: & - IO_timeStamp - implicit none write(6,'(/,a)') ' <<<+- FEM_Zoo init -+>>>' - write(6,'(a)') ' $Id: FEM_Zoo.f90 4354 2015-08-04 15:04:53Z MPIE\p.shanthraj $' - write(6,'(a15,a)') ' Current time: ',IO_timeStamp() -#include "compilation_info.f90" !-------------------------------------------------------------------------------------------------- ! 2D linear diff --git a/src/FEsolving.f90 b/src/FEsolving.f90 index f31500c26..d63617135 100644 --- a/src/FEsolving.f90 +++ b/src/FEsolving.f90 @@ -43,11 +43,6 @@ contains !> solver the information is provided by the interface module !-------------------------------------------------------------------------------------------------- subroutine FE_init -#if defined(__GFORTRAN__) || __INTEL_COMPILER >= 1800 - use, intrinsic :: iso_fortran_env, only: & - compiler_version, & - compiler_options -#endif use debug, only: & debug_level, & debug_FEsolving, & @@ -61,8 +56,7 @@ subroutine FE_init IO_open_inputFile, & IO_open_logFile, & #endif - IO_warning, & - IO_timeStamp + IO_warning use DAMASK_interface implicit none @@ -75,8 +69,6 @@ subroutine FE_init #endif write(6,'(/,a)') ' <<<+- FEsolving init -+>>>' - write(6,'(a15,a)') ' Current time: ',IO_timeStamp() -#include "compilation_info.f90" modelName = getSolverJobName() diff --git a/src/IO.f90 b/src/IO.f90 index 983465caa..7b9abf41c 100644 --- a/src/IO.f90 +++ b/src/IO.f90 @@ -35,8 +35,7 @@ module IO IO_lc, & IO_error, & IO_warning, & - IO_intOut, & - IO_timeStamp + IO_intOut #if defined(Marc4DAMASK) || defined(Abaqus) public :: & IO_open_inputFile, & @@ -717,21 +716,6 @@ pure function IO_intOut(intToPrint) end function IO_intOut -!-------------------------------------------------------------------------------------------------- -!> @brief returns time stamp -!-------------------------------------------------------------------------------------------------- -function IO_timeStamp() - - implicit none - character(len=10) :: IO_timeStamp - integer(pInt), dimension(8) :: values - - call DATE_AND_TIME(VALUES=values) - write(IO_timeStamp,'(i2.2,a1,i2.2,a1,i2.2)') values(5),':',values(6),':',values(7) - -end function IO_timeStamp - - !-------------------------------------------------------------------------------------------------- !> @brief write error statements to standard out and terminate the Marc/spectral run with exit #9xxx !> in ABAQUS either time step is reduced or execution terminated diff --git a/src/compilation_info.f90 b/src/compilation_info.f90 deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/mesh_FEM.f90 b/src/mesh_FEM.f90 index 29f0bc682..af17b2866 100644 --- a/src/mesh_FEM.f90 +++ b/src/mesh_FEM.f90 @@ -120,9 +120,7 @@ subroutine tMesh_FEM_init(self,dimen,order,nodes) !-------------------------------------------------------------------------------------------------- subroutine mesh_init() use DAMASK_interface - use, intrinsic :: iso_fortran_env ! to get compiler_version and compiler_options (at least for gfortran 4.6 at the moment) use IO, only: & - IO_timeStamp, & IO_error, & IO_open_file, & IO_stringPos, & @@ -161,8 +159,6 @@ subroutine mesh_init() write(6,'(/,a)') ' <<<+- mesh init -+>>>' - write(6,'(a15,a)') ' Current time: ',IO_timeStamp() -#include "compilation_info.f90" ! read in file call DMPlexCreateFromFile(PETSC_COMM_WORLD,geometryFile,PETSC_TRUE,globalMesh,ierr) diff --git a/src/plastic_none.f90 b/src/plastic_none.f90 index 0b3df43ef..f8a64b55b 100644 --- a/src/plastic_none.f90 +++ b/src/plastic_none.f90 @@ -19,19 +19,10 @@ contains !> @details reads in material parameters, allocates arrays, and does sanity checks !-------------------------------------------------------------------------------------------------- subroutine plastic_none_init -#if defined(__GFORTRAN__) || __INTEL_COMPILER >= 1800 - use, intrinsic :: iso_fortran_env, only: & - compiler_version, & - compiler_options -#endif - use prec, only: & - pInt use debug, only: & debug_level, & debug_constitutive, & debug_levelBasic - use IO, only: & - IO_timeStamp use material, only: & phase_plasticity, & material_allocatePlasticState, & @@ -41,28 +32,26 @@ subroutine plastic_none_init plasticState implicit none - integer(pInt) :: & + integer :: & Ninstance, & p, & NipcMyPhase write(6,'(/,a)') ' <<<+- plastic_'//PLASTICITY_NONE_label//' init -+>>>' - write(6,'(a15,a)') ' Current time: ',IO_timeStamp() -#include "compilation_info.f90" - Ninstance = int(count(phase_plasticity == PLASTICITY_NONE_ID),pInt) - if (iand(debug_level(debug_constitutive),debug_levelBasic) /= 0_pInt) & + Ninstance = count(phase_plasticity == PLASTICITY_NONE_ID) + if (iand(debug_level(debug_constitutive),debug_levelBasic) /= 0) & write(6,'(a16,1x,i5,/)') '# instances:',Ninstance - do p = 1_pInt, size(phase_plasticity) + do p = 1, size(phase_plasticity) if (phase_plasticity(p) /= PLASTICITY_NONE_ID) cycle !-------------------------------------------------------------------------------------------------- ! allocate state arrays NipcMyPhase = count(material_phase == p) - call material_allocatePlasticState(p,NipcMyPhase,0_pInt,0_pInt,0_pInt, & - 0_pInt,0_pInt,0_pInt) - plasticState(p)%sizePostResults = 0_pInt + call material_allocatePlasticState(p,NipcMyPhase,0,0,0, & + 0,0,0) + plasticState(p)%sizePostResults = 0 enddo