From 39257106ef55335081c88e14afea0525e7050cfb Mon Sep 17 00:00:00 2001
From: Paul Hall <45795415+phall-brown@users.noreply.github.com>
Date: Tue, 25 Apr 2023 23:45:36 -0400
Subject: [PATCH] Removed export of So_ofrac to wav component (unnecessary),
 and other miscellaneous cleanup

---
 mediator/esmFldsExchange_cesm_mod.F90 | 38 +++------------------------
 1 file changed, 4 insertions(+), 34 deletions(-)

diff --git a/mediator/esmFldsExchange_cesm_mod.F90 b/mediator/esmFldsExchange_cesm_mod.F90
index 42bb327ee..94028de1d 100644
--- a/mediator/esmFldsExchange_cesm_mod.F90
+++ b/mediator/esmFldsExchange_cesm_mod.F90
@@ -2964,10 +2964,10 @@ subroutine esmFldsExchange_cesm(gcomp, phase, rc)
        end if
     end if
 !PSH begin
-    if (phase == 'advertise') then
-       call addfld_from(compocn, 'So_ofrac')
-       call addfld_to(compwav, 'So_ofrac')
-    end if
+!    if (phase == 'advertise') then
+!       call addfld_from(compocn, 'So_ofrac')
+!       call addfld_to(compwav, 'So_ofrac')
+!    end if
 !    if (phase == 'advertise') then
 !       call addfld_from(compocn, 'So_ofrac')
 !       call addfld_to(compwav, 'So_ofrac')
@@ -2999,36 +2999,6 @@ subroutine esmFldsExchange_cesm(gcomp, phase, rc)
 !               mrg_from=compmed, mrg_fld='Faox_taux', mrg_type='merge', mrg_fracname='ofrac')
        end if
     end if
-!    if (phase == 'advertise') then
-!       call addfld_to(compwav , 'Foxx_taux')
-!       call addfld_from(compice , 'Fioi_taux')
-!       call addfld_aoflux('Faox_taux')
-!    else
-!       if ( fldchk(is_local%wrap%FBexp(compwav), 'Foxx_taux', rc=rc)) then
-!          if (fldchk(is_local%wrap%FBimp(compice,compice), 'Fioi_taux', rc=rc)) then
-!             call addmap_from(compice, 'Fioi_taux', compocn, mapfcopy, 'unset', 'unset')
-!             call addmrg_to(compwav, 'Foxx_taux', &
-!                  mrg_from=compice, mrg_fld='Fioi_taux', mrg_type='merge', mrg_fracname='ifrac')
-!          end if
-!          call addmrg_to(compwav, 'Foxx_taux', &
-!               mrg_from=compmed, mrg_fld='Faox_taux', mrg_type='merge', mrg_fracname='ofrac')
-!       end if     
-!    end if
-!    if (phase == 'advertise') then
-!       call addfld_to(compwav , 'Foxx_tauy')
-!       call addfld_from(compice , 'Fioi_tauy')
-!       call addfld_aoflux('Faox_tauy')
-!    else  
-!       if ( fldchk(is_local%wrap%FBexp(compwav), 'Foxx_tauy', rc=rc)) then
-!          if (fldchk(is_local%wrap%FBimp(compice,compice), 'Fioi_tauy', rc=rc)) then
-!             call addmap_from(compice, 'Fioi_tauy', compocn, mapfcopy, 'unset', 'unset')
-!             call addmrg_to(compwav, 'Fwxx_tauy', &
-!                  mrg_from=compice, mrg_fld='Fioi_tauy', mrg_type='merge', mrg_fracname='ifrac')
-!          end if  
-!          call addmrg_to(compwav, 'Fwxx_tauy', &
-!               mrg_from=compmed, mrg_fld='Faox_tauy', mrg_type='merge', mrg_fracname='ofrac')
-!       end if
-!    end if
 !PSH end
 
     !=====================================================================