From 34e0dd1c6482ff99394c8ad1b467f29c7e0e1c15 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Thu, 19 Sep 2019 11:00:41 -0700 Subject: [PATCH] polishing --- src/config.f90 | 3 ++- src/material.f90 | 8 ++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/config.f90 b/src/config.f90 index 90233057c..e66b85d2d 100644 --- a/src/config.f90 +++ b/src/config.f90 @@ -4,6 +4,7 @@ !> @details Reads the material configuration file, where solverJobName.materialConfig takes !! precedence over material.config. Stores the raw strings and the positions of delimiters for the !! parts 'homogenization', 'crystallite', 'phase', 'texture', and 'microstucture' +!! Reads numerics.config and debug.config !-------------------------------------------------------------------------------------------------- module config use prec @@ -138,7 +139,7 @@ recursive function read_materialConfig(fileName,cnt) result(fileContent) character(len=pStringLen), dimension(:), allocatable :: includedContent character(len=pStringLen) :: line character(len=pStringLen), parameter :: dummy = 'https://damask.mpie.de' !< to fill up remaining array - character(len=:), allocatable :: rawData + character(len=:), allocatable :: rawData integer :: & fileLength, & fileUnit, & diff --git a/src/material.f90 b/src/material.f90 index 636d7193d..d86c9f10c 100644 --- a/src/material.f90 +++ b/src/material.f90 @@ -3,9 +3,6 @@ !> @author Philip Eisenlohr, Max-Planck-Institut für Eisenforschung GmbH !> @author Martin Diehl, Max-Planck-Institut für Eisenforschung GmbH !> @brief Parses material config file, either solverJobName.materialConfig or material.config -!> @details reads the material configuration file, where solverJobName.materialConfig takes -!! precedence over material.config and parses the sections 'homogenization', 'crystallite', -!! 'phase', 'texture', and 'microstucture' !-------------------------------------------------------------------------------------------------- module material use prec @@ -240,7 +237,6 @@ contains !-------------------------------------------------------------------------------------------------- subroutine material_init - integer, parameter :: FILEUNIT = 210 integer :: i,e,m,c,h, myDebug, myPhase, myHomog, myMicro integer, dimension(:), allocatable :: & CounterPhase, & @@ -384,8 +380,8 @@ subroutine material_init !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ! BEGIN DEPRECATED - allocate(mappingHomogenization (2, discretization_nIP,discretization_nElem),source=0) - allocate(mappingHomogenizationConst( discretization_nIP,discretization_nElem),source=1) + allocate(mappingHomogenization (2,discretization_nIP,discretization_nElem),source=0) + allocate(mappingHomogenizationConst( discretization_nIP,discretization_nElem),source=1) CounterHomogenization=0 do e = 1,discretization_nElem