Changeset 2135 for trunk/LMDZ.COMMON/libf
- Timestamp:
- May 3, 2019, 1:10:27 PM (6 years ago)
- Location:
- trunk/LMDZ.COMMON/libf
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LMDZ.COMMON/libf/dyn3d/conf_gcm.F90
r2126 r2135 17 17 output_grads_dyn, periodav, planet_type, & 18 18 raz_date, resetvarc, starttime, timestart, & 19 ecritstart, force_conserv_tracer19 ecritstart, cpofT,force_conserv_tracer 20 20 USE infotrac, ONLY : type_trac 21 21 use assert_m, only: assert … … 476 476 iphysiq = 5 477 477 CALL getin('iphysiq', iphysiq) 478 479 !Config Key = cpofT 480 !Config Desc = dependence of Cp on T 481 !Config Def = False 482 !Config Help = dependence of Cp on T (true or false) 483 cpofT = .False. 484 if (planet_type.eq."venus") then 485 cpofT = .True. 486 endif 487 CALL getin('cpofT', cpofT) 478 488 479 489 !Config Key = iflag_trac … … 952 962 write(lunout,*)' iflag_phys = ', iflag_phys 953 963 write(lunout,*)' iphysiq = ', iphysiq 964 write(lunout,*)' cpofT = ', cpofT 954 965 write(lunout,*)' iflag_trac = ', iflag_trac 955 966 write(lunout,*)' iapp_tracvl = ', iapp_tracvl -
trunk/LMDZ.COMMON/libf/dyn3d_common/control_mod.F90
r2126 r2135 29 29 integer,save :: ip_ebil_dyn 30 30 logical,save :: offline 31 logical,save :: cpofT 31 32 logical,save :: force_conserv_tracer ! enforce conservation of tracer mass 32 33 character(len=4),save :: config_inca -
trunk/LMDZ.COMMON/libf/dyn3d_common/cpdet_mod.F90
r1659 r2135 21 21 SUBROUTINE ini_cpdet 22 22 23 USE control_mod, ONLY: planet_type23 USE control_mod, ONLY: cpofT 24 24 USE comconst_mod, ONLY: nu_venus,t0_venus 25 25 IMPLICIT none … … 28 28 !====================================================================== 29 29 30 if ( planet_type.eq."venus") then30 if (cpofT) then 31 31 nu_venus=0.35 32 32 t0_venus=460. … … 44 44 FUNCTION cpdet(t) 45 45 46 USE control_mod, ONLY: planet_type46 USE control_mod, ONLY: cpofT 47 47 USE comconst_mod, ONLY: cpp,t0_venus,nu_venus 48 48 IMPLICIT none … … 53 53 real cpdet 54 54 55 if ( planet_type.eq."venus") then55 if (cpofT) then 56 56 cpdet = cpp*(t/t0_venus)**nu_venus 57 57 else … … 75 75 !====================================================================== 76 76 77 USE control_mod, ONLY: planet_type77 USE control_mod, ONLY: cpofT 78 78 USE comconst_mod, ONLY: cpp,t0_venus,nu_venus 79 79 … … 107 107 !---------------------- 108 108 109 if ( planet_type.eq."venus") then109 if (cpofT) then 110 110 yteta = yt**nu_venus & 111 111 & - nu_venus * t0_venus**nu_venus * log(ypk/cpp) … … 136 136 !====================================================================== 137 137 138 USE control_mod, ONLY: planet_type138 USE control_mod, ONLY: cpofT 139 139 USE comconst_mod, ONLY: cpp,nu_venus,t0_venus 140 140 … … 168 168 !---------------------- 169 169 170 if ( planet_type.eq."venus") then170 if (cpofT) then 171 171 172 172 !---------------------- … … 193 193 SUBROUTINE t2tpot_p(nlon,nlev, yt, yteta, ypk) 194 194 ! Parallel version of t2tpot, for an arbitrary number of columns 195 USE control_mod, only : planet_type195 USE control_mod, only : cpofT 196 196 USE parallel_lmdz, only : OMP_CHUNK 197 197 USE comconst_mod, ONLY: cpp,nu_venus,t0_venus … … 231 231 !---------------------- 232 232 233 if ( planet_type.eq."venus") then233 if (cpofT) then 234 234 !$OMP DO SCHEDULE(STATIC,OMP_CHUNK) 235 235 do l=1,nlev … … 250 250 enddo 251 251 !$OMP END DO 252 endif ! of if ( planet_type.eq."venus")252 endif ! of if (cpofT) 253 253 254 254 end subroutine t2tpot_p … … 261 261 ! (more efficient than multiple calls to t2tpot_p() with slices of data) 262 262 USE parallel_lmdz, only : jj_begin,jj_end,OMP_CHUNK 263 USE control_mod, only : planet_type263 USE control_mod, only : cpofT 264 264 USE comconst_mod, ONLY: cpp,nu_venus,t0_venus 265 265 … … 306 306 jje=jj_end 307 307 308 if ( planet_type.eq."venus") then308 if (cpofT) then 309 309 !$OMP DO SCHEDULE(STATIC,OMP_CHUNK) 310 310 do l=1,llm … … 325 325 enddo 326 326 !$OMP END DO 327 endif ! of if ( planet_type.eq."venus")327 endif ! of if (cpofT) 328 328 329 329 end subroutine t2tpot_glo_p … … 334 334 SUBROUTINE tpot2t_p(nlon,nlev,yteta,yt,ypk) 335 335 ! Parallel version of tpot2t, for an arbitrary number of columns 336 USE control_mod, only : planet_type336 USE control_mod, only : cpofT 337 337 USE parallel_lmdz, only : OMP_CHUNK 338 338 USE comconst_mod, ONLY: cpp,nu_venus,t0_venus … … 373 373 !---------------------- 374 374 375 if ( planet_type.eq."venus") then375 if (cpofT) then 376 376 !$OMP DO SCHEDULE(STATIC,OMP_CHUNK) 377 377 do l=1,nlev … … 391 391 enddo 392 392 !$OMP END DO 393 endif ! of if ( planet_type.eq."venus")393 endif ! of if (cpofT) 394 394 end subroutine tpot2t_p 395 395 … … 401 401 ! (more efficient than multiple calls to tpot2t_p() with slices of data) 402 402 USE parallel_lmdz, only : jj_begin,jj_end,OMP_CHUNK 403 USE control_mod, only : planet_type403 USE control_mod, only : cpofT 404 404 USE comconst_mod, ONLY: cpp,nu_venus,t0_venus 405 405 … … 446 446 jje=jj_end 447 447 448 if ( planet_type.eq."venus") then448 if (cpofT) then 449 449 !$OMP DO SCHEDULE(STATIC,OMP_CHUNK) 450 450 do l=1,llm … … 465 465 enddo 466 466 !$OMP END DO 467 endif ! of if ( planet_type.eq."venus")467 endif ! of if (cpofT) 468 468 end subroutine tpot2t_glo_p 469 469 -
trunk/LMDZ.COMMON/libf/dyn3dpar/conf_gcm.F90
r2126 r2135 498 498 iphysiq = 5 499 499 CALL getin('iphysiq', iphysiq) 500 501 !Config Key = cpofT 502 !Config Desc = dependence of Cp on T 503 !Config Def = False 504 !Config Help = dependence of Cp on T (true or false) 505 cpofT = .False. 506 if (planet_type.eq."venus") then 507 cpofT = .True. 508 endif 509 CALL getin('cpofT', cpofT) 500 510 501 511 !Config Key = iflag_trac … … 990 1000 write(lunout,*)' iflag_phys = ', iflag_phys 991 1001 write(lunout,*)' iphysiq = ', iphysiq 1002 write(lunout,*)' cpofT = ', cpofT 992 1003 write(lunout,*)' iflag_trac = ', iflag_trac 993 1004 write(lunout,*)' iapp_tracvl = ', iapp_tracvl -
trunk/LMDZ.COMMON/libf/dynphy_lonlat/phyvenus/iniphysiq_mod.F90
r1682 r2135 76 76 77 77 ! Initialize some physical constants 78 call suphec 78 call suphec(pcpp) 79 79 80 80 ! Initialize cpdet_phy module -
trunk/LMDZ.COMMON/libf/dynphy_lonlat/phyvenus/newstart.F
r2049 r2135 1041 1041 c----------------------------------------------------------------------- 1042 1042 1043 IF ( notopo ) THEN 1044 ps=9.2e6 1045 ELSE 1043 1046 c Extrapolation la pression dans la nouvelle grille 1044 1047 call interp_horiz(psold,ps,imold,jmold,iim,jjm,1, 1045 1048 & rlonuold,rlatvold,rlonu,rlatv) 1049 ENDIF 1046 1050 1047 1051 c On assure la conservation de la masse de l'atmosphere
Note: See TracChangeset
for help on using the changeset viewer.