From 276a2ba3091e0362923d2f14125338a7c0cb0e67 Mon Sep 17 00:00:00 2001
From: George Gayno <ggayno@hercules-login-4.hpc.msstate.edu>
Date: Tue, 31 Dec 2024 13:13:32 -0600
Subject: [PATCH] Add another test point to the rm_isolated_pts unit test.

Fixes #1000.
---
 tests/orog/ftst_rm_isolated_pts.F90 | 134 +++++++++++++++++++++++++---
 1 file changed, 124 insertions(+), 10 deletions(-)

diff --git a/tests/orog/ftst_rm_isolated_pts.F90 b/tests/orog/ftst_rm_isolated_pts.F90
index 7018cc76f..c19af0f90 100644
--- a/tests/orog/ftst_rm_isolated_pts.F90
+++ b/tests/orog/ftst_rm_isolated_pts.F90
@@ -10,9 +10,14 @@ program rm_isolated_pts
 
  integer                :: im, jm, i, j, k
 
+ real, parameter        :: EPSILON=0.001
+
  real, allocatable      :: slm(:,:), oro(:,:), var(:,:), &
                            var4(:,:), oa(:,:,:), ol(:,:,:)      
 
+ real, allocatable      :: slm_expected(:,:), oro_expected(:,:), var_expected(:,:), &
+                           var4_expected(:,:), oa_expected(:,:,:), ol_expected(:,:,:)      
+
  print*,"Starting test of remove_isolated_pts."
 
  im = 3
@@ -25,8 +30,18 @@ program rm_isolated_pts
  allocate (oa(im,jm,4))
  allocate (ol(im,jm,4))
 
+! Test Point 1.
+
+! This is an isolated island. The island should be
+! removed (slm set to 0.0) and all other fields 
+! should be the average of the surrounding points (which
+! for this test case is zero). All surrounding points
+! should be unchanged.
+
 ! Initialize grid to all ocean.
 
+ print*,'-Test point 1.'
+
  slm = 0.0
  oro = 0.0
  var = 0.0
@@ -34,10 +49,7 @@ program rm_isolated_pts
  oa = 0.0
  ol = 0.0
 
-! This is an isolated island. The island should be
-! removed (slm set to 0.0) and all other fields 
-! should be the average of the surrounding points (which
-! for this test case is zero.
+! Initialize an island in the middle of the grid.
 
  slm(2,2) = 1.0
  oro(2,2) = 50.0
@@ -54,22 +66,124 @@ program rm_isolated_pts
  ol(2,2,3) = 0.5
  ol(2,2,4) = 1.0
 
+ 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))
+
+! All points should be ocean (all fields zero).
+
+ slm_expected = 0.0
+ oro_expected = 0.0
+ var_expected = 0.0
+ var4_expected = 0.0
+ oa_expected = 0.0
+ ol_expected = 0.0
+
+ call remove_isolated_pts(im,jm,slm,oro,var,var4,oa,ol)
+
+ do j = 1, jm
+ do i = 1, im
+   if (abs(slm(i,j)-slm_expected(i,j)) > EPSILON) stop 2
+   if (abs(oro(i,j)-oro_expected(i,j)) > EPSILON) stop 4
+   if (abs(var(i,j)-var_expected(i,j)) > EPSILON) stop 6
+   if (abs(var4(i,j)-var4_expected(i,j)) > EPSILON) stop 8
+   do k = 1, 4
+     if (abs(oa(i,j,k)-oa_expected(i,j,k)) > EPSILON) stop 10
+     if (abs(ol(i,j,k)-ol_expected(i,j,k)) > EPSILON) stop 12
+   enddo
+ enddo
+ enddo
+
+! Test Point 2
+
+! Now remove an isolated water point.
+
+ print*,'-Test point 2.'
+
+ slm = 1.0
+ slm(2,2) = 0.0 ! water point
+
+ oro(1,1) = 5.0
+ oro(2,1) = 10.0
+ oro(3,1) = 17.0
+ oro(1,2) = 22.0
+ oro(2,2) = 0.0  ! water point.
+ oro(3,2) = 100.0
+ oro(1,3) = 34.0
+ oro(2,3) = 55.0
+ oro(3,3) = 68.0
+
+ var = 0.5 * oro
+ var4 = 0.25 * oro
+
+ ol(1,1,1) = 0.1
+ ol(2,1,1) = 0.2
+ ol(3,1,1) = 0.3
+ ol(1,2,1) = 0.4
+ ol(2,2,1) = 0.0 ! water point
+ ol(3,2,1) = 0.6
+ ol(1,3,1) = 0.7
+ ol(2,3,1) = 0.8
+ ol(3,3,1) = 0.9
+
+ do j = 1, jm
+ do i = 1, im
+   ol(i,j,2) = ol(i,j,1) * .75
+   ol(i,j,3) = ol(i,j,1) * .5
+   ol(i,j,4) = ol(i,j,1) * .25
+ enddo
+ enddo
+
+ oa = -(ol)
+
+! All points should be land. The former isolated ocean
+! point should have values that are the average of the
+! surrounding land points. All other points should remain
+! unchanged.
+
+ slm_expected = slm
+ oro_expected = oro
+ var_expected = var
+ var4_expected = var4
+ ol_expected = ol
+ oa_expected = oa
+
+! Former ocean point should be average of the surrounding
+! ocean points.
+
+ slm_expected(2,2) = 1.0 ! land point
+ oro_expected(2,2) = 38.875
+ var_expected(2,2) = 0.5 * oro_expected(2,2)
+ var4_expected(2,2) = 0.25 * oro_expected(2,2)
+ ol_expected(2,2,1) = 0.5
+ ol_expected(2,2,2) = 0.375
+ ol_expected(2,2,3) = 0.25
+ ol_expected(2,2,4) = 0.125
+ oa_expected(2,2,1) = -0.5
+ oa_expected(2,2,2) = -0.375
+ oa_expected(2,2,3) = -0.25
+ oa_expected(2,2,4) = -0.125
+
  call remove_isolated_pts(im,jm,slm,oro,var,var4,oa,ol)
 
  do j = 1, jm
  do i = 1, im
-   if (slm(i,j) /= 0.0) stop 2
-   if (oro(i,j) /= 0.0) stop 4
-   if (var(i,j) /= 0.0) stop 6
-   if (var4(i,j) /= 0.0) stop 8
+   if (abs(slm(i,j)-slm_expected(i,j)) > EPSILON) stop 22
+   if (abs(oro(i,j)-oro_expected(i,j)) > EPSILON) stop 24
+   if (abs(var(i,j)-var_expected(i,j)) > EPSILON) stop 26
+   if (abs(var4(i,j)-var4_expected(i,j)) > EPSILON) stop 28
    do k = 1, 4
-     if (oa(i,j,k) /= 0.0) stop 10
-     if (ol(i,j,k) /= 0.0) stop 12
+     if (abs(oa(i,j,k)-oa_expected(i,j,k)) > EPSILON) stop 30
+     if (abs(ol(i,j,k)-ol_expected(i,j,k)) > EPSILON) stop 32
    enddo
  enddo
  enddo
 
  deallocate (slm, oro, var, var4, oa, ol)
+ deallocate (slm_expected, oro_expected, var_expected, var4_expected, oa_expected, ol_expected)
 
  print*,"OK"
  print*,"SUCCSSS"