Skip to content

Commit

Permalink
Merge pull request #38 from climbfuji/fix_longname_conflicts_20180110_2
Browse files Browse the repository at this point in the history 
Fix longname conflicts 20180110/2
  • Loading branch information
@climbfuji
climbfuji committed Jan 10, 2018
2 parents a78d371 + 43797ec commit 4d9094b
Show file tree
Hide file tree
Showing 39 changed files with 86 additions and 87 deletions.
29 changes: 14 additions & 15 deletions GFS_layer/GFS_physics_driver.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,7 @@ subroutine GFS_physics_driver &
! --- local variables

!--- INTEGER VARIABLES
integer :: lprint, ipr, nvdiff
integer :: ipr, nvdiff
integer :: i, kk, ic, k, n, k1, iter, levshcm, tracers, &
trc_shft, tottracer, num2, num3, nshocm, nshoc, ntk

Expand Down Expand Up @@ -558,12 +558,15 @@ subroutine GFS_physics_driver &
!
!===> ... begin here

! DH* these two need to go into some interstitial scheme
! DH* UPDATE - in the final CCPP version, these are part of the
! create_interstitital routine in GFS_typedefs.F90. Hence, the
! following two lines of code have to go
nvdiff = Model%ntrac ! vertical diffusion of all tracers!
ipr = min(size(Grid%xlon,1),10)
! *DH

! DH* this as well
! DH* these lines get executed operationally, but are only used
! in the Morrison microphysics scheme - we can ignore them
do i = 1, size(Grid%xlon,1)
if(nint(Sfcprop%slmsk(i)) == 1) then
frland(i) = 1.0
Expand Down Expand Up @@ -1450,7 +1453,7 @@ subroutine GFS_physics_driver &
! write(7000,*)' vgrs=',vgrs(ipr,:)
! write(7000,*)' dvdt*dtp ',dvdt(ipr,:)*Model%dtp
! endif
! if(Model%lprnt) write(1000+Model%me,*)' gq0w=',gq0(ipr,:,ntcw)
! if(Model%lprnt) write(1000+Model%me,*)' gq0w=',gq0(ipr,:,Model%ntcw)
! if(Model%lprnt) write(0,*)' gq0i=',gq0(ipr,:,ntiw)

