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

correct_unit branch #496

Merged
merged 4 commits into from
Oct 9, 2020
Merged

correct_unit branch #496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
28f96f9
initialize correct_unit branch
mzhangw Sep 10, 2020
b38a49a
unit fix
mzhangw Sep 14, 2020
862b464
unit fix
mzhangw Sep 16, 2020
423c6bd
revert some changes per Doms comments
mzhangw Oct 1, 2020
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
6 changes: 3 additions & 3 deletions physics/GFS_DCNV_generic.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@
[upd_mf]
standard_name = cumulative_atmosphere_updraft_convective_mass_flux
long_name = cumulative updraft mass flux
units = Pa
units = kg m-1 s-2
dimensions = (horizontal_dimension,vertical_dimension)
type = real
kind = kind_phys
Expand All @@ -454,7 +454,7 @@
[dwn_mf]
standard_name = cumulative_atmosphere_downdraft_convective_mass_flux
long_name = cumulative downdraft mass flux
units = Pa
units = kg m-1 s-2
dimensions = (horizontal_dimension,vertical_dimension)
type = real
kind = kind_phys
Expand All @@ -463,7 +463,7 @@
[det_mf]
standard_name = cumulative_atmosphere_detrainment_convective_mass_flux
long_name = cumulative detrainment mass flux
units = Pa
units = kg m-1 s-2
dimensions = (horizontal_dimension,vertical_dimension)
type = real
kind = kind_phys
Expand Down
5 changes: 1 addition & 4 deletions physics/GFS_rrtmg_pre.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ subroutine GFS_rrtmg_pre_run (Model, Grid, Sfcprop, Statein, & ! input
Tbd, Cldprop, Coupling, &
Radtend, & ! input/output
imfdeepcnv, imfdeepcnv_gf, &
f_ice, f_rain, f_rimef, flgmin, cwm, & ! F-A mp scheme only
flgmin, & ! F-A mp scheme only
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change is not associated with correcting units, nonetheless it is good to fix this (Dusan reported issues with those arrays not being allocated but having explicit dimensions).

lm, im, lmk, lmp, & ! input
kd, kt, kb, raddt, delp, dz, plvl, plyr, & ! output
tlvl, tlyr, tsfg, tsfa, qlyr, olyr, &
Expand Down Expand Up @@ -95,9 +95,6 @@ subroutine GFS_rrtmg_pre_run (Model, Grid, Sfcprop, Statein, & ! input
integer, intent(out) :: kd, kt, kb

! F-A mp scheme only
real(kind=kind_phys), dimension(size(Grid%xlon,1),lm+LTP), intent(in) :: f_ice, &
f_rain, f_rimef
real(kind=kind_phys), dimension(size(Grid%xlon,1),lm+LTP), intent(out) :: cwm
real(kind=kind_phys), dimension(size(Grid%xlon,1)), intent(in) :: flgmin
real(kind=kind_phys), intent(out) :: raddt

Expand Down
64 changes: 14 additions & 50 deletions physics/GFS_rrtmg_pre.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,33 +71,6 @@
type = GFS_radtend_type
intent = inout
optional = F
[f_ice]
standard_name = fraction_of_ice_water_cloud
long_name = fraction of ice water cloud
units = frac
dimensions = (horizontal_dimension,vertical_dimension)
type = real
kind = kind_phys
intent = in
optional = F
[f_rain]
standard_name = fraction_of_rain_water_cloud
long_name = fraction of rain water cloud
units = frac
dimensions = (horizontal_dimension,vertical_dimension)
type = real
kind = kind_phys
intent = in
optional = F
[f_rimef]
standard_name = rime_factor
long_name = rime factor
units = frac
dimensions = (horizontal_dimension,vertical_dimension)
type = real
kind = kind_phys
intent = in
optional = F
[flgmin]
standard_name = minimum_large_ice_fraction
long_name = minimum large ice fraction in F-A mp scheme
Expand All @@ -107,15 +80,6 @@
kind = kind_phys
intent = in
optional = F
[cwm]
standard_name = total_cloud_condensate_mixing_ratio_updated_by_physics
long_name = total cloud condensate mixing ratio (except water vapor) updated by physics
units = kg kg-1
dimensions = (horizontal_dimension,vertical_dimension)
type = real
kind = kind_phys
intent = out
optional = F
[lm]
standard_name = number_of_vertical_layers_for_radiation_calculations
long_name = number of vertical layers for radiation calculation
Expand Down Expand Up @@ -444,7 +408,7 @@
standard_name = total_cloud_fraction
long_name = layer total cloud fraction
units = frac
dimensions = (horizontal_dimension,vertical_dimension)
dimensions = (horizontal_dimension,adjusted_vertical_layer_dimension_for_radiation)
type = real
kind = kind_phys
intent = inout
Expand All @@ -453,16 +417,16 @@
standard_name = cloud_liquid_water_path
long_name = layer cloud liquid water path
units = g m-2
dimensions = (horizontal_dimension,vertical_dimension)
dimensions = (horizontal_dimension,adjusted_vertical_layer_dimension_for_radiation)
type = real
kind = kind_phys
intent = inout
optional = F
[clouds3]
standard_name = mean_effective_radius_for_liquid_cloud
long_name = mean effective radius for liquid cloud
units = micron
dimensions = (horizontal_dimension,vertical_dimension)
units = um
dimensions = (horizontal_dimension,adjusted_vertical_layer_dimension_for_radiation)
type = real
kind = kind_phys
intent = inout
Expand All @@ -471,16 +435,16 @@
standard_name = cloud_ice_water_path
long_name = layer cloud ice water path
units = g m-2
dimensions = (horizontal_dimension,vertical_dimension)
dimensions = (horizontal_dimension,adjusted_vertical_layer_dimension_for_radiation)
type = real
kind = kind_phys
intent = inout
optional = F
[clouds5]
standard_name = mean_effective_radius_for_ice_cloud
long_name = mean effective radius for ice cloud
units = micron
dimensions = (horizontal_dimension,vertical_dimension)
units = um
dimensions = (horizontal_dimension,adjusted_vertical_layer_dimension_for_radiation)
type = real
kind = kind_phys
intent = inout
Expand All @@ -489,16 +453,16 @@
standard_name = cloud_rain_water_path
long_name = cloud rain water path
units = g m-2
dimensions = (horizontal_dimension,vertical_dimension)
dimensions = (horizontal_dimension,adjusted_vertical_layer_dimension_for_radiation)
type = real
kind = kind_phys
intent = out
optional = F
[clouds7]
standard_name = mean_effective_radius_for_rain_drop
long_name = mean effective radius for rain drop
units = micron
dimensions = (horizontal_dimension,vertical_dimension)
units = um
dimensions = (horizontal_dimension,adjusted_vertical_layer_dimension_for_radiation)
type = real
kind = kind_phys
intent = out
Expand All @@ -507,16 +471,16 @@
standard_name = cloud_snow_water_path
long_name = cloud snow water path
units = g m-2
dimensions = (horizontal_dimension,vertical_dimension)
dimensions = (horizontal_dimension,adjusted_vertical_layer_dimension_for_radiation)
type = real
kind = kind_phys
intent = out
optional = F
[clouds9]
standard_name = mean_effective_radius_for_snow_flake
long_name = mean effective radius for snow flake
units = micron
dimensions = (horizontal_dimension,vertical_dimension)
units = um
dimensions = (horizontal_dimension,adjusted_vertical_layer_dimension_for_radiation)
type = real
kind = kind_phys
intent = out
Expand All @@ -534,7 +498,7 @@
standard_name = instantaneous_3d_cloud_fraction
long_name = instantaneous 3D cloud fraction for all MPs
units = frac
dimensions = (horizontal_dimension,vertical_dimension)
dimensions = (horizontal_dimension,adjusted_vertical_layer_dimension_for_radiation)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for fixing those wrong dimensions.

type = real
kind = kind_phys
intent = out
Expand Down
12 changes: 6 additions & 6 deletions physics/GFS_rrtmgp_gfdlmp_pre.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
[effr_in]
standard_name = flag_for_cloud_effective_radii
long_name = flag for cloud effective radii calculations in GFDL microphysics
units =
units = flag
dimensions = ()
type = logical
intent = in
Expand Down Expand Up @@ -275,7 +275,7 @@
[cld_reliq]
standard_name = mean_effective_radius_for_liquid_cloud
long_name = mean effective radius for liquid cloud
units = micron
units = um
dimensions = (horizontal_dimension,vertical_dimension)
type = real
kind = kind_phys
Expand All @@ -293,7 +293,7 @@
[cld_reice]
standard_name = mean_effective_radius_for_ice_cloud
long_name = mean effective radius for ice cloud
units = micron
units = um
dimensions = (horizontal_dimension,vertical_dimension)
type = real
kind = kind_phys
Expand All @@ -311,7 +311,7 @@
[cld_resnow]
standard_name = mean_effective_radius_for_snow_flake
long_name = mean effective radius for snow cloud
units = micron
units = um
dimensions = (horizontal_dimension,vertical_dimension)
type = real
kind = kind_phys
Expand All @@ -329,7 +329,7 @@
[cld_rerain]
standard_name = mean_effective_radius_for_rain_drop
long_name = mean effective radius for rain cloud
units = micron
units = um
dimensions = (horizontal_dimension,vertical_dimension)
type = real
kind = kind_phys
Expand Down Expand Up @@ -387,4 +387,4 @@
dimensions = ()
type = integer
intent = out
optional = F
optional = F
12 changes: 6 additions & 6 deletions physics/GFS_rrtmgp_zhaocarr_pre.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
[effr_in]
standard_name = flag_for_cloud_effective_radii
long_name = flag for cloud effective radii calculations in GFDL microphysics
units =
units = flag
dimensions = ()
type = logical
intent = in
Expand Down Expand Up @@ -305,7 +305,7 @@
[cld_reliq]
standard_name = mean_effective_radius_for_liquid_cloud
long_name = mean effective radius for liquid cloud
units = micron
units = um
dimensions = (horizontal_dimension,vertical_dimension)
type = real
kind = kind_phys
Expand All @@ -323,7 +323,7 @@
[cld_reice]
standard_name = mean_effective_radius_for_ice_cloud
long_name = mean effective radius for ice cloud
units = micron
units = um
dimensions = (horizontal_dimension,vertical_dimension)
type = real
kind = kind_phys
Expand All @@ -341,7 +341,7 @@
[cld_resnow]
standard_name = mean_effective_radius_for_snow_flake
long_name = mean effective radius for snow cloud
units = micron
units = um
dimensions = (horizontal_dimension,vertical_dimension)
type = real
kind = kind_phys
Expand All @@ -359,7 +359,7 @@
[cld_rerain]
standard_name = mean_effective_radius_for_rain_drop
long_name = mean effective radius for rain cloud
units = micron
units = um
dimensions = (horizontal_dimension,vertical_dimension)
type = real
kind = kind_phys
Expand Down Expand Up @@ -408,4 +408,4 @@
dimensions = ()
type = integer
intent = out
optional = F
optional = F
2 changes: 1 addition & 1 deletion physics/GFS_time_vary_pre.fv3.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@
[ipt]
standard_name = index_for_diagnostic_printout
long_name = horizontal index for point used for diagnostic printout
units =
units = index
dimensions = ()
type = integer
intent = out
Expand Down
2 changes: 1 addition & 1 deletion physics/gfdl_cloud_microphys.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@
[effr_in]
standard_name = flag_for_cloud_effective_radii
long_name = flag for cloud effective radii calculations in GFDL microphysics
units =
units = flag
dimensions = ()
type = logical
intent = in
Expand Down
14 changes: 7 additions & 7 deletions physics/m_micro.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -777,25 +777,25 @@
[aerfld_i]
standard_name = aerosol_number_concentration_from_gocart_aerosol_climatology
long_name = GOCART aerosol climatology number concentration
units = kg-1?
units = kg-1
dimensions = (horizontal_dimension,vertical_dimension,number_of_aerosol_tracers_MG)
type = real
kind = kind_phys
intent = in
optional = F
[naai_i]
standard_name = in_number_concentration
long_name = IN number concentration
units = kg-1?
standard_name = ice_nucleation_number
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@grantfirl @ligiabernardet has this change been coordinated with you?

long_name = ice nucleation number in MG MP
units = kg-1
dimensions = (horizontal_dimension,vertical_dimension)
type = real
kind = kind_phys
intent = in
optional = F
[npccn_i]
standard_name = ccn_number_concentration
long_name = CCN number concentration
units = kg-1?
standard_name = tendency_of_ccn_activated_number
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@grantfirl @ligiabernardet has this change been coordinated with you?

long_name = tendency of ccn activated number
units = kg-1 s-1
dimensions = (horizontal_dimension,vertical_dimension)
type = real
kind = kind_phys
Expand Down
4 changes: 2 additions & 2 deletions physics/module_SGSCloud_RadPre.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@
[clouds3]
standard_name = mean_effective_radius_for_liquid_cloud
long_name = mean effective radius for liquid cloud
units = micron
units = um
dimensions = (horizontal_dimension,vertical_dimension)
type = real
kind = kind_phys
Expand All @@ -229,7 +229,7 @@
[clouds5]
standard_name = mean_effective_radius_for_ice_cloud
long_name = mean effective radius for ice cloud
units = micron
units = um
dimensions = (horizontal_dimension,vertical_dimension)
type = real
kind = kind_phys
Expand Down
Loading