diff --git a/components/mpas-seaice/bld/build-namelist b/components/mpas-seaice/bld/build-namelist index 664ef679d48b..8d4249b504d3 100755 --- a/components/mpas-seaice/bld/build-namelist +++ b/components/mpas-seaice/bld/build-namelist @@ -528,8 +528,10 @@ add_default($nl, 'config_restart_timestamp_name'); ############################## add_default($nl, 'config_nCategories'); +add_default($nl, 'config_nFloeCategories'); add_default($nl, 'config_nIceLayers'); add_default($nl, 'config_nSnowLayers'); +add_default($nl, 'config_nFloeCategories'); ############################## # Namelist group: initialize # @@ -654,6 +656,7 @@ add_default($nl, 'config_use_aerosols'); add_default($nl, 'config_use_effective_snow_density'); add_default($nl, 'config_use_snow_grain_radius'); add_default($nl, 'config_use_special_boundaries_tracers'); +add_default($nl, 'config_use_floe_size_distribution'); ################################### # Namelist group: biogeochemistry # diff --git a/components/mpas-seaice/bld/build-namelist-section b/components/mpas-seaice/bld/build-namelist-section index 9729301303eb..3bee756fcf42 100644 --- a/components/mpas-seaice/bld/build-namelist-section +++ b/components/mpas-seaice/bld/build-namelist-section @@ -70,6 +70,7 @@ add_default($nl, 'config_do_restart_snow_grain_radius'); add_default($nl, 'config_nCategories'); add_default($nl, 'config_nIceLayers'); add_default($nl, 'config_nSnowLayers'); +add_default($nl, 'config_nFloeCategories'); ############################## # Namelist group: initialize # @@ -186,6 +187,7 @@ add_default($nl, 'config_use_aerosols'); add_default($nl, 'config_use_effective_snow_density'); add_default($nl, 'config_use_snow_grain_radius'); add_default($nl, 'config_use_special_boundaries_tracers'); +add_default($nl, 'config_use_floe_size_distribution'); ################################### # Namelist group: biogeochemistry # diff --git a/components/mpas-seaice/bld/namelist_files/namelist_defaults_mpassi.xml b/components/mpas-seaice/bld/namelist_files/namelist_defaults_mpassi.xml index 9dec1aec7e46..df33a404abdd 100644 --- a/components/mpas-seaice/bld/namelist_files/namelist_defaults_mpassi.xml +++ b/components/mpas-seaice/bld/namelist_files/namelist_defaults_mpassi.xml @@ -59,8 +59,10 @@ 5 +1 7 5 +1 6371229.0 @@ -189,6 +191,7 @@ true true false +false false diff --git a/components/mpas-seaice/bld/namelist_files/namelist_definition_mpassi.xml b/components/mpas-seaice/bld/namelist_files/namelist_definition_mpassi.xml index acfe0d91afe2..6b62bd21e62f 100644 --- a/components/mpas-seaice/bld/namelist_files/namelist_definition_mpassi.xml +++ b/components/mpas-seaice/bld/namelist_files/namelist_definition_mpassi.xml @@ -288,6 +288,22 @@ Valid values: Any positive integer. Default: Defined in namelist_defaults.xml + +The number of floe size categories to use. + +Valid values: Any positive integer. +Default: Defined in namelist_defaults.xml + + + +The number of ice thickness categories to use. + +Valid values: Any positive integer. +Default: Defined in namelist_defaults.xml + + The number of ice layers in the vertical direction to use. @@ -304,6 +320,13 @@ Valid values: Any positive integer. Default: Defined in namelist_defaults.xml + +The number of ice floe categories to use. + +Valid values: 1(default), 12, 16, 24. +Default: Defined in namelist_defaults.xml + @@ -936,6 +959,13 @@ Valid values: true or false Default: Defined in namelist_defaults.xml + +Use floe size distribution. Requires Icepack column package. + +Valid values: true or false +Default: Defined in namelist_defaults.xml + diff --git a/components/mpas-seaice/driver/ice_comp_mct.F b/components/mpas-seaice/driver/ice_comp_mct.F index 0e0ce90a224d..9efdf16fe860 100644 --- a/components/mpas-seaice/driver/ice_comp_mct.F +++ b/components/mpas-seaice/driver/ice_comp_mct.F @@ -754,7 +754,11 @@ end subroutine xml_stream_get_attributes else if (trim(tempCharConfig) == "column_package") then call seaice_column_coupling_prep(domain) endif ! config_column_physics_type - + + call MPAS_pool_get_config(domain % configs, "config_use_floe_size_distribution", tempLogicalConfig) + if (tempLogicalConfig) then + call mpas_log_write('FloeSizeDistribution coming online soon. Turn FSD off for now.', MPAS_LOG_CRIT) + endif !----------------------------------------------------------------------- ! ! send intial state to driver diff --git a/components/mpas-seaice/src/Registry.xml b/components/mpas-seaice/src/Registry.xml index cd00b3d21143..f7a3df3e0a4a 100644 --- a/components/mpas-seaice/src/Registry.xml +++ b/components/mpas-seaice/src/Registry.xml @@ -44,6 +44,10 @@ definition="namelist:config_nCategories" description="The number of ice thickness categories." /> + + +