Changeset 2408 for LMDZ5/branches/testing/libf/phylmd/orografi_strato.F90

Timestamp:

Dec 14, 2015, 11:43:09 AM (9 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2298:2396 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/orografi_strato.F90 (modified) (10 diffs)

LMDZ5/branches/testing/libf/phylmd/orografi_strato.F90

@@ -61 +61 @@
 
   ! ======================================================================
-  ! ym#include "dimensions.h"
-  ! ym#include "dimphy.h"
   include "YOMCST.h"
   include "YOEGWD.h"
@@ -239 +237 @@
 
 
-  ! ym#include "dimensions.h"
-  ! ym#include "dimphy.h"
   include "YOMCST.h"
   include "YOEGWD.h"
@@ -541 +537 @@
 
 
-  ! ym#include "dimensions.h"
-  ! ym#include "dimphy.h"
   include "YOMCST.h"
   include "YOEGWD.h"
@@ -995 +989 @@
   IMPLICIT NONE
 
-  ! ym#include "dimensions.h"
-  ! ym#include "dimphy.h"
   include "YOMCST.h"
   include "YOEGWD.h"
@@ -1114 +1106 @@
   IMPLICIT NONE
 
-  ! ym#include "dimensions.h"
-  ! ym#include "dimphy.h"
   include "YOMCST.h"
   include "YOEGWD.h"
@@ -1350 +1340 @@
   ! ======================================================================
 
-  ! ym#include "dimensions.h"
-  ! ym#include "dimphy.h"
   include "YOMCST.h"
   include "YOEGWD.h"
@@ -1510 +1498 @@
 
 
-  ! ym#include "dimensions.h"
-  ! ym#include "dimphy.h"
   include "YOMCST.h"
   include "YOEGWD.h"
@@ -1558 +1544 @@
   IF (nlon/=klon .OR. nlev/=klev) THEN
     abort_message = 'pb dimension'
-    CALL abort_gcm(modname, abort_message, 1)
+    CALL abort_physic(modname, abort_message, 1)
   END IF
   zcons1 = 1./rd
@@ -1847 +1833 @@
 
   zpr = 100000.
-  ztop = 0.001
+  ZTOP=0.00005
   zsigt = 0.94
   ! old  ZPR=80000.
@@ -1873 +1859 @@
   PRINT *, ' DANS SUGWD nktopg=', nktopg
   PRINT *, ' DANS SUGWD nstra=', nstra
-  if (nstra == 0) call abort_gcm("sugwd_strato", "no level in stratosphere", 1)
-
-  gsigcr = 0.80
-
-  gkdrag = 0.1875
-  grahilo = 0.1
-  grcrit = 1.00
-  gfrcrit = 1.00
-  gkwake = 0.50
-
-  gklift = 0.25
+  if (nstra == 0) call abort_physic("sugwd_strato", "no level in stratosphere", 1)
+
+!  Valeurs lues dans les .def, ou attribues dans conf_phys
+  !gkdrag = 0.2   
+  !grahilo = 0.1
+  !grcrit = 1.00
+  !gfrcrit = 0.70
+  !gkwake = 0.40
+  !gklift = 0.25
+
+  gsigcr = 0.80 ! Top of low level flow
   gvcrit = 0.1