Skip to content

Commit 7918420

Browse files
climbfujiclimbfuji
authored
Merge pull request #90 from climbfuji/update_standard_names_add_cnvc90
(1) Add CCPP-compliant CNVC90 and (2) update standard names in metadata tables
2 parents 5e316e8 + 676b9ab commit 7918420

8 files changed

+20
-19
lines changed

‎GFS_layer/GFS_typedefs.F90

+10-10
Original file line numberDiff line numberDiff line change
@@ -197,15 +197,15 @@ module GFS_typedefs
197197
! prognostic state or tendencies after physical parameterizations
198198
!------------------------------------------------------------------
199199
!! \section arg_table_GFS_stateout_type
200-
!! | local_name | standard_name | long_name | units | rank | type | kind | intent | optional |
201-
!! |-------------------------------------------------|------------------------------------------------------------|------------------------------------------------------------|---------------|------|---------|-----------|--------|----------|
202-
!! | IPD_Data(nb)%Stateout%gu0 | x_wind_updated_by_physics | zonal wind updated by physics | m s-1 | 2 | real | kind_phys | none | F |
203-
!! | IPD_Data(nb)%Stateout%gv0 | y_wind_updated_by_physics | meridional wind updated by physics | m s-1 | 2 | real | kind_phys | none | F |
204-
!! | IPD_Data(nb)%Stateout%gt0 | air_temperature_updated_by_physics | temperature updated by physics | K | 2 | real | kind_phys | none | F |
205-
!! | IPD_Data(nb)%Stateout%gq0 | tracer_concentration_updated_by_physics | tracer concentration updated by physics | kg kg-1 | 3 | real | kind_phys | none | F |
206-
!! | 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 |
207-
!! | 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 |
208-
!! | 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 |
200+
!! | local_name | standard_name | long_name | units | rank | type | kind | intent | optional |
201+
!! |-------------------------------------------------|------------------------------------------------------------|----------------------------------------------------------------|---------------|------|---------|-----------|--------|----------|
202+
!! | IPD_Data(nb)%Stateout%gu0 | x_wind_updated_by_physics | zonal wind updated by physics | m s-1 | 2 | real | kind_phys | none | F |
203+
!! | IPD_Data(nb)%Stateout%gv0 | y_wind_updated_by_physics | meridional wind updated by physics | m s-1 | 2 | real | kind_phys | none | F |
204+
!! | IPD_Data(nb)%Stateout%gt0 | air_temperature_updated_by_physics | temperature updated by physics | K | 2 | real | kind_phys | none | F |
205+
!! | IPD_Data(nb)%Stateout%gq0 | tracer_concentration_updated_by_physics | tracer concentration updated by physics | kg kg-1 | 3 | real | kind_phys | none | F |
206+
!! | 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 |
207+
!! | 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 |
208+
!! | 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 |
209209
!!
210210
type GFS_stateout_type
211211

@@ -1247,7 +1247,7 @@ module GFS_typedefs
12471247
!! | IPD_Data(nb)%Intdiag%totgrp | | accumulated graupel precipitation | kg m-2 | 1 | real | kind_phys | none | F |
12481248
!! | IPD_Data(nb)%Intdiag%u10m | x_wind_at_10m | 10 meter u wind speed | m s-1 | 1 | real | kind_phys | none | F |
12491249
!! | IPD_Data(nb)%Intdiag%v10m | y_wind_at_10m | 10 meter v wind speed | m s-1 | 1 | real | kind_phys | none | F |
1250-
!! | IPD_Data(nb)%Intdiag%zlvl | height_above_mean_sea_level_at_lowest_model_layer | layer 1 height | m | 1 | real | kind_phys | none | F |
1250+
!! | IPD_Data(nb)%Intdiag%zlvl | height_above_ground_at_lowest_model_layer | layer 1 height | m | 1 | real | kind_phys | none | F |
12511251
!! | IPD_Data(nb)%Intdiag%psurf | | surface pressure | Pa | 1 | real | kind_phys | none | F |
12521252
!! | IPD_Data(nb)%Intdiag%hpbl | atmosphere_boundary_layer_thickness | pbl height | m | 1 | real | kind_phys | none | F |
12531253
!! | IPD_Data(nb)%Intdiag%pwat | column_precipitable_water | precipitable water | kg m-2 | 1 | real | kind_phys | none | F |

