Changeset 1286 for LMDZ4/trunk/libf

Timestamp:

Dec 17, 2009, 2:47:10 PM (15 years ago)

Author:

Laurent Fairhead

Message:

Les parametres definissant la transition eau glace dans les nuages sont
maintenant lus dans physiq.def. Les valeurs par defaut donnent les memes
resultats que precedemment. JLD

Location:

LMDZ4/trunk/libf

Files:

• dyn3d/leapfrog.F (modified) (1 diff)
• dyn3dpar/leapfrog_p.F (modified) (2 diffs)
• phylmd/conf_phys.F90 (modified) (4 diffs)
• phylmd/newmicro.F (modified) (3 diffs)
• phylmd/nuage.h (modified) (1 diff)

LMDZ4/trunk/libf/dyn3d/leapfrog.F

@@ -185 +185 @@
       PARAMETER (testita = 9)
 
-      logical , parameter :: flag_verif = .true.
+      logical , parameter :: flag_verif = .false.
       
 

LMDZ4/trunk/libf/dyn3dpar/leapfrog_p.F

@@ -172 +172 @@
       INTEGER testita
       PARAMETER (testita = 9)
+
+      logical , parameter :: flag_verif = .false.
       
 c declaration liees au parallelisme
@@ -1286 +1288 @@
 
 
-            IF( itau. EQ. itaufinp1 ) then  
+            IF( itau. EQ. itaufinp1 ) then
+
+              if (flag_verif) then
+                write(79,*) 'ucov',ucov
+                write(80,*) 'vcov',vcov
+                write(81,*) 'teta',teta
+                write(82,*) 'ps',ps
+                write(83,*) 'q',q
+                WRITE(85,*) 'q1 = ',q(:,:,1)
+                WRITE(86,*) 'q3 = ',q(:,:,3)
+              endif
+  
 
 c$OMP MASTER

LMDZ4/trunk/libf/phylmd/conf_phys.F90

@@ -126 +126 @@
   INTEGER,SAVE :: iflag_pdf_omp
   REAL,SAVE :: rad_froid_omp, rad_chau1_omp, rad_chau2_omp
+  REAL,SAVE :: t_glace_min_omp, t_glace_max_omp
   REAL,SAVE :: inertie_sol_omp,inertie_sno_omp,inertie_ice_omp
   REAL,SAVE :: qsol0_omp
@@ -834 +835 @@
 
 !
+!Config Key  = t_glace_min
+!Config Desc =  
+!Config Def  = 258.
+!Config Help = 
+!
+  t_glace_min_omp = 258.
+  call getin('t_glace_min',t_glace_min_omp)
+
+!
+!Config Key  = t_glace_max
+!Config Desc =  
+!Config Def  = 273.13
+!Config Help = 
+!
+  t_glace_max_omp = 273.13
+  call getin('t_glace_max',t_glace_max_omp)
+
+!
 !Config Key  = top_height
 !Config Desc =
@@ -1374 +1393 @@
     rad_chau1 = rad_chau1_omp
     rad_chau2 = rad_chau2_omp
+    t_glace_min = t_glace_min_omp
+    t_glace_max = t_glace_max_omp
     top_height = top_height_omp
     overlap = overlap_omp
@@ -1544 +1565 @@
   write(numout,*)' tau_ratqs = ',tau_ratqs 
   write(numout,*)' top_height = ',top_height 
+  write(numout,*)' rad_froid = ',rad_froid
+  write(numout,*)' rad_chau1 = ',rad_chau1
+  write(numout,*)' rad_chau2 = ',rad_chau2
+  write(numout,*)' t_glace_min = ',t_glace_min
+  write(numout,*)' t_glace_max = ',t_glace_max
   write(numout,*)' overlap = ',overlap 
   write(numout,*)' cdmmax = ',cdmmax 

LMDZ4/trunk/libf/phylmd/newmicro.F

@@ -73 +73 @@
       REAL coef, coef_froi, coef_chau
       PARAMETER (coef_chau=0.13, coef_froi=0.09)
-      REAL seuil_neb, t_glace
-      PARAMETER (seuil_neb=0.001, t_glace=273.0-15.0)
+      REAL seuil_neb
+      PARAMETER (seuil_neb=0.001)
       INTEGER nexpo ! exponentiel pour glace/eau
       PARAMETER (nexpo=6)
@@ -143 +143 @@
          DO k = 1, klev
             DO i = 1, klon
-               zfice2(i,k) = 1.0 - (t(i,k)-t_glace) / (273.13-t_glace)
+c               zfice2(i,k) = 1.0 - (t(i,k)-t_glace) / (273.13-t_glace)
+               zfice2(i,k) = 1.0 - (t(i,k)-t_glace_min) / 
+     &                             (t_glace_max-t_glace_min)
                zfice2(i,k) = MIN(MAX(zfice2(i,k),0.0),1.0)
 c     IM Total Liquid/Ice water content                                    
@@ -339 +341 @@
                   
                   zfice1 = MIN(
-     &                 MAX( 1.0 - (t(i,k)-t_glace) / (273.13-t_glace)
-     &                 ,0.0),1.0)**nexpo
+     &                 MAX( 1.0 - (t(i,k)-t_glace_min) / 
+     &                    (t_glace_max-t_glace_min),0.0),1.0)**nexpo
                   
                   radius = rad_chaud * (1.-zfice1) + rad_froid * zfice1

LMDZ4/trunk/libf/phylmd/nuage.h

@@ -1 +1 @@
 !
-! $Header$
+! $Id$
 !
-      REAL rad_froid, rad_chau1, rad_chau2
+      REAL rad_froid, rad_chau1, rad_chau2, t_glace_max, t_glace_min
 
-      common /nuagecom/ rad_froid,rad_chau1, rad_chau2
+      common /nuagecom/ rad_froid,rad_chau1, rad_chau2,t_glace_max,     &
+     &                  t_glace_min
 !$OMP THREADPRIVATE(/nuagecom/)