Update dev/emc from dtc/develop: add dynamics code for Ferrier-Aligo …

…microphysics (ufs-community#11)

model/fv_mapz.F90

@@ -3465,12 +3465,25 @@ subroutine moist_cv(is,ie, isd,ied, jsd,jed, km, j, k, nwat, sphum, liq_wat, rai
  enddo
  case(4) ! K_warm_rain with fake ice
  do i=is,ie 
+#ifndef CCPP
  qv(i) = q(i,j,k,sphum)
  qd(i) = q(i,j,k,liq_wat) + q(i,j,k,rainwat)
 #ifdef MULTI_GASES
  cvm(i) = (1.-(qv(i)+qd(i)))*cv_air*vicvqd(q(i,j,k,1:num_gas)) + qv(i)*cv_vap + qd(i)*c_liq
 #else
  cvm(i) = (1.-(qv(i)+qd(i)))*cv_air + qv(i)*cv_vap + qd(i)*c_liq
+#endif
+#else
+ qv(i) = q(i,j,k,sphum)
+ ql(i) = q(i,j,k,liq_wat) + q(i,j,k,rainwat)
+ qs(i) = q(i,j,k,ice_wat)
+ qd(i) = ql(i) + qs(i)
+#ifdef MULTI_GASES
+ cvm(i) = (1.-(qv(i)+qd(i)))*cv_air*vicvqd(q(i,j,k,1:num_gas)) + qv(i)*cv_vap + ql(i)*c_liq + qs(i)*c_ice
+#else
+ cvm(i) = (1.-(qv(i)+qd(i)))*cv_air + qv(i)*cv_vap + ql(i)*c_liq + qs(i)*c_ice
+#endif
+
 #endif
  enddo
  case(5)
@@ -3574,12 +3587,26 @@ subroutine moist_cp(is,ie, isd,ied, jsd,jed, km, j, k, nwat, sphum, liq_wat, rai
  enddo
  case(4) ! K_warm_rain scheme with fake ice
  do i=is,ie
+#ifndef CCPP
  qv(i) = q(i,j,k,sphum)
  qd(i) = q(i,j,k,liq_wat) + q(i,j,k,rainwat)
 #ifdef MULTI_GASES
  cpm(i) = (1.-(qv(i)+qd(i)))*cp_air*vicpqd(q(i,j,k,:)) + qv(i)*cp_vapor + qd(i)*c_liq
 #else
  cpm(i) = (1.-(qv(i)+qd(i)))*cp_air + qv(i)*cp_vapor + qd(i)*c_liq
+#endif
+#else
+ qv(i) = q(i,j,k,sphum)
+ ql(i) = q(i,j,k,liq_wat) + q(i,j,k,rainwat)
+ qs(i) = q(i,j,k,ice_wat)
+ qd(i) = ql(i) + qs(i)
+#ifdef MULTI_GASES
+ cpm(i) = (1.-(qv(i)+qd(i)))*cp_air*vicpqd(q(i,j,k,:)) + qv(i)*cp_vapor + ql(i)*c_liq + qs(i)*c_ice
+#else
+ cpm(i) = (1.-(qv(i)+qd(i)))*cp_air + qv(i)*cp_vapor + ql(i)*c_liq + qs(i)*c_ice
+#endif
+
+
 #endif
  enddo
  case(5)

model/fv_sg.F90

@@ -299,13 +299,28 @@ subroutine fv_subgrid_z( isd, ied, jsd, jed, is, ie, js, je, km, nq, dt, &
  enddo
  elseif ( nwat==4 ) then
  do i=is,ie
+#ifndef CCPP
  q_liq = q0(i,k,liq_wat) + q0(i,k,rainwat)
 #ifdef MULTI_GASES
  cpm(i) = (1.-(q0(i,k,sphum)+q_liq))*cp_air*vicpqd(q0(i,k,:)) + q0(i,k,sphum)*cp_vapor + q_liq*c_liq
  cvm(i) = (1.-(q0(i,k,sphum)+q_liq))*cv_air*vicvqd(q0(i,k,:)) + q0(i,k,sphum)*cv_vap + q_liq*c_liq
 #else
  cpm(i) = (1.-(q0(i,k,sphum)+q_liq))*cp_air + q0(i,k,sphum)*cp_vapor + q_liq*c_liq
  cvm(i) = (1.-(q0(i,k,sphum)+q_liq))*cv_air + q0(i,k,sphum)*cv_vap + q_liq*c_liq
+#endif
+
+#else
+ q_liq = q0(i,k,liq_wat) + q0(i,k,rainwat)
+ q_sol = q0(i,k,ice_wat) 
+#ifdef MULTI_GASES
+ cpm(i) = (1.-(q0(i,k,sphum)+q_liq+q_sol))*cp_air*vicpqd(q0(i,k,:)) + q0(i,k,sphum)*cp_vapor + q_liq*c_liq + q_sol*c_ice
+ cvm(i) = (1.-(q0(i,k,sphum)+q_liq+q_sol))*cv_air*vicvqd(q0(i,k,:)) + q0(i,k,sphum)*cv_vap + q_liq*c_liq + q_sol*c_ice
+#else
+ cpm(i) = (1.-(q0(i,k,sphum)+q_liq+q_sol))*cp_air + q0(i,k,sphum)*cp_vapor + q_liq*c_liq + q_sol*c_ice
+ cvm(i) = (1.-(q0(i,k,sphum)+q_liq+q_sol))*cv_air + q0(i,k,sphum)*cv_vap + q_liq*c_liq + q_sol*c_ice
+#endif
+
+
 #endif
  enddo
  elseif ( nwat==5 ) then
@@ -382,7 +397,11 @@ subroutine fv_subgrid_z( isd, ied, jsd, jed, is, ie, js, je, km, nq, dt, &
  elseif ( nwat==4 ) then
  do k=1,kbot
  do i=is,ie
+#ifndef CCPP
  qcon(i,k) = q0(i,k,liq_wat) + q0(i,k,rainwat)
+#else
+ qcon(i,k) = q0(i,k,liq_wat) + q0(i,k,rainwat) + q0(i,k,ice_wat)
+#endif
  enddo
  enddo
  elseif ( nwat==5 ) then
@@ -451,7 +470,12 @@ subroutine fv_subgrid_z( isd, ied, jsd, jed, is, ie, js, je, km, nq, dt, &
  elseif ( nwat==3 ) then ! AM3/AM4
  qcon(i,km1) = q0(i,km1,liq_wat) + q0(i,km1,ice_wat)
  elseif ( nwat==4 ) then ! K_warm_rain scheme with fake ice
+#ifndef CCPP
  qcon(i,km1) = q0(i,km1,liq_wat) + q0(i,km1,rainwat)
+#else
+ qcon(i,km1) = q0(i,km1,liq_wat) + q0(i,km1,ice_wat) + &
+ q0(i,km1,rainwat)
+#endif
  elseif ( nwat==5 ) then ! K_warm_rain scheme with fake ice
  qcon(i,km1) = q0(i,km1,liq_wat) + q0(i,km1,ice_wat) + &
  q0(i,km1,snowwat) + q0(i,km1,rainwat)
@@ -572,13 +596,27 @@ subroutine fv_subgrid_z( isd, ied, jsd, jed, is, ie, js, je, km, nq, dt, &
  enddo
  elseif ( nwat == 4 ) then
  do i=is,ie
+#ifndef CCPP
  q_liq = q0(i,kk,liq_wat) + q0(i,kk,rainwat)
 #ifdef MULTI_GASES
  cpm(i) = (1.-(q0(i,kk,sphum)+q_liq))*cp_air*vicpqd(q0(i,kk,:)) + q0(i,kk,sphum)*cp_vapor + q_liq*c_liq
  cvm(i) = (1.-(q0(i,kk,sphum)+q_liq))*cv_air*vicvqd(q0(i,kk,:)) + q0(i,kk,sphum)*cv_vap + q_liq*c_liq
 #else
  cpm(i) = (1.-(q0(i,kk,sphum)+q_liq))*cp_air + q0(i,kk,sphum)*cp_vapor + q_liq*c_liq
  cvm(i) = (1.-(q0(i,kk,sphum)+q_liq))*cv_air + q0(i,kk,sphum)*cv_vap + q_liq*c_liq
+#endif
+#else
+ q_liq = q0(i,kk,liq_wat) + q0(i,kk,rainwat)
+ q_sol = q0(i,kk,ice_wat) 
+#ifdef MULTI_GASES
+ cpm(i) = (1.-(q0(i,kk,sphum)+q_liq+q_sol))*cp_air*vicpqd(q0(i,kk,:)) + q0(i,kk,sphum)*cp_vapor + q_liq*c_liq + q_sol*c_ice
+ cvm(i) = (1.-(q0(i,kk,sphum)+q_liq+q_sol))*cv_air*vicvqd(q0(i,kk,:)) + q0(i,kk,sphum)*cv_vap + q_liq*c_liq + q_sol*c_ice
+#else
+ cpm(i) = (1.-(q0(i,kk,sphum)+q_liq+q_sol))*cp_air + q0(i,kk,sphum)*cp_vapor + q_liq*c_liq + q_sol*c_ice
+ cvm(i) = (1.-(q0(i,kk,sphum)+q_liq+q_sol))*cv_air + q0(i,kk,sphum)*cv_vap + q_liq*c_liq + q_sol*c_ice
+#endif
+
+
 #endif
  enddo
  elseif ( nwat == 5 ) then
@@ -850,13 +888,26 @@ subroutine fv_subgrid_z( isd, ied, jsd, jed, is, ie, js, je, km, nq, dt, &
  enddo
  elseif ( nwat==4 ) then
  do i=is,ie
+#ifndef CCPP
  q_liq = q0(i,k,liq_wat) + q0(i,k,rainwat)
 #ifdef MULTI_GASES
  cpm(i) = (1.-(q0(i,k,sphum)+q_liq))*cp_air*vicpqd(q0(i,k,:)) + q0(i,k,sphum)*cp_vapor + q_liq*c_liq
  cvm(i) = (1.-(q0(i,k,sphum)+q_liq))*cv_air*vicvqd(q0(i,k,:)) + q0(i,k,sphum)*cv_vap + q_liq*c_liq
 #else
  cpm(i) = (1.-(q0(i,k,sphum)+q_liq))*cp_air + q0(i,k,sphum)*cp_vapor + q_liq*c_liq
  cvm(i) = (1.-(q0(i,k,sphum)+q_liq))*cv_air + q0(i,k,sphum)*cv_vap + q_liq*c_liq
+#endif
+#else
+ q_liq = q0(i,k,liq_wat) + q0(i,k,rainwat)
+ q_sol = q0(i,k,ice_wat)
+#ifdef MULTI_GASES
+ cpm(i) = (1.-(q0(i,k,sphum)+q_liq+q_sol))*cp_air*vicpqd(q0(i,k,:)) + q0(i,k,sphum)*cp_vapor + q_liq*c_liq + q_sol*c_ice
+ cvm(i) = (1.-(q0(i,k,sphum)+q_liq+q_sol))*cv_air*vicvqd(q0(i,k,:)) + q0(i,k,sphum)*cv_vap + q_liq*c_liq + q_sol*c_ice
+#else
+ cpm(i) = (1.-(q0(i,k,sphum)+q_liq+q_sol))*cp_air + q0(i,k,sphum)*cp_vapor + q_liq*c_liq + q_sol*c_ice
+ cvm(i) = (1.-(q0(i,k,sphum)+q_liq+q_sol))*cv_air + q0(i,k,sphum)*cv_vap + q_liq*c_liq + q_sol*c_ice
+#endif
+
 #endif
  enddo
  elseif ( nwat==5 ) then
@@ -933,7 +984,11 @@ subroutine fv_subgrid_z( isd, ied, jsd, jed, is, ie, js, je, km, nq, dt, &
  elseif ( nwat==4 ) then
  do k=1,kbot
  do i=is,ie
+#ifndef CCPP
  qcon(i,k) = q0(i,k,liq_wat) + q0(i,k,rainwat)
+#else
+ qcon(i,k) = q0(i,k,liq_wat) + q0(i,k,rainwat) + q0(i,k,ice_wat)
+#endif
  enddo
  enddo
  elseif ( nwat==5 ) then
@@ -998,7 +1053,11 @@ subroutine fv_subgrid_z( isd, ied, jsd, jed, is, ie, js, je, km, nq, dt, &
  elseif ( nwat==3 ) then ! AM3/AM4
  qcon(i,km1) = q0(i,km1,liq_wat) + q0(i,km1,ice_wat)
  elseif ( nwat==4 ) then ! K_warm_rain scheme with fake ice
+#ifndef CCPP
  qcon(i,km1) = q0(i,km1,liq_wat) + q0(i,km1,rainwat)
+#else
+ qcon(i,km1) = q0(i,km1,liq_wat) + q0(i,km1,rainwat) + q0(i,km1,ice_wat)
+#endif
  elseif ( nwat==5 ) then
  qcon(i,km1) = q0(i,km1,liq_wat) + q0(i,km1,ice_wat) + &
  q0(i,km1,snowwat) + q0(i,km1,rainwat)
@@ -1118,13 +1177,26 @@ subroutine fv_subgrid_z( isd, ied, jsd, jed, is, ie, js, je, km, nq, dt, &
  enddo
  elseif ( nwat == 4 ) then
  do i=is,ie
+#ifndef CCPP
  q_liq = q0(i,kk,liq_wat) + q0(i,kk,rainwat)
 #ifdef MULTI_GASES
  cpm(i) = (1.-(q0(i,kk,sphum)+q_liq))*cp_air*vicpqd(q0(i,kk,:)) + q0(i,kk,sphum)*cp_vapor + q_liq*c_liq
  cvm(i) = (1.-(q0(i,kk,sphum)+q_liq))*cv_air*vicvqd(q0(i,kk,:)) + q0(i,kk,sphum)*cv_vap + q_liq*c_liq
 #else
  cpm(i) = (1.-(q0(i,kk,sphum)+q_liq))*cp_air + q0(i,kk,sphum)*cp_vapor + q_liq*c_liq
  cvm(i) = (1.-(q0(i,kk,sphum)+q_liq))*cv_air + q0(i,kk,sphum)*cv_vap + q_liq*c_liq
+#endif
+#else
+ q_liq = q0(i,kk,liq_wat) + q0(i,kk,rainwat)
+ q_sol = q0(i,kk,ice_wat)
+#ifdef MULTI_GASES
+ cpm(i) = (1.-(q0(i,kk,sphum)+q_liq+q_sol))*cp_air*vicpqd(q0(i,kk,:)) + q0(i,kk,sphum)*cp_vapor + q_liq*c_liq + q_sol*c_ice
+ cvm(i) = (1.-(q0(i,kk,sphum)+q_liq+q_sol))*cv_air*vicvqd(q0(i,kk,:)) + q0(i,kk,sphum)*cv_vap + q_liq*c_liq + q_sol*c_ice
+#else
+ cpm(i) = (1.-(q0(i,kk,sphum)+q_liq+q_sol))*cp_air + q0(i,kk,sphum)*cp_vapor + q_liq*c_liq + q_sol*c_ice
+ cvm(i) = (1.-(q0(i,kk,sphum)+q_liq+q_sol))*cv_air + q0(i,kk,sphum)*cv_vap + q_liq*c_liq + q_sol*c_ice
+#endif
+
 #endif
  enddo
  elseif ( nwat == 5 ) then