Skip to content

Fix longname conflicts #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
climbfuji merged 7 commits into from
Jan 10, 2018
Merged

Fix longname conflicts #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3df6b0b
Removed local variables slsoil, smsoil and stsoil from physics driver…
DomHeinzeller Dec 28, 2017
0ee3e63
Fixing longname conflicts part 1
DomHeinzeller Dec 28, 2017
f483cd7
Fixed metadata table entries and calling arguments for sfc_sice_run
DomHeinzeller Dec 28, 2017
9d742a4
Fixed metadata table entries and calling arguments for Stateout varia…
DomHeinzeller Dec 28, 2017
56c4d1a
Fixing longname conflicts part 2, and renaming newly introduced varia…
DomHeinzeller Jan 3, 2018
d197652
Adjusting units and types in metadata tables in dcyc2.f and ozphys.f
DomHeinzeller Jan 3, 2018
0851e00
Fixing malformatted metadata tables, correcting units and rank inform…
DomHeinzeller Jan 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
107 changes: 55 additions & 52 deletions GFS_layer/GFS_physics_driver.F90
View file
Open in desktop

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

60 changes: 30 additions & 30 deletions physics/GFS_MP_generic_post.f90
View file
Open in desktop
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