[production/RRFS.v1] Fix improperly assigned fire emissions for ebb_d…

…cycle==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
* Update ccpp/physics to relevant commmit, revert .gitmodules back to original state

ccpp/driver/GFS_diagnostics.F90

@@ -4785,17 +4785,6 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop
        ExtDiag(idx)%data(nb)%var2 => Sfcprop(nb)%fhist
       enddo
 
-      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(nb)%ebu_smoke(:,:)
-      enddo
-
       if (Model%ebb_dcycle == 2 ) then
 
       idx = idx + 1
@@ -4813,6 +4802,16 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop
 
       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(nb)%ebu_smoke(:,:)
+      enddo
 
       idx = idx + 1
       ExtDiag(idx)%axes = 2