- Timestamp:
- 08/24/18 14:23:25 (6 years ago)
- Location:
- codes/icosagcm/devel/src/dynamics
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
codes/icosagcm/devel/src/dynamics/caldyn_gcm.F90
r731 r733 60 60 SELECT CASE(TRIM(def)) 61 61 CASE('energy') 62 caldyn_conserv= energy62 caldyn_conserv=conserv_energy 63 63 CASE('enstrophy') 64 caldyn_conserv= enstrophy64 caldyn_conserv=conserv_enstrophy 65 65 CASE DEFAULT 66 66 IF (is_mpi_root) PRINT *,'Bad selector for variable caldyn_conserv : <', & … … 69 69 END SELECT 70 70 IF (is_master) PRINT *, 'caldyn_conserv=',def 71 72 def='trisk' 73 CALL getin('caldyn_kinetic',def) 74 SELECT CASE(TRIM(def)) 75 CASE('trisk') 76 caldyn_kinetic=kinetic_trisk 77 CASE('consistent') 78 caldyn_kinetic=kinetic_consistent 79 CASE DEFAULT 80 IF (is_mpi_root) PRINT *,'Bad selector for variable caldyn_kinetic : <', & 81 TRIM(def),'> options are <trisk>, <consistent>' 82 STOP 83 END SELECT 84 IF (is_master) PRINT *, 'caldyn_kinetic=',def 71 85 72 86 nqdyn=1 ! default value … … 144 158 CALL allocate_field(f_qu,field_u,type_real,llm) 145 159 CALL allocate_field(f_qv,field_z,type_real,llm) 160 CALL allocate_field(f_Kv,field_z,type_real,llm) 146 161 CALL allocate_field(f_pk, field_t,type_real,llm, name='pk') 147 162 CALL allocate_field(f_wwuu, field_u,type_real,llm+1,name='wwuu') … … 272 287 273 288 SELECT CASE(caldyn_conserv) 274 CASE( energy) ! energy-conserving289 CASE(conserv_energy) ! energy-conserving 275 290 DO ind=1,ndomain 276 291 IF (.NOT. assigned_domain(ind)) CYCLE … … 333 348 ENDDO 334 349 335 CASE( enstrophy) ! enstrophy-conserving350 CASE(conserv_enstrophy) ! enstrophy-conserving 336 351 DO ind=1,ndomain 337 352 IF (.NOT. assigned_domain(ind)) CYCLE -
codes/icosagcm/devel/src/dynamics/caldyn_hevi.f90
r731 r733 5 5 USE caldyn_kernels_hevi_mod 6 6 USE caldyn_kernels_base_mod 7 USE caldyn_gcm_mod8 7 IMPLICIT NONE 9 8 PRIVATE -
codes/icosagcm/devel/src/dynamics/caldyn_kernels.f90
r731 r733 144 144 DO l = ll_begin, ll_end 145 145 !!! Compute mass and theta fluxes 146 ! IF (caldyn_conserv== energy) CALL test_message(req_qu)146 ! IF (caldyn_conserv==conserv_energy) CALL test_message(req_qu) 147 147 !DIR$ SIMD 148 148 DO ij=ij_begin_ext,ij_end_ext … … 190 190 191 191 SELECT CASE(caldyn_conserv) 192 CASE( energy) ! energy-conserving TRiSK192 CASE(conserv_energy) ! energy-conserving TRiSK 193 193 194 194 ! CALL wait_message(req_qu) ! COM03 … … 237 237 ENDDO 238 238 239 CASE( enstrophy) ! enstrophy-conserving TRiSK239 CASE(conserv_enstrophy) ! enstrophy-conserving TRiSK 240 240 241 241 DO l=ll_begin,ll_end -
codes/icosagcm/devel/src/dynamics/caldyn_kernels_hevi.F90
r731 r733 580 580 SELECT CASE(caldyn_conserv) 581 581 582 CASE( energy) ! energy-conserving TRiSK582 CASE(conserv_energy) ! energy-conserving TRiSK 583 583 584 584 DO l=ll_begin,ll_end … … 624 624 ENDDO 625 625 626 CASE( enstrophy) ! enstrophy-conserving TRiSK626 CASE(conserv_enstrophy) ! enstrophy-conserving TRiSK 627 627 628 628 DO l=ll_begin,ll_end … … 705 705 DO l = ll_begin, ll_end 706 706 ! Compute mass fluxes 707 IF (caldyn_conserv== energy) CALL test_message(req_qu)707 IF (caldyn_conserv==conserv_energy) CALL test_message(req_qu) 708 708 !DIR$ SIMD 709 709 DO ij=ij_begin_ext,ij_end_ext -
codes/icosagcm/devel/src/dynamics/caldyn_vars.f90
r732 r733 6 6 SAVE 7 7 8 INTEGER, PARAMETER :: energy=1, enstrophy=2, caldyn_vert_noncons=1, caldyn_vert_cons=2, & 8 INTEGER, PARAMETER :: conserv_energy=1, conserv_enstrophy=2, & 9 kinetic_trisk=1, kinetic_consistent=2, & 10 caldyn_vert_noncons=1, caldyn_vert_cons=2, & 9 11 thermo_none=-99, thermo_theta=1, thermo_entropy=2, & 10 12 thermo_moist=3, thermo_boussinesq=4, thermo_dry=10, thermo_fake_moist=11, thermo_moist_debug=100 11 13 12 INTEGER :: caldyn_conserv, caldyn_ thermo, caldyn_vert_variant, physics_thermo13 !$OMP THREADPRIVATE(caldyn_conserv, caldyn_ thermo, caldyn_vert_variant, physics_thermo)14 INTEGER :: caldyn_conserv, caldyn_kinetic, caldyn_thermo, caldyn_vert_variant, physics_thermo 15 !$OMP THREADPRIVATE(caldyn_conserv, caldyn_kinetic, caldyn_thermo, caldyn_vert_variant, physics_thermo) 14 16 15 17 LOGICAL :: boussinesq, hydrostatic … … 20 22 21 23 ! temporary shared variables for caldyn 22 TYPE(t_field),POINTER :: f_qu(:), f_qv(:), f_pk(:),f_wwuu(:),f_planetvel(:), & 24 TYPE(t_field),POINTER :: f_qu(:), f_qv(:), f_Kv(:), & 25 f_pk(:),f_wwuu(:),f_planetvel(:), & 23 26 f_Fel(:), f_gradPhi2(:), f_wil(:), f_Wetadot(:) 24 25 27 26 28 TYPE(t_message) :: req_ps, req_mass, req_theta_rhodz, req_u, req_qu, req_geopot, req_w
Note: See TracChangeset
for help on using the changeset viewer.