Changeset 445 for LMDZ.3.3/branches

Timestamp:

Jan 27, 2003, 12:01:53 PM (22 years ago)

Author:

lmdzadmin

Message:

Nettoyage + correction bug q 2m IM

File:

• LMDZ.3.3/branches/rel-LF/libf/phylmd/stdlevvar.F90 (modified) (6 diffs)

LMDZ.3.3/branches/rel-LF/libf/phylmd/stdlevvar.F90

@@ -51 +51 @@
       REAL, PARAMETER :: RKAR=0.40
 ! niter : nombre iterations calcul "corrector"
-      INTEGER, parameter :: niter=6, ncon=niter-1
+!     INTEGER, parameter :: niter=6, ncon=niter-1
+      INTEGER, parameter :: niter=2, ncon=niter-1
 !
 ! Variables locales
@@ -73 +74 @@
       LOGICAL :: okri
       REAL, dimension(klon) :: u_zref_p, te_zref_p, temp_p, q_zref_p
+!convertgence
+      REAL, dimension(klon) :: te_zref_con, q_zref_con
       REAL, dimension(klon) :: u_zref_c, te_zref_c, temp_c, q_zref_c
       REAL, dimension(klon) :: ok_pred, ok_corr
@@ -115 +118 @@
         te_zref(i) = ts1(i) + delte(i)
         temp(i) = te_zref(i) * (psol(i)/pat1(i))**(-RKAPPA)
-!       q_zref_p(i) = q_zref(i)
+        q_zref_p(i) = q_zref(i)
 !       te_zref_p(i) = te_zref(i)
         temp_p(i) = temp(i)
@@ -142 +145 @@
 !                 (1 + RVTMP2 * max(q_zref(i),0.0))
 !
-          IF(temp(i).GT.350.) THEN
-            WRITE(*,*) 'temp(i) GT 350 K !!',i,nsrf,temp(i)
-          ENDIF
+!IM +++
+!         IF(temp(i).GT.350.) THEN
+!           WRITE(*,*) 'temp(i) GT 350 K !!',i,nsrf,temp(i)
+!         ENDIF
+!IM ---
 !
         IF(n.EQ.ncon) THEN
-          te_zref_p(i) = te_zref(i)
-          q_zref_p(i) = q_zref(i)
+          te_zref_con(i) = te_zref(i)
+          q_zref_con(i) = q_zref(i)
         ENDIF 
 !
@@ -158 +163 @@
 !
         DO i = 1, knon
-          conv_te(i) = (te_zref(i) - te_zref_p(i))/te_zref_p(i)
-          conv_q(i) = (q_zref(i) - q_zref_p(i))/q_zref_p(i)
+          conv_te(i) = (te_zref(i) - te_zref_con(i))/te_zref_con(i)
+          conv_q(i) = (q_zref(i) - q_zref_con(i))/q_zref_con(i)
+!IM +++
 !         IF(abs(conv_te(i)).GE.0.0025.AND.abs(conv_q(i)).GE.0.05) THEN
-!           PRINT*,'DIV','i=',i,te_zref_p(i),te_zref(i),conv_te(i), &
-!           q_zref_p(i),q_zref(i),conv_q(i)
+!           PRINT*,'DIV','i=',i,te_zref_con(i),te_zref(i),conv_te(i), &
+!           q_zref_con(i),q_zref(i),conv_q(i)
 !         ENDIF
+!IM ---
         ENDDO
 !
@@ -170 +177 @@
         temp_c(i) = temp(i)
 !
-        IF(zri1(i).LT.0.) THEN
-          IF(nsrf.EQ.1) THEN
-            ok_pred(i)=1.
-            ok_corr(i)=0.
-          ELSE
-            ok_pred(i)=0.
-            ok_corr(i)=1.
-          ENDIF
-        ELSE
-          ok_pred(i)=0.
-          ok_corr(i)=1.
-        ENDIF
+!       IF(zri1(i).LT.0.) THEN
+!         IF(nsrf.EQ.1) THEN
+!           ok_pred(i)=1.
+!           ok_corr(i)=0.
+!         ELSE
+!           ok_pred(i)=0.
+!           ok_corr(i)=1.
+!         ENDIF
+!       ELSE
+!         ok_pred(i)=0.
+!         ok_corr(i)=1.
+!       ENDIF
+!
+        ok_pred(i)=0.
+        ok_corr(i)=1.
 !
         t_2m(i) = temp_p(i) * ok_pred(i) + temp_c(i) * ok_corr(i)
         q_2m(i) = q_zref_p(i) * ok_pred(i) + q_zref_c(i) * ok_corr(i)
+!IM +++
+!       IF(n.EQ.niter) THEN
+!       IF(t_2m(i).LT.t1(i).AND.t_2m(i).LT.ts1(i)) THEN
+!         PRINT*,' BAD t2m LT ',i,nsrf,t_2m(i),t1(i),ts1(i) 
+!       ELSEIF(t_2m(i).GT.t1(i).AND.t_2m(i).GT.ts1(i)) THEN
+!         PRINT*,' BAD t2m GT ',i,nsrf,t_2m(i),t1(i),ts1(i) 
+!       ENDIF
+!       ENDIF
+!IM ---
       ENDDO
 !