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

Fix incorrect units in dtend metadata #82

Merged
merged 2 commits into from
Apr 23, 2021
Merged

Fix incorrect units in dtend metadata #82

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7de499d
Fix incorrect units in dtend metadata
SamuelTrahanNOAA Apr 19, 2021
4750124
Make the tracer tendency units mandatory.
SamuelTrahanNOAA Apr 22, 2021
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
56 changes: 26 additions & 30 deletions ccpp/data/GFS_typedefs.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4421,7 +4421,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
do itrac=1,Model%ntrac
write(namestr,'("tracer",I0)') itrac
write(descstr,'("tracer ",I0," of ",I0)') itrac, Model%ntrac
call label_dtend_tracer(Model,100+itrac,trim(namestr),trim(descstr))
call label_dtend_tracer(Model,100+itrac,trim(namestr),trim(descstr),'kg kg-1 s-1')
enddo

if(Model%ntchs>0) then
Expand All @@ -4433,23 +4433,23 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
do ichem=Model%ntchs,Model%ntchs+Model%ntchm-1
write(namestr,'("chem",I0)') ichem
write(descstr,'("chemical tracer ",I0," of ",I0)') ichem, Model%ntchm
call label_dtend_tracer(Model,100+ichem,trim(namestr),trim(descstr))
call label_dtend_tracer(Model,100+ichem,trim(namestr),trim(descstr),'kg kg-1 s-1')
enddo
endif

! More specific chemical tracer names:
call label_dtend_tracer(Model,100+Model%ntchs,'so2','sulfur dioxide concentration')
if(Model%ntchm>0) then
! Need better descriptions of these.
call label_dtend_tracer(Model,100+Model%ntchm+Model%ntchs-1,'pp10','pp10 concentration')
call label_dtend_tracer(Model,100+Model%ntchm+Model%ntchs-1,'pp10','pp10 concentration','kg kg-1 s-1')

itrac=get_tracer_index(Model%tracer_names, 'DMS', Model%me, Model%master, Model%debug)
if(itrac>0) then
call label_dtend_tracer(Model,100+itrac,'DMS','DMS concentration')
call label_dtend_tracer(Model,100+itrac,'DMS','DMS concentration','kg kg-1 s-1')
endif
itrac=get_tracer_index(Model%tracer_names, 'msa', Model%me, Model%master, Model%debug)
if(itrac>0) then
call label_dtend_tracer(Model,100+itrac,'msa','msa concentration')
call label_dtend_tracer(Model,100+itrac,'msa','msa concentration','kg kg-1 s-1')
endif
endif
endif
Expand All @@ -4459,25 +4459,25 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
call label_dtend_tracer(Model,Model%index_of_y_wind,'v','y wind','m s-2')

