Skip to content

Correct bug in global mesh #309

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

Open
mike-hobson wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Correct bug in global mesh #309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions infrastructure/source/mesh/global_mesh_mod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1097,6 +1097,7 @@ function get_cell_id( self, cell_number, &
! y_dist cells in the y-direction
! Since the direction may have changed we need to recompute
y_index = rotate(x_index)
if ( x_cells < 0 ) y_index = opposite(y_index)
if ( y_cells < 0 ) y_index = opposite(y_index)

! y_index and y_dist
Expand Down
51 changes: 44 additions & 7 deletions infrastructure/unit-test/mesh/global_mesh_mod_test.pf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,11 +118,32 @@ contains
@assertTrue(periodic_xy(1))
@assertTrue(periodic_xy(2))

! Generate the global_mesh
! Check getting cell id from an x- and y-distance from a starting cell.
! First test that providing zero distances gives same id
cell_id = global_mesh%get_cell_id( 1, 0, 0 )
@assertEqual( 1, cell_id )
!
! Test functionality of the global_mesh object we've just created

! Check cell id from 1 cell away in all directions
cell_id = global_mesh%get_cell_id( 28, 1, 1 )
@assertEqual( 21, cell_id )
cell_id = global_mesh%get_cell_id( 28, 1, 0 )
@assertEqual( 29, cell_id )
cell_id = global_mesh%get_cell_id( 28, 1,-1 )
@assertEqual( 37, cell_id )
cell_id = global_mesh%get_cell_id( 28, 0, 1 )
@assertEqual( 20, cell_id )
cell_id = global_mesh%get_cell_id( 28, 0, 0 )
@assertEqual( 28, cell_id )
cell_id = global_mesh%get_cell_id( 28, 0,-1 )
@assertEqual( 36, cell_id )
cell_id = global_mesh%get_cell_id( 28,-1, 1 )
@assertEqual( 19, cell_id )
cell_id = global_mesh%get_cell_id( 28,-1, 0 )
@assertEqual( 27, cell_id )
cell_id = global_mesh%get_cell_id( 28,-1,-1 )
@assertEqual( 35, cell_id )

! Check cell id from a cell over the biperiodic wrap-around
cell_id = global_mesh%get_cell_id( 1, 2, 2 )
@assertEqual( 51, cell_id )

Expand Down Expand Up @@ -246,14 +267,30 @@ contains
global_mesh_id2 = global_mesh%get_id()
@assertTrue(global_mesh_id2 > 0)

!
! Generate the global_mesh
! Check getting a cell id from an x- and y-distance from a starting cell.
! First test that providing zero distances gives same id
cell_id = global_mesh%get_cell_id( 1, 0, 0 )
@assertEqual( 1, cell_id )
!
! Test functionality of the global_mesh object we've just created

! Get cell id from within a single panel
cell_id = global_mesh%get_cell_id( 10, 1, 1 )
@assertEqual( 7, cell_id )

! Check cell id across a panel boundary where orientation doesn't change
! (shouldn't need to check orientation - but it shouldn't harm, either)
cell_id = global_mesh%get_cell_id( 1, 2, 2 )
@assertEqual( 74, cell_id )
cell_id = global_mesh%get_cell_id( 1, 2, 2, check_orientation=.true. )
@assertEqual( 74, cell_id )

! Check cell id across a panel boundary where orientation DOES change
cell_id = global_mesh%get_cell_id( 28, 2, 2, check_orientation=.true. )
@assertEqual( 34, cell_id )

! Check cell id across a panel boundary where orientation DOES change
! but with negative x- and y- distances
cell_id = global_mesh%get_cell_id( 5, -2, -2, check_orientation=.true. )
@assertEqual( 63, cell_id )

call global_mesh%get_vert_on_cell( 6, verts )
@assertEqual( 10, verts(1) )
Expand Down
Loading