Changeset 1418 for LMDZ4/trunk/libf/phylmd

Timestamp:

Jul 19, 2010, 5:11:24 PM (14 years ago)

Author:

jghattas

Message:

Following bug corrections are already done at branch LMDZ4_AR5 rev
1417,1416 :

Bug corrections for nudged run (pres2lev.F90, guide_p_mod.F90) :

• now the results are the same for sequentiel and parallel mode(if adjust=n and compiled with vsafe at mercure).
• the results are the same as the sequential mode in previous revision.
• test done only with guide_u=y,guide_v=y
• copied optimized version of pres2lev.F90 from dyn3dpar to dyn3d

Added condition read_climoz for the variable O3daySTD(calcul_STDlev.h,
undefSTD.F)

Corrected bug in calculation of the diagnostic variable ec550aer
"Extinction at 550nm" (aeropt_5wv.F90) (Maria Raffaella Vuolo, LSCE)

Added stop if use_filtre_fft=y with dyn3d (conf_gcm.F) : this option is
not implemented in dyn3d.

Location:

LMDZ4/trunk/libf/phylmd

Files:

• aeropt_5wv.F90 (modified) (1 diff)
• calcul_STDlev.h (modified) (1 diff)
• undefSTD.F (modified) (3 diffs)

LMDZ4/trunk/libf/phylmd/aeropt_5wv.F90

@@ -850 +850 @@
 !  ENDDO
 
-   DO i=1, klon
-      od550aer(i)=SUM(tausum(i,2,:))
-      od865aer(i)=SUM(tausum(i,5,:))
-      DO k=1, KLEV
-         ec550aer(i,k)=SUM(tau(i,k,2,:))/dh(i,k)
-      END DO    
-   END DO
+  DO i=1, klon
+     od550aer(i)=0.
+     DO m=1,naero_spc
+        od550aer(i)=od550aer(i)+tausum(i,2,m)
+     END DO
+  END DO
+  DO i=1, klon
+     od865aer(i)=0.
+     DO m=1,naero_spc
+        od865aer(i)=od865aer(i)+tausum(i,5,m)
+     END DO
+  END DO
+  DO i=1, klon
+     DO k=1, KLEV
+        ec550aer(i,k)=0.
+        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
+  
    od550lt1aer(:)=tausum(:,2,id_ASSO4M)+tausum(:,2,id_ASBCM)+tausum(:,2,id_AIBCM)+ &
         tausum(:,2,id_ASPOMM)+tausum(:,2,id_AIPOMM)+tausum(:,2,id_ASSSM)+ &

LMDZ4/trunk/libf/phylmd/calcul_STDlev.h

@@ -128 +128 @@
 cIM on somme les valeurs toutes les freq_calNMC secondes
 c
-       CALL undefSTD(itap,freq_calNMC)
+       CALL undefSTD(itap,freq_calNMC, read_climoz)
 c
 cIM on moyenne a la fin du mois ou du jour (toutes les freq_outNMC secondes)

LMDZ4/trunk/libf/phylmd/undefSTD.F

@@ -2 +2 @@
 ! $Id$
 !
-      SUBROUTINE undefSTD(itap,freq_calNMC)
+      SUBROUTINE undefSTD(itap,freq_calNMC, read_climoz)
       USE netcdf
       USE dimphy
@@ -43 +43 @@
       INTEGER i, k, n
       REAL freq_calNMC(nout)
+      INTEGER read_climoz
 c
 c variables Output
@@ -85 +86 @@
            T2sumSTD(i,k,n)=T2sumSTD(i,k,n)+T2STD(i,k)
            O3sumSTD(i,k,n)=O3sumSTD(i,k,n)+O3STD(i,k)
-           O3daysumSTD(i,k,n)=O3daysumSTD(i,k,n)+O3daySTD(i,k)
+           IF (read_climoz==2) 
+     &          O3daysumSTD(i,k,n)=O3daysumSTD(i,k,n)+O3daySTD(i,k)
+
           ENDIF 
          ENDDO !i