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

Jump to bottom

Fix test failures with ifx due to use of host associated arrays #1606

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open

Fix test failures with ifx due to use of host associated arrays #1606

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4db6c52
Added save attribute to Host Associated Arrays
abrooks1085 Oct 24, 2024
6f449ef
Merge branch 'NOAA-GFDL:main' into ifx_tests_fix
abrooks1085 Nov 7, 2024
3536d39
Removed save attribute from lat and lon arrays and put these arrays i…
abrooks1085 Nov 7, 2024
3fd1639
removed save attribute from arrays and moved initialize_arrays subrou…
abrooks1085 Nov 7, 2024
ad66ba6
Removed trailing whitespace
abrooks1085 Nov 7, 2024
a74f50c
undo
abrooks1085 Nov 7, 2024
16f7ead
undo
abrooks1085 Nov 7, 2024
993a0be
undo
abrooks1085 Nov 7, 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
23 changes: 12 additions & 11 deletions test_fms/diag_integral/test_diag_integral.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,14 @@ program test_diag_integral
character(9), parameter :: field_nameh='immadeuph' !> made up field name to test
character(8), parameter :: std_digits = 'e23.15e3' !> write out precision for r8_kind data

real(TEST_DI_KIND_) :: immadeup2(nxy,nxy) !> array to test sum_field_2d
real(TEST_DI_KIND_) :: immadeup3(nxy,nxy,nxy) !> array to test sum_field_3d
real(TEST_DI_KIND_) :: immadeupw(nxy,nxy,nxy) !> array to test sum_field_wght_3d
real(TEST_DI_KIND_) :: weight(nxy,nxy,nxy) !> weights required to test sum_field_wght_3d
real(TEST_DI_KIND_) :: immadeuph(nxy,nxy) !> array to test sum_field_2d_hemi

real(r8_kind) :: lat(nxyp,nxyp), lon(nxyp,nxyp)
real(r8_kind) :: area(nxy,nxy)
real(TEST_DI_KIND_), save :: immadeup2(nxy,nxy) !> array to test sum_field_2d
real(TEST_DI_KIND_), save :: immadeup3(nxy,nxy,nxy) !> array to test sum_field_3d
real(TEST_DI_KIND_), save :: immadeupw(nxy,nxy,nxy) !> array to test sum_field_wght_3d
real(TEST_DI_KIND_), save :: weight(nxy,nxy,nxy) !> weights required to test sum_field_wght_3d
real(TEST_DI_KIND_), save :: immadeuph(nxy,nxy) !> array to test sum_field_2d_hemi

real(r8_kind), save :: lat(nxyp,nxyp), lon(nxyp,nxyp)
real(r8_kind), save :: area(nxy,nxy)
type(time_type) :: Time_init, Time

!testing and generating answers
Expand Down Expand Up @@ -175,12 +175,13 @@ end subroutine test_sum_diag_integral_field
!-------------------------------------
subroutine read_diag_integral_file

character(*), parameter :: di_file='diag_integral.out'
integer :: iunit
character(17), parameter :: di_file='diag_integral.out'
integer, parameter :: iunit=100

character(100) :: cline1, cline2, cline3, cline4, cline5, clin6

!> read in computed values
open(newunit=iunit, file=di_file)
open(unit=iunit,file=trim(di_file))
rem1776 marked this conversation as resolved.
Show resolved Hide resolved
read(iunit,*) cline1, cline2, cline3, cline4, cline5, clin6
read(iunit,*) itime, field_avg2, field_avg3, field_avgw, field_avgh
close(iunit)
Expand Down
6 changes: 3 additions & 3 deletions test_fms/topography/test_topography.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ program test_top
integer, parameter :: lkind = TEST_TOP_KIND_ ! kind parameter for mixed precision

real(kind=TEST_TOP_KIND_), parameter :: deg2rad = real(pi, TEST_TOP_KIND_)/180.0_lkind
real(kind=TEST_TOP_KIND_), dimension(2,2) :: lon2d, lat2d ! in radians
real(kind=TEST_TOP_KIND_), dimension(2) :: lon1d, lat1d ! in radians
real(kind=TEST_TOP_KIND_), dimension(2,2), save :: lon2d, lat2d ! in radians
real(kind=TEST_TOP_KIND_), dimension(2), save :: lon1d, lat1d ! in radians

call fms_init
call topography_init
Expand Down Expand Up @@ -352,4 +352,4 @@ end subroutine check_answers



end program test_top
end program test_top
Loading