Changeset 5220 for LMDZ6/branches/Amaury_dev

Timestamp:

Sep 23, 2024, 2:38:51 PM (2 months ago)

Author:

abarral

Message:

Correct errors induced in r5218 r5219

Location:

LMDZ6/branches/Amaury_dev/libf

Files:

• misc/slatec_xer.f90 (modified) (2 diffs)
• phylmd/StratAer/traccoag_mod.F90 (modified) (4 diffs)

LMDZ6/branches/Amaury_dev/libf/misc/slatec_xer.f90

@@ -1 +1 @@
 ! Contains "legacy" xer* functions required by some other very old external code
 
-MODULE lmdz_xer
+MODULE slatec_xer
   IMPLICIT NONE; PRIVATE
   PUBLIC xermsg
@@ -1121 +1121 @@
 
 
-END MODULE lmdz_xer
+END MODULE slatec_xer

LMDZ6/branches/Amaury_dev/libf/phylmd/StratAer/traccoag_mod.F90

@@ -82 +82 @@
     INTEGER :: injdur_sai          ! injection duration for SAI case [days]
     INTEGER :: yr, is_bissext
-    REAL                                   :: samoment2, samoment3! 2nd and 3rd order moments of size distribution
+    REAL :: samoment2, samoment3! 2nd and 3rd order moments of size distribution
 
     IF (is_mpi_root .AND. flag_verbose_strataer) THEN
@@ -355 +355 @@
     sulfmmr_mode(:, :, :) = 0.0
     nd_mode(:, :, :) = 0.0
-reff_sulfate(:,:)=0.0
+    reff_sulfate(:, :) = 0.0
+
     DO i = 1, klon
       DO j = 1, klev
-        samoment2=0.0
-           samoment3=0.0DO it = 1, nbtr_bin
+        samoment2 = 0.0
+        samoment3 = 0.0
+        DO it = 1, nbtr_bin
           !surf_PM25_sulf(i)=surf_PM25_sulf(i)+tr_seri(i,1,it+nbtr_sulgas)*m_part(i,1,it) &
           !assume that particles consist of ammonium sulfate at the surface (132g/mol)
@@ -383 +385 @@
                     * 4. * RPI * (mdw(it) * f_r_wetB(i, j, it) / 2.)**2. &       ! [WET SA of part it in m2]
                     * 1.e-2                                              ! conversion from m2/m3 to cm2/cm3A!    samoment2 : 2nd order moment of WET sulfate aerosols (m2/m3)
-                 samoment2 = samoment2 + nd_mode(i,j,it) &     ! [DRY part/m3A (in bin it)]
-                      &  *( mdw(it)*f_r_wetB(i,j,it)/2. )**2.                     ! [WET SA of part it in m2]
-!    samoment3 : 3nd order moment of WET sulfate aerosols (cm2/cm3)
-                 samoment3 = samoment3 + nd_mode(i,j,it) &     ! [DRY part/m3A (in bin it)]
-                      &  *( mdw(it)*f_r_wetB(i,j,it)/2. )**3.                     ! [WET SA of part it in m2]
+            samoment2 = samoment2 + nd_mode(i, j, it) &     ! [DRY part/m3A (in bin it)]
+                    & * (mdw(it) * f_r_wetB(i, j, it) / 2.)**2.                     ! [WET SA of part it in m2]
+            !    samoment3 : 3nd order moment of WET sulfate aerosols (cm2/cm3)
+            samoment3 = samoment3 + nd_mode(i, j, it) &     ! [DRY part/m3A (in bin it)]
+                    & * (mdw(it) * f_r_wetB(i, j, it) / 2.)**3.                     ! [WET SA of part it in m2]
           ELSE
             !     SAD_sulfate: SAD WET sulfate aerosols (cm2/cm3)
@@ -393 +395 @@
                     * 4. * RPI * (mdw(it) * f_r_wet(i, j) / 2.)**2. &           ! [WET SA of part it in m2]
                     * 1.e-2                                              ! conversion from m2/m3 to cm2/cm3A
-!    samoment2 : 2nd order moment of WET sulfate aerosols (m2/m3)
-                 samoment2 = samoment2 + nd_mode(i,j,it) &     ! [DRY part/m3A (in bin it)]
-                      &  *( mdw(it)*f_r_wet(i,j)/2. )**2.                          ! [WET SA of part it in m2]
-!    samoment3 : 3nd order moment of WET sulfate aerosols (cm2/cm3)
-                 samoment3 = samoment3 + nd_mode(i,j,it) &     ! [DRY part/m3A (in bin it)]
-                      &  *( mdw(it)*f_r_wet(i,j)/2. )**3.                          ! [WET SA of part it in m2]          ENDIF
-        ENDDO!     reff_sulfate: effective radius of WET sulfate aerosols (cm)
-           reff_sulfate(i,j) = (samoment3 / samoment2) &
-                & *1.e2                                              ! conversion from m to cm
-      ENDDO
-    ENDDO
+            !    samoment2 : 2nd order moment of WET sulfate aerosols (m2/m3)
+            samoment2 = samoment2 + nd_mode(i, j, it) &     ! [DRY part/m3A (in bin it)]
+                    & * (mdw(it) * f_r_wet(i, j) / 2.)**2.                          ! [WET SA of part it in m2]
+            !    samoment3 : 3nd order moment of WET sulfate aerosols (cm2/cm3)
+            samoment3 = samoment3 + nd_mode(i, j, it) &     ! [DRY part/m3A (in bin it)]
+                    & * (mdw(it) * f_r_wet(i, j) / 2.)**3.                          ! [WET SA of part it in m2]
+
+          END IF
+        END DO!     reff_sulfate: effective radius of WET sulfate aerosols (cm)
+        reff_sulfate(i, j) = (samoment3 / samoment2) &
+                & * 1.e2                                              ! conversion from m to cm
+      END DO
+    END DO
   END SUBROUTINE traccoag