Changeset 2408 for LMDZ5/branches/testing/libf/phylmd/aeropt_5wv.F90

Timestamp:

Dec 14, 2015, 11:43:09 AM (9 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2298:2396 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/aeropt_5wv.F90 (modified) (6 diffs)

LMDZ5/branches/testing/libf/phylmd/aeropt_5wv.F90

@@ -67 +67 @@
   !
   REAL, DIMENSION(klon), INTENT(out)          :: ai      ! POLDER aerosol index 
-!  REAL, DIMENSION(klon,nwave,naero_spc), INTENT(out)      :: tausum
-!  REAL, DIMENSION(klon,klev,nwave,naero_spc), INTENT(out) :: tau
   REAL, DIMENSION(klon,nwave,naero_tot), INTENT(out)      :: tausum
   REAL, DIMENSION(klon,klev,nwave,naero_tot), INTENT(out) :: tau
@@ -588 +586 @@
           A1_SSSSM(klev), A2_SSSSM(klev), A3_SSSSM(klev),&
           B1_SSSSM(klev), B2_SSSSM(klev), C1_SSSSM(klev), C2_SSSSM(klev), stat=ierr)
-        IF (ierr /= 0) CALL abort_gcm('aeropt_5mw', 'pb in allocation 1',1)
+        IF (ierr /= 0) CALL abort_physic('aeropt_5mw', 'pb in allocation 1',1)
      END IF
 
@@ -626 +624 @@
   DO k=1, klev
     DO i=1, klon
-!      IF (t_seri(i,k).EQ.0) stop 'stop aeropt_5wv T '
-!      IF (pplay(i,k).EQ.0) stop  'stop aeropt_5wv p '
       zrho=pplay(i,k)/t_seri(i,k)/RD                  ! kg/m3
       dh(i,k)=pdel(i,k)/(gravit*zrho)
-!CDIR UNROLL=naero_spc
       mass_temp(i,k,:) = m_allaer(i,k,:) / zrho / 1.e+9
       zdp1(i,k)=pdel(i,k)/(gravit*delt)     ! air mass auxiliary  variable --> zdp1 [kg/(m^2 *s)]
@@ -760 +755 @@
     ENDIF
 
-!Bug 21 12 10 AI
-!    used_tau(spsol)=.TRUE.
     IF (soluble) then
       used_tau(spsol)=.TRUE.
-       ELSE
+    ELSE
       used_tau(naero_soluble+spinsol)=.TRUE.
     ENDIF
@@ -866 +859 @@
      DO m=1,naero_spc
         od550aer(i)=od550aer(i)+tausum(i,2,m)
-     END DO
-  END DO
+     ENDDO
+  ENDDO
+
   DO i=1, klon
      od865aer(i)=0.
      DO m=1,naero_spc
         od865aer(i)=od865aer(i)+tausum(i,5,m)
-     END DO
-  END DO
+     ENDDO
+  ENDDO
+
   DO i=1, klon
      DO k=1, KLEV
@@ -879 +874 @@
         DO m=1,naero_spc
            ec550aer(i,k)=ec550aer(i,k)+tau(i,k,2,m)/dh(i,k)
-        END DO
-     END DO
-  END DO
+        ENDDO
+     ENDDO
+  ENDDO
   
-   od550lt1aer(:)=tausum(:,2,id_ASSO4M_phy)+tausum(:,2,id_ASBCM_phy)+tausum(:,2,id_AIBCM_phy)+ &
-        tausum(:,2,id_ASPOMM_phy)+tausum(:,2,id_AIPOMM_phy)+tausum(:,2,id_ASSSM_phy)+ &
-        0.03*tausum(:,2,id_CSSSM_phy)+0.4*tausum(:,2,id_CIDUSTM_phy)
-
-
+   od550lt1aer(:)=tausum(:,2,id_ASSO4M_phy)+tausum(:,2,id_ASBCM_phy)+tausum(:,2,id_AIBCM_phy)+  &
+                  tausum(:,2,id_ASPOMM_phy)+tausum(:,2,id_AIPOMM_phy)+tausum(:,2,id_ASSSM_phy)+ &
+                  0.03*tausum(:,2,id_CSSSM_phy)+0.4*tausum(:,2,id_CIDUSTM_phy)
 
   DEALLOCATE(aerosol_name)