Changeset 5081 for LMDZ6/branches/Amaury_dev/libf/dyn3dmem

Timestamp:

Jul 19, 2024, 4:15:44 PM (18 months ago)

Author:

abarral

Message:

Commit linked to correcting relevant warnings during gfortran compilation

[minor]
Correct remnants of fixed-form "+" in massbarxy.F90
Correct COMMON alignment in clesphys.h, flux_arp.h, cv*param.h, YOECUMF.h, alpale.h
Correct obsolete logical operators
Restrict use of iso_fortran_env in nf95_abort.f90
Remove redundant save in module declarations
Remove <continue> without labels
Fix nonstandard kind selectors

Location:

LMDZ6/branches/Amaury_dev/libf/dyn3dmem

Files:

• guide_loc_mod.F90 (modified) (9 diffs)
• massbarxy_loc.F90 (modified) (1 diff)
• vlspltqs_loc.F (modified) (16 diffs)

LMDZ6/branches/Amaury_dev/libf/dyn3dmem/guide_loc_mod.F90

@@ -1598 +1598 @@
     if (first) then
          ncidpl=-99
-         write(*,*),trim(modname)//': opening nudging files '
+         write(*,*) trim(modname)//': opening nudging files '
 ! Ap et Bp si Niveaux de pression hybrides
          if (guide_plevs==1) then
-             write(*,*),trim(modname)//' Reading nudging on model levels'
+             write(*,*) trim(modname)//' Reading nudging on model levels'
              rcode = nf90_open('apbp.nc', nf90_nowrite, ncidpl)
              IF (rcode/=NF_NOERR) THEN
@@ -1617 +1617 @@
               CALL abort_gcm(modname,abort_message,1)
              ENDIF
-             write(*,*),trim(modname)//' ncidpl,varidap',ncidpl,varidap
+             write(*,*) trim(modname)//' ncidpl,varidap',ncidpl,varidap
          endif
          
@@ -1632 +1632 @@
               CALL abort_gcm(modname,abort_message,1)
              ENDIF
-             write(*,*),trim(modname)//' ncidp,varidp',ncidp,varidp
+             write(*,*) trim(modname)//' ncidp,varidp',ncidp,varidp
              if (ncidpl==-99) ncidpl=ncidp
          endif
@@ -1648 +1648 @@
               CALL abort_gcm(modname,abort_message,1)
              ENDIF
-             write(*,*),trim(modname)//' ncidu,varidu',ncidu,varidu
+             write(*,*) trim(modname)//' ncidu,varidu',ncidu,varidu
              if (ncidpl==-99) ncidpl=ncidu
 
@@ -1680 +1680 @@
               CALL abort_gcm(modname,abort_message,1)
              ENDIF
-             write(*,*),trim(modname)//' ncidv,varidv',ncidv,varidv
+             write(*,*) trim(modname)//' ncidv,varidv',ncidv,varidv
              if (ncidpl==-99) ncidpl=ncidv
              
@@ -1713 +1713 @@
               CALL abort_gcm(modname,abort_message,1)
              ENDIF
-             write(*,*),trim(modname)//' ncidT,varidT',ncidt,varidt
+             write(*,*) trim(modname)//' ncidT,varidT',ncidt,varidt
              if (ncidpl==-99) ncidpl=ncidt
 
@@ -1744 +1744 @@
               CALL abort_gcm(modname,abort_message,1)
              ENDIF
-             write(*,*),trim(modname)//' ncidQ,varidQ',ncidQ,varidQ
+             write(*,*) trim(modname)//' ncidQ,varidQ',ncidQ,varidQ
              if (ncidpl==-99) ncidpl=ncidQ
 
@@ -1776 +1776 @@
               CALL abort_gcm(modname,abort_message,1)
              ENDIF
-             write(*,*),trim(modname)//' ncidps,varidps',ncidps,varidps
+             write(*,*) trim(modname)//' ncidps,varidps',ncidps,varidps
          endif
 ! Coordonnee verticale
@@ -1782 +1782 @@
               rcode = nf90_inq_varid(ncidpl, 'LEVEL', varidpl)
               IF (rcode/=0) rcode = nf90_inq_varid(ncidpl, 'PRESSURE', varidpl)
