Changeset 5081 for LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/optics_lib.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/cosp/optics_lib.F90 (modified) (9 diffs)

LMDZ6/branches/Amaury_dev/libf/phylmd/cosp/optics_lib.F90

@@ -38 +38 @@
   
 ! ----- INPUTS -----
-  real*8, intent(in) :: freq,tk
+  real(kind=8), intent(in) :: freq,tk
   
 ! ----- OUTPUTS -----
-  real*8, intent(out) :: n_r, n_i
+  real(kind=8), intent(out) :: n_r, n_i
 
 ! ----- INTERNAL -----    
-  real*8 ld,es,ei,a,ls,sg,tm1,cos1,sin1
-  real*8 e_r,e_i
-  real*8 pi
-  real*8 tc
-  complex*16 e_comp, sq
+  real(kind=8) ld,es,ei,a,ls,sg,tm1,cos1,sin1
+  real(kind=8) e_r,e_i
+  real(kind=8) pi
+  real(kind=8) tc
+  complex(kind=8) e_comp, sq
 
   tc = tk - 273.15
@@ -102 +102 @@
 
 ! ----- INPUTS -----
-  real*8, intent(in) :: freq, t
+  real(kind=8), intent(in) :: freq, t
   
 ! ----- OUTPUTS -----  
-  real*8, intent(out) :: n_r,n_i
+  real(kind=8), intent(out) :: n_r,n_i
 
 ! Parameters:
-  integer*2 :: i,lt1,lt2,nwl,nwlt
+  integer(kind=2) :: i,lt1,lt2,nwl,nwlt
   parameter(nwl=468,nwlt=62)
 
-  real*8 :: alam,cutice,pi,t1,t2,wlmax,wlmin, &
+  real(kind=8) :: alam,cutice,pi,t1,t2,wlmax,wlmin, &
             x,x1,x2,y,y1,y2,ylo,yhi,tk
 
-  real*8 :: &
+  real(kind=8) :: &
        tabim(nwl),tabimt(nwlt,4),tabre(nwl),tabret(nwlt,4),temref(4), &
        wl(nwl),wlt(nwlt)
@@ -540 +540 @@
     if(tk < temref(4)) tk=temref(4)
     do 11 i=2,4
-      if(tk.ge.temref(i)) go to 12
+      if(tk>=temref(i)) go to 12
     11 continue
     12 lt1=i
     lt2=i-1
     do 13 i=2,nwlt
-      if(alam.le.wlt(i)) go to 14
+      if(alam<=wlt(i)) go to 14
     13 continue
     14 x1=log(wlt(i-1))
@@ -586 +586 @@
       Subroutine MieInt(Dx, SCm, Inp, Dqv, Dqxt, Dqsc, Dbsc, Dg, Xs1, Xs2, DPh, Error)
 
-      Integer * 2  Imaxx
+      Integer (kind=2)  Imaxx
       Parameter (Imaxx = 12000)
-      Real * 4     RIMax          ! largest real part of refractive index
+      Real (kind=4)     RIMax          ! largest real part of refractive index
       Parameter (RIMax = 2.5)
-      Real * 4     IRIMax         ! largest imaginary part of refractive index
+      Real (kind=4)     IRIMax         ! largest imaginary part of refractive index
       Parameter (IRIMax = -2)
-      Integer * 2  Itermax
+      Integer (kind=2)  Itermax
       Parameter (Itermax = 12000 * 2.5)
                                 ! must be large enough to cope with the
                                 ! largest possible nmx = x * abs(scm) + 15
                                 ! or nmx =  Dx + 4.05*Dx**(1./3.) + 2.0
-      Integer * 2  Imaxnp
+      Integer (kind=2)  Imaxnp
       Parameter (Imaxnp = 10000)  ! Change this as required
 !     INPUT
-      Real * 8     Dx
-      Complex * 16  SCm
-      Integer * 4  Inp
-      Real * 8     Dqv(Inp)
+      Real (kind=8)     Dx
+      Complex (kind=8)  SCm
+      Integer (kind=4)  Inp
+      Real (kind=8)     Dqv(Inp)
 !     OUTPUT
-      Complex * 16  Xs1(InP)
-      Complex * 16  Xs2(InP)
-      Real * 8     Dqxt
-      Real * 8     Dqsc
-      Real * 8     Dg
-      Real * 8     Dbsc
-      Real * 8     DPh(InP)
-      Integer * 4  Error
+      Complex (kind=8)  Xs1(InP)
+      Complex (kind=8)  Xs2(InP)
+      Real (kind=8)     Dqxt
+      Real (kind=8)     Dqsc
+      Real (kind=8)     Dg
+      Real (kind=8)     Dbsc
+      Real (kind=8)     DPh(InP)
+      Integer (kind=4)  Error
 !     LOCAL
