Changeset 732 for codes/icosagcm


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

devel : more cleanup and reorganization in dynamics/

Location:
codes/icosagcm/devel/src
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • codes/icosagcm/devel/src/base/earth_const.f90

    r714 r732  
    1919  REAL(rstd),SAVE :: mu                 ! molar mass of the atmosphere 
    2020 
    21   INTEGER, PARAMETER,PUBLIC :: thermo_none=-99, thermo_theta=1, thermo_entropy=2, & 
    22        thermo_moist=3, thermo_boussinesq=4, thermo_dry=10, thermo_fake_moist=11, thermo_moist_debug=100, & 
    23        caldyn_vert_noncons=1, caldyn_vert_cons=2 
    24   INTEGER, PUBLIC :: caldyn_thermo, caldyn_vert_variant, physics_thermo 
    25   !$OMP THREADPRIVATE(caldyn_thermo)  
    26   !$OMP THREADPRIVATE(physics_thermo)  
    27  
    28   LOGICAL, SAVE :: boussinesq, hydrostatic 
    29   !$OMP THREADPRIVATE(boussinesq) 
    30   !$OMP THREADPRIVATE(hydrostatic)  
    31   LOGICAL :: dysl, dysl_geopot, dysl_pvort_only, dysl_caldyn_fast, dysl_caldyn_coriolis, dysl_slow_hydro, dysl_caldyn_vert 
    32   !$OMP THREADPRIVATE(dysl, dysl_geopot, dysl_pvort_only, dysl_caldyn_fast, dysl_caldyn_coriolis, dysl_slow_hydro, dysl_caldyn_vert) 
    33  
    3421CONTAINS 
    3522   
    … …  
    5138    CALL getin("scale_height",scale_height) 
    5239     
    53     boussinesq=.FALSE. 
    54     CALL getin("boussinesq",boussinesq)   
    55     PRINT *, "Note : key boussinesq is deprecated, use thermo=boussinesq instead" 
    56     IF(boussinesq) STOP 
    57     hydrostatic=.TRUE. 
    58     CALL getin("hydrostatic",hydrostatic)   
    59     IF(boussinesq .AND. .NOT. hydrostatic) THEN 
    60        PRINT *, 'boussinesq=.TRUE. and hydrostatic=.FALSE. : Non-hydrostatic boussinesq equations are not supported' 
    61        STOP 
    62     END IF 
    63      
    6440    mu=kappa/cpp 
    6541    radius=radius/scale_factor 

  • codes/icosagcm/devel/src/dcmip/physics_dcmip2016.f90

    r531 r732  
    11MODULE physics_dcmip2016_mod 
    22  USE ICOSA 
     3  USE caldyn_vars_mod 
    34  PRIVATE 
    45   

  • codes/icosagcm/devel/src/diagnostics/diagflux.F90

    r612 r732  
    22  USE icosa 
    33  USE omp_para 
     4  USE caldyn_vars_mod 
    45  IMPLICIT NONE 
    56  SAVE 

  • codes/icosagcm/devel/src/diagnostics/observable.f90

    r728 r732  
    11MODULE observable_mod 
    22  USE icosa 
     3  USE caldyn_vars_mod 
    34  USE diagflux_mod 
    45  USE output_field_mod 

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

    r731 r732  
    66  SAVE 
    77 
    8   INTEGER, PARAMETER :: energy=1, enstrophy=2 
     8  INTEGER, PARAMETER :: energy=1, enstrophy=2, caldyn_vert_noncons=1, caldyn_vert_cons=2, & 
     9       thermo_none=-99, thermo_theta=1, thermo_entropy=2, & 
     10       thermo_moist=3, thermo_boussinesq=4, thermo_dry=10, thermo_fake_moist=11, thermo_moist_debug=100 
     11 
     12  INTEGER :: caldyn_conserv, caldyn_thermo, caldyn_vert_variant, physics_thermo 
     13  !$OMP THREADPRIVATE(caldyn_conserv, caldyn_thermo, caldyn_vert_variant, physics_thermo) 
     14 
     15  LOGICAL :: boussinesq, hydrostatic 
     16  !$OMP THREADPRIVATE(boussinesq, hydrostatic) 
     17 
     18  LOGICAL :: dysl, dysl_geopot, dysl_pvort_only, dysl_caldyn_fast, dysl_caldyn_coriolis, dysl_slow_hydro, dysl_caldyn_vert 
     19  !$OMP THREADPRIVATE(dysl, dysl_geopot, dysl_pvort_only, dysl_caldyn_fast, dysl_caldyn_coriolis, dysl_slow_hydro, dysl_caldyn_vert) 
    920 
    1021  ! temporary shared variables for caldyn 
    … …  
    1223                           f_Fel(:), f_gradPhi2(:), f_wil(:), f_Wetadot(:) 
    1324 
    14   INTEGER :: caldyn_conserv 
    15   !$OMP THREADPRIVATE(caldyn_conserv)  
    1625 
    1726  TYPE(t_message) :: req_ps, req_mass, req_theta_rhodz, req_u, req_qu, req_geopot, req_w 

  • codes/icosagcm/devel/src/initial/etat0.f90

    r568 r732  
    22  USE icosa 
    33  USE omp_para 
     4  USE caldyn_vars_mod 
    45  IMPLICIT NONE          
    56  PRIVATE 

  • codes/icosagcm/devel/src/initial/etat0_dcmip2016_baroclinic_wave.f90

    r531 r732  
    11MODULE etat0_dcmip2016_baroclinic_wave_mod 
    22  USE icosa 
     3  USE caldyn_vars_mod 
    34  IMPLICIT NONE 
    45  PRIVATE 

  • codes/icosagcm/devel/src/initial/etat0_dcmip2016_cyclone.f90

    r531 r732  
    11MODULE etat0_dcmip2016_cyclone_mod 
    22  USE icosa 
     3  USE caldyn_vars_mod 
    34  IMPLICIT NONE 
    45  PRIVATE 

  • codes/icosagcm/devel/src/initial/etat0_dcmip2016_supercell.f90

    r531 r732  
    11MODULE etat0_dcmip2016_supercell_mod 
    22  USE icosa 
     3  USE caldyn_vars_mod 
    34  IMPLICIT NONE 
    45  PRIVATE 

  • codes/icosagcm/devel/src/output/write_etat0.f90

    r569 r732  
    11MODULE write_etat0_mod 
    2  
    3  
    42 
    53CONTAINS 
    … …  
    1311  USE omp_para 
    1412  USE xios_mod 
     13  USE caldyn_vars_mod 
    1514  IMPLICIT NONE 
    1615    INTEGER,INTENT(IN)    :: it 

  • codes/icosagcm/devel/src/time/hevi_scheme.f90

    r533 r732  
    44  USE field_mod 
    55  USE euler_scheme_mod 
     6  USE caldyn_vars_mod 
    67  IMPLICIT NONE 
    78  PRIVATE 

  • codes/icosagcm/devel/src/time/timeloop_gcm.f90

    r714 r732  
    88  USE explicit_scheme_mod 
    99  USE hevi_scheme_mod 
     10  USE caldyn_vars_mod 
    1011  IMPLICIT NONE 
    1112  PRIVATE 
Note: See TracChangeset for help on using the changeset viewer.