Skip to content

Commit

Permalink
Merge pull request #91 from climbfuji/additional-variables-for-hrrr-p…
Browse files Browse the repository at this point in the history 
…hysics_and_update_standard_names

Additional variables for HRRR physics (RUC LSM), update of standard names
  • Loading branch information
@tanyasmirnova
tanyasmirnova authored Jun 4, 2018
2 parents 7918420 + 5238774 commit eaa050a
Show file tree
Hide file tree
Showing 11 changed files with 94 additions and 803 deletions.
803 changes: 47 additions & 756 deletions GFS_layer/GFS_typedefs.F90
View file

Large diffs are not rendered by default.

26 changes: 13 additions & 13 deletions physics/GFS_DCNV_generic.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,18 @@ subroutine GFS_DCNV_generic_pre_finalize()
end subroutine GFS_DCNV_generic_pre_finalize

!> \section arg_table_GFS_DCNV_generic_pre_run Argument Table
!! | local_name | standard_name | long_name | units | rank | type | kind | intent | optional |
!! |----------------|--------------------------------------------------------|--------------------------------------------------------------------------|---------------|------|-------------------|-----------|--------|----------|
!! | Model | FV3-GFS_Control_type | Fortran DDT containing FV3-GFS model control parameters | DDT | 0 | GFS_control_type | | in | F |
!! | Stateout | FV3-GFS_Stateout_type | Fortran DDT containing FV3-GFS prognostic state to return to dycore | DDT | 0 | GFS_stateout_type | | in | F |
!! | Grid | FV3-GFS_Grid_type | Fortran DDT containing FV3-GFS grid and interpolation related data | DDT | 0 | GFS_grid_type | | in | F |
!! | save_u | x_wind_save | x-wind before entering a physics scheme | m s-1 | 2 | real | kind_phys | inout | F |
!! | save_v | y_wind_save | y-wind before entering a physics scheme | m s-1 | 2 | real | kind_phys | inout | F |
!! | save_t | air_temperature_save | air temperature before entering a physics scheme | K | 2 | real | kind_phys | inout | F |
!! | save_qv | water_vapor_specific_humidity_save | water vapor specific humidity before entering a physics scheme | kg kg-1 | 2 | real | kind_phys | inout | F |
!! | save_qcw | cloud_condensed_water_specific_humidity_save | cloud condensed water specific humidity before entering a physics scheme | kg kg-1 | 2 | real | kind_phys | inout | F |
!! | errmsg | error_message | error message for error handling in CCPP | none | 0 | character | len=* | out | F |
!! | errflg | error_flag | error flag for error handling in CCPP | flag | 0 | integer | | out | F |
!! | local_name | standard_name | long_name | units | rank | type | kind | intent | optional |
!! |----------------|--------------------------------------------------------|---------------------------------------------------------------------------|---------------|------|-------------------|-----------|--------|----------|
!! | Model | FV3-GFS_Control_type | Fortran DDT containing FV3-GFS model control parameters | DDT | 0 | GFS_control_type | | in | F |
!! | Stateout | FV3-GFS_Stateout_type | Fortran DDT containing FV3-GFS prognostic state to return to dycore | DDT | 0 | GFS_stateout_type | | in | F |
!! | Grid | FV3-GFS_Grid_type | Fortran DDT containing FV3-GFS grid and interpolation related data | DDT | 0 | GFS_grid_type | | in | F |
!! | save_u | x_wind_save | x-wind before entering a physics scheme | m s-1 | 2 | real | kind_phys | inout | F |
!! | save_v | y_wind_save | y-wind before entering a physics scheme | m s-1 | 2 | real | kind_phys | inout | F |
!! | save_t | air_temperature_save | air temperature before entering a physics scheme | K | 2 | real | kind_phys | inout | F |
!! | save_qv | water_vapor_specific_humidity_save | water vapor specific humidity before entering a physics scheme | kg kg-1 | 2 | real | kind_phys | inout | F |
!! | save_qcw | cloud_condensed_water_mixing_ratio_save | moist cloud condensed water mixing ratio before entering a physics scheme | kg kg-1 | 2 | real | kind_phys | inout | F |
!! | errmsg | error_message | error message for error handling in CCPP | none | 0 | character | len=* | out | F |
!! | errflg | error_flag | error flag for error handling in CCPP | flag | 0 | integer | | out | F |
!!
subroutine GFS_DCNV_generic_pre_run (Model, Stateout, Grid, save_u, save_v, save_t, save_qv, save_qcw, errmsg, errflg)

