Add conversion from CAM tabs to SAM t.

m2lines · Feb 1, 2024 · 350a54f · 350a54f
1 parent a6c5951
commit 350a54f
Showing 1 changed file with 20 additions and 7 deletions.
diff --git a/NN_module/nn_interface_CAM.f90 b/NN_module/nn_interface_CAM.f90
@@ -18,7 +18,7 @@ module nn_interface_CAM
                                   esati, qsati, qsatw, dtqsatw, dtqsati
 use SAM_consts_mod, only: nrf, ggr, cp, tbgmax, tbgmin, tprmax, tprmin, &
                           fac_cond, fac_sub, fac_fus, &
-                          an, bn, ap, bp, &
+                          a_bg, a_pr, an, bn, ap, bp, &
                           omegan, check
 implicit none
 private
@@ -137,7 +137,7 @@ subroutine nn_convection_flux_CAM(pres_cam, pres_int_cam, &
 
         ! TODO: Formulate the input variables to the parameterisation as required.
         ! Convert CAM Moistures to SAM - no need to change temp
-        call  CAM_var_conversion(q_v, q_c, q_i, q)
+        call  CAM_var_conversion(q_v, q_c, q_i, q, t, tabs)
 
         !-----------------------------------------------------
 
@@ -477,11 +477,12 @@ subroutine sam_sounding_finalize()
     end subroutine sam_sounding_finalize
 
 
-    subroutine CAM_var_conversion(qv, qc, qi, q)
+    subroutine CAM_var_conversion(qv, qc, qi, q, tabs, t)
         !! Convert CAM qv, qc, qi to q to used by SAM parameterisation
-        !! q is total water qn is cloud vapor/liquid/ice
-        !! No conversion for temperature because CAM and SAM temperature
-        !! is the same
+        !! q is total water qv/c/i is cloud vapor/liquid/ice
+        !! Convert CAM absolute temperature to moist static energy t used by SAM
+        !! by inverting lines 49-53 of diagnose.f90 from SAM where
+        !! qn is cloud water + ice, qp is precipitable water (0 here)
 
         integer :: nx, nz
             !! array sizes
@@ -491,7 +492,7 @@ subroutine CAM_var_conversion(qv, qc, qi, q)
         ! ---------------------
         ! Fields from CAM/SAM
         ! ---------------------
-        != unit 1 :: q, qn, qv, qc, qi
+        != unit 1 :: q, qv, qc, qi
         real, intent(out) :: q(:, :)
             !! Total non-precipitating water mixing ratio as required by SAM NN
         real, intent(in) :: qv(:, :)
@@ -501,13 +502,25 @@ subroutine CAM_var_conversion(qv, qc, qi, q)
         real, intent(in) :: qi(:, :)
             !! Cloud ice from CAM
 
+        real, intent(out) :: t(:, :)
+            !! Static energy as required by SAM NN
+        real, intent(out) :: tabs(:, :)
+            !! Absolute temperature from CAM
+
 
         nx = size(q, 1)
         nz = size(q, 2)
 
         do k = 1, nz
           do i = 1, nx
             q(i,k) = qv(i,k) + qc(i,k) + qi(i,k)
+
+            omn  = max(0.,min(1.,(tabs(i,k)-tbgmin)*a_bg))
+            omp  = max(0.,min(1.,(tabs(i,k)-tprmin)*a_pr))
+            t(i,k) = tabs(i,k)
+                     ! - (fac_cond+(1.-omp)*fac_fus)*qp(i,k) &
+                     - (fac_cond+(1.-omn)*fac_fus)*(qc(i,k) + qi(i,k)) &
+                     + gamaz(k) &
           end do
         end do