223031012
/
DAMASK_EICMD
mirror of https://github.com/achalhp/DAMASK_EICMD.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'modernize-testing' into development

This commit is contained in:
Sharan Roongta 2020-09-08 12:30:13 +02:00
parent 751bf7862d e270b5fe5f
commit f38e32572f
3 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.gitlab-ci.yml
View File

@ -251,13 +251,6 @@ Thermal:
- master - master
- release - release
grid_packedGeometry:
stage: grid
script: grid_packedGeometry/test.py
except:
- master
- release
grid_parsingArguments: grid_parsingArguments:
stage: grid stage: grid
script: grid_parsingArguments/test.py script: grid_parsingArguments/test.py

2
PRIVATE

@ -1 +1 @@
Subproject commit c6dc3f116fc6007caf076772d5c29f0a0523544d Subproject commit a13f94880aeae06c14bde50c15f00d7f076d23ad

16
src/homogenization_mech_RGC.f90
View File

@ -85,7 +85,7 @@ module subroutine mech_RGC_init(num_homogMech)
h, & h, &
NofMyHomog, & NofMyHomog, &
sizeState, nIntFaceTot sizeState, nIntFaceTot
class (tNode), pointer :: & class (tNode), pointer :: &
num_RGC, & ! pointer to RGC numerics data num_RGC, & ! pointer to RGC numerics data
material_homogenization, & material_homogenization, &
@ -107,7 +107,7 @@ module subroutine mech_RGC_init(num_homogMech)
allocate(state(Ninstance)) allocate(state(Ninstance))
allocate(state0(Ninstance)) allocate(state0(Ninstance))
allocate(dependentState(Ninstance)) allocate(dependentState(Ninstance))
num_RGC => num_homogMech%get('RGC',defaultVal=emptyDict) num_RGC => num_homogMech%get('RGC',defaultVal=emptyDict)
num%atol = num_RGC%get_asFloat('atol', defaultVal=1.0e+4_pReal) num%atol = num_RGC%get_asFloat('atol', defaultVal=1.0e+4_pReal)
@ -139,7 +139,7 @@ module subroutine mech_RGC_init(num_homogMech)
if (num%volDiscrPow <= 0.0_pReal) call IO_error(301,ext_msg='volDiscrPw_RGC') if (num%volDiscrPow <= 0.0_pReal) call IO_error(301,ext_msg='volDiscrPw_RGC')
material_homogenization => material_root%get('homogenization') material_homogenization => material_root%get('homogenization')
do h = 1, size(homogenization_type) do h = 1, size(homogenization_type)
if (homogenization_type(h) /= HOMOGENIZATION_RGC_ID) cycle if (homogenization_type(h) /= HOMOGENIZATION_RGC_ID) cycle
homog => material_homogenization%get(h) homog => material_homogenization%get(h)
@ -188,10 +188,10 @@ module subroutine mech_RGC_init(num_homogMech)
stt%work => homogState(h)%state(nIntFaceTot+1,:) stt%work => homogState(h)%state(nIntFaceTot+1,:)
stt%penaltyEnergy => homogState(h)%state(nIntFaceTot+2,:) stt%penaltyEnergy => homogState(h)%state(nIntFaceTot+2,:)
allocate(dst%volumeDiscrepancy( NofMyHomog)) allocate(dst%volumeDiscrepancy( NofMyHomog), source=0.0_pReal)
allocate(dst%relaxationRate_avg( NofMyHomog)) allocate(dst%relaxationRate_avg( NofMyHomog), source=0.0_pReal)
allocate(dst%relaxationRate_max( NofMyHomog)) allocate(dst%relaxationRate_max( NofMyHomog), source=0.0_pReal)
allocate(dst%mismatch( 3,NofMyHomog)) allocate(dst%mismatch( 3,NofMyHomog), source=0.0_pReal)
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
! assigning cluster orientations ! assigning cluster orientations
@ -959,7 +959,7 @@ module subroutine mech_RGC_results(instance,group)
case('W') case('W')
call results_writeDataset(group,stt%work,trim(prm%output(o)), & call results_writeDataset(group,stt%work,trim(prm%output(o)), &
'work density','J/m³') 'work density','J/m³')
case('M') case('M')
call results_writeDataset(group,dst%mismatch,trim(prm%output(o)), & call results_writeDataset(group,dst%mismatch,trim(prm%output(o)), &
'average mismatch tensor','1') 'average mismatch tensor','1')
case('R') case('R')