Index: LMDZ6/trunk/libf/dyn3d_common/infotrac.F90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/infotrac.F90 (revision 3871) +++ LMDZ6/trunk/libf/dyn3d_common/infotrac.F90 (revision 3872) @@ -155,5 +155,5 @@ WRITE(lunout,*) 'Incoherence between type_trac and config_inca. Model stops. Modify run.def' CALL abort_gcm('infotrac_init','Incoherence between type_trac and config_inca',1) - END IF + ENDIF #ifndef INCA WRITE(lunout,*) 'To run this option you must add cpp key INCA and compile with INCA code' @@ -181,5 +181,5 @@ WRITE(lunout,*) 'Incoherence between type_trac and config_inca. Model stops. Modify run.def' CALL abort_gcm('infotrac_init','Incoherence between type_trac and config_inca',1) - END IF + ENDIF #ifndef INCA WRITE(lunout,*) 'To run this option you must add cpp key INCA and compilewith INCA code' @@ -189,5 +189,5 @@ WRITE(lunout,*) 'type_trac=',type_trac,' not possible. Model stops' CALL abort_gcm('infotrac_init','bad parameter',1) - END IF + ENDIF ! Test if config_inca is other then none for run without INCA @@ -195,5 +195,5 @@ WRITE(lunout,*) 'config_inca will now be changed to none as you do not couple with INCA model' config_inca='none' - END IF + ENDIF !----------------------------------------------------------------------- @@ -204,5 +204,5 @@ !----------------------------------------------------------------------- IF (type_trac == 'lmdz' .OR. type_trac == 'repr' .OR. type_trac == 'coag' .OR. type_trac == 'co2i') THEN - IF (type_trac=='co2i') THEN ! ModThL + IF (type_trac=='co2i') THEN nqCO2 = 1 ELSE @@ -234,5 +234,5 @@ !>jyg ELSE ! type_trac=inca or inco - IF (type_trac=='inco') THEN ! ModThL + IF (type_trac=='inco') THEN nqCO2 = 1 ELSE @@ -259,5 +259,5 @@ CALL abort_gcm('infotrac_init','Bad number of water phases',1) ENDIF - END IF + ENDIF ! nbtr has been read from INCA by init_const_lmdz() in gcm.F #ifdef INCA @@ -267,17 +267,18 @@ #endif nbtr=nqINCA+nqCO2 - + nqtrue=nbtr+nqo WRITE(lunout,*) trim(modname),': nqo = ',nqo WRITE(lunout,*) trim(modname),': nbtr = ',nbtr WRITE(lunout,*) trim(modname),': nqtrue = ',nqtrue WRITE(lunout,*) trim(modname),': nqCO2 = ',nqCO2 - ALLOCATE(hadv_inca(nqINCA), vadv_inca(nqINCA), conv_flg_inca(nqINCA), pbl_flg_inca(nqINCA), solsym_inca(nqINCA)) ! Mod ThL + WRITE(lunout,*) trim(modname),': nqINCA = ',nqINCA + ALLOCATE(hadv_inca(nqINCA), vadv_inca(nqINCA), conv_flg_inca(nqINCA), pbl_flg_inca(nqINCA), solsym_inca(nqINCA)) ENDIF ! type_trac 'inca' ou 'inco' !>jyg IF ((planet_type=="earth").and.(nqtrue < 2)) THEN - WRITE(lunout,*) trim(modname),': nqtrue=',nqtrue, ' is not allowded. 2 tracers is the minimum' + WRITE(lunout,*) trim(modname),': nqtrue=',nqtrue, ' is not allowed. 2 tracers is the minimum' CALL abort_gcm('infotrac_init','Not enough tracers',1) - END IF + ENDIF !jyg< @@ -287,5 +288,5 @@ !! CALL Init_chem_rep_trac(nbtr) !!#endif -!! END IF +!! ENDIF !>jyg @@ -372,5 +373,5 @@ write(lunout,*) 'tnom_transp(iq)=<',trim(tnom_transp(iq)),'>' - END DO !DO iq=1,nqtrue + ENDDO!DO iq=1,nqtrue CLOSE(90) @@ -400,5 +401,5 @@ tnom_transp(1) = 'dummy' endif ! of if (planet_type=="earth") - END IF + ENDIF WRITE(lunout,*) trim(modname),': Valeur de traceur.def :' @@ -469,5 +470,5 @@ CALL Init_chem_rep_trac(nbtr,nqo,tnom_0) #endif - END IF + ENDIF ! ! Allocate variables depending on nbtr @@ -485,5 +486,5 @@ ! dans traceur.def IF (ierr .eq. 0) then - DO iq=1,nqo + DO iq=1,nqo+nqCO2 write(*,*) 'infotrac 237: iq=',iq @@ -526,5 +527,5 @@ write(lunout,*) 'tnom_transp(iq)=<',trim(tnom_transp(iq)),'>' - END DO !DO iq=1,nqo + ENDDO !DO iq=1,nqo CLOSE(90) ELSE !! if traceur.def doesn't exist @@ -543,27 +544,28 @@ hadv_inca, & vadv_inca, & - conv_flg_inca, & ! ModThL - pbl_flg_inca, & ! ModThL - solsym_inca) ! ModThL - conv_flg(1+nqCO2:nbtr) = conv_flg_inca ! ModThL - pbl_flg(1+nqCO2:nbtr) = pbl_flg_inca ! ModThL - solsym(1+nqCO2:nbtr) = solsym_inca ! ModThL - IF (type_trac == 'inco') THEN ! ModThL - conv_flg(1:nqCO2) = 1 ! ModThL - pbl_flg(1:nqCO2) = 1 ! ModThL - solsym(1:nqCO2) = 'CO2' ! ModThL - ENDIF ! ModThL - + conv_flg_inca, & + pbl_flg_inca, & + solsym_inca) + + conv_flg(1+nqCO2:nbtr) = conv_flg_inca + pbl_flg(1+nqCO2:nbtr) = pbl_flg_inca + solsym(1+nqCO2:nbtr) = solsym_inca + + IF (type_trac == 'inco') THEN + conv_flg(1:nqCO2) = 1 + pbl_flg(1:nqCO2) = 1 + solsym(1:nqCO2) = 'CO2' + ENDIF #endif !jyg< - DO iq = nqo+nqCO2+1, nqtrue ! ModThL - hadv(iq) = hadv_inca(iq-nqo-nqCO2) ! ModThL - vadv(iq) = vadv_inca(iq-nqo-nqCO2) ! ModThL - tnom_0(iq)=solsym(iq-nqo-nqCO2) ! ModThL + DO iq = nqo+nqCO2+1, nqtrue + hadv(iq) = hadv_inca(iq-nqo-nqCO2) + vadv(iq) = vadv_inca(iq-nqo-nqCO2) + tnom_0(iq)=solsym_inca(iq-nqo-nqCO2) tnom_transp(iq) = 'air' END DO - END IF ! (type_trac == 'inca' or 'inco') + ENDIF ! (type_trac == 'inca' or 'inco') !----------------------------------------------------------------------- @@ -585,5 +587,5 @@ WRITE(lunout,*) trim(modname),': This choice of advection schema is not available',iq,hadv(iq),vadv(iq) CALL abort_gcm('infotrac_init','Bad choice of advection schema - 1',1) - END IF + ENDIF END DO @@ -601,5 +603,5 @@ ! The true number of tracers is also the total number nqtot = nqtrue - END IF + ENDIF ! @@ -627,5 +629,5 @@ CALL abort_gcm('infotrac_init','Bad choice of advection schema - 2',1) - END IF + ENDIF str1=tnom_0(iq) @@ -635,5 +637,5 @@ ELSE ttext(new_iq)=trim(tnom_0(iq))//descrq(iadv(new_iq)) - END IF + ENDIF ! schemas tenant compte des moments d'ordre superieur @@ -653,5 +655,5 @@ tname(new_iq)=trim(str1)//txtp(jq) END DO - END IF + ENDIF END DO @@ -688,5 +690,5 @@ WRITE(lunout,*)trim(modname),'STOP : The option iadv=',iadv(iq),' is not tested in this version of LMDZ' CALL abort_gcm('infotrac_init','In this version iadv=14 is only permitted for water vapour!',1) - END IF + ENDIF END DO Index: LMDZ6/trunk/libf/phylmd/infotrac_phy.F90 =================================================================== --- LMDZ6/trunk/libf/phylmd/infotrac_phy.F90 (revision 3871) +++ LMDZ6/trunk/libf/phylmd/infotrac_phy.F90 (revision 3872) @@ -135,7 +135,7 @@ CHARACTER(len=4),INTENT(IN) :: type_trac_ INTEGER,INTENT(IN) :: niadv_ (nqtot_) ! equivalent dyn / physique - INTEGER,INTENT(IN) :: conv_flg_(nbtr_) ! ModThL - INTEGER,INTENT(IN) :: pbl_flg_(nbtr_) ! ModThL - CHARACTER(len=8),INTENT(IN) :: solsym_(nbtr_) ! ModThL + INTEGER,INTENT(IN) :: conv_flg_(nbtr_) + INTEGER,INTENT(IN) :: pbl_flg_(nbtr_) + CHARACTER(len=8),INTENT(IN) :: solsym_(nbtr_) ! Isotopes: INTEGER,INTENT(IN) :: nqfils_(nqtot_) @@ -168,5 +168,5 @@ nqo=nqo_ nbtr=nbtr_ - nqCO2=nqCO2_ ! ModThL + nqCO2=nqCO2_ #ifdef CPP_StratAer nbtr_bin=nbtr_bin_ @@ -192,5 +192,5 @@ IF(prt_level.ge.1) THEN - write(lunout,*) TRIM(modname)//": nqtot,nqo,nbtr,nqCO2",nqtot,nqo,nbtr,nqCO2 ! ModThL + write(lunout,*) TRIM(modname)//": nqtot,nqo,nbtr,nqCO2",nqtot,nqo,nbtr,nqCO2 ENDIF Index: LMDZ6/trunk/libf/phylmd/physiq_mod.F90 =================================================================== --- LMDZ6/trunk/libf/phylmd/physiq_mod.F90 (revision 3871) +++ LMDZ6/trunk/libf/phylmd/physiq_mod.F90 (revision 3872) @@ -1943,5 +1943,5 @@ klon, & nqtot, & - nqo+nqCO2, & ! ModThL + nqo+nqCO2, & pdtphys, & annee_ref, & @@ -3781,5 +3781,5 @@ nbp_lon, & nbp_lat-1, & - tr_seri(:,:,1+nqCO2:nbtr), & ! ModThL + tr_seri(:,:,1+nqCO2:nbtr), & ftsol, & paprs, & @@ -4923,5 +4923,5 @@ ENDDO ! - IF (type_trac == 'inca' .OR. type_trac == 'inco') THEN ! ModThL + IF (type_trac == 'inca' .OR. type_trac == 'inco') THEN #ifdef INCA CALL VTe(VTphysiq) @@ -4932,5 +4932,5 @@ pplay, & t_seri, & - tr_seri(:,:,1+nqCO2:nbtr), & ! ModThL + tr_seri(:,:,1+nqCO2:nbtr), & nbtr, & paprs, &