Merge branch 'modernize-testing' into development

This commit is contained in:
Sharan Roongta 2020-09-08 12:30:13 +02:00
commit f38e32572f
3 changed files with 9 additions and 16 deletions

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

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

View File

@ -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