Changeset 1416 for LMDZ4/branches

Timestamp:

Jul 16, 2010, 11:29:10 AM (14 years ago)

Author:

jghattas

Message:

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 use_filtre_fft=n).
• the results are the same as the sequential mode in previous revision.
• test done only with guide_u=y,guide_v=y

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

ACo, YM, JG

Location:

LMDZ4/branches/LMDZ4_AR5/libf

Files:

• dyn3dpar/guide_p_mod.F90 (modified) (1 diff)
• dyn3dpar/pres2lev.F90 (modified) (1 diff)
• phylmd/calcul_STDlev.h (modified) (1 diff)
• phylmd/undefSTD.F (modified) (3 diffs)

LMDZ4/branches/LMDZ4_AR5/libf/dyn3dpar/guide_p_mod.F90

@@ -390 +390 @@
               stop
           ELSE
-              IF (guide_v) vnat1(jjb_v:jje_v,:,:)=vnat2(jjb_v:jje_v,:,:)
-              IF (guide_u) unat1(jjb_u:jje_u,:,:)=unat2(jjb_u:jje_u,:,:)
-              IF (guide_T) tnat1(jjb_u:jje_u,:,:)=tnat2(jjb_u:jje_u,:,:)
-              IF (guide_Q) qnat1(jjb_u:jje_u,:,:)=qnat2(jjb_u:jje_u,:,:)
-              IF (guide_P.OR.guide_modele) psnat1(jjb_u:jje_u,:)=psnat2(jjb_u:jje_u,:)
+              IF (guide_v) vnat1(:,jjb_v:jje_v,:)=vnat2(:,jjb_v:jje_v,:)
+              IF (guide_u) unat1(:,jjb_u:jje_u,:)=unat2(:,jjb_u:jje_u,:)
+              IF (guide_T) tnat1(:,jjb_u:jje_u,:)=tnat2(:,jjb_u:jje_u,:)
+              IF (guide_Q) qnat1(:,jjb_u:jje_u,:)=qnat2(:,jjb_u:jje_u,:)
+              IF (guide_P.OR.guide_modele) psnat1(:,jjb_u:jje_u)=psnat2(:,jjb_u:jje_u)
               step_rea=step_rea+1
               itau_test=itau

LMDZ4/branches/LMDZ4_AR5/libf/dyn3dpar/pres2lev.F90

@@ -60 +60 @@
       DO k=1,ni*nj
         IF (pn(k,ln) >= zpo(k,1) ) THEN
-          varn(k,ln) = varo(k,1)
+          varn(k,ln) = zvaro(k,1)
         ELSE IF (pn(k,ln) <= zpo(k,lmo)) THEN
           varn(k,ln) = zvaro(k,lmo)

LMDZ4/branches/LMDZ4_AR5/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/branches/LMDZ4_AR5/libf/phylmd/undefSTD.F

@@ -2 +2 @@
 ! $Header$
 !
-      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