Skip to content
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

Cleanup rainfall variables (and more) 08/22/2018 #150

Merged
merged 10 commits into from
Aug 23, 2018
Merged

Cleanup rainfall variables (and more) 08/22/2018 #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
52bae04
physics/gfdl_cloud_microphys.F90: remove logical is_initialized, _ini…
climbfuji Aug 22, 2018
b8f0815
physics/gfdl_fv_sat_adj.F90: remove logical is_initialized, _init sho…
climbfuji Aug 22, 2018
c7da052
physics/sfc_drv.f: remove logical is_initialized, _init should be cal…
climbfuji Aug 22, 2018
c793c76
Capitalize suffix f90->F90 of CCPP schemes to enable preprocessing
climbfuji Aug 22, 2018
2afa24d
physics/precpd.f: update standard name of rn
climbfuji Aug 23, 2018
3143b6d
Remove physics/gfdl_cloud_microphys_post.F90
climbfuji Aug 23, 2018
193b31c
physics/GFS_MP_generic_post.F90: update/correct metadata for explicit…
climbfuji Aug 23, 2018
6fa0067
physics/gfdl_cloud_microphys.F90: update metadata of explicit precipi…
climbfuji Aug 23, 2018
2b177ad
Merge branch 'GFS_MP_generic_pre_update' of https://github.com/grantf…
climbfuji Aug 23, 2018
7a40b1b
Merge branch 'master' of https://github.com/NCAR/ccpp-physics into cl…
climbfuji Aug 23, 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
2 changes: 1 addition & 1 deletion physics/GFS_DCNV_generic.f90 → physics/GFS_DCNV_generic.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
!> \file GFS_DCNV_generic.f90
!> \file GFS_DCNV_generic.F90
!! Contains code related to deep convective schemes to be used within the GFS physics suite.

