diff --git a/components/mpas-ocean/bld/build-namelist b/components/mpas-ocean/bld/build-namelist index 19418582863e..f810bfa9170a 100755 --- a/components/mpas-ocean/bld/build-namelist +++ b/components/mpas-ocean/bld/build-namelist @@ -759,7 +759,6 @@ add_default($nl, 'config_frazil_fractional_thickness_limit'); add_default($nl, 'config_specific_heat_sea_water'); add_default($nl, 'config_frazil_maximum_depth'); add_default($nl, 'config_frazil_sea_ice_reference_salinity'); -add_default($nl, 'config_frazil_land_ice_reference_salinity'); add_default($nl, 'config_frazil_maximum_freezing_temperature'); add_default($nl, 'config_frazil_use_surface_pressure'); diff --git a/components/mpas-ocean/bld/build-namelist-section b/components/mpas-ocean/bld/build-namelist-section index 0c834f05cec1..4681d6cca93b 100644 --- a/components/mpas-ocean/bld/build-namelist-section +++ b/components/mpas-ocean/bld/build-namelist-section @@ -284,7 +284,6 @@ add_default($nl, 'config_frazil_fractional_thickness_limit'); add_default($nl, 'config_specific_heat_sea_water'); add_default($nl, 'config_frazil_maximum_depth'); add_default($nl, 'config_frazil_sea_ice_reference_salinity'); -add_default($nl, 'config_frazil_land_ice_reference_salinity'); add_default($nl, 'config_frazil_maximum_freezing_temperature'); add_default($nl, 'config_frazil_use_surface_pressure'); diff --git a/components/mpas-ocean/bld/namelist_files/namelist_defaults_mpaso.xml b/components/mpas-ocean/bld/namelist_files/namelist_defaults_mpaso.xml index 5a3359cd2d7a..8ea53f3f7499 100644 --- a/components/mpas-ocean/bld/namelist_files/namelist_defaults_mpaso.xml +++ b/components/mpas-ocean/bld/namelist_files/namelist_defaults_mpaso.xml @@ -380,7 +380,6 @@ 3.996e3 100.0 4.0 -0.0 0.0 .false. diff --git a/components/mpas-ocean/bld/namelist_files/namelist_definition_mpaso.xml b/components/mpas-ocean/bld/namelist_files/namelist_definition_mpaso.xml index e01c2b9716f4..bdf3d802d594 100644 --- a/components/mpas-ocean/bld/namelist_files/namelist_definition_mpaso.xml +++ b/components/mpas-ocean/bld/namelist_files/namelist_definition_mpaso.xml @@ -1477,20 +1477,12 @@ Default: Defined in namelist_defaults.xml -assumed salinity of frazil ice in the open ocean. +assumed salinity of frazil ice in the open ocean. Land ice frazil salinity is always 0. Valid values: Any positive real number. Default: Defined in namelist_defaults.xml - -assumed salinity of frazil ice under land ice. - -Valid values: Any non-negative real number. -Default: Defined in namelist_defaults.xml - - Maximum freezing temperature for the creation of frazil diff --git a/components/mpas-ocean/src/Registry.xml b/components/mpas-ocean/src/Registry.xml index 905343f3e408..ebee11826e75 100644 --- a/components/mpas-ocean/src/Registry.xml +++ b/components/mpas-ocean/src/Registry.xml @@ -954,13 +954,9 @@ possible_values="Any positive real number." /> -