Skip to content
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

Fixed "Map Grid Size mismatch error" and "array PARTITION error" #29

Merged
merged 2 commits into from
Mar 22, 2024
Merged

Fixed "Map Grid Size mismatch error" and "array PARTITION error" #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b3f94d
Fixed "Map Grid Size mismatch error" and "array PARTITION error"
kvrigor Aug 25, 2023
f1069e6
Set MPIFC when configuring MCT
kvrigor Sep 2, 2023
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
21 changes: 13 additions & 8 deletions src/clm5/oasis3/oas_defineMod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ module oas_defineMod

subroutine oas_definitions_init(bounds)
use spmdMod , only : masterproc
use domainMod , only : ldomain
use clm_varpar , only : nlevsoi, nlevgrnd
use decompMod , only : ldecomp, bounds_type
use oas_vardefMod
Expand All @@ -30,15 +31,17 @@ subroutine oas_definitions_init(bounds)
integer :: var_nodims(2) ! var dimension parameters


if (masterproc) then
call define_grid()
end if

! TODO: Fix grids.nc and masks.nc generation for 1D grid representation
!if (masterproc) then
! call define_grid()
!end if

! -----------------------------------------------------------------
! ... Define partition
! -----------------------------------------------------------------
allocate(partition(200))
! partition length = (# elements for partition info) + (max segments ORANGE partition) x (# elements per segment info)
! = 2 + 200*2 = 402
allocate(partition(402))
partition(:) = 0; k = 0

! Use ORANGE partitioning scheme. This scheme defines an ensemble
Expand All @@ -58,18 +61,18 @@ subroutine oas_definitions_init(bounds)
partition(3+k) = gcell_start - 1 ! segment global offset (0-based)
partition(4+k) = gcell_previous - gcell_start + 1 ! segment length
k = k + 2

gcell_start = ldecomp%gdc2glo(g) ! current gridcell marks the start of a new segment
partition(2) = partition(2) + 1 ! increment number of segments
partition(2) = partition(2) + 1 ! increment number of segments (limited to 200 based from OASIS3-MCT User's guide)
end if
gcell_previous = ldecomp%gdc2glo(g)
enddo

! Define partition params for last segment
partition(3+k) = gcell_start - 1
partition(4+k) = gcell_previous - gcell_start + 1
partition(2) = partition(2) + 1

call oasis_def_partition(grid_id, partition, ierror)
call oasis_def_partition(grid_id, partition, ierror, ldomain%ns)
deallocate(partition)

! -----------------------------------------------------------------
Expand Down Expand Up @@ -143,6 +146,7 @@ end subroutine oas_definitions_init
subroutine define_grid()
use shr_kind_mod , only : r8 => shr_kind_r8
use domainMod , only : ldomain

character(len=4), parameter :: grid_name='gclm'
integer, parameter :: SOUTH = 1
integer, parameter :: NORTH = 2
Expand Down Expand Up @@ -244,5 +248,6 @@ subroutine define_grid()
call oasis_terminate_grids_writing()
deallocate(oas_lon, oas_lat, oas_corner_lon, oas_corner_lat, oas_mask, corner_lon, corner_lat)
end if

end subroutine define_grid
end module oas_defineMod
3 changes: 2 additions & 1 deletion src/externals/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ if (BUILD_MCT)
--exec-prefix=${MCT_BLD_DIR}
CC=${CMAKE_C_COMPILER}
FC=${CMAKE_Fortran_COMPILER}
MPIFC=${CMAKE_Fortran_COMPILER}
CFLAGS=${CMAKE_C_FLAGS}
FCFLAGS=${CMAKE_Fortran_FLAGS}
BUILD_ALWAYS YES
Expand All @@ -75,4 +76,4 @@ endif()
# ===========
# PIO
# ===========
add_subdirectory(pio1)
add_subdirectory(pio1)
Loading