‎physics/GFS_MP_generic_post.f90

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ end subroutine GFS_MP_generic_post_init
3131
!! | frain | dynamics_to_physics_timestep_ratio | dtf/dtp, dynamics to physics timestep ratio | none | 0 | real | kind_phys | in | F |
3232
!! | ntcw | index_for_liquid_cloud_condensate | cloud condensate index in tracer array(3) | index | 0 | integer | | in | F |
3333
!! | ncld | number_of_hydrometeors | number_of_hydrometeors(1 for Z-C) | count | 0 | integer | | in | F |
34-
!! | cwm | cloud_condensed_water_specific_humidity_updated_by_physics | cloud condensed water specific humidity | kg kg-1 | 2 | real | kind_phys | in | F |
34+
!! | cwm | cloud_condensed_water_mixing_ratio_updated_by_physics | cloud condensed water mixing ratio | kg kg-1 | 2 | real | kind_phys | in | F |
3535
!! | t | air_temperature_updated_by_physics | layer mean air temperature | K | 2 | real | kind_phys | in | F |
3636
!! | q | water_vapor_specific_humidity_updated_by_physics | water vapor specific humidity | kg kg-1 | 2 | real | kind_phys | in | F |
3737
!! | save_t | air_temperature_save | air temperature before entering a physics scheme | K | 2 | real | kind_phys | in | F |

‎physics/GFS_zhao_carr_pre.f90

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ end subroutine GFS_zhao_carr_pre_init
1919
!! | im | horizontal_loop_extent | horizontal loop extent | count | 0 | integer | | in | F |
2020
!! | ix | horizontal_dimension | horizontal dimension | count | 0 | integer | | in | F |
2121
!! | levs | vertical_dimension | vertical layer dimension | count | 0 | integer | | in | F |
22-
!! | cwm | cloud_condensed_water_specific_humidity_updated_by_physics | cloud condensed water specific humidity | kg kg-1 | 2 | real | kind_phys | in | F |
22+
!! | cwm | cloud_condensed_water_mixing_ratio_updated_by_physics | cloud condensed water mixing ratio | kg kg-1 | 2 | real | kind_phys | in | F |
2323
!! | clw1 | cloud_ice_specific_humidity | cloud ice specific humidity | kg kg-1 | 2 | real | kind_phys | out | F |
2424
!! | errmsg | error_message | error message for error handling in CCPP | none | 0 | character | len=* | out | F |
2525
!! | errflg | error_flag | error flag for error handling in CCPP | flag | 0 | integer | | out | F |

‎physics/cnvc90.f

+4-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ module cnvc90
88
subroutine cnvc90_init()
99
end subroutine cnvc90_init
1010

