From db07a38fc16ed21c62270d6630666b6fc5e261d7 Mon Sep 17 00:00:00 2001 From: mhrib Date: Tue, 14 Sep 2021 18:46:46 +0000 Subject: [PATCH 01/13] 'heatflux_linear' flag: sensible+latent heatfluxes using traditional linear bulk formula --- cicecore/cicedynB/general/ice_init.F90 | 12 +++++++++--- configuration/scripts/ice_in | 1 + doc/source/cice_index.rst | 1 + doc/source/user_guide/ug_case_settings.rst | 1 + 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/cicecore/cicedynB/general/ice_init.F90 b/cicecore/cicedynB/general/ice_init.F90 index 3d102217a..80ea2c04c 100644 --- a/cicecore/cicedynB/general/ice_init.F90 +++ b/cicecore/cicedynB/general/ice_init.F90 @@ -143,7 +143,8 @@ subroutine input_data tfrz_option, frzpnd, atmbndy, wave_spec_type, snwredist, snw_aging_table logical (kind=log_kind) :: calc_Tsfc, formdrag, highfreq, calc_strair, wave_spec, & - sw_redist, calc_dragio, use_smliq_pnd, snwgrain + sw_redist, calc_dragio, use_smliq_pnd, snwgrain, & + heatflux_linear logical (kind=log_kind) :: tr_iage, tr_FY, tr_lvl, tr_pond logical (kind=log_kind) :: tr_iso, tr_aero, tr_fsd, tr_snow @@ -242,7 +243,8 @@ subroutine input_data snw_tau_fname, snw_kappa_fname, snw_drdt0_fname namelist /forcing_nml/ & - formdrag, atmbndy, calc_strair, calc_Tsfc, & + formdrag, atmbndy, heatflux_linear, & + calc_strair, calc_Tsfc, & highfreq, natmiter, atmiter_conv, calc_dragio, & ustar_min, emissivity, iceruf, iceruf_ocn, & fbot_xfer_type, update_ocn_f, l_mpond_fresh, tfrz_option, & @@ -449,6 +451,7 @@ subroutine input_data albsnowi = 0.70_dbl_kind ! cold snow albedo, near IR ahmax = 0.3_dbl_kind ! thickness above which ice albedo is constant (m) atmbndy = 'default' ! or 'constant' + heatflux_linear = .false. ! if true, calculate sensible+latent heatfluxes using traditional linear bulk formula default_season = 'winter' ! default forcing data, if data is not read in fyear_init = 1900 ! first year of forcing cycle ycycle = 1 ! number of years in forcing cycle @@ -799,6 +802,7 @@ subroutine input_data call broadcast_scalar(albsnowi, master_task) call broadcast_scalar(ahmax, master_task) call broadcast_scalar(atmbndy, master_task) + call broadcast_scalar(heatflux_linear, master_task) call broadcast_scalar(fyear_init, master_task) call broadcast_scalar(ycycle, master_task) call broadcast_scalar(atm_data_format, master_task) @@ -1646,6 +1650,7 @@ subroutine input_data write(nu_diag,1010) ' highfreq = ', highfreq,' : high-frequency atmospheric coupling' write(nu_diag,1020) ' natmiter = ', natmiter,' : number of atmo boundary layer iterations' write(nu_diag,1002) ' atmiter_conv = ', atmiter_conv,' : convergence criterion for ustar' + write(nu_diag,1010) ' heatflux_linear = ', heatflux_linear,' : Use linear bulk transfer coefficients for sensible+latent heatfluxes' elseif (trim(atmbndy) == 'constant') then tmpstr2 = ' : boundary layer uses bulk transfer coefficients' else @@ -2034,7 +2039,8 @@ subroutine input_data ahmax_in=ahmax, shortwave_in=shortwave, albedo_type_in=albedo_type, R_ice_in=R_ice, R_pnd_in=R_pnd, & R_snw_in=R_snw, dT_mlt_in=dT_mlt, rsnw_mlt_in=rsnw_mlt, & kstrength_in=kstrength, krdg_partic_in=krdg_partic, krdg_redist_in=krdg_redist, mu_rdg_in=mu_rdg, & - atmbndy_in=atmbndy, calc_strair_in=calc_strair, formdrag_in=formdrag, highfreq_in=highfreq, & + atmbndy_in=atmbndy, heatflux_linear_in=heatflux_linear, & + calc_strair_in=calc_strair, formdrag_in=formdrag, highfreq_in=highfreq, & kitd_in=kitd, kcatbound_in=kcatbound, hs0_in=hs0, dpscale_in=dpscale, frzpnd_in=frzpnd, & rfracmin_in=rfracmin, rfracmax_in=rfracmax, pndaspect_in=pndaspect, hs1_in=hs1, hp1_in=hp1, & ktherm_in=ktherm, calc_Tsfc_in=calc_Tsfc, conduct_in=conduct, & diff --git a/configuration/scripts/ice_in b/configuration/scripts/ice_in index 3dec72963..0b0d40b0d 100644 --- a/configuration/scripts/ice_in +++ b/configuration/scripts/ice_in @@ -224,6 +224,7 @@ &forcing_nml formdrag = .false. atmbndy = 'default' + heatflux_linear = .false. rotate_wind = .true. calc_strair = .true. calc_Tsfc = .true. diff --git a/doc/source/cice_index.rst b/doc/source/cice_index.rst index 0a04b5e26..221ae8f39 100644 --- a/doc/source/cice_index.rst +++ b/doc/source/cice_index.rst @@ -283,6 +283,7 @@ either Celsius or Kelvin units). "**H**", "", "" "halo_info", "information for updating ghost cells", "" "heat_capacity", "if true, use salinity-dependent thermodynamics", "T" + "heatflux_linear", "if true, calculate sensible+latent heatfluxes using traditional linear bulk formula", "F" "hfrazilmin", "minimum thickness of new frazil ice", "0.05 m" "hi_min", "minimum ice thickness for thinnest ice category", "0.01 m" "hi_ssl", "ice surface scattering layer thickness", "0.05 m" diff --git a/doc/source/user_guide/ug_case_settings.rst b/doc/source/user_guide/ug_case_settings.rst index 65a50120b..f83e982b2 100644 --- a/doc/source/user_guide/ug_case_settings.rst +++ b/doc/source/user_guide/ug_case_settings.rst @@ -562,6 +562,7 @@ forcing_nml "``formdrag``", "logical", "calculate form drag", "``.false.``" "``fyear_init``", "integer", "first year of atmospheric forcing data", "1900" "``highfreq``", "logical", "high-frequency atmo coupling", "``.false.``" + "``heatflux_linear``", "logical", "if true, calculate latent+sensible heatfluxes using traditional linear bulk formula", "``.false.``" "``ice_data_type``", "``boxslotcyl``", "initialize ice concentration and velocity for :ref:`boxslotcyl` test (:cite:`Zalesak79`)", "``default``" "", "``box2001``", "initialize ice concentration for :ref:`box2001` test (:cite:`Hunke01`)", "" "", "``default``", "no special initialization", "" From ce7b41dd1fe1cec1584914071ae57ed212060c5e Mon Sep 17 00:00:00 2001 From: mhrib Date: Wed, 15 Sep 2021 13:12:14 +0000 Subject: [PATCH 02/13] Add option atmbndy='mixed' boundary layer condition --- cicecore/cicedynB/general/ice_init.F90 | 27 +++++++++++----------- configuration/scripts/ice_in | 3 +-- doc/source/cice_index.rst | 3 +-- doc/source/user_guide/ug_case_settings.rst | 7 +++--- 4 files changed, 19 insertions(+), 21 deletions(-) diff --git a/cicecore/cicedynB/general/ice_init.F90 b/cicecore/cicedynB/general/ice_init.F90 index 80ea2c04c..9d0bcc4a2 100644 --- a/cicecore/cicedynB/general/ice_init.F90 +++ b/cicecore/cicedynB/general/ice_init.F90 @@ -143,8 +143,7 @@ subroutine input_data tfrz_option, frzpnd, atmbndy, wave_spec_type, snwredist, snw_aging_table logical (kind=log_kind) :: calc_Tsfc, formdrag, highfreq, calc_strair, wave_spec, & - sw_redist, calc_dragio, use_smliq_pnd, snwgrain, & - heatflux_linear + sw_redist, calc_dragio, use_smliq_pnd, snwgrain logical (kind=log_kind) :: tr_iage, tr_FY, tr_lvl, tr_pond logical (kind=log_kind) :: tr_iso, tr_aero, tr_fsd, tr_snow @@ -243,8 +242,7 @@ subroutine input_data snw_tau_fname, snw_kappa_fname, snw_drdt0_fname namelist /forcing_nml/ & - formdrag, atmbndy, heatflux_linear, & - calc_strair, calc_Tsfc, & + formdrag, atmbndy, calc_strair, calc_Tsfc, & highfreq, natmiter, atmiter_conv, calc_dragio, & ustar_min, emissivity, iceruf, iceruf_ocn, & fbot_xfer_type, update_ocn_f, l_mpond_fresh, tfrz_option, & @@ -450,8 +448,7 @@ subroutine input_data albsnowv = 0.98_dbl_kind ! cold snow albedo, visible albsnowi = 0.70_dbl_kind ! cold snow albedo, near IR ahmax = 0.3_dbl_kind ! thickness above which ice albedo is constant (m) - atmbndy = 'default' ! or 'constant' - heatflux_linear = .false. ! if true, calculate sensible+latent heatfluxes using traditional linear bulk formula + atmbndy = 'similarity' ! Atm boundary layer: 'similarity', 'constant' or 'mixed' default_season = 'winter' ! default forcing data, if data is not read in fyear_init = 1900 ! first year of forcing cycle ycycle = 1 ! number of years in forcing cycle @@ -802,7 +799,6 @@ subroutine input_data call broadcast_scalar(albsnowi, master_task) call broadcast_scalar(ahmax, master_task) call broadcast_scalar(atmbndy, master_task) - call broadcast_scalar(heatflux_linear, master_task) call broadcast_scalar(fyear_init, master_task) call broadcast_scalar(ycycle, master_task) call broadcast_scalar(atm_data_format, master_task) @@ -1645,14 +1641,18 @@ subroutine input_data write(nu_diag,1010) ' rotate_wind = ', rotate_wind,' : rotate wind/stress to computational grid' write(nu_diag,1010) ' formdrag = ', formdrag,' : use form drag parameterization' write(nu_diag,1000) ' iceruf = ', iceruf, ' : ice surface roughness at atmosphere interface (m)' - if (trim(atmbndy) == 'default') then - tmpstr2 = ' : stability-based boundary layer' + if (trim(atmbndy) == 'constant') then + tmpstr2 = ' : boundary layer uses bulk transfer coefficients' + elseif (trim(atmbndy) == 'similarity' .or. & + trim(atmbndy) == 'mixed') then write(nu_diag,1010) ' highfreq = ', highfreq,' : high-frequency atmospheric coupling' write(nu_diag,1020) ' natmiter = ', natmiter,' : number of atmo boundary layer iterations' write(nu_diag,1002) ' atmiter_conv = ', atmiter_conv,' : convergence criterion for ustar' - write(nu_diag,1010) ' heatflux_linear = ', heatflux_linear,' : Use linear bulk transfer coefficients for sensible+latent heatfluxes' - elseif (trim(atmbndy) == 'constant') then - tmpstr2 = ' : boundary layer uses bulk transfer coefficients' + if (trim(atmbndy) == 'similarity') then + tmpstr2 = ' : stability-based boundary layer' + else + tmpstr2 = ' : stability-based boundary layer, but constant for sensible+latent heatfluxes' + endif else tmpstr2 = ' : unknown value' endif @@ -2039,8 +2039,7 @@ subroutine input_data ahmax_in=ahmax, shortwave_in=shortwave, albedo_type_in=albedo_type, R_ice_in=R_ice, R_pnd_in=R_pnd, & R_snw_in=R_snw, dT_mlt_in=dT_mlt, rsnw_mlt_in=rsnw_mlt, & kstrength_in=kstrength, krdg_partic_in=krdg_partic, krdg_redist_in=krdg_redist, mu_rdg_in=mu_rdg, & - atmbndy_in=atmbndy, heatflux_linear_in=heatflux_linear, & - calc_strair_in=calc_strair, formdrag_in=formdrag, highfreq_in=highfreq, & + atmbndy_in=atmbndy, calc_strair_in=calc_strair, formdrag_in=formdrag, highfreq_in=highfreq, & kitd_in=kitd, kcatbound_in=kcatbound, hs0_in=hs0, dpscale_in=dpscale, frzpnd_in=frzpnd, & rfracmin_in=rfracmin, rfracmax_in=rfracmax, pndaspect_in=pndaspect, hs1_in=hs1, hp1_in=hp1, & ktherm_in=ktherm, calc_Tsfc_in=calc_Tsfc, conduct_in=conduct, & diff --git a/configuration/scripts/ice_in b/configuration/scripts/ice_in index 0b0d40b0d..443ff1cbb 100644 --- a/configuration/scripts/ice_in +++ b/configuration/scripts/ice_in @@ -223,8 +223,7 @@ &forcing_nml formdrag = .false. - atmbndy = 'default' - heatflux_linear = .false. + atmbndy = 'similarity' rotate_wind = .true. calc_strair = .true. calc_Tsfc = .true. diff --git a/doc/source/cice_index.rst b/doc/source/cice_index.rst index 221ae8f39..19428c87e 100644 --- a/doc/source/cice_index.rst +++ b/doc/source/cice_index.rst @@ -65,7 +65,7 @@ either Celsius or Kelvin units). "atm_data_dir", "directory for atmospheric forcing data", "" "atm_data_format", "format of atmospheric forcing files", "" "atm_data_type", "type of atmospheric forcing", "" - "atmbndy", "atmo boundary layer parameterization (‘default’ or ‘constant’)", "" + "atmbndy", "atmo boundary layer parameterization ('similarity', ‘constant’, or 'mixed')", "" "avail_hist_fields", "type for history field data", "" "awtidf", "weighting factor for near-ir, diffuse albedo", "0.36218" "awtidr", "weighting factor for near-ir, direct albedo", "0.00182" @@ -283,7 +283,6 @@ either Celsius or Kelvin units). "**H**", "", "" "halo_info", "information for updating ghost cells", "" "heat_capacity", "if true, use salinity-dependent thermodynamics", "T" - "heatflux_linear", "if true, calculate sensible+latent heatfluxes using traditional linear bulk formula", "F" "hfrazilmin", "minimum thickness of new frazil ice", "0.05 m" "hi_min", "minimum ice thickness for thinnest ice category", "0.01 m" "hi_ssl", "ice surface scattering layer thickness", "0.05 m" diff --git a/doc/source/user_guide/ug_case_settings.rst b/doc/source/user_guide/ug_case_settings.rst index f83e982b2..77f2d63fa 100644 --- a/doc/source/user_guide/ug_case_settings.rst +++ b/doc/source/user_guide/ug_case_settings.rst @@ -528,8 +528,10 @@ forcing_nml :widths: 15, 15, 30, 15 "", "", "", "" - "``atmbndy``", "``constant``", "bulk transfer coefficients", "``default``" - "", "``default``", "stability-based boundary layer", "" + "``atmbndy``", "``constant``", "bulk transfer coefficients", "``similarity``" + "", "``similarity``", "stability-based boundary layer", "" + "", "``constant``", "constant-based boundary layer", "" + "", "``mixed``", "stability-based, but constant for sensible+latent heatfluxes", "" "``atmiter_conv``", "real", "convergence criteria for ustar", "0.0" "``atm_data_dir``", "string", "path to atmospheric forcing data directory", "" "``atm_data_format``", "``bin``", "read direct access binary atmo forcing file format", "``bin``" @@ -562,7 +564,6 @@ forcing_nml "``formdrag``", "logical", "calculate form drag", "``.false.``" "``fyear_init``", "integer", "first year of atmospheric forcing data", "1900" "``highfreq``", "logical", "high-frequency atmo coupling", "``.false.``" - "``heatflux_linear``", "logical", "if true, calculate latent+sensible heatfluxes using traditional linear bulk formula", "``.false.``" "``ice_data_type``", "``boxslotcyl``", "initialize ice concentration and velocity for :ref:`boxslotcyl` test (:cite:`Zalesak79`)", "``default``" "", "``box2001``", "initialize ice concentration for :ref:`box2001` test (:cite:`Hunke01`)", "" "", "``default``", "no special initialization", "" From 416bd74f435686a6dcf1f96f928a1efe33a84797 Mon Sep 17 00:00:00 2001 From: mhrib Date: Wed, 15 Sep 2021 21:37:06 +0000 Subject: [PATCH 03/13] New options for 'atmbndy' --- doc/source/user_guide/ug_case_settings.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/source/user_guide/ug_case_settings.rst b/doc/source/user_guide/ug_case_settings.rst index 77f2d63fa..3365c5de1 100644 --- a/doc/source/user_guide/ug_case_settings.rst +++ b/doc/source/user_guide/ug_case_settings.rst @@ -528,7 +528,7 @@ forcing_nml :widths: 15, 15, 30, 15 "", "", "", "" - "``atmbndy``", "``constant``", "bulk transfer coefficients", "``similarity``" + "``atmbndy``", "string", "bulk transfer coefficients", "``similarity``" "", "``similarity``", "stability-based boundary layer", "" "", "``constant``", "constant-based boundary layer", "" "", "``mixed``", "stability-based, but constant for sensible+latent heatfluxes", "" From 316538cba3c2e838330f92d10186f16808773a2c Mon Sep 17 00:00:00 2001 From: mhrib Date: Thu, 16 Sep 2021 13:02:13 +0000 Subject: [PATCH 04/13] For backward compability, rename "atmbndy" = default to similarity --- cicecore/cicedynB/general/ice_init.F90 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/cicecore/cicedynB/general/ice_init.F90 b/cicecore/cicedynB/general/ice_init.F90 index 9d0bcc4a2..10eb0893f 100644 --- a/cicecore/cicedynB/general/ice_init.F90 +++ b/cicecore/cicedynB/general/ice_init.F90 @@ -1214,6 +1214,14 @@ subroutine input_data endif endif + if (trim(atmbndy) == 'default') then + if (my_task == master_task) then + write(nu_diag,*) subname//' WARNING: atmbndy = default' + write(nu_diag,*) subname//' WARNING: For backward compability, set atmbndy = similarity' + endif + atmbndy = 'similarity' + endif + if (formdrag) then if (trim(atmbndy) == 'constant') then if (my_task == master_task) write(nu_diag,*) subname//' ERROR: formdrag=T and atmbndy=constant' From bc292e567b02289aa6ebfc03b843b639f380176d Mon Sep 17 00:00:00 2001 From: mhrib Date: Thu, 23 Sep 2021 07:07:47 +0000 Subject: [PATCH 05/13] Change wording for text related to atmbndy --- cicecore/cicedynB/general/ice_init.F90 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cicecore/cicedynB/general/ice_init.F90 b/cicecore/cicedynB/general/ice_init.F90 index 10eb0893f..7c53181a6 100644 --- a/cicecore/cicedynB/general/ice_init.F90 +++ b/cicecore/cicedynB/general/ice_init.F90 @@ -1216,8 +1216,8 @@ subroutine input_data if (trim(atmbndy) == 'default') then if (my_task == master_task) then - write(nu_diag,*) subname//' WARNING: atmbndy = default' - write(nu_diag,*) subname//' WARNING: For backward compability, set atmbndy = similarity' + write(nu_diag,*) subname//' WARNING: "atmbndy = default" is decrecated' + write(nu_diag,*) subname//' WARNING: setting "atmbndy = similarity"' endif atmbndy = 'similarity' endif @@ -1650,7 +1650,7 @@ subroutine input_data write(nu_diag,1010) ' formdrag = ', formdrag,' : use form drag parameterization' write(nu_diag,1000) ' iceruf = ', iceruf, ' : ice surface roughness at atmosphere interface (m)' if (trim(atmbndy) == 'constant') then - tmpstr2 = ' : boundary layer uses bulk transfer coefficients' + tmpstr2 = ' : constant-based boundary layer' elseif (trim(atmbndy) == 'similarity' .or. & trim(atmbndy) == 'mixed') then write(nu_diag,1010) ' highfreq = ', highfreq,' : high-frequency atmospheric coupling' @@ -1659,7 +1659,7 @@ subroutine input_data if (trim(atmbndy) == 'similarity') then tmpstr2 = ' : stability-based boundary layer' else - tmpstr2 = ' : stability-based boundary layer, but constant for sensible+latent heatfluxes' + tmpstr2 = ' : stability-based boundary layer for wind stress, constant for sensible+latent heat fluxes' endif else tmpstr2 = ' : unknown value' From 779509ad22a961df16de1e38184d40c948bfa8ea Mon Sep 17 00:00:00 2001 From: mhrib Date: Thu, 23 Sep 2021 07:09:18 +0000 Subject: [PATCH 06/13] Change wording for text related to atmbndy --- doc/source/user_guide/ug_case_settings.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/source/user_guide/ug_case_settings.rst b/doc/source/user_guide/ug_case_settings.rst index 3365c5de1..2b4e26c72 100644 --- a/doc/source/user_guide/ug_case_settings.rst +++ b/doc/source/user_guide/ug_case_settings.rst @@ -531,7 +531,7 @@ forcing_nml "``atmbndy``", "string", "bulk transfer coefficients", "``similarity``" "", "``similarity``", "stability-based boundary layer", "" "", "``constant``", "constant-based boundary layer", "" - "", "``mixed``", "stability-based, but constant for sensible+latent heatfluxes", "" + "", "``mixed``", "stability-based boundary layer for wind stress, constant-based for sensible+latent heat fluxes", "" "``atmiter_conv``", "real", "convergence criteria for ustar", "0.0" "``atm_data_dir``", "string", "path to atmospheric forcing data directory", "" "``atm_data_format``", "``bin``", "read direct access binary atmo forcing file format", "``bin``" From b759d49925330100240f36972362adb45b0ec4ac Mon Sep 17 00:00:00 2001 From: mhrib Date: Thu, 23 Sep 2021 09:34:19 +0000 Subject: [PATCH 07/13] Change wording for text related to atmbndy --- cicecore/cicedynB/general/ice_init.F90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cicecore/cicedynB/general/ice_init.F90 b/cicecore/cicedynB/general/ice_init.F90 index 7c53181a6..2a7b7f3eb 100644 --- a/cicecore/cicedynB/general/ice_init.F90 +++ b/cicecore/cicedynB/general/ice_init.F90 @@ -1659,7 +1659,7 @@ subroutine input_data if (trim(atmbndy) == 'similarity') then tmpstr2 = ' : stability-based boundary layer' else - tmpstr2 = ' : stability-based boundary layer for wind stress, constant for sensible+latent heat fluxes' + tmpstr2 = ' : stability-based boundary layer for wind stress, constant-based for sensible+latent heat fluxes' endif else tmpstr2 = ' : unknown value' From d3dd99e7bcec68dee471198f493bbbce7e35af9a Mon Sep 17 00:00:00 2001 From: mhrib Date: Thu, 23 Sep 2021 14:29:25 +0000 Subject: [PATCH 08/13] Spelling error etc. --- cicecore/cicedynB/general/ice_init.F90 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cicecore/cicedynB/general/ice_init.F90 b/cicecore/cicedynB/general/ice_init.F90 index 2a7b7f3eb..2e67af51c 100644 --- a/cicecore/cicedynB/general/ice_init.F90 +++ b/cicecore/cicedynB/general/ice_init.F90 @@ -1216,8 +1216,8 @@ subroutine input_data if (trim(atmbndy) == 'default') then if (my_task == master_task) then - write(nu_diag,*) subname//' WARNING: "atmbndy = default" is decrecated' - write(nu_diag,*) subname//' WARNING: setting "atmbndy = similarity"' + write(nu_diag,*) subname//' WARNING: atmbndy = default is deprecated' + write(nu_diag,*) subname//' WARNING: setting atmbndy = similarity' endif atmbndy = 'similarity' endif From 3954d4b33d7730e60b89c53a8d278637fd43f0da Mon Sep 17 00:00:00 2001 From: mhrib Date: Fri, 24 Sep 2021 12:01:48 +0000 Subject: [PATCH 09/13] Update Icepack with required atmbndy changes --- icepack | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/icepack b/icepack index 34c8e688b..f9c9e480f 160000 --- a/icepack +++ b/icepack @@ -1 +1 @@ -Subproject commit 34c8e688bf7f3008cf84093cd703cf8cfe068eda +Subproject commit f9c9e480f6ce482317734be80719178c8e1b5121 From fa92c7ff507866bf5cd5a66096d15d761ec8998a Mon Sep 17 00:00:00 2001 From: mhrib Date: Mon, 27 Sep 2021 07:25:35 +0000 Subject: [PATCH 10/13] Added test for atmbndy={constant,mixed} --- .../scripts/options/set_nml.atmbndy_constant | 1 + .../scripts/options/set_nml.atmbndy_mixed | 1 + configuration/scripts/tests/base_suite.ts | 74 +------------------ 3 files changed, 4 insertions(+), 72 deletions(-) create mode 100644 configuration/scripts/options/set_nml.atmbndy_constant create mode 100644 configuration/scripts/options/set_nml.atmbndy_mixed diff --git a/configuration/scripts/options/set_nml.atmbndy_constant b/configuration/scripts/options/set_nml.atmbndy_constant new file mode 100644 index 000000000..8e2a68192 --- /dev/null +++ b/configuration/scripts/options/set_nml.atmbndy_constant @@ -0,0 +1 @@ +atmbndy = 'constant' diff --git a/configuration/scripts/options/set_nml.atmbndy_mixed b/configuration/scripts/options/set_nml.atmbndy_mixed new file mode 100644 index 000000000..c79a26fb5 --- /dev/null +++ b/configuration/scripts/options/set_nml.atmbndy_mixed @@ -0,0 +1 @@ +atmbndy = 'mixed' diff --git a/configuration/scripts/tests/base_suite.ts b/configuration/scripts/tests/base_suite.ts index 4da4dd110..478ec2819 100644 --- a/configuration/scripts/tests/base_suite.ts +++ b/configuration/scripts/tests/base_suite.ts @@ -1,74 +1,4 @@ # Test Grid PEs Sets BFB-compare -smoke gx3 8x2 diag1,run5day -smoke gx3 1x1 debug,diag1,run2day -smoke gx3 1x4 debug,diag1,run2day -smoke gx3 4x1 debug,diag1,run5day -restart gx3 8x2 debug -smoke gx3 8x2 diag24,run1year,medium -smoke gx3 7x2 diag1,bigdiag,run1day,diagpt1 -decomp gx3 4x2x25x29x5 none -smoke gx3 4x2 diag1,run5day smoke_gx3_8x2_diag1_run5day -smoke gx3 4x1 diag1,run5day,thread smoke_gx3_8x2_diag1_run5day -smoke gx3 1x8 diag1,run5day,evp1d -restart gx1 40x4 droundrobin,medium -restart tx1 40x4 dsectrobin,medium -restart gx3 4x4 none -restart gx3 10x4 maskhalo -restart gx3 6x2 alt01 -restart gx3 8x2 alt02 -restart gx3 4x2 alt03 -restart gx3 12x2 alt03,maskhalo,droundrobin -restart gx3 4x4 alt04 -restart gx3 4x4 alt05 -restart gx3 8x2 alt06 -restart gx3 18x2 debug,maskhalo -restart gx3 6x2 alt01,debug,short -restart gx3 8x2 alt02,debug,short -restart gx3 4x2 alt03,debug,short -smoke gx3 12x2 alt03,debug,short,maskhalo,droundrobin -smoke gx3 4x4 alt04,debug,short -smoke gx3 4x4 alt05,debug,short -smoke gx3 8x2 alt06,debug,short -smoke gx3 10x2 debug,diag1,run5day,gx3sep2 -smoke gx3 7x2x5x29x12 diag1,bigdiag,run1day,debug -restart gbox128 4x2 short -restart gbox128 4x2 boxnodyn,short -restart gbox128 4x2 boxnodyn,short,debug -restart gbox128 2x2 boxadv,short -smoke gbox128 2x2 boxadv,short,debug -restart gbox128 4x4 boxrestore,short -smoke gbox128 4x4 boxrestore,short,debug -restart gbox80 1x1 box2001 -smoke gbox80 1x1 boxslotcyl -smoke gx3 8x2 bgcz -smoke gx3 8x2 bgcz,debug -smoke gx3 8x1 bgcskl,debug -#smoke gx3 4x1 bgcz,thread smoke_gx3_8x2_bgcz -restart gx1 4x2 bgcsklclim,medium -restart gx1 8x1 bgczclim,medium -smoke gx1 24x1 medium,run90day,yi2008 -smoke gx3 8x1 medium,run90day,yi2008 -restart gx1 24x1 short -restart gx1 16x2 seabedLKD,gx1apr,short,debug -restart gx1 15x2 seabedprob -restart gx1 32x1 gx1prod -smoke gx3 4x2 fsd1,diag24,run5day,debug -smoke gx3 8x2 fsd12,diag24,run5day -restart gx3 4x2 fsd12,debug,short -smoke gx3 8x2 fsd12ww3,diag24,run1day -smoke gx3 4x1 isotope,debug -restart gx3 8x2 isotope -smoke gx3 4x1 snwITDrdg,snwgrain,icdefault,debug -smoke gx3 4x1 snw30percent,icdefault,debug -restart gx3 8x2 snwITDrdg,icdefault,snwgrain -restart gx3 4x4 gx3ncarbulk,iobinary -restart gx3 4x4 histall,precision8,cdf64 -smoke gx3 30x1 bgcz,histall -smoke gx3 14x2 fsd12,histall -smoke gx3 4x1 dynpicard -smoke gx3 8x2 diag24,run5day,zsal,debug -restart gx3 8x2 zsal -restart gx3 8x2 gx3ncarbulk,debug -restart gx3 4x4 gx3ncarbulk,diag1 -restart gx1 24x1 gx1coreii,short smoke gx3 4x1 calcdragio +restart gx3 4x2 atmbndy_constant +restart gx3 4x2 atmbndy_mixed From dd18f9b7e0ebf172f1f61d723aed53ed2ad1a79c Mon Sep 17 00:00:00 2001 From: mhrib Date: Mon, 27 Sep 2021 08:02:49 +0000 Subject: [PATCH 11/13] Add test for atmbndy={constant,mixed} --- configuration/scripts/tests/base_suite.ts | 72 +++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/configuration/scripts/tests/base_suite.ts b/configuration/scripts/tests/base_suite.ts index 478ec2819..48d6c8fb9 100644 --- a/configuration/scripts/tests/base_suite.ts +++ b/configuration/scripts/tests/base_suite.ts @@ -1,4 +1,76 @@ # Test Grid PEs Sets BFB-compare +smoke gx3 8x2 diag1,run5day +smoke gx3 1x1 debug,diag1,run2day +smoke gx3 1x4 debug,diag1,run2day +smoke gx3 4x1 debug,diag1,run5day +restart gx3 8x2 debug +smoke gx3 8x2 diag24,run1year,medium +smoke gx3 7x2 diag1,bigdiag,run1day,diagpt1 +decomp gx3 4x2x25x29x5 none +smoke gx3 4x2 diag1,run5day smoke_gx3_8x2_diag1_run5day +smoke gx3 4x1 diag1,run5day,thread smoke_gx3_8x2_diag1_run5day +smoke gx3 1x8 diag1,run5day,evp1d +restart gx1 40x4 droundrobin,medium +restart tx1 40x4 dsectrobin,medium +restart gx3 4x4 none +restart gx3 10x4 maskhalo +restart gx3 6x2 alt01 +restart gx3 8x2 alt02 +restart gx3 4x2 alt03 +restart gx3 12x2 alt03,maskhalo,droundrobin +restart gx3 4x4 alt04 +restart gx3 4x4 alt05 +restart gx3 8x2 alt06 +restart gx3 18x2 debug,maskhalo +restart gx3 6x2 alt01,debug,short +restart gx3 8x2 alt02,debug,short +restart gx3 4x2 alt03,debug,short +smoke gx3 12x2 alt03,debug,short,maskhalo,droundrobin +smoke gx3 4x4 alt04,debug,short +smoke gx3 4x4 alt05,debug,short +smoke gx3 8x2 alt06,debug,short +smoke gx3 10x2 debug,diag1,run5day,gx3sep2 +smoke gx3 7x2x5x29x12 diag1,bigdiag,run1day,debug +restart gbox128 4x2 short +restart gbox128 4x2 boxnodyn,short +restart gbox128 4x2 boxnodyn,short,debug +restart gbox128 2x2 boxadv,short +smoke gbox128 2x2 boxadv,short,debug +restart gbox128 4x4 boxrestore,short +smoke gbox128 4x4 boxrestore,short,debug +restart gbox80 1x1 box2001 +smoke gbox80 1x1 boxslotcyl +smoke gx3 8x2 bgcz +smoke gx3 8x2 bgcz,debug +smoke gx3 8x1 bgcskl,debug +#smoke gx3 4x1 bgcz,thread smoke_gx3_8x2_bgcz +restart gx1 4x2 bgcsklclim,medium +restart gx1 8x1 bgczclim,medium +smoke gx1 24x1 medium,run90day,yi2008 +smoke gx3 8x1 medium,run90day,yi2008 +restart gx1 24x1 short +restart gx1 16x2 seabedLKD,gx1apr,short,debug +restart gx1 15x2 seabedprob +restart gx1 32x1 gx1prod +smoke gx3 4x2 fsd1,diag24,run5day,debug +smoke gx3 8x2 fsd12,diag24,run5day +restart gx3 4x2 fsd12,debug,short +smoke gx3 8x2 fsd12ww3,diag24,run1day +smoke gx3 4x1 isotope,debug +restart gx3 8x2 isotope +smoke gx3 4x1 snwITDrdg,snwgrain,icdefault,debug +smoke gx3 4x1 snw30percent,icdefault,debug +restart gx3 8x2 snwITDrdg,icdefault,snwgrain +restart gx3 4x4 gx3ncarbulk,iobinary +restart gx3 4x4 histall,precision8,cdf64 +smoke gx3 30x1 bgcz,histall +smoke gx3 14x2 fsd12,histall +smoke gx3 4x1 dynpicard +smoke gx3 8x2 diag24,run5day,zsal,debug +restart gx3 8x2 zsal +restart gx3 8x2 gx3ncarbulk,debug +restart gx3 4x4 gx3ncarbulk,diag1 +restart gx1 24x1 gx1coreii,short smoke gx3 4x1 calcdragio restart gx3 4x2 atmbndy_constant restart gx3 4x2 atmbndy_mixed From 9d2aacb14c2c482fe008a70ea0a91c1f266a1e42 Mon Sep 17 00:00:00 2001 From: mhrib Date: Mon, 27 Sep 2021 20:12:00 +0000 Subject: [PATCH 12/13] Test for atmbndy={constant,mixed} --- configuration/scripts/options/set_nml.atmbndyconstant | 1 + configuration/scripts/options/set_nml.atmbndymixed | 1 + configuration/scripts/tests/base_suite.ts | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 configuration/scripts/options/set_nml.atmbndyconstant create mode 100644 configuration/scripts/options/set_nml.atmbndymixed diff --git a/configuration/scripts/options/set_nml.atmbndyconstant b/configuration/scripts/options/set_nml.atmbndyconstant new file mode 100644 index 000000000..8e2a68192 --- /dev/null +++ b/configuration/scripts/options/set_nml.atmbndyconstant @@ -0,0 +1 @@ +atmbndy = 'constant' diff --git a/configuration/scripts/options/set_nml.atmbndymixed b/configuration/scripts/options/set_nml.atmbndymixed new file mode 100644 index 000000000..c79a26fb5 --- /dev/null +++ b/configuration/scripts/options/set_nml.atmbndymixed @@ -0,0 +1 @@ +atmbndy = 'mixed' diff --git a/configuration/scripts/tests/base_suite.ts b/configuration/scripts/tests/base_suite.ts index 48d6c8fb9..2c75bffe1 100644 --- a/configuration/scripts/tests/base_suite.ts +++ b/configuration/scripts/tests/base_suite.ts @@ -72,5 +72,5 @@ restart gx3 8x2 gx3ncarbulk,debug restart gx3 4x4 gx3ncarbulk,diag1 restart gx1 24x1 gx1coreii,short smoke gx3 4x1 calcdragio -restart gx3 4x2 atmbndy_constant -restart gx3 4x2 atmbndy_mixed +restart gx3 4x2 atmbndyconstant +restart gx3 4x2 atmbndymixed From 290744bc30f9d336ba392f489e208e81cc5e607e Mon Sep 17 00:00:00 2001 From: mhrib Date: Mon, 27 Sep 2021 20:35:54 +0000 Subject: [PATCH 13/13] clean up. Renamed without underscores --- configuration/scripts/options/set_nml.atmbndy_constant | 1 - configuration/scripts/options/set_nml.atmbndy_mixed | 1 - 2 files changed, 2 deletions(-) delete mode 100644 configuration/scripts/options/set_nml.atmbndy_constant delete mode 100644 configuration/scripts/options/set_nml.atmbndy_mixed diff --git a/configuration/scripts/options/set_nml.atmbndy_constant b/configuration/scripts/options/set_nml.atmbndy_constant deleted file mode 100644 index 8e2a68192..000000000 --- a/configuration/scripts/options/set_nml.atmbndy_constant +++ /dev/null @@ -1 +0,0 @@ -atmbndy = 'constant' diff --git a/configuration/scripts/options/set_nml.atmbndy_mixed b/configuration/scripts/options/set_nml.atmbndy_mixed deleted file mode 100644 index c79a26fb5..000000000 --- a/configuration/scripts/options/set_nml.atmbndy_mixed +++ /dev/null @@ -1 +0,0 @@ -atmbndy = 'mixed'