Skip to content

Commit 4d9094b

Browse files
climbfujiclimbfuji
authored
Merge pull request #38 from climbfuji/fix_longname_conflicts_20180110_2
Fix longname conflicts 20180110/2
2 parents a78d371 + 43797ec commit 4d9094b

39 files changed

+86
-87
lines changed

‎GFS_layer/GFS_physics_driver.F90‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,7 @@ subroutine GFS_physics_driver &
458458
! --- local variables
459459

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

@@ -558,12 +558,15 @@ subroutine GFS_physics_driver &
558558
!
559559
!===> ... begin here
560560

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

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

14561459
if (Model%lsidea) then ! idea convective adjustment
@@ -1524,7 +1527,7 @@ subroutine GFS_physics_driver &
15241527
! write(0,*) ' gt0=',(gt0(ipr,k),k=1,Model%levs),' kdt=',Model%kdt
15251528
! write(0,*)' gq0=',(gq0(ipr,k,1),k=1,Model%levs),' lat=',lat
15261529
! write(0,*)' gq0i2=',(gq0(ipr,k,ntiw),k=1,Model%levs),' lat=',lat
1527-
! write(0,*)' gq1=',(gq0(ipr,k,ntcw),k=1,Model%levs)
1530+
! write(0,*)' gq1=',(gq0(ipr,k,Model%ntcw),k=1,Model%levs)
15281531
! print *,' vvel=',vvel
15291532
! endif
15301533
! if (Model%lprnt) write(7000,*)' bef convection gu0=',gu0(ipr,:)
@@ -1656,7 +1659,7 @@ subroutine GFS_physics_driver &
16561659
!
16571660
! dqdt(1:size(Grid%xlon,1),:,1) = gq0(1:size(Grid%xlon,1),:,1)
16581661
! dqdt(1:size(Grid%xlon,1),:,2) = gq0(1:size(Grid%xlon,1),:,ntiw)
1659-
! dqdt(1:size(Grid%xlon,1),:,3) = gq0(1:size(Grid%xlon,1),:,ntcw)
1662+
! dqdt(1:size(Grid%xlon,1),:,3) = gq0(1:size(Grid%xlon,1),:,Model%ntcw)
16601663
!GFDL lat has no meaning inside of shoc - changed to "1"
16611664
!GFDL call shoc(size(Grid%xlon,1), size(Grid%xlon,1), 1, Model%levs, Model%levs+1, Model%dtp, Model%me, lat,
16621665
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), &
@@ -1891,7 +1894,7 @@ subroutine GFS_physics_driver &
18911894
! write(0,*)' aftcnvgt0=',gt0(ipr,:),' kdt=',Model%kdt,' lat=',lat
18921895
! write(0,*)' aftcnvgq0=',(gq0(ipr,k,1),k=1,Model%levs),' lat=',lat
18931896
! write(0,*)' gq0i2=',(gq0(ipr,k,ntiw),k=1,Model%levs),' lat=',lat
1894-
! write(0,*)' aftcnvgq1=',(gq0(ipr,k,ntcw),k=1,Model%levs)
1897+
! write(0,*)' aftcnvgq1=',(gq0(ipr,k,Model%ntcw),k=1,Model%levs)
18951898
! endif
18961899
!
18971900
! do i = 1, size(Grid%xlon,1)
@@ -2255,10 +2258,10 @@ subroutine GFS_physics_driver &
22552258
! if (clw(1,1,2) < -999.0) then ! if clw is not partitioned to ice and water
22562259
! do k=1,Model%levs
22572260
! do i=1,size(Grid%xlon,1)
2258-
! tem = gq0(i,k,ntcw) &
2261+
! tem = gq0(i,k,Model%ntcw) &
22592262
! & * max(0.0, MIN(1.0, (TCR-gt0(i,k))*TCRF))
22602263
! clw(i,k,1) = tem ! ice
2261-
! clw(i,k,2) = gq0(i,k,ntcw) - tem ! water
2264+
! clw(i,k,2) = gq0(i,k,Model%ntcw) - tem ! water
22622265
! enddo
22632266
! enddo
22642267
! endif ! Anning ncld ==2
@@ -2565,7 +2568,7 @@ subroutine GFS_physics_driver &
25652568
! if (Model%lprnt) write(0,*) ' aftlsgq0=',gq0(ipr,:,1),' kdt=',Model%kdt
25662569
! if (Model%lprnt) write(0,*)' clw1aft=',gq0(ipr,:,ntiw),' kdt=',Model%kdt
25672570
! if (Model%lprnt) write(0,*)' cloudsm=',phy_f3d(ipr,:,1)*100,' kdt=',Model%kdt
2568-
! if (Model%lprnt) write(0,*)' clw2aft=',gq0(ipr,:,ntcw),' kdt=',Model%kdt
2571+
! if (Model%lprnt) write(0,*)' clw2aft=',gq0(ipr,:,Model%ntcw),' kdt=',Model%kdt
25692572

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

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

