Skip to content

Commit 1476a46

Browse files
grantfirlgrantfirl
committed
Merge branch 'ufs-dev-PR195' into ufs-dev-PR253
2 parents 8bb67bc + 041e7b3 commit 1476a46

File tree

5 files changed

+34
-59
lines changed

5 files changed

+34
-59
lines changed

‎physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_pre.F90‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -73,19 +73,19 @@ subroutine GFS_rrtmg_pre_run (im, levs, lm, lmk, lmp, n_var_lndp, lextop,&
7373
use surface_perturbation, only: cdfnor,ppfbet
7474

7575
! For Thompson MP
76-
use module_mp_thompson, only: calc_effectRad_thmpsn => calc_effectRad, &
77-
Nt_c_l_thmpsn => Nt_c_l, &
78-
Nt_c_o_thmpsn => Nt_c_o, &
79-
re_qc_min_thmpsn => re_qc_min, &
80-
re_qc_max_thmpsn => re_qc_max, &
81-
re_qi_min_thmpsn => re_qi_min, &
82-
re_qi_max_thmpsn => re_qi_max, &
83-
re_qs_min_thmpsn => re_qs_min, &
84-
re_qs_max_thmpsn => re_qs_max
76+
use module_mp_thompson, only: calc_effectRad_thompson => calc_effectRad, &
77+
Nt_c_l_thompson => Nt_c_l, &
78+
Nt_c_o_thompson => Nt_c_o, &
79+
re_qc_min_thompson => re_qc_min, &
80+
re_qc_max_thompson => re_qc_max, &
81+
re_qi_min_thompson => re_qi_min, &
82+
re_qi_max_thompson => re_qi_max, &
83+
re_qs_min_thompson => re_qs_min, &
84+
re_qs_max_thompson => re_qs_max
8585
use module_mp_thompson_make_number_concentrations, only: &
86-
make_IceNumber_thmpsn => make_IceNumber, &
87-
make_DropletNumber_thmpsn => make_DropletNumber, &
88-
make_RainNumber_thmpsn => make_RainNumber
86+
make_IceNumber_thompson => make_IceNumber, &
87+
make_DropletNumber_thompson => make_DropletNumber, &
88+
make_RainNumber_thompson => make_RainNumber
8989

9090
use module_mp_tempo_params, only: &
9191
ty_tempo_cfg, &
@@ -792,13 +792,13 @@ subroutine GFS_rrtmg_pre_run (im, levs, lm, lmk, lmp, n_var_lndp, lextop,&
792792
qs_mp (i,k) = tracer1(i,k,ntsw)/(1.-qvs)
793793
if(nint(slmsk(i)) == 1) then
794794
if (imp_physics == imp_physics_thompson) then
795-
nc_mp (i,k) = Nt_c_l_thmpsn*orho(i,k)
795+
nc_mp (i,k) = Nt_c_l_thompson*orho(i,k)
796796
else
797797
nc_mp (i,k) = Nt_c_l_tempo*orho(i,k)
798798
endif
799799
else
800800
if (imp_physics == imp_physics_thompson) then
801-
nc_mp (i,k) = Nt_c_o_thmpsn*orho(i,k)
801+
nc_mp (i,k) = Nt_c_o_thompson*orho(i,k)
802802
else
803803
nc_mp (i,k) = Nt_c_o_tempo*orho(i,k)
804804
endif
@@ -923,14 +923,14 @@ subroutine GFS_rrtmg_pre_run (im, levs, lm, lmk, lmp, n_var_lndp, lextop,&
923923
do i=1,im
924924
if ((ltaerosol .or. mraerosol) .and. qc_mp(i,k)>1.e-12 .and. nc_mp(i,k)<100.) then
925925
if (imp_physics == imp_physics_thompson) then
926-
nc_mp(i,k) = make_DropletNumber_thmpsn(qc_mp(i,k)*rho(i,k), nwfa(i,k)*rho(i,k)) * orho(i,k)
926+
nc_mp(i,k) = make_DropletNumber_thompson(qc_mp(i,k)*rho(i,k), nwfa(i,k)*rho(i,k)) * orho(i,k)
927927
else
928928
nc_mp(i,k) = make_DropletNumber_tempo(qc_mp(i,k)*rho(i,k), nwfa(i,k)*rho(i,k)) * orho(i,k)
929929
endif
930930
endif
931931
if (qi_mp(i,k)>1.e-12 .and. ni_mp(i,k)<100.) then
932932
if (imp_physics == imp_physics_thompson) then
933-
ni_mp(i,k) = make_IceNumber_thmpsn(qi_mp(i,k)*rho(i,k), tlyr(i,k)) * orho(i,k)
933+
ni_mp(i,k) = make_IceNumber_thompson(qi_mp(i,k)*rho(i,k), tlyr(i,k)) * orho(i,k)
934934
else
935935
ni_mp(i,k) = make_IceNumber_tempo(qi_mp(i,k)*rho(i,k), tlyr(i,k)) * orho(i,k)
936936
endif
@@ -946,18 +946,18 @@ subroutine GFS_rrtmg_pre_run (im, levs, lm, lmk, lmp, n_var_lndp, lextop,&
946946
! it will raise the low limit from 5 to 10, but the high limit will remain 125.
947947

948948
if (imp_physics == imp_physics_thompson) then
949-
call calc_effectRad_thmpsn(tlyr(i,:), plyr(i,:)*100., qv_mp(i,:), qc_mp(i,:), &
949+
call calc_effectRad_thompson(tlyr(i,:), plyr(i,:)*100., qv_mp(i,:), qc_mp(i,:), &
950950
nc_mp(i,:), qi_mp(i,:), ni_mp(i,:), qs_mp(i,:), &
951951
effrl(i,:), effri(i,:), effrs(i,:), islmsk, 1, lm )
952952
! Scale Thompson's effective radii from meter to micron
953953
do k=1,lm
954-
effrl(i,k) = MAX(re_qc_min_thmpsn, MIN(effrl(i,k), re_qc_max_thmpsn))*1.e6
955-
effri(i,k) = MAX(re_qi_min_thmpsn, MIN(effri(i,k), re_qi_max_thmpsn))*1.e6
956-
effrs(i,k) = MAX(re_qs_min_thmpsn, MIN(effrs(i,k), re_qs_max_thmpsn))*1.e6
954+
effrl(i,k) = MAX(re_qc_min_thompson, MIN(effrl(i,k), re_qc_max_thompson))*1.e6
955+
effri(i,k) = MAX(re_qi_min_thompson, MIN(effri(i,k), re_qi_max_thompson))*1.e6
956+
effrs(i,k) = MAX(re_qs_min_thompson, MIN(effrs(i,k), re_qs_max_thompson))*1.e6
957957
end do
958-
effrl(i,lmk) = re_qc_min_thmpsn*1.e6
959-
effri(i,lmk) = re_qi_min_thmpsn*1.e6
960-
effrs(i,lmk) = re_qs_min_thmpsn*1.e6
958+
effrl(i,lmk) = re_qc_min_thompson*1.e6
959+
effri(i,lmk) = re_qi_min_thompson*1.e6
960+
effrs(i,lmk) = re_qs_min_thompson*1.e6
961961
else
962962
call calc_effectRad_tempo(t1d=tlyr(i,:), p1d=plyr(i,:)*100., qv1d=qv_mp(i,:), qc1d=qc_mp(i,:), &
963963
nc1d=nc_mp(i,:), qi1d=qi_mp(i,:), ni1d=ni_mp(i,:), qs1d=qs_mp(i,:), &

‎physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_4.F90‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ subroutine GFS_suite_interstitial_4_run (im, levs, ltaerosol, tracers_total, ntr
1717

1818
use machine, only: kind_phys
1919
use module_mp_thompson_make_number_concentrations, only: &
20-
make_IceNumber_thmpsn => make_IceNumber, &
21-
make_DropletNumber_thmpsn => make_DropletNumber
20+
make_IceNumber_thompson => make_IceNumber, &
21+
make_DropletNumber_thompson => make_DropletNumber
2222

2323
use module_mp_tempo_utils, only: &
2424
make_IceNumber_tempo => make_IceNumber, &
@@ -233,7 +233,7 @@ subroutine GFS_suite_interstitial_4_run (im, levs, ltaerosol, tracers_total, ntr
233233
!> - Convert number concentration from moist to dry
234234
nc_mp(i,k) = gq0(i,k,ntlnc) / (one-spechum(i,k))
235235
if (imp_physics == imp_physics_thompson) then
236-
nc_mp(i,k) = max(zero, nc_mp(i,k) + make_DropletNumber_thmpsn(qc_mp(i,k) * rho, nwfa(i,k)*rho) * orho)
236+
nc_mp(i,k) = max(zero, nc_mp(i,k) + make_DropletNumber_thompson(qc_mp(i,k) * rho, nwfa(i,k)*rho) * orho)
237237
else
238238
nc_mp(i,k) = max(zero, nc_mp(i,k) + make_DropletNumber_tempo(qc_mp(i,k) * rho, nwfa(i,k)*rho) * orho)
239239
endif
@@ -246,7 +246,7 @@ subroutine GFS_suite_interstitial_4_run (im, levs, ltaerosol, tracers_total, ntr
246246
!> - Convert number concentration from moist to dry
247247
ni_mp(i,k) = gq0(i,k,ntinc) / (one-spechum(i,k))
248248
if (imp_physics == imp_physics_thompson) then
249-
ni_mp(i,k) = max(zero, ni_mp(i,k) + make_IceNumber_thmpsn(qi_mp(i,k) * rho, save_tcp(i,k)) * orho)
249+
ni_mp(i,k) = max(zero, ni_mp(i,k) + make_IceNumber_thompson(qi_mp(i,k) * rho, save_tcp(i,k)) * orho)
250250
else
251251
ni_mp(i,k) = max(zero, ni_mp(i,k) + make_IceNumber_tempo(qi_mp(i,k) * rho, save_tcp(i,k)) * orho)
252252
endif
@@ -266,7 +266,7 @@ subroutine GFS_suite_interstitial_4_run (im, levs, ltaerosol, tracers_total, ntr
266266
qc_mp(i,k) = (clw(i,k,2)-save_qc(i,k))
267267
!> - Update cloud water number concentration
268268
if (imp_physics == imp_physics_thompson) then
269-
gq0(i,k,ntlnc) = max(zero, gq0(i,k,ntlnc) + make_DropletNumber_thmpsn(qc_mp(i,k) * rho, nwfa(i,k)*rho) * orho)
269+
gq0(i,k,ntlnc) = max(zero, gq0(i,k,ntlnc) + make_DropletNumber_thompson(qc_mp(i,k) * rho, nwfa(i,k)*rho) * orho)
270270
else
271271
gq0(i,k,ntlnc) = max(zero, gq0(i,k,ntlnc) + make_DropletNumber_tempo(qc_mp(i,k) * rho, nwfa(i,k)*rho) * orho)
272272
endif
@@ -276,7 +276,7 @@ subroutine GFS_suite_interstitial_4_run (im, levs, ltaerosol, tracers_total, ntr
276276
qi_mp(i,k) = (clw(i,k,1)-save_qi(i,k))
277277
!> - Update cloud ice number concentration
278278
if (imp_physics == imp_physics_thompson) then
279-
gq0(i,k,ntinc) = max(zero, gq0(i,k,ntinc) + make_IceNumber_thmpsn(qi_mp(i,k) * rho, save_tcp(i,k)) * orho)
279+
gq0(i,k,ntinc) = max(zero, gq0(i,k,ntinc) + make_IceNumber_thompson(qi_mp(i,k) * rho, save_tcp(i,k)) * orho)
280280
else
281281
gq0(i,k,ntinc) = max(zero, gq0(i,k,ntinc) + make_IceNumber_tempo(qi_mp(i,k) * rho, save_tcp(i,k)) * orho)
282282
endif

‎physics/MP/GFDL/v1_2019/gfdl_cloud_microphys.F90‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
module gfdl_cloud_microphys
88

99
use gfdl_cloud_microphys_mod, only: gfdl_cloud_microphys_mod_init, &
10-
gfdl_cloud_microphys_mod_driver, &
11-
gfdl_cloud_microphys_mod_end, &
12-
cloud_diagnosis
10+
gfdl_cloud_microphys_mod_driver, &
11+
gfdl_cloud_microphys_mod_end, &
12+
cloud_diagnosis
1313

1414
implicit none
1515

‎physics/MP/TEMPO/mp_tempo_post.F90‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
module mp_tempo_post
22

3-
use mpi_f08
43
use machine, only : kind_phys
54

65
implicit none
@@ -53,7 +52,7 @@ end subroutine mp_tempo_post_init
5352
!! \htmlinclude mp_tempo_post_run.html
5453
!!
5554
subroutine mp_tempo_post_run(ncol, nlev, tgrs_save, tgrs, prslk, dtp, ttendlim, &
56-
kdt, mpicomm, mpirank, mpiroot, errmsg, errflg)
55+
kdt, errmsg, errflg)
5756

5857
implicit none
5958

@@ -66,10 +65,7 @@ subroutine mp_tempo_post_run(ncol, nlev, tgrs_save, tgrs, prslk, dtp, ttendlim,
6665
real(kind_phys), intent(in) :: dtp
6766
real(kind_phys), intent(in) :: ttendlim
6867
integer, intent(in) :: kdt
69-
! MPI information
70-
type(MPI_Comm), intent(in ) :: mpicomm
71-
integer, intent(in ) :: mpirank
72-
integer, intent(in ) :: mpiroot
68+
7369
! CCPP error handling
7470
character(len=*), intent( out) :: errmsg
7571
integer, intent( out) :: errflg

‎physics/MP/TEMPO/mp_tempo_post.meta‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -96,27 +96,6 @@
9696
dimensions = ()
9797
type = integer
9898
intent = in
99-
[mpicomm]
100-
standard_name = mpi_communicator
101-
long_name = MPI communicator
102-
units = index
103-
dimensions = ()
104-
type = MPI_Comm
105-
intent = in
106-
[mpirank]
107-
standard_name = mpi_rank
108-
long_name = current MPI-rank
109-
units = index
110-
dimensions = ()
111-
type = integer
112-
intent = in
113-
[mpiroot]
114-
standard_name = mpi_root
115-
long_name = master MPI-rank
116-
units = index
117-
dimensions = ()
118-
type = integer
119-
intent = in
12099
[errmsg]
121100
standard_name = ccpp_error_message
122101
long_name = error message for error handling in CCPP

0 commit comments

Comments
 (0)