diff --git a/cu_ntiedtke.F90 b/cu_ntiedtke.F90 index e1d266d..658bd65 100644 --- a/cu_ntiedtke.F90 +++ b/cu_ntiedtke.F90 @@ -75,8 +75,8 @@ module cu_ntiedtke !================================================================================================================= -!>\section arg_table_cu_ntiedtke_init -!!\html\include cu_ntiedtke_init.html +!> \section arg_table_cu_ntiedtke_init +!! \htmlinclude cu_ntiedtke_init.html !! subroutine cu_ntiedtke_init(con_cp,con_rd,con_rv,con_xlv,con_xls,con_xlf,con_grav,errmsg,errflg) !================================================================================================================= @@ -123,8 +123,8 @@ subroutine cu_ntiedtke_init(con_cp,con_rd,con_rv,con_xlv,con_xls,con_xlf,con_gra end subroutine cu_ntiedtke_init !================================================================================================================= -!>\section arg_table_cu_ntiedtke_finalize -!!\html\include cu_ntiedtke_finalize.html +!> \section arg_table_cu_ntiedtke_finalize +!! \htmlinclude cu_ntiedtke_finalize.html !! subroutine cu_ntiedtke_finalize(errmsg,errflg) !================================================================================================================= @@ -141,8 +141,8 @@ subroutine cu_ntiedtke_finalize(errmsg,errflg) end subroutine cu_ntiedtke_finalize !================================================================================================================= -!>\section arg_table_cu_ntiedtke_run -!!\html\include cu_ntiedtke_run.html +!> \section arg_table_cu_ntiedtke_run +!! \htmlinclude cu_ntiedtke_run.html !! ! level 1 subroutine 'cu_ntiedkte_run' subroutine cu_ntiedtke_run(pu,pv,pt,pqv,pqc,pqi,pqvf,ptf,poz,pzz,pomg, & @@ -187,7 +187,7 @@ subroutine cu_ntiedtke_run(pu,pv,pt,pqv,pqc,pqi,pqvf,ptf,poz,pzz,pomg, & !--- input arguments: integer,intent(in):: lq,km,km1 - integer,intent(in),dimension(:):: lndj + real,intent(in),dimension(:):: lndj !WL:2024 changed from integer to real, since the type of this variable diffs from the rest of the mesoscale_reference suite real(kind=kind_phys),intent(in):: dt real(kind=kind_phys),intent(in),dimension(:):: dx @@ -411,7 +411,7 @@ subroutine cumastrn & !--- input arguments: integer,intent(in):: klev,klon,klevp1,klevm1 - integer,intent(in),dimension(klon):: lndj + real,intent(in),dimension(klon):: lndj !WL:2024 changed from integer to real, since the type of this variable diffs from the rest of the mesoscale_reference suite real(kind=kind_phys),intent(in):: ztmst real(kind=kind_phys),intent(in),dimension(klon):: dx @@ -1271,7 +1271,7 @@ subroutine cutypen & !--- input arguments: integer,intent(in):: klon,klev,klevp1,klevm1 - integer,intent(in),dimension(klon):: lndj + real,intent(in),dimension(klon):: lndj !WL:2024 changed from integer to real, since the type of this variable diffs from the rest of the mesoscale_reference suite real(kind=kind_phys),intent(in),dimension(klon):: qfx,hfx real(kind=kind_phys),intent(in),dimension(klon,klev):: pap,pgeo @@ -1837,7 +1837,7 @@ subroutine cuascn & !--- input arguments: integer,intent(in):: klev,klon,klevp1,klevm1 - integer,intent(in),dimension(klon):: lndj + real,intent(in),dimension(klon):: lndj !WL:2024 changed from integer to real, since the type of this variable diffs from the rest of the mesoscale_reference suite integer,intent(in),dimension(klon):: klwmin integer,intent(in),dimension(klon):: kdpl @@ -2359,7 +2359,7 @@ subroutine cudlfsn & logical,intent(in),dimension(klon):: ldcum integer,intent(in):: klev - integer,intent(in),dimension(klon):: lndj + real,intent(in),dimension(klon):: lndj !WL:2024 changed from integer to real, since the type of this variable diffs from the rest of the mesoscale_reference suite integer,intent(in),dimension(klon):: kcbot,kctop real(kind=kind_phys),intent(in),dimension(klon):: pmfub @@ -2814,7 +2814,7 @@ subroutine cuflxn & logical,intent(in),dimension(klon):: ldcum integer,intent(in):: klev - integer,intent(in),dimension(klon):: lndj + real,intent(in),dimension(klon):: lndj !WL:2024 changed from integer to real, since the type of this variable diffs from the rest of the mesoscale_reference suite integer,intent(in),dimension(klon):: kcbot,kctop,kdtop real(kind=kind_phys),intent(in):: ztmst diff --git a/cu_ntiedtke.meta b/cu_ntiedtke.meta index 36cd414..d7f4543 100644 --- a/cu_ntiedtke.meta +++ b/cu_ntiedtke.meta @@ -1,18 +1,19 @@ -NOTES: -[pap] : mean layer hydrostatic pressure. -[paph]: hydrostatic air pressure at model layer interfaces. -[pqvf]: dynamic tendency plus PBL tendency. -[ptf] : dynamic tendency plus PBL tendency plus radiative tendencies. -[pqv] : water vapor mixing ratio and not specific humidity. - +#NOTES: +#[pap] : mean layer hydrostatic pressure. +#[paph]: hydrostatic air pressure at model layer interfaces. +#[pqvf]: dynamic tendency plus PBL tendency. +#[ptf] : dynamic tendency plus PBL tendency plus radiative tendencies. +#[pqv] : water vapor mixing ratio and not specific humidity. +# [ccpp-table-properties] name = cu_ntiedtke type = scheme - dependencies = ../ccpp_kind_types.F + dependencies = ../hooks/mmm_kinds.F90 + # dependencies = ../ccpp_kind_types.F90 ######################################################################## [ccpp-arg-table] - name = cu_ntietdke_init + name = cu_ntiedtke_init type = scheme [con_cp] standard_name = specific_heat_of_dry_air_at_constant_pressure @@ -21,55 +22,54 @@ NOTES: dimensions = () type = real | kind = kind_phys intent = in - optional = F [con_rd] - standard_name = gas_constant_dry_air - long_name = gas constant dry air + standard_name = gas_constant_of_dry_air + long_name = ideal gas constant for dry air units = J kg-1 K-1 dimensions = () - type = real | kind = kind_phys + type = real + kind = kind_phys intent = in - optional = F [con_rv] standard_name = gas_constant_water_vapor - long_name = gas constant water vapor - units = J kg-1 K-1 + long_name = ideal gas constant for water vapor + units = J kg-1 K-1 dimensions = () - type = real | kind = kind_phys + type = real + kind = kind_phys intent = in - optional = F [con_xlv] standard_name = latent_heat_of_vaporization_of_water_at_0C - long_name = latent heat of vaporization of water at 0C - units = J kg-1 + long_name = latent heat of evaporation/condensation + units = J kg-1 dimensions = () - type = real | kind = kind_phys + type = real + kind = kind_phys intent = in - optional = F [con_xls] - standard_name = latent_heat_of_sublimation_of_water_at_0C - long_name = latent heat of sublimation of water at 0C - units = J kg-1 + standard_name = latent_heat_of_sublimation_of_ice_snow_at_0C + long_name = latent heat of sublimation of snow/ice at 0C + units = J kg-1 dimensions = () - type = real | kind = kind_phys + type = real + kind = kind_phys intent = in - optional = F [con_xlf] standard_name = latent_heat_of_fusion_of_water_at_0C - long_name = latent heat of fusion of water at 0C + long_name = latent heat of fusion units = J kg-1 dimensions = () - type = real | kind = kind_phys + type = real + kind = kind_phys intent = in - optional = F [con_grav] standard_name = gravitational_acceleration long_name = gravitational acceleration units = m s-2 dimensions = () - type = real | kind = kind_phys + type = real + kind = kind_phys intent = in - optional = F [errmsg] standard_name = ccpp_error_message long_name = error message for error handling in CCPP @@ -78,7 +78,6 @@ NOTES: type = character kind = len=* intent = out - optional = F [errflg] standard_name = ccpp_error_code long_name = error code for error handling in CCPP @@ -86,11 +85,10 @@ NOTES: dimensions = () type = integer intent = out - optional = F ######################################################################## [ccpp-arg-table] - name = cu_ntietdke_finalize + name = cu_ntiedtke_finalize type = scheme [errmsg] standard_name = ccpp_error_message @@ -100,7 +98,6 @@ NOTES: type = character kind = len=* intent = out - optional = F [errflg] standard_name = ccpp_error_code long_name = error code for error handling in CCPP @@ -108,39 +105,35 @@ NOTES: dimensions = () type = integer intent = out - optional = F ######################################################################## [ccpp-arg-table] name = cu_ntiedtke_run type = scheme [pu] - standard_name = x_wind - long_name = x component of layer wind + standard_name = x_wind_of_new_state + long_name = updated x-direction wind units = m s-1 dimensions = (horizontal_loop_extent,vertical_layer_dimension) type = real kind = kind_phys intent = inout - optional = F [pv] - standard_name = y_wind - long_name = y component of layer wind + standard_name = y_wind_of_new_state + long_name = updated y-direction wind units = m s-1 dimensions = (horizontal_loop_extent,vertical_layer_dimension) type = real kind = kind_phys intent = inout - optional = F [pt] - standard_name = air_temperature - long_name = layer mean air temperature + standard_name = air_temperature_of_new_state + long_name = updated temperature units = K dimensions = (horizontal_loop_extent,vertical_layer_dimension) type = real kind = kind_phys intent = inout - optional = F [pqv] standard_name = water_vapor_mixing_ratio long_name = water vapor mixing ratio @@ -149,33 +142,32 @@ NOTES: type = real kind = kind_phys intent = inout - optional = F + optional = T [pqc] - standard_name = cloud_condensed_water_mixing_ratio - long_name = cloud condensed water mixing ratio + standard_name = cloud_condensed_water_mixing_ratio_convective_transport_tracer + long_name = ratio of mass of cloud water to mass of dry air plus vapor (without condensates) in the convectively transported tracer array units = kg kg-1 dimensions = (horizontal_loop_extent,vertical_layer_dimension) type = real kind = kind_phys intent = inout - optional = F [pqi] - standard_name = ice_water_mixing_ratio - long_name = ice water mixing ratio + standard_name = ice_water_mixing_ratio_convective_transport_tracer + long_name = ratio of mass of ice water to mass of dry air plus vapor (without condensates) in the convectively transported tracer array units = kg kg-1 dimensions = (horizontal_loop_extent,vertical_layer_dimension) type = real kind = kind_phys intent = inout - optional = F [pqvf] - standard_name = tendendy_of_water_vapor_mixing_ratio + standard_name = tendendy_of_water_vapor_mixing_ratio_due_to_nonphysics long_name = moisture tendency due to dynamics only units = kg kg-1 s-1 dimensions = (horizontal_loop_extent,vertical_layer_dimension) type = real kind = kind_phys intent = in + optional = T [ptf] standard_name = tendency_of_air_temperature_due_to_nonphysics long_name = temperature tendency due to dynamics only @@ -184,24 +176,24 @@ NOTES: type = real kind = kind_phys intent = in + optional = T [poz] - standard_name = geopotential - long_name = geopotential at model layer centers - units = m2 s-2 + standard_name = geopotential_height + long_name = geopotential height at model layer centers + units = m dimensions = (horizontal_loop_extent,vertical_layer_dimension) type = real - kind = kind_phys - intent = in - optional = F + intent = in + optional = T [pzz] - standard_name = geopotential_at_interface - long_name = geopotential at model layer interfaces - units = m2 s-2 + standard_name = geopotential_height_at_interface + long_name = geopotential height at model layer interfaces + units = m dimensions = (horizontal_loop_extent,vertical_interface_dimension) type = real - kind = kind_phys + kind = kind_phys intent = in - optional = F + optional = T [pomg] standard_name = lagrangian_tendency_of_air_pressure long_name = layer mean vertical velocity @@ -210,7 +202,6 @@ NOTES: type = real kind = kind_phys intent = in - optional = F [pap] standard_name = air_pressure long_name = mean layer pressure @@ -219,7 +210,6 @@ NOTES: type = real kind = kind_phys intent = in - optional = F [paph] standard_name = air_pressure_at_interface long_name = air pressure at model layer interfaces @@ -228,7 +218,6 @@ NOTES: type = real kind = kind_phys intent = in - optional = F [evap] standard_name = kinematic_surface_upward_latent_heat_flux long_name = kinematic surface upward latent heat flux @@ -237,7 +226,7 @@ NOTES: type = real kind = kind_phys intent = in - optional = F + optional = T [hfx] standard_name = kinematic_surface_upward_sensible_heat_flux long_name = kinematic surface upward sensible heat flux @@ -246,64 +235,61 @@ NOTES: type = real kind = kind_phys intent = in - optional = F + optional = T [zprecc] - standard_name = lwe_thickness_of_deep_convective_precipitation_amount - long_name = deep convective rainfall amount on physics timestep - units = m + standard_name = lwe_thickness_of_deep_convective_precipitation_amount_in_mm + long_name = deep convective rainfall amount on physics timestep in mm + units = mm dimensions = (horizontal_loop_extent) type = real kind = kind_phys intent = out [lndj] - standard_name = sea_land_ice_mask - long_name = landmask: sea/land=0/1 - units = none - dimensions = (horizontal_dimension) - type = integer + standard_name = sea_land_ice_mask_mmm + long_name = sea/land/ice mask mmm + units = flag + dimensions = (horizontal_loop_extent) + type = real + kind = kind_phys intent = in - optional = F + optional = T [lq] - standard_name = horizontal_dimension - long_name = size of horizontal dimension + standard_name = horizontal_loop_extent + long_name = horizontal loop extent units = count dimensions = () type = integer intent = in - optional = F [km] standard_name = vertical_layer_dimension - long_name = inumber of vertical layers + long_name = number of vertical levels units = count dimensions = () type = integer intent = in - optional = F [km1] standard_name = vertical_interface_dimension - long_name = number of vertical interfaces + long_name = number of vertical levels plus one units = count dimensions = () type = integer intent = in - optional = F [dt] standard_name = timestep_for_physics - long_name = time step for physics + long_name = physics timestep units = s dimensions = () type = real kind = kind_phys intent = in - optional = F [dx] - standard_name = grid_distance - long_name = grid distance - units = m - dimensions = () - type = real | kind = kind_phys + standard_name = characteristic_grid_lengthscale + long_name = relative dx for the grid cell + units = m + dimensions = (horizontal_loop_extent) + type = real + kind = kind_phys intent = in - optional = F [errmsg] standard_name = ccpp_error_message long_name = error message for error handling in CCPP @@ -312,7 +298,6 @@ NOTES: type = character kind = len=* intent = out - optional = F [errflg] standard_name = ccpp_error_code long_name = error code for error handling in CCPP @@ -320,7 +305,4 @@ NOTES: dimensions = () type = integer intent = out - optional = F - ######################################################################## -