fix merge bugs and add more glc runoff diags

NCAR · Aug 27, 2024 · f53b5e9 · f53b5e9
1 parent df4bb55
commit f53b5e9
Show file tree

Hide file tree

Showing 3 changed files with 81 additions and 36 deletions.
diff --git a/config_src/drivers/nuopc_cap/mom_cap.F90 b/config_src/drivers/nuopc_cap/mom_cap.F90
@@ -740,7 +740,7 @@ subroutine InitializeAdvertise(gcomp, importState, exportState, clock, rc)
              Ice_ocean_boundary% lrunoff_glc (isc:iec,jsc:jec),     &
              Ice_ocean_boundary% frunoff_glc (isc:iec,jsc:jec),     &
              Ice_ocean_boundary% hrofl_glc (isc:iec,jsc:jec),       &
-             Ice_ocean_boundary% hrofi_glc (isc:iec,jsc:jec),
+             Ice_ocean_boundary% hrofi_glc (isc:iec,jsc:jec),       &
              source=0.0)
 
     ! Needed for MARBL

diff --git a/config_src/drivers/nuopc_cap/mom_surface_forcing_nuopc.F90 b/config_src/drivers/nuopc_cap/mom_surface_forcing_nuopc.F90
@@ -549,8 +549,7 @@ subroutine convert_IOB_to_fluxes(IOB, fluxes, index_bounds, Time, valid_time, G,
     if (associated(IOB%frunoff_glc)) then
       fluxes%latent(i,j)              = fluxes%latent(i,j) - &
           IOB%frunoff_glc(i-i0,j-j0) * US%W_m2_to_QRZ_T * CS%latent_heat_fusion
-      ! todo: confirm below subtraction of frunoff_glc to latent_frunoff_diag is correct.
-      fluxes%latent_frunoff_diag(i,j) = fluxes%latent_frunoff_diag(i,j) - G%mask2dT(i,j) * &
+      fluxes%latent_frunoff_glc_diag(i,j) = fluxes%latent_frunoff_glc_diag(i,j) - G%mask2dT(i,j) * &
           IOB%frunoff_glc(i-i0,j-j0) * US%W_m2_to_QRZ_T * CS%latent_heat_fusion
     endif
     if (associated(IOB%q_flux)) then