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

Optimization for special cases of defining grid. #374

Merged
merged 2 commits into from
Jan 24, 2025
Merged

Optimization for special cases of defining grid. #374

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
e217c92
Optimization for special cases of defining grid.
zhangsp8 Jan 23, 2025
3396335
Merge branch 'CoLM-SYSU:master' into master
zhangsp8 Jan 23, 2025
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
4 changes: 2 additions & 2 deletions share/MOD_Grid.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -864,7 +864,7 @@ SUBROUTINE set_grid_concat (this, grid)
ilonloc = 0
DO WHILE (.true.)
ilon = mod(ilon,grid%nlon) + 1
IF (grid%xblk(ilon) /= iblk) THEN
IF ((grid%xblk(ilon) /= iblk) .or. (grid%xloc(ilon) == 1)) THEN
this%nxseg = this%nxseg + 1
iblk = grid%xblk(ilon)
ENDIF
Expand Down Expand Up @@ -899,7 +899,7 @@ SUBROUTINE set_grid_concat (this, grid)
DO WHILE (.true.)
ilon = mod(ilon,grid%nlon) + 1
ilonloc = ilonloc + 1
IF (grid%xblk(ilon) /= iblk) THEN
IF ((grid%xblk(ilon) /= iblk) .or. (grid%xloc(ilon) == 1)) THEN
ixseg = ixseg + 1
iblk = grid%xblk(ilon)
this%xsegs(ixseg)%blk = iblk
Expand Down
72 changes: 31 additions & 41 deletions share/MOD_Pixel.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,9 @@ SUBROUTINE pixel_assimilate_latlon (this, &
integer :: iy1, iy2, ys2, yn2
real(r8), allocatable :: ytmp(:)

integer :: nx
integer :: ix1, ix2, xw2, xe2
real(r8), allocatable :: xtmp(:)
integer :: nx, nlonc
integer :: ix1, ix2, xw2
real(r8), allocatable :: xtmp(:), loncirc(:)

IF (lat_s(1) <= lat_s(nlat)) THEN
yinc = 1
Expand Down Expand Up @@ -180,55 +180,45 @@ SUBROUTINE pixel_assimilate_latlon (this, &
west = lon_w(1)
east = lon_e(nlon)

allocate (xtmp (this%nlon+nlon+2))
IF (west == east) THEN
nlonc = nlon
allocate (loncirc (nlonc))
loncirc = lon_w
ELSE
nlonc = nlon + 1
allocate (loncirc (nlonc))
loncirc(1:nlon) = lon_w
loncirc(nlon+1) = east
ENDIF

allocate (xtmp (this%nlon+nlon+2))
nx = 0
DO ix1 = 1, this%nlon

nx = nx + 1
xtmp(nx) = this%lon_w(ix1)

IF ( lon_between_floor(this%lon_w(ix1), west, east) &
.or. lon_between_ceil (this%lon_e(ix1), west, east) &
.or. lon_between_floor(west, this%lon_w(ix1), this%lon_e(ix1)) &
.or. lon_between_ceil (east, this%lon_w(ix1), this%lon_e(ix1))) THEN

xw2 = find_nearest_west (this%lon_w(ix1), nlon, lon_w)
xe2 = find_nearest_east (this%lon_e(ix1), nlon, lon_e)

IF (.not. lon_between_floor(this%lon_w(ix1), lon_w(xw2), lon_e(xw2))) THEN
xw2 = mod(xw2,nlon) + 1
ENDIF

IF (.not. lon_between_ceil(this%lon_e(ix1), lon_w(xe2), lon_e(xe2))) THEN
xe2 = xe2 - 1
IF (xe2 == 0) xe2 = nlon
ENDIF

IF ((lon_between_floor(lon_w(xw2), this%lon_w(ix1), this%lon_e(ix1)) &
.and. (lon_w(xw2) /= this%lon_w(ix1)))) THEN
nx = nx + 1
xtmp(nx) = lon_w(xw2)
ENDIF

IF (xw2 /= xe2) THEN
ix2 = mod(xw2,nlon) + 1
DO WHILE (.true.)
xw2 = find_nearest_west (this%lon_w(ix1), nlonc, loncirc)
ix2 = mod(xw2,nlonc) + 1
DO WHILE (.true.)
IF (lon_between_floor(loncirc(ix2), this%lon_w(ix1), this%lon_e(ix1))) THEN
IF (loncirc(ix2) /= this%lon_w(ix1)) THEN
nx = nx + 1
xtmp(nx) = lon_w(ix2)
xtmp(nx) = loncirc(ix2)
ENDIF

IF (ix2 == xe2) EXIT
ix2 = mod(ix2,nlon) + 1
ENDDO
IF (ix2 /= xw2) THEN
ix2 = mod(ix2,nlonc) + 1
ELSE
EXIT
ENDIF
ELSE
EXIT
ENDIF
ENDDO

IF ((lon_between_ceil(lon_e(xe2), this%lon_w(ix1), this%lon_e(ix1))) &
.and. (lon_e(xe2) /= this%lon_e(ix1))) THEN
nx = nx + 1
xtmp(nx) = lon_e(xe2)
ENDIF
ENDIF
ENDDO

nx = nx + 1
xtmp(nx) = this%lon_e(this%nlon)

Expand Down
Loading