From 05d980f1e314e28d297cb0870b90cb8d8efd63e6 Mon Sep 17 00:00:00 2001 From: Luv Sharma Date: Fri, 12 Sep 2014 15:58:03 +0000 Subject: [PATCH] minor fixes --- code/homogenization.f90 | 17 ++++++++--------- code/homogenization_isostrain.f90 | 3 +++ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/code/homogenization.f90 b/code/homogenization.f90 index 4f734a85c..e2cf74628 100644 --- a/code/homogenization.f90 +++ b/code/homogenization.f90 @@ -1224,17 +1224,16 @@ subroutine field_putDAMAGE(ip,el,fieldDamageValue) ! naming scheme implicit none integer(pInt), intent(in) :: & ip, & !< integration point number - el, & - fieldDamageValue - + el + real(pReal), intent(in) :: & + fieldDamageValue integer(pInt) :: & Ngrains, ipc select case(field_damage_type(material_homog(ip,el))) case (FIELD_DAMAGE_NONLOCAL_ID) fieldDamage(material_homog(ip,el))% & - state(1:fieldDamage(material_homog(ip,el))%sizeState, & - mappingHomogenization(1,ip,el)) = fieldDamageValue + state(1, mappingHomogenization(1,ip,el)) = fieldDamageValue end select @@ -1298,16 +1297,16 @@ subroutine field_putThermal(ip,el,fieldThermalValue) implicit none integer(pInt), intent(in) :: & ip, & !< integration point number - el, & - fieldThermalValue + el + real(pReal), intent(in) :: & + fieldThermalValue integer(pInt) :: & Ngrains, ipc select case(field_thermal_type(material_homog(ip,el))) case (FIELD_THERMAL_CONDUCTION_ID) fieldThermal(material_homog(ip,el))% & - state(1:fieldThermal(material_homog(ip,el))%sizeState, & - mappingHomogenization(1,ip,el)) = fieldThermalValue + state(1,mappingHomogenization(1,ip,el)) = fieldThermalValue end select diff --git a/code/homogenization_isostrain.f90 b/code/homogenization_isostrain.f90 index 284891048..7342b462f 100644 --- a/code/homogenization_isostrain.f90 +++ b/code/homogenization_isostrain.f90 @@ -135,6 +135,9 @@ subroutine homogenization_isostrain_init(fileUnit) tag = IO_lc(IO_stringValue(line,positions,1_pInt)) ! extract key select case(tag) case('type') +#ifdef NEWSTATE + case('field_damage') +#endif case ('(output)') output = output + 1_pInt homogenization_isostrain_output(output,i) = IO_lc(IO_stringValue(line,positions,2_pInt))