-              write(*,*),trim(modname)//' ncidpl,varidpl',ncidpl,varidpl
+              write(*,*) trim(modname)//' ncidpl,varidpl',ncidpl,varidpl
          endif
 ! Coefs ap, bp pour calcul de la pression aux differents niveaux

LMDZ6/branches/Amaury_dev/libf/dyn3dmem/massbarxy_loc.F90

@@ -27 +27 @@
     DO ij=ijb,ije-1
       massebxy(ij,l)=masse(ij     ,l)*alpha2(ij     ) + &
-     +               masse(ij+1   ,l)*alpha3(ij+1   ) + &
-     +               masse(ij+iip1,l)*alpha1(ij+iip1) + &
-     +               masse(ij+iip2,l)*alpha4(ij+iip2)
+                     masse(ij+1   ,l)*alpha3(ij+1   ) + &
+                     masse(ij+iip1,l)*alpha1(ij+iip1) + &
+                     masse(ij+iip2,l)*alpha4(ij+iip2)
     END DO
     DO ij=ijb+iip1-1,ije+iip1-1,iip1; massebxy(ij,l)=massebxy(ij-iim,l); END DO

LMDZ6/branches/Amaury_dev/libf/dyn3dmem/vlspltqs_loc.F

@@ -62 +62 @@
       if (pole_sud.and.ije==ip1jmp1)  ije=ije-iip1
       
-      IF (pente_max.gt.-1.e-5) THEN
+      IF (pente_max>-1.e-5) THEN
 c     IF (pente_max.gt.10) THEN
 
@@ -104 +104 @@
      ,         cvmgp(dxqu(ij-1)+dxqu(ij),0.,dxqu(ij-1)*dxqu(ij))
 #else
-               IF(dxqu(ij-1)*dxqu(ij).gt.0) THEN
+               IF(dxqu(ij-1)*dxqu(ij)>0) THEN
                   dxq(ij,l)=dxqu(ij-1)+dxqu(ij)
                ELSE
@@ -135 +135 @@
                zz(ij)=dxqu(ij-1)*dxqu(ij)
                zz(ij)=zz(ij)+zz(ij)
-               IF(zz(ij).gt.0) THEN
+               IF(zz(ij)>0) THEN
                   dxq(ij,l)=zz(ij)/(dxqu(ij-1)+dxqu(ij))
                ELSE
@@ -205 +205 @@
       DO l=1,llm
        DO ij=ijb,ije-1
-          IF (u_m(ij,l).gt.0.) THEN
+          IF (u_m(ij,l)>0.) THEN
              zdum(ij,l)=1.-u_m(ij,l)/masse(ij,l,iq)
              u_mq(ij,l)=u_m(ij,l)*
@@ -225 +225 @@
       DO l=1,llm
          DO ij=ijb,ije-1
-            IF(zdum(ij,l).lt.0) THEN
+            IF(zdum(ij,l)<0) THEN
                iadvplus(ij,l)=1
                u_mq(ij,l)=0.
@@ -269 +269 @@
 c$OMP DO SCHEDULE(STATIC,OMP_CHUNK)
          DO l=1,llm
-            IF(nl(l).gt.0) THEN
+            IF(nl(l)>0) THEN
                iju=0
 c   indicage des mailles concernees par le traitement special
                DO ij=ijb,ije
-                  IF(iadvplus(ij,l).eq.1.and.mod(ij,iip1).ne.0) THEN
+                  IF(iadvplus(ij,l)==1.and.mod(ij,iip1)/=0) THEN
                      iju=iju+1
                      indu(iju)=ij
@@ -287 +287 @@
                   zu_m=u_m(ij,l)
                   u_mq(ij,l)=0.
-                  IF(zu_m.gt.0.) THEN
+                  IF(zu_m>0.) THEN
                      ijq=ij
                      i=ijq-(j-1)*iip1
 c   accumulation pour les mailles completements advectees
