cam6_4_051: Age of air diagnostics

src/physics/cam/aoa_tracers.F90

@@ -31,13 +31,13 @@ module aoa_tracers
   integer, parameter :: ncnst=3  ! number of constituents implemented by this module
 
   ! constituent names
-  character(len=6), parameter :: c_names(ncnst) = (/'AOAMF ', 'HORZ  ', 'VERT  '/)
+  character(len=4), parameter :: c_names(ncnst) = (/'AOA1', 'HORZ', 'VERT'/)
 
   ! constituent source/sink names
-  character(len=8), parameter :: src_names(ncnst) = (/'AOAMFSRC', 'HORZSRC ', 'VERTSRC '/)
+  character(len=7), parameter :: src_names(ncnst) = (/'AOA1SRC', 'HORZSRC', 'VERTSRC'/)
 
   integer :: ifirst = -1 ! global index of first constituent
-  integer :: ixaoa  = -1 ! global index for AOAMFSRC tracer
+  integer :: ixaoa  = -1 ! global index for AOA1SRC tracer
   integer :: ixht   = -1 ! global index for HORZ tracer
   integer :: ixvt   = -1 ! global index for VERT tracer
 
@@ -132,12 +132,12 @@ subroutine aoa_tracers_register
     if (.not. aoa_tracers_flag) return
 
     call cnst_add(c_names(1), mwdry, cpair, 0._r8, ixaoa, readiv=aoa_read_from_ic_file, &
-                  longname='mixing ratio LB tracer')
+                  longname='mixing ratio LB tracer', cam_outfld=.false.)
 
     call cnst_add(c_names(2), mwdry, cpair, 1._r8, ixht,   readiv=aoa_read_from_ic_file, &
-                  longname='horizontal tracer')
+                  longname='horizontal tracer', cam_outfld=.false.)
     call cnst_add(c_names(3), mwdry, cpair, 0._r8, ixvt,   readiv=aoa_read_from_ic_file, &
-                  longname='vertical tracer')
+                  longname='vertical tracer', cam_outfld=.false.)
 
     ifirst = ixaoa
 
@@ -324,6 +324,8 @@ subroutine aoa_tracers_timestep_tend(state, ptend, dt)
     real(r8), parameter :: mmr0 = 1.0e-6_r8   ! initial lower boundary mmr
     real(r8), parameter :: per_yr = 0.02_r8   ! fractional increase per year
 
+    real(r8) :: mmr_out(pcols,pver,ncnst)
+
     !------------------------------------------------------------------
 
     teul = .5_r8*dt/(86400._r8 * treldays)   ! 1/2 for the semi-implicit scheme if dt=time step
@@ -345,7 +347,7 @@ subroutine aoa_tracers_timestep_tend(state, ptend, dt)
     lchnk = state%lchnk
     ncol  = state%ncol
 
-    ! AOAMF
+    ! AOA1
     xmmr = mmr0*(1._r8 + per_yr*years)
     ptend%q(1:ncol,pver,ixaoa) = (xmmr - state%q(1:ncol,pver,ixaoa)) / dt
 
@@ -371,6 +373,15 @@ subroutine aoa_tracers_timestep_tend(state, ptend, dt)
     call outfld (src_names(2), ptend%q(:,:,ixht),   pcols, lchnk)
     call outfld (src_names(3), ptend%q(:,:,ixvt),   pcols, lchnk)
 
+    ! output mixing ratios to history
+    mmr_out(:ncol,:,1) = state%q(:ncol,:,ixaoa) + dt*ptend%q(1:ncol,:,ixaoa)
+    mmr_out(:ncol,:,2) = state%q(:ncol,:,ixht)  + dt*ptend%q(1:ncol,:,ixht)
+    mmr_out(:ncol,:,3) = state%q(:ncol,:,ixvt)  + dt*ptend%q(1:ncol,:,ixvt)
+
+    call outfld (c_names(1), mmr_out(:,:,1),  pcols, lchnk)
+    call outfld (c_names(2), mmr_out(:,:,2),  pcols, lchnk)
+    call outfld (c_names(3), mmr_out(:,:,3),  pcols, lchnk)
+
   end subroutine aoa_tracers_timestep_tend
 
 !===========================================================================
@@ -392,7 +403,7 @@ subroutine init_cnst_3d(m, latvals, lonvals, mask, q)
 
     if (m == ixaoa) then
 
-       ! AOAMF
+       ! AOA1
        q(:,:) = 0.0_r8
 
     else if (m == ixht) then