Changeset 955 for codes/icosagcm/devel/src/diagnostics/compute_pression.F90

Timestamp:

07/15/19 23:21:31 (5 years ago)

Author:

dubos

Message:

devel : fixed diagnosis of hydrostatic pressure for Lagrangian vertical coordinate

File:

• codes/icosagcm/devel/src/diagnostics/compute_pression.F90 (modified) (5 diffs)

codes/icosagcm/devel/src/diagnostics/compute_pression.F90

@@ -3 +3 @@
   USE icosa
   USE omp_para
-  USE disvert_mod, ONLY : ap, bp, ap_bp_present
+  USE disvert_mod, ONLY : ap, bp, ap_bp_present, ptop, caldyn_eta, eta_lag
   IMPLICIT NONE
   PRIVATE
@@ -10 +10 @@
 
   PUBLIC :: pression, compute_pression_hex, compute_pression_unst, &
-       pression_mid, compute_pression_mid_hex, compute_pression_mid_unst
+       pression_mid, compute_pression_mid_hex, compute_pression_mid_unst, &
+       hydrostatic_pressure, compute_hydrostatic_pressure_unst, compute_hydrostatic_pressure_hex
 
 CONTAINS
@@ -92 +93 @@
   END SUBROUTINE pression_mid
 
+  SUBROUTINE hydrostatic_pressure(f_rhodz, f_theta_rhodz, f_ps, f_p)
+    TYPE(t_field), POINTER :: f_rhodz(:), f_theta_rhodz(:), f_ps(:), f_p(:)
+    REAL(rstd), POINTER :: ps(:), rhodz(:,:), p(:,:), theta_rhodz(:,:,:)
+    INTEGER :: ind
+    DO ind=1,ndomain
+      IF (.NOT. assigned_domain(ind)) CYCLE
+      CALL swap_dimensions(ind)
+      CALL swap_geometry(ind)
+      rhodz=f_rhodz(ind)
+      theta_rhodz=f_theta_rhodz(ind)
+      ps=f_ps(ind)
+      p=f_p(ind)
+      CALL compute_hydrostatic_pressure(rhodz, theta_rhodz, ps, p)
+    ENDDO
+  END SUBROUTINE hydrostatic_pressure
+
 !------------- hexagonal-mesh compute kernels --------
 
@@ -115 +132 @@
 #undef AP
 #undef BP
+
+  SUBROUTINE compute_hydrostatic_pressure_hex(rhodz, theta_rhodz, ps, pk)
+    REAL(rstd),INTENT(IN)  :: rhodz(iim*jjm,llm) ! mass per unit surface in each model level
+    REAL(rstd),INTENT(IN)  :: theta_rhodz(iim*jjm,llm, nqdyn) ! dynamical tracers (theta/entropy)
+    REAL(rstd),INTENT(OUT) :: ps(iim*jjm)        ! surface pressure, diagnosed if Lagrangian vertical coordinate 
+    REAL(rstd),INTENT(OUT) :: pk(iim*jjm,llm)    ! pressure at full levels
+    INTEGER :: ij,l, ij_omp_begin_ext, ij_omp_end_ext
+    !$OMP BARRIER
+    CALL distrib_level(ij_begin_ext,ij_end_ext, ij_omp_begin_ext,ij_omp_end_ext)
+#include "../kernels_hex/compute_hydrostatic_pressure.k90"
+    !$OMP BARRIER
+  END SUBROUTINE compute_hydrostatic_pressure_hex
 
 !----------- unstructured-mesh compute kernels --------
@@ -140 +169 @@
 #undef BP
 
+  SUBROUTINE compute_hydrostatic_pressure_unst(rhodz, theta_rhodz, ps, pk)
+    FIELD_MASS,  INTENT(IN)  :: rhodz ! mass per unit surface in each model level
+    FIELD_THETA, INTENT(IN)  :: theta_rhodz(iim*jjm,llm, nqdyn) ! dynamical tracers (theta/entropy)
+    FIELD_PS,    INTENT(OUT) :: ps(iim*jjm)        ! surface pressure, diagnosed if Lagrangian vertical coordinate 
+    FIELD_MASS,  INTENT(OUT) :: pk(iim*jjm,llm)    ! pressure at full levels
+    DECLARE_INDICES
+#include "../kernels_unst/compute_hydrostatic_pressure.k90"
+  END SUBROUTINE compute_hydrostatic_pressure_unst
+  
+
 END MODULE compute_pression_mod