Skip to content

converted internal grid number to sequence number #200

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
victorkemp merged 3 commits into from
Apr 5, 2026
Merged

converted internal grid number to sequence number #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c35c2e0
converted internal grid number to sequence number
victorkemp Apr 4, 2026
c6d8ade
Merge branch 'MYSTRANsolver:main' into fix-grav-grid-order-bug
victorkemp Apr 4, 2026
a27d13c
CONM2 grid odering fix
victorkemp Apr 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Source/LK1/L1D/GET_GRID_6X6_MASS.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ SUBROUTINE GET_GRID_6X6_MASS ( AGRID, IGRID, FOUND, GRID_MGG )
USE CONSTANTS_1, ONLY : ZERO
USE DOF_TABLES, ONLY : TDOF
USE SPARSE_MATRICES, ONLY : I2_MGG, J_MGG, MGG
USE MODEL_STUF, ONLY : GRID_SEQ

USE GET_GRID_6X6_MASS_USE_IFs

Expand Down Expand Up @@ -85,7 +86,7 @@ SUBROUTINE GET_GRID_6X6_MASS ( AGRID, IGRID, FOUND, GRID_MGG )
ENDDO
ENDDO

IGRID_DOF_NUM = 6*(IGRID - 1) + 1
IGRID_DOF_NUM = 6*(GRID_SEQ(IGRID) - 1) + 1
k_do: DO K=1,NTERM_MGG

IF ((I2_MGG(K) >= IGRID_DOF_NUM) .AND. (I2_MGG(K) <= IGRID_DOF_NUM + 5)) THEN
Expand Down
3 changes: 1 addition & 2 deletions Source/LK1/L1E/MGGC_MASS_MATRIX.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,7 @@ SUBROUTINE MGGC_MASS_MATRIX
IROW_START = 1
i_do1:DO I=1,NGRID

!xx GRID_NUM = GRID_ID(INV_GRID_SEQ(I)) ! GRID_NUM's are in TDOFI order (internal DOF order)
GRID_NUM = GRID_ID(I)
GRID_NUM = GRID_ID(INV_GRID_SEQ(I)) ! GRID_NUM's are in TDOFI order (internal DOF order)
CALL MGG_CONM2_PROC ( I, GRID_NUM, MGG_CONM2, MGG_CONM2_NONZERO )
CALL GET_GRID_NUM_COMPS ( GRID_NUM, NUM_COMPS, SUBR_NAME )

Expand Down
Loading