module GFS_DCNV_generic_pre
Expand Down
44 changes: 30 additions & 14 deletions physics/GFS_MP_generic.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ end subroutine GFS_MP_generic_post_init
!! | dtf | time_step_for_dynamics | dynamics timestep | s | 0 | real | kind_phys | in | F |
!! | frain | dynamics_to_physics_timestep_ratio | ratio of dynamics timestep to physics timestep | none | 0 | real | kind_phys | in | F |
!! | rainc | lwe_thickness_of_convective_precipitation_amount_on_dynamics_timestep | convective rain at this time step | m | 1 | real | kind_phys | in | F |
!! | rain1 | lwe_thickness_of_stratiform_precipitation_amount | stratiform rainfall amount on physics timestep | m | 1 | real | kind_phys | in | F |
!! | rain1 | lwe_thickness_of_explicit_precipitation_amount | explicit rainfall amount on physics timestep | m | 1 | real | kind_phys | in | F |
!! | rann | random_number_array | random number array (0-1) | none | 2 | real | kind_phys | in | F |
!! | xlat | latitude | latitude | radians | 1 | real | kind_phys | in | F |
!! | xlon | longitude | longitude | radians | 1 | real | kind_phys | in | F |
Expand All @@ -122,14 +122,14 @@ end subroutine GFS_MP_generic_post_init
!! | prsi | air_pressure_at_interface | pressure at layer interface | Pa | 2 | real | kind_phys | in | F |
!! | phii | geopotential_at_interface | geopotential at model layer interfaces | m2 s-2 | 2 | real | kind_phys | in | F |
!! | tsfc | surface_skin_temperature | surface skin temperature | K | 1 | real | kind_phys | in | F |
!! | ice | lwe_thickness_of_ice_amount_on_dynamics_timestep | ice fall at this time step | m | 1 | real | kind_phys | in | F |
!! | snow | lwe_thickness_of_snow_amount_on_dynamics_timestep | snow fall at this time step | m | 1 | real | kind_phys | in | F |
!! | graupel | lwe_thickness_of_graupel_amount_on_dynamics_timestep | graupel fall at this time step | m | 1 | real | kind_phys | in | F |
!! | ice | lwe_thickness_of_ice_amount_on_dynamics_timestep | ice fall at this time step | m | 1 | real | kind_phys | inout | F |
!! | snow | lwe_thickness_of_snow_amount_on_dynamics_timestep | snow fall at this time step | m | 1 | real | kind_phys | inout | F |
!! | graupel | lwe_thickness_of_graupel_amount_on_dynamics_timestep | graupel fall at this time step | m | 1 | real | kind_phys | inout | 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 |
!! | ice0 | lwe_thickness_of_ice_amount_per_day | ice fall over 24h period | mm | 1 | real | kind_phys | in | F |
!! | snow0 | lwe_thickness_of_snow_amount_per_day | snow fall over 24h period | mm | 1 | real | kind_phys | in | F |
!! | graupel0 | lwe_thickness_of_graupel_amount_per_day | graupel fall over 24h period | mm | 1 | real | kind_phys | in | F |
!! | ice0 | lwe_thickness_of_ice_amount | ice fall on physics timestep | m | 1 | real | kind_phys | in | F |
!! | snow0 | lwe_thickness_of_snow_amount | snow fall on physics timestep | m | 1 | real | kind_phys | in | F |
!! | graupel0 | lwe_thickness_of_graupel_amount | graupel fall on physics timestep | m | 1 | real | kind_phys | in | F |
!! | del | air_pressure_difference_between_midlayers | air pressure difference between midlayers | Pa | 2 | real | kind_phys | in | F |
!! | rain | lwe_thickness_of_precipitation_amount_on_dynamics_timestep | total rain at this time step | m | 1 | real | kind_phys | inout | F |
!! | domr_diag | dominant_rain_type | dominant rain type | none | 1 | real | kind_phys | inout | F |
Expand Down Expand Up @@ -168,13 +168,14 @@ subroutine GFS_MP_generic_post_run(im, ix, levs, kdt, nrcm, ncld, nncl, ntcw, nt
integer, intent(in) :: im, ix, levs, kdt, nrcm, ncld, nncl, ntcw, ntrac, imp_physics, imp_physics_gfdl
logical, intent(in) :: cal_pre, lssav, ldiag3d, cplflx, cplchm

real(kind=kind_phys), intent(in) :: dtf, frain, con_g
real(kind=kind_phys), dimension(im), intent(in) :: rainc, rain1, xlat, xlon, tsfc, ice, snow, graupel, &
ice0, snow0, graupel0
real(kind=kind_phys), dimension(ix,nrcm), intent(in) :: rann
real(kind=kind_phys), dimension(im,levs), intent(in) :: gt0, gq0_water_vapor, prsl, save_t, save_qv, del
real(kind=kind_phys), dimension(im,levs+1), intent(in) :: prsi, phii
real(kind=kind_phys), dimension(im,levs,ntrac), intent(in) :: gq0
real(kind=kind_phys), intent(in) :: dtf, frain, con_g
real(kind=kind_phys), dimension(im), intent(in) :: rainc, rain1, xlat, xlon, tsfc
real(kind=kind_phys), dimension(im), intent(inout) :: ice, snow, graupel
real(kind=kind_phys), dimension(im), intent(in) :: ice0, snow0, graupel0
real(kind=kind_phys), dimension(ix,nrcm), intent(in) :: rann
real(kind=kind_phys), dimension(im,levs), intent(in) :: gt0, gq0_water_vapor, prsl, save_t, save_qv, del
real(kind=kind_phys), dimension(im,levs+1), intent(in) :: prsi, phii
real(kind=kind_phys), dimension(im,levs,ntrac), intent(in) :: gq0


real(kind=kind_phys), dimension(im), intent(inout) :: rain, domr_diag, domzr_diag, domip_diag, doms_diag, tprcp, &
Expand All @@ -200,6 +201,21 @@ subroutine GFS_MP_generic_post_run(im, ix, levs, kdt, nrcm, ncld, nncl, ntcw, nt
rain(i) = rainc(i) + frain * rain1(i)
enddo

! DH* TODO - Fix wrong code in non-CCPP build (GFS_physics_driver)
! and use commented lines here (keep wrong version for bit-for-bit):
! put ice, snow, graupel on dynamics timestep. The way the code in
! GFS_physics_driver is written, Diag%{graupel,ice,snow} are on the
! physics timestep, while Diag%{rain,rainc} and all totprecip etc
! are on the dynamics timestep. Totally confusing and wrong. *DH
if (imp_physics == imp_physics_gfdl) then
!graupel = frain*graupel0
!ice = frain*ice0
!snow = frain*snow0
graupel = graupel0
ice = ice0
snow = snow0
end if

if (cal_pre) then ! hchuang: add dominant precipitation type algorithm
!
call calpreciptype (kdt, nrcm, im, ix, levs, levs+1, &
Expand Down
2 changes: 1 addition & 1 deletion physics/GFS_PBL_generic.f90 → physics/GFS_PBL_generic.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
!> \file GFS_PBL_generic.f90
!> \file GFS_PBL_generic.F90
!! Contains code related to PBL schemes to be used within the GFS physics suite.

module GFS_PBL_generic_pre
Expand Down
2 changes: 1 addition & 1 deletion physics/GFS_SCNV_generic.f90 → physics/GFS_SCNV_generic.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
!> \file GFS_SCNV_generic.f90
!> \file GFS_SCNV_generic.F90
!! Contains code related to shallow convective schemes to be used within the GFS physics suite.

module GFS_SCNV_generic_pre
Expand Down
2 changes: 1 addition & 1 deletion physics/GFS_phys_time_vary.fv3.f90 → physics/GFS_phys_time_vary.fv3.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
!> \file GFS_phys_time_vary.f90
!> \file GFS_phys_time_vary.F90
!! Contains code related to GFS physics suite setup (physics part of time_vary_step)

module GFS_phys_time_vary
Expand Down
2 changes: 1 addition & 1 deletion physics/GFS_phys_time_vary.scm.f90 → physics/GFS_phys_time_vary.scm.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
!> \file GFS_phys_time_vary.f90
!> \file GFS_phys_time_vary.F90
!! Contains code related to GFS physics suite setup (physics part of time_vary_step)

module GFS_phys_time_vary
Expand Down
2 changes: 1 addition & 1 deletion physics/GFS_rad_time_vary.fv3.f90 → physics/GFS_rad_time_vary.fv3.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
!>\file GFS_rad_time_vary.f90
!>\file GFS_rad_time_vary.F90
!! Contains code related to GFS physics suite setup (radiation part of time_vary_step)
module GFS_rad_time_vary

Expand Down
2 changes: 1 addition & 1 deletion physics/GFS_rad_time_vary.scm.f90 → physics/GFS_rad_time_vary.scm.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
!>\file GFS_rad_time_vary.f90
!>\file GFS_rad_time_vary.F90
!! Contains code related to GFS physics suite setup (radiation part of time_vary_step)
module GFS_rad_time_vary

Expand Down
2 changes: 1 addition & 1 deletion physics/GFS_surface_generic.f90 → physics/GFS_surface_generic.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
!> \file GFS_surface_generic.f90
!> \file GFS_surface_generic.F90
!! Contains code related to all GFS surface schemes.

module GFS_surface_generic_pre
Expand Down
2 changes: 1 addition & 1 deletion physics/GFS_time_vary_pre.fv3.f90 → physics/GFS_time_vary_pre.fv3.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
!> \file GFS_time_vary_pre.f90
!> \file GFS_time_vary_pre.F90
!! Contains code related to GFS physics suite setup (generic part of time_vary_step)

module GFS_time_vary_pre
Expand Down
2 changes: 1 addition & 1 deletion physics/GFS_time_vary_pre.scm.f90 → physics/GFS_time_vary_pre.scm.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
!> \file GFS_time_vary_pre.f90
!> \file GFS_time_vary_pre.F90
!! Contains code related to GFS physics suite setup (generic part of time_vary_step)

module GFS_time_vary_pre
Expand Down
0 physics/get_prs_fv3.f90 → physics/get_prs_fv3.F90
View file
Open in desktop
File renamed without changes.
Loading