Expand Down Expand Up @@ -90,7 +90,7 @@ end subroutine GFS_DCNV_generic_post_finalize
!! | ud_mf | instantaneous_atmosphere_updraft_convective_mass_flux | (updraft mass flux) * delt | kg m-2 | 2 | real | kind_phys | in | F |
!! | dd_mf | instantaneous_atmosphere_downdraft_convective_mass_flux | (downdraft mass flux) * delt | kg m-2 | 2 | real | kind_phys | in | F |
!! | dt_mf | instantaneous_atmosphere_detrainment_convective_mass_flux | (detrainment mass flux) * delt | kg m-2 | 2 | real | kind_phys | in | F |
!! | cnvw | convective_cloud_water_specific_humidity | convective cloud water specific humidity | kg kg-1 | 2 | real | kind_phys | in | F |
!! | cnvw | convective_cloud_water_mixing_ratio | moist convective cloud water mixing ratio | kg kg-1 | 2 | real | kind_phys | in | F |
!! | cnvc | convective_cloud_cover | convective cloud cover | frac | 2 | real | kind_phys | in | F |
!! | Diag | FV3-GFS_Diag_type | Fortran DDT containing FV3-GFS fields targeted for diagnostic output | DDT | 0 | GFS_diag_type | | inout | F |
!! | Tbd | FV3-GFS_Tbd_type | Fortran DDT containing FV3-GFS miscellaneous data | DDT | 0 | GFS_tbd_type | | inout | F |
Expand Down
2 changes: 1 addition & 1 deletion physics/GFS_MP_generic_post.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ end subroutine GFS_MP_generic_post_init
!! | frain | dynamics_to_physics_timestep_ratio | dtf/dtp, dynamics to physics timestep ratio | none | 0 | real | kind_phys | in | F |
!! | ntcw | index_for_liquid_cloud_condensate | cloud condensate index in tracer array(3) | index | 0 | integer | | in | F |
!! | ncld | number_of_hydrometeors | number_of_hydrometeors(1 for Z-C) | count | 0 | integer | | in | F |
!! | cwm | cloud_condensed_water_mixing_ratio_updated_by_physics | cloud condensed water mixing ratio | kg kg-1 | 2 | real | kind_phys | in | F |
!! | cwm | cloud_condensed_water_mixing_ratio_updated_by_physics | moist cloud condensed water mixing ratio | kg kg-1 | 2 | real | kind_phys | in | F |
!! | t | air_temperature_updated_by_physics | layer mean air temperature | K | 2 | real | kind_phys | in | F |
!! | q | water_vapor_specific_humidity_updated_by_physics | water vapor specific humidity | kg kg-1 | 2 | real | kind_phys | in | F |
!! | save_t | air_temperature_save | air temperature before entering a physics scheme | K | 2 | real | kind_phys | in | F |
Expand Down
36 changes: 18 additions & 18 deletions physics/GFS_MP_generic_pre.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,24 +14,24 @@ end subroutine GFS_MP_generic_pre_init