! Other tracer names. These were taken from GFS_typedefs.F90 with descriptions from GFS_typedefs.meta
call label_dtend_tracer(Model,100+Model%ntqv,'qv','water vapor specific humidity')
call label_dtend_tracer(Model,100+Model%ntoz,'o3','ozone concentration')
call label_dtend_tracer(Model,100+Model%ntcw,'liq_wat','cloud condensate (or liquid water)')
call label_dtend_tracer(Model,100+Model%ntiw,'ice_wat','ice water')
call label_dtend_tracer(Model,100+Model%ntrw,'rainwat','rain water')
call label_dtend_tracer(Model,100+Model%ntsw,'snowwat','snow water')
call label_dtend_tracer(Model,100+Model%ntgl,'graupel','graupel')
call label_dtend_tracer(Model,100+Model%ntclamt,'cld_amt','cloud amount integer')
call label_dtend_tracer(Model,100+Model%ntlnc,'water_nc','liquid number concentration')
call label_dtend_tracer(Model,100+Model%ntinc,'ice_nc','ice number concentration')
call label_dtend_tracer(Model,100+Model%ntrnc,'rain_nc','rain number concentration')
call label_dtend_tracer(Model,100+Model%ntsnc,'snow_nc','snow number concentration')
call label_dtend_tracer(Model,100+Model%ntgnc,'graupel_nc','graupel number concentration')
call label_dtend_tracer(Model,100+Model%ntke,'sgs_tke','turbulent kinetic energy')
call label_dtend_tracer(Model,100+Model%nqrimef,'q_rimef','mass weighted rime factor')
call label_dtend_tracer(Model,100+Model%ntwa,'liq_aero','number concentration of water-friendly aerosols')
call label_dtend_tracer(Model,100+Model%ntia,'ice_aero','number concentration of ice-friendly aerosols')
call label_dtend_tracer(Model,100+Model%nto,'o_ion','oxygen ion concentration')
call label_dtend_tracer(Model,100+Model%nto2,'o2','oxygen concentration')
call label_dtend_tracer(Model,100+Model%ntqv,'qv','water vapor specific humidity','kg kg-1 s-1')
call label_dtend_tracer(Model,100+Model%ntoz,'o3','ozone concentration','kg kg-1 s-1')
call label_dtend_tracer(Model,100+Model%ntcw,'liq_wat','cloud condensate (or liquid water)','kg kg-1 s-1')
call label_dtend_tracer(Model,100+Model%ntiw,'ice_wat','ice water','kg kg-1 s-1')
call label_dtend_tracer(Model,100+Model%ntrw,'rainwat','rain water','kg kg-1 s-1')
call label_dtend_tracer(Model,100+Model%ntsw,'snowwat','snow water','kg kg-1 s-1')
call label_dtend_tracer(Model,100+Model%ntgl,'graupel','graupel','kg kg-1 s-1')
call label_dtend_tracer(Model,100+Model%ntclamt,'cld_amt','cloud amount integer','kg kg-1 s-1')
call label_dtend_tracer(Model,100+Model%ntlnc,'water_nc','liquid number concentration','kg-1 s-1')
call label_dtend_tracer(Model,100+Model%ntinc,'ice_nc','ice number concentration','kg-1 s-1')
call label_dtend_tracer(Model,100+Model%ntrnc,'rain_nc','rain number concentration','kg-1 s-1')
call label_dtend_tracer(Model,100+Model%ntsnc,'snow_nc','snow number concentration','kg-1 s-1')
call label_dtend_tracer(Model,100+Model%ntgnc,'graupel_nc','graupel number concentration','kg-1 s-1')
call label_dtend_tracer(Model,100+Model%ntke,'sgs_tke','turbulent kinetic energy','J s-1')
call label_dtend_tracer(Model,100+Model%nqrimef,'q_rimef','mass weighted rime factor','kg-1 s-1')
call label_dtend_tracer(Model,100+Model%ntwa,'liq_aero','number concentration of water-friendly aerosols','kg-1 s-1')
call label_dtend_tracer(Model,100+Model%ntia,'ice_aero','number concentration of ice-friendly aerosols','kg-1 s-1')
call label_dtend_tracer(Model,100+Model%nto,'o_ion','oxygen ion concentration','kg kg-1 s-1')
call label_dtend_tracer(Model,100+Model%nto2,'o2','oxygen concentration','kg kg-1 s-1')

call label_dtend_cause(Model,Model%index_of_process_pbl,'pbl','tendency due to PBL')
call label_dtend_cause(Model,Model%index_of_process_dcnv,'deepcnv','tendency due to deep convection')
Expand Down Expand Up @@ -6064,7 +6064,7 @@ subroutine label_dtend_tracer(Model,itrac,name,desc,unit)
type(GFS_control_type), intent(inout) :: Model
integer, intent(in) :: itrac
character(len=*), intent(in) :: name, desc
character(len=*), optional, intent(in) :: unit
character(len=*), intent(in) :: unit

if(itrac<2) then
! Special index 1 is for unallocated tracers
Expand All @@ -6073,11 +6073,7 @@ subroutine label_dtend_tracer(Model,itrac,name,desc,unit)

Model%dtend_var_labels(itrac)%name = name
Model%dtend_var_labels(itrac)%desc = desc
if(present(unit)) then
Model%dtend_var_labels(itrac)%unit=unit
else
Model%dtend_var_labels(itrac)%unit='kg kg-1 s-1'
endif
Model%dtend_var_labels(itrac)%unit = unit
end subroutine label_dtend_tracer

subroutine label_dtend_cause(Model,icause,name,desc,mod_name,time_avg)
Expand Down