diff --git a/GFS_layer/GFS_typedefs.F90 b/GFS_layer/GFS_typedefs.F90 index a4372427c..759d02404 100644 --- a/GFS_layer/GFS_typedefs.F90 +++ b/GFS_layer/GFS_typedefs.F90 @@ -197,15 +197,15 @@ module GFS_typedefs ! prognostic state or tendencies after physical parameterizations !------------------------------------------------------------------ !! \section arg_table_GFS_stateout_type -!! | local_name | standard_name | long_name | units | rank | type | kind | intent | optional | -!! |-------------------------------------------------|------------------------------------------------------------|------------------------------------------------------------|---------------|------|---------|-----------|--------|----------| -!! | IPD_Data(nb)%Stateout%gu0 | x_wind_updated_by_physics | zonal wind updated by physics | m s-1 | 2 | real | kind_phys | none | F | -!! | IPD_Data(nb)%Stateout%gv0 | y_wind_updated_by_physics | meridional wind updated by physics | m s-1 | 2 | real | kind_phys | none | F | -!! | IPD_Data(nb)%Stateout%gt0 | air_temperature_updated_by_physics | temperature updated by physics | K | 2 | real | kind_phys | none | F | -!! | IPD_Data(nb)%Stateout%gq0 | tracer_concentration_updated_by_physics | tracer concentration updated by physics | kg kg-1 | 3 | real | kind_phys | none | F | -!! | IPD_Data(nb)%Stateout%gq0(:,:,1) | water_vapor_specific_humidity_updated_by_physics | water vapor specific humidity updated by physics | kg kg-1 | 2 | real | kind_phys | none | F | -!! | IPD_Data(nb)%Stateout%gq0(:,:,IPD_Control%ntcw) | cloud_condensed_water_specific_humidity_updated_by_physics | cloud condensed water specific humidity updated by physics | kg kg-1 | 2 | real | kind_phys | none | F | -!! | IPD_Data(nb)%Stateout%gq0(:,:,IPD_Control%ntoz) | ozone_concentration_updated_by_physics | ozone concentration updated by physics | kg kg-1 | 2 | real | kind_phys | none | F | +!! | local_name | standard_name | long_name | units | rank | type | kind | intent | optional | +!! |-------------------------------------------------|------------------------------------------------------------|----------------------------------------------------------------|---------------|------|---------|-----------|--------|----------| +!! | IPD_Data(nb)%Stateout%gu0 | x_wind_updated_by_physics | zonal wind updated by physics | m s-1 | 2 | real | kind_phys | none | F | +!! | IPD_Data(nb)%Stateout%gv0 | y_wind_updated_by_physics | meridional wind updated by physics | m s-1 | 2 | real | kind_phys | none | F | +!! | IPD_Data(nb)%Stateout%gt0 | air_temperature_updated_by_physics | temperature updated by physics | K | 2 | real | kind_phys | none | F | +!! | IPD_Data(nb)%Stateout%gq0 | tracer_concentration_updated_by_physics | tracer concentration updated by physics | kg kg-1 | 3 | real | kind_phys | none | F | +!! | IPD_Data(nb)%Stateout%gq0(:,:,1) | water_vapor_specific_humidity_updated_by_physics | water vapor specific humidity updated by physics | kg kg-1 | 2 | real | kind_phys | none | F | +!! | IPD_Data(nb)%Stateout%gq0(:,:,IPD_Control%ntcw) | cloud_condensed_water_mixing_ratio_updated_by_physics | moist mixing ratio of cloud condensed water updated by physics | kg kg-1 | 2 | real | kind_phys | none | F | +!! | IPD_Data(nb)%Stateout%gq0(:,:,IPD_Control%ntoz) | ozone_concentration_updated_by_physics | ozone concentration updated by physics | kg kg-1 | 2 | real | kind_phys | none | F | !! type GFS_stateout_type @@ -1243,7 +1243,7 @@ module GFS_typedefs !! | IPD_Data(nb)%Intdiag%totgrp | | accumulated graupel precipitation | kg m-2 | 1 | real | kind_phys | none | F | !! | IPD_Data(nb)%Intdiag%u10m | x_wind_at_10m | 10 meter u wind speed | m s-1 | 1 | real | kind_phys | none | F | !! | IPD_Data(nb)%Intdiag%v10m | y_wind_at_10m | 10 meter v wind speed | m s-1 | 1 | real | kind_phys | none | F | -!! | IPD_Data(nb)%Intdiag%zlvl | height_above_mean_sea_level_at_lowest_model_layer | layer 1 height | m | 1 | real | kind_phys | none | F | +!! | IPD_Data(nb)%Intdiag%zlvl | height_above_ground_at_lowest_model_layer | layer 1 height | m | 1 | real | kind_phys | none | F | !! | IPD_Data(nb)%Intdiag%psurf | | surface pressure | Pa | 1 | real | kind_phys | none | F | !! | IPD_Data(nb)%Intdiag%hpbl | atmosphere_boundary_layer_thickness | pbl height | m | 1 | real | kind_phys | none | F | !! | IPD_Data(nb)%Intdiag%pwat | column_precipitable_water | precipitable water | kg m-2 | 1 | real | kind_phys | none | F | diff --git a/physics/GFS_MP_generic_post.f90 b/physics/GFS_MP_generic_post.f90 index f6bccad88..10dfc9c11 100644 --- a/physics/GFS_MP_generic_post.f90 +++ b/physics/GFS_MP_generic_post.f90 @@ -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_specific_humidity_updated_by_physics | cloud condensed water specific humidity | kg kg-1 | 2 | real | kind_phys | 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 | !! | 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 | diff --git a/physics/GFS_zhao_carr_pre.f90 b/physics/GFS_zhao_carr_pre.f90 index c3dbd7af1..c8ab9a51b 100644 --- a/physics/GFS_zhao_carr_pre.f90 +++ b/physics/GFS_zhao_carr_pre.f90 @@ -19,7 +19,7 @@ end subroutine GFS_zhao_carr_pre_init !! | 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 | -!! | cwm | cloud_condensed_water_specific_humidity_updated_by_physics | cloud condensed water specific humidity | kg kg-1 | 2 | real | kind_phys | 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 | !! | clw1 | cloud_ice_specific_humidity | cloud ice specific humidity | 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 | diff --git a/physics/cnvc90.f b/physics/cnvc90.f index 8719ff43b..8fe5084de 100644 --- a/physics/cnvc90.f +++ b/physics/cnvc90.f @@ -8,7 +8,7 @@ module cnvc90 subroutine cnvc90_init() end subroutine cnvc90_init - +#if 0 !! \section arg_table_cnvc90_run Argument Table !! | local_name | standard_name | long_name | units | rank | type | kind | intent | optional | !! |----------------|-----------------------------------------------------------------------|---------------------------------------------------------|-------|------|-----------|-----------|--------|----------| @@ -29,7 +29,8 @@ end subroutine cnvc90_init !! | 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 cnvc90_run(CLSTP,IM,IX,RN,KBOT,KTOP,KM,PRSI, +#endif + SUBROUTINE cnvc90_run(CLSTP,IM,IX,RN,KBOT,KTOP,KM,PRSI, & & ACV,ACVB,ACVT,CV,CVB,CVT,errmsg,errflg) USE MACHINE, ONLY :kind_phys @@ -99,7 +100,7 @@ SUBROUTINE cnvc90_run(CLSTP,IM,IX,RN,KBOT,KTOP,KM,PRSI, IF(ACV(I).GT.0.) THEN ! CVB(I) = ACVB(I) ! CVT(I) = ACVT(I) -c.... convert cvt and cvb to pressures +! convert cvt and cvb to pressures ITOP = NINT(ACVT(I)) CVT(I) = PRSI(i,ITOP+1) IBOT = NINT(ACVB(I)) diff --git a/physics/gscond.f b/physics/gscond.f index 460d7e9e8..5f80aec64 100644 --- a/physics/gscond.f +++ b/physics/gscond.f @@ -38,7 +38,7 @@ end subroutine zhaocarr_gscond_finalize !! | q | water_vapor_specific_humidity_updated_by_physics | water vapor specific humidity | kg kg-1 | 2 | real | kind_phys | inout | 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 | -!! | cwm | cloud_condensed_water_specific_humidity_updated_by_physics | cloud condensed water specific humidity | kg kg-1 | 2 | real | kind_phys | out | F | +!! | cwm | cloud_condensed_water_mixing_ratio_updated_by_physics | cloud condensed water mixing ratio | kg kg-1 | 2 | real | kind_phys | out | F | !! | t | air_temperature_updated_by_physics | layer mean air temperature | K | 2 | real | kind_phys | inout | F | !! | tp | air_temperature_two_time_steps_back | air temperature two time steps back | K | 2 | real | kind_phys | inout | F | !! | qp | water_vapor_specific_humidity_two_time_steps_back | water vapor specific humidity two time steps back | kg kg-1 | 2 | real | kind_phys | inout | F | diff --git a/physics/precpd.f b/physics/precpd.f index 33609a6f8..aa7acb625 100644 --- a/physics/precpd.f +++ b/physics/precpd.f @@ -27,7 +27,7 @@ end subroutine zhaocarr_precpd_init !! | del | air_pressure_difference_between_midlayers | pressure level thickness | Pa | 2 | real | kind_phys | in | F | !! | prsl | air_pressure | layer mean pressure | Pa | 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 | inout | F | -!! | cwm | cloud_condensed_water_specific_humidity_updated_by_physics | cloud condensed water specific humidity | kg kg-1 | 2 | real | kind_phys | inout | F | +!! | cwm | cloud_condensed_water_mixing_ratio_updated_by_physics | cloud condensed water mixing ratio | kg kg-1 | 2 | real | kind_phys | inout | F | !! | t | air_temperature_updated_by_physics | layer mean air temperature | K | 2 | real | kind_phys | inout | F | !! | rn | lwe_thickness_of_stratiform_precipitation_amount | stratiform rainfall amount on physics timestep | m | 1 | real | kind_phys | out | F | !! | sr | ratio_of_snowfall_to_rainfall | ratio of snowfall to large-scale rainfall | frac | 1 | real | kind_phys | out | F | diff --git a/physics/sfc_diff.f b/physics/sfc_diff.f index 91654a8cb..0a93c0a61 100644 --- a/physics/sfc_diff.f +++ b/physics/sfc_diff.f @@ -25,7 +25,7 @@ end subroutine sfc_ex_coef_finalize !! | v1 | y_wind_at_lowest_model_layer | y component of 1st model layer wind | m s-1 | 1 | real | kind_phys | in | F | !! | t1 | air_temperature_at_lowest_model_layer | 1st model layer air temperature | K | 1 | real | kind_phys | in | F | !! | q1 | specific_humidity_at_lowest_model_layer | 1st model layer specific humidity | kg kg-1 | 1 | real | kind_phys | in | F | -!! | z1 | height_above_mean_sea_level_at_lowest_model_layer | height above mean sea level at 1st model layer | m | 1 | real | kind_phys | in | F | +!! | z1 | height_above_ground_at_lowest_model_layer | height above ground at 1st model layer | m | 1 | real | kind_phys | in | F | !! | snwdph | surface_snow_thickness_water_equivalent | water equivalent surface snow thickness | mm | 1 | real | kind_phys | in | F | !! | tskin | surface_skin_temperature | surface skin temperature | K | 1 | real | kind_phys | in | F | !! | z0rl | surface_roughness_length | surface roughness length | cm | 1 | real | kind_phys | inout | F | diff --git a/physics/sfc_drv.f b/physics/sfc_drv.f index c3d523c46..603ab1aa2 100644 --- a/physics/sfc_drv.f +++ b/physics/sfc_drv.f @@ -278,7 +278,7 @@ end subroutine lsm_noah_finalize !! | ch | surface_drag_coefficient_for_heat_and_moisture_in_air | surface exchange coeff heat & moisture | none | 1 | real | kind_phys | in | F | !! | prsl1 | air_pressure_at_lowest_model_layer | Model layer 1 mean pressure | Pa | 1 | real | kind_phys | in | F | !! | prslki | ratio_of_exner_function_between_midlayer_and_interface_at_lowest_model_layer | Exner function ratio bt midlayer and interface at 1st layer | ratio | 1 | real | kind_phys | in | F | -!! | zf | height_above_mean_sea_level_at_lowest_model_layer | height above MSL at 1st model layer | m | 1 | real | kind_phys | in | F | +!! | zf | height_above_ground_at_lowest_model_layer | height above ground at 1st model layer | m | 1 | real | kind_phys | in | F | !! | islimsk | sea_land_ice_mask | landmask: sea/land/ice=0/1/2 | flag | 1 | integer | | in | F | !! | ddvel | surface_wind_enhancement_due_to_convection | surface wind enhancement due to convection | m s-1 | 1 | real | kind_phys | in | F | !! | slopetyp | surface_slope_classification | class of sfc slope | index | 1 | integer | | in | F |