fix merge errors

NOAA-EMC · Oct 29, 2024 · 1779f54 · 1779f54
1 parent fab5994
commit 1779f54
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 17 deletions.
diff --git a/ccpp/driver/GFS_diagnostics.F90 b/ccpp/driver/GFS_diagnostics.F90
@@ -4971,7 +4971,7 @@ 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'
@@ -4980,7 +4980,7 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop
       ExtDiag(idx)%mod_name = 'gfs_phys'
       allocate (ExtDiag(idx)%data(nblks))
       do nb = 1,nblks
-       ExtDiag(idx)%data(nb)%var3 => Coupling(nb)%ebu_smoke(:,:)
+       ExtDiag(idx)%data(nb)%var3 => Coupling%ebu_smoke(Model%chunk_begin(nb):Model%chunk_end(nb),:)
       enddo
 
       idx = idx + 1
@@ -5044,17 +5044,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/io/module_write_netcdf.F90 b/io/module_write_netcdf.F90
@@ -407,11 +407,7 @@ end function nf_set_log_level
                if (is_cubed_sphere) then
                   chunksizes = [im, jm, 1, 1, 1]
                else
-<<<<<<< HEAD
-                  chunksizes = [ichunk3d(grid_id), jchunk3d(grid_id), min(kchunk3d(grid_id),fldlev(i)), 1]
-=======
                   chunksizes = [ichunk3d(grid_id), jchunk3d(grid_id), fldlev(i), 1]
->>>>>>> c01786de (Update io/module_write_netcdf.F90 (#810))
                end if
                ncerr = nf90_def_var_chunking(ncid, varids(i), NF90_CHUNKED, chunksizes) ; NC_ERR_STOP(ncerr)
             end if