From 0e342879afe9a363a089fff587c6a39279ea5901 Mon Sep 17 00:00:00 2001 From: weiwangncar Date: Tue, 20 Aug 2024 01:45:44 -0600 Subject: [PATCH 1/6] Add reflectivity calculation back for WSM6 --- phys/module_mp_wsm6.F | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/phys/module_mp_wsm6.F b/phys/module_mp_wsm6.F index d0d45e69a2..cf163d7a2f 100644 --- a/phys/module_mp_wsm6.F +++ b/phys/module_mp_wsm6.F @@ -1,7 +1,7 @@ module module_mp_wsm6 use ccpp_kind_types,only: kind_phys - use mp_wsm6,only: mp_wsm6_run + use mp_wsm6,only: mp_wsm6_run,refl10cm_wsm6 use mp_wsm6_effectrad,only: mp_wsm6_effectRad_run @@ -231,6 +231,23 @@ subroutine wsm6(th,q,qc,qr,qi,qs,qg,den,pii,p,delz, & enddo enddo + if (diagflag .and. do_radar_ref == 1) then + do i=its,ite + do k=kts,kte + t1d(k)=th(i,k,j)*pii(i,k,j) + p1d(k)=p(i,k,j) + qv1d(k)=q(i,k,j) + qr1d(k)=qr(i,k,j) + qs1d(k)=qs(i,k,j) + qg1d(k)=qg(i,k,j) + enddo + call refl10cm_wsm6 (qv1d,qr1d,qs1d,qg1d,t1d,p1d,dBZ,kts,kte) + do k = kts, kte + refl_10cm(i,k,j) = MAX(-35., dBZ(k)) + enddo + enddo + endif + enddo end subroutine wsm6 From 2e18018ac3511d4de42cf116ba0ebdd9525700e0 Mon Sep 17 00:00:00 2001 From: weiwangncar Date: Wed, 21 Aug 2024 00:27:15 -0600 Subject: [PATCH 2/6] To trigger a test... --- phys/module_mp_wsm6.F | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phys/module_mp_wsm6.F b/phys/module_mp_wsm6.F index cf163d7a2f..a00ac4721d 100644 --- a/phys/module_mp_wsm6.F +++ b/phys/module_mp_wsm6.F @@ -243,7 +243,7 @@ subroutine wsm6(th,q,qc,qr,qi,qs,qg,den,pii,p,delz, & enddo call refl10cm_wsm6 (qv1d,qr1d,qs1d,qg1d,t1d,p1d,dBZ,kts,kte) do k = kts, kte - refl_10cm(i,k,j) = MAX(-35., dBZ(k)) + refl_10cm(i,k,j) = max(-35., dBZ(k)) enddo enddo endif From 964bb2dc245e34b59352e523c792713d06c98548 Mon Sep 17 00:00:00 2001 From: weiwangncar Date: Wed, 21 Aug 2024 21:28:58 -0600 Subject: [PATCH 3/6] To trigger a test... --- phys/module_mp_wsm6.F | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phys/module_mp_wsm6.F b/phys/module_mp_wsm6.F index a00ac4721d..cf163d7a2f 100644 --- a/phys/module_mp_wsm6.F +++ b/phys/module_mp_wsm6.F @@ -243,7 +243,7 @@ subroutine wsm6(th,q,qc,qr,qi,qs,qg,den,pii,p,delz, & enddo call refl10cm_wsm6 (qv1d,qr1d,qs1d,qg1d,t1d,p1d,dBZ,kts,kte) do k = kts, kte - refl_10cm(i,k,j) = max(-35., dBZ(k)) + refl_10cm(i,k,j) = MAX(-35., dBZ(k)) enddo enddo endif From 09dc5e5e4267af0e8ee345c2845a00e36503e41f Mon Sep 17 00:00:00 2001 From: weiwangncar Date: Fri, 23 Aug 2024 21:20:46 -0600 Subject: [PATCH 4/6] To trigger a test, again --- phys/module_mp_wsm6.F | 1 - 1 file changed, 1 deletion(-) diff --git a/phys/module_mp_wsm6.F b/phys/module_mp_wsm6.F index cf163d7a2f..3f89751cea 100644 --- a/phys/module_mp_wsm6.F +++ b/phys/module_mp_wsm6.F @@ -9,7 +9,6 @@ module module_mp_wsm6 private public:: wsm6 - contains From e8edc22249e702a2def2b9141e6db83a1bcd47a0 Mon Sep 17 00:00:00 2001 From: weiwangncar Date: Wed, 28 Aug 2024 18:49:47 -0600 Subject: [PATCH 5/6] Try to trigger another test... --- phys/module_mp_wsm6.F | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phys/module_mp_wsm6.F b/phys/module_mp_wsm6.F index 3f89751cea..7654d7c680 100644 --- a/phys/module_mp_wsm6.F +++ b/phys/module_mp_wsm6.F @@ -242,7 +242,7 @@ subroutine wsm6(th,q,qc,qr,qi,qs,qg,den,pii,p,delz, & enddo call refl10cm_wsm6 (qv1d,qr1d,qs1d,qg1d,t1d,p1d,dBZ,kts,kte) do k = kts, kte - refl_10cm(i,k,j) = MAX(-35., dBZ(k)) + refl_10cm(i,k,j) = max(-35., dBZ(k)) enddo enddo endif From 507a8e26c7dc9f9052d86853388dbb2576cc8296 Mon Sep 17 00:00:00 2001 From: weiwangncar Date: Wed, 28 Aug 2024 19:43:43 -0600 Subject: [PATCH 6/6] Recover the original code... --- phys/module_mp_wsm6.F | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/phys/module_mp_wsm6.F b/phys/module_mp_wsm6.F index 7654d7c680..cf163d7a2f 100644 --- a/phys/module_mp_wsm6.F +++ b/phys/module_mp_wsm6.F @@ -9,6 +9,7 @@ module module_mp_wsm6 private public:: wsm6 + contains @@ -242,7 +243,7 @@ subroutine wsm6(th,q,qc,qr,qi,qs,qg,den,pii,p,delz, & enddo call refl10cm_wsm6 (qv1d,qr1d,qs1d,qg1d,t1d,p1d,dBZ,kts,kte) do k = kts, kte - refl_10cm(i,k,j) = max(-35., dBZ(k)) + refl_10cm(i,k,j) = MAX(-35., dBZ(k)) enddo enddo endif