Changeset 3901 for trunk/LMDZ.MARS/libf/phymars/swr_toon.F

Timestamp:

Aug 20, 2025, 4:25:12 PM (4 days ago)

Author:

emillour

Message:

Mars PCM:
Some code tidying:

• turn aeroptproperties, albedocaps, cvmgp and convadj into modules
• remove useless check in callradite
• clean module vlz_fi (remove obsolete #ifdef CRAY cpp alternatives)
• remove function cvmgp since it was only called under #ifdef CRAY in vlz_fi

EM

File:

• trunk/LMDZ.MARS/libf/phymars/swr_toon.F (modified) (5 diffs)

trunk/LMDZ.MARS/libf/phymars/swr_toon.F

@@ -15 +15 @@
       use callkeys_mod, only: rayleigh
       use swrayleigh_mod, only: swrayleigh
+      use cvmgt_mod, only: cvmgt
       
       IMPLICIT NONE
@@ -75 +76 @@
 C     ARGUMENTS
 C     ---------
-      INTEGER KDLON, KFLEV, KNU
-      REAL aerosol(NDLO2,KFLEV,naerkind), albedo(NDLO2,2), 
-     S     PDSIG(NDLO2,KFLEV),PSEC(NDLO2)
-
-      REAL QVISsQREF3d(NDLO2,KFLEV,nsun,naerkind)  
-      REAL omegaVIS3d(NDLO2,KFLEV,nsun,naerkind)   
-      REAL gVIS3d(NDLO2,KFLEV,nsun,naerkind)
-
-      REAL PPSOL(NDLO2)
-      REAL PFD(NDLO2,KFLEV+1),PFU(NDLO2,KFLEV+1)
-      REAL PRMU(NDLO2)
+      INTEGER,INTENT(IN) :: KDLON, KFLEV, KNU
+      REAL,INTENT(IN) :: aerosol(NDLO2,KFLEV,naerkind), albedo(NDLO2,2)
+      REAL,INTENT(IN) :: PDSIG(NDLO2,KFLEV),PSEC(NDLO2)
+
+      REAL,INTENT(IN) :: QVISsQREF3d(NDLO2,KFLEV,nsun,naerkind)  
+      REAL,INTENT(IN) :: omegaVIS3d(NDLO2,KFLEV,nsun,naerkind)   
+      REAL,INTENT(IN) :: gVIS3d(NDLO2,KFLEV,nsun,naerkind)
+
+      REAL,INTENT(IN) :: PPSOL(NDLO2)
+      REAL,INTENT(OUT) :: PFD(NDLO2,KFLEV+1),PFU(NDLO2,KFLEV+1)
+      REAL,INTENT(IN) :: PRMU(NDLO2)
 
 C     LOCAL ARRAYS
@@ -104 +105 @@
 c     End part added by Tran The Trung
 
-c     Function
-c     --------
-      real CVMGT
-
 c Computing TOTAL single scattering parameters by adding
 c  properties of all the NAERKIND kind of aerosols
@@ -117 +114 @@
             ZTAUAZ(JL,JK) = 0.
          END DO 
-         DO 106 JAE=1,naerkind
-            DO 105 JL = 1 , KDLON
+         DO JAE=1,naerkind
+            DO JL = 1 , KDLON
 c              Mean Extinction optical depth in the spectral band
 c              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -133 +130 @@
      S           QVISsQREF3d(JL,JK,KNU,JAE)*
      &           omegaVIS3d(JL,JK,KNU,JAE)*gVIS3d(JL,JK,KNU,JAE)
- 105        CONTINUE
- 106     CONTINUE
+            ENDDO
+         ENDDO
       END DO
 C     
       DO JK = 1 , nlaylte
          DO JL = 1 , KDLON
+           ! NB: function CVMGT(x1,x2,l) returns x1 if l==.true.
+           !     or x2 otherwise. Maybe worth inlining someday? 
             ZCGAZ(JL,JK) = CVMGT( 0., ZCGAZ(JL,JK) / ZPIZAZ(JL,JK),
      S            (ZPIZAZ(JL,JK).EQ.0) )