Changeset 803 for LMDZ4/trunk/libf/phylmd/ocean_cpl_mod.F90

Timestamp:

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

Author:

Laurent Fairhead

Message:

On elimine l'ancien calcul de clvent JG
LF

File:

• LMDZ4/trunk/libf/phylmd/ocean_cpl_mod.F90 (modified) (3 diffs)

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