Index: trunk/LMDZ.VENUS/libf/phyvenus/cloudvenus/evap.f90 =================================================================== --- trunk/LMDZ.VENUS/libf/phyvenus/cloudvenus/evap.f90 (revision 4080) +++ trunk/LMDZ.VENUS/libf/phyvenus/cloudvenus/evap.f90 (revision 4085) @@ -6,5 +6,5 @@ IMPLICIT NONE - real, intent(in) :: nq + integer, intent(in) :: nq real, intent(in) :: RHOSA real, intent(inout), dimension(nq) :: ztrac ! Zeroth moment of mode 1 @@ -43,5 +43,5 @@ IMPLICIT NONE - real, intent(in) :: nq + integer, intent(in) :: nq real, intent(in) :: RHOSA real, intent(inout), dimension(nq) :: ztrac ! Zeroth moment of mode 1 Index: trunk/LMDZ.VENUS/libf/phyvenus/cloudvenus/flux.f90 =================================================================== --- trunk/LMDZ.VENUS/libf/phyvenus/cloudvenus/flux.f90 (revision 4080) +++ trunk/LMDZ.VENUS/libf/phyvenus/cloudvenus/flux.f90 (revision 4085) @@ -155,5 +155,5 @@ ENDIF - IF (checkm1 .eq. .false.) then + IF (checkm1 .eqv. .false.) then k1 = dt_eff*dM3_dt(m3sa_m1, m3w_m1, m3sa_m2, M3_m1(3), M0_m1(1), mmean, MSA, RHOAIR, PAIR, MRSATOTtemp, sigma1, RHOSA, RHOsasat, ST, RGAS, TAIR, RDSA+RCSA) @@ -168,5 +168,5 @@ ENDIF - IF (checkm2 .eq. .false.) then + IF (checkm2 .eqv. .false.) then k1 = dt_eff*dM3_dt(m3sa_m2, m3w_m2, m3sa_m1, M3_m2(3), M0_m2(1), mmean, MSA, RHOAIR, PAIR, MRSATOTtemp, sigma2, RHOSA, RHOsasat, ST, RGAS, TAIR, RDSA+RCSA) @@ -181,5 +181,5 @@ ENDIF - IF (checkm1 .eq. .false.) then + IF (checkm1 .eqv. .false.) then @@ -227,5 +227,5 @@ s1pred1 = s1pred2 ENDIF - IF (checkm2 .eq. .false.) then + IF (checkm2 .eqv. .false.) then Index: trunk/LMDZ.VENUS/libf/phyvenus/cloudvenus/init_moment.f90 =================================================================== --- trunk/LMDZ.VENUS/libf/phyvenus/cloudvenus/init_moment.f90 (revision 4080) +++ trunk/LMDZ.VENUS/libf/phyvenus/cloudvenus/init_moment.f90 (revision 4085) @@ -20,5 +20,6 @@ real :: M3_m1sa(nlev) , M3_m2sa(nlev) real :: M3_m1wv(nlev) , M3_m2wv(nlev) - real :: r1i,r1j,r2i,r2j,J,ROSA,dummy,WSAM + real :: r1i,r1j,r2i,r2j,ROSA,dummy,WSAM + integer :: J real :: KMASS_mode1(nlev), KMASS_mode2(nlev) real :: RHOAIR(nlev) Index: trunk/LMDZ.VENUS/libf/phyvenus/cloudvenus/mad_muphy.f90 =================================================================== --- trunk/LMDZ.VENUS/libf/phyvenus/cloudvenus/mad_muphy.f90 (revision 4080) +++ trunk/LMDZ.VENUS/libf/phyvenus/cloudvenus/mad_muphy.f90 (revision 4085) @@ -85,5 +85,5 @@ !------------- - IF (debug_cloud .eq. .false.) then + IF (debug_cloud .eqv. .false.) then dbg_cons = .false. dbg_coag = .false. @@ -201,10 +201,10 @@ ! obtenues a l'equilibre - IF (dbg_glob .eq. .true.) then + IF (dbg_glob) then write(*,*)'RHOpi et RHOeqi', RHOSAp, RHOSA ENDIF call change_wsa(TAIR,PAIR,MRSAv,MRSAss,WSAv) - IF (dbg_glob .eq. .true.) then + IF (dbg_glob) then write(*,*)'WSAp, WSAVin, WSAeq, WSAVeq', WSAp,WSAVin, WSA, WSAV write(*,*)'RHOp et RHOeq', RHOSAp, RHOSA @@ -226,5 +226,5 @@ IF((NUCLEA) .AND. (SH2SO4 .gt. 1)) then ! HOmogeneous NUcleation with MOment - IF (dbg_nucl .eq. .true.) write(*,*)'[NUCLEA] Here in NUCLEA (hom)', NUCLEA + IF (dbg_nucl) write(*,*)'[NUCLEA] Here in NUCLEA (hom)', NUCLEA IF ((TAIR .GT. 165.e0) .and. (TAIR .LT. 400.e0) .and. (h2so4_m3 .GT. 1.e10) .and. (h2so4_m3 .LT. 1.e19) .and. (RH .gt. 1e-5) .AND. (RH .LT. 1.D0)) then CALL HONUMO(TAIR,PAIR,dt,M0_m1,M3_m1,dM0_hom,dM3_hom) ! #.m(air)-3 and m3.m(air)-3 @@ -238,5 +238,5 @@ IF((HETNUCLEA) .AND. (SH2SO4 .gt. 1)) then ! HETerogeneous NUcleation with MOment - IF (dbg_nucl .eq. .true.) write(*,*)'[NUCLEA] Here in NUCLEA (het)', HETNUCLEA + IF (dbg_nucl) write(*,*)'[NUCLEA] Here in NUCLEA (het)', HETNUCLEA ! Calculation of ra (mean radius of aerosols) before heterogeneous nucleation @@ -392,5 +392,5 @@ dM3_m1_ccn = 0.D0 - IF (dbg_tend .eq. .true.) THEN + IF (dbg_tend) THEN write(*,*)'[TEND ] Tendencies calculation' write(*,*)'[TEND ] SUM tendance M3(m1) SA/WV ',dM3_m1_SA,dM3_m1_WV @@ -406,5 +406,5 @@ - IF (dbg_tend .eq. .true.) THEN + IF (dbg_tend) THEN write(*,*)'[TEND ] Tendencies calculation' write(*,*)'[TEND ] SUM tendance M3(m2) SA/WV ',dM3_m2_SA,dM3_m2_WV @@ -514,5 +514,5 @@ dvmr_WV_m2 = dvmr_WV_m2 * dvmr_WV - IF (dbg_tend .eq. .true.) THEN + IF (dbg_tend) THEN write(*,*)'[TEND ] M3_m1 (SA, W, vmr)', dvmr_SA_m1, dvmr_WV_m1 write(*,*)'[TEND ] M3_m2 (SA, W, vmr)', dvmr_SA_m2, dvmr_WV_m2 @@ -608,5 +608,5 @@ ! Partition vapeur - IF (dbg_cons .eq. .true.) THEN + IF (dbg_cons) THEN write(*,*)'[VapUpdate prev] MRSAv, MRWVv',MRSAv, MRWVv write(*,*)'[VapUpdate prev] MRSAl, MRWVl',MRSAl, MRWVl @@ -620,5 +620,5 @@ MRSAl = MRSAl + dvmr_SA ! acid MRWVl = MRWVl + dvmr_WV ! water - IF (dbg_cons .eq. .true.) THEN + IF (dbg_cons) THEN write(*,*)'[VapUpdate aft] MRSAv, MRWVv',MRSAv, MRWVv write(*,*)'[VapUpdate aft] MRSAl, MRWVl',MRSAl, MRWVl @@ -677,5 +677,5 @@ diff = abs(check - MRTOT) ! any differences ? - IF (dbg_tend .eq. .true.) THEN + IF (dbg_tend) THEN write(*,*)'[TEND ] vap: PI, RHOSA',PI, RHOSA write(*,*)'[TEND ] vap: CSA, CWV, RHOAIR', RHOAIR @@ -684,5 +684,5 @@ ENDIF - IF (dbg_cons .eq. .true.) THEN + IF (dbg_cons) THEN write(*,*)'[CONS ] WSA AFTER',WSAV, WSA write(*,*)'[CONS ] MRSA V AFTER', MRSAv @@ -715,5 +715,5 @@ ! Changements des moments effectues directement dans la subroutines ? - IF (dbg_coag .eq. .true.) THEN + IF (dbg_coag) THEN write(*,*)'[COAG ] Here in COAG', COAG write(*,*)'[COAG ] r1,r2 tot BEF COAG',r1,r2 @@ -732,5 +732,5 @@ & dM3_m1_coag,dM0_m2_coag,dM3_m2_coag) - IF (dbg_coag .eq. .true.) THEN + IF (dbg_coag) THEN write(*,*)'[COAG ] M0 tot BEF UP', M0_m1(1),M0_m2(1), M0_m1(1)+M0_m2(1) write(*,*)'[COAG ] M3 tot BEF UP', M3_m1(1)+M3_m1(2),M3_m2(1)+M3_m2(2), & @@ -763,5 +763,5 @@ ! somme = dM3_m1_coag(1)+dM3_m1_coag(2)+dM3_m1_coag(3)+dM3_m2_coag(1)+dM3_m2_coag(2)+dM3_m2_coag(3) ! write(*,*),'coag',somme - IF (dbg_coag .eq. .true.) THEN + IF (dbg_coag) THEN write(*,*)'[COAG ] M0 tot AFT UP', M0_m1(1),M0_m2(1), M0_m1(1)+M0_m2(1) write(*,*)'[COAG ] M3 tot AFT UP', M3_m1(1)+M3_m1(2),M3_m2(1)+M3_m2(2), & @@ -808,5 +808,5 @@ IF ((M0_m1(1) .gt. 1e-15) .and. (somme .gt. 1e-30) .and. (r_merge .gt. (ri1*ri2)**0.5)) THEN ! write(*,*)'[COAG, MERGING ] r1,r2 BEF MERGING',r1, r2 - IF (dbg_coag .eq. .true.) THEN + IF (dbg_coag) THEN write(*,*)'[COAG, MERGING ] Mode merging 1 vers 2' ENDIF @@ -859,5 +859,5 @@ IF ((M0_m2(1) .gt. 1e-15) .and. (somme .gt. 1e-30) .and. (r_merge .lt. (ri1*ri2)**0.5)) THEN ! write(*,*)'[COAG, MERGING ] r1,r2 BEF MERGING',r1, r2 - IF (dbg_coag .eq. .true.) THEN + IF (dbg_coag) THEN write(*,*)'[COAG, MERGING ] Mode merging 2 vers 1',abs(sum(dM3_merge_m1)+sum(dM3_merge_m2)) ENDIF