!> \section arg_table_GFS_MP_generic_pre_run Argument Table
!! | local_name | standard_name | long_name | units | rank | type | kind | intent | optional |
!! |----------------|--------------------------------------------------------|--------------------------------------------------------------------------|-------------|------|-----------|-----------|--------|----------|
!! | im | horizontal_loop_extent | horizontal loop extent | count | 0 | integer | | in | F |
!! | ix | horizontal_dimension | horizontal dimension | count | 0 | integer | | in | F |
!! | levs | vertical_dimension | vertical layer dimension | count | 0 | integer | | in | F |
!! | clw1 | cloud_ice_specific_humidity | cloud ice specific humidity | kg kg-1 | 2 | real | kind_phys | in | F |
!! | clw2 | cloud_liquid_water_specific_humidity | cloud water specific humidity | kg kg-1 | 2 | real | kind_phys | in | F |
!! | ldiag3d | flag_diagnostics_3D | logical flag for 3D diagnostics | flag | 0 | logical | | in | F |
!! | ntcw | index_for_liquid_cloud_condensate | cloud condensate index in tracer array(3) | index | 0 | integer | | in | F |
!! | ncld | number_of_hydrometeors | number of hydrometeors(1 for Z-C) | count | 0 | integer | | in | F |
!! | num_p3d | array_dimension_of_microphysics | number of 3D arrays needed for microphysics | count | 0 | integer | | in | F |
!! | t | air_temperature_updated_by_physics | layer mean air temperature | K | 2 | real | kind_phys | in | F |
!! | q | water_vapor_specific_humidity_updated_by_physics | water vapor specific humidity | kg kg-1 | 2 | real | kind_phys | in | F |
!! | save_t | air_temperature_save | air temperature before entering a physics scheme | K | 2 | real | kind_phys | out | F |
!! | save_qv | water_vapor_specific_humidity_save | water vapor specific humidity before entering a physics scheme | kg kg-1 | 2 | real | kind_phys | out | F |
!! | save_qcw | cloud_condensed_water_specific_humidity_save | cloud condensed water specific humidity before entering a physics scheme | kg kg-1 | 2 | real | kind_phys | out | F |
!! | errmsg | error_message | error message for error handling in CCPP | none | 0 | character | len=* | out | F |
!! | errflg | error_flag | error flag for error handling in CCPP | flag | 0 | integer | | out | F |
!! | local_name | standard_name | long_name | units | rank | type | kind | intent | optional |
!! |----------------|--------------------------------------------------------|---------------------------------------------------------------------------|-------------|------|-----------|-----------|--------|----------|
!! | im | horizontal_loop_extent | horizontal loop extent | count | 0 | integer | | in | F |
!! | ix | horizontal_dimension | horizontal dimension | count | 0 | integer | | in | F |
!! | levs | vertical_dimension | vertical layer dimension | count | 0 | integer | | in | F |
!! | clw1 | cloud_ice_mixing_ratio | moist cloud ice mixing ratio | kg kg-1 | 2 | real | kind_phys | in | F |
!! | clw2 | cloud_liquid_water_mixing_ratio | moist cloud water mixing ratio | kg kg-1 | 2 | real | kind_phys | in | F |
!! | ldiag3d | flag_diagnostics_3D | logical flag for 3D diagnostics | flag | 0 | logical | | in | F |
!! | ntcw | index_for_liquid_cloud_condensate | cloud condensate index in tracer array(3) | index | 0 | integer | | in | F |
!! | ncld | number_of_hydrometeors | number of hydrometeors(1 for Z-C) | count | 0 | integer | | in | F |
!! | num_p3d | array_dimension_of_microphysics | number of 3D arrays needed for microphysics | count | 0 | integer | | in | F |
!! | t | air_temperature_updated_by_physics | layer mean air temperature | K | 2 | real | kind_phys | in | F |
!! | q | water_vapor_specific_humidity_updated_by_physics | water vapor specific humidity | kg kg-1 | 2 | real | kind_phys | in | F |
!! | save_t | air_temperature_save | air temperature before entering a physics scheme | K | 2 | real | kind_phys | out | F |
!! | save_qv | water_vapor_specific_humidity_save | water vapor specific humidity before entering a physics scheme | kg kg-1 | 2 | real | kind_phys | out | F |
!! | save_qcw | cloud_condensed_water_mixing_ratio_save | moist cloud condensed water mixing ratio before entering a physics scheme | kg kg-1 | 2 | real | kind_phys | out | F |
!! | errmsg | error_message | error message for error handling in CCPP | none | 0 | character | len=* | out | F |
!! | errflg | error_flag | error flag for error handling in CCPP | flag | 0 | integer | | out | F |
!!
subroutine GFS_MP_generic_pre_run(im, ix, levs, clw1, clw2, &
ldiag3d, ntcw, ncld, num_p3d, t, q, &
Expand Down
2 changes: 1 addition & 1 deletion physics/GFS_suite_interstitial.ccpp.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ end subroutine GFS_suite_interstitial_3_finalize
!! | work2 | grid_size_related_coefficient_used_in_scale-sensitive_schemes_complement | complement to work1 | none | 1 | real | kind_phys | in | F |
!! | clw | convective_transportable_tracers | array to contain cloud water and other convective trans. tracers | kg kg-1 | 3 | real | kind_phys | inout | F |
!! | cnvc | convective_cloud_cover | convective cloud cover | frac | 2 | real | kind_phys | inout | F |
!! | cnvw | convective_cloud_water_specific_humidity | convective cloud water specific humidity | kg kg-1 | 2 | real | kind_phys | inout | F |
!! | cnvw | convective_cloud_water_mixing_ratio | moist convective cloud water mixing ratio | kg kg-1 | 2 | real | kind_phys | inout | F |
!! | ktop | vertical_index_at_cloud_top | vertical index at cloud top | index | 1 | integer | | inout | F |
!! | kbot | vertical_index_at_cloud_base | vertical index at cloud base | index | 1 | integer | | inout | F |
!! | rhc | critical_relative_humidity | critical relative humidity | frac | 2 | real | kind_phys | out | F |
Expand Down
Loading

0 comments on commit eaa050a

Please sign in to comment.