Ignore:
Timestamp:
06/19/19 01:37:50 (5 years ago)
Author:
dubos
Message:

devel : unique interface for compute_caldyn_fast_X, compute_caldyn_slow_hydro_X

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r920 r921  
    99  USE compute_caldyn_kv_mod, ONLY : compute_caldyn_kv 
    1010  USE compute_caldyn_Coriolis_mod, ONLY : compute_caldyn_Coriolis 
    11   USE compute_caldyn_slow_hydro_mod, ONLY : compute_caldyn_slow_hydro 
     11  USE compute_caldyn_slow_hydro_mod, ONLY : compute_caldyn_slow_hydro => compute_caldyn_slow_hydro_manual 
    1212  USE compute_caldyn_slow_NH_mod, ONLY : compute_caldyn_slow_NH 
    1313  USE compute_caldyn_solver_mod, ONLY : compute_caldyn_solver 
    14   USE compute_caldyn_fast_mod, ONLY : compute_caldyn_fast 
     14  USE compute_caldyn_fast_mod, ONLY : compute_caldyn_fast => compute_caldyn_fast_manual 
    1515  USE compute_NH_geopot_mod, ONLY : compute_NH_geopot 
    1616  IMPLICIT NONE 
    … …  
    136136       END IF 
    137137       u=f_u(ind) 
    138        CALL compute_caldyn_fast(tau,u,mass,theta,pk,geopot,du) ! computes du_fast and updates u 
     138       Kv=f_Kv(ind) ! buffer for partial Bernoulli function 
     139       CALL compute_caldyn_fast(tau,theta,geopot, pk,Kv,du,u) ! computes du_fast and updates u 
    139140    ENDDO 
    140141     
    … …  
    185186          hv=f_hv(ind) 
    186187          Kv=f_Kv(ind) 
    187           CALL compute_caldyn_slow_hydro(u,mass,hv, hflux,Kv,du, .TRUE.) 
     188          CALL compute_caldyn_slow_hydro(.TRUE., u,mass,hv,Kv, Kv, hflux,du) 
    188189       ELSE 
    189190          W = f_W(ind) 
Note: See TracChangeset for help on using the changeset viewer.