-      Integer * 2  I
-      Integer * 2  NStop
-      Integer * 2  NmX
-      Integer * 4  N    ! N*N > 32767 ie N > 181
-      Integer * 4  Inp2
-      Real * 8     Chi,Chi0,Chi1
-      Real * 8     APsi,APsi0,APsi1
-      Real * 8     Pi0(Imaxnp)
-      Real * 8     Pi1(Imaxnp)
-      Real * 8     Taun(Imaxnp)
-      Real * 8     Psi,Psi0,Psi1
-      Complex * 8  Ir
-      Complex * 16 Cm
-      Complex * 16 A,ANM1,APB
-      Complex * 16 B,BNM1,AMB
-      Complex * 16 D(Itermax)
-      Complex * 16 Sp(Imaxnp)
-      Complex * 16 Sm(Imaxnp)
-      Complex * 16 Xi,Xi0,Xi1
-      Complex * 16 Y
+      Integer (kind=2)  I
+      Integer (kind=2)  NStop
+      Integer (kind=2)  NmX
+      Integer (kind=4)  N    ! N*N > 32767 ie N > 181
+      Integer (kind=4)  Inp2
+      Real (kind=8)     Chi,Chi0,Chi1
+      Real (kind=8)     APsi,APsi0,APsi1
+      Real (kind=8)     Pi0(Imaxnp)
+      Real (kind=8)     Pi1(Imaxnp)
+      Real (kind=8)     Taun(Imaxnp)
+      Real (kind=8)     Psi,Psi0,Psi1
+      Complex (kind=4)  Ir
+      Complex (kind=8) Cm
+      Complex (kind=8) A,ANM1,APB
+      Complex (kind=8) B,BNM1,AMB
+      Complex (kind=8) D(Itermax)
+      Complex (kind=8) Sp(Imaxnp)
+      Complex (kind=8) Sm(Imaxnp)
+      Complex (kind=8) Xi,Xi0,Xi1
+      Complex (kind=8) Y
 !     ACCELERATOR VARIABLES
-      Integer * 2  Tnp1
-      Integer * 2  Tnm1
-      Real * 8     Dn
-      Real * 8     Rnx
-      Real * 8     S(Imaxnp)
-      Real * 8     T(Imaxnp)
-      Real * 8     Turbo
-      Real * 8     A2
-      Complex * 16 A1
+      Integer (kind=2)  Tnp1
+      Integer (kind=2)  Tnm1
+      Real (kind=8)     Dn
+      Real (kind=8)     Rnx
+      Real (kind=8)     S(Imaxnp)
+      Real (kind=8)     T(Imaxnp)
+      Real (kind=8)     Turbo
+      Real (kind=8)     A2
+      Complex (kind=8) A1
       
-      If ((Dx.Gt.Imaxx) .Or. (InP.Gt.ImaxNP)) Then
+      If ((Dx>Imaxx) .Or. (InP>ImaxNP)) Then
         Error = 1
         Return
@@ -652 +652 @@
       Ir = 1 / Cm
       Y =  Dx * Cm
-      If (Dx.Lt.0.02) Then
+      If (Dx<0.02) Then
          NStop = 2
       Else
-         If (Dx.Le.8.0) Then
+         If (Dx<=8.0) Then
             NStop = Dx + 4.00*Dx**(1./3.) + 2.0
          Else
-            If (Dx.Lt. 4200.0) Then
+            If (Dx< 4200.0) Then
                NStop = Dx + 4.05*Dx**(1./3.) + 2.0
             Else
@@ -666 +666 @@
       End If
       NmX = Max(Real(NStop),Real(Abs(Y))) + 15.
-      If (Nmx .gt. Itermax) then
+      If (Nmx > Itermax) then
           Error = 1
           Return
@@ -709 +709 @@
          Dqxt = Tnp1 *      Dble(A + B)          + Dqxt
          Dqsc = Tnp1 * (A*Conjg(A) + B*Conjg(B)) + Dqsc
-         If (N.Gt.1) then
+         If (N>1) then
          Dg = Dg + (dN*dN - 1) * Dble(ANM1*Conjg(A) + BNM1 * Conjg(B)) / dN + TNM1 * Dble(ANM1*Conjg(BNM1)) / (dN*dN - dN)
          End If
@@ -717 +717 @@
          AMB = A2 * (A - B)
          Do I = 1,Inp2
-            If (I.GT.Inp) Then
+            If (I>Inp) Then
                S(I) = -Pi1(I)
             Else
@@ -736 +736 @@
          Xi1 = Dcmplx(APsi1,Chi1)
       End Do
-      If (Dg .GT.0) Dg = 2 * Dg / Dqsc
+      If (Dg >0) Dg = 2 * Dg / Dqsc
       Dqsc =  2 * Dqsc / Dx**2
       Dqxt =  2 * Dqxt / Dx**2