From 02b4b820c3ddf17661df9bdeea371266ca1225b8 Mon Sep 17 00:00:00 2001 From: "anning.cheng" Date: Wed, 28 Jun 2023 23:29:26 -0400 Subject: [PATCH 1/4] optimized the code and decrease the stratosphere warm bias for mraerosol=T --- .gitmodules | 4 ++-- ccpp/data/CCPP_typedefs.F90 | 4 ++++ ccpp/physics | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 22c723ac1..8ac042753 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,8 +8,8 @@ branch = main [submodule "ccpp/physics"] path = ccpp/physics - url = https://github.com/ufs-community/ccpp-physics - branch = ufs/dev + url = https://github.com/AnningCheng-NOAA/ccpp-physics + branch = maie [submodule "upp"] path = upp url = https://github.com/NOAA-EMC/UPP 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 427c77ba1..bb2af8cf6 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 427c77ba16f62bd84996f91b09655fff53abe549 +Subproject commit bb2af8cf67cd8c760cab8c72c022013ab43e3df0 From d63ba56211b85433959680018138c7d96c93a593 Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Fri, 30 Jun 2023 11:05:03 -0400 Subject: [PATCH 2/4] update .gitmodules for testing --- .gitmodules | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 8ac042753..0b48ee203 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,8 +8,10 @@ branch = main [submodule "ccpp/physics"] path = ccpp/physics - url = https://github.com/AnningCheng-NOAA/ccpp-physics - branch = maie + #url = https://github.com/NCAR/ccpp-physics + #branch = main + url = https://github.com/grantfirl/ccpp-physics + branch = strat_warm_bias_fix_cheng [submodule "upp"] path = upp url = https://github.com/NOAA-EMC/UPP From db6cda307c3acf0f54b49dab392e61baf2d39b2c Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Mon, 24 Jul 2023 08:46:30 -0400 Subject: [PATCH 3/4] update ccpp/physics and revert .gitmodules --- .gitmodules | 6 ++---- ccpp/physics | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index 0b48ee203..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 = strat_warm_bias_fix_cheng + 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 a69c8a345..9b6997449 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit a69c8a345b4d46140c4f7da95e42c688a5309e1b +Subproject commit 9b69974496a208e26feef30d0b0e405ac4e023b9 From 5689a5ca68e92b93c2b6cdef55488ba5dc22877f Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Mon, 24 Jul 2023 12:33:55 -0400 Subject: [PATCH 4/4] correct .gitmodules --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 6bb663df1..22c723ac1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,8 +8,8 @@ branch = main [submodule "ccpp/physics"] path = ccpp/physics - url = https://github.com/NCAR/ccpp-physics - branch = main + url = https://github.com/ufs-community/ccpp-physics + branch = ufs/dev [submodule "upp"] path = upp url = https://github.com/NOAA-EMC/UPP