diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a88b330bd..4c33f83e7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -251,13 +251,6 @@ Thermal: - master - release -grid_packedGeometry: - stage: grid - script: grid_packedGeometry/test.py - except: - - master - - release - grid_parsingArguments: stage: grid script: grid_parsingArguments/test.py diff --git a/PRIVATE b/PRIVATE index c6dc3f116..a13f94880 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit c6dc3f116fc6007caf076772d5c29f0a0523544d +Subproject commit a13f94880aeae06c14bde50c15f00d7f076d23ad diff --git a/src/homogenization_mech_RGC.f90 b/src/homogenization_mech_RGC.f90 index 1d1348d69..d3990e266 100644 --- a/src/homogenization_mech_RGC.f90 +++ b/src/homogenization_mech_RGC.f90 @@ -85,7 +85,7 @@ module subroutine mech_RGC_init(num_homogMech) h, & NofMyHomog, & sizeState, nIntFaceTot - + class (tNode), pointer :: & num_RGC, & ! pointer to RGC numerics data material_homogenization, & @@ -107,7 +107,7 @@ module subroutine mech_RGC_init(num_homogMech) allocate(state(Ninstance)) allocate(state0(Ninstance)) allocate(dependentState(Ninstance)) - + num_RGC => num_homogMech%get('RGC',defaultVal=emptyDict) 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') - material_homogenization => material_root%get('homogenization') + material_homogenization => material_root%get('homogenization') do h = 1, size(homogenization_type) if (homogenization_type(h) /= HOMOGENIZATION_RGC_ID) cycle homog => material_homogenization%get(h) @@ -188,10 +188,10 @@ module subroutine mech_RGC_init(num_homogMech) stt%work => homogState(h)%state(nIntFaceTot+1,:) stt%penaltyEnergy => homogState(h)%state(nIntFaceTot+2,:) - allocate(dst%volumeDiscrepancy( NofMyHomog)) - allocate(dst%relaxationRate_avg( NofMyHomog)) - allocate(dst%relaxationRate_max( NofMyHomog)) - allocate(dst%mismatch( 3,NofMyHomog)) + allocate(dst%volumeDiscrepancy( NofMyHomog), source=0.0_pReal) + allocate(dst%relaxationRate_avg( NofMyHomog), source=0.0_pReal) + allocate(dst%relaxationRate_max( NofMyHomog), source=0.0_pReal) + allocate(dst%mismatch( 3,NofMyHomog), source=0.0_pReal) !-------------------------------------------------------------------------------------------------- ! assigning cluster orientations @@ -959,7 +959,7 @@ module subroutine mech_RGC_results(instance,group) case('W') call results_writeDataset(group,stt%work,trim(prm%output(o)), & 'work density','J/m³') - case('M') + case('M') call results_writeDataset(group,dst%mismatch,trim(prm%output(o)), & 'average mismatch tensor','1') case('R')