if (Model%lsidea) then ! idea convective adjustment
Expand Down Expand Up @@ -1524,7 +1527,7 @@ subroutine GFS_physics_driver &
! write(0,*) ' gt0=',(gt0(ipr,k),k=1,Model%levs),' kdt=',Model%kdt
! write(0,*)' gq0=',(gq0(ipr,k,1),k=1,Model%levs),' lat=',lat
! write(0,*)' gq0i2=',(gq0(ipr,k,ntiw),k=1,Model%levs),' lat=',lat
! write(0,*)' gq1=',(gq0(ipr,k,ntcw),k=1,Model%levs)
! write(0,*)' gq1=',(gq0(ipr,k,Model%ntcw),k=1,Model%levs)
! print *,' vvel=',vvel
! endif
! if (Model%lprnt) write(7000,*)' bef convection gu0=',gu0(ipr,:)
Expand Down Expand Up @@ -1656,7 +1659,7 @@ subroutine GFS_physics_driver &
!
! dqdt(1:size(Grid%xlon,1),:,1) = gq0(1:size(Grid%xlon,1),:,1)
! dqdt(1:size(Grid%xlon,1),:,2) = gq0(1:size(Grid%xlon,1),:,ntiw)
! dqdt(1:size(Grid%xlon,1),:,3) = gq0(1:size(Grid%xlon,1),:,ntcw)
! dqdt(1:size(Grid%xlon,1),:,3) = gq0(1:size(Grid%xlon,1),:,Model%ntcw)
!GFDL lat has no meaning inside of shoc - changed to "1"
!GFDL call shoc(size(Grid%xlon,1), size(Grid%xlon,1), 1, Model%levs, Model%levs+1, Model%dtp, Model%me, lat,
call shoc (size(Grid%xlon,1), size(Grid%xlon,1), 1, Model%levs, Model%levs+1, Model%dtp, Model%me, 1, Statein%prsl(1,1), &
Expand Down Expand Up @@ -1891,7 +1894,7 @@ subroutine GFS_physics_driver &
! write(0,*)' aftcnvgt0=',gt0(ipr,:),' kdt=',Model%kdt,' lat=',lat
! write(0,*)' aftcnvgq0=',(gq0(ipr,k,1),k=1,Model%levs),' lat=',lat
! write(0,*)' gq0i2=',(gq0(ipr,k,ntiw),k=1,Model%levs),' lat=',lat
! write(0,*)' aftcnvgq1=',(gq0(ipr,k,ntcw),k=1,Model%levs)
! write(0,*)' aftcnvgq1=',(gq0(ipr,k,Model%ntcw),k=1,Model%levs)
! endif
!
! do i = 1, size(Grid%xlon,1)
Expand Down Expand Up @@ -2255,10 +2258,10 @@ subroutine GFS_physics_driver &
! if (clw(1,1,2) < -999.0) then ! if clw is not partitioned to ice and water
! do k=1,Model%levs
! do i=1,size(Grid%xlon,1)
! tem = gq0(i,k,ntcw) &
! tem = gq0(i,k,Model%ntcw) &
! & * max(0.0, MIN(1.0, (TCR-gt0(i,k))*TCRF))
! clw(i,k,1) = tem ! ice
! clw(i,k,2) = gq0(i,k,ntcw) - tem ! water
! clw(i,k,2) = gq0(i,k,Model%ntcw) - tem ! water
! enddo
! enddo
! endif ! Anning ncld ==2
Expand Down Expand Up @@ -2565,7 +2568,7 @@ subroutine GFS_physics_driver &
! if (Model%lprnt) write(0,*) ' aftlsgq0=',gq0(ipr,:,1),' kdt=',Model%kdt
! if (Model%lprnt) write(0,*)' clw1aft=',gq0(ipr,:,ntiw),' kdt=',Model%kdt
! if (Model%lprnt) write(0,*)' cloudsm=',phy_f3d(ipr,:,1)*100,' kdt=',Model%kdt
! if (Model%lprnt) write(0,*)' clw2aft=',gq0(ipr,:,ntcw),' kdt=',Model%kdt
! if (Model%lprnt) write(0,*)' clw2aft=',gq0(ipr,:,Model%ntcw),' kdt=',Model%kdt

if (Model%fprcp == 1) then
Stateout%gq0(:,:,Model%ntrw) = qrn(:,:)
Expand Down Expand Up @@ -2622,17 +2625,13 @@ subroutine GFS_physics_driver &
Diag%rain, domr, domzr, domip, doms, Sfcprop%srflag, & ! output
Sfcprop%tprcp)

! DH* inside GFS_MP_generic_post_run Diag%dq3dt(:,:,6) is called dq3dt4
! also, the original GFS_physics_driver had interstitial code around line 2599
! Diag%dq3dt(:,:,4) = Diag%dq3dt(:,:,4) + (Stateout%gq0(:,:,1)-dqdt(:,:,1)) * frain
! --> I think Diag%dq3dt(:,:,6) should be Diag%dq3dt(:,:,4) here *DH
call GFS_MP_generic_post_run (size(Grid%xlon,1), size(Grid%xlon,1), Model%levs, Model%dtf, del, &
Model%lssav, Model%ldiag3d, Diag%rain,frain, &
Model%ntcw, Model%ncld, &
Stateout%gq0(:,:,Model%ntcw), &
Stateout%gt0, Stateout%gq0(:,:,1), &
save_t, save_qv, Diag%totprcp, Diag%dt3dt(:,:,6),&
Diag%dq3dt(:,:,6), Diag%pwat)
Diag%dq3dt(:,:,4), Diag%pwat)

