Changeset 952 for codes

Timestamp:

07/15/19 12:23:41 (5 years ago)

Author:

dubos

Message:

devel : temperature diagnostics for unstructured mesh

Location:

codes/icosagcm/devel/src

Files:

• base/init_grid_param.f90 (modified) (3 diffs)
• diagnostics/compute_diagnostics.f90 (modified) (1 diff)
• diagnostics/compute_temperature.F90 (modified) (4 diffs)

codes/icosagcm/devel/src/base/init_grid_param.f90

@@ -4 +4 @@
   USE compute_rhodz_mod
   USE compute_pression_mod
+  USE compute_temperature_mod
 
   USE compute_caldyn_mod
@@ -68 +69 @@
     compute_pression     => compute_pression_hex
     compute_pression_mid => compute_pression_mid_hex
+    compute_temperature  => compute_temperature_hex
     ! dynamics
     compute_pvort_only        => compute_pvort_only_hex
@@ -82 +84 @@
     compute_pression     => compute_pression_unst
     compute_pression_mid => compute_pression_mid_unst
+    compute_temperature  => compute_temperature_unst
     ! dynamics
     compute_pvort_only         => compute_pvort_only_unst

codes/icosagcm/devel/src/diagnostics/compute_diagnostics.f90

@@ -1 +1 @@
 MODULE compute_diagnostics_mod
+  USE icosa
   IMPLICIT NONE
   SAVE
+  PRIVATE
+
+  ! fake array dimensions, for interfaces
+  INTEGER, PARAMETER :: iim_jjm_i=1, iim_jjm_u=1, iim_jjm_v=1, llm_=1, llm1=1, nqdyn_=1
 
   INTERFACE
 
     SUBROUTINE comp_rhodz(flag,ps,rhodz)
-      USE prec, ONLY : rstd
+      IMPORT
       LOGICAL, INTENT(IN) :: flag
-      REAL(rstd),INTENT(IN)  :: ps(1)
-      REAL(rstd),INTENT(OUT) :: rhodz(1,1)
+      REAL(rstd),INTENT(IN)  :: ps(iim_jjm_i)
+      REAL(rstd),INTENT(OUT) :: rhodz(iim_jjm_i,llm_)
     END SUBROUTINE comp_rhodz
 
     SUBROUTINE comp_pression(ps, p, offset)
-      USE prec, ONLY : rstd
+      IMPORT
       INTEGER, INTENT(IN) :: offset
-      REAL(rstd), INTENT(IN) :: ps(1)
-      REAL(rstd), INTENT(OUT) :: p(1,1)
+      REAL(rstd), INTENT(IN) :: ps(iim_jjm_i)
+      REAL(rstd), INTENT(OUT) :: p(iim_jjm_i,llm_)
     END SUBROUTINE comp_pression
+
+    SUBROUTINE comp_temperature(pmid,q,temp)
+      IMPORT
+      REAL(rstd),INTENT(IN)    :: pmid(iim_jjm_i, llm_)
+      REAL(rstd),INTENT(IN)    :: q(iim_jjm_i, llm_, nqdyn_)
+      REAL(rstd),INTENT(INOUT) :: temp(iim_jjm_i, llm_)
+    END SUBROUTINE comp_temperature
+
   END INTERFACE
 
-  PROCEDURE(comp_rhodz), POINTER :: compute_rhodz
-  PROCEDURE(comp_pression), POINTER :: compute_pression, compute_pression_mid
+  PROCEDURE(comp_rhodz),       POINTER :: compute_rhodz   => NULL()
+  PROCEDURE(comp_pression),    POINTER :: compute_pression => NULL(), compute_pression_mid => NULL()
+  PROCEDURE(comp_temperature), POINTER :: compute_temperature => NULL()
+
+  PUBLIC :: compute_rhodz, compute_pression, compute_pression_mid, compute_temperature
 
 END MODULE compute_diagnostics_mod

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

@@ -8 +8 @@
   SAVE
 
-  PUBLIC :: temperature, compute_temperature
+  PUBLIC :: temperature, compute_temperature_unst, compute_temperature_hex, compute_temperature_manual
 
 #include "../unstructured/unstructured.h90"
@@ -15 +15 @@
   
   SUBROUTINE temperature(f_pmid,f_q,f_temp)
+    USE compute_diagnostics_mod, ONLY : compute_temperature
     USE icosa
     TYPE(t_field), POINTER :: f_pmid(:)         ! IN
@@ -117 +118 @@
   END SUBROUTINE compute_temperature_hex
 
-  SUBROUTINE compute_temperature(pmid,q,temp)
+  SUBROUTINE compute_temperature_manual(pmid,q,temp)
     USE icosa
     USE omp_para
@@ -147 +148 @@
        END DO
     END DO
-  END SUBROUTINE compute_temperature
+  END SUBROUTINE compute_temperature_manual
 
   SUBROUTINE Tv2T(f_Tv, f_q, f_T)