26372636
! if (Model%cal_pre) then ! hchuang: add dominant precipitation type algorithm
26382637
! i = min(3,Model%num_p3d)

‎physics/GFS_MP_generic_post.f90‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ end subroutine GFS_MP_generic_post_init
2020
!! \section arg_table_GFS_MP_generic_post_run Argument Table
2121
!! | local var name | longname | description | units | rank | type | kind | intent | optional |
2222
!! |----------------|------------------------------------------------------------|----------------------------------------------------------------|-------------|------|---------|-----------|--------|----------|
23-
!! | im | horizontal_loop_extent | horizontal loop extent, start at 1 | index | 0 | integer | | in | F |
24-
!! | ix | horizontal_dimension | horizontal dimension | index | 0 | integer | | in | F |
23+
!! | im | horizontal_loop_extent | horizontal loop extent | count | 0 | integer | | in | F |
24+
!! | ix | horizontal_dimension | horizontal dimension | count | 0 | integer | | in | F |
2525
!! | levs | vertical_dimension | vertical layer dimension | index | 0 | integer | | in | F |
2626
!! | dtf | time_step_for_dynamics | dynamics time step | s | 0 | real | kind_phys | in | F |
2727
!! | del | air_pressure_difference_between_midlayers | air pressure difference between midlayers | Pa | 2 | real | kind_phys | in | F |

‎physics/GFS_MP_generic_pre.f90‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ end subroutine GFS_MP_generic_pre_init
1616
!> \section arg_table_GFS_MP_generic_pre_run Argument Table
1717
!! | local var name | longname |description | units | rank | type | kind | intent | optional |
1818
!! |----------------|------------------------------------------------------------|--------------------------------------------------------------------------|-------------|------|---------|-----------|--------|----------|
19-
!! | im | horizontal_loop_extent | horizontal loop extent, start at 1 | index | 0 | integer | | in | F |
20-
!! | ix | horizontal_dimension | horizontal dimension | index | 0 | integer | | in | F |
19+
!! | im | horizontal_loop_extent | horizontal loop extent | count | 0 | integer | | in | F |
20+
!! | ix | horizontal_dimension | horizontal dimension | count | 0 | integer | | in | F |
2121
!! | levs | vertical_dimension | vertical layer dimension | index | 0 | integer | | in | F |
2222
!! | clw1 | cloud_ice_specific_humidity | cloud ice specific humidity | kg kg-1 | 2 | real | kind_phys | in | F |
2323
!! | clw2 | cloud_liquid_water_specific_humidity | cloud water specific humidity | kg kg-1 | 2 | real | kind_phys | in | F |

‎physics/GFS_PBL_generic.f90‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ end subroutine GFS_PBL_generic_pre_finalize
1414
!> \section arg_table_GFS_PBL_generic_pre_run Argument Table
1515
!! | local var name | longname | description | units | rank | type | kind | intent | optional |
1616
!! |----------------|--------------------------------------------------------|----------------------------------------------------|---------------|------|---------|-----------|--------|----------|
17-
!! | im | horizontal_loop_extent | horizontal loop extent, start at 1 | index | 0 | integer | | in | F |
17+
!! | im | horizontal_loop_extent | horizontal loop extent | count | 0 | integer | | in | F |
1818
!! | levs | vertical_dimension | vertical layer dimension | index | 0 | integer | | in | F |
1919
!! | kinver | index_of_highest_temperature_inversion | index of highest temperature inversion | index | 1 | integer | | in | F |
2020
!!

‎physics/GFS_RRTMG_post.f90‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ end subroutine GFS_RRTMG_post_init
2020
!! | Statein | FV3-GFS_Statein_type | Fortran DDT containing FV3-GFS prognostic state data in from dycore | DDT | 0 | GFS_statein_type | | in | F |
2121
!! | Coupling | FV3-GFS_Coupling_type | Fortran DDT containing FV3-GFS fields to/from coupling with other components | DDT | 0 | GFS_coupling_type | | inout | F |
2222
!! | 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 |
23-
!! | im | horizontal_loop_extent | horizontal loop extent, start at 1 | index | 0 | integer | | in | F |
23+
!! | im | horizontal_loop_extent | horizontal loop extent | count | 0 | integer | | in | F |
2424
!! | lm | vertical_layer_dimension_for_radiation | number of vertical layers for radiation calculation | count | 0 | integer | | in | F |
2525
!! | ltp | extra_top_layer | extra top layers | none | 0 | integer | | in | F |
2626
!! | kt | vertical_index_difference_between_layer_and_upper_bound | vertical index difference between layer and upper bound | index | 0 | integer | | in | F |