-                     do while(zu_m.gt.masse(ijq,l,iq))
+                     do while(zu_m>masse(ijq,l,iq))
                         u_mq(ij,l)=u_mq(ij,l)+q(ijq,l,iq)
      &                     *masse(ijq,l,iq) 
@@ -305 +305 @@
                      i=ijq-(j-1)*iip1
 c   accumulation pour les mailles completements advectees
-                     do while(-zu_m.gt.masse(ijq,l,iq))
+                     do while(-zu_m>masse(ijq,l,iq))
                         u_mq(ij,l)=u_mq(ij,l)-q(ijq,l,iq)
      &                   *masse(ijq,l,iq)
@@ -345 +345 @@
             !MVals: veiller a ce qu'on n'ait pas de denominateur nul
             masse(ij,l,iq2)=max(masse(ij,l,iq)*q(ij,l,iq),min_qMass)
-            if (q(ij,l,iq).gt.min_qParent) then ! modif 13 nov 2020
+            if (q(ij,l,iq)>min_qParent) then ! modif 13 nov 2020
               Ratio(ij,l,iq2)=q(ij,l,iq2)/q(ij,l,iq)
             else
@@ -478 +478 @@
       ij=3525
       l=3
-      if ((ij.ge.ijb).and.(ij.le.ije)) then
+      if ((ij>=ijb).and.(ij<=ije)) then
         !write(*,*) 'vlyqs 480: ij,l,iq,ijb,q(ij,l,:)=',
 !     &             ij,l,iq,ijb,q(ij,l,:)
@@ -576 +576 @@
         fn=1.
         DO ij=1,iim
-          IF(pente_max*adyqv(ij).lt.abs(dyq(ij,l))) THEN
+          IF(pente_max*adyqv(ij)<abs(dyq(ij,l))) THEN
             fn=min(pente_max*adyqv(ij)/abs(dyq(ij,l)),fn)
           ENDIF
@@ -608 +608 @@
         fs=1.
         DO ij=1,iim
-        IF(pente_max*adyqv(ij+ip1jm-iip1).lt.abs(dyq(ij+ip1jm,l))) THEN
+        IF(pente_max*adyqv(ij+ip1jm-iip1)<abs(dyq(ij+ip1jm,l))) THEN
          fs=min(pente_max*adyqv(ij+ip1jm-iip1)/abs(dyq(ij+ip1jm,l)),fs)
         ENDIF
@@ -694 +694 @@
 
       DO ij=ijb,ije
-         IF(dyqv(ij)*dyqv(ij-iip1).gt.0.) THEN
+         IF(dyqv(ij)*dyqv(ij-iip1)>0.) THEN
             dyq(ij,l)=sign(min(abs(dyq(ij,l)),dyqmax(ij)),dyq(ij,l))
          ELSE
@@ -712 +712 @@
       DO l=1,llm
        DO ij=ijb,ije
-         IF( masse_adv_v(ij,l).GT.0. ) THEN
+         IF( masse_adv_v(ij,l)>0. ) THEN
            qbyv(ij,l,iq)= MIN( qsat(ij+iip1,l), q(ij+iip1,l,iq )  +
      ,      dyq(ij+iip1,l)*0.5*(1.-masse_adv_v(ij,l)
@@ -757 +757 @@
             !MVals: veiller a ce qu'on n'ait pas de denominateur nul
             !write(lunout,*) 'ij,l,q(ij,l,iq)=',ij,l,q(ij,l,iq)
-            if (q(ij,l,iq).gt.min_qParent) then ! modif 13 nov 2020
+            if (q(ij,l,iq)>min_qParent) then ! modif 13 nov 2020
               Ratio(ij,l,iq2)=q(ij,l,iq2)/q(ij,l,iq)
             else
@@ -806 +806 @@
          IF (pole_sud) THEN
          
-           convps  = -SSUM(iim,qbyv(ip1jm-iim,l,iq),iq,1)/apols
+           convps  = -SSUM(iim,qbyv(ip1jm-iim,l,iq),iq,1)/apols  ! /!\ called with 4 args ???
            convmps = -SSUM(iim,masse_adv_v(ip1jm-iim,l),1)/apols
            DO ij = ip1jm+1,ip1jmp1