From 09563a84f914f66cae06e4d8d67b949483b50330 Mon Sep 17 00:00:00 2001 From: "Haiqin.Li" Date: Tue, 5 Mar 2024 03:39:39 +0000 Subject: [PATCH 1/3] "point to the MYNN PBL update for RRFS.v1" --- .gitmodules | 4 ++-- ccpp/physics | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 75876f6fa..a8ab23be4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,8 +8,8 @@ branch = production/RRFS.v1 [submodule "ccpp/physics"] path = ccpp/physics - url = https://github.com/ufs-community/ccpp-physics - branch = production/RRFS.v1 + url = https://github.com/haiqinli/ccpp-physics + branch = production/RRFS.v1-mynn [submodule "upp"] path = upp url = https://github.com/NOAA-EMC/UPP diff --git a/ccpp/physics b/ccpp/physics index 8a4b1022e..274a69673 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 8a4b1022e7ebf0d2c8398cc49835a162f3cb3bd8 +Subproject commit 274a69673ed190a0f3c5e0d48e6643b0f0af1580 From dbe5fcb6a975dfbc80fa77571a24bb19835da557 Mon Sep 17 00:00:00 2001 From: "Haiqin.Li" Date: Wed, 6 Mar 2024 23:09:36 +0000 Subject: [PATCH 2/3] "point to PR #320 of https://github.com/NOAA-EMC/GFDL_atmos_cubed_sphere" --- .gitmodules | 4 ++-- atmos_cubed_sphere | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index a8ab23be4..e0e22cc0c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,7 @@ [submodule "atmos_cubed_sphere"] path = atmos_cubed_sphere - url = https://github.com/NOAA-EMC/GFDL_atmos_cubed_sphere - branch = production/RRFS.v1 + url = https://github.com/haiqinli/GFDL_atmos_cubed_sphere + branch = production/RRFS.v1-mynn [submodule "ccpp/framework"] path = ccpp/framework url = https://github.com/NCAR/ccpp-framework diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index 65301dd7c..01c092757 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 65301dd7c6b29c755a1f31b1a8e94562d3bd920c +Subproject commit 01c0927577a2ad709f8f9137a580466d057c8e20 From 7231bff2cfbc4882d1bed8bd03b61cf39b57b6dc Mon Sep 17 00:00:00 2001 From: "Haiqin.Li" Date: Fri, 8 Mar 2024 18:30:38 +0000 Subject: [PATCH 3/3] "Adding capability to output instantaneous clear sky downward shortwave flux" --- ccpp/driver/GFS_diagnostics.F90 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/ccpp/driver/GFS_diagnostics.F90 b/ccpp/driver/GFS_diagnostics.F90 index def71566d..0b809191b 100644 --- a/ccpp/driver/GFS_diagnostics.F90 +++ b/ccpp/driver/GFS_diagnostics.F90 @@ -545,6 +545,19 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop ExtDiag(idx)%data(nb)%var2 => IntDiag(nb)%fluxr(:,32) enddo + idx = idx + 1 + ExtDiag(idx)%axes = 2 + ExtDiag(idx)%name = 'csdsf' + ExtDiag(idx)%desc = 'Clear Sky Instantateous Downward Short Wave Flux' + ExtDiag(idx)%unit = 'W/m**2' + ExtDiag(idx)%mod_name = 'gfs_phys' + ExtDiag(idx)%intpl_method = 'bilinear' + allocate (ExtDiag(idx)%data(nblks)) + do nb = 1,nblks + ExtDiag(idx)%data(nb)%var2 => IntDiag(nb)%fluxr(:,32) + enddo + + idx = idx + 1 ExtDiag(idx)%axes = 2 ExtDiag(idx)%name = 'csulf_ave'