Skip to content

Commit

Permalink
Merge pull request #35 from climbfuji/fix_longname_conflicts
Browse files Browse the repository at this point in the history 
Fix longname conflicts after separation of GFS physics
  • Loading branch information
@climbfuji
climbfuji authored Jan 10, 2018
2 parents b32a12f + 0851e00 commit 4182c15
Show file tree
Hide file tree
Showing 33 changed files with 884 additions and 908 deletions.
107 changes: 55 additions & 52 deletions GFS_layer/GFS_physics_driver.F90
View file

Large diffs are not rendered by default.

84 changes: 43 additions & 41 deletions physics/GFS_DCNV_generic.f90
View file

Large diffs are not rendered by default.

60 changes: 30 additions & 30 deletions physics/GFS_MP_generic_post.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,39 +11,39 @@ module GFS_MP_generic_post

!> \defgroup GFS_MP_generic_post GFS MP generic post
!! @{
!!\section arg_table_GFS_MP_generic_post_init Argument Table
!! \section arg_table_GFS_MP_generic_post_init Argument Table
!!
subroutine GFS_MP_generic_post_init
end subroutine GFS_MP_generic_post_init


!!\section arg_table_GFS_MP_generic_post_run Argument Table
!!| local var name | longname |description | units | rank | type | kind | intent | optional |
!!|----------------|--------------------------------------------------------|----------------------------------------------------------------|-------------|------|---------|-----------|--------|----------|
!!| im | horizontal_loop_extent | horizontal loop extent, start at 1 | index | 0 | integer | | in | F |
!!| ix | horizontal_dimension | horizontal dimension | index | 0 | integer | | in | F |
!!| levs | vertical_dimension | vertical layer dimension | index | 0 | integer | | in | F |
!!| dtf | time_step_for_dynamics | dynamics time step | s | 0 | real | kind_phys | in | F |
!!| del | air_pressure_difference_between_midlayers | air pressure difference between midlayers | Pa | 2 | real | kind_phys | in | F |
!!| lssav | flag_diagnostics | logical flag for model physics diagnostics | flag | 0 | logical | | in | F |
!!| ldiag3d | flag_diagnostics_3D | logical flag for 3D diagnostics | flag | 0 | logical | | in | F |
!!| rain | total_rainfall_amount | instantaneous total precipitation at surface (APCP) | m | 1 | real | kind_phys | in | F |
!!| frain | factor_for_centered_difference_scheme | dtf/dtp; factor for centered difference scheme correction | 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) | none | 0 | integer | | in | F |
!!| cwm | cloud_condensed_water_specific_humidity | cloud condensed water specific humidity | 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 | water vapor specific humidity | kg kg-1 | 2 | real | kind_phys | in | F |
!!| initial_t | air_temperature_initial | air temperature before entering a physics scheme | K | 2 | real | kind_phys | in | F |
!!| initial_qv | water_vapor_specific_humidity_initial | water vapor specific humidity before entering a physics scheme | kg kg-1 | 2 | real | kind_phys | in | F |
!!| totprcp | precipitation_rate_at_surface | precipitation rate at surface | kg m-2 s-1 | 1 | real | kind_phys | inout | F |
!!| dt3dt6 | large_scale_condensate_heating_rate_at_model_layers | large scale condensate heating rate at model layers | K s-1 | 2 | real | kind_phys | inout | F |
!!| dq3dt4 | large_scale_condensate_moistening_rate_at_model_layers | large scale condensate moistening rate at model layers | kg kg-1 s-1 | 2 | real | kind_phys | inout | F |
!!| pwat | column_precipitable_water | column integrated precipitable water | kg m-2 | 1 | real | kind_phys | out | F |
!! \section arg_table_GFS_MP_generic_post_run Argument Table
!! | local var name | longname | description | units | rank | type | kind | intent | optional |
!! |----------------|------------------------------------------------------------|----------------------------------------------------------------|-------------|------|---------|-----------|--------|----------|
!! | im | horizontal_loop_extent | horizontal loop extent, start at 1 | index | 0 | integer | | in | F |
!! | ix | horizontal_dimension | horizontal dimension | index | 0 | integer | | in | F |
!! | levs | vertical_dimension | vertical layer dimension | index | 0 | integer | | in | F |
!! | dtf | time_step_for_dynamics | dynamics time step | s | 0 | real | kind_phys | in | F |
!! | del | air_pressure_difference_between_midlayers | air pressure difference between midlayers | Pa | 2 | real | kind_phys | in | F |
!! | lssav | flag_diagnostics | logical flag for model physics diagnostics | flag | 0 | logical | | in | F |
!! | ldiag3d | flag_diagnostics_3D | logical flag for 3D diagnostics | flag | 0 | logical | | in | F |
!! | rain | timestep_total_rainfall_amount | total precipitation at surface (APCP) | 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 |
!! | 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 |
!! | 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 |
!! | save_qv | water_vapor_specific_humidity_save | water vapor specific humidity before entering a physics scheme | kg kg-1 | 2 | real | kind_phys | in | F |
!! | totprcp | precipitation_rate_at_surface | precipitation rate at surface | kg m-2 s-1 | 1 | real | kind_phys | inout | F |
!! | dt3dt6 | large_scale_condensate_heating_rate_at_model_layers | large scale condensate heating rate at model layers | K s-1 | 2 | real | kind_phys | inout | F |
!! | dq3dt4 | large_scale_condensate_moistening_rate_at_model_layers | large scale condensate moistening rate at model layers | kg kg-1 s-1 | 2 | real | kind_phys | inout | F |
!! | pwat | column_precipitable_water | column integrated precipitable water | kg m-2 | 1 | real | kind_phys | out | F |
!!
subroutine GFS_MP_generic_post_run(im, ix, levs,dtf,del, &
lssav,ldiag3d,rain,frain,ntcw,ncld,cwm, & !input
t,q,initial_t, initial_qv, &
t,q,save_t, save_qv, &
totprcp, dt3dt6,dq3dt4,pwat ) ! output

