From 7bb66addd2d071eebbe742550267b3e5c0a7023b Mon Sep 17 00:00:00 2001
From: Bill Sacks <sacks@ucar.edu>
Date: Mon, 5 Dec 2022 07:03:09 -0700
Subject: [PATCH] Stop hard-coding the settings of pole points

---
 tools/mksurfdata_esmf/src/mksurfdata.F90 | 37 +-----------------------
 1 file changed, 1 insertion(+), 36 deletions(-)

diff --git a/tools/mksurfdata_esmf/src/mksurfdata.F90 b/tools/mksurfdata_esmf/src/mksurfdata.F90
index 0b304079bc..e0f0108d7c 100644
--- a/tools/mksurfdata_esmf/src/mksurfdata.F90
+++ b/tools/mksurfdata_esmf/src/mksurfdata.F90
@@ -389,13 +389,7 @@ program mksurfdata
        pctlnd_o=pctlnd_pft, pctnatpft_o=pctnatpft, pctcft_o=pctcft, rc=rc)
   if (ChkErr(rc,__LINE__,u_FILE_u)) call shr_sys_abort('error in calling mkdomain')
 
-  ! If have pole points on grid - set south pole to glacier
-  ! north pole is assumed as non-land
   do n = 1,lsize_o
-     if (abs((lat(n) - 90._r8)) < 1.e-6_r8) then
-        call pctnatpft(n)%set_pct_l2g(0._r8)
-        call pctcft(n)%set_pct_l2g(0._r8)
-     end if
      landfrac_pft(n) = pctlnd_pft(n)/100._r8
   end do
   if (fsurdat /= ' ') then
@@ -573,22 +567,9 @@ program mksurfdata
   end if
 
   ! -----------------------------------
-  ! Adjust pctlak, pctwet, pcturb and pctgla
+  ! Save special land unit areas of surface dataset
   ! -----------------------------------
-  do n = 1,lsize_o
-
-     ! If have pole points on grid - set south pole to glacier
-     ! north pole is assumed as non-land
-     if (abs((lat(n) - 90._r8)) < 1.e-6_r8) then
-        pctlak(n) = 0._r8
-        pctwet(n) = 0._r8
-        pcturb(n) = 0._r8
-        pctgla(n) = 100._r8
-     end if
-
-  end do
 
-  ! Save special land unit areas of surface dataset
   pctwet_orig(:) = pctwet(:)
   pctgla_orig(:) = pctgla(:)
 
@@ -929,22 +910,6 @@ program mksurfdata
         pctwet(:) = pctwet_orig(:)
         pctgla(:) = pctgla_orig(:)
 
-        ! If have pole points on grid - set south pole to glacier
-        ! north pole is assumed as non-land
-        ! pctlak, pctwet, pcturb and pctgla were calculated ABOVE
-        ! pctnatpft and pctcft were calculated ABOVE
-        do n = 1,lsize_o
-           if (abs(lat(n) - 90._r8) < 1.e-6_r8) then
-              pctlak(n) = 0._r8
-              pctwet(n) = 0._r8
-              pcturb(n) = 0._r8
-              pctgla(n) = 100._r8
-              call pctnatpft(n)%set_pct_l2g(0._r8)
-              call pctcft(n)%set_pct_l2g(0._r8)
-           end if
-
-        end do
-
         ! Normalize land use and make sure things add up to 100% as well as
         ! checking that things are as they should be.
         if (root_task) then