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

Timestamp:

Jul 19, 2024, 4:15:44 PM (13 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/phylmdiso

Files:

• add_phys_tend_mod.F90 (modified) (14 diffs)
• physiq_mod.F90 (modified) (15 diffs)

LMDZ6/branches/Amaury_dev/libf/phylmdiso/add_phys_tend_mod.F90

@@ -297 +297 @@
   END DO
 
-  if (fl_ebil .GT. 0) then
+  if (fl_ebil > 0) then
     ! ------------------------------------------------
     ! Compute vertical sum for each atmospheric column
@@ -408 +408 @@
 !=====================================================================================
 
-IF (jbad .GT. 0) THEN
+IF (jbad > 0) THEN
       DO j = 1, jbad
          i=jadrs(j)
-         if(prt_level.ge.debug_level) THEN
+         if(prt_level>=debug_level) THEN
           print*,'PLANTAGE POUR LE POINT i lon lat =',&
                  i,longitude_deg(i),latitude_deg(i),text
@@ -426 +426 @@
 ! Impression, warning et correction en cas de probleme moins important
 !=====================================================================================
-IF (jqbad .GT. 0) THEN
+IF (jqbad > 0) THEN
       done(:) = .false.                         !jyg
       DO j = 1, jqbad
         i=jqadrs(j)
-          if(prt_level.ge.debug_level) THEN
+          if(prt_level>=debug_level) THEN
            print*,'WARNING  : EAU POUR LE POINT i lon lat =',&
                   i,longitude_deg(i),latitude_deg(i),text
@@ -465 +465 @@
               enddo
 #endif
-              if(prt_level.ge.debug_level) THEN
+              if(prt_level>=debug_level) THEN
                print*,' cas q_seri<1.e-15 i k zq_int zqp_int zq_int/zqp_int :', &
                                     i, kqadrs(j), zq_int, zqp_int, zq_int/zqp_int
@@ -487 +487 @@
             DO k = 1, klev
               zq=q_seri(i,k)+zdq(i,k)
-              if (zq.lt.1.e-15) then
-                 if (q_seri(i,k).lt.1.e-15) then
-                  if(prt_level.ge.debug_level) THEN
+              if (zq<1.e-15) then
+                 if (q_seri(i,k)<1.e-15) then
+                  if(prt_level>=debug_level) THEN
                    print*,' cas q_seri<1.e-15 i k q_seri zq zdq :',i,k,q_seri(i,k),zq,zdq(i,k)
                   endif
@@ -555 +555 @@
          ENDDO
       ENDDO
-IF (jbad .GT. 0) THEN
+IF (jbad > 0) THEN
       DO j = 1, jbad
          i=jadrs(j)
          k=kadrs(j)
-         if(prt_level.ge.debug_level) THEN
+         if(prt_level>=debug_level) THEN
           print*,'PLANTAGE2 POUR LE POINT i itap lon lat txt jbad zdt t',&
                  i,itap,longitude_deg(i),latitude_deg(i),text,jbad, &
@@ -573 +573 @@
 ENDIF 
 !
-IF (jqbad .GT. 0) THEN
+IF (jqbad > 0) THEN
       DO j = 1, jqbad
          i=jqadrs(j)
          k=kqadrs(j)
-         if(prt_level.ge.debug_level) THEN
+         if(prt_level>=debug_level) THEN
           print*,'WARNING  : EAU2 POUR LE POINT i itap lon lat txt jqbad zdq q zdql ql',&
                  i,itap,longitude_deg(i),latitude_deg(i),text,jqbad,&
@@ -613 +613 @@
 !======================================================================
 
-  if (fl_ebil .GT. 0) then
+  if (fl_ebil > 0) then
   
     ! ------------------------------------------------
@@ -764 +764 @@
   END DO
 
-  if (fl_ebil .GT. 0) then
+  if (fl_ebil > 0) then
     ! ------------------------------------------------
     ! Compute vertical sum for each atmospheric column
@@ -795 +795 @@
 !======================================================================
 
-  if (fl_ebil .GT. 0) then
+  if (fl_ebil > 0) then
   
     ! ------------------------------------------------
@@ -944 +944 @@
 
 !!print *,'prt_level:',prt_level,' fl_ebil:',fl_ebil,' fl_cor_ebil:',fl_cor_ebil
-if ( (fl_ebil .GT. 0) .and. (klon .EQ. 1)) then
+if ( (fl_ebil > 0) .and. (klon == 1)) then
 
   bilq_bnd = 0.
@@ -976 +976 @@
   bilh_error = d_h_col(1) - bilh_bnd
 ! are the errors too large?
-  if ( abs(bilq_error) .gt. bilq_seuil) bilq_ok=1
-  if ( abs(bilh_error) .gt. bilh_seuil) bilh_ok=1
+  if ( abs(bilq_error) > bilq_seuil) bilq_ok=1
+  if ( abs(bilh_error) > bilh_seuil) bilh_ok=1
 !
 ! Print diagnostics
 ! =================
-  if ( (bilq_ok .eq. 0).and.(bilh_ok .eq. 0) ) then
+  if ( (bilq_ok == 0).and.(bilh_ok == 0) ) then
     status="enerbil-OK"
   else
@@ -987 +987 @@
   end if
 
-  if ( prt_level .GE. 3) then
+  if ( prt_level >= 3) then
     write(*,9010) text,status," itap:",itap,"enerbilERROR: Q", bilq_error,"  H", bilh_error
 9010  format (1x,A8,2x,A12,A6,I4,A18,E15.6,A5,E15.6)
   end if
-  if ( prt_level .GE. 3) then
+  if ( prt_level >= 3) then
     write(*,9000) text,"enerbil: Q,H,KE budget", d_qt_col(1), d_h_col(1),d_ek_col(1)
   end if
-  if ( prt_level .GE. 5) then
+  if ( prt_level >= 5) then
     write(*,9000) text,"enerbil at boundaries: Q, H",bilq_bnd, bilh_bnd
     write(*,9000) text,"enerbil: water budget",d_qt_col(1),d_qw_col(1),d_ql_col(1),d_qs_col(1), d_qbs_col(1)
@@ -1002 +1002 @@
   specific_diag: SELECT CASE (text)
   CASE("vdf") specific_diag
-    if ( prt_level .GE. 5) then
+    if ( prt_level >= 5) then
       write(*,9000) text,"enerbil: d_h, bilh, sens,t_seri", d_h_col(1), bilh_bnd, sens(1), t_seri(1,1)
       write(*,9000) text,"enerbil: d_h_col_vdf, f_h, diff",d_h_col_vdf, f_h_bnd, bilh_bnd-sens(1)
     end if
   CASE("lsc") specific_diag
-    if ( prt_level .GE. 5) then
+    if ( prt_level >= 5) then
       write(*,9000) text,"enerbil: rain, bil_lat, bil_sens", rain_lsc(1), rlvtt * rain_lsc(1), -(rcw-rcpd)*t_seri(1,1) * rain_lsc(1)
       write(*,9000) text,"enerbil: snow, bil_lat, bil_sens", snow_lsc(1), rlstt * snow_lsc(1), -(rcs-rcpd)*t_seri(1,1) * snow_lsc(1)
     end if
   CASE("convection") specific_diag
-    if ( prt_level .GE. 5) then
+    if ( prt_level >= 5) then
       write(*,9000) text,"enerbil: rain, bil_lat, bil_sens", rain_con(1), rlvtt * rain_con(1), -(rcw-rcpd)*t_seri(1,1) * rain_con(1)
       write(*,9000) text,"enerbil: snow, bil_lat, bil_sens", snow_con(1), rlstt * snow_con(1), -(rcs-rcpd)*t_seri(1,1) * snow_con(1)

LMDZ6/branches/Amaury_dev/libf/phylmdiso/physiq_mod.F90

@@ -6175 +6175 @@
     itaprad = itaprad + 1
 
-    IF (iflag_radia.eq.0) THEN
-       IF (prt_level.ge.9) THEN
+    IF (iflag_radia==0) THEN
+       IF (prt_level>=9) THEN
           PRINT *,'--------------------------------------------------'
           PRINT *,'>>>> ATTENTION rayonnement desactive pour ce cas'
@@ -6258 +6258 @@
     ! a l'echelle sous-maille:
     !
-    IF (prt_level .GE.10) THEN
+    IF (prt_level >=10) THEN
        print *,' call orography ? ', ok_orodr
     ENDIF
@@ -6274 +6274 @@
           ! zpmm_orodr_t and zstd_orodr_t are activation thresholds set by F. Lott to
           ! earn computation time but they are not physical.
-          IF (((zpic(i)-zmea(i)).GT.zpmm_orodr_t).AND.(zstd(i).GT.zstd_orodr_t).AND.(zrel_oro(i).LE.zrel_oro_t)) THEN
+          IF (((zpic(i)-zmea(i))>zpmm_orodr_t).AND.(zstd(i)>zstd_orodr_t).AND.(zrel_oro(i)<=zrel_oro_t)) THEN
              itest(i)=1
              igwd=igwd+1
@@ -6331 +6331 @@
           !    such as ice sheets (work by V. Wiener)
           zrel_oro(i)=zstd(i)/(max(zsig(i),1.E-8)*sqrt(cell_area(i)))
-          IF (((zpic(i)-zmea(i)).GT.zpmm_orolf_t).AND.(zrel_oro(i).LE.zrel_oro_t)) THEN
+          IF (((zpic(i)-zmea(i))>zpmm_orolf_t).AND.(zrel_oro(i)<=zrel_oro_t)) THEN
              itest(i)=1
              igwd=igwd+1
@@ -6555 +6555 @@
        CALL getin_p('addtkeoro',addtkeoro) 
       
-       IF (prt_level.ge.5) &
+       IF (prt_level>=5) &
             print*,'addtkeoro', addtkeoro
             
@@ -6576 +6576 @@
 !
 
-       IF (addtkeoro .GT. 0 .AND. ok_orodr ) THEN
+       IF (addtkeoro > 0 .AND. ok_orodr ) THEN
 !      -------------------------------------------
 
@@ -6583 +6583 @@
 
 
-  IF (addtkeoro .EQ. 1 ) THEN
+  IF (addtkeoro == 1 ) THEN
 
             duadd(:,:)=alphatkeoro*d_u_oro(:,:)
             dvadd(:,:)=alphatkeoro*d_v_oro(:,:)
 
-  ELSE IF (addtkeoro .EQ. 2) THEN
+  ELSE IF (addtkeoro == 2) THEN
 
      IF (smallscales_tkeoro) THEN
@@ -6597 +6597 @@
 ! car on peut s'attendre a ce que les petites echelles produisent aussi de la TKE
 ! Mais attention, cela ne va pas dans le sens de la conservation de l'energie! 
-          IF ((zstd(i).GT.1.0) .AND.(zrel_oro(i).LE.zrel_oro_t)) THEN
+          IF ((zstd(i)>1.0) .AND.(zrel_oro(i)<=zrel_oro_t)) THEN
              itest(i)=1
              igwd=igwd+1
@@ -6609 +6609 @@
        DO i=1,klon
           itest(i)=0
-        IF (((zpic(i)-zmea(i)).GT.zpmm_orodr_t).AND.(zstd(i).GT.zstd_orodr_t).AND.(zrel_oro(i).LE.zrel_oro_t)) THEN
+        IF (((zpic(i)-zmea(i))>zpmm_orodr_t).AND.(zstd(i)>zstd_orodr_t).AND.(zrel_oro(i)<=zrel_oro_t)) THEN
              itest(i)=1
              igwd=igwd+1
@@ -6831 +6831 @@
   IF (ok_airs) then
 
-  IF (itap.eq.1.or.MOD(itap,NINT(freq_airs/phys_tstep)).EQ.0) THEN
+  IF (itap==1.or.MOD(itap,NINT(freq_airs/phys_tstep))==0) THEN
      write(*,*) 'je vais appeler simu_airs, ok_airs, freq_airs=', ok_airs, freq_airs
      CALL simu_airs(itap,rneb, t_seri, cldemi, fiwc, ref_ice, pphi, pplay, paprs,&
@@ -6938 +6938 @@
     IF (offline) THEN
 
-       IF (prt_level.ge.9) &
+       IF (prt_level>=9) &
             print*,'Attention on met a 0 les thermiques pour phystoke'
        CALL phystokenc ( &
@@ -6959 +6959 @@
     !
     !IM global posePB BEG
-    IF(1.EQ.0) THEN
+    IF(1==0) THEN
        !
        CALL transp_lay (paprs,zxtsol, t_seri, q_seri, u_seri, v_seri, zphi, &
@@ -7118 +7118 @@
     ! Convertir les incrementations en tendances
     !
-    IF (prt_level .GE.10) THEN
+    IF (prt_level >=10) THEN
        print *,'Convertir les incrementations en tendances '
     ENDIF
@@ -7141 +7141 @@
           ENDIF
           !--ice_sursat: nqo=4, on ajoute rneb
-          IF (nqo.ge.4 .and. ok_ice_sursat) THEN
+          IF (nqo>=4 .and. ok_ice_sursat) THEN
              d_qx(i,k,irneb) = ( rneb_seri(i,k) - qx(i,k,irneb) ) / phys_tstep
           ENDIF
 
-           IF (nqo.ge.4 .and. ok_bs) THEN
+           IF (nqo>=4 .and. ok_bs) THEN
              d_qx(i,k,ibs) = ( qbs_seri(i,k) - qx(i,k,ibs) ) / phys_tstep
           ENDIF
@@ -7216 +7216 @@
     !==========================================================================
 
-    IF (prt_level.ge.1) THEN
+    IF (prt_level>=1) THEN
        write(lunout,*) 'FIN DE PHYSIQ !!!!!!!!!!!!!!!!!!!!'
        write(lunout,*) &