Update RAS to match GOCART changes to fscav

NCAR · Jun 30, 2021 · 7f6e45e · 7f6e45e
1 parent f35d72d
commit 7f6e45e
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 9 deletions.
diff --git a/physics/rascnv.F90 b/physics/rascnv.F90
@@ -297,7 +297,7 @@ end subroutine rascnv_finalize
 !! \section arg_table_rascnv_run Argument Table
 !! \htmlinclude rascnv_run.html
 !!
-      subroutine rascnv_run(IM,     k,      ntr,   dt,   dtf            &
+      subroutine rascnv_run(IM,     k,      itc, ntc, ntr,   dt,  dtf   &
      &,                     ccwf,   area,   dxmin, dxinv                &
      &,                     psauras, prauras, wminras, dlqf, flipv      &
      &,                     me,     rannum, nrcm,  mp_phys, mp_phys_mg  &
@@ -332,7 +332,7 @@ subroutine rascnv_run(IM,     k,      ntr,   dt,   dtf            &
 !
       logical, intent(in) :: flipv
 !
-      integer, intent(in) :: im, k, ntr, me, nrcm, ntk, kdt             &
+      integer, intent(in) :: im, k, itc, ntc, ntr, me, nrcm, ntk, kdt   &
      &,                      mp_phys, mp_phys_mg
       integer, dimension(:), intent(out)   :: kbot, ktop
       integer, dimension(:), intent(inout) :: kcnv
@@ -401,13 +401,15 @@ subroutine rascnv_run(IM,     k,      ntr,   dt,   dtf            &
       real                fscav_(ntr+2)  ! Fraction scavenged per km
 !
       fscav_ = -999.0_kp                 ! By default no scavenging
-      if (ntr > 0) then
-        if (fscav(1) > zero) then
-          do i=1,ntr
-            fscav_(i) = fscav(i)
-          enddo
-        endif
-      endif
+      if (itc > 0 .and. ntc > 0) then
+        if (ntr >= itc + ntc - 3) then
+          fscav_(itc:ntc-1) = fscav
+        else
+          errmsg = 'Error in rascnv_run: test ntr >= itc + ntc - 3 FAILED'
+          errflg = 1
+          return
+        end if
+      end if
       trcmin = -99999.0_kp
       if (ntk-2 > 0) trcmin(ntk-2) = 1.0e-4_kp
 

diff --git a/physics/rascnv.meta b/physics/rascnv.meta
@@ -210,6 +210,22 @@
   type = integer
   intent = in
   optional = F
+[itc]
+  standard_name = number_of_aerosol_tracers_for_convection
+  long_name = number of aerosol tracers transported/scavenged by convection
+  units = count
+  dimensions = ()
+  type = integer
+  intent = in
+  optional = F
+[ntc]
+  standard_name = number_of_chemical_tracers
+  long_name = number of chemical tracers
+  units = count
+  dimensions = ()
+  type = integer
+  intent = in
+  optional = F
 [ntr]
   standard_name = number_of_tracers_for_samf
   long_name = number of tracers for scale-aware mass flux schemes