Changeset 928 for codes/icosagcm/devel/src/dynamics/caldyn_hevi.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/caldyn_hevi.f90 (modified) (5 diffs)

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

@@ -3 +3 @@
   USE transfert_mod
   USE caldyn_vars_mod
-  USE caldyn_kernels_hevi_mod
-  USE caldyn_kernels_base_mod
+  USE compute_caldyn_vert_mod, ONLY : compute_caldyn_vert => compute_caldyn_vert_manual
+  USE compute_caldyn_vert_NH_mod, ONLY : compute_caldyn_vert_NH => compute_caldyn_vert_NH_manual
   USE compute_theta_mod, ONLY : compute_theta => compute_theta_manual
   USE compute_geopot_mod, ONLY : compute_geopot => compute_geopot_manual
   USE compute_caldyn_kv_mod, ONLY : compute_caldyn_kv
-  USE compute_caldyn_Coriolis_mod, ONLY : compute_caldyn_Coriolis
+  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
@@ -62 +62 @@
     REAL(rstd),POINTER :: du(:,:), dW(:,:), dPhi(:,:), hflux(:,:), wflux(:,:)
     REAL(rstd),POINTER :: u(:,:), w(:,:), qu(:,:), qv(:,:), Kv(:,:), hv(:,:)
-
+    REAL(rstd),POINTER :: berni(:,:), Ftheta(:,:)
 ! temporary shared variable
     REAL(rstd),POINTER  :: theta(:,:,:)  
@@ -136 +136 @@
        END IF
        u=f_u(ind)
-       Kv=f_Kv(ind) ! buffer for partial Bernoulli function
-       CALL compute_caldyn_fast(tau,theta,geopot, pk,Kv,du,u) ! computes du_fast and updates u
+       berni=f_berni(ind) ! buffer for partial Bernoulli function
+       CALL compute_caldyn_fast(tau,theta,geopot, pk,berni,du,u) ! computes du_fast and updates u
     ENDDO
     
@@ -186 +186 @@
           hv=f_hv(ind)
           Kv=f_Kv(ind)
-          CALL compute_caldyn_slow_hydro(.TRUE., u,mass,hv,Kv, Kv, hflux,du)
+          berni=f_berni(ind)
+          CALL compute_caldyn_slow_hydro(.TRUE., u,mass,hv,Kv, berni, hflux,du)
        ELSE
           W = f_W(ind)
@@ -197 +198 @@
           CALL compute_caldyn_slow_NH(u,mass,geopot,W, F_el,gradPhi2,w_il, hflux,du,dPhi,dW)
        END IF
-       CALL compute_caldyn_Coriolis(hflux,theta,qu, convm,dtheta_rhodz,du)
+       Ftheta=f_Ftheta(ind)
+       CALL compute_caldyn_Coriolis(hflux,theta,qu, Ftheta, convm,dtheta_rhodz,du)
        IF(caldyn_eta==eta_mass) THEN
           wflux=f_wflux(ind)