From 18c61ca0fb63d2923e5232aee06771f91a288891 Mon Sep 17 00:00:00 2001 From: victorkemp Date: Tue, 7 Jul 2026 20:09:22 +1200 Subject: [PATCH 1/2] Corrected DEBUG(191) and (192) mixup --- Source/EMG/EMG5/HEXA.f90 | 3 +-- Source/EMG/EMG5/PENTA.f90 | 5 ++--- Source/EMG/EMG5/TETRA.f90 | 5 ++--- Source/LK9/LINK9/LINK9.f90 | 4 ++-- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/Source/EMG/EMG5/HEXA.f90 b/Source/EMG/EMG5/HEXA.f90 index 53fd0294..59faf0ff 100644 --- a/Source/EMG/EMG5/HEXA.f90 +++ b/Source/EMG/EMG5/HEXA.f90 @@ -38,9 +38,8 @@ SUBROUTINE HEXA ( OPT, INT_ELEM_ID,IORD, RED_INT_SHEAR, WRITE_WARN ) ! 6) KED = element differen stiff matrix calc , if OPT(6) = 'Y' USE PENTIUM_II_KIND, ONLY : BYTE, LONG, DOUBLE - USE IOUNT1, ONLY : WRT_ERR, ERR, F06 + USE IOUNT1, ONLY : ERR, F06 USE SCONTR, ONLY : BLNK_SUB_NAM, FATAL_ERR, MAX_ORDER_GAUSS, MELDOF, MPLOAD4_3D_DATA, NPLOAD4_3D, NSUB, NTSUB - USE TIMDAT, ONLY : TSEC USE CONSTANTS_1, ONLY : QUARTER, HALF, ZERO, ONE USE DEBUG_PARAMETERS, ONLY : DEBUG USE PARAMS, ONLY : EPSIL diff --git a/Source/EMG/EMG5/PENTA.f90 b/Source/EMG/EMG5/PENTA.f90 index b177fa56..7a3b7d31 100644 --- a/Source/EMG/EMG5/PENTA.f90 +++ b/Source/EMG/EMG5/PENTA.f90 @@ -37,9 +37,8 @@ SUBROUTINE PENTA ( OPT, INT_ELEM_ID, IORD_IJ, IORD_K, RED_INT_SHEAR, WRITE_WARN ! 5) KED = element differen stiff matrix calc , if OPT(6) = 'Y' = 'Y' USE PENTIUM_II_KIND, ONLY : BYTE, LONG, DOUBLE - USE IOUNT1, ONLY : WRT_ERR, ERR, F06 + USE IOUNT1, ONLY : ERR, F06 USE SCONTR, ONLY : BLNK_SUB_NAM, FATAL_ERR, MAX_ORDER_TRIA, MAX_ORDER_GAUSS, NTSUB - USE TIMDAT, ONLY : TSEC USE CONSTANTS_1, ONLY : HALF, THIRD, ZERO USE DEBUG_PARAMETERS, ONLY : DEBUG USE PARAMS, ONLY : EPSIL @@ -375,7 +374,7 @@ SUBROUTINE PENTA ( OPT, INT_ELEM_ID, IORD_IJ, IORD_K, RED_INT_SHEAR, WRITE_WARN ENDDO CALL MATMULT_FFF_T ( BI, EALP, 6, 3*ELGP, 1, DUM0 ) INTFAC = DETJ(GAUSS_PT)*HH_IJ(IJ)*HH_K(K) - IF (DEBUG(192) == 0) THEN ! Use temperatures at Gauss points for PTE + IF (DEBUG(191) == 0) THEN ! Use temperatures at Gauss points for PTE CALL SHP3DP ( IJ, IJ, K, ELGP, SUBR_NAME, IORD_MSG, IORD_IJ, IORD_K, SS_I(IJ), SS_J(IJ), SS_K(K), & 'N', PSH, DPSHG ) CALL MATMULT_FFF ( PSH, GRID_DT_ARRAY, 1, ELGP, NTSUB, TGAUSS ) diff --git a/Source/EMG/EMG5/TETRA.f90 b/Source/EMG/EMG5/TETRA.f90 index 92b96284..f1c3071c 100644 --- a/Source/EMG/EMG5/TETRA.f90 +++ b/Source/EMG/EMG5/TETRA.f90 @@ -37,9 +37,8 @@ SUBROUTINE TETRA ( OPT, INT_ELEM_ID, IORD, RED_INT_SHEAR, WRITE_WARN ) ! 5) KED = element differen stiff matrix calc , if OPT(6) = 'Y' = 'Y' USE PENTIUM_II_KIND, ONLY : BYTE, LONG, DOUBLE - USE IOUNT1, ONLY : WRT_ERR, ERR, F06 + USE IOUNT1, ONLY : ERR, F06 USE SCONTR, ONLY : BLNK_SUB_NAM, FATAL_ERR, MAX_ORDER_TETRA, NTSUB - USE TIMDAT, ONLY : TSEC USE CONSTANTS_1, ONLY : HALF, QUARTER, ZERO USE DEBUG_PARAMETERS, ONLY : DEBUG USE NONLINEAR_PARAMS, ONLY : LOAD_ISTEP @@ -253,7 +252,7 @@ SUBROUTINE TETRA ( OPT, INT_ELEM_ID, IORD, RED_INT_SHEAR, WRITE_WARN ) ENDDO CALL MATMULT_FFF_T ( BI, EALP, 6, 3*ELGP, 1, DUM0 ) INTFAC = DETJ(GAUSS_PT)*HHH_IJK(I) - IF (DEBUG(192) == 0) THEN ! Use temperatures at Gauss points for PTE + IF (DEBUG(191) == 0) THEN ! Use temperatures at Gauss points for PTE CALL SHP3DT ( I, ELGP, SUBR_NAME, IORD_MSG, IORD, SSS_I(I), SSS_J(I), SSS_K(I), 'N', PSH, DPSHG ) CALL MATMULT_FFF ( PSH, GRID_DT_ARRAY, 1, ELGP, NTSUB, TGAUSS ) TEMP = TGAUSS(1,N) - TREF1 diff --git a/Source/LK9/LINK9/LINK9.f90 b/Source/LK9/LINK9/LINK9.f90 index 78084102..4118a293 100644 --- a/Source/LK9/LINK9/LINK9.f90 +++ b/Source/LK9/LINK9/LINK9.f90 @@ -917,8 +917,8 @@ SUBROUTINE LINK9 ( LK9_PROC_NUM ) IF (SOL_NAME(1:5) == 'MODES') THEN CALL MATMULT_SFF ( 'MGG', NDOFG, NDOFG, NTERM_MGG, SYM_MGG, I_MGG, J_MGG, MGG, 'UG', NDOFG, 1, UG_COL, 'Y', & 'FG', -EIGEN_VAL(JVEC), FG_COL ) - ! DEBUG(191): calc FG_COL as if all inertia force due to MAA*UA_DDOT - IF ((NDOFO == 0) .AND. (DEBUG(191) == 2)) THEN + ! DEBUG(192): calc FG_COL as if all inertia force due to MAA*UA_DDOT + IF ((NDOFO == 0) .AND. (DEBUG(192) == 2)) THEN CALL GET_FG_INERTIA_FORCES ENDIF ! Mult MGG*PHIXG for FG unless JVEC > NDOFR+NVEC, otherwise FG is null From 06e315f2e17fd84e431c06c0adf00af2a36ee4b6 Mon Sep 17 00:00:00 2001 From: victorkemp Date: Tue, 7 Jul 2026 20:22:20 +1200 Subject: [PATCH 2/2] Reverted 191->182 change and disabled it because it crashes on benchmarks --- Source/LK9/LINK9/LINK9.f90 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Source/LK9/LINK9/LINK9.f90 b/Source/LK9/LINK9/LINK9.f90 index 4118a293..01ad32f6 100644 --- a/Source/LK9/LINK9/LINK9.f90 +++ b/Source/LK9/LINK9/LINK9.f90 @@ -917,9 +917,10 @@ SUBROUTINE LINK9 ( LK9_PROC_NUM ) IF (SOL_NAME(1:5) == 'MODES') THEN CALL MATMULT_SFF ( 'MGG', NDOFG, NDOFG, NTERM_MGG, SYM_MGG, I_MGG, J_MGG, MGG, 'UG', NDOFG, 1, UG_COL, 'Y', & 'FG', -EIGEN_VAL(JVEC), FG_COL ) - ! DEBUG(192): calc FG_COL as if all inertia force due to MAA*UA_DDOT - IF ((NDOFO == 0) .AND. (DEBUG(192) == 2)) THEN - CALL GET_FG_INERTIA_FORCES + ! DEBUG(191): calc FG_COL as if all inertia force due to MAA*UA_DDOT + IF ((NDOFO == 0) .AND. (DEBUG(191) == 2)) THEN + ! Disabled because it's nothing to do with DEBUG(191) (temperature averaging for thermal loads) and it crashes if used. + ! CALL GET_FG_INERTIA_FORCES ENDIF ! Mult MGG*PHIXG for FG unless JVEC > NDOFR+NVEC, otherwise FG is null ELSE IF (SOL_NAME(1:12) == 'GEN CB MODEL') THEN! Get FG_COL from L5B for CB soln