From e26e8c715f348e07d10db913e81b2cc4843b39e1 Mon Sep 17 00:00:00 2001 From: Sharan Roongta Date: Mon, 21 Feb 2022 17:28:02 +0100 Subject: [PATCH] pass data to homogenization and phase level at the same time --- src/grid/DAMASK_grid.f90 | 3 +-- src/homogenization.f90 | 1 - src/homogenization_thermal.f90 | 2 +- src/phase_thermal.f90 | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/grid/DAMASK_grid.f90 b/src/grid/DAMASK_grid.f90 index 918f477b1..c5888b99a 100644 --- a/src/grid/DAMASK_grid.f90 +++ b/src/grid/DAMASK_grid.f90 @@ -304,8 +304,6 @@ program DAMASK_grid call spectral_Utilities_init do field = 1, nActiveFields select case (ID(field)) - case(FIELD_MECH_ID) - call mechanical_init case(FIELD_THERMAL_ID) initial_conditions => config_load%get('initial_conditions',defaultVal=emptyDict) @@ -318,6 +316,7 @@ program DAMASK_grid end select enddo + call mechanical_init !-------------------------------------------------------------------------------------------------- ! write header of output file if (worldrank == 0) then diff --git a/src/homogenization.f90 b/src/homogenization.f90 index 8539df994..8c8899d2e 100644 --- a/src/homogenization.f90 +++ b/src/homogenization.f90 @@ -293,7 +293,6 @@ subroutine homogenization_thermal_response(Delta_t,cell_start,cell_end) do ce = cell_start, cell_end if (terminallyIll) continue ho = material_homogenizationID(ce) - call thermal_partition(ce) do co = 1, homogenization_Nconstituents(ho) if (.not. phase_thermal_constitutive(Delta_t,material_phaseID(co,ce),material_phaseEntry(co,ce))) then if (.not. terminallyIll) print*, ' Cell ', ce, ' terminally ill' diff --git a/src/homogenization_thermal.f90 b/src/homogenization_thermal.f90 index 9aa727041..259921f72 100644 --- a/src/homogenization_thermal.f90 +++ b/src/homogenization_thermal.f90 @@ -162,7 +162,7 @@ module subroutine homogenization_thermal_setField(T,dot_T, ce) current(material_homogenizationID(ce))%T(material_homogenizationEntry(ce)) = T current(material_homogenizationID(ce))%dot_T(material_homogenizationEntry(ce)) = dot_T - + call thermal_partition(ce) end subroutine homogenization_thermal_setField diff --git a/src/phase_thermal.f90 b/src/phase_thermal.f90 index 11314531e..8640c356d 100644 --- a/src/phase_thermal.f90 +++ b/src/phase_thermal.f90 @@ -96,7 +96,7 @@ module subroutine thermal_init(phases) do ph = 1, phases%length Nmembers = count(material_phaseID == ph) - allocate(current(ph)%T(Nmembers),source=T_ROOM) + allocate(current(ph)%T(Nmembers),source=300.0_pReal) allocate(current(ph)%dot_T(Nmembers),source=0.0_pReal) phase => phases%get(ph) thermal => phase%get('thermal',defaultVal=emptyDict)