backs out change in standard name for liquid and frozen heat flux

since this will require a change in the nuopc field_dictionary. The
fields are not currently used.

config_src/nuopc_driver/mom_cap.F90

@@ -776,9 +776,9 @@ subroutine InitializeAdvertise(gcomp, importState, exportState, clock, rc)
   call fld_list_add(fldsToOcn_num, fldsToOcn, "Foxx_rofi"                  , "will provide") !-> ice runoff
   call fld_list_add(fldsToOcn_num, fldsToOcn, "mean_fresh_water_to_ocean_rate", "will provide")
   call fld_list_add(fldsToOcn_num, fldsToOcn, "net_heat_flx_to_ocn"        , "will provide")
-  !Requires nuopc dictionary change
-  call fld_list_add(fldsToOcn_num, fldsToOcn, "liquid_runoff_heat_flx"      , "will provide")
-  call fld_list_add(fldsToOcn_num, fldsToOcn, "frozen_runoff_heat_flx"      , "will provide")
+  !These are not currently used and changing requires a nuopc dictionary change
+  !call fld_list_add(fldsToOcn_num, fldsToOcn, "mean_runoff_heat_flx"        , "will provide")
+  !call fld_list_add(fldsToOcn_num, fldsToOcn, "mean_calving_heat_flx"       , "will provide")
 
   !--------- export fields -------------
   call fld_list_add(fldsFrOcn_num, fldsFrOcn, "ocean_mask"                 , "will provide")

config_src/nuopc_driver/mom_cap_methods.F90

@@ -239,7 +239,7 @@ subroutine mom_import(ocean_public, ocean_grid, importState, ice_ocean_boundary,
 
   ! heat content of lrunoff
   ice_ocean_boundary%lrunoff_hflx(:,:) = 0._ESMF_KIND_R8
-  call state_getimport(importState, 'liquid_runoff_heat_flx',  &
+  call state_getimport(importState, 'mean_runoff_heat_flx',  &
        isc, iec, jsc, jec, ice_ocean_boundary%lrunoff_hflx, rc=rc)
   if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, &
        line=__LINE__, &
@@ -248,7 +248,7 @@ subroutine mom_import(ocean_public, ocean_grid, importState, ice_ocean_boundary,
 
   ! heat content of frunoff
   ice_ocean_boundary%frunoff_hflx(:,:) = 0._ESMF_KIND_R8
-  call state_getimport(importState, 'frozen_runoff_heat_flx',  &
+  call state_getimport(importState, 'mean_calving_heat_flx',  &
        isc, iec, jsc, jec, ice_ocean_boundary%frunoff_hflx, rc=rc)
   if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, &
        line=__LINE__, &