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

+(*)Grid rotation now works with restarts #787

Open
wants to merge 3 commits into
base: dev/gfdl
Choose a base branch
from
Open

+(*)Grid rotation now works with restarts #787

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
0806e1e
+Add zero_zeros optional arg to MOM_write_field
Hallberg-NOAA Dec 21, 2024
9d2f3f7
+Add turns argument to MOM_read_data
Hallberg-NOAA Dec 23, 2024
23f6aa8
(*)+Modified MOM_restart to fix rotated restarts
Hallberg-NOAA Dec 23, 2024
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
62 changes: 49 additions & 13 deletions config_src/infra/FMS1/MOM_domain_infra.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1259,53 +1259,89 @@ end subroutine redistribute_array_4d


!> Rescale the values of a 4-D array in its computational domain by a constant factor
subroutine rescale_comp_data_4d(domain, array, scale)
subroutine rescale_comp_data_4d(domain, array, scale, zero_zeros)
type(MOM_domain_type), intent(in) :: domain !< MOM domain from which to extract information
real, dimension(:,:,:,:), intent(inout) :: array !< The array which is having the data in its
!! computational domain rescaled
real, intent(in) :: scale !< A scaling factor by which to multiply the
!! values in the computational domain of array
integer :: is, ie, js, je
logical, optional, intent(in) :: zero_zeros !< If present and true, convert negative zeros
!! into ordinary signless zeros.
logical :: unsign_zeros ! If true, convert negative zeros into ordinary signless zeros.
integer :: is, ie, js, je, i, j, k, m

if (scale == 1.0) return
unsign_zeros = .false. ; if (present(zero_zeros)) unsign_zeros = zero_zeros

if ((scale == 1.0) .and. (.not.unsign_zeros)) return

call get_simple_array_i_ind(domain, size(array,1), is, ie)
call get_simple_array_j_ind(domain, size(array,2), js, je)
array(is:ie,js:je,:,:) = scale*array(is:ie,js:je,:,:)
if (scale /= 1.0) &
array(is:ie,js:je,:,:) = scale*array(is:ie,js:je,:,:)

if (unsign_zeros) then ! Convert negative zeros into zeros
do m=1,size(array,4) ; do k=1,size(array,3) ; do j=js,je ; do i=is,ie
if (array(i,j,k,m) == 0.0) array(i,j,k,m) = 0.0
enddo ; enddo ; enddo ; enddo
endif

end subroutine rescale_comp_data_4d

!> Rescale the values of a 3-D array in its computational domain by a constant factor
subroutine rescale_comp_data_3d(domain, array, scale)
subroutine rescale_comp_data_3d(domain, array, scale, zero_zeros)
type(MOM_domain_type), intent(in) :: domain !< MOM domain from which to extract information
real, dimension(:,:,:), intent(inout) :: array !< The array which is having the data in its
!! computational domain rescaled
real, intent(in) :: scale !< A scaling factor by which to multiply the
real, intent(in) :: scale !< A scaling factor by which to multiply theds
!! values in the computational domain of array
integer :: is, ie, js, je
logical, optional, intent(in) :: zero_zeros !< If present and true, convert negative zeros
!! into ordinary signless zeros.
logical :: unsign_zeros ! If true, convert negative zeros into ordinary signless zeros.
integer :: is, ie, js, je, i, j, k

if (scale == 1.0) return
unsign_zeros = .false. ; if (present(zero_zeros)) unsign_zeros = zero_zeros

if ((scale == 1.0) .and. (.not.unsign_zeros)) return

call get_simple_array_i_ind(domain, size(array,1), is, ie)
call get_simple_array_j_ind(domain, size(array,2), js, je)
array(is:ie,js:je,:) = scale*array(is:ie,js:je,:)
if (scale /= 1.0) &
array(is:ie,js:je,:) = scale*array(is:ie,js:je,:)

if (unsign_zeros) then ! Convert negative zeros into zeros
do k=1,size(array,3) ; do j=js,je ; do i=is,ie
if (array(i,j,k) == 0.0) array(i,j,k) = 0.0
enddo ; enddo ; enddo
endif

end subroutine rescale_comp_data_3d

!> Rescale the values of a 2-D array in its computational domain by a constant factor
subroutine rescale_comp_data_2d(domain, array, scale)
subroutine rescale_comp_data_2d(domain, array, scale, zero_zeros)
type(MOM_domain_type), intent(in) :: domain !< MOM domain from which to extract information
real, dimension(:,:), intent(inout) :: array !< The array which is having the data in its
!! computational domain rescaled
real, intent(in) :: scale !< A scaling factor by which to multiply the
!! values in the computational domain of array
integer :: is, ie, js, je
logical, optional, intent(in) :: zero_zeros !< If present and true, convert negative zeros
!! into ordinary signless zeros.
logical :: unsign_zeros ! If true, convert negative zeros into ordinary signless zeros.
integer :: is, ie, js, je, i, j

unsign_zeros = .false. ; if (present(zero_zeros)) unsign_zeros = zero_zeros

if (scale == 1.0) return
if ((scale == 1.0) .and. (.not.unsign_zeros)) return

call get_simple_array_i_ind(domain, size(array,1), is, ie)
call get_simple_array_j_ind(domain, size(array,2), js, je)
array(is:ie,js:je) = scale*array(is:ie,js:je)
if (scale /= 1.0) &
array(is:ie,js:je) = scale*array(is:ie,js:je)

