Convert cmfmc_dp to kg m-2 s-1 within ZM scheme for consistent units …

…with snapshot
ESCOMP · Jan 30, 2025 · ffeb80b · ffeb80b
1 parent 4d4ca68
commit ffeb80b
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/schemes/sima_diagnostics/zm_diagnostics.F90 b/schemes/sima_diagnostics/zm_diagnostics.F90
@@ -145,9 +145,6 @@ subroutine zm_diagnostics_run(ncol, pver, pverp, ideep, cpair, prec, cape, gravi
       end do
       call history_out_field('FREQZM  ',freqzm)
 
-   !  Convert from hPa s-1 to kg m-2 s-1
-      mcon(:ncol,:pverp) = mcon(:ncol,:pverp) * 100._kind_phys/gravit
-
       call history_out_field('CMFMC_DP', mcon)
 
 

diff --git a/schemes/sima_diagnostics/zm_diagnostics.meta b/schemes/sima_diagnostics/zm_diagnostics.meta
@@ -187,7 +187,7 @@
   intent = in
 [ mcon ]
   standard_name = atmosphere_convective_mass_flux_due_to_deep_convection
-  units = hPa s-1
+  units = kg m-2 s-1
   type = real | kind = kind_phys
   dimensions = (horizontal_loop_extent,vertical_interface_dimension)
   intent = inout

diff --git a/schemes/zhang_mcfarlane/zm_convr.F90 b/schemes/zhang_mcfarlane/zm_convr.F90
@@ -789,6 +789,9 @@ subroutine zm_convr_run(     ncol    ,pver    , &
    rliq(:ncol) = rliq(:ncol) /1000._kind_phys
    rice(:ncol) = rice(:ncol) /1000._kind_phys
 
+! Convert mass flux from reported mb s-1 to kg m-2 s-1
+   mcon(:ncol,:pverp) = mcon(:ncol,:pverp) * 100._kind_phys / gravit
+
    return
 end subroutine zm_convr_run
 

diff --git a/schemes/zhang_mcfarlane/zm_convr.meta b/schemes/zhang_mcfarlane/zm_convr.meta
@@ -310,7 +310,7 @@
   intent = in
 [ mcon ]
   standard_name = atmosphere_convective_mass_flux_due_to_deep_convection
-  units = hPa s-1
+  units = kg m-2 s-1
   type = real | kind = kind_phys
   dimensions = (horizontal_loop_extent,vertical_interface_dimension)
   intent = out