Changeset 545 for trunk

Timestamp:

Feb 28, 2012, 10:17:23 AM (13 years ago)

Author:

acolaitis

Message:

Bug correction for cases when the Richardson exceeds the critical richardson.

File:

• trunk/LMDZ.MARS/libf/phymars/vdifc.F (modified) (1 diff)

trunk/LMDZ.MARS/libf/phymars/vdifc.F

@@ -327 +327 @@
 
         IF (callrichsl) THEN
-       zcdv(:)=zcdv_true(:)*sqrt(zu2(:)+
-     &  (log(1.+0.7*wstar(:) + 2.3*wstar(:)**2))**2)
-!     &  (14.75*sqrt(hfmax(:)) - 10.*hfmax(:) + 1.7*hfmax(:)**2)**2)     ! subgrid gustiness added by quadratic interpolation with a coeff beta
-       zcdh(:)=zcdh_true(:)*sqrt(zu2(:)+
-     &  (log(1.+0.7*wstar(:) + 2.3*wstar(:)**2))**2)
-!     &  (8.*hfmax(:) + 0.*hfmax(:)**2 + 0.*hfmax(:)**4)**2)     ! LES comparisons. This parameter is linked to the thermals settings)
-
-        ust(:)=sqrt(zcdv_true(:))*sqrt(zu2(:)+
-     &  (log(1.+0.7*wstar(:) + 2.3*wstar(:)**2))**2)
-!     &  (14.75*sqrt(hfmax(:)) - 10.*hfmax(:) + 1.7*hfmax(:)**2)**2)
-        tst(:)=(ph(:,1)-ptsrf(:))*zcdh(:)/ust(:)
-!        ust(:)=sqrt(zcdv_true(:))*sqrt(zu2(:))
-!        tst(:)=(ph(:,1)-ptsrf(:))*zcdh_true(:)/sqrt(zcdv_true(:))
+          zcdv(:)=zcdv_true(:)*sqrt(zu2(:)+
+     &     (log(1.+0.7*wstar(:) + 2.3*wstar(:)**2))**2)
+          zcdh(:)=zcdh_true(:)*sqrt(zu2(:)+
+     &     (log(1.+0.7*wstar(:) + 2.3*wstar(:)**2))**2)
+
+           ust(:)=sqrt(zcdv_true(:))*sqrt(zu2(:)+
+     &     (log(1.+0.7*wstar(:) + 2.3*wstar(:)**2))**2)
+
+           tst(:)=0.
+           DO ig=1,ngrid
+              IF (zcdh_true(ig) .ne. 0.) THEN      ! When Cd=Ch=0, u*=t*=0
+                 tst(ig)=(ph(ig,1)-ptsrf(ig))*zcdh(ig)/ust(ig)
+              ENDIF
+           ENDDO
+
         ELSE
-        zcdv(:)=zcdv_true(:)*sqrt(zu2(:))     ! 1 / bulk aerodynamic momentum conductance 
-        zcdh(:)=zcdh_true(:)*sqrt(zu2(:))     ! 1 / bulk aerodynamic heat conductance
-        ust(:)=sqrt(zcdv_true(:))*sqrt(zu2(:))
-        tst(:)=(ph(:,1)-ptsrf(:))*zcdh_true(:)/sqrt(zcdv_true(:))
+           zcdv(:)=zcdv_true(:)*sqrt(zu2(:))     ! 1 / bulk aerodynamic momentum conductance 
+           zcdh(:)=zcdh_true(:)*sqrt(zu2(:))     ! 1 / bulk aerodynamic heat conductance
+           ust(:)=sqrt(zcdv_true(:))*sqrt(zu2(:))
+           tst(:)=(ph(:,1)-ptsrf(:))*zcdh_true(:)/sqrt(zcdv_true(:))
         ENDIF