Apply berg flux spreading using DIB pattern

cime_config/config_grids.xml

@@ -5910,6 +5910,7 @@
     <gridmap ocn_grid="IcoswISC30E3r5" rof_grid="JRA025">
       <map name="ROF2OCN_ICE_RMAPNAME">cpl/cpl6/map_JRA025_to_IcoswISC30E3r5_cstmnn.r150e300.20231121.nc</map>
       <map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_JRA025_to_IcoswISC30E3r5_cstmnn.r150e300.20231121.nc</map>
+      <map name="ROF2ICE_RMAPNAME">cpl/cpl6/map_JRA025_to_IcoswISC30E3r5_cstmnn.r150e300.20231121.nc</map>
     </gridmap>
 
     <gridmap ocn_grid="IcosXISC30E3r7" rof_grid="JRA025">
@@ -6486,6 +6487,7 @@
       <map name="OCN2GLC_SHELF_FMAPNAME">cpl/gridmaps/IcoswISC30E3r5/map_IcoswISC30E3r5-nomask_to_ais4to20_esmfaave.20240701.nc</map>
       <map name="OCN2GLC_SHELF_SMAPNAME">cpl/gridmaps/IcoswISC30E3r5/map_IcoswISC30E3r5-nomask_to_ais4to20_esmfbilin.20240701.nc</map>
       <map name="OCN2GLC_TF_SMAPNAME">cpl/gridmaps/IcoswISC30E3r5/map_IcoswISC30E3r5-nomask_to_ais4to20_esmfbilin.20250403.nc</map>
+      <map name="GLC2ICE_RMAPNAME">cpl/gridmaps/mpas.ais4to20km/map_ais4to20_to_IcoswISC30E3r5-nomask_esmfaave.20240701.nc</map>
       <map name="GLC2ICE_FMAPNAME">cpl/gridmaps/mpas.ais4to20km/map_ais4to20_to_IcoswISC30E3r5-nomask_esmfaave.20240701.nc</map>
       <map name="GLC2ICE_SMAPNAME">cpl/gridmaps/mpas.ais4to20km/map_ais4to20_to_IcoswISC30E3r5-nomask_esmfbilin.20240701.nc</map>
       <map name="GLC2OCN_FMAPNAME">cpl/gridmaps/mpas.ais4to20km/map_ais4to20_to_IcoswISC30E3r5-nomask_esmfaave.20240701.nc</map>

components/mpas-albany-landice/driver/glc_comp_mct.F

@@ -1554,12 +1554,12 @@ subroutine glc_export_mct(g2x_g, errorCode)
          do i = 1, nCellsSolve
             n = n + 1
 
-            ! Fogg_rofl
+            ! Fogg_rofl - liquid runoff to ocean
             g2x_g % rAttr(index_g2x_Fogg_rofl,n) = avgBareIceAblationApplied(i) 
-            ! Figg_rofi
-            g2x_g % rAttr(index_g2x_Figg_rofi,n) = 0.0 ! placeholder
-            ! Fogg_rofi
-            g2x_g % rAttr(index_g2x_Fogg_rofi,n) = avgCalvingFlux(i) 
+            ! Figg_rofi - solid runoff to sea ice
+            g2x_g % rAttr(index_g2x_Figg_rofi,n) = avgCalvingFlux(i)
+            ! Fogg_rofi - solid runoff to ocean
+            g2x_g % rAttr(index_g2x_Fogg_rofi,n) = 0.0
             g2x_g % rAttr(index_g2x_Fogg_rofi,n) = g2x_g % rAttr(index_g2x_Fogg_rofi,n) + avgFaceMeltFlux(i)
             if (trim(config_basal_mass_bal_float) == 'ismip6') then
                ! if MALI is calculating ISMF, add that to rofi

components/mpas-ocean/cime_config/testdefs/testmods_dirs/mpaso/scaled_dib_dismf/README

@@ -2,7 +2,7 @@ This testdef is used to test a stealth feature in mpaso and mpassi introduced
 by PR #6696. It simply changes sets the following namelist option in mpaso
 to true
    config_scale_dismf_by_removed_ice_runoff
