Index: LMDZ6/trunk/libf/dyn3d/check_isotopes.F =================================================================== --- LMDZ6/trunk/libf/dyn3d/check_isotopes.F (revision 4123) +++ LMDZ6/trunk/libf/dyn3d/check_isotopes.F (revision 4124) @@ -1,5 +1,5 @@ subroutine check_isotopes_seq(q,ip1jmp1,err_msg) - USE infotrac, ONLY: nqtot, nqo, niso, ntraciso, ntraceurs_zone, - & ok_isotopes, ok_isotrac, use_iso, + USE infotrac, ONLY: nqtot, nqo, niso, ntraciso, nzone, + & use_iso, & iqiso, index_trac,indnum_fn_num, tnat implicit none @@ -29,5 +29,5 @@ real deltaD - if (ok_isotopes) then + if (niso > 0) then write(*,*) 'check_isotopes 31: err_msg=',err_msg @@ -130,8 +130,8 @@ !write(*,*) 'check_isotopes 129' - if (ok_isotrac) then + if (nzone > 0) then if (use_iso(2).and.use_iso(1)) then - do izone=1,ntraceurs_zone + do izone=1,nzone ixt=index_trac(izone,indnum_fn_num(2)) ieau=index_trac(izone,indnum_fn_num(1)) @@ -157,5 +157,5 @@ enddo ! do k=1,llm enddo ! do phase=1,nqo - enddo !do izone=1,ntraceurs_zone + enddo !do izone=1,nzone endif !if (use_iso(2).and.use_iso(1)) then @@ -167,5 +167,5 @@ xtractot=0.0 xiiso=q(i,k,iq) - do izone=1,ntraceurs_zone + do izone=1,nzone iq=iqiso(index_trac(izone,iiso),phase) xtractot=xtractot+ q(i,k,iq) @@ -185,8 +185,8 @@ ! bidouille pour éviter divergence: if (abs(xtractot).gt.ridicule) then - do izone=1,ntraceurs_zone + do izone=1,nzone ixt=index_trac(izone,iiso) q(i,k,iq)=q(i,k,iq)/xtractot*xiiso - enddo !do izone=1,ntraceurs_zone + enddo !do izone=1,nzone endif !if ((abs(xtractot).gt.ridicule) then enddo !DO i = 1,ip1jmp1 @@ -195,7 +195,7 @@ enddo !do iiso=1,niso - endif !if (ok_isotrac) then - - endif ! if (ok_isotopes) + endif !if (nzone > 0) + + endif ! if (niso > 0) !write(*,*) 'check_isotopes 198' Index: LMDZ6/trunk/libf/dyn3d/dynetat0.F90 =================================================================== --- LMDZ6/trunk/libf/dyn3d/dynetat0.F90 (revision 4123) +++ LMDZ6/trunk/libf/dyn3d/dynetat0.F90 (revision 4124) @@ -6,5 +6,5 @@ ! Purpose: Initial state reading. !------------------------------------------------------------------------------- - USE infotrac, ONLY: nqtot, tracers, niso, iqiso, iso_indnum, iso_num, tnat, alpha_ideal, ok_isotopes, iH2O + USE infotrac, ONLY: nqtot, tracers, niso, iqiso, iso_indnum, iso_num, tnat, alpha_ideal, iH2O USE strings_mod, ONLY: maxlen, msg, strStack, real2str USE netcdf, ONLY: NF90_OPEN, NF90_NOWRITE, NF90_INQ_VARID, & Index: LMDZ6/trunk/libf/dyn3d/iniacademic.F90 =================================================================== --- LMDZ6/trunk/libf/dyn3d/iniacademic.F90 (revision 4123) +++ LMDZ6/trunk/libf/dyn3d/iniacademic.F90 (revision 4124) @@ -5,5 +5,5 @@ USE filtreg_mod, ONLY: inifilr - USE infotrac, ONLY: nqtot, niso_possibles, ok_isotopes, ok_iso_verif, tnat, alpha_ideal, & + USE infotrac, ONLY: nqtot, niso, niso_possibles, ok_iso_verif, tnat, alpha_ideal, & iqiso, tracers, iso_indnum, iso_num USE control_mod, ONLY: day_step,planet_type @@ -284,5 +284,5 @@ ! iName = tracers(iq)%iso_iName ! (next commit) iName = iso_num(iq) - if (.NOT.ok_isotopes .OR. iName <= 0) CYCLE + if (niso <= 0 .OR. iName <= 0) CYCLE iPhase = tracers(iq)%iso_iPhase iqParent = tracers(iq)%iqParent Index: LMDZ6/trunk/libf/dyn3d/qminimum.F =================================================================== --- LMDZ6/trunk/libf/dyn3d/qminimum.F (revision 4123) +++ LMDZ6/trunk/libf/dyn3d/qminimum.F (revision 4124) @@ -4,5 +4,5 @@ SUBROUTINE qminimum( q,nqtot,deltap ) - USE infotrac, ONLY: ok_isotopes,ntraciso,iqiso,ok_iso_verif + USE infotrac, ONLY: niso, ntraciso,iqiso,ok_iso_verif IMPLICIT none c @@ -59,8 +59,6 @@ if (seuil_liq - q(i,k,iq_liq) .gt. 0.d0 ) then - if (ok_isotopes) then - zx_defau_diag(i,k,iq_liq)=AMAX1 + if (niso > 0) zx_defau_diag(i,k,iq_liq)=AMAX1 : ( seuil_liq - q(i,k,iq_liq), 0.0 ) - endif !if (ok_isotopes) then q(i,k,iq_vap) = q(i,k,iq_vap) + q(i,k,iq_liq) - seuil_liq @@ -80,7 +78,6 @@ if ( seuil_vap - q(i,k,iq) .gt. 0.d0 ) then - if (ok_isotopes) then - zx_defau_diag(i,k,iq)=AMAX1( seuil_vap - q(i,k,iq), 0.0 ) - endif !if (ok_isotopes) then + if (niso > 0) + & zx_defau_diag(i,k,iq)=AMAX1( seuil_vap - q(i,k,iq), 0.0 ) q(i,k-1,iq) = q(i,k-1,iq) - ( seuil_vap - q(i,k,iq) ) * @@ -110,5 +107,5 @@ !write(*,*) 'qminimum 128' - if (ok_isotopes) then + if (niso > 0) then ! CRisi: traiter de même les traceurs d'eau ! Mais il faut les prendre à l'envers pour essayer de conserver la @@ -184,5 +181,5 @@ endif !if (ok_iso_verif) then - endif !if (ok_isotopes) then + endif !if (niso > 0) then !write(*,*) 'qminimum 188' Index: LMDZ6/trunk/libf/dyn3d_common/infotrac.F90 =================================================================== --- LMDZ6/trunk/libf/dyn3d_common/infotrac.F90 (revision 4123) +++ LMDZ6/trunk/libf/dyn3d_common/infotrac.F90 (revision 4124) @@ -16,5 +16,5 @@ PUBLIC :: tracers, type_trac !--- Full tracers database, tracers type keyword PUBLIC :: nqtot, nbtr, nqo, nqCO2, nqtottr !--- Main dimensions - PUBLIC :: solsym, conv_flg, pbl_flg !--- Tracers names + convection & boundary layer activation keys + PUBLIC :: conv_flg, pbl_flg !--- Convection & boundary layer activation keys !=== FOR ISOTOPES: General @@ -36,5 +36,5 @@ !=== OLD QUANTITIES OR ALIASES FOR OLDER NAMES (TO BE REMOVED SOON) PUBLIC :: ntraciso, ntraceurs_zone - PUBLIC :: ok_isotopes, ok_iso_verif, ok_isotrac, use_iso + PUBLIC :: ok_iso_verif, use_iso PUBLIC :: iso_num, iso_indnum, indnum_fn_num, niso_possibles PUBLIC :: qperemin, masseqmin, ratiomin @@ -139,5 +139,5 @@ REAL, SAVE :: qperemin, masseqmin, ratiomin INTEGER, SAVE :: niso_possibles - LOGICAL, SAVE :: ok_isotopes, ok_iso_verif, ok_isotrac + LOGICAL, SAVE :: ok_iso_verif LOGICAL, SAVE, ALLOCATABLE :: use_iso(:) INTEGER, SAVE, ALLOCATABLE :: iso_num(:) !--- idx in [1,niso_possibles] = f(1<=iq <=nqtot) @@ -150,5 +150,4 @@ INTEGER, SAVE, ALLOCATABLE :: conv_flg(:), & !--- Convection activation ; needed for INCA (nbtr) pbl_flg(:) !--- Boundary layer activation ; needed for INCA (nbtr) - CHARACTER(LEN=8), SAVE, ALLOCATABLE :: solsym(:) !--- Names from INCA (nbtr) LOGICAL, PARAMETER :: lOldCode = .TRUE. @@ -379,10 +378,9 @@ IF(ALL([2,3] /= nqo)) CALL abort_gcm(modname, 'Only 2 or 3 water phases allowed ; found nqo='//TRIM(int2str(nqo)), 1) ALLOCATE(hadv(nqtrue), conv_flg(nbtr), hadv_inca(nqINCA), conv_flg_inca(nqINCA), solsym_inca(nqINCA)) - ALLOCATE(vadv(nqtrue), pbl_flg(nbtr), vadv_inca(nqINCA), pbl_flg_inca(nqINCA), solsym(nbtr)) + ALLOCATE(vadv(nqtrue), pbl_flg(nbtr), vadv_inca(nqINCA), pbl_flg_inca(nqINCA)) CALL init_transport(hadv_inca, vadv_inca, conv_flg_inca, pbl_flg_inca, solsym_inca) !--- Passive CO2 tracer is at position 1 because: H2O has been removed ; nqCO2/=0 in "inco" case only conv_flg(1:nbtr) = [(1, k=1, nqCO2), conv_flg_inca] pbl_flg(1:nbtr) = [(1, k=1, nqCO2), pbl_flg_inca] - solsym (1:nbtr) = [('CO2 ', k=1, nqCO2), solsym_inca] ALLOCATE(ttr(nqtrue)) ttr(1:nqo+nqCO2) = tracers @@ -390,5 +388,5 @@ ttr(1+nqo:nqCO2+nqo )%component = 'co2i' ttr(1+nqo+nqCO2:nqtrue)%component = 'inca' - ttr(1+nqo :nqtrue)%name = solsym + ttr(1+nqo :nqtrue)%name = [('CO2 ', k=1, nqCO2), solsym_inca] ttr(1+nqo+nqCO2:nqtrue)%parent = tran0 ttr(1+nqo+nqCO2:nqtrue)%phase = 'g' @@ -409,5 +407,5 @@ lerr = getKey('hadv', hadv, ky=tracers(:)%keys) lerr = getKey('vadv', vadv, ky=tracers(:)%keys) - ALLOCATE(conv_flg(nbtr), pbl_flg(nbtr), solsym(nbtr)) + ALLOCATE(conv_flg(nbtr), pbl_flg(nbtr)) conv_flg(1:nbtr) = [(1, it=1, nbtr)] !--- Convection activated for all tracers pbl_flg(1:nbtr) = [(1, it=1, nbtr)] !--- Boundary layer activated for all tracers @@ -534,5 +532,5 @@ nqtottr = nqtot-nqo*(1+ntiso) !--- NO H2O-FAMILY TRACER IS PASSED TO THE PHYSICS - ALLOCATE(conv_flg(nbtr), pbl_flg(nbtr), solsym(nbtr)) + ALLOCATE(conv_flg(nbtr), pbl_flg(nbtr)) #ifndef INCA conv_flg(1:nbtr) = 1 !--- Convection activated for all tracers @@ -540,7 +538,6 @@ #else !--- Passive CO2 tracer is at position 1 because: H2O has been removed ; nqCO2/=0 in "inco" case only - conv_flg(1:nbtr) = [( 1, ic=1, nqCO2),conv_flg_inca] - pbl_flg(1:nbtr) = [( 1, ic=1, nqCO2), pbl_flg_inca] - solsym(1:nbtr) = [('CO2 ', ic=1, nqCO2), solsym_inca] + conv_flg(1:nbtr) = [(1, ic=1, nqCO2),conv_flg_inca] + pbl_flg(1:nbtr) = [(1, ic=1, nqCO2), pbl_flg_inca] #endif @@ -798,6 +795,4 @@ !--- Isotopic quantities (to be removed soon) - ok_isotopes = i%niso > 0 - ok_isotrac = i%nzone > 0 ok_iso_verif = i%check niso_possibles = SIZE(tnom_iso) Index: LMDZ6/trunk/libf/dyn3dmem/check_isotopes_loc.F =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/check_isotopes_loc.F (revision 4123) +++ LMDZ6/trunk/libf/dyn3dmem/check_isotopes_loc.F (revision 4124) @@ -1,5 +1,5 @@ subroutine check_isotopes(q,ijb,ije,err_msg) - USE infotrac, ONLY: nqtot, nqo, niso, ntraciso, ntraceurs_zone, - & ok_isotopes, ok_isotrac, use_iso, + USE infotrac, ONLY: nqtot, nqo, niso, ntraciso, nzone, + & use_iso, & iqiso, indnum_fn_num, index_trac, tnat USE parallel_lmdz @@ -30,5 +30,5 @@ real deltaD - if (ok_isotopes) then + if (niso > 0) then ! write(*,*) 'check_isotopes 31: err_msg=',err_msg @@ -139,5 +139,5 @@ ! write(*,*) 'check_isotopes 129' - if (ok_isotrac) then + if (nzone > 0) then if (use_iso(2).and.use_iso(1)) then @@ -208,7 +208,7 @@ enddo !do iiso=1,niso - endif !if (ok_isotrac) then - - endif ! if (ok_isotopes) + endif !if (nzone > 0) + + endif ! if (niso > 0) ! write(*,*) 'check_isotopes 198' Index: LMDZ6/trunk/libf/dyn3dmem/dynetat0_loc.F90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/dynetat0_loc.F90 (revision 4123) +++ LMDZ6/trunk/libf/dyn3dmem/dynetat0_loc.F90 (revision 4124) @@ -7,5 +7,5 @@ !------------------------------------------------------------------------------- USE parallel_lmdz - USE infotrac, ONLY: nqtot, tracers, niso, iqiso, iso_indnum, iso_num, tnat, alpha_ideal, ok_isotopes, iH2O + USE infotrac, ONLY: nqtot, tracers, niso, iqiso, iso_indnum, iso_num, tnat, alpha_ideal, iH2O USE strings_mod, ONLY: maxlen, msg, strStack, real2str USE netcdf, ONLY: NF90_OPEN, NF90_NOWRITE, NF90_INQUIRE_DIMENSION, NF90_INQ_VARID, & Index: LMDZ6/trunk/libf/dyn3dmem/iniacademic_loc.F90 =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/iniacademic_loc.F90 (revision 4123) +++ LMDZ6/trunk/libf/dyn3dmem/iniacademic_loc.F90 (revision 4124) @@ -5,5 +5,5 @@ USE filtreg_mod, ONLY: inifilr - USE infotrac, ONLY: nqtot, niso_possibles, ok_isotopes, ok_iso_verif, tnat, alpha_ideal, & + USE infotrac, ONLY: nqtot, niso, niso_possibles, ok_iso_verif, tnat, alpha_ideal, & iqiso, tracers, iso_indnum, iso_num USE control_mod, ONLY: day_step,planet_type @@ -288,5 +288,5 @@ ! iName = tracers(iq)%iso_iName ! (next commit) iName = iso_num(iq) - if (.NOT.ok_isotopes .OR. iName <= 0) CYCLE + if (niso <= 0 .OR. iName <= 0) CYCLE iPhase = tracers(iq)%iso_iPhase iqParent = tracers(iq)%iqParent Index: LMDZ6/trunk/libf/dyn3dmem/qminimum_loc.F =================================================================== --- LMDZ6/trunk/libf/dyn3dmem/qminimum_loc.F (revision 4123) +++ LMDZ6/trunk/libf/dyn3dmem/qminimum_loc.F (revision 4124) @@ -4,5 +4,5 @@ SUBROUTINE qminimum_loc( q,nqtot,deltap ) USE parallel_lmdz - USE infotrac, ONLY: ok_isotopes,ntraciso,iqiso,ok_iso_verif, & + USE infotrac, ONLY: niso,ntraciso,iqiso,ok_iso_verif, & & ratiomin,qperemin ! CRisi 23nov2020 IMPLICIT none @@ -71,8 +71,6 @@ if (seuil_liq - q(i,k,iq_liq) .gt. 0.d0 ) then - if (ok_isotopes) then - zx_defau_diag(i,k,iq_liq)=AMAX1 + if (niso > 0) zx_defau_diag(i,k,iq_liq)=AMAX1 : ( seuil_liq - q(i,k,iq_liq), 0.0 ) - endif !if (ok_isotopes) then q(i,k,iq_vap) = q(i,k,iq_vap) + q(i,k,iq_liq) - seuil_liq @@ -100,7 +98,6 @@ if ( seuil_vap - q(i,k,iq) .gt. 0.d0 ) then - if (ok_isotopes) then - zx_defau_diag(i,k,iq)=AMAX1( seuil_vap - q(i,k,iq), 0.0 ) - endif !if (ok_isotopes) then + if (niso > 0) + & zx_defau_diag(i,k,iq)=AMAX1( seuil_vap - q(i,k,iq), 0.0 ) q(i,k-1,iq) = q(i,k-1,iq) - ( seuil_vap - q(i,k,iq) ) * @@ -141,5 +138,5 @@ !write(lunout,*) 'qminimum 128' - if (ok_isotopes) then + if (niso > 0) then !write(lunout,*) 'qminimum 140' ! CRisi: traiter de même les traceurs d'eau @@ -277,5 +274,5 @@ endif !if (ok_iso_verif) then - endif !if (ok_isotopes) then + endif !if (niso > 0) then !write(*,*) 'qminimum 188' c Index: LMDZ6/trunk/libf/dynphy_lonlat/phylmd/iniphysiq_mod.F90 =================================================================== --- LMDZ6/trunk/libf/dynphy_lonlat/phylmd/iniphysiq_mod.F90 (revision 4123) +++ LMDZ6/trunk/libf/dynphy_lonlat/phylmd/iniphysiq_mod.F90 (revision 4124) @@ -16,5 +16,5 @@ USE mod_phys_lmdz_para, ONLY: klon_omp ! number of columns (on local omp grid) USE vertical_layers_mod, ONLY : init_vertical_layers - USE infotrac, ONLY: nbtr,nqCO2,tracers,isotopes,type_trac,conv_flg,pbl_flg,solsym,nqtottr + USE infotrac, ONLY: nbtr,nqCO2,tracers,isotopes,type_trac,conv_flg,pbl_flg,nqtottr #ifdef CPP_StratAer USE infotrac_phy, ONLY: nbtr_bin, nbtr_sulgas, id_OCS_strat, & @@ -137,5 +137,5 @@ ! Initialize tracer names, numbers, etc. for physics - CALL init_infotrac_phy(type_trac, tracers, isotopes, nqtottr, nqCO2, pbl_flg, conv_flg, solsym) + CALL init_infotrac_phy(type_trac, tracers, isotopes, nqtottr, nqCO2, pbl_flg, conv_flg) ! Initializations for Reprobus Index: LMDZ6/trunk/libf/phylmd/infotrac_phy.F90 =================================================================== --- LMDZ6/trunk/libf/phylmd/infotrac_phy.F90 (revision 4123) +++ LMDZ6/trunk/libf/phylmd/infotrac_phy.F90 (revision 4124) @@ -15,5 +15,5 @@ PUBLIC :: tracers, type_trac !--- Full tracers database, tracers type keyword PUBLIC :: nqtot, nbtr, nqo, nqCO2, nqtottr !--- Main dimensions - PUBLIC :: conv_flg, pbl_flg, solsym !--- Convection & boundary layer activation keys + PUBLIC :: conv_flg, pbl_flg !--- Convection & boundary layer activation keys !=== FOR ISOTOPES: General @@ -33,5 +33,5 @@ PUBLIC :: ntraciso, ntraceurs_zone, indnum_fn_num, use_iso, index_trac, iqiso - PUBLIC :: niso_possibles, ok_isotrac, ok_isotopes, ok_iso_verif + PUBLIC :: niso_possibles, ok_iso_verif INTERFACE isoSelect; MODULE PROCEDURE isoSelectByIndex, isoSelectByName; END INTERFACE isoSelect @@ -132,6 +132,5 @@ INTEGER, SAVE, ALLOCATABLE ::conv_flg(:), & !--- Convection activation ; needed for INCA (nbtr) pbl_flg(:) !--- Boundary layer activation ; needed for INCA (nbtr) - CHARACTER(LEN=8), SAVE, ALLOCATABLE :: solsym(:) -!$OMP THREADPRIVATE(conv_flg, pbl_flg, solsym) +!$OMP THREADPRIVATE(conv_flg, pbl_flg) !--- Aliases for older names + quantities to be removed (will be replaced by:) @@ -142,6 +141,6 @@ INTEGER, SAVE :: niso_possibles !--- suppressed (use effective niso instead) !$OMP THREADPRIVATE(niso_possibles) - LOGICAL, SAVE :: ok_isotopes, ok_iso_verif, ok_isotrac !--- -> niso>0, isoCheck, nzone>0 -!$OMP THREADPRIVATE(ok_isotopes, ok_iso_verif, ok_isotrac) + LOGICAL, SAVE :: ok_iso_verif !--- -> isoCheck +!$OMP THREADPRIVATE(ok_iso_verif) LOGICAL, SAVE, ALLOCATABLE :: use_iso(:) !--- suppressed !$OMP THREADPRIVATE (use_iso) @@ -159,5 +158,5 @@ CONTAINS -SUBROUTINE init_infotrac_phy(type_trac_, tracers_, isotopes_, nqtottr_, nqCO2_, pbl_flg_, conv_flg_, solsym_) +SUBROUTINE init_infotrac_phy(type_trac_, tracers_, isotopes_, nqtottr_, nqCO2_, pbl_flg_, conv_flg_) USE print_control_mod, ONLY: prt_level, lunout @@ -171,5 +170,4 @@ INTEGER, INTENT(IN) :: conv_flg_(:) INTEGER, INTENT(IN) :: pbl_flg_(:) - CHARACTER(LEN=*),INTENT(IN) :: solsym_(:) INTEGER :: iq, ixt @@ -186,5 +184,4 @@ pbl_flg = pbl_flg_ conv_flg = conv_flg_ - solsym = solsym_ nqtot = SIZE(tracers_) nqo = COUNT(delPhase(tracers%name)=='H2O' .AND. tracers%iGeneration==0) @@ -230,6 +227,4 @@ iqiso => iqTraPha index_trac => itZonIso - ok_isotopes = niso > 0 - ok_isotrac = nzone > 0 ok_iso_verif = isoCheck niso_possibles = SIZE(tnom_iso) Index: LMDZ6/trunk/libf/phylmd/phytrac_mod.F90 =================================================================== --- LMDZ6/trunk/libf/phylmd/phytrac_mod.F90 (revision 4123) +++ LMDZ6/trunk/libf/phylmd/phytrac_mod.F90 (revision 4124) @@ -124,5 +124,6 @@ USE phys_cal_mod, only : hour USE dimphy - USE infotrac_phy, ONLY: nbtr, nqCO2, type_trac, conv_flg, solsym, pbl_flg + USE infotrac_phy, ONLY: nbtr, nqCO2, type_trac, conv_flg, pbl_flg + USE strings_mod, ONLY: int2str USE mod_grid_phy_lmdz USE mod_phys_lmdz_para @@ -753,5 +754,5 @@ END DO - CALL minmaxqfi(tr_seri(:,:,it),0.,1.e33,'convection it = '//solsym(it)) + CALL minmaxqfi(tr_seri(:,:,it),0.,1.e33,'convection it = '//TRIM(int2str(it))) END DO ! nbtr @@ -955,5 +956,5 @@ ENDDO ENDDO - CALL minmaxqfi(tr_seri(:,:,it),0.,1.e33,'lsc scav it = '//solsym(it)) + CALL minmaxqfi(tr_seri(:,:,it),0.,1.e33,'lsc scav it = '//TRIM(int2str(it))) ENDIF Index: LMDZ6/trunk/libf/phylmd/rrtm/readaerosol_optic_rrtm.F90 =================================================================== --- LMDZ6/trunk/libf/phylmd/rrtm/readaerosol_optic_rrtm.F90 (revision 4123) +++ LMDZ6/trunk/libf/phylmd/rrtm/readaerosol_optic_rrtm.F90 (revision 4124) @@ -20,5 +20,5 @@ load_tmp8,load_tmp9,load_tmp10 - USE infotrac_phy + USE infotrac_phy, ONLY: tracers, nqtot, nbtr USE YOMCST @@ -91,5 +91,5 @@ integer :: id_ASBCM, id_ASPOMM, id_ASSO4M, id_ASMSAM, id_CSSO4M, id_CSMSAM, id_SSSSM integer :: id_CSSSM, id_ASSSM, id_CIDUSTM, id_AIBCM, id_AIPOMM, id_ASNO3M, id_CSNO3M, id_CINO3M - INTEGER :: k, i + INTEGER :: k, i, iq, itr !--air density @@ -107,38 +107,26 @@ !--convert to ug m-3 unit for consistency with offline fields ! - DO i=1,nbtr - SELECT CASE(trim(solsym(i))) - CASE ("ASBCM") - id_ASBCM = i - CASE ("ASPOMM") - id_ASPOMM = i - CASE ("ASSO4M") - id_ASSO4M = i - CASE ("ASMSAM") - id_ASMSAM = i - CASE ("CSSO4M") - id_CSSO4M = i - CASE ("CSMSAM") - id_CSMSAM = i - CASE ("SSSSM") - id_SSSSM = i - CASE ("CSSSM") - id_CSSSM = i - CASE ("ASSSM") - id_ASSSM = i - CASE ("CIDUSTM") - id_CIDUSTM = i - CASE ("AIBCM") - id_AIBCM = i - CASE ("AIPOMM") - id_AIPOMM = i - CASE ("ASNO3M") - id_ASNO3M = i - CASE ("CSNO3M") - id_CSNO3M = i - CASE ("CINO3M") - id_CINO3M = i - END SELECT - ENDDO + itr = 0 + DO iq = 1,nqtot + IF(.NOT. tracers(iq)%isInPhysics) CYCLE + itr = itr+1 + SELECT CASE(trim(tracers(iq)%name)) + CASE ("ASBCM"); id_ASBCM = itr + CASE ("ASPOMM"); id_ASPOMM = itr + CASE ("ASSO4M"); id_ASSO4M = itr + CASE ("ASMSAM"); id_ASMSAM = itr + CASE ("CSSO4M"); id_CSSO4M = itr + CASE ("CSMSAM"); id_CSMSAM = itr + CASE ("SSSSM"); id_SSSSM = itr + CASE ("CSSSM"); id_CSSSM = itr + CASE ("ASSSM"); id_ASSSM = itr + CASE ("CIDUSTM");id_CIDUSTM= itr + CASE ("AIBCM"); id_AIBCM = itr + CASE ("AIPOMM"); id_AIPOMM = itr + CASE ("ASNO3M"); id_ASNO3M = itr + CASE ("CSNO3M"); id_CSNO3M = itr + CASE ("CINO3M"); id_CINO3M = itr + END SELECT + END DO bcsol(:,:) = tr_seri(:,:,id_ASBCM) *zrho(:,:)*1.e9 ! ASBCM Index: LMDZ6/trunk/libf/phylmd/traclmdz_mod.F90 =================================================================== --- LMDZ6/trunk/libf/phylmd/traclmdz_mod.F90 (revision 4123) +++ LMDZ6/trunk/libf/phylmd/traclmdz_mod.F90 (revision 4124) @@ -311,5 +311,6 @@ USE dimphy - USE infotrac_phy, ONLY: nbtr, pbl_flg, solsym + USE infotrac_phy, ONLY: nbtr, pbl_flg + USE strings_mod, ONLY: int2str USE regr_pr_comb_coefoz_m, ONLY: regr_pr_comb_coefoz USE o3_chem_m, ONLY: o3_chem @@ -551,8 +552,4 @@ DO it=1,nbtr - WRITE(solsym(it),'(i2)') it - END DO - - DO it=1,nbtr IF(radio(it)) then DO k = 1, klev @@ -561,5 +558,5 @@ END DO END DO - CALL minmaxqfi(tr_seri(:,:,it),0.,1.e33,'puits rn it='//solsym(it)) + CALL minmaxqfi(tr_seri(:,:,it),0.,1.e33,'puits rn it='//TRIM(int2str(it))) END IF END DO Index: LMDZ6/trunk/libf/phylmd/tracreprobus_mod.F90 =================================================================== --- LMDZ6/trunk/libf/phylmd/tracreprobus_mod.F90 (revision 4123) +++ LMDZ6/trunk/libf/phylmd/tracreprobus_mod.F90 (revision 4124) @@ -12,5 +12,5 @@ USE dimphy - USE infotrac_phy, ONLY: nbtr, solsym + USE infotrac_phy, ONLY: nbtr #ifdef REPROBUS USE CHEM_REP, ONLY : pdt_rep, & ! pas de temps reprobus @@ -119,10 +119,4 @@ END DO - - - ! - DO it=1,nbtr - WRITE(solsym(it),'(i2)') it - END DO #endif END SUBROUTINE tracreprobus Index: LMDZ6/trunk/libf/phylmdiso/climb_hq_mod.F90 =================================================================== --- LMDZ6/trunk/libf/phylmdiso/climb_hq_mod.F90 (revision 4123) +++ LMDZ6/trunk/libf/phylmdiso/climb_hq_mod.F90 (revision 4124) @@ -502,5 +502,5 @@ #ifdef ISOVERIF -USE infotrac_phy, ONLY: ok_isotrac +USE infotrac_phy, ONLY: nzone USE isotopes_mod, ONLY: iso_eau,iso_HDO,iso_O18, ridicule USE isotopes_verif_mod @@ -578,7 +578,5 @@ endif #ifdef ISOTRAC - if (ok_isotrac) then - call iso_verif_traceur(xt_old(1,i,k),'climb_hq_mod 422') - endif + IF(nzone > 0) CALL iso_verif_traceur(xt_old(1,i,k),'climb_hq_mod 422') #endif enddo @@ -781,7 +779,5 @@ endif #ifdef ISOTRAC - if (ok_isotrac) then - call iso_verif_traceur(xt_old(1,i,k),'climb_hq_mod 526') - endif + IF(nzone > 0) CALL iso_verif_traceur(xt_old(1,i,k),'climb_hq_mod 526') #endif #endif Index: LMDZ6/trunk/libf/phylmdiso/isotopes_mod.F90 =================================================================== --- LMDZ6/trunk/libf/phylmdiso/isotopes_mod.F90 (revision 4123) +++ LMDZ6/trunk/libf/phylmdiso/isotopes_mod.F90 (revision 4124) @@ -3,5 +3,5 @@ MODULE isotopes_mod -USE infotrac_phy, ONLY: ntraciso,niso,indnum_fn_num,ok_isotrac,use_iso, & +USE infotrac_phy, ONLY: ntraciso,niso,indnum_fn_num,use_iso, & & niso_possibles IMPLICIT NONE @@ -245,5 +245,5 @@ write(*,*) 'iso_init 64: niso=',niso -! init de ntracisoOR: on écrasera en cas de ok_isotrac si complications avec +! init de ntracisoOR: on écrasera en cas de nzone>0 si complications avec ! ORCHIDEE ntracisoOR=ntraciso @@ -327,9 +327,9 @@ call getin_p('essai_convergence',essai_convergence) call getin_p('initialisation_iso',initialisation_iso) -!if (ok_isotrac) then +!if (nzone>0) then !if (initialisation_iso.eq.0) then ! call getin_p('initialisation_isotrac',initialisation_isotrac) !endif !if (initialisation_iso.eq.0) then -!endif !if (ok_isotrac) then +!endif !if (nzone>0) call getin_p('modif_sst',modif_sst) if (modif_sst.ge.1) then Index: LMDZ6/trunk/libf/phylmdiso/physiq_mod.F90 =================================================================== --- LMDZ6/trunk/libf/phylmdiso/physiq_mod.F90 (revision 4123) +++ LMDZ6/trunk/libf/phylmdiso/physiq_mod.F90 (revision 4124) @@ -40,5 +40,5 @@ USE indice_sol_mod USE infotrac, ONLY: iso_num, iso_indnum - USE infotrac_phy, ONLY: nqtot, nbtr, nqo, tracers, type_trac, nqCO2, ok_isotopes, indnum_fn_num + USE infotrac_phy, ONLY: nqtot, nbtr, nqo, tracers, type_trac, nqCO2, indnum_fn_num USE readTracFiles_mod, ONLY: addPhase USE strings_mod, ONLY: strIdx, strStack, int2str @@ -126,11 +126,10 @@ #ifdef ISO - USE infotrac_phy, ONLY: & - iqiso,ok_isotrac,niso, ntraciso - USE isotopes_mod, ONLY: iso_eau,iso_HDO,iso_O18,iso_O17,iso_HTO, & + USE infotrac_phy, ONLY: iqiso,niso, ntraciso, nzone + USE isotopes_mod, ONLY: iso_eau,iso_HDO,iso_O18,iso_O17,iso_HTO, & & bidouille_anti_divergence,ok_bidouille_wake, & & modif_ratqs,essai_convergence,iso_init,ridicule_rain,tnat, & & ridicule,ridicule_snow - USE isotopes_routines_mod, ONLY: iso_tritium + USE isotopes_routines_mod, ONLY: iso_tritium #ifdef ISOVERIF USE isotopes_verif_mod, ONLY: errmax,errmaxrel, & @@ -1595,27 +1594,14 @@ ! dyn3dmem et physiq #ifdef ISO - write(*,*) 'physiq 1846a: ok_isotopes,ntraciso,niso=',ok_isotopes,ntraciso,niso - if (.not.ok_isotopes) then - CALL abort_gcm('physiq 1756','options iso incompatibles',1) - endif + write(*,*) 'physiq 1846a: ok_isotopes,ntraciso,niso=',niso>0,ntraciso,niso + IF(niso <= 0) CALL abort_gcm('physiq 1756','options iso incompatibles',1) #ifdef ISOTRAC - if (.not.ok_isotrac) then - CALL abort_gcm('physiq 1758','options isotrac incompatibles',1) - endif + IF(nzone <= 0) CALL abort_gcm('physiq 1758','options isotrac incompatibles',1) #else -! #ifdef ISOTRAC - if (ok_isotrac) then - CALL abort_gcm('physiq 1762','options isotrac incompatibles',1) - endif -#endif -!! #ifdef ISOTRAC -! -> on supprime opion ISOTRAC, tout passe par ok_isotrac + IF(nzone > 0) CALL abort_gcm('physiq 1762','options isotrac incompatibles',1) +#endif #else -! #ifdef ISO - if (ok_isotopes) then - CALL abort_gcm('physiq 1772','options iso incompatibles',1) - endif -#endif -! #ifdef ISO + if(niso > 0) CALL abort_gcm('physiq 1772','options iso incompatibles',1) +#endif #ifdef ISO @@ -1623,11 +1609,9 @@ #ifdef ISOVERIF write(*,*) 'physiq 1366: call iso_init' - write(*,*) 'ok_isotopes=',ok_isotopes -#endif - if (ok_isotopes) then - call iso_init() - endif + write(*,*) 'ok_isotopes=',niso > 0 +#endif + if (niso > 0) call iso_init() #ifdef ISOTRAC -if (ok_isotrac) then +IF(nzone > 0) then write(*,*) 'physiq 1416: call iso_traceurs_init' call iso_traceurs_init() @@ -2424,5 +2408,5 @@ #ifdef ISOVERIF ! write(*,*) 'physiq 1847: qx(1,1,:)=',qx(1,1,:) - write(*,*) 'physiq 1846b: ok_isotopes,ntraciso,niso=',ok_isotopes,ntraciso,niso + write(*,*) 'physiq 1846b: ok_isotopes,ntraciso,niso=',niso>0,ntraciso,niso #endif do ixt=1,ntraciso @@ -2451,5 +2435,4 @@ #endif ! #ifdef ISO - ! !--OB mass fixer @@ -2521,5 +2504,4 @@ ! Diagnostiquer la tendance dynamique #ifdef ISOVERIF - !write(*,*) 'physiq tmp 2010: ancien_ok=',ancien_ok if ((iso_HDO.gt.0).and.(iso_O18.gt.0)) then do i=1,klon @@ -6821,7 +6803,5 @@ endif ! if (iso_eau.gt.0) then #ifdef ISOTRAC - if (ok_isotrac) then - call iso_verif_traceur(xt_ancien(1,i,k),'physiq 4802') - endif !if (ok_isotrac) then + IF(nzone > 0) CALL iso_verif_traceur(xt_ancien(1,i,k),'physiq 4802') #endif enddo