Changeset 2969 for trunk/LMDZ.VENUS

Timestamp:

May 26, 2023, 8:37:28 AM (18 months ago)

Author:

emillour

Message:

Venus PCM:
Some adaptations for gfortran:

• the cosd()/sind() functions (arguments in degrees) are depreciated use cos()/sin() instead with a conversion to radians of input arguments
• comparisons between logicals is done with .eqv. not .eq.

EM

Location:

trunk/LMDZ.VENUS/libf/phyvenus

Files:

• conf_phys.F90 (modified) (1 diff)
• iono_h.F90 (modified) (9 diffs)

trunk/LMDZ.VENUS/libf/phyvenus/conf_phys.F90

@@ -504 +504 @@
   call getin('ok_ionchem',ok_ionchem)
 
-  if ((ok_jonline.eq..false.).and.(.true..eq.ok_ionchem)) then
-    write(*,*) "Attention, incoherence :" 
+  if ((ok_jonline.eqv..false.).and.(.true..eqv.ok_ionchem)) then
+    write(*,*) "Error incoherent flags :" 
     write(*,*) "ok_jonline=",ok_jonline," / ok_ionchem=",ok_ionchem
-    write(*,*) "Si vous souhaitez les ions, ok_jonline==.true."
-    write(*,*) "Si vous ne voulez pas des ions, ok_ionchem==.false."
-    write(*,*) "Verifiez votre physiq.def"
+    write(*,*) "If you include ions, ok_jonline==.true."
+    write(*,*) "If you do not include ions, ok_ionchem==.false."
+    write(*,*) "Check physiq.def"
     stop
   endif

trunk/LMDZ.VENUS/libf/phyvenus/iono_h.F90

@@ -222 +222 @@
 
       logical, save :: firstcall = .true. 
+      real,parameter :: pi = 4.*atan(1.0)
+      real,parameter :: deg2rad = pi/180.  
       real,    save :: a(4,4), b(4,4)     ! Fourrier coefficient
       integer       :: jj
@@ -257 +259 @@
       do jj=1,4
         P_indice_factor_local = P_indice_factor_local         + &
-                       ( a(indice,jj)*cosd((jj-1)*sza_local)  + &
-                         b(indice,jj)*sind((jj-1)*sza_local)  )
+                       ( a(indice,jj)*cos((jj-1)*sza_local*deg2rad)+ &
+                         b(indice,jj)*sin((jj-1)*sza_local*deg2rad)  )
       enddo
       
@@ -285 +287 @@
 ! local variables: 
 
-      logical, save :: firstcall = .true.       
+      logical, save :: firstcall = .true.    
+      real,parameter :: pi = 4.*atan(1.0)
+      real,parameter :: deg2rad = pi/180.  
       real          :: temp_elect     ! electronic temperatures
 
@@ -360 +364 @@
               enddo
               dfx = (t_Theis(jsza2,1) - t_Theis(jsza1,1))              &
-                   /   (cosd(sza_Theis(jsza2))-cosd(sza_Theis(jsza1))) 
+                   /   (cos(sza_Theis(jsza2)*deg2rad)                  &
+                        -cos(sza_Theis(jsza1)*deg2rad)) 
                     
               dT  = t_Theis(jsza1,1) +                                 &
-                          dfx*(cosd(sza_local)-cosd(sza_Theis(jsza1))) 
+                          dfx*(cos(sza_local*deg2rad)                  &
+                               -cos(sza_Theis(jsza1)*deg2rad)) 
 
               dfy = (tt-dT) / (z_Theis(1)-130.)        
@@ -394 +400 @@
              
             z_incre   =(zkm-z_Theis(iz1))/(z_Theis(iz2)-z_Theis(iz1))
-            sza_incre =(cosd(sza_local)-cosd(sza_Theis(jsza1)))        &
-                  /(cosd(sza_Theis(jsza2))-cosd(sza_Theis(jsza1)))
+            sza_incre =(cos(sza_local*deg2rad)                 &
+                        -cos(sza_Theis(jsza1)*deg2rad))        &
+                   /(cos(sza_Theis(jsza2)*deg2rad)             &
+                     -cos(sza_Theis(jsza1)*deg2rad))
      
             temp_elect = dfx*sza_incre + dfy*z_incre                   &
@@ -424 +432 @@
               enddo
               dfx = (t_Theis(jsza2,nz_Theis) - t_Theis(jsza1,nz_Theis))   &
-                   /   (cosd(sza_Theis(jsza2))-cosd(sza_Theis(jsza1))) 
+                   /   (cos(sza_Theis(jsza2)*deg2rad)                     &
+                        -cos(sza_Theis(jsza1)*deg2rad)) 
                     
               temp_elect = t_Theis(jsza1,nz_Theis) +                      &
-                           dfx*(cosd(sza_local)-cosd(sza_Theis(jsza1)))                             
+                           dfx*(cos(sza_local*deg2rad)                    &
+                                -cos(sza_Theis(jsza1)*deg2rad))                             
              endif  
            endif
@@ -500 +510 @@
 
       logical, save :: firstcall = .true.       
+      real,parameter :: pi = 4.*atan(1.0)
+      real,parameter :: deg2rad = pi/180.  
       real          :: temp_ion     ! electronic temperatures
 
@@ -589 +601 @@
            if(zkm_security .lt. Altimini) then
               dfx = (t_Miller(jsza2,1) - t_Miller(jsza1,1))              &
-                   /   (cosd(sza_Miller(jsza2))-cosd(sza_Miller(jsza1))) 
+                   /   (cos(sza_Miller(jsza2)*deg2rad)                   &
+                        -cos(sza_Miller(jsza1)*deg2rad)) 
                     
               dT  = t_Miller(jsza1,1) +                                   &
-                     dfx*(cosd(sza_security)-cosd(sza_Miller(jsza1))) 
+                     dfx*(cos(sza_security*deg2rad)                       &
+                          -cos(sza_Miller(jsza1)*deg2rad)) 
 
               dfy = (tt-dT) / (z_Miller(1)-130.)        
@@ -611 +625 @@
               z_incre   =(zkm_security-z_Miller(iz1))                    &
                     /(z_Miller(iz2)-z_Miller(iz1))
-              sza_incre =(cosd(sza_security)-cosd(sza_Miller(jsza1)))    &
-                    /(cosd(sza_Miller(jsza2))-cosd(sza_Miller(jsza1)))
+              sza_incre =(cos(sza_security*deg2rad)           &
+                          -cos(sza_Miller(jsza1)*deg2rad))    &
+                    /(cos(sza_Miller(jsza2)*deg2rad)          &
+                      -cos(sza_Miller(jsza1)*deg2rad))
        
               temp_ion = dfx*sza_incre + dfy*z_incre                     &