From b98b940a96d74f859aa910160e6dc2c19e6a3838 Mon Sep 17 00:00:00 2001 From: Irena Vankova Date: Tue, 2 Jul 2024 15:58:48 -0600 Subject: [PATCH] rearrange groupd in bld --- components/mpas-ocean/bld/build-namelist | 10 +++++----- components/mpas-ocean/bld/build-namelist-section | 2 +- components/mpas-ocean/src/Registry.xml | 2 ++ 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/components/mpas-ocean/bld/build-namelist b/components/mpas-ocean/bld/build-namelist index dfde528029e7..158398e97e60 100755 --- a/components/mpas-ocean/bld/build-namelist +++ b/components/mpas-ocean/bld/build-namelist @@ -706,6 +706,11 @@ add_default($nl, 'config_use_sgr_opt_temp'); add_default($nl, 'config_use_sgr_opt_salt'); add_default($nl, 'config_sgr_temperature'); add_default($nl, 'config_sgr_salinity'); +if ($OCN_SGR eq 'data') { + add_default($nl, 'config_subglacial_runoff_mode', 'val'=>"data"); +} else { + add_default($nl, 'config_subglacial_runoff_mode'); +} ############################ # Namelist group: coupling # @@ -801,11 +806,6 @@ add_default($nl, 'config_land_ice_flux_ISOMIP_gammaT'); add_default($nl, 'config_land_ice_flux_rms_tidal_velocity'); add_default($nl, 'config_land_ice_flux_jenkins_heat_transfer_coefficient'); add_default($nl, 'config_land_ice_flux_jenkins_salt_transfer_coefficient'); -if ($OCN_SGR eq 'data') { - add_default($nl, 'config_subglacial_runoff_mode', 'val'=>"data"); -} else { - add_default($nl, 'config_subglacial_runoff_mode'); -} ############################# # Namelist group: advection # diff --git a/components/mpas-ocean/bld/build-namelist-section b/components/mpas-ocean/bld/build-namelist-section index 7aa6c3d523ab..063e2a6e7adf 100644 --- a/components/mpas-ocean/bld/build-namelist-section +++ b/components/mpas-ocean/bld/build-namelist-section @@ -229,6 +229,7 @@ add_default($nl, 'config_use_sgr_opt_temp'); add_default($nl, 'config_use_sgr_opt_salt'); add_default($nl, 'config_sgr_temperature'); add_default($nl, 'config_sgr_salinity'); +add_default($nl, 'config_subglacial_runoff_mode'); ############################ # Namelist group: coupling # @@ -312,7 +313,6 @@ add_default($nl, 'config_land_ice_flux_ISOMIP_gammaT'); add_default($nl, 'config_land_ice_flux_rms_tidal_velocity'); add_default($nl, 'config_land_ice_flux_jenkins_heat_transfer_coefficient'); add_default($nl, 'config_land_ice_flux_jenkins_salt_transfer_coefficient'); -add_default($nl, 'config_subglacial_runoff_mode'); ############################# # Namelist group: advection # diff --git a/components/mpas-ocean/src/Registry.xml b/components/mpas-ocean/src/Registry.xml index fa1b2f1c32c9..c50c6453c876 100644 --- a/components/mpas-ocean/src/Registry.xml +++ b/components/mpas-ocean/src/Registry.xml @@ -3574,6 +3574,8 @@ description="Divergence of transmission through interfaces of surface fluxes below the surface layer at cell centers. These are applied only to subglacial runoff." packages="dataSubglacialRunoffFluxPKG" /> + +