From ef0a823a02549bda01ce6bf6bb3f4a21d70f3c23 Mon Sep 17 00:00:00 2001 From: Erin Thomas Date: Tue, 26 Sep 2023 12:26:31 -0700 Subject: [PATCH 1/8] components/mpas-seaice/bld/build-namelist --- components/mpas-seaice/bld/build-namelist | 2 ++ 1 file changed, 2 insertions(+) diff --git a/components/mpas-seaice/bld/build-namelist b/components/mpas-seaice/bld/build-namelist index 664ef679d48b..063ee060be63 100755 --- a/components/mpas-seaice/bld/build-namelist +++ b/components/mpas-seaice/bld/build-namelist @@ -530,6 +530,7 @@ add_default($nl, 'config_restart_timestamp_name'); add_default($nl, 'config_nCategories'); add_default($nl, 'config_nIceLayers'); add_default($nl, 'config_nSnowLayers'); +add_default($nl, 'config_nFloeCategories'); ############################## # Namelist group: initialize # @@ -654,6 +655,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 # From 0368921ca3fcd9a892e241f9c2d6e0b19b94ae83 Mon Sep 17 00:00:00 2001 From: Erin Thomas Date: Tue, 26 Sep 2023 12:29:25 -0700 Subject: [PATCH 2/8] components/mpas-seaice/bld/build-namelist-section --- components/mpas-seaice/bld/build-namelist-section | 2 ++ 1 file changed, 2 insertions(+) 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 # From 2d20e48e6a6cb09f17c3a93bb46e5d46928665fe Mon Sep 17 00:00:00 2001 From: Erin Thomas Date: Tue, 26 Sep 2023 12:31:05 -0700 Subject: [PATCH 3/8] components/mpas-seaice/bld/namelist_files/namelist_defaults_mpassi.xml --- .../mpas-seaice/bld/namelist_files/namelist_defaults_mpassi.xml | 2 ++ 1 file changed, 2 insertions(+) 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..708b2789f058 100644 --- a/components/mpas-seaice/bld/namelist_files/namelist_defaults_mpassi.xml +++ b/components/mpas-seaice/bld/namelist_files/namelist_defaults_mpassi.xml @@ -61,6 +61,7 @@ 5 7 5 +1 6371229.0 @@ -189,6 +190,7 @@ true true false +false false From d0b1f229594d13acb350a53e88475c286b67b749 Mon Sep 17 00:00:00 2001 From: Erin Thomas Date: Tue, 26 Sep 2023 12:32:19 -0700 Subject: [PATCH 4/8] components/mpas-seaice/bld/namelist_files/namelist_definition_mpassi.xml --- .../bld/namelist_files/namelist_definition_mpassi.xml | 7 +++++++ 1 file changed, 7 insertions(+) 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..c065cfd92652 100644 --- a/components/mpas-seaice/bld/namelist_files/namelist_definition_mpassi.xml +++ b/components/mpas-seaice/bld/namelist_files/namelist_definition_mpassi.xml @@ -304,6 +304,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 + From ea65d161505e1efe32bc1de1f02bae1c026da1ca Mon Sep 17 00:00:00 2001 From: Erin Thomas Date: Tue, 26 Sep 2023 12:33:38 -0700 Subject: [PATCH 5/8] components/mpas-seaice/bld/namelist_files/namelist_definition_mpassi.xml --- .../bld/namelist_files/namelist_definition_mpassi.xml | 7 +++++++ 1 file changed, 7 insertions(+) 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 c065cfd92652..83b6e1c8d3b9 100644 --- a/components/mpas-seaice/bld/namelist_files/namelist_definition_mpassi.xml +++ b/components/mpas-seaice/bld/namelist_files/namelist_definition_mpassi.xml @@ -943,6 +943,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 + From d8633adf4a06bed5bfcbfb92c17e4aff96c35df0 Mon Sep 17 00:00:00 2001 From: Erin Thomas Date: Thu, 28 Sep 2023 10:22:08 -0500 Subject: [PATCH 6/8] abort if FSD turned on. --- components/mpas-seaice/driver/ice_comp_mct.F | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 From ba13054b99de6e1054919d00c663be299ff9db5c Mon Sep 17 00:00:00 2001 From: Andrew Roberts Date: Thu, 28 Sep 2023 13:13:45 -0500 Subject: [PATCH 7/8] Add floe size distribution namelist option to registry --- components/mpas-seaice/src/Registry.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/components/mpas-seaice/src/Registry.xml b/components/mpas-seaice/src/Registry.xml index cd00b3d21143..c018fc1df56b 100644 --- a/components/mpas-seaice/src/Registry.xml +++ b/components/mpas-seaice/src/Registry.xml @@ -775,6 +775,11 @@ description="Modify tracers in given boundary cells." possible_values="true or false" /> + From 584443d3855aa373546f61e6cd8f8922fec588e1 Mon Sep 17 00:00:00 2001 From: Andrew Roberts Date: Thu, 28 Sep 2023 13:52:24 -0500 Subject: [PATCH 8/8] Updated to include dimension namelist option for the floe size --- components/mpas-seaice/bld/build-namelist | 1 + .../namelist_files/namelist_defaults_mpassi.xml | 1 + .../namelist_definition_mpassi.xml | 16 ++++++++++++++++ components/mpas-seaice/src/Registry.xml | 8 ++++++++ 4 files changed, 26 insertions(+) diff --git a/components/mpas-seaice/bld/build-namelist b/components/mpas-seaice/bld/build-namelist index 063ee060be63..8d4249b504d3 100755 --- a/components/mpas-seaice/bld/build-namelist +++ b/components/mpas-seaice/bld/build-namelist @@ -528,6 +528,7 @@ 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'); 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 708b2789f058..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,6 +59,7 @@ 5 +1 7 5 1 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 83b6e1c8d3b9..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. diff --git a/components/mpas-seaice/src/Registry.xml b/components/mpas-seaice/src/Registry.xml index c018fc1df56b..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." /> + +