From 1298f6ea5e86be8fab53149280242841a5789d89 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Thu, 8 May 2014 17:44:28 +0000 Subject: [PATCH] updated material.config of tests, had too many slip systems defined. simplified none homogenization --- code/homogenization.f90 | 2 +- code/homogenization_none.f90 | 23 +++++++++-------------- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/code/homogenization.f90 b/code/homogenization.f90 index 0421db7b4..188fa25fe 100644 --- a/code/homogenization.f90 +++ b/code/homogenization.f90 @@ -129,7 +129,7 @@ subroutine homogenization_init() if (.not. IO_open_jobFile_stat(FILEUNIT,material_localFileExt)) & ! no local material configuration present... call IO_open_file(FILEUNIT,material_configFile) ! ... open material.config file if (any(homogenization_type == HOMOGENIZATION_NONE_ID)) & - call homogenization_none_init(FILEUNIT) + call homogenization_none_init() if (any(homogenization_type == HOMOGENIZATION_ISOSTRAIN_ID)) & call homogenization_isostrain_init(FILEUNIT) if (any(homogenization_type == HOMOGENIZATION_RGC_ID)) & diff --git a/code/homogenization_none.f90 b/code/homogenization_none.f90 index 9d761c978..bfb4a7d56 100644 --- a/code/homogenization_none.f90 +++ b/code/homogenization_none.f90 @@ -3,12 +3,11 @@ !-------------------------------------------------------------------------------------------------- !> @author Franz Roters, Max-Planck-Institut für Eisenforschung GmbH !> @author Philip Eisenlohr, Max-Planck-Institut für Eisenforschung GmbH -!> @brief Isostrain (full constraint Taylor assuption) homogenization scheme +!> @author Martin Diehl, Max-Planck-Institut für Eisenforschung GmbH +!> @brief dummy homogenization homogenization scheme !-------------------------------------------------------------------------------------------------- module homogenization_none - use prec, only: & - pInt - + implicit none private @@ -20,24 +19,20 @@ contains !-------------------------------------------------------------------------------------------------- !> @brief allocates all neccessary fields, reads information from material configuration file !-------------------------------------------------------------------------------------------------- -subroutine homogenization_none_init(fileUnit) +subroutine homogenization_none_init() use, intrinsic :: iso_fortran_env ! to get compiler_version and compiler_options (at least for gfortran 4.6 at the moment) - use IO - use material - + use IO, only: & + IO_timeStamp + use material, only: & + HOMOGENIZATION_NONE_label + implicit none - integer(pInt), intent(in) :: fileUnit - integer :: & - maxNinstance ! no pInt (stores a system dependen value from 'count' write(6,'(/,a)') ' <<<+- homogenization_'//HOMOGENIZATION_NONE_label//' init -+>>>' write(6,'(a)') ' $Id$' write(6,'(a15,a)') ' Current time: ',IO_timeStamp() #include "compilation_info.f90" - maxNinstance = count(homogenization_type == HOMOGENIZATION_NONE_ID) - if (maxNinstance == 0) return - end subroutine homogenization_none_init end module homogenization_none