Changeset 803

Timestamp:

Jul 3, 2007, 5:18:23 PM (17 years ago)

Author:

Laurent Fairhead

Message:

On elimine l'ancien calcul de clvent JG
LF

Location:

LMDZ4/trunk/libf/phylmd

Files:

• ocean_cpl_mod.F90 (modified) (3 diffs)
• pbl_surface_mod.F90 (modified) (5 diffs)
• surface_data.F90 (modified) (1 diff)

LMDZ4/trunk/libf/phylmd/ocean_cpl_mod.F90

@@ -12 +12 @@
   USE calcul_fluxs_mod, ONLY : calcul_fluxs
   USE climb_wind_mod,   ONLY : calcul_wind_flux
-  USE mod_clvent,       ONLY : calcul_flux_vent
-  USE surface_data,     ONLY : newwind
 
   IMPLICIT NONE
@@ -160 +158 @@
          tsurf_new, evap, fluxlat, fluxsens, dflux_s, dflux_l)
     
-!jg : temporary test, only calcul_flux_wind should be saved in the future
     ! Calcultate the flux of u and v at surface
-    IF (newwind) THEN
-       ! calculate flux with new methode
-       CALL calcul_wind_flux(knon, dtime, taux, tauy)
-    ELSE 
-       ! use results from old clvent. jg: TO BE REMOVED
-       CALL calcul_flux_vent(klon, taux, tauy)
-    ENDIF
-
+    CALL calcul_wind_flux(knon, dtime, taux, tauy)
+    
 
 !****************************************************************************************
@@ -312 +303 @@
 
     ! Calcultate the flux of u and v at surface
-    IF (newwind) THEN
-       ! calculate flux with new methode
-       CALL calcul_wind_flux(knon, dtime, taux, tauy)
-    ELSE
-       ! use results from old clvent. jg: TO BE REMOVED
-       CALL calcul_flux_vent(klon, taux, tauy)
-    END IF
-
+    CALL calcul_wind_flux(knon, dtime, taux, tauy)
+    
 !****************************************************************************************
 ! Flux ocean-atmosphere useful for "slab" ocean but here calculated only for printing

LMDZ4/trunk/libf/phylmd/pbl_surface_mod.F90

@@ -13 +13 @@
   USE mod_phys_lmdz_para,  ONLY : mpi_size
   USE ioipsl
-  USE surface_data,        ONLY : ocean, ok_veget, debug_surf, newwind
+  USE surface_data,        ONLY : ocean, ok_veget
   USE surf_land_mod,       ONLY : surf_land
   USE surf_landice_mod,    ONLY : surf_landice
@@ -22 +22 @@
   USE climb_wind_mod,      ONLY : climb_wind_down, climb_wind_up
   USE coef_diff_turb_mod,  ONLY : coef_diff_turb
-
-!jg+ temporary
-  USE mod_clvent, ONLY : clvent, save_flux
-!jg-
 
   IMPLICIT NONE
@@ -455 +451 @@
 
 
-!jg+ temporary test
-    REAL, DIMENSION(klon,klev)         :: y_flux_u_old, y_flux_v_old
-    REAL, DIMENSION(klon,klev)         :: y_d_u_old, y_d_v_old
-!jg-
-    
 !****************************************************************************************
 ! End of declarations
@@ -698 +689 @@
             ycoefm, ycoefh)
        
-!jg+
-!****************************************************************************************
-!    => Old method
-! Calculer la diffusion des vitesses "u" et "v"   
-! Output can be used : y_d_u_old, y_flux_u_old, y_d_v_old, y_flux_v_old
-!
-!****************************************************************************************
-       CALL clvent(knon,dtime,yu1,yv1,ycoefm,yt,yu,ypaprs,ypplay,ydelp, &
-            y_d_u_old, y_flux_u_old)
-       CALL clvent(knon,dtime,yu1,yv1,ycoefm,yt,yv,ypaprs,ypplay,ydelp, &
-            y_d_v_old, y_flux_v_old)
-       ! save_flux est utile pour pouvoir utilise calcul_flux_vent plus tard
-       CALL save_flux(klon, y_flux_u_old(:,1), y_flux_v_old(:,1))
-!jg-
-
 !****************************************************************************************
 ! 
@@ -848 +824 @@
             y_flux_u, y_flux_v, y_d_u, y_d_v)
 
-!jg+ temporary for testing 
-! Use the results from old method
-       IF (.NOT. newwind) THEN
-          y_flux_u(:,:) = y_flux_u_old(:,:)
-          y_flux_v(:,:) = y_flux_v_old(:,:)
-          y_d_u(:,:)    = y_d_u_old(:,:)
-          y_d_v(:,:)    = y_d_v_old(:,:)
-       ENDIF
-!jg-
-   
        DO j = 1, knon
           y_dflux_t(j) = y_dflux_t(j) * ypct(j)

LMDZ4/trunk/libf/phylmd/surface_data.F90

@@ -10 +10 @@
   REAL, PARAMETER        :: calsno=1./(2.3867e+06*.15)
   
-  LOGICAL, SAVE          :: debug_surf=.FALSE.
-  !$OMP THREADPRIVATE(debug_surf)
-  LOGICAL, SAVE          :: newwind=.FALSE.
-  !$OMP THREADPRIVATE(newwind)
-  
   LOGICAL, SAVE          :: ok_veget       ! true for use of vegetation model ORCHIDEE
   !$OMP THREADPRIVATE(ok_veget)