! if (Model%cal_pre) then ! hchuang: add dominant precipitation type algorithm
! i = min(3,Model%num_p3d)
Expand Down
4 changes: 2 additions & 2 deletions physics/GFS_MP_generic_post.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ 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 |
!! | im | horizontal_loop_extent | horizontal loop extent | count | 0 | integer | | in | F |
!! | ix | horizontal_dimension | horizontal dimension | count | 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 |
Expand Down
4 changes: 2 additions & 2 deletions physics/GFS_MP_generic_pre.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ end subroutine GFS_MP_generic_pre_init
!> \section arg_table_GFS_MP_generic_pre_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 |
!! | im | horizontal_loop_extent | horizontal loop extent | count | 0 | integer | | in | F |
!! | ix | horizontal_dimension | horizontal dimension | count | 0 | integer | | in | F |
!! | levs | vertical_dimension | vertical layer dimension | index | 0 | integer | | in | F |
!! | clw1 | cloud_ice_specific_humidity | cloud ice specific humidity | kg kg-1 | 2 | real | kind_phys | in | F |
!! | clw2 | cloud_liquid_water_specific_humidity | cloud water specific humidity | kg kg-1 | 2 | real | kind_phys | in | F |
Expand Down
2 changes: 1 addition & 1 deletion physics/GFS_PBL_generic.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ end subroutine GFS_PBL_generic_pre_finalize
!> \section arg_table_GFS_PBL_generic_pre_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 |
!! | im | horizontal_loop_extent | horizontal loop extent | count | 0 | integer | | in | F |
!! | levs | vertical_dimension | vertical layer dimension | index | 0 | integer | | in | F |
!! | kinver | index_of_highest_temperature_inversion | index of highest temperature inversion | index | 1 | integer | | in | F |
!!
Expand Down
2 changes: 1 addition & 1 deletion physics/GFS_RRTMG_post.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ end subroutine GFS_RRTMG_post_init
!! | Statein | FV3-GFS_Statein_type | Fortran DDT containing FV3-GFS prognostic state data in from dycore | DDT | 0 | GFS_statein_type | | in | F |
!! | 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 |
!! | im | horizontal_loop_extent | horizontal loop extent | 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 |
Expand Down
2 changes: 1 addition & 1 deletion physics/GFS_RRTMG_pre.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ end subroutine GFS_RRTMG_pre_init
!! | 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 |
!! | im | horizontal_loop_extent | horizontal loop extent | count | 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 Down
4 changes: 2 additions & 2 deletions physics/GFS_calpreciptype.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ end subroutine GFS_calpreciptype_init
!! |----------------|---------------------------------------------------|-------------------------------------------------------|---------|------|---------|-----------|--------|----------|
!! | kdt | index_of_time_step | current time step index | index | 0 | integer | | in | F |
!! | nrcm | array_dimension_of_random_number | second dimension of random number array | count | 0 | integer | | in | F |
!! | 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 |
!! | im | horizontal_loop_extent | horizontal loop extent | count | 0 | integer | | in | F |
!! | ix | horizontal_dimension | horizontal dimension | count | 0 | integer | | in | F |
!! | lm | vertical_dimension | vertical layer dimension | index | 0 | integer | | in | F |
!! | lp1 | vertical_interface_dimension | vertical interface dimension | index | 0 | integer | | in | F |
!! | randomno | random_number_array | random number array | none | 2 | real | | in | F |
Expand Down
6 changes: 3 additions & 3 deletions physics/GFS_rad_time_vary.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ end subroutine GFS_rad_time_vary_init
!! | Model | FV3-GFS_Control_type | Fortran DDT containing FV3-GFS model control parameters | DDT | 0 | GFS_control_type | | in | F |
!! | Statein | FV3-GFS_Statein_type | Fortran DDT containing FV3-GFS prognostic state data in from dycore | DDT | 0 | GFS_statein_type | | in | F |
!! | 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 |
!! | blksz | horizontal_block_size | horizontal block size for explicit data blocking | none | 1 | integer | | in | F |
!! | blksz | horizontal_block_size | horizontal block size for explicit data blocking | count | 0 | integer | | in | F |
!! | sec | seconds_elapsed_since_model_initialization | seconds elapsed since model initialization | s | 0 | real | kind_phys | in | F |
!! | ictmflg | flag_for_initial_time-date_control | flag for initial time/date control | none | 0 | integer | | in | F |
!! | isolar | flag_for_solar_constant | solar constant control flag | none | 0 | integer | | in | F |
!! | ictmflg | flag_for_initial_time-date_control | flag for initial time/date control | flag | 0 | integer | | in | F |
!! | isolar | flag_for_solar_constant | solar constant control flag | flag | 0 | integer | | in | F |
!!
subroutine GFS_rad_time_vary_run (Model, Statein, Tbd, blksz, sec, ictmflg, isolar)

Expand Down
Loading

0 comments on commit 4d9094b

Please sign in to comment.