Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fifth reconciliation PR from production/RRFS.v1 #884

Merged
merged 8 commits into from
Dec 30, 2024
Merged

Fifth reconciliation PR from production/RRFS.v1 #884

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
78955ff
Update io/module_write_netcdf.F90 (#810)
DusanJovic-NOAA Apr 2, 2024
fab5994
[production/RRFS.v1] Fix improperly assigned fire emissions for ebb_d…
jordanschnell Apr 11, 2024
1779f54
fix merge errors
grantfirl Oct 29, 2024
6d7cb5a
revert changes to io/module_write_netcdf.F90 since changes in produci…
grantfirl Oct 29, 2024
ae2c1ec
Merge branch 'develop' into rrfsv1-to-ufs/dev5
grantfirl Nov 13, 2024
b75a532
Merge branch 'develop' into rrfsv1-to-ufs/dev5
grantfirl Dec 2, 2024
adbb065
Merge branch 'develop' into rrfsv1-to-ufs/dev5
grantfirl Dec 6, 2024
4327b12
update ccpp physics after merge
grantfirl Dec 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 11 additions & 12 deletions ccpp/driver/GFS_diagnostics.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion ccpp/physics
Open in desktop
Submodule physics updated 2 files
+1 −1 physics/MP/Thompson/module_mp_thompson.F90
+0 −9 physics/smoke_dust/module_add_emiss_burn.F90
Loading