Changeset 1279 for LMDZ4/trunk/libf/dyn3dpar/disvert.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/dyn3dpar/disvert.F (modified) (5 diffs)

LMDZ4/trunk/libf/dyn3dpar/disvert.F

@@ -1 +1 @@
 !
-! $Header$
+! $Id$
 !
       SUBROUTINE disvert(pa,preff,ap,bp,dpres,presnivs,nivsigs,nivsig)
@@ -36 +36 @@
 c
       INTEGER l
-      REAL snorm
+      REAL snorm,dsigmin
       REAL alpha,beta,gama,delta,deltaz,h
       INTEGER np,ierr
@@ -96 +96 @@
       WRITE(LUNOUT,*)'WARNING!!! Ancienne discretisation verticale'
 
+      if (ok_strato) then
+         if (llm==39) then
+            dsigmin=0.3
+         else if (llm==50) then
+            dsigmin=1.
+         else
+            WRITE(LUNOUT,*) 'ATTENTION discretisation z a ajuster'
+            dsigmin=1.
+         endif
+         WRITE(LUNOUT,*) 'Discretisation verticale DSIGMIN=',dsigmin
+      endif
+
       h=7.
       snorm  = 0.
@@ -102 +114 @@
 
          IF (ok_strato) THEN
-           dsig(l) =(1.0 + 7.0 * SIN(x)**2)
+           dsig(l) =(dsigmin + 7.0 * SIN(x)**2)
      &            *(0.5*(1.-tanh(1.*(x-asin(1.))/asin(1.))))**2        
          ELSE
@@ -149 +161 @@
 c
       ENDDO
+
+      bp(1)=1.
+      ap(1)=0.
+
       ap(llmp1) = pa * ( sig(llmp1) - bp(llmp1) )