Changeset 1279 for LMDZ4/trunk/libf/dyn3d/inidissip.F

Timestamp:

Dec 10, 2009, 10:02:56 AM (15 years ago)

Author:

Laurent Fairhead

Message:

Merged LMDZ4-dev branch changes r1241:1278 into the trunk
Running trunk and LMDZ4-dev in LMDZOR configuration on local
machine (sequential) and SX8 (4-proc) yields identical results
(restart and restartphy are identical binarily)
Log history from r1241 to r1278 is available by switching to
source:LMDZ4/branches/LMDZ4-dev-20091210

Location:

LMDZ4/trunk

Files:

• . (modified) (1 prop)
• libf/dyn3d/inidissip.F (modified) (4 diffs)

LMDZ4/trunk/libf/dyn3d/inidissip.F

@@ -1 +1 @@
 !
-! $Header$
+! $Id$
 !
       SUBROUTINE inidissip ( lstardis,nitergdiv,nitergrot,niterh  ,
@@ -18 +18 @@
 #include "comvert.h"
 #include "control.h"
+#include "logic.h"
 
       LOGICAL lstardis
@@ -29 +30 @@
       INTEGER l,ij,idum,ii
       REAL tetamin
+      REAL pseudoz
 
       REAL ran1
@@ -174 +176 @@
 c   --------------------------------------------------
 
-      DO l=1,llm
-         zvert(l)=1.
-      ENDDO
-
-      fact=2.
-c
-      DO l = 1, llm
-         zz      = 1. - preff/presnivs(l)
-         zvert(l)= fact -( fact-1.)/( 1.+zz*zz )
-      ENDDO
+      if (ok_strato .and. llm==39) then
+         do l=1,llm
+            pseudoz=8.*log(preff/presnivs(l))
+            zvert(l)=1+
+     s      (tanh((pseudoz-dissip_zref)/dissip_deltaz)+1.)/2.
+     s      *(dissip_factz-1.)
+         enddo 
+      else
+         DO l=1,llm
+            zvert(l)=1.
+         ENDDO
+         fact=2.
+         DO l = 1, llm
+            zz      = 1. - preff/presnivs(l)
+            zvert(l)= fact -( fact-1.)/( 1.+zz*zz )
+         ENDDO
+      endif