Changeset 3872
- Timestamp:
- Apr 12, 2021, 12:40:14 PM (4 years ago)
- Location:
- LMDZ6/trunk/libf
- Files:
-
- 3 edited
-
dyn3d_common/infotrac.F90 (modified) (21 diffs)
-
phylmd/infotrac_phy.F90 (modified) (3 diffs)
-
phylmd/physiq_mod.F90 (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
LMDZ6/trunk/libf/dyn3d_common/infotrac.F90
r3870 r3872 155 155 WRITE(lunout,*) 'Incoherence between type_trac and config_inca. Model stops. Modify run.def' 156 156 CALL abort_gcm('infotrac_init','Incoherence between type_trac and config_inca',1) 157 END 157 ENDIF 158 158 #ifndef INCA 159 159 WRITE(lunout,*) 'To run this option you must add cpp key INCA and compile with INCA code' … … 181 181 WRITE(lunout,*) 'Incoherence between type_trac and config_inca. Model stops. Modify run.def' 182 182 CALL abort_gcm('infotrac_init','Incoherence between type_trac and config_inca',1) 183 END 183 ENDIF 184 184 #ifndef INCA 185 185 WRITE(lunout,*) 'To run this option you must add cpp key INCA and compilewith INCA code' … … 189 189 WRITE(lunout,*) 'type_trac=',type_trac,' not possible. Model stops' 190 190 CALL abort_gcm('infotrac_init','bad parameter',1) 191 END 191 ENDIF 192 192 193 193 ! Test if config_inca is other then none for run without INCA … … 195 195 WRITE(lunout,*) 'config_inca will now be changed to none as you do not couple with INCA model' 196 196 config_inca='none' 197 END 197 ENDIF 198 198 199 199 !----------------------------------------------------------------------- … … 204 204 !----------------------------------------------------------------------- 205 205 IF (type_trac == 'lmdz' .OR. type_trac == 'repr' .OR. type_trac == 'coag' .OR. type_trac == 'co2i') THEN 206 IF (type_trac=='co2i') THEN ! ModThL206 IF (type_trac=='co2i') THEN 207 207 nqCO2 = 1 208 208 ELSE … … 234 234 !>jyg 235 235 ELSE ! type_trac=inca or inco 236 IF (type_trac=='inco') THEN ! ModThL236 IF (type_trac=='inco') THEN 237 237 nqCO2 = 1 238 238 ELSE … … 259 259 CALL abort_gcm('infotrac_init','Bad number of water phases',1) 260 260 ENDIF 261 END 261 ENDIF 262 262 ! nbtr has been read from INCA by init_const_lmdz() in gcm.F 263 263 #ifdef INCA … … 267 267 #endif 268 268 nbtr=nqINCA+nqCO2 269 269 nqtrue=nbtr+nqo 270 270 WRITE(lunout,*) trim(modname),': nqo = ',nqo 271 271 WRITE(lunout,*) trim(modname),': nbtr = ',nbtr 272 272 WRITE(lunout,*) trim(modname),': nqtrue = ',nqtrue 273 273 WRITE(lunout,*) trim(modname),': nqCO2 = ',nqCO2 274 ALLOCATE(hadv_inca(nqINCA), vadv_inca(nqINCA), conv_flg_inca(nqINCA), pbl_flg_inca(nqINCA), solsym_inca(nqINCA)) ! Mod ThL 274 WRITE(lunout,*) trim(modname),': nqINCA = ',nqINCA 275 ALLOCATE(hadv_inca(nqINCA), vadv_inca(nqINCA), conv_flg_inca(nqINCA), pbl_flg_inca(nqINCA), solsym_inca(nqINCA)) 275 276 ENDIF ! type_trac 'inca' ou 'inco' 276 277 !>jyg 277 278 278 279 IF ((planet_type=="earth").and.(nqtrue < 2)) THEN 279 WRITE(lunout,*) trim(modname),': nqtrue=',nqtrue, ' is not allow ded. 2 tracers is the minimum'280 WRITE(lunout,*) trim(modname),': nqtrue=',nqtrue, ' is not allowed. 2 tracers is the minimum' 280 281 CALL abort_gcm('infotrac_init','Not enough tracers',1) 281 END 282 ENDIF 282 283 283 284 !jyg< … … 287 288 !! CALL Init_chem_rep_trac(nbtr) 288 289 !!#endif 289 !! END 290 !! ENDIF 290 291 !>jyg 291 292 … … 372 373 write(lunout,*) 'tnom_transp(iq)=<',trim(tnom_transp(iq)),'>' 373 374 374 END DO!DO iq=1,nqtrue375 ENDDO!DO iq=1,nqtrue 375 376 CLOSE(90) 376 377 … … 400 401 tnom_transp(1) = 'dummy' 401 402 endif ! of if (planet_type=="earth") 402 END 403 ENDIF 403 404 404 405 WRITE(lunout,*) trim(modname),': Valeur de traceur.def :' … … 469 470 CALL Init_chem_rep_trac(nbtr,nqo,tnom_0) 470 471 #endif 471 END 472 ENDIF 472 473 ! 473 474 ! Allocate variables depending on nbtr … … 485 486 ! dans traceur.def 486 487 IF (ierr .eq. 0) then 487 DO iq=1,nqo 488 DO iq=1,nqo+nqCO2 488 489 489 490 write(*,*) 'infotrac 237: iq=',iq … … 526 527 write(lunout,*) 'tnom_transp(iq)=<',trim(tnom_transp(iq)),'>' 527 528 528 END DO!DO iq=1,nqo529 ENDDO !DO iq=1,nqo 529 530 CLOSE(90) 530 531 ELSE !! if traceur.def doesn't exist … … 543 544 hadv_inca, & 544 545 vadv_inca, & 545 conv_flg_inca, & ! ModThL 546 pbl_flg_inca, & ! ModThL 547 solsym_inca) ! ModThL 548 conv_flg(1+nqCO2:nbtr) = conv_flg_inca ! ModThL 549 pbl_flg(1+nqCO2:nbtr) = pbl_flg_inca ! ModThL 550 solsym(1+nqCO2:nbtr) = solsym_inca ! ModThL 551 IF (type_trac == 'inco') THEN ! ModThL 552 conv_flg(1:nqCO2) = 1 ! ModThL 553 pbl_flg(1:nqCO2) = 1 ! ModThL 554 solsym(1:nqCO2) = 'CO2' ! ModThL 555 ENDIF ! ModThL 556 546 conv_flg_inca, & 547 pbl_flg_inca, & 548 solsym_inca) 549 550 conv_flg(1+nqCO2:nbtr) = conv_flg_inca 551 pbl_flg(1+nqCO2:nbtr) = pbl_flg_inca 552 solsym(1+nqCO2:nbtr) = solsym_inca 553 554 IF (type_trac == 'inco') THEN 555 conv_flg(1:nqCO2) = 1 556 pbl_flg(1:nqCO2) = 1 557 solsym(1:nqCO2) = 'CO2' 558 ENDIF 557 559 #endif 558 560 559 561 !jyg< 560 DO iq = nqo+nqCO2+1, nqtrue ! ModThL561 hadv(iq) = hadv_inca(iq-nqo-nqCO2) ! ModThL562 vadv(iq) = vadv_inca(iq-nqo-nqCO2) ! ModThL563 tnom_0(iq)=solsym (iq-nqo-nqCO2) ! ModThL562 DO iq = nqo+nqCO2+1, nqtrue 563 hadv(iq) = hadv_inca(iq-nqo-nqCO2) 564 vadv(iq) = vadv_inca(iq-nqo-nqCO2) 565 tnom_0(iq)=solsym_inca(iq-nqo-nqCO2) 564 566 tnom_transp(iq) = 'air' 565 567 END DO 566 568 567 END 569 ENDIF ! (type_trac == 'inca' or 'inco') 568 570 569 571 !----------------------------------------------------------------------- … … 585 587 WRITE(lunout,*) trim(modname),': This choice of advection schema is not available',iq,hadv(iq),vadv(iq) 586 588 CALL abort_gcm('infotrac_init','Bad choice of advection schema - 1',1) 587 END 589 ENDIF 588 590 END DO 589 591 … … 601 603 ! The true number of tracers is also the total number 602 604 nqtot = nqtrue 603 END 605 ENDIF 604 606 605 607 ! … … 627 629 628 630 CALL abort_gcm('infotrac_init','Bad choice of advection schema - 2',1) 629 END 631 ENDIF 630 632 631 633 str1=tnom_0(iq) … … 635 637 ELSE 636 638 ttext(new_iq)=trim(tnom_0(iq))//descrq(iadv(new_iq)) 637 END 639 ENDIF 638 640 639 641 ! schemas tenant compte des moments d'ordre superieur … … 653 655 tname(new_iq)=trim(str1)//txtp(jq) 654 656 END DO 655 END 657 ENDIF 656 658 END DO 657 659 … … 688 690 WRITE(lunout,*)trim(modname),'STOP : The option iadv=',iadv(iq),' is not tested in this version of LMDZ' 689 691 CALL abort_gcm('infotrac_init','In this version iadv=14 is only permitted for water vapour!',1) 690 END 692 ENDIF 691 693 END DO 692 694 -
LMDZ6/trunk/libf/phylmd/infotrac_phy.F90
r3870 r3872 135 135 CHARACTER(len=4),INTENT(IN) :: type_trac_ 136 136 INTEGER,INTENT(IN) :: niadv_ (nqtot_) ! equivalent dyn / physique 137 INTEGER,INTENT(IN) :: conv_flg_(nbtr_) ! ModThL138 INTEGER,INTENT(IN) :: pbl_flg_(nbtr_) ! ModThL139 CHARACTER(len=8),INTENT(IN) :: solsym_(nbtr_) ! ModThL137 INTEGER,INTENT(IN) :: conv_flg_(nbtr_) 138 INTEGER,INTENT(IN) :: pbl_flg_(nbtr_) 139 CHARACTER(len=8),INTENT(IN) :: solsym_(nbtr_) 140 140 ! Isotopes: 141 141 INTEGER,INTENT(IN) :: nqfils_(nqtot_) … … 168 168 nqo=nqo_ 169 169 nbtr=nbtr_ 170 nqCO2=nqCO2_ ! ModThL170 nqCO2=nqCO2_ 171 171 #ifdef CPP_StratAer 172 172 nbtr_bin=nbtr_bin_ … … 192 192 193 193 IF(prt_level.ge.1) THEN 194 write(lunout,*) TRIM(modname)//": nqtot,nqo,nbtr,nqCO2",nqtot,nqo,nbtr,nqCO2 ! ModThL194 write(lunout,*) TRIM(modname)//": nqtot,nqo,nbtr,nqCO2",nqtot,nqo,nbtr,nqCO2 195 195 ENDIF 196 196 -
LMDZ6/trunk/libf/phylmd/physiq_mod.F90
r3870 r3872 1943 1943 klon, & 1944 1944 nqtot, & 1945 nqo+nqCO2, & ! ModThL1945 nqo+nqCO2, & 1946 1946 pdtphys, & 1947 1947 annee_ref, & … … 3781 3781 nbp_lon, & 3782 3782 nbp_lat-1, & 3783 tr_seri(:,:,1+nqCO2:nbtr), & ! ModThL3783 tr_seri(:,:,1+nqCO2:nbtr), & 3784 3784 ftsol, & 3785 3785 paprs, & … … 4923 4923 ENDDO 4924 4924 ! 4925 IF (type_trac == 'inca' .OR. type_trac == 'inco') THEN ! ModThL4925 IF (type_trac == 'inca' .OR. type_trac == 'inco') THEN 4926 4926 #ifdef INCA 4927 4927 CALL VTe(VTphysiq) … … 4932 4932 pplay, & 4933 4933 t_seri, & 4934 tr_seri(:,:,1+nqCO2:nbtr), & ! ModThL4934 tr_seri(:,:,1+nqCO2:nbtr), & 4935 4935 nbtr, & 4936 4936 paprs, &
Note: See TracChangeset
for help on using the changeset viewer.
