From a7d46eee01a78f0915373ebc58c9b20ba14a6c36 Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Mon, 30 Dec 2024 11:33:33 -0500 Subject: [PATCH] Fifth reconciliation PR from production/RRFS.v1 (#884) * Update io/module_write_netcdf.F90 (#810) * [production/RRFS.v1] Fix improperly assigned fire emissions for ebb_dcycle==1 for retrospectives (NOT operational!) (#812) * Fix improperly assigned fire emissions for ebb_dcycle==1 for retrospectives (NOT operational!) * Move ebu_smoke outside of extended_sd_diag IF block in diagnostics --------- Co-authored-by: jordanschnell --- ccpp/driver/GFS_diagnostics.F90 | 23 +++++++++++------------ ccpp/physics | 2 +- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/ccpp/driver/GFS_diagnostics.F90 b/ccpp/driver/GFS_diagnostics.F90 index 346662e3c..d2a8bdf5a 100644 --- a/ccpp/driver/GFS_diagnostics.F90 +++ b/ccpp/driver/GFS_diagnostics.F90 @@ -4897,7 +4897,17 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop endif endif extended_smoke_dust_diagnostics - + + idx = idx + 1 + ExtDiag(idx)%axes = 3 + ExtDiag(idx)%name = 'ebu_smoke' + ExtDiag(idx)%desc = 'smoke emission' + ExtDiag(idx)%unit = 'ug/m2/s' + ExtDiag(idx)%mod_name = 'gfs_phys' + allocate (ExtDiag(idx)%data(nblks)) + do nb = 1,nblks + ExtDiag(idx)%data(nb)%var3 => Coupling%ebu_smoke(Model%chunk_begin(nb):Model%chunk_end(nb),:) + enddo idx = idx + 1 ExtDiag(idx)%axes = 2 @@ -4960,17 +4970,6 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop endif smoke_forecast_mode - idx = idx + 1 - ExtDiag(idx)%axes = 3 - ExtDiag(idx)%name = 'ebu_smoke' - ExtDiag(idx)%desc = 'smoke emission' - ExtDiag(idx)%unit = 'ug/m2/s' - ExtDiag(idx)%mod_name = 'gfs_phys' - allocate (ExtDiag(idx)%data(nblks)) - do nb = 1,nblks - ExtDiag(idx)%data(nb)%var3 => Coupling%ebu_smoke(Model%chunk_begin(nb):Model%chunk_end(nb),:) - enddo - idx = idx + 1 ExtDiag(idx)%axes = 3 ExtDiag(idx)%name = 'ext550' diff --git a/ccpp/physics b/ccpp/physics index dab57fcce..dfad42fe3 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit dab57fcce3f1abf16eb01f22469ea84279f67b19 +Subproject commit dfad42fe3ac83ab76c9e2523a5d185752d771fa8