11-
11+
#if 0
1212
!! \section arg_table_cnvc90_run Argument Table
1313
!! | local_name | standard_name | long_name | units | rank | type | kind | intent | optional |
1414
!! |----------------|-----------------------------------------------------------------------|---------------------------------------------------------|-------|------|-----------|-----------|--------|----------|
@@ -29,7 +29,8 @@ end subroutine cnvc90_init
2929
!! | errmsg | error_message | error message for error handling in CCPP | none | 0 | character | len=* | out | F |
3030
!! | errflg | error_flag | error flag for error handling in CCPP | flag | 0 | integer | | out | F |
3131
!!
32-
SUBROUTINE cnvc90_run(CLSTP,IM,IX,RN,KBOT,KTOP,KM,PRSI,
32+
#endif
33+
SUBROUTINE cnvc90_run(CLSTP,IM,IX,RN,KBOT,KTOP,KM,PRSI, &
3334
& ACV,ACVB,ACVT,CV,CVB,CVT,errmsg,errflg)
3435

3536
USE MACHINE, ONLY :kind_phys
@@ -99,7 +100,7 @@ SUBROUTINE cnvc90_run(CLSTP,IM,IX,RN,KBOT,KTOP,KM,PRSI,
99100
IF(ACV(I).GT.0.) THEN
100101
! CVB(I) = ACVB(I)
101102
! CVT(I) = ACVT(I)
102-
c.... convert cvt and cvb to pressures
103+
! convert cvt and cvb to pressures
103104
ITOP = NINT(ACVT(I))
104105
CVT(I) = PRSI(i,ITOP+1)
105106
IBOT = NINT(ACVB(I))

‎physics/gscond.f

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ end subroutine zhaocarr_gscond_finalize
3838
!! | q | water_vapor_specific_humidity_updated_by_physics | water vapor specific humidity | kg kg-1 | 2 | real | kind_phys | inout | F |
3939
!! | clw1 | cloud_ice_specific_humidity | cloud ice specific humidity | kg kg-1 | 2 | real | kind_phys | in | F |
4040
!! | clw2 | cloud_liquid_water_specific_humidity | cloud water specific humidity | kg kg-1 | 2 | real | kind_phys | in | F |
41-
!! | cwm | cloud_condensed_water_specific_humidity_updated_by_physics | cloud condensed water specific humidity | kg kg-1 | 2 | real | kind_phys | out | F |
41+
!! | cwm | cloud_condensed_water_mixing_ratio_updated_by_physics | cloud condensed water mixing ratio | kg kg-1 | 2 | real | kind_phys | out | F |
4242
!! | t | air_temperature_updated_by_physics | layer mean air temperature | K | 2 | real | kind_phys | inout | F |
4343
!! | tp | air_temperature_two_time_steps_back | air temperature two time steps back | K | 2 | real | kind_phys | inout | F |
4444
!! | 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 |

‎physics/precpd.f

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ end subroutine zhaocarr_precpd_init
2727
!! | del | air_pressure_difference_between_midlayers | pressure level thickness | Pa | 2 | real | kind_phys | in | F |
2828
!! | prsl | air_pressure | layer mean pressure | Pa | 2 | real | kind_phys | in | F |
2929
!! | q | water_vapor_specific_humidity_updated_by_physics | water vapor specific humidity | kg kg-1 | 2 | real | kind_phys | inout | F |
30-
!! | cwm | cloud_condensed_water_specific_humidity_updated_by_physics | cloud condensed water specific humidity | kg kg-1 | 2 | real | kind_phys | inout | F |
30+
!! | cwm | cloud_condensed_water_mixing_ratio_updated_by_physics | cloud condensed water mixing ratio | kg kg-1 | 2 | real | kind_phys | inout | F |
3131
!! | t | air_temperature_updated_by_physics | layer mean air temperature | K | 2 | real | kind_phys | inout | F |
3232
!! | rn | lwe_thickness_of_stratiform_precipitation_amount | stratiform rainfall amount on physics timestep | m | 1 | real | kind_phys | out | F |
3333
!! | sr | ratio_of_snowfall_to_rainfall | ratio of snowfall to large-scale rainfall | frac | 1 | real | kind_phys | out | F |

‎physics/sfc_diff.f

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ end subroutine sfc_ex_coef_finalize
2525
!! | v1 | y_wind_at_lowest_model_layer | y component of 1st model layer wind | m s-1 | 1 | real | kind_phys | in | F |
2626
!! | t1 | air_temperature_at_lowest_model_layer | 1st model layer air temperature | K | 1 | real | kind_phys | in | F |
2727
!! | q1 | specific_humidity_at_lowest_model_layer | 1st model layer specific humidity | kg kg-1 | 1 | real | kind_phys | in | F |
28-
!! | 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 |
28+
!! | z1 | height_above_ground_at_lowest_model_layer | height above ground at 1st model layer | m | 1 | real | kind_phys | in | F |
2929
!! | snwdph | surface_snow_thickness_water_equivalent | water equivalent surface snow thickness | mm | 1 | real | kind_phys | in | F |
3030
!! | tskin | surface_skin_temperature | surface skin temperature | K | 1 | real | kind_phys | in | F |
3131
!! | z0rl | surface_roughness_length | surface roughness length | cm | 1 | real | kind_phys | inout | F |

‎physics/sfc_drv.f

+1-1
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ end subroutine lsm_noah_finalize
278278
!! | ch | surface_drag_coefficient_for_heat_and_moisture_in_air | surface exchange coeff heat & moisture | none | 1 | real | kind_phys | in | F |
279279
!! | prsl1 | air_pressure_at_lowest_model_layer | Model layer 1 mean pressure | Pa | 1 | real | kind_phys | in | F |
280280
!! | 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 |
281-
!! | zf | height_above_mean_sea_level_at_lowest_model_layer | height above MSL at 1st model layer | m | 1 | real | kind_phys | in | F |
281+
!! | zf | height_above_ground_at_lowest_model_layer | height above ground at 1st model layer | m | 1 | real | kind_phys | in | F |
282282
!! | islimsk | sea_land_ice_mask | landmask: sea/land/ice=0/1/2 | flag | 1 | integer | | in | F |
283283
!! | ddvel | surface_wind_enhancement_due_to_convection | surface wind enhancement due to convection | m s-1 | 1 | real | kind_phys | in | F |
284284
!! | slopetyp | surface_slope_classification | class of sfc slope | index | 1 | integer | | in | F |

0 commit comments

Comments
 (0)