Changeset 889 for LMDZ4/trunk

Timestamp:

Feb 5, 2008, 11:28:30 AM (16 years ago)

Author:

Laurent Fairhead

Message:

Modifs pour que l'aquaplanete marche FH
LF

Location:

LMDZ4/trunk/libf/phylmd

Files:

• clesphys.h (modified) (2 diffs)
• conf_phys.F90 (modified) (2 diffs)
• pbl_surface_mod.F90 (modified) (1 diff)
• physiq.F (modified) (3 diffs)

LMDZ4/trunk/libf/phylmd/clesphys.h

@@ -33 +33 @@
 !IM fmagic : parametre pour regler l albedo sur ocean
        REAL fmagic
+! Hauteur (imposee) du contenu en eau du sol
+           REAL qsol0
 !IM lev_histhf  : niveau sorties 6h
 !IM lev_histday : niveau sorties journalieres
@@ -57 +59 @@
      &     , ecrit_mth, ecrit_tra, ecrit_reg                            &
      &     , freq_ISCCP, ecrit_ISCCP, ip_ebil_phy                       &
-     &     , ok_slab_sicOBS, ok_lic_melt, cvl_corr
+     &     , ok_slab_sicOBS, ok_lic_melt, cvl_corr                      &
+     &     , qsol0
      
 !$OMP THREADPRIVATE(/clesphys/)

LMDZ4/trunk/libf/phylmd/conf_phys.F90

@@ -6 +6 @@
 
   subroutine conf_phys(ocean, ok_veget, ok_journe, ok_mensuel, ok_instan, ok_hf, &
- &                     solarlong0,qsol0,seuil_inversion, &
+ &                     solarlong0,seuil_inversion, &
  &                     fact_cldcon, facttemps,ok_newmicro,iflag_radia,&
  &                     iflag_cldcon, &
@@ -95 +95 @@
   REAL,SAVE :: rad_froid_omp, rad_chau1_omp, rad_chau2_omp
   REAL,SAVE :: inertie_sol_omp,inertie_sno_omp,inertie_ice_omp
-  REAL      :: qsol0
   REAL,SAVE :: qsol0_omp
   REAL      :: solarlong0

LMDZ4/trunk/libf/phylmd/pbl_surface_mod.F90

@@ -536 +536 @@
           
 !****************************************************************************************
+! Force soil water content to qsol0 if qsol0>0 and VEGET=F (use bucket
+! instead of ORCHIDEE)
+    if (qsol0>0.) then
+      print*,'WARNING : On impose qsol=',qsol0
+      qsol(:)=qsol0
+    endif
+!****************************************************************************************
+
+!****************************************************************************************
 ! 2) Initialization to zero 
 !    Done for all local variables that will be compressed later

LMDZ4/trunk/libf/phylmd/physiq.F

@@ -687 +687 @@
 c
       REAL qsol(klon)
-      REAL,save :: qsol0
       REAL,save ::  solarlong0
 c
@@ -1739 +1738 @@
          call conf_phys(ocean, ok_veget, ok_journe, ok_mensuel,
      .                  ok_instan, ok_hf,
-     .                  solarlong0,qsol0,seuil_inversion,
+     .                  solarlong0,seuil_inversion,
      .                  fact_cldcon, facttemps,ok_newmicro,iflag_radia,
      .                  iflag_cldcon,iflag_ratqs,ratqsbas,ratqshaut,
@@ -2308 +2307 @@
 c   dsens, devap, zxsnow, zxfluxt, zxfluxq, q2m, fluxq
 c
-
-      if (qsol0>0.) qsol(:)=qsol0
 
       CALL pbl_surface(