From 4eb301c6299f65c4f117bece6f11f76f6871b0ba Mon Sep 17 00:00:00 2001 From: Lisa Bengtsson Date: Mon, 9 Jun 2025 19:13:42 +0000 Subject: [PATCH 1/4] update threshold for when to use prognostic closure --- physics/CONV/SAMF/samfdeepcnv.f | 2 +- physics/CONV/SAMF/samfshalcnv.f | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/physics/CONV/SAMF/samfdeepcnv.f b/physics/CONV/SAMF/samfdeepcnv.f index b9f0ea8bc9..38f8af1765 100644 --- a/physics/CONV/SAMF/samfdeepcnv.f +++ b/physics/CONV/SAMF/samfdeepcnv.f @@ -2540,7 +2540,7 @@ subroutine samfdeepcnv_run (im,km,first_time_step,restart, & !> - If grid size is less than a threshold value (dxcrtas: currently 8km if progsigma is not used and 30km if progsigma is used), the quasi-equilibrium assumption of Arakawa-Schubert is not used any longer. ! if(progsigma)then - dxcrtas=30.e3 + dxcrtas=500.e3 dxcrtuf=10.e3 else dxcrtas=8.e3 diff --git a/physics/CONV/SAMF/samfshalcnv.f b/physics/CONV/SAMF/samfshalcnv.f index 0746d085eb..ee7f6a76e2 100644 --- a/physics/CONV/SAMF/samfshalcnv.f +++ b/physics/CONV/SAMF/samfshalcnv.f @@ -204,7 +204,7 @@ subroutine samfshalcnv_run(im,km,itc,ntc,cliq,cp,cvap, & parameter(betaw=.03,dxcrtc0=9.e3) parameter(h1=0.33333333) ! progsigma - parameter(dxcrtas=30.e3,sigmind=0.01,sigmins=0.03,sigminm=0.01) + parameter(dxcrtas=500.e3,sigmind=0.01,sigmins=0.03,sigminm=0.01) c local variables and arrays real(kind=kind_phys) pfld(im,km), to(im,km), qo(im,km), & uo(im,km), vo(im,km), qeso(im,km), From b957d06345bffa564c75d27a77a4602f6f1c7d17 Mon Sep 17 00:00:00 2001 From: Lisa Bengtsson Date: Mon, 9 Jun 2025 21:50:24 +0000 Subject: [PATCH 2/4] Update documentation for saSAS --- physics/CONV/SAMF/samfdeepcnv.f | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/physics/CONV/SAMF/samfdeepcnv.f b/physics/CONV/SAMF/samfdeepcnv.f index 38f8af1765..b4fe700279 100644 --- a/physics/CONV/SAMF/samfdeepcnv.f +++ b/physics/CONV/SAMF/samfdeepcnv.f @@ -2537,7 +2537,7 @@ subroutine samfdeepcnv_run (im,km,first_time_step,restart, & c c------- final changed variable per unit mass flux c -!> - If grid size is less than a threshold value (dxcrtas: currently 8km if progsigma is not used and 30km if progsigma is used), the quasi-equilibrium assumption of Arakawa-Schubert is not used any longer. +!> - If grid size is less than a threshold value (dxcrtas: currently 8km if progsigma is not used), or progsigma = true, the quasi-equilibrium assumption of Arakawa-Schubert is not used any longer. ! if(progsigma)then dxcrtas=500.e3 From 9f04d291c493350e4c77ce2d73e13e1bf7e19f4f Mon Sep 17 00:00:00 2001 From: Lisa Bengtsson Date: Tue, 24 Jun 2025 21:24:55 +0000 Subject: [PATCH 3/4] Correct units in .meta files --- physics/CONV/SAMF/samfdeepcnv.meta | 4 ++-- physics/CONV/SAMF/samfshalcnv.meta | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/physics/CONV/SAMF/samfdeepcnv.meta b/physics/CONV/SAMF/samfdeepcnv.meta index 7c208d2d3b..e6f44bc7bc 100644 --- a/physics/CONV/SAMF/samfdeepcnv.meta +++ b/physics/CONV/SAMF/samfdeepcnv.meta @@ -472,7 +472,7 @@ [omegain] standard_name = prognostic_updraft_velocity_in_convection long_name = convective updraft velocity - units = frac + units = Pa s-1 dimensions = (horizontal_loop_extent,vertical_layer_dimension) type = real kind = kind_phys @@ -481,7 +481,7 @@ [omegaout] standard_name = updraft_velocity_updated_by_physics long_name = convective updraft velocity updated by physics - units = frac + units = Pa s-1 dimensions = (horizontal_loop_extent,vertical_layer_dimension) type = real kind = kind_phys diff --git a/physics/CONV/SAMF/samfshalcnv.meta b/physics/CONV/SAMF/samfshalcnv.meta index d6fb7960d7..c1714801dd 100644 --- a/physics/CONV/SAMF/samfshalcnv.meta +++ b/physics/CONV/SAMF/samfshalcnv.meta @@ -504,7 +504,7 @@ [omegain] standard_name = prognostic_updraft_velocity_in_convection long_name = convective updraft velocity - units = frac + units = Pa s-1 dimensions = (horizontal_loop_extent,vertical_layer_dimension) type = real kind = kind_phys @@ -513,7 +513,7 @@ [omegaout] standard_name = updraft_velocity_updated_by_physics long_name = convective updraft velocity updated by physics - units = frac + units = Pa s-1 dimensions = (horizontal_loop_extent,vertical_layer_dimension) type = real kind = kind_phys From 19d82ffbc8b5ef6c636f996ebca6112f7c37132a Mon Sep 17 00:00:00 2001 From: Lisa Bengtsson Date: Wed, 9 Jul 2025 14:56:15 +0000 Subject: [PATCH 4/4] Correct units in interstitial file --- .../UFS_SCM_NEPTUNE/GFS_suite_interstitial_3.meta | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_3.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_3.meta index c791826796..65aeee8286 100644 --- a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_3.meta +++ b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_3.meta @@ -273,7 +273,7 @@ [omegain] standard_name = prognostic_updraft_velocity_in_convection long_name = convective updraft velocity - units = frac + units = Pa s-1 dimensions = (horizontal_loop_extent,vertical_layer_dimension) type = real kind = kind_phys @@ -282,7 +282,7 @@ [omegaout] standard_name = updraft_velocity_updated_by_physics long_name = convective updraft velocity updated by physics - units = frac + units = Pa s-1 dimensions = (horizontal_loop_extent,vertical_layer_dimension) type = real kind = kind_phys