Disable land ice frazil salinity

[cbegeman]

The option to have non-zero land ice frazil salinity was not fully supported. Here, we remove that option. This is BFB when land ice frazil salinity is zero, which has been the case in every configuration I am aware of.

This PR is to be merged after E3SM-Project#6229.

[cbegeman]

This PR has been tested on chrys, intel-impi with the IcosWISC compass standalone test.

[xylar]

@cbegeman, there are some more places that the namelist option needs to be removed:

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

Line 762 in eb4d66b

add_default($nl, 'config_frazil_land_ice_reference_salinity');

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

Line 373 in eb4d66b

<config_frazil_land_ice_reference_salinity>0.0</config_frazil_land_ice_reference_salinity>

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

Lines 1486 to 1492 in eb4d66b

	<entry id="config_frazil_land_ice_reference_salinity" type="real"
	category="frazil_ice" group="frazil_ice">
	assumed salinity of frazil ice under land ice.
	Valid values: Any non-negative real number.
	Default: Defined in namelist_defaults.xml
	</entry>

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

Line 287 in eb4d66b

add_default($nl, 'config_frazil_land_ice_reference_salinity');

And the following needs to match Registry:

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

Lines 1478 to 1484 in eb4d66b

	<entry id="config_frazil_sea_ice_reference_salinity" type="real"
	category="frazil_ice" group="frazil_ice">
	assumed salinity of frazil ice in the open ocean.
	Valid values: Any positive real number.
	Default: Defined in namelist_defaults.xml
	</entry>

Once those are updated, I think this looks great and will be ready to go to E3SM!

[cbegeman]

@xylar Thanks for all the links! That made the fixup really easy! Changes here: 4f3eead

[darincomeau]

well that just made this a whole lot harder to review, I shouldn't have waited so long :D!

But I think with that last commit I agree this looks good. I can do a proper review on the real PR.

[xylar]

@darincomeau, it should be back to sanity...

[xylar]

@cbegeman, it sounds like this can move to E3SM, then.

[cbegeman]

Migrated to E3SM-Project#6397