From cd175568644bbcc567639be727a9e126d4c53b75 Mon Sep 17 00:00:00 2001 From: "Chunxi.Zhang-NOAA" Date: Tue, 1 Nov 2022 19:54:25 +0000 Subject: [PATCH 1/9] Improve radiative fluxes and cloud cover in ccpp/physics for HR1 --- .gitmodules | 6 ++++-- ccpp/physics | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 22c723ac1..dc09abb64 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,8 +8,10 @@ branch = main [submodule "ccpp/physics"] path = ccpp/physics - url = https://github.com/ufs-community/ccpp-physics - branch = ufs/dev +# url = https://github.com/ufs-community/ccpp-physics +# branch = ufs/dev + url = https://github.com/ChunxiZhang-NOAA/ccpp-physics + branch = feature/mp_cloud [submodule "upp"] path = upp url = https://github.com/NOAA-EMC/UPP diff --git a/ccpp/physics b/ccpp/physics index aa7bff5d0..e14df8ce6 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit aa7bff5d0da9ab02938aba373088df6df784e965 +Subproject commit e14df8ce60c149bd6639b4f953006fa777c5f310 From 045de8301b334bba02646b21b06ef20c052a4ff2 Mon Sep 17 00:00:00 2001 From: Brian Curtis <64433609+BrianCurtis-NOAA@users.noreply.github.com> Date: Thu, 3 Nov 2022 10:31:54 -0400 Subject: [PATCH 2/9] Enable AOD diagnostics when coupled with AQM. (#593) * Enable AOD diagnostics when coupled with AQM Co-authored-by: Raffaele Montuoro --- ccpp/driver/GFS_diagnostics.F90 | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/ccpp/driver/GFS_diagnostics.F90 b/ccpp/driver/GFS_diagnostics.F90 index 206dc01d0..9e7cbf49b 100644 --- a/ccpp/driver/GFS_diagnostics.F90 +++ b/ccpp/driver/GFS_diagnostics.F90 @@ -929,6 +929,22 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop ExtDiag(idx)%data(nb)%var2 => IntDiag(nb)%fluxr(:,39) enddo +!--- air quality diagnostics --- + if (Model%cplaqm) then + if (associated(IntDiag(1)%aod)) then + idx = idx + 1 + ExtDiag(idx)%axes = 2 + ExtDiag(idx)%name = 'aod' + ExtDiag(idx)%desc = 'total aerosol optical depth at 550 nm' + ExtDiag(idx)%unit = 'numerical' + ExtDiag(idx)%mod_name = 'gfs_phys' + allocate (ExtDiag(idx)%data(nblks)) + do nb = 1,nblks + ExtDiag(idx)%data(nb)%var2 => IntDiag(nb)%aod + enddo + endif + endif + ! ! !--- accumulated diagnostics --- From a076a26deece3f9f1819f3d68b54dee802156273 Mon Sep 17 00:00:00 2001 From: "Chunxi.Zhang-NOAA" Date: Fri, 4 Nov 2022 21:26:48 +0000 Subject: [PATCH 3/9] Remove the lines that are commented out in ccpp/physics/physics/GFS_rrtmg_pre.F90 and module_mp_thompson.F90 --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index e14df8ce6..729b6e6a7 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit e14df8ce60c149bd6639b4f953006fa777c5f310 +Subproject commit 729b6e6a79390c0b3babdd02802b2eba3ecaa9bf From a1a05bfb7b37a878fd2c983112bb410e8495e474 Mon Sep 17 00:00:00 2001 From: "Chunxi.Zhang-NOAA" Date: Mon, 7 Nov 2022 16:30:18 +0000 Subject: [PATCH 4/9] Make changes to the Thompson scheme to address reviewer comments --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 729b6e6a7..e947b0850 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 729b6e6a79390c0b3babdd02802b2eba3ecaa9bf +Subproject commit e947b0850d26a43c76e3b9d5767afff68cbce159 From d37a1fda85b4b53e25b572315a7944ebfdc52940 Mon Sep 17 00:00:00 2001 From: "Chunxi.Zhang-NOAA" Date: Tue, 8 Nov 2022 16:02:28 +0000 Subject: [PATCH 5/9] Revert submodule pointer for ccpp-physics --- .gitmodules | 6 ++---- ccpp/physics | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index dc09abb64..22c723ac1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,10 +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/ChunxiZhang-NOAA/ccpp-physics - branch = feature/mp_cloud + url = https://github.com/ufs-community/ccpp-physics + branch = ufs/dev [submodule "upp"] path = upp url = https://github.com/NOAA-EMC/UPP diff --git a/ccpp/physics b/ccpp/physics index e947b0850..f1b918295 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit e947b0850d26a43c76e3b9d5767afff68cbce159 +Subproject commit f1b9182951d8c1fd41f62c0b55af9fcfa76ba40f From f7a3007f68bd874ff6a7b92ae31c5c09951dc970 Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Tue, 8 Nov 2022 16:54:31 -0500 Subject: [PATCH 6/9] update ccpp/physics submodule pointer --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index c348f3e36..a01516033 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit c348f3e363f066c2c513b0449690859d3104bac8 +Subproject commit a0151603380b3d4d188a4121addf83720e66a550 From 023488d9761422fc82e279687917027a26a499be Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Tue, 15 Nov 2022 15:55:23 -0500 Subject: [PATCH 7/9] update ccpp/physics submodule pointer --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index a01516033..6374c8862 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit a0151603380b3d4d188a4121addf83720e66a550 +Subproject commit 6374c88626fee7de8484b1c6fd3bf2e165265dc5 From 45c08a2bc4c3d0475f555a67f011f45323c2bd1b Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Tue, 15 Nov 2022 18:41:07 -0500 Subject: [PATCH 8/9] update ccpp/physics and .gitmodules for testing --- .gitmodules | 6 ++++-- ccpp/physics | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 6bb663df1..e3bfc40a5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,8 +8,10 @@ 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-PR19 + #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 6374c8862..c65aa9033 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 6374c88626fee7de8484b1c6fd3bf2e165265dc5 +Subproject commit c65aa9033250b036b993d927ba692e45f9aa378e From 0437122168b6df67d0e899d9573d4b320a3b0ded Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Mon, 21 Nov 2022 14:11:53 -0500 Subject: [PATCH 9/9] update ccpp/physics submodule and revert .gitmodules --- .gitmodules | 6 ++---- ccpp/physics | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index e3bfc40a5..6bb663df1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,10 +8,8 @@ branch = main [submodule "ccpp/physics"] path = ccpp/physics - url = https://github.com/grantfirl/ccpp-physics - branch = ufs-dev-PR19 - #url = https://github.com/NCAR/ccpp-physics - #branch = main + 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 c65aa9033..312f63eab 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit c65aa9033250b036b993d927ba692e45f9aa378e +Subproject commit 312f63eab04893f95844f3a0fd3803c03fb1fe11