From 11dda0c40064190e67b6f4ffc46feb6c20e77609 Mon Sep 17 00:00:00 2001 From: George Gayno Date: Tue, 31 Dec 2024 15:27:50 -0600 Subject: [PATCH] Update first unit test point to be a 4x4 grid as to test both odd and even dimensioned grids. Fixes #1000. --- tests/orog/ftst_rm_isolated_pts.F90 | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/tests/orog/ftst_rm_isolated_pts.F90 b/tests/orog/ftst_rm_isolated_pts.F90 index c19af0f90..b82265ccd 100644 --- a/tests/orog/ftst_rm_isolated_pts.F90 +++ b/tests/orog/ftst_rm_isolated_pts.F90 @@ -20,8 +20,8 @@ program rm_isolated_pts print*,"Starting test of remove_isolated_pts." - im = 3 - jm = 3 + im = 4 + jm = 4 allocate (slm(im,jm)) allocate (oro(im,jm)) @@ -97,12 +97,25 @@ program rm_isolated_pts enddo enddo + deallocate (slm, oro, var, var4, oa, ol) + deallocate (slm_expected, oro_expected, var_expected, var4_expected, oa_expected, ol_expected) + ! Test Point 2 ! Now remove an isolated water point. print*,'-Test point 2.' + im = 3 + jm = 3 + + allocate (slm(im,jm)) + allocate (oro(im,jm)) + allocate (var(im,jm)) + allocate (var4(im,jm)) + allocate (oa(im,jm,4)) + allocate (ol(im,jm,4)) + slm = 1.0 slm(2,2) = 0.0 ! water point @@ -144,6 +157,13 @@ program rm_isolated_pts ! surrounding land points. All other points should remain ! unchanged. + allocate (slm_expected(im,jm)) + allocate (oro_expected(im,jm)) + allocate (var_expected(im,jm)) + allocate (var4_expected(im,jm)) + allocate (oa_expected(im,jm,4)) + allocate (ol_expected(im,jm,4)) + slm_expected = slm oro_expected = oro var_expected = var