no longer need to scale by mask - since its done in MOM_surface_forcing

NOAA-GFDL · May 29, 2018 · 4c1a97f · 4c1a97f
1 parent 5f1b51c
commit 4c1a97f
Showing 1 changed file with 16 additions and 16 deletions.
diff --git a/config_src/mct_driver/ocn_cap_methods.F90 b/config_src/mct_driver/ocn_cap_methods.F90
@@ -45,31 +45,31 @@ subroutine ocn_import(x2o, ind, grid, ice_ocean_boundary, c1, c2, c3, c4)
           ice_ocean_boundary%v_flux(i,j) = x2o(ind%x2o_Foxx_tauy,k) 
 
           ! liquid precipitation (rain)
-          ice_ocean_boundary%lprec(i,j) = x2o(ind%x2o_Faxa_rain,k) * GRID%mask2dT(ig,jg)
+          ice_ocean_boundary%lprec(i,j) = x2o(ind%x2o_Faxa_rain,k) 
 
           ! frozen precipitation (snow)
-          ice_ocean_boundary%fprec(i,j) = x2o(ind%x2o_Faxa_snow,k) * GRID%mask2dT(ig,jg)
+          ice_ocean_boundary%fprec(i,j) = x2o(ind%x2o_Faxa_snow,k) 
 
           ! longwave radiation, sum up and down (W/m2)
-          ice_ocean_boundary%lw_flux(i,j) = (x2o(ind%x2o_Faxa_lwdn,k) + x2o(ind%x2o_Foxx_lwup,k)) * GRID%mask2dT(i,j)
+          ice_ocean_boundary%lw_flux(i,j) = (x2o(ind%x2o_Faxa_lwdn,k) + x2o(ind%x2o_Foxx_lwup,k)) 
 
           ! specific humitidy flux
           ice_ocean_boundary%q_flux(i,j) = x2o(ind%x2o_Foxx_evap,k) !???TODO: should this be a minus sign
 
           ! sensible heat flux (W/m2)
-          ice_ocean_boundary%t_flux(i,j) = x2o(ind%x2o_Foxx_sen,k) * GRID%mask2dT(i,j) !???TODO: should this be a minus sign
+          ice_ocean_boundary%t_flux(i,j) = x2o(ind%x2o_Foxx_sen,k)  !???TODO: should this be a minus sign
 
           ! latent heat flux (W/m^2)
-          ice_ocean_boundary%latent_flux(i,j) = x2o(ind%x2o_Foxx_lat,k) * GRID%mask2dT(i,j) !???TODO: should this be a minus sign
+          ice_ocean_boundary%latent_flux(i,j) = x2o(ind%x2o_Foxx_lat,k) !???TODO: should this be a minus sign
 
           ! liquid runoff
-          ice_ocean_boundary%rofl_flux(i,j) = x2o(ind%x2o_Foxx_rofl,k) * GRID%mask2dT(i,j)
+          ice_ocean_boundary%rofl_flux(i,j) = x2o(ind%x2o_Foxx_rofl,k) 
 
           ! ice runoff
-          ice_ocean_boundary%rofi_flux(i,j) = x2o(ind%x2o_Foxx_rofi,k) * GRID%mask2dT(i,j)
+          ice_ocean_boundary%rofi_flux(i,j) = x2o(ind%x2o_Foxx_rofi,k) 
 
           ! surface pressure
-          ice_ocean_boundary%p(i,j) = x2o(ind%x2o_Sa_pslv,k) * GRID%mask2dT(i,j)
+          ice_ocean_boundary%p(i,j) = x2o(ind%x2o_Sa_pslv,k) 
 
           ! salt flux
           ice_ocean_boundary%salt_flux(i,j) = x2o(ind%x2o_Fioi_salt,k)
@@ -80,15 +80,15 @@ subroutine ocn_import(x2o, ind, grid, ice_ocean_boundary, c1, c2, c3, c4)
           ! 4) near-IR, diffuse shortwave (W/m2)
           if (present(c1) .and. present(c2) .and. present(c3) .and. present(c4)) then
              ! Use runtime coefficients to decompose net short-wave heat flux into 4 components
-             ice_ocean_boundary%sw_flux_vis_dir(i,j) = x2o(ind%x2o_Foxx_swnet,k) * c1 * GRID%mask2dT(ig,jg)
-             ice_ocean_boundary%sw_flux_vis_dif(i,j) = x2o(ind%x2o_Foxx_swnet,k) * c2 * GRID%mask2dT(ig,jg)
-             ice_ocean_boundary%sw_flux_nir_dir(i,j) = x2o(ind%x2o_Foxx_swnet,k) * c3 * GRID%mask2dT(ig,jg)
-             ice_ocean_boundary%sw_flux_nir_dif(i,j) = x2o(ind%x2o_Foxx_swnet,k) * c4 * GRID%mask2dT(ig,jg)
+             ice_ocean_boundary%sw_flux_vis_dir(i,j) = x2o(ind%x2o_Foxx_swnet,k) * c1 
+             ice_ocean_boundary%sw_flux_vis_dif(i,j) = x2o(ind%x2o_Foxx_swnet,k) * c2 
+             ice_ocean_boundary%sw_flux_nir_dir(i,j) = x2o(ind%x2o_Foxx_swnet,k) * c3 
+             ice_ocean_boundary%sw_flux_nir_dif(i,j) = x2o(ind%x2o_Foxx_swnet,k) * c4 
           else
-             ice_ocean_boundary%sw_flux_vis_dir(i,j) = x2o(ind%x2o_Faxa_swvdr,k) * GRID%mask2dT(ig,jg)
-             ice_ocean_boundary%sw_flux_vis_dif(i,j) = x2o(ind%x2o_Faxa_swvdf,k) * GRID%mask2dT(ig,jg)
-             ice_ocean_boundary%sw_flux_nir_dir(i,j) = x2o(ind%x2o_Faxa_swndr,k) * GRID%mask2dT(ig,jg)
-             ice_ocean_boundary%sw_flux_nir_dif(i,j) = x2o(ind%x2o_Faxa_swndf,k) * GRID%mask2dT(ig,jg)
+             ice_ocean_boundary%sw_flux_vis_dir(i,j) = x2o(ind%x2o_Faxa_swvdr,k) 
+             ice_ocean_boundary%sw_flux_vis_dif(i,j) = x2o(ind%x2o_Faxa_swvdf,k) 
+             ice_ocean_boundary%sw_flux_nir_dir(i,j) = x2o(ind%x2o_Faxa_swndr,k) 
+             ice_ocean_boundary%sw_flux_nir_dif(i,j) = x2o(ind%x2o_Faxa_swndf,k) 
           end if
        end do
     end do