Changeset 928 for codes/icosagcm/devel/src/dynamics/compute_caldyn_Coriolis.F90

Timestamp:

06/21/19 01:01:34 (5 years ago)

Author:

dubos

Message:

devel : separate modules for caldyn_vert and caldyn_vert_NH

File:

• codes/icosagcm/devel/src/dynamics/compute_caldyn_Coriolis.F90 (modified) (5 diffs)

codes/icosagcm/devel/src/dynamics/compute_caldyn_Coriolis.F90

@@ -1 +1 @@
 MODULE compute_caldyn_Coriolis_mod
-  USE grid_param, ONLY : llm
+  USE prec, ONLY : rstd
+  USE grid_param
+  USE earth_const
+  USE disvert_mod
+  USE omp_para
+  USE trace
   IMPLICIT NONE
   PRIVATE
@@ -6 +11 @@
 #include "../unstructured/unstructured.h90"
 
-  PUBLIC :: compute_caldyn_Coriolis
+  PUBLIC :: compute_caldyn_Coriolis_manual, &
+       compute_caldyn_Coriolis_unst, compute_caldyn_Coriolis_hex
 
 CONTAINS
@@ -55 +61 @@
 #endif END_DYSL
 
-  SUBROUTINE compute_coriolis_unst(hflux,theta,qu,Ftheta, convm,dtheta_rhodz,du)
+  SUBROUTINE compute_caldyn_coriolis_unst(hflux,theta,qu, Ftheta, convm,dtheta_rhodz,du)
     USE ISO_C_BINDING, only : C_DOUBLE, C_FLOAT
-    USE grid_param, ONLY : nqdyn
     USE data_unstructured_mod, ONLY : id_coriolis, primal_num, dual_num, edge_num, &
           left, right,primal_deg,primal_edge,primal_ne,trisk_deg,wee,trisk,Ai, &
           enter_trace, exit_trace
-    FIELD_U     :: hflux, Ftheta, qu, du
-    FIELD_MASS  :: convm
-    FIELD_THETA :: theta, dtheta_rhodz
+    FIELD_U     :: hflux, Ftheta, qu, du ! IN, BUF, IN, INOUT
+    FIELD_MASS  :: convm                 ! BUF
+    FIELD_THETA :: theta, dtheta_rhodz   ! IN, OUT
     DECLARE_INDICES
     DECLARE_EDGES
@@ -70 +75 @@
 #include "../kernels_unst/coriolis.k90"
     STOP_TRACE
-  END SUBROUTINE compute_coriolis_unst
-
-  SUBROUTINE compute_caldyn_Coriolis(hflux,theta,qu, convm,dtheta_rhodz,du)
+  END SUBROUTINE compute_caldyn_coriolis_unst
+
+  SUBROUTINE compute_caldyn_Coriolis_hex(hflux,theta,qu, Ftheta, convm,dtheta_rhodz,du)
     USE icosa
-    USE trace
     USE caldyn_vars_mod
-    USE omp_para, ONLY : ll_begin, ll_end
-    REAL(rstd),INTENT(IN)  :: hflux(3*iim*jjm,llm)  ! hflux in kg/s
-    REAL(rstd),INTENT(IN)  :: theta(iim*jjm,llm,nqdyn) ! active scalars
-    REAL(rstd),INTENT(IN)  :: qu(3*iim*jjm,llm)
-    REAL(rstd),INTENT(OUT) :: convm(iim*jjm,llm)  ! mass flux convergence
-    REAL(rstd),INTENT(OUT) :: dtheta_rhodz(iim*jjm,llm,nqdyn)
+    REAL(rstd),INTENT(IN)    :: hflux(3*iim*jjm,llm)  ! hflux in kg/s
+    REAL(rstd),INTENT(IN)    :: theta(iim*jjm,llm,nqdyn) ! active scalars
+    REAL(rstd),INTENT(IN)    :: qu(3*iim*jjm,llm)
+    REAL(rstd), INTENT(OUT)  :: Ftheta(3*iim*jjm,llm)  ! potential temperature flux
+    REAL(rstd),INTENT(OUT)   :: convm(iim*jjm,llm)  ! mass flux convergence
+    REAL(rstd),INTENT(OUT)   :: dtheta_rhodz(iim*jjm,llm,nqdyn)
     REAL(rstd),INTENT(INOUT) :: du(3*iim*jjm,llm)
-    
-    REAL(rstd) :: Ftheta(3*iim*jjm,llm)  ! potential temperature flux
     REAL(rstd) :: uu_right, uu_lup, uu_ldown, du_trisk, divF
     INTEGER :: ij,iq,l,kdown
-
     CALL trace_start("compute_caldyn_Coriolis")
 
-    IF(dysl_caldyn_coriolis) THEN
-
 #include "../kernels_hex/coriolis.k90"
 
-    ELSE
-#define FTHETA(ij) Ftheta(ij,1)
+    CALL trace_end("compute_caldyn_Coriolis")
+  END SUBROUTINE compute_caldyn_Coriolis_hex
+
+  SUBROUTINE compute_caldyn_Coriolis_manual(hflux,theta,qu, Ftheta, convm,dtheta_rhodz,du)
+    USE icosa
+    USE caldyn_vars_mod
+    REAL(rstd),INTENT(IN)    :: hflux(3*iim*jjm,llm)  ! hflux in kg/s
+    REAL(rstd),INTENT(IN)    :: theta(iim*jjm,llm,nqdyn) ! active scalars
+    REAL(rstd),INTENT(IN)    :: qu(3*iim*jjm,llm)
+    REAL(rstd),INTENT(IN)    :: Ftheta(3*iim*jjm,llm)  ! ignored in favor of local buffer
+    REAL(rstd),INTENT(OUT)   :: convm(iim*jjm,llm)  ! mass flux convergence
+    REAL(rstd),INTENT(OUT)   :: dtheta_rhodz(iim*jjm,llm,nqdyn)
+    REAL(rstd),INTENT(INOUT) :: du(3*iim*jjm,llm)
+    REAL(rstd)  :: buf_Ftheta(3*iim*jjm)  ! local buffer for potential temperature flux
+    REAL(rstd) :: uu_right, uu_lup, uu_ldown, du_trisk, divF
+    INTEGER :: ij,iq,l,kdown
+
+    CALL trace_start("compute_caldyn_Coriolis")
+
+#define FTHETA(ij) buf_Ftheta(ij)
 
     DO l=ll_begin, ll_end
@@ -275 +292 @@
 #undef FTHETA
 
-    END IF ! dysl
-
     CALL trace_end("compute_caldyn_Coriolis")
 
-  END SUBROUTINE compute_caldyn_Coriolis
+  END SUBROUTINE compute_caldyn_Coriolis_manual
   
 END MODULE compute_caldyn_Coriolis_mod