‎physics/GFS_RRTMG_pre.f90‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ end subroutine GFS_RRTMG_pre_init
2424
!! | Cldprop | FV3-GFS_Cldprop_type | Fortran DDT containing FV3-GFS cloud fields needed by radiation from physics | DDT | 0 | GFS_cldprop_type | | in | F |
2525
!! | Radtend | FV3-GFS_Radtend_type | Fortran DDT containing FV3-GFS radiation tendencies | DDT | 0 | GFS_radtend_type | | in | F |
2626
!! | lm | vertical_layer_dimension_for_radiation | number of vertical layers for radiation calculation | count | 0 | integer | | out | F |
27-
!! | im | horizontal_loop_extent | horizontal loop extent, start at 1 | index | 0 | integer | | out | F |
27+
!! | im | horizontal_loop_extent | horizontal loop extent | count | 0 | integer | | out | F |
2828
!! | lmk | adjusted_vertical_layer_dimension_for_radiation | number of vertical layers for radiation | count | 0 | integer | | out | F |
2929
!! | lmp | adjusted_vertical_level_dimension_for_radiation | number of vertical levels for radiation | count | 0 | integer | | out | F |
3030
!! | kd | vertical_index_difference_between_in-out_and_local | vertical index difference between in/out and local | index | 0 | integer | | out | F |

‎physics/GFS_calpreciptype.f90‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ end subroutine GFS_calpreciptype_init
1515
!! |----------------|---------------------------------------------------|-------------------------------------------------------|---------|------|---------|-----------|--------|----------|
1616
!! | kdt | index_of_time_step | current time step index | index | 0 | integer | | in | F |
1717
!! | nrcm | array_dimension_of_random_number | second dimension of random number array | count | 0 | integer | | in | F |
18-
!! | im | horizontal_loop_extent | horizontal loop extent, start at 1 | index | 0 | integer | | in | F |
19-
!! | ix | horizontal_dimension | horizontal dimension | index | 0 | integer | | in | F |
18+
!! | im | horizontal_loop_extent | horizontal loop extent | count | 0 | integer | | in | F |
19+
!! | ix | horizontal_dimension | horizontal dimension | count | 0 | integer | | in | F |
2020
!! | lm | vertical_dimension | vertical layer dimension | index | 0 | integer | | in | F |
2121
!! | lp1 | vertical_interface_dimension | vertical interface dimension | index | 0 | integer | | in | F |
2222
!! | randomno | random_number_array | random number array | none | 2 | real | | in | F |

‎physics/GFS_rad_time_vary.f90‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ end subroutine GFS_rad_time_vary_init
1616
!! | Model | FV3-GFS_Control_type | Fortran DDT containing FV3-GFS model control parameters | DDT | 0 | GFS_control_type | | in | F |
1717
!! | Statein | FV3-GFS_Statein_type | Fortran DDT containing FV3-GFS prognostic state data in from dycore | DDT | 0 | GFS_statein_type | | in | F |
1818
!! | 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 |
19-
!! | blksz | horizontal_block_size | horizontal block size for explicit data blocking | none | 1 | integer | | in | F |
19+
!! | blksz | horizontal_block_size | horizontal block size for explicit data blocking | count | 0 | integer | | in | F |
2020
!! | sec | seconds_elapsed_since_model_initialization | seconds elapsed since model initialization | s | 0 | real | kind_phys | in | F |
21-
!! | ictmflg | flag_for_initial_time-date_control | flag for initial time/date control | none | 0 | integer | | in | F |
22-
!! | isolar | flag_for_solar_constant | solar constant control flag | none | 0 | integer | | in | F |
21+
!! | ictmflg | flag_for_initial_time-date_control | flag for initial time/date control | flag | 0 | integer | | in | F |
22+
!! | isolar | flag_for_solar_constant | solar constant control flag | flag | 0 | integer | | in | F |
2323
!!
2424
subroutine GFS_rad_time_vary_run (Model, Statein, Tbd, blksz, sec, ictmflg, isolar)
2525

0 commit comments

Comments
 (0)