Skip to content

Commit

Permalink
Merge pull request #132 from rmontuoro/production/ee2
Browse files Browse the repository at this point in the history 
Address compliance issues towards NCO HPC implementation standards for AQMv7 operational implementation
  • Loading branch information
@climbfuji
climbfuji authored Nov 29, 2023
2 parents 4315912 + d6563b5 commit f039816
Show file tree
Hide file tree
Showing 26 changed files with 236 additions and 214 deletions.
4 changes: 2 additions & 2 deletions physics/GFS_DCNV_generic_post.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ subroutine GFS_DCNV_generic_post_run (im, levs, lssav, ldiag3d, qdiag3d, ras, &
logical, intent(in) :: satmedmf, trans_trac

real(kind=kind_phys), dimension(:), intent(inout) :: rainc, cldwrk
real(kind=kind_phys), dimension(:,:), intent(inout) :: upd_mf, dwn_mf, det_mf
real(kind=kind_phys), dimension(:,:), pointer :: upd_mf, dwn_mf, det_mf
real(kind=kind_phys), dimension(:,:), intent(inout) :: cnvw, cnvc

real(kind=kind_phys), dimension(:,:,:), intent(inout) :: dtend
real(kind=kind_phys), dimension(:,:,:), pointer :: dtend
integer, intent(in) :: dtidx(:,:), index_of_process_dcnv, index_of_temperature, &
index_of_x_wind, index_of_y_wind, ntqv
integer, intent(in) :: ntcw,ntiw,ntclamt,ntrw,ntsw,ntrnc,ntsnc,ntgl, &
Expand Down
2 changes: 1 addition & 1 deletion physics/GFS_GWD_generic_post.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ subroutine GFS_GWD_generic_post_run(lssav, ldiag3d, dtf, dusfcg, dvsfcg, dudt, d
real(kind=kind_phys), intent(inout) :: dugwd(:), dvgwd(:)

! dtend only allocated only if ldiag3d is .true.
real(kind=kind_phys), intent(inout) :: dtend(:,:,:)
real(kind=kind_phys), pointer :: dtend(:,:,:)
integer, intent(in) :: dtidx(:,:), index_of_temperature, &
& index_of_x_wind, index_of_y_wind, index_of_process_orographic_gwd

Expand Down
5 changes: 3 additions & 2 deletions physics/GFS_GWD_generic_pre.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,14 @@ subroutine GFS_GWD_generic_pre_run( &

real(kind=kind_phys), intent(out) :: &
& oc(:), oa4(:,:), clx(:,:), &
& varss(:), ocss(:), oa4ss(:,:), clxss(:,:), &
& theta(:), sigma(:), gamma(:), elvmax(:)
real(kind=kind_phys), pointer :: &
& varss(:), ocss(:), oa4ss(:,:), clxss(:,:)

logical, intent(in) :: lssav, ldiag3d, flag_for_gwd_generic_tend
real(kind=kind_phys), intent(in) :: dtdt(:,:), dudt(:,:), dvdt(:,:)
! dtend only allocated only if ldiag3d is .true.
real(kind=kind_phys), intent(inout) :: dtend(:,:,:)
real(kind=kind_phys), pointer :: dtend(:,:,:)
integer, intent(in) :: dtidx(:,:), index_of_temperature, &
& index_of_x_wind, index_of_y_wind, index_of_process_orographic_gwd
real(kind=kind_phys), intent(in) :: dtf
Expand Down
26 changes: 13 additions & 13 deletions physics/GFS_MP_generic_post.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,33 +55,33 @@ subroutine GFS_MP_generic_post_run(
real(kind=kind_phys), dimension(:,:), intent(in) :: prsi, phii
real(kind=kind_phys), dimension(:,:,:), intent(in) :: gq0, save_q

real(kind=kind_phys), dimension(:,:,:), intent(in) :: dfi_radar_tten
real(kind=kind_phys), dimension(:,:,:), pointer :: dfi_radar_tten

real(kind=kind_phys), dimension(:), intent(in ) :: sr
real(kind=kind_phys), dimension(:), intent(inout) :: rain, domr_diag, domzr_diag, domip_diag, doms_diag, tprcp, &
srflag, cnvprcp, totprcp, totice, totsnw, totgrp, cnvprcpb, &
totprcpb, toticeb, totsnwb, totgrpb, pwat
real(kind=kind_phys), dimension(:), intent(inout) :: rain_cpl, rainc_cpl, snow_cpl

real(kind=kind_phys), dimension(:,:,:), intent(inout) :: dtend
real(kind=kind_phys), dimension(:,:,:), pointer :: dtend
integer, dimension(:,:), intent(in) :: dtidx

! Stochastic physics / surface perturbations
real(kind=kind_phys), dimension(:), intent(inout) :: drain_cpl, dsnow_cpl

! Rainfall variables previous time step
integer, intent(in) :: lsm, lsm_ruc, lsm_noahmp
real(kind=kind_phys), dimension(:), intent(inout) :: raincprv
real(kind=kind_phys), dimension(:), intent(inout) :: rainncprv
real(kind=kind_phys), dimension(:), intent(inout) :: iceprv
real(kind=kind_phys), dimension(:), intent(inout) :: snowprv
real(kind=kind_phys), dimension(:), intent(inout) :: graupelprv
real(kind=kind_phys), dimension(:), intent(inout) :: draincprv
real(kind=kind_phys), dimension(:), intent(inout) :: drainncprv
real(kind=kind_phys), dimension(:), intent(inout) :: diceprv
real(kind=kind_phys), dimension(:), intent(inout) :: dsnowprv
real(kind=kind_phys), dimension(:), intent(inout) :: dgraupelprv
real(kind=kind_phys), dimension(:,:), intent(inout) :: dqdt_qmicro
real(kind=kind_phys), dimension(:), pointer :: raincprv
real(kind=kind_phys), dimension(:), pointer :: rainncprv
real(kind=kind_phys), dimension(:), pointer :: iceprv
real(kind=kind_phys), dimension(:), pointer :: snowprv
real(kind=kind_phys), dimension(:), pointer :: graupelprv
real(kind=kind_phys), dimension(:), pointer :: draincprv
real(kind=kind_phys), dimension(:), pointer :: drainncprv
real(kind=kind_phys), dimension(:), pointer :: diceprv
real(kind=kind_phys), dimension(:), pointer :: dsnowprv
real(kind=kind_phys), dimension(:), pointer :: dgraupelprv
real(kind=kind_phys), dimension(:,:), pointer :: dqdt_qmicro
real(kind=kind_phys), dimension(:,:), intent(inout) :: prevsq
real(kind=kind_phys), intent(in) :: dtp

Expand Down
9 changes: 5 additions & 4 deletions physics/GFS_PBL_generic_post.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,9 @@ subroutine GFS_PBL_generic_post_run (im, levs, nvdiff, ntrac,
real(kind=kind_phys), intent(in) :: rd, cp, fvirt, hvap, huge
real(kind=kind_phys), dimension(:), intent(in) :: t1, q1, hflx, oceanfrac
real(kind=kind_phys), dimension(:,:), intent(in) :: prsl
real(kind=kind_phys), dimension(:), intent(in) :: dusfc_cice, dvsfc_cice, dtsfc_cice, dqsfc_cice, &
dtsfc_med, dqsfc_med, dusfc_med, dvsfc_med, wind, stress_wat, hflx_wat, evap_wat, ugrs1, vgrs1
real(kind=kind_phys), dimension(:), pointer :: dusfc_cice, dvsfc_cice, dtsfc_cice, dqsfc_cice, &
dtsfc_med, dqsfc_med, dusfc_med, dvsfc_med
real(kind=kind_phys), dimension(:), intent(in) :: wind, stress_wat, hflx_wat, evap_wat, ugrs1, vgrs1

real(kind=kind_phys), dimension(:,:, :), intent(in) :: qgrs
real(kind=kind_phys), dimension(:,:), intent(in) :: ugrs, vgrs, tgrs
Expand All @@ -63,9 +64,9 @@ subroutine GFS_PBL_generic_post_run (im, levs, nvdiff, ntrac,
! Since Intel 15 crashes when passing unallocated arrays to arrays defined with explicit shape,
! use assumed-shape arrays. Note that Intel 18 and GNU 6.2.0-8.1.0 tolerate explicit-shape arrays
! as long as these do not get used when not allocated.
real(kind=kind_phys), dimension(:), intent(inout) :: dusfc_cpl, dvsfc_cpl, dtsfc_cpl, dqsfc_cpl, dusfci_cpl, dvsfci_cpl, &
real(kind=kind_phys), dimension(:), pointer :: dusfc_cpl, dvsfc_cpl, dtsfc_cpl, dqsfc_cpl, dusfci_cpl, dvsfci_cpl, &
dtsfci_cpl, dqsfci_cpl, dusfc_diag, dvsfc_diag, dtsfc_diag, dqsfc_diag, dusfci_diag, dvsfci_diag, dtsfci_diag, dqsfci_diag
real(kind=kind_phys), intent(inout), optional :: dtend(:,:,:)
real(kind=kind_phys), pointer , optional :: dtend(:,:,:)
integer, intent(in) :: dtidx(:,:)
integer, intent(in) :: index_of_temperature, index_of_x_wind, index_of_y_wind, index_of_process_pbl

Expand Down
2 changes: 1 addition & 1 deletion physics/GFS_SCNV_generic_post.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ subroutine GFS_SCNV_generic_post_run (im, levs, nn, lssav, ldiag3d, qdiag3d, &
real(kind=kind_phys), dimension(:,:,:), intent(in) :: save_q, gq0

! dtend only allocated if ldiag3d == .true.
real(kind=kind_phys), intent(inout) :: dtend(:,:,:)
real(kind=kind_phys), pointer :: dtend(:,:,:)
integer, intent(in) :: dtidx(:,:)
integer, intent(in) :: index_of_temperature, index_of_x_wind, index_of_y_wind, index_of_process_scnv
real(kind=kind_phys), dimension(:,:,:), intent(in) :: clw
Expand Down
Loading

0 comments on commit f039816

Please sign in to comment.