Skip to content

Commit

Permalink
Minor formatting corrections of metadata tables and insertion of warn…
Browse files Browse the repository at this point in the history 
…ings that certain parts of the code must be removed once the physics are integrated with the CCPP
  • Loading branch information
@DomHeinzeller
DomHeinzeller committed Jan 9, 2018
1 parent 991e21b commit 67129c6
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 16 deletions.
1 change: 1 addition & 0 deletions GFS_layer/GFS_physics_driver.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -614,6 +614,7 @@ subroutine GFS_physics_driver &
! allocate (cnvc(ix,levs), cnvw(ix,levs))
! endif

! DH* this entire routine can/must be removed once the full CCPP version is used - part of interstitial_create in GFS_typedefs.F90 *DH
call GFS_suite_interstitial_1_run (Model, Grid, tottracer, trc_shft, tracers, ntk, skip_macro, clw, cnvc, cnvw)
!
! --- set initial quantities for stochastic physics deltas
Expand Down
4 changes: 2 additions & 2 deletions physics/GFS_RRTMG_post.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ end subroutine GFS_RRTMG_post_init
!! | Coupling | FV3-GFS_Coupling_type | Fortran DDT containing FV3-GFS fields to/from coupling with other components | DDT | 0 | GFS_coupling_type | | inout | F |
!! | scmpsw | components_of_surface_downward_shortwave_fluxes | derived type for special components of surface downward shortwave fluxes | W m-2 | 1 | cmpfsw_type | | in | F |
!! | im | horizontal_loop_extent | horizontal loop extent, start at 1 | index | 0 | integer | | in | F |
!! | lm | vertical_layer_dimension_for_radiation | number of vertical layers for radiation calculation | count | 0 | integer | | in | F |
!! | lm | vertical_layer_dimension_for_radiation | number of vertical layers for radiation calculation | count | 0 | integer | | in | F |
!! | ltp | extra_top_layer | extra top layers | none | 0 | integer | | in | F |
!! | kt | vertical_index_difference_between_layer_and_upper_bound | vertical index difference between layer and upper bound | index | 0 | integer | | in | F |
!! | kb | vertical_index_difference_between_layer_and_lower_bound | vertical index difference between layer and lower bound | index | 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 |
!! | raddt | time_step_for_radiation | radiation time step | s | 0 | real | kind_phys | in | F |
!! | aerodp | atmosphere_optical_thickness_due_to_ambient_aerosol_particals | vertical integrated optical depth for various aerosol species | none | 2 | real | kind_phys | in | F |
!! | aerodp | atmosphere_optical_thickness_due_to_ambient_aerosol_particles | vertical integrated optical depth for various aerosol species | none | 2 | real | kind_phys | in | F |
!! | cldsa | cloud_area_fraction_for_radiation | fraction of clouds for low, middle, high, total and BL | frac | 2 | real | kind_phys | in | F |
!! | mtopa | model_layer_number_at_cloud_top | vertical indices for low, middle and high cloud tops | index | 2 | integer | | in | F |
!! | mbota | model_layer_number_at_cloud_base | vertical indices for low, middle and high cloud bases | index | 2 | integer | | in | F |
Expand Down
16 changes: 8 additions & 8 deletions physics/GFS_RRTMG_pre.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ end subroutine GFS_RRTMG_pre_init
!! | Tbd | FV3-GFS_Tbd_type | Fortran DDT containing FV3-GFS data not yet assigned to a defined container | DDT | 0 | GFS_tbd_type | | in | F |
!! | Cldprop | FV3-GFS_Cldprop_type | Fortran DDT containing FV3-GFS cloud fields needed by radiation from physics | DDT | 0 | GFS_cldprop_type | | in | F |
!! | Radtend | FV3-GFS_Radtend_type | Fortran DDT containing FV3-GFS radiation tendencies | DDT | 0 | GFS_radtend_type | | in | F |
!! | lm | vertical_layer_dimension_for_radiation | number of vertical layers for radiation calculation | count | 0 | integer | | out | F |
!! | im | horizontal_loop_extent | horizontal loop extent, start at 1 | index | 0 | integer | | out | F |
!! | lm | vertical_layer_dimension_for_radiation | number of vertical layers for radiation calculation | count | 0 | integer | | out | F |
!! | im | horizontal_loop_extent | horizontal loop extent, start at 1 | index | 0 | integer | | out | F |
!! | lmk | adjusted_vertical_layer_dimension_for_radiation | number of vertical layers for radiation | count | 0 | integer | | out | F |
!! | lmp | adjusted_vertical_level_dimension_for_radiation | number of vertical levels for radiation | count | 0 | integer | | out | F |
!! | kd | vertical_index_difference_between_in-out_and_local | vertical index difference between in/out and local | index | 0 | integer | | out | F |
Expand All @@ -36,16 +36,16 @@ end subroutine GFS_RRTMG_pre_init
!! | tlvl | air_temperature_at_interface_for_radiation | air temperature at vertical interface for radiation calculation | K | 2 | real | kind_phys | out | F |
!! | tlyr | air_temperature_at_layer_for_radiation | air temperature at vertical layer for radiation calculation | K | 2 | real | kind_phys | out | F |
!! | 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 |
!! | 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 |
!! | 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 |
!! | gasvmr_ch4 | volume_mixing_ratio_ch4 | CH4 volume mixing ratio | kg kg-1 | 2 | real | kind_phys | out | F |
!! | gasvmr_o2 | volume_mixing_ratio_o2 | O2 volume mixing ratio | kg kg-1 | 2 | real | kind_phys | out | F |
!! | gasvmr_co | volume_mixing_ratio_co | CO volume mixing ratio | kg kg-1 | 2 | real | kind_phys | out | F |
!! | gasvmr_co | volume_mixing_ratio_co | CO volume mixing ratio | kg kg-1 | 2 | real | kind_phys | out | F |
!! | gasvmr_cfc11 | volume_mixing_ratio_cfc11 | CFC11 volume mixing ratio | kg kg-1 | 2 | real | kind_phys | out | F |
!! | gasvmr_cfc12 | volume_mixing_ratio_cfc12 | CFC12 volume mixing ratio | kg kg-1 | 2 | real | kind_phys | out | F |
!! | gasvmr_cfc22 | volume_mixing_ratio_cfc22 | CFC22 volume mixing ratio | kg kg-1 | 2 | real | kind_phys | out | F |
Expand All @@ -57,18 +57,18 @@ end subroutine GFS_RRTMG_pre_init
!! | faerlw1 | aerosol_optical_depth_for_longwave_bands_01-16 | aerosol optical depth for longwave bands 01-16 | none | 3 | real | kind_phys | out | F |
!! | faerlw2 | aerosol_single_scattering_albedo_for_longwave_bands_01-16 | aerosol single scattering albedo for longwave bands 01-16 | frac | 3 | real | kind_phys | out | F |
!! | faerlw3 | aerosol_asymmetry_parameter_for_longwave_bands_01-16 | aerosol asymmetry parameter for longwave bands 01-16 | none | 3 | real | kind_phys | out | F |
!! | aerodp | atmosphere_optical_thickness_due_to_ambient_aerosol_particals | vertical integrated optical depth for various aerosol species | none | 2 | real | kind_phys | out | F |
!! | aerodp | atmosphere_optical_thickness_due_to_ambient_aerosol_particles | vertical integrated optical depth for various aerosol species | none | 2 | real | kind_phys | out | F |
!! | clouds1 | total_cloud_fraction | layer total cloud fraction | frac | 2 | real | kind_phys | out | F |
!! | clouds2 | cloud_liquid_water_path | layer cloud liquid water path | g m-2 | 2 | real | kind_phys | out | F |
!! | clouds3 | mean_effective_radius_for_liquid_cloud | mean effective radius for liquid cloud | micron | 2 | real | kind_phys | out | F |
!! | clouds4 | cloud_ice_water_path | layer cloud ice water path | g m-2 | 2 | real | kind_phys | out | F |
!! | clouds5 | mean_effective_radius_for_ice_cloud | mean effective radius for ice cloud | micron | 2 | real | kind_phys | out | F |
!! | clouds6 | cloud_rain_water_path | cloud rain water path | g m-2 | 2 | real | kind_phys | out | F |
!! | clouds7 | mean_effective_radius_for_rain_drop | mean effective radius for rain drop | micron | 2 | real | kind_phys | out | F |
!! | clouds8 | cloud_snow_water_path | cloud snow water path | g m-2 | 2 | real | kind_phys | out | F |
!! | clouds8 | cloud_snow_water_path | cloud snow water path | g m-2 | 2 | real | kind_phys | out | F |
!! | clouds9 | mean_effective_radius_for_snow_flake | mean effective radius for snow flake | micron | 2 | real | kind_phys | out | F |
!! | cldsa | cloud_area_fraction_for_radiation | fraction of clouds for low, middle,high, total and BL | frac | 2 | real | kind_phys | out | F |
!! | mtopa | model_layer_number_at_cloud_top | vertical indices for low, middle and high cloud tops | index | 2 | integer | | out | F |
!! | mtopa | model_layer_number_at_cloud_top | vertical indices for low, middle and high cloud tops | index | 2 | integer | | out | F |
!! | mbota | model_layer_number_at_cloud_base | vertical indices for low, middle and high cloud bases | index | 2 | integer | | out | F |
!!
subroutine GFS_RRTMG_pre_run (Model, Grid, Sfcprop, Statein, & ! input
Expand Down
11 changes: 10 additions & 1 deletion physics/GFS_suite_interstitial.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ end subroutine GFS_suite_interstitial_1_finalize
!! | Grid | FV3-GFS_Grid_type | Fortran DDT containing FV3-GFS grid and interpolation related data | DDT | 0 | GFS_grid_type | | in | F |
!! | tottracer | number_of_total_tracers | total number of tracers | count | 0 | integer | | out | F |
!! | trc_shft | start_index_of_other_tracers | beginning index of the non-water tracer species | index | 0 | integer | | out | F |
!! | tracers | number_of_water_tracers | number of water-related tracers | index | 0 | integer | | out | F |
!! | tracers | number_of_water_tracers | number of water-related tracers | count | 0 | integer | | out | F |
!! | ntk | index_of_TKE | index of TKE in the tracer array | index | 0 | integer | | out | F |
!! | skip_macro | flag_skip_macro | flag to skip cloud macrophysics in Morrison scheme | flag | 1 | logical | | out | F |
!! | clw | convective_transportable_tracers | array to contain cloud water and other convective trans. tracers | kg kg-1 | 3 | real | kind_phys | out | F |
Expand All @@ -36,6 +36,13 @@ subroutine GFS_suite_interstitial_1_run (Model, Grid, tottracer, trc_shft, trace
logical, dimension(size(Grid%xlon,1)), intent(out) :: skip_macro
real(kind=kind_phys), allocatable, intent(out) :: clw(:,:,:), cnvc(:,:), cnvw(:,:)

! DH*
! ATTENTION - tottracer, trc_shft, tracers and ntk will be calculated as part of Interstitial_type -> create
! and arrays clw (and potentially cnvc will be allocated there as well NEED TO REMOVE FROM HERE!!!
write(0,*) 'ATTENTION - THE ENTIRE CODE CONTAINED IN GFS_suite_interstitial_1_run'
write(0,*) 'must be skipped once the full CCPP-version is used (tracers are calculated'
write(0,*) 'and fields are allocated in GFS_typedefs.F90 ->interstitial_create)'

tottracer = 0 ! no convective transport of tracers
if (Model%trans_trac .or. Model%cscnv) then
if (Model%ntcw > 0) then
Expand Down Expand Up @@ -63,6 +70,8 @@ subroutine GFS_suite_interstitial_1_run (Model, Grid, tottracer, trc_shft, trace
allocate (cnvc(size(Grid%xlon,1),Model%levs), cnvw(size(Grid%xlon,1),Model%levs))
endif

! *DH

end subroutine GFS_suite_interstitial_1_run

end module
Expand Down
Loading

0 comments on commit 67129c6

Please sign in to comment.