Changeset 2287

Timestamp:

May 22, 2015, 5:52:37 PM (10 years ago)

Author:

crio

Message:

 

Location:

LMDZ5/trunk/libf/phylmd

Files:

• conf_phys_m.F90 (modified) (5 diffs)
• cv3_routines.F90 (modified) (3 diffs)
• nuage.h (modified) (2 diffs)

LMDZ5/trunk/libf/phylmd/conf_phys_m.F90

@@ -40 +40 @@
     include "thermcell.h"
     include "iniprint.h"
+
 
     !IM : on inclut/initialise les taux de CH4, N2O, CFC11 et CFC12
@@ -145 +146 @@
     INTEGER, SAVE :: iflag_mix_omp
     real, save :: scut_omp, qqa1_omp, qqa2_omp, gammas_omp, Fmax_omp, alphas_omp
+    REAL, SAVE :: tmax_fonte_cv_omp
 
     REAL,SAVE :: R_ecc_omp,R_peri_omp,R_incl_omp,solaire_omp
@@ -1788 +1790 @@
     Fmax_omp = 0.65
     call getin('Fmax',Fmax_omp)
+
+    !
+    !Config Key  = tmax_fonte_cv
+    !Config Desc =
+    !Config Def  = 275.15
+    !Config Help =
+    !
+    tmax_fonte_cv_omp = 275.15
+    call getin('tmax_fonte_cv',tmax_fonte_cv_omp)
 
     !
@@ -2085 +2096 @@
     gammas = gammas_omp
     Fmax = Fmax_omp
+    tmax_fonte_cv = tmax_fonte_cv_omp
     alphas = alphas_omp
     ok_strato = ok_strato_omp
@@ -2275 +2287 @@
     write(lunout,*)' gammas = ', gammas
     write(lunout,*)' Fmax = ', Fmax
+    write(lunout,*)' tmax_fonte_cv = ', tmax_fonte_cv
     write(lunout,*)' alphas = ', alphas
     write(lunout,*)' iflag_wake = ', iflag_wake

LMDZ5/trunk/libf/phylmd/cv3_routines.F90

@@ -2224 +2224 @@
   include "cv3param.h"
   include "cvflag.h"
+  include "nuage.h"
 
 !inputs:
@@ -2403 +2404 @@
 
           IF (cvflag_ice) THEN
-            thaw = (t(il,i)-273.15)/(275.15-273.15)
+!CR:tmax_fonte_cv: T for which ice is totally melted (used to be 275.15)
+            thaw = (t(il,i)-273.15)/(tmax_fonte_cv-273.15)
             thaw = min(max(thaw,0.0), 1.0)
             frac(il, i) = frac(il, i)*(1.-thaw)
@@ -2517 +2519 @@
           f6 = -100.*sigd(il)*bfac*(ph(il,i)-ph(il,i+1))*evap(il, i)
 
-          thaw = (t(il,i)-273.15)/(275.15-273.15)
+!CR:tmax_fonte_cv: T for which ice is totally melted (used to be 275.15)
+          thaw = (t(il,i)-273.15)/(tmax_fonte_cv-273.15)
           thaw = min(max(thaw,0.0), 1.0)
           water(il, i) = water(il, i+1) + (1-fraci(il,i))*d6

LMDZ5/trunk/libf/phylmd/nuage.h

@@ -7 +7 @@
       REAL tau_cld_cv,coefw_cld_cv
 
+      REAL tmax_fonte_cv
+
       INTEGER iflag_t_glace,iflag_cld_cv
 
@@ -12 +14 @@
      &                  t_glace_min,exposant_glace,rei_min,rei_max,     &
      &                  tau_cld_cv,coefw_cld_cv,                        &
-     &                  iflag_t_glace,iflag_cld_cv
+     &                  iflag_t_glace,iflag_cld_cv,tmax_fonte_cv
 !$OMP THREADPRIVATE(/nuagecom/)