Changeset 1279 for LMDZ4/trunk/libf/dyn3d/conf_gcm.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/conf_gcm.F (modified) (6 diffs)

LMDZ4/trunk/libf/dyn3d/conf_gcm.F

@@ -1 +1 @@
 !
-! $Header$
+! $Id$
 !
 c
@@ -38 +38 @@
 #include "serre.h"
 #include "comdissnew.h"
+#include "temps.h"
+#include "comconst.h"
 
 ! FH 2008/05/09 On elimine toutes les clefs physiques dans la dynamique
@@ -111 +113 @@
       CALL getin('planet_type',planet_type)
 
+!Config  Key  = calend
+!Config  Desc = type de calendrier utilise
+!Config  Def  = earth_360d
+!Config  Help = valeur possible: earth_360d, earth_365d, earth_366d
+!Config         
+      calend = 'earth_360d'
+      CALL getin('calend', calend)
+
 !Config  Key  = dayref
 !Config  Desc = Jour de l'etat initial
@@ -267 +277 @@
        tetatemp  = 7200.
        CALL getin('tetatemp',tetatemp )
+
+! Parametres controlant la variation sur la verticale des constantes de
+! dissipation.
+! Pour le moment actifs uniquement dans la version a 39 niveaux
+! avec ok_strato=y
+
+       dissip_factz=4.
+       dissip_deltaz=10.
+       dissip_zref=30.
+       CALL getin('dissip_factz',dissip_factz )
+       CALL getin('dissip_deltaz',dissip_deltaz )
+       CALL getin('dissip_zref',dissip_zref )
+
+       iflag_top_bound=1
+       tau_top_bound=1.e-5
+       CALL getin('iflag_top_bound',iflag_top_bound)
+       CALL getin('tau_top_bound',tau_top_bound)
 
 !Config  Key  = coefdis
@@ -558 +585 @@
       write(lunout,*)' Configuration des parametres du gcm: '
       write(lunout,*)' planet_type = ', planet_type
+      write(lunout,*)' calend = ', calend
       write(lunout,*)' dayref = ', dayref
       write(lunout,*)' anneeref = ', anneeref
@@ -744 +772 @@
       write(lunout,*)' Configuration des parametres du gcm: '
       write(lunout,*)' planet_type = ', planet_type
+      write(lunout,*)' calend = ', calend
       write(lunout,*)' dayref = ', dayref
       write(lunout,*)' anneeref = ', anneeref