Changeset 938 for codes/icosagcm/devel/src
- Timestamp:
- 07/03/19 18:31:43 (5 years ago)
- Location:
- codes/icosagcm/devel/src
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
codes/icosagcm/devel/src/base/init_grid_param.f90
r935 r938 11 11 USE compute_caldyn_fast_mod 12 12 USE compute_caldyn_slow_hydro_mod 13 USE compute_caldyn_coriolis_mod 13 14 14 15 IMPLICIT NONE … … 73 74 compute_caldyn_fast => compute_caldyn_fast_hex 74 75 compute_caldyn_slow_hydro => compute_caldyn_slow_hydro_hex 76 compute_caldyn_coriolis => compute_caldyn_coriolis_hex 75 77 END SUBROUTINE select_compute_hex 76 78 … … 86 88 compute_caldyn_fast => compute_caldyn_fast_unst 87 89 compute_caldyn_slow_hydro => compute_caldyn_slow_hydro_unst 90 compute_caldyn_coriolis => compute_caldyn_coriolis_unst 88 91 END SUBROUTINE select_compute_unst 89 92 -
codes/icosagcm/devel/src/dynamics/caldyn_hevi.f90
r935 r938 6 6 USE compute_caldyn_vert_NH_mod, ONLY : compute_caldyn_vert_NH => compute_caldyn_vert_NH_manual 7 7 USE compute_caldyn_kv_mod, ONLY : compute_caldyn_kv 8 USE compute_caldyn_Coriolis_mod, ONLY : compute_caldyn_Coriolis => compute_caldyn_Coriolis_manual9 8 USE compute_caldyn_slow_hydro_mod, ONLY : compute_caldyn_slow_hydro => compute_caldyn_slow_hydro_manual 10 9 USE compute_caldyn_slow_NH_mod, ONLY : compute_caldyn_slow_NH … … 33 32 USE checksum_mod 34 33 USE compute_caldyn_mod, ONLY : compute_pvort_only, compute_theta, & 35 compute_geopot, compute_caldyn_fast 34 compute_geopot, compute_caldyn_fast, compute_caldyn_coriolis 36 35 IMPLICIT NONE 37 36 LOGICAL,INTENT(IN) :: write_out -
codes/icosagcm/devel/src/dynamics/compute_caldyn.f90
r935 r938 46 46 END SUBROUTINE comp_caldyn_fast 47 47 48 SUBROUTINE comp_caldyn_slow_hydro(zero, u,rhodz,hv,Kv, berni, hflux,du) 49 IMPORT 50 LOGICAL, INTENT(IN) :: zero 51 REAL(rstd),INTENT(IN) :: u(iim_jjm_u, llm_) ! prognostic "velocity" 52 REAL(rstd),INTENT(IN) :: rhodz(iim_jjm_i, llm_) 53 REAL(rstd),INTENT(IN) :: hv(iim_jjm_v, llm_) ! height/mass averaged to vertices 54 REAL(rstd),INTENT(IN) :: Kv(iim_jjm_v, llm_) ! kinetic energy at vertices 55 REAL(rstd), INTENT(OUT) :: berni(iim_jjm_i, llm_) ! Bernoulli function 56 REAL(rstd),INTENT(OUT) :: hflux(iim_jjm_u, llm_) ! hflux in kg/s 57 REAL(rstd),INTENT(INOUT) :: du(iim_jjm_u, llm_) 58 END SUBROUTINE comp_caldyn_slow_hydro 48 SUBROUTINE comp_caldyn_slow_hydro(zero, u,rhodz,hv,Kv, berni, hflux,du) 49 IMPORT 50 LOGICAL, INTENT(IN) :: zero 51 REAL(rstd),INTENT(IN) :: u(iim_jjm_u, llm_) ! prognostic "velocity" 52 REAL(rstd),INTENT(IN) :: rhodz(iim_jjm_i, llm_) 53 REAL(rstd),INTENT(IN) :: hv(iim_jjm_v, llm_) ! height/mass averaged to vertices 54 REAL(rstd),INTENT(IN) :: Kv(iim_jjm_v, llm_) ! kinetic energy at vertices 55 REAL(rstd), INTENT(OUT) :: berni(iim_jjm_i, llm_) ! Bernoulli function 56 REAL(rstd),INTENT(OUT) :: hflux(iim_jjm_u, llm_) ! hflux in kg/s 57 REAL(rstd),INTENT(INOUT) :: du(iim_jjm_u, llm_) 58 END SUBROUTINE comp_caldyn_slow_hydro 59 60 SUBROUTINE comp_caldyn_coriolis(hflux,theta,qu, Ftheta, convm,dtheta_rhodz,du) 61 IMPORT 62 REAL(rstd),INTENT(IN) :: hflux(iim_jjm_u, llm_) ! hflux in kg/s 63 REAL(rstd),INTENT(IN) :: theta(iim_jjm_i, llm_, nqdyn_) ! active scalars 64 REAL(rstd),INTENT(IN) :: qu(iim_jjm_u, llm_) 65 REAL(rstd), INTENT(OUT) :: Ftheta(iim_jjm_u, llm_) ! potential temperature flux 66 REAL(rstd),INTENT(OUT) :: convm(iim_jjm_i, llm_) ! mass flux convergence 67 REAL(rstd),INTENT(OUT) :: dtheta_rhodz(iim_jjm_i, llm_, nqdyn_) 68 REAL(rstd),INTENT(INOUT) :: du(iim_jjm_u, llm_) 69 END SUBROUTINE comp_caldyn_coriolis 59 70 60 71 END INTERFACE … … 65 76 PROCEDURE(comp_caldyn_fast), POINTER :: compute_caldyn_fast => NULL() 66 77 PROCEDURE(comp_caldyn_slow_hydro), POINTER :: compute_caldyn_slow_hydro => NULL() 78 PROCEDURE(comp_caldyn_coriolis), POINTER :: compute_caldyn_coriolis => NULL() 67 79 68 80 END MODULE compute_caldyn_mod
Note: See TracChangeset
for help on using the changeset viewer.