From b32981f72045e4f7191a62088be12996cd67d2ed Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Mon, 24 Jul 2023 12:48:46 -0400 Subject: [PATCH 1/2] Fixed stratosphere warm bias and code optimization for MERRA2 (#674) * optimized the code and decrease the stratosphere warm bias for mraerosol=T --------- Co-authored-by: anning.cheng --- ccpp/data/CCPP_typedefs.F90 | 4 ++++ ccpp/physics | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ccpp/data/CCPP_typedefs.F90 b/ccpp/data/CCPP_typedefs.F90 index 9a6a387ba..ed27c5e37 100644 --- a/ccpp/data/CCPP_typedefs.F90 +++ b/ccpp/data/CCPP_typedefs.F90 @@ -929,6 +929,8 @@ subroutine gfs_interstitial_setup_tracers(Interstitial, Model) if (Model%imp_physics == Model%imp_physics_thompson) then if (Model%ltaerosol) then Interstitial%nvdiff = 12 + else if (Model%mraerosol) then + Interstitial%nvdiff = 10 else Interstitial%nvdiff = 9 endif @@ -1018,6 +1020,8 @@ subroutine gfs_interstitial_setup_tracers(Interstitial, Model) elseif (Model%imp_physics == Model%imp_physics_thompson) then if (Model%ltaerosol) then Interstitial%nvdiff = 12 + else if (Model%mraerosol) then + Interstitial%nvdiff = 10 else Interstitial%nvdiff = 9 endif diff --git a/ccpp/physics b/ccpp/physics index 5dc968ef4..9b6997449 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 5dc968ef4e0aa0c36ef980e39a44d58056d1cb2c +Subproject commit 9b69974496a208e26feef30d0b0e405ac4e023b9 From 8d7118ef2ad33cafce6252d13c3d6bceb7210e7c Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Thu, 2 Nov 2023 13:46:09 -0400 Subject: [PATCH 2/2] update ccpp/physics submodule and .gitmodules --- .gitmodules | 6 ++---- ccpp/physics | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index 60456312d..6bb663df1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,10 +8,8 @@ branch = main [submodule "ccpp/physics"] path = ccpp/physics - #url = https://github.com/NCAR/ccpp-physics - #branch = main - url = https://github.com/grantfirl/ccpp-physics - branch = ufs-dev-PR88 + url = https://github.com/NCAR/ccpp-physics + branch = main [submodule "upp"] path = upp url = https://github.com/NOAA-EMC/UPP diff --git a/ccpp/physics b/ccpp/physics index e1ccc99c6..61b419f13 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit e1ccc99c6eb48b6700513c4bb4315fca131fbd6a +Subproject commit 61b419f132ea24cbe191e34f1bbfcedf2c66e0dd