Update namelist files with new namelist option and section

Author: cbegeman

components/mpas-ocean/bld/build-namelist

@@ -815,6 +815,12 @@ if ($OCN_ISMF eq 'coupled') {
 	add_default($nl, 'config_frazil_under_land_ice');
 }
 
+############################
+# Namelist group: land_ice #
+############################
+
+add_default($nl, 'config_land_ice_rho_ocean');
+
 ###################################
 # Namelist group: land_ice_fluxes #
 ###################################

components/mpas-ocean/bld/build-namelist-group-list

@@ -20,6 +20,7 @@ my @groups = qw(run_modes
                 self_attraction_loading
                 tidal_potential_forcing
                 frazil_ice
+                land_ice
                 land_ice_fluxes
                 advection
                 bottom_drag

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

@@ -305,6 +305,12 @@ add_default($nl, 'config_frazil_sea_ice_reference_salinity');
 add_default($nl, 'config_frazil_maximum_freezing_temperature');
 add_default($nl, 'config_frazil_use_surface_pressure');
 
+############################
+# Namelist group: land_ice #
+############################
+
+add_default($nl, 'config_land_ice_rho_ocean');
+
 ###################################
 # Namelist group: land_ice_fluxes #
 ###################################

components/mpas-ocean/bld/namelist_files/namelist_defaults_mpaso.xml

@@ -428,6 +428,9 @@
 <config_frazil_maximum_freezing_temperature>0.0</config_frazil_maximum_freezing_temperature>
 <config_frazil_use_surface_pressure>.false.</config_frazil_use_surface_pressure>
 
+<!-- land_ice -->
+<config_land_ice_rho_ocean>1028</config_land_ice_rho_ocean>
+
 <!-- land_ice_fluxes -->
 <config_land_ice_flux_mode>'off'</config_land_ice_flux_mode>
 <config_land_ice_flux_mode ocn_grid="oQU240wLI">'pressure_only'</config_land_ice_flux_mode>

components/mpas-ocean/bld/namelist_files/namelist_definition_mpaso.xml

@@ -1644,6 +1644,16 @@ Default: Defined in namelist_defaults.xml
 </entry>
 
 
+<!-- land_ice -->
+
+<entry id="config_land_ice_rho_ocean" type="real"
+	category="land_ice" group="land_ice">
+ocean density used to calculate landIceDraft at floatation (assumed constant and uniform). Should be consistent with MALI's config_ocean_density when used to determine grounding line location. This is an alternative to the coupler variable effectiveDensityInLandIce which is not currently used."
+
+Valid values: Any positive real number
+Default: Defined in namelist_defaults.xml
+</entry>
+
 <!-- land_ice_fluxes -->
 
 <entry id="config_land_ice_flux_mode" type="char*1024"

components/mpas-ocean/src/Registry.xml

@@ -1045,6 +1045,12 @@
 			possible_values=".true. or .false."
 		/>
 	</nml_record>
+	<nml_record name="land_ice" mode="init;forward">
+		<nml_option name="config_land_ice_rho_ocean" type="real" default_value="1028.0" units="kg m^-3"
+					description="ocean density used to calculate landIceDraft at floatation (assumed constant and uniform). Should be consistent with MALI's config_ocean_density when used to determine grounding line location. This is an alternative to the coupler variable effectiveDensityInLandIce which is not currently used."
+					possible_values="Any positive real number"
+		/>
+	</nml_record>
 	<nml_record name="land_ice_fluxes" mode="init;forward">
 		<nml_option name="config_land_ice_flux_mode" type="character" default_value="off"
 					description="Selects the mode in which land-ice fluxes are computed."
@@ -1078,10 +1084,6 @@
 					description="The density of land ice."
 					possible_values="Any positive real number"
 		/>
-		<nml_option name="config_land_ice_flux_rho_ocean" type="real" default_value="1028.0" units="kg m^-3"
-					description="ocean density used to calculate landIceDraft at floatation (assumed constant and uniform). Should be consistent with MALI's config_ocean_density. This is an alternative to the coupler variable effectiveDensityInLandIce which is not currently used."
-					possible_values="Any positive real number"
-		/>
 		<nml_option name="config_land_ice_flux_explicit_topDragCoeff" type="real" default_value="2.5e-3"
 					description="The top drag coefficient if config_use_implicit_top_drag_coeff is false."
 					possible_values="Any positive real number"

components/mpas-ocean/src/mode_init/mpas_ocn_init_global_ocean.F

@@ -973,7 +973,7 @@ subroutine ocn_init_setup_global_ocean_interpolate_land_ice_topography(domain, i
        real(kind=RKIND) :: rho_floatation
 
        iErr = 0
-       rho_floatation = config_land_ice_flux_rho_ocean
+       rho_floatation = config_land_ice_rho_ocean
 
        ! Iteratively smooth land ice topography variables
        if (config_global_ocean_topography_smooth_weight > 0) then

components/mpas-ocean/src/shared/mpas_ocn_diagnostics.F

@@ -4684,7 +4684,7 @@ subroutine ocn_diagnostics_init(domain, err)!{{{
          landIceTopDragCoeff = config_land_ice_flux_explicit_topDragCoeff
       endif
 
-      rho_floatation = config_land_ice_flux_rho_ocean
+      rho_floatation = config_land_ice_rho_ocean
 
       if (trim(config_thickness_drag_type) == 'centered') then
          thickEdgeDragChoice = thickEdgeDragCenter

components/mpas-ocean/src/shared/mpas_ocn_time_varying_forcing.F

@@ -71,7 +71,7 @@ subroutine ocn_time_varying_forcing_init(domain)!{{{
     !  call init_****_forcing(domain)
     !endif
 
-    rho_floatation = config_land_ice_flux_rho_ocean
+    rho_floatation = config_land_ice_rho_ocean
 
   end subroutine ocn_time_varying_forcing_init!}}}