Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/NCAR/gmtb-gfsphysics into…
Browse files Browse the repository at this point in the history 
… fix_longname_conflicts
  • Loading branch information
@DomHeinzeller
DomHeinzeller committed Jan 10, 2018
2 parents 4c220a6 + 4182c15 commit d2a2585
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion physics/GFS_DCNV_generic.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ end subroutine GFS_DCNV_generic_post_finalize
!! | 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 |
!! | frain | dynamics_to_physics_timestep_ratio | ratio of dynamics timestep to physics timestep | none | 0 | real | kind_phys | in | F |
!! | rain1 | rainfall_amount_on_physics_timestep | convective rainfall amount on physics timestep | m | 1 | real | kind_phys | in | F |
!! | rain1 | rainfall_amount_on_physics_timestep | convective rainfall amount on physics timestep | m | 1 | real | kind_phys | in | F |
!! | cld1d | cloud_work_function | cloud work function | m2 s-2 | 1 | real | kind_phys | in | F |
!! | save_u | x_wind_save | x-wind before entering a physics scheme | m s-1 | 2 | real | kind_phys | in | F |
!! | save_v | y_wind_save | y-wind before entering a physics scheme | m s-1 | 2 | real | kind_phys | in | F |
Expand Down
4 changes: 2 additions & 2 deletions physics/GFS_RRTMG_pre.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ end subroutine GFS_RRTMG_pre_init
!! | tsfg | surface_ground_temperature_for_radiation | surface ground temperature for radiation | K | 1 | real | kind_phys | out | F |
!! | tsfa | surface_air_temperature_for_radiation | lowest model layer air temperature for radiation | K | 1 | real | kind_phys | out | F |
!! | qlyr | water_vapor_specific_humidity_at_layer_for_radiation | water vapor specific humidity at vertical layer for radiation calculation | kg kg-1 | 2 | real | kind_phys | out | F |
!! | nday | daytime_points_dimension | daytime points dimension | index | 0 | integer | | out | F |
!! | idxday | daytime_points | daytime points | count | 1 | integer | | out | F |
!! | nday | daytime_points_dimension | daytime points dimension | count | 0 | integer | | out | F |
!! | idxday | daytime_points | daytime points | index | 1 | integer | | out | F |
!! | olyr | ozone_concentration_at_layer_for_radiation | ozone concentration | kg kg-1 | 2 | real | kind_phys | out | F |
!! | gasvmr_co2 | volume_mixing_ratio_co2 | CO2 volume mixing ratio | kg kg-1 | 2 | real | kind_phys | out | F |
!! | gasvmr_n2o | volume_mixing_ratio_n2o | N2O volume mixing ratio | kg kg-1 | 2 | real | kind_phys | out | F |
Expand Down
2 changes: 1 addition & 1 deletion physics/GFS_calpreciptype.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ end subroutine GFS_calpreciptype_init
!! | prsi | air_pressure_at_interface | pressure at layer interface | Pa | 2 | real | kind_phys | in | F |
!! | rainc | timestep_convective_rainfall_amount | convective rain | m | 1 | real | kind_phys | in | F |
!! | frain | dynamics_to_physics_timestep_ratio | dtf/dtp, dynamics to physics timestep ratio | none | 0 | real | kind_phys | in | F |
!! | rain1 | rainfall_amount_on_physics_timestep | convective rainfall amount on physics timestep | m | 1 | real | kind_phys | in | F |
!! | rain1 | rainfall_amount_on_physics_timestep | convective rainfall amount on physics timestep | m | 1 | real | kind_phys | in | F |
!! | phii | geopotential_at_interface | geopotential at model layer interfaces | m2 s-2 | 2 | real | kind_phys | in | F |
!! | n3dfercld | array_dimension_of_microphysics | number of 3D arrays needed for microphysics | count | 0 | integer | | in | F |
!! | tskin | surface_skin_temperature | surface skin temperature | K | 1 | real | kind_phys | in | F |
Expand Down
2 changes: 1 addition & 1 deletion physics/GFS_radsw_post.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ end subroutine GFS_radsw_post_init
!! | Radtend | FV3-GFS_Radtend_type | Fortran DDT containing FV3-GFS fields targetted for diagnostic output | DDT | 0 | GFS_radtend_type | | inout | F |
!! | Coupling | FV3-GFS_Coupling_type | Fortran DDT containing FV3-GFS fields to/from coupling with other components | DDT | 0 | GFS_coupling_type | | inout | F |
!! | ltp | extra_top_layer | extra top layers | none | 0 | integer | | in | F |
!! | nday | daytime_points_dimension | daytime points dimension | index | 0 | integer | | in | F |
!! | nday | daytime_points_dimension | daytime points dimension | count | 0 | integer | | in | F |
!! | lm | vertical_layer_dimension_for_radiation | number of vertical layers for radiation calculation | count | 0 | integer | | in | F |
!! | kd | vertical_index_difference_between_in-out_and_local | vertical index difference between in/out and local | index | 0 | integer | | in | F |
!! | htswc | tendency_of_air_temperature_due_to_shortwave_heating | total sky heating rate due to shortwave radiation | K s-1 | 2 | real | kind_phys | in | F |
Expand Down
4 changes: 2 additions & 2 deletions physics/radsw_main.f
View file
Original file line number Diff line number Diff line change
Expand Up @@ -607,8 +607,8 @@ end subroutine swrad_init
!! | sfcalb_uvis_dif | surface_albedo_due_to_UV_and_VIS_diffused | surface albedo due to UV+VIS diffused beam | frac | 1 | real | kind_phys | in | F |
!! | cosz | cosine_of_zenith_angle | cosine of the solar zenit angle | none | 1 | real | kind_phys | in | F |
!! | solcon | solar_constant | solar constant | W m-2 | 0 | real | kind_phys | in | F |
!! | nday | daytime_points_dimension | daytime points dimension | index | 0 | integer | | in | F |
!! | idxday | daytime_points | daytime points | count | 1 | integer | | in | F |
!! | nday | daytime_points_dimension | daytime points dimension | count | 0 | integer | | in | F |
!! | idxday | daytime_points | daytime points | index | 1 | integer | | in | F |
!! | npts | horizontal_loop_extent | horizontal dimension | index | 0 | integer | | in | F |
!! | nlay | adjusted_vertical_layer_dimension_for_radiation | number of vertical layers for radiation | count | 0 | integer | | in | F |
!! | nlp1 | adjusted_vertical_level_dimension_for_radiation | number of vertical levels for radiation | count | 0 | integer | | in | F |
Expand Down
4 changes: 2 additions & 2 deletions physics/sfc_diff.f
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@ end subroutine sfc_ex_coef_finalize
!!| sigmaf | vegetation_area_fraction | areal fractional cover of green vegetation | frac | 1 | real | kind_phys | in | F |
!!| vegtype | cell_vegetation_type | vegetation type at each grid cell | index | 1 | integer | | in | F |
!!| shdmax | maximum_vegetation_area_fraction | max fractnl cover of green veg | frac | 1 | real | kind_phys | in | F |
!!| ivegsrc | vegetation_type | vegetation type data source umd or igbp | index | 0 | integer | | in | F |
!!| ivegsrc | vegetation_type | vegetation type data source umd or igbp | index | 0 | integer | | in | F |
!!| tsurf | surface_skin_temperature_after_iteration | surface skin temperature after iteration | K | 1 | real | kind_phys | in | F |
!!| flag_iter | flag_for_iteration | flag for iteration | flag | 1 | logical | | in | F |
!!| redrag | flag_for_reduced_drag_coefficient_over_sea | flag for reduced drag coefficient over sea | flag | 1 | logical | | in | F |
!!| redrag | flag_for_reduced_drag_coefficient_over_sea | flag for reduced drag coefficient over sea | flag | 0 | logical | | in | F |
!!
!! \section general General Algorithm
!! \section detailed Detailed Algorithm
Expand Down
2 changes: 1 addition & 1 deletion physics/sfc_sice.f
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ end subroutine sfc_sice_finalize
!! | islimsk | sea_land_ice_mask | sea/land/ice mask (=0/1/2) | flag | 1 | integer | | in | F |
!! | ddvel | surface_wind_enhancement_due_to_convection | wind enhancement due to convection | m s-1 | 1 | real | kind_phys | in | F |
!! | flag_iter | flag_for_iteration | flag for iteration | flag | 1 | logical | | in | F |
!! | mom4ice | flag_for_mom4_coupling | flag for Mom4 coupling | flag | 1 | logical | | in | F |
!! | mom4ice | flag_for_mom4_coupling | flag for Mom4 coupling | flag | 0 | logical | | in | F |
!! | lsm | flag_for_land_surface_scheme | flag for land sfc scheme =0: osu; =1: noah | flag | 0 | integer | | in | F |
!! | lprnt | flag_print | switch for printing sample column to stdout | flag | 0 | logical | | in | F |
!! | ipr | horizontal_index_of_printed_column | horizontal index of printed column | index | 0 | integer | | in | F |
Expand Down

0 comments on commit d2a2585

Please sign in to comment.