Adding stress from ice to Fwxx_taux

NorESMhub · Apr 26, 2023 · abc5658 · abc5658
1 parent 14bd205
commit abc5658
Showing 1 changed file with 24 additions and 8 deletions.
diff --git a/mediator/esmFldsExchange_cesm_mod.F90 b/mediator/esmFldsExchange_cesm_mod.F90
@@ -2983,20 +2983,36 @@ subroutine esmFldsExchange_cesm(gcomp, phase, rc)
     ! ---------------------------------------------------------------------
     ! to wav: zonal and meridional wind stress
     ! ---------------------------------------------------------------------
+!    if (phase == 'advertise') then 
+!       call addfld_to(compwav , 'Fwxx_taux')
+!!       call addfld_from(compice , 'Fioi_taux')
+!       call addfld_aoflux('Faox_taux')
+!    else 
+!       if ( fldchk(is_local%wrap%FBexp(compwav), 'Fwxx_taux', rc=rc)) then 
+!!          if (fldchk(is_local%wrap%FBimp(compice,compice), 'Fioi_taux', rc=rc)) then 
+!!             call addmap_from(compice, 'Fioi_taux', compwav, mapfcopy, 'unset', 'unset')
+!!             call addmrg_to(compwav, 'Fwxx_taux', &
+!!                  mrg_from=compice, mrg_fld='Fioi_taux', mrg_type='merge', mrg_fracname='ifrac')
+!!          end if
+!          call addmrg_to(compwav, 'Fwxx_taux', &
+!               mrg_from=compmed, mrg_fld='Faox_taux', mrg_type='copy')
+!!               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 , 'Fwxx_taux')
-!       call addfld_from(compice , 'Fioi_taux')
+       call addfld_from(compice , 'Fioi_taux')
        call addfld_aoflux('Faox_taux')
     else 
        if ( fldchk(is_local%wrap%FBexp(compwav), 'Fwxx_taux', rc=rc)) then 
-!          if (fldchk(is_local%wrap%FBimp(compice,compice), 'Fioi_taux', rc=rc)) then 
-!             call addmap_from(compice, 'Fioi_taux', compwav, mapfcopy, 'unset', 'unset')
-!             call addmrg_to(compwav, 'Fwxx_taux', &
-!                  mrg_from=compice, mrg_fld='Fioi_taux', mrg_type='merge', mrg_fracname='ifrac')
-!          end if
+          if (fldchk(is_local%wrap%FBimp(compice,compice), 'Fioi_taux', rc=rc)) then 
+             call addmap_from(compice, 'Fioi_taux', compwav, mapfcopy, 'unset', 'unset')
+             call addmrg_to(compwav, 'Fwxx_taux', &
+                  mrg_from=compice, mrg_fld='Fioi_taux', mrg_type='merge', mrg_fracname='ifrac')
+          end if
           call addmrg_to(compwav, 'Fwxx_taux', &
-               mrg_from=compmed, mrg_fld='Faox_taux', mrg_type='copy')
-!               mrg_from=compmed, mrg_fld='Faox_taux', mrg_type='merge', mrg_fracname='ofrac')
+               mrg_from=compmed, mrg_fld='Faox_taux', mrg_type='merge', mrg_fracname='ofrac')
        end if
     end if
 !PSH end