Changeset 5081 for LMDZ6/branches/Amaury_dev/libf/phylmd/add_phys_tend_mod.F90

Timestamp:

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

File:

• LMDZ6/branches/Amaury_dev/libf/phylmd/add_phys_tend_mod.F90 (modified) (14 diffs)

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

@@ -226 +226 @@
   ENDDO
 
-  IF (fl_ebil .GT. 0) THEN
+  IF (fl_ebil > 0) THEN
     ! ------------------------------------------------
     ! Compute vertical sum for each atmospheric column
@@ -283 +283 @@
 !=====================================================================================
 
-  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
@@ -301 +301 @@
 ! 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
@@ -325 +325 @@
                 zqp_int = zqp_int + zqp(k)     *(paprs(i,k)-paprs(i,k+1))/Rg
               ENDDO
-              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
@@ -340 +340 @@
             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
@@ -383 +383 @@
      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, &
@@ -401 +401 @@
   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,&
@@ -441 +441 @@
 !======================================================================
 
-  IF (fl_ebil .GT. 0) THEn
+  IF (fl_ebil > 0) THEn
   
     ! ------------------------------------------------
@@ -584 +584 @@
   ENDDO
 
-  IF (fl_ebil .GT. 0) THEN
+  IF (fl_ebil > 0) THEN
     ! ------------------------------------------------
     ! Compute vertical sum for each atmospheric column
@@ -613 +613 @@
 !======================================================================
 
-  IF (fl_ebil .GT. 0) THEN
+  IF (fl_ebil > 0) THEN
   
     ! ------------------------------------------------
@@ -761 +761 @@
 
 !!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.
@@ -793 +793 @@
   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
@@ -804 +804 @@
   ENDIF
 
-  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)
   ENDIF
-  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)
   ENDIF
-  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)
@@ -819 +819 @@
   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)
     ENDIF
   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)
     ENDIF
   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)