Changeset 938

Timestamp:

07/03/19 18:31:43 (5 years ago)

Author:

dubos

Message:

devel : interfaces for caldyn_coriolis

Location:

codes/icosagcm/devel/src

Files:

• base/init_grid_param.f90 (modified) (3 diffs)
• dynamics/caldyn_hevi.f90 (modified) (2 diffs)
• dynamics/compute_caldyn.f90 (modified) (2 diffs)

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

@@ -11 +11 @@
   USE compute_caldyn_fast_mod
   USE compute_caldyn_slow_hydro_mod
+  USE compute_caldyn_coriolis_mod
 
   IMPLICIT NONE
@@ -73 +74 @@
     compute_caldyn_fast       => compute_caldyn_fast_hex
     compute_caldyn_slow_hydro => compute_caldyn_slow_hydro_hex
+    compute_caldyn_coriolis   => compute_caldyn_coriolis_hex
   END SUBROUTINE select_compute_hex
 
@@ -86 +88 @@
     compute_caldyn_fast        => compute_caldyn_fast_unst
     compute_caldyn_slow_hydro  => compute_caldyn_slow_hydro_unst
+    compute_caldyn_coriolis   => compute_caldyn_coriolis_unst
   END SUBROUTINE select_compute_unst
   

codes/icosagcm/devel/src/dynamics/caldyn_hevi.f90

@@ -6 +6 @@
   USE compute_caldyn_vert_NH_mod, ONLY : compute_caldyn_vert_NH => compute_caldyn_vert_NH_manual
   USE compute_caldyn_kv_mod, ONLY : compute_caldyn_kv
-  USE compute_caldyn_Coriolis_mod, ONLY : compute_caldyn_Coriolis => compute_caldyn_Coriolis_manual
   USE compute_caldyn_slow_hydro_mod, ONLY : compute_caldyn_slow_hydro => compute_caldyn_slow_hydro_manual
   USE compute_caldyn_slow_NH_mod, ONLY : compute_caldyn_slow_NH
@@ -33 +32 @@
     USE checksum_mod
     USE compute_caldyn_mod, ONLY : compute_pvort_only, compute_theta, &
-         compute_geopot, compute_caldyn_fast
+         compute_geopot, compute_caldyn_fast, compute_caldyn_coriolis
     IMPLICIT NONE
     LOGICAL,INTENT(IN)    :: write_out

codes/icosagcm/devel/src/dynamics/compute_caldyn.f90

@@ -46 +46 @@
     END SUBROUTINE comp_caldyn_fast
 
-  SUBROUTINE comp_caldyn_slow_hydro(zero, u,rhodz,hv,Kv, berni, hflux,du)
-    IMPORT
-    LOGICAL, INTENT(IN) :: zero
-    REAL(rstd),INTENT(IN)  :: u(iim_jjm_u, llm_)    ! prognostic "velocity"
-    REAL(rstd),INTENT(IN)  :: rhodz(iim_jjm_i, llm_)
-    REAL(rstd),INTENT(IN)  :: hv(iim_jjm_v, llm_)   ! height/mass averaged to vertices
-    REAL(rstd),INTENT(IN)  :: Kv(iim_jjm_v, llm_)   ! kinetic energy at vertices
-    REAL(rstd), INTENT(OUT) :: berni(iim_jjm_i, llm_)  ! Bernoulli function
-    REAL(rstd),INTENT(OUT) :: hflux(iim_jjm_u, llm_) ! hflux in kg/s 
-    REAL(rstd),INTENT(INOUT) :: du(iim_jjm_u, llm_)
-  END SUBROUTINE comp_caldyn_slow_hydro
+    SUBROUTINE comp_caldyn_slow_hydro(zero, u,rhodz,hv,Kv, berni, hflux,du)
+      IMPORT
+      LOGICAL, INTENT(IN) :: zero
+      REAL(rstd),INTENT(IN)  :: u(iim_jjm_u, llm_)    ! prognostic "velocity"
+      REAL(rstd),INTENT(IN)  :: rhodz(iim_jjm_i, llm_)
+      REAL(rstd),INTENT(IN)  :: hv(iim_jjm_v, llm_)   ! height/mass averaged to vertices
+      REAL(rstd),INTENT(IN)  :: Kv(iim_jjm_v, llm_)   ! kinetic energy at vertices
+      REAL(rstd), INTENT(OUT) :: berni(iim_jjm_i, llm_)  ! Bernoulli function
+      REAL(rstd),INTENT(OUT) :: hflux(iim_jjm_u, llm_) ! hflux in kg/s 
+      REAL(rstd),INTENT(INOUT) :: du(iim_jjm_u, llm_)
+    END SUBROUTINE comp_caldyn_slow_hydro
+    
+    SUBROUTINE comp_caldyn_coriolis(hflux,theta,qu, Ftheta, convm,dtheta_rhodz,du)
+      IMPORT
+      REAL(rstd),INTENT(IN)    :: hflux(iim_jjm_u, llm_)  ! hflux in kg/s
+      REAL(rstd),INTENT(IN)    :: theta(iim_jjm_i, llm_, nqdyn_) ! active scalars
+      REAL(rstd),INTENT(IN)    :: qu(iim_jjm_u, llm_)
+      REAL(rstd), INTENT(OUT)  :: Ftheta(iim_jjm_u, llm_)  ! potential temperature flux
+      REAL(rstd),INTENT(OUT)   :: convm(iim_jjm_i, llm_)  ! mass flux convergence
+      REAL(rstd),INTENT(OUT)   :: dtheta_rhodz(iim_jjm_i, llm_, nqdyn_)
+      REAL(rstd),INTENT(INOUT) :: du(iim_jjm_u, llm_)
+    END SUBROUTINE comp_caldyn_coriolis
 
   END INTERFACE
@@ -65 +76 @@
   PROCEDURE(comp_caldyn_fast),       POINTER :: compute_caldyn_fast       => NULL()
   PROCEDURE(comp_caldyn_slow_hydro), POINTER :: compute_caldyn_slow_hydro => NULL()
+  PROCEDURE(comp_caldyn_coriolis),   POINTER :: compute_caldyn_coriolis   => NULL()
 
 END MODULE compute_caldyn_mod