!
Expand All @@ -61,8 +61,8 @@ subroutine GFS_MP_generic_post_run(im, ix, levs,dtf,del, &
real(kind=kind_phys),dimension(im) :: work1
real(kind=kind_phys),dimension(im), intent(in) :: rain
real(kind=kind_phys),dimension(ix,levs), intent(in) :: t,q, &
cwm, del, initial_t, &
initial_qv
cwm, del, save_t, &
save_qv
real(kind=kind_phys),dimension(im), intent(inout) :: totprcp
real(kind=kind_phys),dimension(im), intent(out) :: pwat
real(kind=kind_phys),dimension(ix,levs), intent(inout) :: &
Expand All @@ -80,8 +80,8 @@ subroutine GFS_MP_generic_post_run(im, ix, levs,dtf,del, &
do k = 1,levs
!CCPP dt3dt6(i,k) = dt3dt6(i,k) + (t(i,k)-dtdt(i,k)) * frain
!CCPP dq3dt4(i,k) = dq3dt4(i,k) + (q(i,k)-dqdt1(i,k)) * frain
dt3dt6(i,k) = dt3dt6(i,k) + (t(i,k)-initial_t(i,k)) * frain
dq3dt4(i,k) = dq3dt4(i,k) + (q(i,k)-initial_qv(i,k)) * frain
dt3dt6(i,k) = dt3dt6(i,k) + (t(i,k)-save_t(i,k)) * frain
dq3dt4(i,k) = dq3dt4(i,k) + (q(i,k)-save_qv(i,k)) * frain

enddo
enddo
Expand Down Expand Up @@ -112,7 +112,7 @@ subroutine GFS_MP_generic_post_run(im, ix, levs,dtf,del, &

end subroutine GFS_MP_generic_post_run

!!\setction arg_table_GFS_MP_generic_post_finalize Argument Table
!! \section arg_table_GFS_MP_generic_post_finalize Argument Table
!!
subroutine GFS_MP_generic_post_finalize
end subroutine GFS_MP_generic_post_finalize
Expand Down
Loading

0 comments on commit 4182c15

Please sign in to comment.