From f44edb31fc74b031f02d80def49f3fcb9b6fd351 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Mon, 24 May 2021 17:20:33 +0200 Subject: [PATCH] polishing --- src/phase_mechanical_plastic_isotropic.f90 | 8 ++++---- src/phase_thermal.f90 | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/phase_mechanical_plastic_isotropic.f90 b/src/phase_mechanical_plastic_isotropic.f90 index 0e7920f1d..4701a4514 100644 --- a/src/phase_mechanical_plastic_isotropic.f90 +++ b/src/phase_mechanical_plastic_isotropic.f90 @@ -36,10 +36,10 @@ submodule(phase:plastic) isotropic !-------------------------------------------------------------------------------------------------- ! containers for parameters and state - type(tParameters), allocatable, dimension(:) :: param - type(tIsotropicState), allocatable, dimension(:) :: & - dotState, & - state + type(tParameters), allocatable, dimension(:) :: param + type(tIsotropicState), allocatable, dimension(:) :: & + dotState, & + state contains diff --git a/src/phase_thermal.f90 b/src/phase_thermal.f90 index cbe467838..e106d890e 100644 --- a/src/phase_thermal.f90 +++ b/src/phase_thermal.f90 @@ -100,8 +100,7 @@ module subroutine thermal_init(phases) allocate(current(ph)%dot_T(Nmembers),source=0.0_pReal) phase => phases%get(ph) thermal => phase%get('thermal',defaultVal=emptyDict) - param(ph)%C_p = thermal%get_asFloat('c_p',defaultVal=0.0_pReal) - if (param(ph)%C_p <= 0) param(ph)%C_p = thermal%get_asFloat('C_p',defaultVal=0.0_pReal) ! ToDo: decide on capitalization + param(ph)%C_p = thermal%get_asFloat('C_p',defaultVal=0.0_pReal) param(ph)%K(1,1) = thermal%get_asFloat('K_11',defaultVal=0.0_pReal) ! ToDo: make mandatory? param(ph)%K(2,2) = thermal%get_asFloat('K_22',defaultVal=0.0_pReal) ! ToDo: depends on symmtery param(ph)%K(3,3) = thermal%get_asFloat('K_33',defaultVal=0.0_pReal) ! ToDo: depends on symmtery