Changeset 731 for codes/icosagcm


Ignore:
Timestamp:
08/24/18 12:56:07 (6 years ago)
Author:
dubos
Message:

devel : cleanup and reorganization in dynamics/

Location:
codes/icosagcm/devel/src/dynamics
Files:
1 added
5 edited

Legend:

Unmodified
Added
Removed

  • codes/icosagcm/devel/src/dynamics/caldyn_gcm.F90

    r628 r731  
    22  USE icosa 
    33  USE transfert_mod 
     4  USE caldyn_vars_mod 
    45  USE caldyn_kernels_hevi_mod 
    56  USE caldyn_kernels_base_mod 
    … …  
    141142 
    142143  SUBROUTINE allocate_caldyn 
    143     CALL allocate_field(f_out_u,field_u,type_real,llm)  
    144144    CALL allocate_field(f_qu,field_u,type_real,llm)  
    145145    CALL allocate_field(f_qv,field_z,type_real,llm)  

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

    r562 r731  
    22  USE icosa 
    33  USE transfert_mod 
     4  USE caldyn_vars_mod 
     5  USE caldyn_kernels_hevi_mod 
    46  USE caldyn_kernels_base_mod 
    5   USE caldyn_kernels_hevi_mod 
    67  USE caldyn_gcm_mod 
    78  IMPLICIT NONE 

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

    r531 r731  
    22  USE icosa 
    33  USE transfert_mod 
    4   USE caldyn_kernels_base_mod 
     4  USE caldyn_vars_mod 
    55  IMPLICIT NONE 
    66  PRIVATE 
    77 
    8   PUBLIC :: compute_planetvel, compute_pvort, compute_geopot, & 
    9        compute_caldyn_horiz, compute_caldyn_vert 
     8  PUBLIC :: compute_planetvel, compute_pvort, compute_caldyn_horiz 
    109CONTAINS 
    1110 

  • codes/icosagcm/devel/src/dynamics/caldyn_kernels_base.F90

    r722 r731  
    33  USE transfert_mod 
    44  USE disvert_mod 
     5  USE caldyn_vars_mod 
    56  USE omp_para 
    67  USE trace 
    78  IMPLICIT NONE 
    89  PRIVATE 
    9  
    10   INTEGER, PARAMETER,PUBLIC :: energy=1, enstrophy=2 
    11   TYPE(t_field),POINTER,PUBLIC :: f_out_u(:), f_qu(:), f_qv(:) 
    12   REAL(rstd),SAVE,POINTER :: out_u(:,:), p(:,:), qu(:,:) 
    13   !$OMP THREADPRIVATE(out_u, p, qu) 
    14  
    15   ! temporary shared variables for caldyn 
    16   TYPE(t_field),POINTER,PUBLIC :: f_pk(:),f_wwuu(:),f_planetvel(:), & 
    17                                   f_Fel(:), f_gradPhi2(:), f_wil(:), f_Wetadot(:) 
    18  
    19   INTEGER, PUBLIC :: caldyn_conserv 
    20   !$OMP THREADPRIVATE(caldyn_conserv)  
    21  
    22   TYPE(t_message),PUBLIC :: req_ps, req_mass, req_theta_rhodz, req_u, req_qu, req_geopot, req_w 
     10  SAVE 
    2311 
    2412  PUBLIC :: compute_geopot, compute_caldyn_vert, compute_caldyn_vert_nh 

  • codes/icosagcm/devel/src/dynamics/caldyn_kernels_hevi.F90

    r657 r731  
    55  USE disvert_mod 
    66  USE transfert_mod 
    7   USE caldyn_kernels_base_mod 
     7  USE caldyn_vars_mod 
    88  IMPLICIT NONE 
    99  PRIVATE 
Note: See TracChangeset for help on using the changeset viewer.