if (unsign_zeros) then ! Convert negative zeros into zeros
do j=js,je ; do i=is,ie
if (array(i,j) == 0.0) array(i,j) = 0.0
enddo ; enddo
endif

end subroutine rescale_comp_data_2d

Expand Down
60 changes: 48 additions & 12 deletions config_src/infra/FMS2/MOM_domain_infra.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1258,53 +1258,89 @@ end subroutine redistribute_array_4d


!> Rescale the values of a 4-D array in its computational domain by a constant factor
subroutine rescale_comp_data_4d(domain, array, scale)
subroutine rescale_comp_data_4d(domain, array, scale, zero_zeros)
type(MOM_domain_type), intent(in) :: domain !< MOM domain from which to extract information
real, dimension(:,:,:,:), intent(inout) :: array !< The array which is having the data in its
!! computational domain rescaled
real, intent(in) :: scale !< A scaling factor by which to multiply the
!! values in the computational domain of array
integer :: is, ie, js, je
logical, optional, intent(in) :: zero_zeros !< If present and true, convert negative zeros
!! into ordinary signless zeros.
logical :: unsign_zeros ! If true, convert negative zeros into ordinary signless zeros.
integer :: is, ie, js, je, i, j, k, m

if (scale == 1.0) return
unsign_zeros = .false. ; if (present(zero_zeros)) unsign_zeros = zero_zeros

if ((scale == 1.0) .and. (.not.unsign_zeros)) return

call get_simple_array_i_ind(domain, size(array,1), is, ie)
call get_simple_array_j_ind(domain, size(array,2), js, je)
array(is:ie,js:je,:,:) = scale*array(is:ie,js:je,:,:)
if (scale /= 1.0) &
array(is:ie,js:je,:,:) = scale*array(is:ie,js:je,:,:)

if (unsign_zeros) then ! Convert negative zeros into zeros
do m=1,size(array,4) ; do k=1,size(array,3) ; do j=js,je ; do i=is,ie
if (array(i,j,k,m) == 0.0) array(i,j,k,m) = 0.0
enddo ; enddo ; enddo ; enddo
endif

end subroutine rescale_comp_data_4d

!> Rescale the values of a 3-D array in its computational domain by a constant factor
subroutine rescale_comp_data_3d(domain, array, scale)
subroutine rescale_comp_data_3d(domain, array, scale, zero_zeros)
type(MOM_domain_type), intent(in) :: domain !< MOM domain from which to extract information
real, dimension(:,:,:), intent(inout) :: array !< The array which is having the data in its
!! computational domain rescaled
real, intent(in) :: scale !< A scaling factor by which to multiply the
!! values in the computational domain of array
integer :: is, ie, js, je
logical, optional, intent(in) :: zero_zeros !< If present and true, convert negative zeros
!! into ordinary signless zeros.
logical :: unsign_zeros ! If true, convert negative zeros into ordinary signless zeros.
integer :: is, ie, js, je, i, j, k

if (scale == 1.0) return
unsign_zeros = .false. ; if (present(zero_zeros)) unsign_zeros = zero_zeros

if ((scale == 1.0) .and. (.not.unsign_zeros)) return

call get_simple_array_i_ind(domain, size(array,1), is, ie)
call get_simple_array_j_ind(domain, size(array,2), js, je)
array(is:ie,js:je,:) = scale*array(is:ie,js:je,:)
if (scale /= 1.0) &
array(is:ie,js:je,:) = scale*array(is:ie,js:je,:)

if (unsign_zeros) then ! Convert negative zeros into zeros
do k=1,size(array,3) ; do j=js,je ; do i=is,ie
if (array(i,j,k) == 0.0) array(i,j,k) = 0.0
enddo ; enddo ; enddo
endif

end subroutine rescale_comp_data_3d

!> Rescale the values of a 2-D array in its computational domain by a constant factor
subroutine rescale_comp_data_2d(domain, array, scale)
subroutine rescale_comp_data_2d(domain, array, scale, zero_zeros)
type(MOM_domain_type), intent(in) :: domain !< MOM domain from which to extract information
real, dimension(:,:), intent(inout) :: array !< The array which is having the data in its
!! computational domain rescaled
real, intent(in) :: scale !< A scaling factor by which to multiply the
!! values in the computational domain of array
integer :: is, ie, js, je
logical, optional, intent(in) :: zero_zeros !< If present and true, convert negative zeros
!! into ordinary signless zeros.
logical :: unsign_zeros ! If true, convert negative zeros into ordinary signless zeros.
integer :: is, ie, js, je, i, j

unsign_zeros = .false. ; if (present(zero_zeros)) unsign_zeros = zero_zeros

if (scale == 1.0) return
if ((scale == 1.0) .and. (.not.unsign_zeros)) return

call get_simple_array_i_ind(domain, size(array,1), is, ie)
call get_simple_array_j_ind(domain, size(array,2), js, je)
array(is:ie,js:je) = scale*array(is:ie,js:je)
if (scale /= 1.0) &
array(is:ie,js:je) = scale*array(is:ie,js:je)

if (unsign_zeros) then ! Convert negative zeros into zeros
do j=js,je ; do i=is,ie
if (array(i,j) == 0.0) array(i,j) = 0.0
enddo ; enddo
endif

end subroutine rescale_comp_data_2d

Expand Down
Loading
Loading