Changeset 732
- Timestamp:
- 08/24/18 13:56:09 (6 years ago)
- Location:
- codes/icosagcm/devel/src
- Files:
-
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
codes/icosagcm/devel/src/base/earth_const.f90
r714 r732 19 19 REAL(rstd),SAVE :: mu ! molar mass of the atmosphere 20 20 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=224 INTEGER, PUBLIC :: caldyn_thermo, caldyn_vert_variant, physics_thermo25 !$OMP THREADPRIVATE(caldyn_thermo)26 !$OMP THREADPRIVATE(physics_thermo)27 28 LOGICAL, SAVE :: boussinesq, hydrostatic29 !$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_vert32 !$OMP THREADPRIVATE(dysl, dysl_geopot, dysl_pvort_only, dysl_caldyn_fast, dysl_caldyn_coriolis, dysl_slow_hydro, dysl_caldyn_vert)33 34 21 CONTAINS 35 22 … … 51 38 CALL getin("scale_height",scale_height) 52 39 53 boussinesq=.FALSE.54 CALL getin("boussinesq",boussinesq)55 PRINT *, "Note : key boussinesq is deprecated, use thermo=boussinesq instead"56 IF(boussinesq) STOP57 hydrostatic=.TRUE.58 CALL getin("hydrostatic",hydrostatic)59 IF(boussinesq .AND. .NOT. hydrostatic) THEN60 PRINT *, 'boussinesq=.TRUE. and hydrostatic=.FALSE. : Non-hydrostatic boussinesq equations are not supported'61 STOP62 END IF63 64 40 mu=kappa/cpp 65 41 radius=radius/scale_factor -
codes/icosagcm/devel/src/dcmip/physics_dcmip2016.f90
r531 r732 1 1 MODULE physics_dcmip2016_mod 2 2 USE ICOSA 3 USE caldyn_vars_mod 3 4 PRIVATE 4 5 -
codes/icosagcm/devel/src/diagnostics/diagflux.F90
r612 r732 2 2 USE icosa 3 3 USE omp_para 4 USE caldyn_vars_mod 4 5 IMPLICIT NONE 5 6 SAVE -
codes/icosagcm/devel/src/diagnostics/observable.f90
r728 r732 1 1 MODULE observable_mod 2 2 USE icosa 3 USE caldyn_vars_mod 3 4 USE diagflux_mod 4 5 USE output_field_mod -
codes/icosagcm/devel/src/dynamics/caldyn_vars.f90
r731 r732 6 6 SAVE 7 7 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) 9 20 10 21 ! temporary shared variables for caldyn … … 12 23 f_Fel(:), f_gradPhi2(:), f_wil(:), f_Wetadot(:) 13 24 14 INTEGER :: caldyn_conserv15 !$OMP THREADPRIVATE(caldyn_conserv)16 25 17 26 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 2 2 USE icosa 3 3 USE omp_para 4 USE caldyn_vars_mod 4 5 IMPLICIT NONE 5 6 PRIVATE -
codes/icosagcm/devel/src/initial/etat0_dcmip2016_baroclinic_wave.f90
r531 r732 1 1 MODULE etat0_dcmip2016_baroclinic_wave_mod 2 2 USE icosa 3 USE caldyn_vars_mod 3 4 IMPLICIT NONE 4 5 PRIVATE -
codes/icosagcm/devel/src/initial/etat0_dcmip2016_cyclone.f90
r531 r732 1 1 MODULE etat0_dcmip2016_cyclone_mod 2 2 USE icosa 3 USE caldyn_vars_mod 3 4 IMPLICIT NONE 4 5 PRIVATE -
codes/icosagcm/devel/src/initial/etat0_dcmip2016_supercell.f90
r531 r732 1 1 MODULE etat0_dcmip2016_supercell_mod 2 2 USE icosa 3 USE caldyn_vars_mod 3 4 IMPLICIT NONE 4 5 PRIVATE -
codes/icosagcm/devel/src/output/write_etat0.f90
r569 r732 1 1 MODULE write_etat0_mod 2 3 4 2 5 3 CONTAINS … … 13 11 USE omp_para 14 12 USE xios_mod 13 USE caldyn_vars_mod 15 14 IMPLICIT NONE 16 15 INTEGER,INTENT(IN) :: it -
codes/icosagcm/devel/src/time/hevi_scheme.f90
r533 r732 4 4 USE field_mod 5 5 USE euler_scheme_mod 6 USE caldyn_vars_mod 6 7 IMPLICIT NONE 7 8 PRIVATE -
codes/icosagcm/devel/src/time/timeloop_gcm.f90
r714 r732 8 8 USE explicit_scheme_mod 9 9 USE hevi_scheme_mod 10 USE caldyn_vars_mod 10 11 IMPLICIT NONE 11 12 PRIVATE
Note: See TracChangeset
for help on using the changeset viewer.