-and the following namelist option in mpassi to true
-   config_scale_dib_by_removed_ice_runoff
+and the following namelist option in mpassi
+   config_dib_scale_mode = 'removed_ice_runoff'
 These flags only makes sense to use in a B-case runs with data icebergs (DIB)
 and data ice-shelf melt fluxes (DISMF).

components/mpas-ocean/cime_config/testdefs/testmods_dirs/mpaso/scaled_dib_dismf/user_nl_mpassi

@@ -1 +1 @@
- config_scale_dib_by_removed_ice_runoff = .true.
+ config_dib_scale_mode = 'removed_ice_runoff'

components/mpas-seaice/bld/build-namelist

@@ -940,7 +940,7 @@ if ($iceberg_mode eq 'data') {
     add_default($nl, 'config_use_data_icebergs', 'val'=>"false");
 }
 add_default($nl, 'config_iceberg_temperature');
-add_default($nl, 'config_scale_dib_by_removed_ice_runoff');
+add_default($nl, 'config_dib_scale_mode');
 add_default($nl, 'config_salt_flux_coupling_type');
 add_default($nl, 'config_ice_ocean_drag_coefficient');
 

components/mpas-seaice/bld/build-namelist-section

@@ -446,7 +446,7 @@ add_default($nl, 'config_sea_freezing_temperature_type');
 add_default($nl, 'config_ocean_surface_type');
 add_default($nl, 'config_use_data_icebergs');
 add_default($nl, 'config_iceberg_temperature');
-add_default($nl, 'config_scale_dib_by_removed_ice_runoff');
+add_default($nl, 'config_dib_scale_mode');
 add_default($nl, 'config_salt_flux_coupling_type');
 add_default($nl, 'config_ice_ocean_drag_coefficient');
 

components/mpas-seaice/bld/namelist_files/namelist_defaults_mpassi.xml

@@ -457,7 +457,7 @@
 <config_ocean_surface_type>'free'</config_ocean_surface_type>
 <config_use_data_icebergs>false</config_use_data_icebergs>
 <config_iceberg_temperature>-4.0</config_iceberg_temperature>
-<config_scale_dib_by_removed_ice_runoff>false</config_scale_dib_by_removed_ice_runoff>
+<config_dib_scale_mode>'none'</config_dib_scale_mode>
 <config_salt_flux_coupling_type>'constant'</config_salt_flux_coupling_type>
 <config_ice_ocean_drag_coefficient>0.00536</config_ice_ocean_drag_coefficient>
 

components/mpas-seaice/bld/namelist_files/namelist_definition_mpassi.xml

@@ -2662,11 +2662,11 @@ Valid values: Any real number.
 Default: Defined in namelist_defaults.xml
 </entry>
 
-<entry id="config_scale_dib_by_removed_ice_runoff" type="logical"
+<entry id="config_dib_scale_mode" type="char*1024"
 	category="ocean" group="ocean">
-Whether to scale data iceberg fluxes by the running mean of removed ice runoff
+How to scale data iceberg fluxes: 'none'=no scaling, 'removed_ice_runoff'=running mean of removed ice runoff, 'coupler_ice_runoff'=sum of Fixx_rofi from coupler"
 
-Valid values: true or false
+Valid values: 'none', 'removed_ice_runoff','coupler_ice_runoff'
 Default: Defined in namelist_defaults.xml
 </entry>
 

components/mpas-seaice/cime_config/buildnml

@@ -680,6 +680,7 @@ def buildnml(case, caseroot, compname):
                 lines.append('                  input_interval="none" >')
                 lines.append('')
                 lines.append('    <var name="bergFreshwaterFluxData"/>')
+                lines.append('    <var name="areaIntegAnnMeanDataIcebergFreshwaterFlux"/>')
                 lines.append('    <var name="areaIntegAnnMeanDataIcebergIceShelfFreshwaterFlux"/>')
                 lines.append('    <var name="xtime"/>')
                 lines.append('</stream>')