Ignore:
Timestamp:
Jul 19, 2024, 5:41:58 PM (4 months ago)
Author:
abarral
Message:

(lint) Fix obsolete boolean operators

Location:
LMDZ6/branches/Amaury_dev/libf/phylmd/rrtm
Files:
17 edited

Legend:

Unmodified
Added
Removed

  • LMDZ6/branches/Amaury_dev/libf/phylmd/rrtm/aeropt_5wv_rrtm.F90

    r3288 r5082  
    356356  ENDDO
    357357
    358   IF (flag_aerosol .EQ. 1) THEN
     358  IF (flag_aerosol == 1) THEN
    359359     nb_aer = 2
    360360     ALLOCATE (aerosol_name(nb_aer))
    361361     aerosol_name(1) = id_ASSO4M_phy
    362362     aerosol_name(2) = id_CSSO4M_phy
    363   ELSEIF (flag_aerosol .EQ. 2) THEN
     363  ELSEIF (flag_aerosol == 2) THEN
    364364     nb_aer = 2
    365365     ALLOCATE (aerosol_name(nb_aer))
    366366     aerosol_name(1) = id_ASBCM_phy
    367367     aerosol_name(2) = id_AIBCM_phy
    368   ELSEIF (flag_aerosol .EQ. 3) THEN
     368  ELSEIF (flag_aerosol == 3) THEN
    369369     nb_aer = 2
    370370     ALLOCATE (aerosol_name(nb_aer))
    371371     aerosol_name(1) = id_ASPOMM_phy
    372372     aerosol_name(2) = id_AIPOMM_phy
    373   ELSEIF (flag_aerosol .EQ. 4) THEN
     373  ELSEIF (flag_aerosol == 4) THEN
    374374     nb_aer = 3
    375375     ALLOCATE (aerosol_name(nb_aer))
    … …  
    377377     aerosol_name(2) = id_SSSSM_phy
    378378     aerosol_name(3) = id_ASSSM_phy
    379   ELSEIF (flag_aerosol .EQ. 5) THEN
     379  ELSEIF (flag_aerosol == 5) THEN
    380380     nb_aer = 1
    381381     ALLOCATE (aerosol_name(nb_aer))
    382382     aerosol_name(1) = id_CIDUSTM_phy
    383   ELSEIF (flag_aerosol .EQ. 6 .OR. flag_aerosol .EQ. 7 ) THEN
     383  ELSEIF (flag_aerosol == 6 .OR. flag_aerosol == 7 ) THEN
    384384     nb_aer = 13
    385385     ALLOCATE (aerosol_name(nb_aer))
    … …  
    417417      rh(i,k)=MIN(RHcl(i,k)*100.,RH_MAX)
    418418      RH_num(i,k) = INT( rh(i,k)/10. + 1.)
    419       IF (rh(i,k).GT.85.) RH_num(i,k)=10
    420       IF (rh(i,k).GT.90.) RH_num(i,k)=11
     419      IF (rh(i,k)>85.) RH_num(i,k)=10
     420      IF (rh(i,k)>90.) RH_num(i,k)=11
    421421      delta(i,k)=(rh(i,k)-RH_tab(RH_num(i,k)))*fact_RH(RH_num(i,k))
    422422    ENDDO
    … …  
    425425  DO m=1,nb_aer   ! tau is only computed for each mass   
    426426    fac=1.0
    427     IF (aerosol_name(m).EQ.id_ASBCM_phy) THEN
     427    IF (aerosol_name(m)==id_ASBCM_phy) THEN
    428428        soluble=.TRUE.
    429429        spsol=1
    430     ELSEIF (aerosol_name(m).EQ.id_ASPOMM_phy) THEN
     430    ELSEIF (aerosol_name(m)==id_ASPOMM_phy) THEN
    431431        soluble=.TRUE.
    432432        spsol=2
    433     ELSEIF (aerosol_name(m).EQ.id_CSSO4M_phy) THEN
     433    ELSEIF (aerosol_name(m)==id_CSSO4M_phy) THEN
    434434        soluble=.TRUE.
    435435        spsol=3
    436436        !fac=1.375    ! (NH4)2-SO4/SO4 132/96 mass conversion factor for AOD
    437437        fac=0.0      !--6 March 2017 - OB as Didier H said CSSO4 should not be used
    438     ELSEIF (aerosol_name(m).EQ.id_ASSO4M_phy) THEN
     438    ELSEIF (aerosol_name(m)==id_ASSO4M_phy) THEN
    439439        soluble=.TRUE.
    440440        spsol=4
    441441        fac=1.375    ! (NH4)2-SO4/SO4 132/96 mass conversion factor for AOD
    442     ELSEIF (aerosol_name(m).EQ.id_SSSSM_phy) THEN
     442    ELSEIF (aerosol_name(m)==id_SSSSM_phy) THEN
    443443        soluble=.TRUE.
    444444        spsol=5
    445     ELSEIF (aerosol_name(m).EQ.id_CSSSM_phy) THEN
     445    ELSEIF (aerosol_name(m)==id_CSSSM_phy) THEN
    446446        soluble=.TRUE.
    447447        spsol=6
    448     ELSEIF (aerosol_name(m).EQ.id_ASSSM_phy) THEN
     448    ELSEIF (aerosol_name(m)==id_ASSSM_phy) THEN
    449449        soluble=.TRUE.
    450450        spsol=7
    451     ELSEIF (aerosol_name(m).EQ.id_CSNO3M_phy) THEN
     451    ELSEIF (aerosol_name(m)==id_CSNO3M_phy) THEN
    452452        soluble=.TRUE.
    453453        spsol=8
    454454        fac=1.2903    ! NO3NH4/NO3 / mass conversion factor for AOD
    455     ELSEIF (aerosol_name(m).EQ.id_ASNO3M_phy) THEN
     455    ELSEIF (aerosol_name(m)==id_ASNO3M_phy) THEN
    456456        soluble=.TRUE.
    457457        spsol=9
    458458        fac=1.2903    ! NO3NH4/NO3 / mass conversion factor for AOD
    459     ELSEIF (aerosol_name(m).EQ.id_CIDUSTM_phy) THEN
     459    ELSEIF (aerosol_name(m)==id_CIDUSTM_phy) THEN
    460460        soluble=.FALSE.
    461461        spinsol=1
    462     ELSEIF  (aerosol_name(m).EQ.id_AIBCM_phy) THEN
     462    ELSEIF  (aerosol_name(m)==id_AIBCM_phy) THEN
    463463        soluble=.FALSE.
    464464        spinsol=2
    465     ELSEIF (aerosol_name(m).EQ.id_AIPOMM_phy) THEN
     465    ELSEIF (aerosol_name(m)==id_AIPOMM_phy) THEN
    466466        soluble=.FALSE.
    467467        spinsol=3
    468     ELSEIF (aerosol_name(m).EQ.id_CINO3M_phy) THEN
     468    ELSEIF (aerosol_name(m)==id_CINO3M_phy) THEN
    469469        soluble=.FALSE.
    470470        spinsol=4
    … …  
    481481    !--to save time 670 and AI are not computed for CMIP6
    482482    !IF (la.NE.la443.AND.la.NE.la550.AND.la.NE.la670.AND.la.NE.la865) CYCLE
    483     IF (la.NE.la443.AND.la.NE.la550.AND.la.NE.la865) CYCLE
     483    IF (la/=la443.AND.la/=la550.AND.la/=la865) CYCLE
    484484
    485485      IF (soluble) THEN            ! For soluble aerosol
    486486
    487487        !--treat special case of soluble BC internal mixture
    488         IF (spsol.EQ.1 .AND. flag_bc_internal_mixture) THEN
     488        IF (spsol==1 .AND. flag_bc_internal_mixture) THEN
    489489
    490490          DO k=1, klev
    … …  
    493493             BC_massfra = m_allaer(i,k,id_ASBCM_phy)/(m_allaer(i,k,id_ASBCM_phy)+m_allaer(i,k,id_ASSO4M_phy))
    494494
    495              IF (BC_massfra.GE.0.20) THEN
     495             IF (BC_massfra>=0.20) THEN
    496496               classbc = 6
    497              ELSEIF (BC_massfra.GE.0.10) THEN
     497             ELSEIF (BC_massfra>=0.10) THEN
    498498               classbc = 5
    499              ELSEIF  (BC_massfra.GE.0.05) THEN
     499             ELSEIF  (BC_massfra>=0.05) THEN
    500500               classbc = 4
    501              ELSEIF  (BC_massfra.GE.0.02) THEN
     501             ELSEIF  (BC_massfra>=0.02) THEN
    502502               classbc = 3
    503              ELSEIF  (BC_massfra.GE.0.01) THEN
     503             ELSEIF  (BC_massfra>=0.01) THEN
    504504               classbc = 2
    505505             ELSE
    … …  
    513513             tausum(i,la,aerindex)=tausum(i,la,aerindex)+tau(i,k,la,aerindex)
    514514
    515              IF (la.EQ.la550.AND.dryaod_diag) THEN
     515             IF (la==la550.AND.dryaod_diag) THEN
    516516                tau_ae5wv_int = alpha_MG_5wv(1,la,classbc)
    517517                drytausum(i,aerindex)=drytausum(i,aerindex)+m_allaer(i,k,aerindex)/1.e6*zdh(i,k)*tau_ae5wv_int*fac
    518518             ENDIF
    519519
    520              IF (la.EQ.la550) THEN
     520             IF (la==la550) THEN
    521521                abs_ae5wv_int = abs_MG_5wv(RH_num(i,k),la,classbc)+DELTA(i,k)* &
    522522                               (abs_MG_5wv(RH_num(i,k)+1,la,classbc) - &
    … …  
    539539              tausum(i,la,aerindex)=tausum(i,la,aerindex)+tau(i,k,la,aerindex)
    540540
    541               IF (la.EQ.la550.AND.dryaod_diag) THEN
     541              IF (la==la550.AND.dryaod_diag) THEN
    542542                 tau_ae5wv_int = alpha_aers_5wv(1,la,spsol)
    543543                 drytausum(i,aerindex)=drytausum(i,aerindex)+m_allaer(i,k,aerindex)/1.e6*zdh(i,k)*tau_ae5wv_int*fac
    544544              ENDIF
    545545
    546               IF (la.EQ.la550) THEN
     546              IF (la==la550) THEN
    547547                 abs_ae5wv_int = abs_aers_5wv(RH_num(i,k),la,spsol)+DELTA(i,k)* &
    548548                                (abs_aers_5wv(RH_num(i,k)+1,la,spsol) - &
    … …  
    566566            tausum(i,la,aerindex)= tausum(i,la,aerindex)+tau(i,k,la,aerindex)
    567567
    568             IF (la.EQ.la550.AND.dryaod_diag) THEN
     568            IF (la==la550.AND.dryaod_diag) THEN
    569569              drytausum(i,aerindex)= drytausum(i,aerindex)+tau(i,k,la,aerindex)
    570570            ENDIF
    571571
    572             IF (la.EQ.la550) THEN
     572            IF (la==la550) THEN
    573573               abs_ae5wv_int = abs_aeri_5wv(la,spinsol)
    574574               abs550aer(i)=abs550aer(i)+m_allaer(i,k,aerindex)/1.e6*zdh(i,k)*abs_ae5wv_int*fac

  • LMDZ6/branches/Amaury_dev/libf/phylmd/rrtm/aeropt_6bands_rrtm.F90

    r4165 r5082  
    1616  !    Anne Cozic Avril 2009
    1717  !    a partir d'une sous-routine de Johannes Quaas pour les sulfates
    18   !    Olivier Boucher février 2014 pour passage à RRTM
    19   !    a partir des propriétés optiques fournies par Yves Balkanski
     18  !    Olivier Boucher f�vrier 2014 pour passage � RRTM
     19  !    a partir des propri�t�s optiques fournies par Yves Balkanski
    2020  !
    2121  IMPLICIT NONE
    … …  
    477477  spinsol = 0
    478478
    479   IF (NSW.NE.nbands_sw_rrtm) THEN
     479  IF (NSW/=nbands_sw_rrtm) THEN
    480480    CALL abort_physic(modname,'Erreur NSW doit etre egal a 6 pour cette routine',1)
    481481  ENDIF
    … …  
    483483  zdh(:,:)=pdel(:,:)/(RG*zrho(:,:))      ! m
    484484
    485   IF (flag_aerosol .EQ. 1) THEN
     485  IF (flag_aerosol == 1) THEN
    486486     nb_aer = 2
    487487     ALLOCATE (aerosol_name(nb_aer))
    488488     aerosol_name(1) = id_ASSO4M_phy
    489489     aerosol_name(2) = id_CSSO4M_phy
    490   ELSEIF (flag_aerosol .EQ. 2) THEN
     490  ELSEIF (flag_aerosol == 2) THEN
    491491     nb_aer = 2
    492492     ALLOCATE (aerosol_name(nb_aer))
    493493     aerosol_name(1) = id_ASBCM_phy
    494494     aerosol_name(2) = id_AIBCM_phy
    495   ELSEIF (flag_aerosol .EQ. 3) THEN
     495  ELSEIF (flag_aerosol == 3) THEN
    496496     nb_aer = 2
    497497     ALLOCATE (aerosol_name(nb_aer))
    498498     aerosol_name(1) = id_ASPOMM_phy
    499499     aerosol_name(2) = id_AIPOMM_phy
    500   ELSEIF (flag_aerosol .EQ. 4) THEN
     500  ELSEIF (flag_aerosol == 4) THEN
    501501     nb_aer = 3
    502502     ALLOCATE (aerosol_name(nb_aer))
    … …  
    504504     aerosol_name(2) = id_SSSSM_phy
    505505     aerosol_name(3) = id_ASSSM_phy
    506   ELSEIF (flag_aerosol .EQ. 5) THEN
     506  ELSEIF (flag_aerosol == 5) THEN
    507507     nb_aer = 1
    508508     ALLOCATE (aerosol_name(nb_aer))
    509509     aerosol_name(1) = id_CIDUSTM_phy
    510   ELSEIF (flag_aerosol .EQ. 6 .OR. flag_aerosol .EQ. 7 ) THEN
     510  ELSEIF (flag_aerosol == 6 .OR. flag_aerosol == 7 ) THEN
    511511     nb_aer = 13
    512512     ALLOCATE (aerosol_name(nb_aer))
    … …  
    541541      rh(i,k)=MIN(RHcl(i,k)*100.,RH_MAX)
    542542      RH_num(i,k) = INT(rh(i,k)/10. + 1.)
    543       IF (rh(i,k).GT.85.) RH_num(i,k)=10
    544       IF (rh(i,k).GT.90.) RH_num(i,k)=11
     543      IF (rh(i,k)>85.) RH_num(i,k)=10
     544      IF (rh(i,k)>90.) RH_num(i,k)=11
    545545      delta(i,k)=(rh(i,k)-RH_tab(RH_num(i,k)))*fact_RH(RH_num(i,k))
    546546    ENDDO
    … …  
    557557  DO m=1,nb_aer   ! tau is only computed for each mass
    558558     fac=1.0
    559      IF (aerosol_name(m).EQ.id_ASBCM_phy) THEN
     559     IF (aerosol_name(m)==id_ASBCM_phy) THEN
    560560        soluble=.TRUE.
    561561        spsol=1
    562      ELSEIF (aerosol_name(m).EQ.id_ASPOMM_phy) THEN
     562     ELSEIF (aerosol_name(m)==id_ASPOMM_phy) THEN
    563563        soluble=.TRUE.
    564564        spsol=2
    565      ELSEIF (aerosol_name(m).EQ.id_CSSO4M_phy) THEN
     565     ELSEIF (aerosol_name(m)==id_CSSO4M_phy) THEN
    566566        soluble=.TRUE.
    567567        spsol=3
    568568        !fac=1.375    ! (NH4)2-SO4/SO4 132/96 mass conversion factor for AOD
    569569        fac=0.0      !--6 March 2017 - OB as Didier H said CSSO4 should not be used
    570      ELSEIF  (aerosol_name(m).EQ.id_ASSO4M_phy) THEN
     570     ELSEIF  (aerosol_name(m)==id_ASSO4M_phy) THEN
    571571        soluble=.TRUE.
    572572        spsol=4
    573573        fac=1.375    ! (NH4)2-SO4/SO4 132/96 mass conversion factor for AOD
    574      ELSEIF (aerosol_name(m).EQ.id_SSSSM_phy) THEN
     574     ELSEIF (aerosol_name(m)==id_SSSSM_phy) THEN
    575575         soluble=.TRUE.
    576576         spsol=5
    577      ELSEIF (aerosol_name(m).EQ.id_CSSSM_phy) THEN
     577     ELSEIF (aerosol_name(m)==id_CSSSM_phy) THEN
    578578         soluble=.TRUE.
    579579         spsol=6
    580      ELSEIF (aerosol_name(m).EQ.id_ASSSM_phy) THEN
     580     ELSEIF (aerosol_name(m)==id_ASSSM_phy) THEN
    581581         soluble=.TRUE.
    582582         spsol=7
    583      ELSEIF (aerosol_name(m).EQ.id_CSNO3M_phy) THEN
     583     ELSEIF (aerosol_name(m)==id_CSNO3M_phy) THEN
    584584         soluble=.TRUE.
    585585         spsol=8
    586586         fac=1.2903    ! NO3NH4/NO3 / mass conversion factor for AOD
    587      ELSEIF (aerosol_name(m).EQ.id_ASNO3M_phy) THEN
     587     ELSEIF (aerosol_name(m)==id_ASNO3M_phy) THEN
    588588         soluble=.TRUE.
    589589         spsol=9
    590590         fac=1.2903    ! NO3NH4/NO3 / mass conversion factor for AOD
    591      ELSEIF (aerosol_name(m).EQ.id_CIDUSTM_phy) THEN
     591     ELSEIF (aerosol_name(m)==id_CIDUSTM_phy) THEN
    592592         soluble=.FALSE.
    593593         spinsol=1
    594      ELSEIF  (aerosol_name(m).EQ.id_AIBCM_phy) THEN
     594     ELSEIF  (aerosol_name(m)==id_AIBCM_phy) THEN
    595595         soluble=.FALSE.
    596596         spinsol=2
    597      ELSEIF (aerosol_name(m).EQ.id_AIPOMM_phy) THEN
     597     ELSEIF (aerosol_name(m)==id_AIPOMM_phy) THEN
    598598         soluble=.FALSE.
    599599         spinsol=3
    600      ELSEIF (aerosol_name(m).EQ.id_CINO3M_phy) THEN
     600     ELSEIF (aerosol_name(m)==id_CINO3M_phy) THEN
    601601         soluble=.FALSE.
    602602         spinsol=4
    … …  
    612612
    613613       !--here we treat the special case of soluble BC internal mixture with Maxwell-Garnett rule
    614        IF (spsol.EQ.1 .AND. flag_bc_internal_mixture) THEN
     614       IF (spsol==1 .AND. flag_bc_internal_mixture) THEN
    615615
    616616         DO k=1, klev
    … …  
    623623             BC_massfra = m_allaer(i,k,id_ASBCM_phy)/(m_allaer(i,k,id_ASBCM_phy)+m_allaer(i,k,id_ASSO4M_phy))
    624624
    625              IF (BC_massfra.GE.0.20) THEN
     625             IF (BC_massfra>=0.20) THEN
    626626               classbc = 6
    627              ELSEIF (BC_massfra.GE.0.10) THEN
     627             ELSEIF (BC_massfra>=0.10) THEN
    628628               classbc = 5
    629              ELSEIF  (BC_massfra.GE.0.05) THEN
     629             ELSEIF  (BC_massfra>=0.05) THEN
    630630               classbc = 4
    631              ELSEIF  (BC_massfra.GE.0.02) THEN
     631             ELSEIF  (BC_massfra>=0.02) THEN
    632632               classbc = 3
    633              ELSEIF  (BC_massfra.GE.0.01) THEN
     633             ELSEIF  (BC_massfra>=0.01) THEN
    634634               classbc = 2
    635635             ELSE
    … …  
    640640             BC_massfra_pi = m_allaer_pi(i,k,id_ASBCM_phy)/(m_allaer_pi(i,k,id_ASBCM_phy)+m_allaer_pi(i,k,id_ASSO4M_phy))
    641641
    642              IF (BC_massfra_pi.GE.0.20) THEN
     642             IF (BC_massfra_pi>=0.20) THEN
    643643               classbc_pi = 6
    644              ELSEIF (BC_massfra_pi.GE.0.10) THEN
     644             ELSEIF (BC_massfra_pi>=0.10) THEN
    645645               classbc_pi = 5
    646              ELSEIF  (BC_massfra_pi.GE.0.05) THEN
     646             ELSEIF  (BC_massfra_pi>=0.05) THEN
    647647               classbc_pi = 4
    648              ELSEIF  (BC_massfra_pi.GE.0.02) THEN
     648             ELSEIF  (BC_massfra_pi>=0.02) THEN
    649649               classbc_pi = 3
    650              ELSEIF  (BC_massfra_pi.GE.0.01) THEN
     650             ELSEIF  (BC_massfra_pi>=0.01) THEN
    651651               classbc_pi = 2
    652652             ELSE
    … …  
    726726
    727727         !--external mixture case for soluble BC
    728          IF (spsol.EQ.1) THEN
     728         IF (spsol==1) THEN
    729729           piz_ae_pi(:,:,aerindex,:) = piz_ae(:,:,aerindex,:)
    730730           cg_ae_pi(:,:,aerindex,:)  = cg_ae(:,:,aerindex,:)
    … …  
    780780                                /tau_allaer(i,k,2,inu)
    781781         piz_allaer(i,k,2,inu)=MIN(MAX(piz_allaer(i,k,2,inu),0.01),1.0)
    782          IF (tau_allaer(i,k,2,inu).LE.tau_min) piz_allaer(i,k,2,inu)=1.0
     782         IF (tau_allaer(i,k,2,inu)<=tau_min) piz_allaer(i,k,2,inu)=1.0
    783783
    784784         cg_allaer(i,k,2,inu)=(tau_ae(i,k,id_ASSO4M_phy,inu)*piz_ae(i,k,id_ASSO4M_phy,inu)*cg_ae(i,k,id_ASSO4M_phy,inu)+ &
    … …  
    820820                                  /tau_allaer(i,k,1,inu)
    821821           piz_allaer(i,k,1,inu)=MIN(MAX(piz_allaer(i,k,1,inu),0.01),1.0)
    822            IF (tau_allaer(i,k,1,inu).LE.tau_min) piz_allaer(i,k,1,inu)=1.0
     822           IF (tau_allaer(i,k,1,inu)<=tau_min) piz_allaer(i,k,1,inu)=1.0
    823823         
    824824           cg_allaer(i,k,1,inu)=(tau_ae_pi(i,k,id_ASSO4M_phy,inu)*piz_ae(i,k,id_ASSO4M_phy,inu)*cg_ae(i,k,id_ASSO4M_phy,inu)+    &

  • LMDZ6/branches/Amaury_dev/libf/phylmd/rrtm/aeropt_lw_rrtm.F90

    r3288 r5082  
    4040  modname='aeropt_lw_rrtm'
    4141  !
    42   IF (NLW.NE.nbands_lw_rrtm) THEN
     42  IF (NLW/=nbands_lw_rrtm) THEN
    4343    CALL abort_physic(modname,'Erreur NLW doit etre egal a 16 pour cette routine',1)
    4444  ENDIF
    … …  
    4646  IF (ok_alw) THEN                                   !--aerosol LW effects
    4747   !
    48    IF (flag_aerosol.EQ.5.OR.flag_aerosol.EQ.6.OR.flag_aerosol.EQ.7) THEN  !-Dust
     48   IF (flag_aerosol==5.OR.flag_aerosol==6.OR.flag_aerosol==7) THEN  !-Dust
    4949    !
    5050    zdh(:,:)=pdel(:,:)/(RG*zrho(:,:))      ! m

  • LMDZ6/branches/Amaury_dev/libf/phylmd/rrtm/dump2ds.F

    r1990 r5082  
    88c NAN et INF ajoute aux plots                           Pat fin 2006
    99c ==================================================================
    10 c Comme dump2d sauf que le signe est préservé, la valeur zero
     10c Comme dump2d sauf que le signe est pr�serv�, la valeur zero
    1111c identifiee par un blanc.
    1212c detection des Infty (= ou -) et NaN (?)
    … …  
    2020      logical zinf,znan,zsign
    2121      CHARACTER (len=*) :: nom_z
    22       INTEGER*4 icheck(2)
     22      INTEGER(kind=4) icheck(2)
    2323      EQUIVALENCE(az,icheck)
    2424      EQUIVALENCE(iform,jform)
    … …  
    3939      DO 10003 j=1,jm
    4040      DO 10005 i=1,im
    41       IF(.NOT.( z(i,j).GT.zmax))GOTO 10007
     41      IF(.NOT.( z(i,j)>zmax))GOTO 10007
    4242      zmax=z(i,j)
    4343      imax=i
    4444      jmax=j
    45 10007 IF(.NOT.( z(i,j).LT.zmin))GOTO 10009
     4510007 IF(.NOT.( z(i,j)<zmin))GOTO 10009
    4646      zmin=z(i,j)
    4747      imin=i
    4848      jmin=j
    49 10009 IF(.NOT.( z(i,j).eq.0.))GOTO 10011
     4910009 IF(.NOT.( z(i,j)==0.))GOTO 10011
    5050      kzero=kzero+1
    515110011 CONTINUE
    … …  
    535310006 CONTINUE
    545410003 CONTINUE
    55 10004 zsign=(sign(1.,zmin)*sign(1.,zmax).gt.0.)
     5510004 zsign=(sign(1.,zmin)*sign(1.,zmax)>0.)
    5656      WRITE(*,*)'>>> dump2ds: ',trim(nom_z)
    5757      PRINT*,'>>>  ',kzero,' zero values  <<<'
    58       IF(.NOT.( ZMin.lt.0.))GOTO 10013
     58      IF(.NOT.( ZMin<0.))GOTO 10013
    5959      PRINT2000,' [MIN:',zmin,'(',imin,',',jmin,') (-@zyxwvutsrqpon NOPQ
    6060     *RSTUVWXYZ*+) ',zmax,'(',imax,',',jmax,'):MAX]'
    … …  
    646410014 CONTINUE
    65652000  Format(a,1pg11.4,a1,i3,a1,i3,a,1pg11.4,a1,i3,a1,i3,a)
    66       IF(.NOT.( zmax.GT.zmin))GOTO 10015
     66      IF(.NOT.( zmax>zmin))GOTO 10015
    6767      zllm=max(abs(zmax),abs(zmin))
    6868      zllu=min(abs(zmax),abs(zmin))
    69       if(im.ge.100)WRITE(*,'(104x,900i1)')(mod(i/100,10),i=100,im)
     69      if(im>=100)WRITE(*,'(104x,900i1)')(mod(i/100,10),i=100,im)
    7070      WRITE(*,'(14x,1000i1)')(mod(i/10,10),i=10,im)
    7171      WRITE(*,'(5x,1009i1)')(mod(i,10),i=1,im)
    … …  
    7676      DO 10019 i=1,im
    7777      az=abs(z(i,j))
    78       IF(.NOT.( az.eq.0.))GOTO 10021
     78      IF(.NOT.( az==0.))GOTO 10021
    7979      kchar(i)=16
    8080      GOTO 10022
    81 10021 IF(.NOT.((az.ne.0.and.icheck(1).eq.0.and.icheck(2).eq.2146435072))
     8110021 IF(.NOT.((az/=0.and.icheck(1)==0.and.icheck(2)==2146435072))
    8282     *)GOTO 10023
    8383      kchar(i)=31
    8484      zinf=.true.
    8585      GOTO 10022
    86 10023 IF(.NOT.((az.ne.0.and.icheck(1).eq.0.and.icheck(2).eq.2146959360))
     8610023 IF(.NOT.((az/=0.and.icheck(1)==0.and.icheck(2)==2146959360))
    8787     *)GOTO 10024
    8888      kchar(i)=32
    … …  
    949410025 kchar(i)=NINT(13.*az/zllm+17)
    959510026 CONTINUE
    96 10022 IF(.NOT.( z(i,j).lt.0.))GOTO 10027
     9610022 IF(.NOT.( z(i,j)<0.))GOTO 10027
    9797      kchar(i)=32-kchar(i)
    989810027 CONTINUE
    … …  
    104104      WRITE(*,'(5x,1000i1)')(mod(i,10),i=1,im)
    105105      WRITE(*,'(14x,1000i1)')(mod(i/10,10),i=10,im)
    106       if(im.ge.100)WRITE(*,'(104x,900i1)')(mod(i/100,10),i=100,im)
     106      if(im>=100)WRITE(*,'(104x,900i1)')(mod(i/100,10),i=100,im)
    107107      GOTO 10016
    10810810015 print*,'>>> ZERO MAP  <<<'

  • LMDZ6/branches/Amaury_dev/libf/phylmd/rrtm/eq_regions_mod.F90

    r2010 r5082  
    349349&    w + p9) * w + p8) * w + p7) * w + p6) * w + p5) *&
    350350&    w + p4) * w + p3) * w + p2) * w + p1) * w + p0
    351 if (n .gt. 0) then
     351if (n > 0) then
    352352  w = x - 1
    353353  do k = 2, n

  • LMDZ6/branches/Amaury_dev/libf/phylmd/rrtm/gstats.F90

    r1990 r5082  
    104104      WRITE(CC,'(I4)')INUM
    105105!     write(6,*) inum,cctype(inum)
    106       IF(CCTYPE(INUM).EQ."TRS".OR.CCTYPE(INUM).EQ.'MP-'.OR.CCTYPE(INUM).EQ.'MPL'&
    107                             & .OR.CCTYPE(INUM).EQ.'BAR'.OR.CCTYPE(INUM).EQ.'OMP') THEN
     106      IF(CCTYPE(INUM)=="TRS".OR.CCTYPE(INUM)=='MP-'.OR.CCTYPE(INUM)=='MPL'&
     107                            & .OR.CCTYPE(INUM)=='BAR'.OR.CCTYPE(INUM)=='OMP') THEN
    108108        CCDESC_DRHOOK(INUM)='>'//CCTYPE(INUM)//'-'//CCDESC(INUM)(1:21)//'('//CC//')'
    109109      ENDIF
    … …  
    131131!   write(0,*) "CCTYPE=",CCTYPE(KNUM)
    132132!   write(0,*) "CCDESC_DRHOOK=",CCDESC_DRHOOK(KNUM)
    133     IF(CCTYPE(KNUM).EQ."TRS")THEN
     133    IF(CCTYPE(KNUM)=="TRS")THEN
    134134      CALL DR_HOOK(CCDESC_DRHOOK(KNUM),KSWITCH,ZHOOK_HANDLE_TRANS)
    135     ELSEIF(CCTYPE(KNUM).EQ.'MP-')THEN
     135    ELSEIF(CCTYPE(KNUM)=='MP-')THEN
    136136      CALL DR_HOOK(CCDESC_DRHOOK(KNUM),KSWITCH,ZHOOK_HANDLE_COMMS)
    137     ELSEIF(CCTYPE(KNUM).EQ.'MPL'.AND.KNUM.NE.682)THEN
     137    ELSEIF(CCTYPE(KNUM)=='MPL'.AND.KNUM/=682)THEN
    138138      CALL DR_HOOK(CCDESC_DRHOOK(KNUM),KSWITCH,ZHOOK_HANDLE_COMMS1)
    139     ELSEIF(CCTYPE(KNUM).EQ.'OMP')THEN
     139    ELSEIF(CCTYPE(KNUM)=='OMP')THEN
    140140!     CALL DR_HOOK(CCDESC_DRHOOK(KNUM),KSWITCH,ZHOOK_HANDLE)
    141141! MPL 1.12.08 : erreur a la compilation car zhook_handle est un tableau et non un
    142142! scalaire (PKEY)
    143143      CALL DR_HOOK(CCDESC_DRHOOK(KNUM),KSWITCH,ZTIME)
    144     ELSEIF(CCTYPE(KNUM).EQ.'BAR')THEN
     144    ELSEIF(CCTYPE(KNUM)=='BAR')THEN
    145145      CALL DR_HOOK(CCDESC_DRHOOK(KNUM),KSWITCH,ZHOOK_HANDLE_BARR)
    146146    ENDIF
    … …  
    207207    THISTCPU(KNUM) = 0.0_JPRB
    208208    THISVCPU(KNUM) = 0.0_JPRB
    209     IF(MYPROC_STATS.LE.NSTATS_MEM.AND.MYPROC_STATS.NE.0) THEN
     209    IF(MYPROC_STATS<=NSTATS_MEM.AND.MYPROC_STATS/=0) THEN
    210210!     CALL getrss(IMEM)
    211211!     IMEM = getrss()/1024
    … …  
    215215      IMEMC = 0
    216216      IF(LSTATS_ALLOC) IMEMC = GETCURHEAP()/1024
    217       IF(IMEM > IIMEM.OR.IPAG > IIPAG.OR.(LSTATS_ALLOC.AND.(IMEMC.NE.IIMEMC))) THEN
     217      IF(IMEM > IIMEM.OR.IPAG > IIPAG.OR.(LSTATS_ALLOC.AND.(IMEMC/=IIMEMC))) THEN
    218218        IF(LLMFIRST) THEN
    219219          WRITE(0,*) ".---------------------------------------------------------"
    … …  
    258258    TTCPUSUM(KNUM) = TTCPUSUM(KNUM)+THISTCPU(KNUM)+ZTCPU-TTCPULCALL(KNUM)
    259259    TVCPUSUM(KNUM) = TVCPUSUM(KNUM)+THISVCPU(KNUM)+ZVCPU-TVCPULCALL(KNUM)
    260     IF(MYPROC_STATS.LE.NSTATS_MEM.AND.MYPROC_STATS.NE.0) THEN
     260    IF(MYPROC_STATS<=NSTATS_MEM.AND.MYPROC_STATS/=0) THEN
    261261!     CALL getrss(IMEM)
    262262      IMEM = GETRSS()/1024
    … …  
    266266      IMEMC = 0
    267267      IF(LSTATS_ALLOC) IMEMC = GETCURHEAP()/1024
    268       IF(IMEM > IIMEM.OR.IPAG > IIPAG.OR.(LSTATS_ALLOC.AND.(IMEMC.NE.IIMEMC))) THEN
     268      IF(IMEM > IIMEM.OR.IPAG > IIPAG.OR.(LSTATS_ALLOC.AND.(IMEMC/=IIMEMC))) THEN
    269269        WRITE(0,'(A10,I5,1X,A20,1X,I6,2(1X,I7),1X,I6,1X,I4,1X,I4,1X,I7)') &
    270270             & "MEMORY aft ",KNUM,CCDESC(KNUM),IMEM-IIMEM,IMEM,IMEMH,IMEMS, &

  • LMDZ6/branches/Amaury_dev/libf/phylmd/rrtm/read_rsun_rrtm.F90

    r5075 r5082  
    5252       CALL nf95_gw_var(ncid, varid, time)
    5353
    54        IF (NSW.NE.size(wlen)) THEN
     54       IF (NSW/=size(wlen)) THEN
    5555         PRINT *,'read_rsun_rrtm NSW <> wlen = ',NSW, size(wlen)
    5656         CALL abort_physic('read_rsun_rrtm','size of SSI is different from NSW',1)
    … …  
    5858
    5959!--test if time is different from year_len but allow a mismatch of 1 day
    60        IF (size(time).NE.year_len.AND.size(time).NE.year_len+1) THEN
     60       IF (size(time)/=year_len.AND.size(time)/=year_len+1) THEN
    6161         PRINT *,'read_rsun_rrtm time <> year_len = ', size(time), year_len
    6262         CALL abort_physic('read_rsun_rrtm','time dim should be the number of days in year',1)
    6363       ENDIF
    6464!--warning only if forcing file has 366 days but year_len has only 365
    65        IF (size(time).EQ.year_len+1) THEN
     65       IF (size(time)==year_len+1) THEN
    6666         PRINT *,'Warning read_rsun_rrtm uses a leap year rsun for a noleap year'
    6767       ENDIF
    … …  
    7676
    7777       DO nbday=1, year_len
    78          IF (ABS(SUM(SSI_FRAC(:,nbday))-1.).GT.1.e-6) THEN
     78         IF (ABS(SUM(SSI_FRAC(:,nbday))-1.)>1.e-6) THEN
    7979           PRINT *,'somme SSI_FRAC=', SUM(SSI_FRAC(:,nbday))
    8080           CALL abort_physic('read_rsun_rrtm','somme SSI_FRAC <> 1',1)
    … …  
    9292!--only read at beginning of day
    9393!--day in year is provided as days_elapsed since the beginning of the year +1
    94     IF (debut.OR.days_elapsed+1.NE.day_pre) THEN
     94    IF (debut.OR.days_elapsed+1/=day_pre) THEN
    9595
    9696!--keep memory of previous day

  • LMDZ6/branches/Amaury_dev/libf/phylmd/rrtm/readaerosol_optic_rrtm.F90

    r4124 r5082  
    161161     !
    162162     ! Read and interpolate sulfate
    163      IF ( flag_aerosol .EQ. 1 .OR. flag_aerosol .EQ. 6 .OR. flag_aerosol .EQ. 7 ) THEN
     163     IF ( flag_aerosol == 1 .OR. flag_aerosol == 6 .OR. flag_aerosol == 7 ) THEN
    164164
    165165        CALL readaerosol_interp(id_ASSO4M_phy, itap, pdtphys, rjourvrai, debut, pplay, paprs, t_seri, sulfacc, sulfacc_pi,loadso4)
    … …  
    170170
    171171     ! Read and interpolate bcsol and bcins
    172      IF ( flag_aerosol .EQ. 2 .OR. flag_aerosol .EQ. 6 .OR. flag_aerosol .EQ. 7 ) THEN
     172     IF ( flag_aerosol == 2 .OR. flag_aerosol == 6 .OR. flag_aerosol == 7 ) THEN
    173173
    174174        ! Get bc aerosol distribution
    … …  
    183183
    184184     ! Read and interpolate pomsol and pomins
    185      IF ( flag_aerosol .EQ. 3 .OR. flag_aerosol .EQ. 6 .OR. flag_aerosol .EQ. 7 ) THEN
     185     IF ( flag_aerosol == 3 .OR. flag_aerosol == 6 .OR. flag_aerosol == 7 ) THEN
    186186
    187187        CALL readaerosol_interp(id_ASPOMM_phy, itap, pdtphys, rjourvrai, debut, pplay, paprs, t_seri, pomsol, pomsol_pi, load_tmp3)
    … …  
    195195
    196196     ! Read and interpolate csssm, ssssm, assssm
    197      IF (flag_aerosol .EQ. 4 .OR. flag_aerosol .EQ. 6 .OR. flag_aerosol .EQ. 7 ) THEN
     197     IF (flag_aerosol == 4 .OR. flag_aerosol == 6 .OR. flag_aerosol == 7 ) THEN
    198198
    199199        CALL readaerosol_interp(id_SSSSM_phy ,itap, pdtphys,rjourvrai, &
    … …  
    212212
    213213     ! Read and interpolate cidustm
    214      IF (flag_aerosol .EQ. 5 .OR. flag_aerosol .EQ. 6 .OR. flag_aerosol .EQ. 7 ) THEN
     214     IF (flag_aerosol == 5 .OR. flag_aerosol == 6 .OR. flag_aerosol == 7 ) THEN
    215215
    216216        CALL readaerosol_interp(id_CIDUSTM_phy, itap, pdtphys, rjourvrai, debut, pplay, paprs, t_seri, cidust, cidust_pi, loaddust)
    … …  
    222222     !
    223223     ! Read and interpolate asno3m, csno3m, cino3m
    224      IF (flag_aerosol .EQ. 6 .OR. flag_aerosol .EQ. 7 ) THEN
     224     IF (flag_aerosol == 6 .OR. flag_aerosol == 7 ) THEN
    225225
    226226        CALL readaerosol_interp(id_ASNO3M_phy, itap, pdtphys, rjourvrai, &

  • LMDZ6/branches/Amaury_dev/libf/phylmd/rrtm/readaerosolstrato1_rrtm.F90

    r5075 r5082  
    7979
    8080!--we only read monthly strat aerosol data
    81     IF (debut.OR.mth_cur.NE.mth_pre) THEN
     81    IF (debut.OR.mth_cur/=mth_pre) THEN
    8282
    8383!--only root reads the data
    8484    IF (is_mpi_root.AND.is_omp_root) THEN
    8585
    86     IF (nbands_sw_rrtm.NE.6) THEN
     86    IF (nbands_sw_rrtm/=6) THEN
    8787        print *,'nbands_sw_rrtm doit etre egal a 6 dans readaerosolstrat_rrtm'
    8888        STOP
    … …  
    9494    CALL nf95_gw_var(ncid_in, varid, lev)
    9595    n_lev = size(lev)
    96     IF (n_lev.NE.klev) THEN
     96    IF (n_lev/=klev) THEN
    9797       print *,'Le nombre de niveaux n est pas egal a klev'
    9898       STOP
    … …  
    105105
    106106    IF (grid_type/=unstructured) THEN
    107       IF (n_lat.NE.nbp_lat) THEN
     107      IF (n_lat/=nbp_lat) THEN
    108108         print *,'Le nombre de lat n est pas egal a nbp_lat'
    109109         STOP
    … …  
    117117
    118118    IF (grid_type/=unstructured) THEN
    119       IF (n_lon.NE.nbp_lon) THEN
     119      IF (n_lon/=nbp_lon) THEN
    120120         print *,'Le nombre de lon n est pas egal a nbp_lon'
    121121         STOP
    … …  
    128128    n_month = size(time)
    129129    print *, 'TIME aerosol strato=', n_month, time
    130     IF (n_month.NE.12) THEN
     130    IF (n_month/=12) THEN
    131131       print *,'Le nombre de month n est pas egal a 12'
    132132       STOP
    … …  
    145145
    146146!---select the correct month
    147     IF (mth_cur.LT.1.OR.mth_cur.GT.12) THEN
     147    IF (mth_cur<1.OR.mth_cur>12) THEN
    148148      print *,'probleme avec le mois dans readaerosolstrat =', mth_cur
    149149    ENDIF
    … …  
    224224
    225225!--stratospheric AOD in LW
    226     IF (nbands_lw_rrtm .NE. NLW) then
     226    IF (nbands_lw_rrtm /= NLW) then
    227227      print*, 'different values for NLW (=',NLW,') and nbands_lw_rrtm (=', nbands_lw_rrtm, ')'
    228228      STOP
    … …  
    246246!--default SSA value if there is no aerosol
    247247!--to avoid 0 values that seems to cause some problem to RRTM
    248     WHERE (tau_aero_sw_rrtm.LT.1.e-14)
     248    WHERE (tau_aero_sw_rrtm<1.e-14)
    249249      piz_aero_sw_rrtm = 1.0
    250250    ENDWHERE

  • LMDZ6/branches/Amaury_dev/libf/phylmd/rrtm/readaerosolstrato2_rrtm.F90

    r5075 r5082  
    8585
    8686!--we only read monthly strat aerosol data
    87     IF (debut.OR.mth_cur.NE.mth_pre) THEN
     87    IF (debut.OR.mth_cur/=mth_pre) THEN
    8888
    8989!--only root reads the data
    … …  
    9191
    9292!--check mth_cur
    93         IF (mth_cur.LT.1.OR.mth_cur.GT.12) THEN
     93        IF (mth_cur<1.OR.mth_cur>12) THEN
    9494          print *,'probleme avec le mois dans readaerosolstrat =', mth_cur
    9595        ENDIF
    … …  
    105105        CALL nf95_gw_var(ncid_in, varid, lev)
    106106        n_lev = size(lev)
    107         IF (n_lev.NE.klev) THEN
     107        IF (n_lev/=klev) THEN
    108108           abort_message='Le nombre de niveaux n est pas egal a klev'
    109109           CALL abort_physic(modname,abort_message,1)
    … …  
    115115
    116116        IF (grid_type/=unstructured) THEN
    117            IF (n_lat.NE.nbp_lat) THEN
     117           IF (n_lat/=nbp_lat) THEN
    118118             print *, 'latitude=', n_lat, nbp_lat
    119119             abort_message='Le nombre de lat n est pas egal a nbp_lat'
    … …  
    125125        CALL nf95_gw_var(ncid_in, varid, time)
    126126        n_month = size(time)
    127         IF (n_month.NE.12) THEN
     127        IF (n_month/=12) THEN
    128128           abort_message='Le nombre de month n est pas egal a 12'
    129129           CALL abort_physic(modname,abort_message,1)
    … …  
    134134        n_wav = size(wav)
    135135        print *, 'WAV aerosol strato=', n_wav, wav
    136         IF (n_wav.NE.NSW) THEN
     136        IF (n_wav/=NSW) THEN
    137137           abort_message='Le nombre de wav n est pas egal a NSW'
    138138           CALL abort_physic(modname,abort_message,1)
    … …  
    197197        CALL nf95_gw_var(ncid_in, varid, lev)
    198198        n_lev = size(lev)
    199         IF (n_lev.NE.klev) THEN
     199        IF (n_lev/=klev) THEN
    200200           abort_message='Le nombre de niveaux n est pas egal a klev'
    201201           CALL abort_physic(modname,abort_message,1)
    … …  
    207207
    208208        IF (grid_type/=unstructured) THEN
    209           IF (n_lat.NE.nbp_lat) THEN
     209          IF (n_lat/=nbp_lat) THEN
    210210             abort_message='Le nombre de lat n est pas egal a nbp_lat'
    211211             CALL abort_physic(modname,abort_message,1)
    … …  
    216216        CALL nf95_gw_var(ncid_in, varid, time)
    217217        n_month = size(time)
    218         IF (n_month.NE.12) THEN
     218        IF (n_month/=12) THEN
    219219           abort_message='Le nombre de month n est pas egal a 12'
    220220           CALL abort_physic(modname,abort_message,1)
    … …  
    225225        n_wav = size(wav)
    226226        print *, 'WAV aerosol strato=', n_wav, wav
    227         IF (n_wav.NE.NLW) THEN
     227        IF (n_wav/=NLW) THEN
    228228           abort_message='Le nombre de wav n est pas egal a NLW'
    229229           CALL abort_physic(modname,abort_message,1)
    … …  
    332332    DO i=1, klon
    333333    DO k=1, klev
    334       IF (stratomask(i,k).GT.0.999999) THEN
     334      IF (stratomask(i,k)>0.999999) THEN
    335335        DO wave=1, nwave_sw
    336336          tausum_aero(i,wave,id_STRAT_phy)=tausum_aero(i,wave,id_STRAT_phy)+tau_aer_strat(i,k,band)
    … …  
    346346!--weighted average for cg, piz and tau, adding strat aerosols on top of tropospheric ones
    347347    DO band=1, NSW
    348       WHERE (stratomask.GT.0.999999)
     348      WHERE (stratomask>0.999999)
    349349!--strat aerosols are added to index 2 : natural and anthropogenic aerosols for bands 1 to NSW
    350350        cg_aero_sw_rrtm(:,:,2,band)  = ( cg_aero_sw_rrtm(:,:,2,band)*piz_aero_sw_rrtm(:,:,2,band)*tau_aero_sw_rrtm(:,:,2,band) + &
    … …  
    374374!--weighted average for cg, piz and tau, adding strat aerosols on top of tropospheric ones
    375375    DO band=1, NSW
    376       WHERE (stratomask.GT.0.999999)
     376      WHERE (stratomask>0.999999)
    377377!--strat aerosols are added to index 2 : natural and anthropogenic aerosols for bands 1 to NSW
    378378        cg_aero_sw_rrtm(:,:,2,band)  = ( cg_aero_sw_rrtm(:,:,2,band)*piz_aero_sw_rrtm(:,:,2,band)*tau_aero_sw_rrtm(:,:,2,band) + &
    … …  
    393393    DO i=1, klon
    394394    DO k=1, klev
    395       IF (stratomask(i,k).GT.0.999999) THEN
     395      IF (stratomask(i,k)>0.999999) THEN
    396396        DO wave=1, nwave_lw
    397397          tausum_aero(i,nwave_sw+wave,id_STRAT_phy)=tausum_aero(i,nwave_sw+wave,id_STRAT_phy)+taulw_aer_strat(i,k,band)
    … …  
    405405!--stratospheric aerosols are added to both index 2 and 1
    406406    DO band=1, NLW
    407       WHERE (stratomask.GT.0.999999)
     407      WHERE (stratomask>0.999999)
    408408        tau_aero_lw_rrtm(:,:,2,band)  = tau_aero_lw_rrtm(:,:,2,band) + taulw_aer_strat(:,:,band)
    409409        tau_aero_lw_rrtm(:,:,1,band)  = tau_aero_lw_rrtm(:,:,1,band) + taulw_aer_strat(:,:,band)
    … …  
    419419      tau_aero_lw_rrtm(:,:,1,band)  = tau_aero_lw_rrtm(:,:,2,band)
    420420!
    421       WHERE (stratomask.GT.0.999999)
     421      WHERE (stratomask>0.999999)
    422422!--stratospheric aerosols are only added to index 2
    423423        tau_aero_lw_rrtm(:,:,2,band)  = tau_aero_lw_rrtm(:,:,2,band) + taulw_aer_strat(:,:,band)
    … …  
    428428!--default SSA value if there is no aerosol
    429429!--to avoid 0 values that seems to cause some problem to RRTM
    430     WHERE (tau_aero_sw_rrtm.LT.1.e-14)
     430    WHERE (tau_aero_sw_rrtm<1.e-14)
    431431      piz_aero_sw_rrtm = 1.0
    432432    ENDWHERE

  • LMDZ6/branches/Amaury_dev/libf/phylmd/rrtm/recmwf_aero.F90

    r4875 r5082  
    468468  !----aerosol flags are on
    469469
    470   IF (flag_aerosol .GT. 0 .OR. flag_aerosol_strat) THEN
     470  IF (flag_aerosol > 0 .OR. flag_aerosol_strat) THEN
    471471
    472472     !--Case 1
    … …  
    633633
    634634  ! case with no aerosols at all is also computed IF ACTIVEFEEDBACK_ACTIVE is false
    635   IF (.not. AEROSOLFEEDBACK_ACTIVE .OR. flag_aerosol .EQ. 0 .OR. swaerofree_diag) THEN   
     635  IF (.not. AEROSOLFEEDBACK_ACTIVE .OR. flag_aerosol == 0 .OR. swaerofree_diag) THEN
    636636
    637637     ! ZERO aerosol effect
    … …  
    732732  !---Now we copy back the correct fields to proceed to the next timestep
    733733
    734   IF  ( AEROSOLFEEDBACK_ACTIVE .AND. (flag_aerosol .GT. 0 .OR. flag_aerosol_strat) ) THEN
     734  IF  ( AEROSOLFEEDBACK_ACTIVE .AND. (flag_aerosol > 0 .OR. flag_aerosol_strat) ) THEN
    735735
    736736     IF ( ok_ade .and. ok_aie  ) THEN
    … …  
    804804  IF (ok_ade.AND.ok_aie.AND.ok_volcan) THEN
    805805     !--in this case the fluxes used for the heating rates come from case 4 but SW surface radiation is kept from case 2
    806      IF (flag_volc_surfstrat.EQ.2) THEN ! STRAT HEATING
     806     IF (flag_volc_surfstrat==2) THEN ! STRAT HEATING
    807807        volmip_solsw(:)= ZFSDN_AERO(:,1,2)-ZFSUP_AERO(:,1,2)
    808      ELSEIF (flag_volc_surfstrat.EQ.1) THEN ! SURF COOLING
     808     ELSEIF (flag_volc_surfstrat==1) THEN ! SURF COOLING
    809809        !--in this case the fluxes used for the heating rates come from case 2 but SW surface radiation is kept from case 4
    810810        PFSUP(:,:) =    ZFSUP_AERO(:,:,2)
    … …  
    836836  ! Will need to be extended to LW radiation -> done by CK (2014-05-23)
    837837
    838   IF (flag_aerosol .GT. 0 .OR. flag_aerosol_strat) THEN
     838  IF (flag_aerosol > 0 .OR. flag_aerosol_strat) THEN
    839839
    840840     IF (ok_ade.AND.ok_aie) THEN

  • LMDZ6/branches/Amaury_dev/libf/phylmd/rrtm/rrtm_gasabs1a_140gp.F90

    r1990 r5082  
    144144    Z_TF = Z_ODEPTH/(BPADE+Z_ODEPTH)
    145145    ITR=INT(5.E+03_JPRB*Z_TF+0.5_JPRB)
    146     IF (ITR.LT.0) ITR=0     ! MPL 12.12.08
     146    IF (ITR<0) ITR=0     ! MPL 12.12.08
    147147    P_ATR1(IPR,I_LAY) = 1.0_JPRB - TRANS(ITR)
    148148    P_TF1(IPR,I_LAY) = Z_TF

  • LMDZ6/branches/Amaury_dev/libf/phylmd/rrtm/rrtm_rtrn1a_140gp.F90

    r2462 r5082  
    383383!       & (1.0_JPRB - Z_CLDFRAC(I_LEV-1))   
    384384!    ENDIF
    385      if(istcld(i_lev).ne.1.and.i_lev.ne.1) then
     385     if(istcld(i_lev)/=1.and.i_lev/=1) then
    386386        z_faccmb1(i_lev+1) = max(0.,min(z_cldfrac(i_lev+1)-z_cldfrac(i_lev), &
    387387               z_cldfrac(i_lev-1)-z_cldfrac(i_lev)))
    … …  
    496496!    Z_FACCMB2D(I_LEV-1) = Z_FACCLD1D(I_LEV-1) * Z_FACCLR2D(I_LEV) *&
    497497!     & (1.0_JPRB - Z_CLDFRAC(I_LEV+1)) 
    498     if (istcldd(i_lev).ne.1.and.i_lev.ne.1) then
     498    if (istcldd(i_lev)/=1.and.i_lev/=1) then
    499499       z_faccmb1d(i_lev-1) = max(0.,min(z_cldfrac(i_lev+1)-z_cldfrac(i_lev), &
    500500                            z_cldfrac(i_lev-1)-z_cldfrac(i_lev)))

  • LMDZ6/branches/Amaury_dev/libf/phylmd/rrtm/set99.F

    r1990 r5082  
    2828      IL=1
    2929   20 CONTINUE
    30       IF (MOD(NU,IFAC).NE.0) GO TO 30
     30      IF (MOD(NU,IFAC)/=0) GO TO 30
    3131      K=K+1
    3232      JFAX(K)=IFAC
    33       IF (IFAC.NE.8) GO TO 25
    34       IF (K.EQ.1) GO TO 25
     33      IF (IFAC/=8) GO TO 25
     34      IF (K==1) GO TO 25
    3535      JFAX(1)=8
    3636      JFAX(K)=6
    3737   25 CONTINUE
    3838      NU=NU/IFAC
    39       IF (NU.EQ.1) GO TO 50
    40       IF (IFAC.NE.8) GO TO 20
     39      IF (NU==1) GO TO 50
     40      IF (IFAC/=8) GO TO 20
    4141   30 CONTINUE
    4242      IL=IL+1
    4343      IFAC=NLFAX(IL)
    44       IF (IFAC.GT.1) GO TO 20
     44      IF (IFAC>1) GO TO 20
    4545C
    4646      WRITE(6,40) N

  • LMDZ6/branches/Amaury_dev/libf/phylmd/rrtm/suecrad.F90

    r4251 r5082  
    301301LRRTM  = .FALSE.
    302302LECMWF = .FALSE.
    303 IF (iflag_rrtm.EQ.1) THEN
     303IF (iflag_rrtm==1) THEN
    304304        LRRTM  = .TRUE.
    305305        LECMWF = .TRUE.

  • LMDZ6/branches/Amaury_dev/libf/phylmd/rrtm/yomhook.F90

    r1990 r5082  
    1818INTEGER(KIND=JPIM),        INTENT(IN) :: KSWITCH
    1919REAL(KIND=JPRB),        INTENT(INOUT) :: PKEY
    20 IF (KSWITCH.EQ.0) THEN
     20IF (KSWITCH==0) THEN
    2121!  PRINT *,'--> ON ENTRE DANS: ',CDNAME
    22 ELSE IF (KSWITCH.EQ.1) THEN
     22ELSE IF (KSWITCH==1) THEN
    2323!  PRINT *,'    ON SORT  DE  : ',CDNAME
    2424ENDIF

  • LMDZ6/branches/Amaury_dev/libf/phylmd/rrtm/yomoml.F90

    r2010 r5082  
    148148LOGICAL :: OML_TEST_EVENT
    149149INTEGER(KIND=JPIM),intent(in) :: K,MYEVENT
    150 IF(K.EQ.MYEVENT) THEN
     150IF(K==MYEVENT) THEN
    151151 OML_TEST_EVENT =.TRUE.
    152152ELSE
Note: See TracChangeset for help on using the changeset viewer.