Changeset 803 for LMDZ4/trunk/libf


Ignore:
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:
3 edited

Legend:

Unmodified
Added
Removed
  • LMDZ4/trunk/libf/phylmd/ocean_cpl_mod.F90

    r793 r803  
    1212  USE calcul_fluxs_mod, ONLY : calcul_fluxs
    1313  USE climb_wind_mod,   ONLY : calcul_wind_flux
    14   USE mod_clvent,       ONLY : calcul_flux_vent
    15   USE surface_data,     ONLY : newwind
    1614
    1715  IMPLICIT NONE
     
    160158         tsurf_new, evap, fluxlat, fluxsens, dflux_s, dflux_l)
    161159   
    162 !jg : temporary test, only calcul_flux_wind should be saved in the future
    163160    ! Calcultate the flux of u and v at surface
    164     IF (newwind) THEN
    165        ! calculate flux with new methode
    166        CALL calcul_wind_flux(knon, dtime, taux, tauy)
    167     ELSE
    168        ! use results from old clvent. jg: TO BE REMOVED
    169        CALL calcul_flux_vent(klon, taux, tauy)
    170     ENDIF
    171 
     161    CALL calcul_wind_flux(knon, dtime, taux, tauy)
     162   
    172163
    173164!****************************************************************************************
     
    312303
    313304    ! Calcultate the flux of u and v at surface
    314     IF (newwind) THEN
    315        ! calculate flux with new methode
    316        CALL calcul_wind_flux(knon, dtime, taux, tauy)
    317     ELSE
    318        ! use results from old clvent. jg: TO BE REMOVED
    319        CALL calcul_flux_vent(klon, taux, tauy)
    320     END IF
    321 
     305    CALL calcul_wind_flux(knon, dtime, taux, tauy)
     306   
    322307!****************************************************************************************
    323308! Flux ocean-atmosphere useful for "slab" ocean but here calculated only for printing
  • LMDZ4/trunk/libf/phylmd/pbl_surface_mod.F90

    r793 r803  
    1313  USE mod_phys_lmdz_para,  ONLY : mpi_size
    1414  USE ioipsl
    15   USE surface_data,        ONLY : ocean, ok_veget, debug_surf, newwind
     15  USE surface_data,        ONLY : ocean, ok_veget
    1616  USE surf_land_mod,       ONLY : surf_land
    1717  USE surf_landice_mod,    ONLY : surf_landice
     
    2222  USE climb_wind_mod,      ONLY : climb_wind_down, climb_wind_up
    2323  USE coef_diff_turb_mod,  ONLY : coef_diff_turb
    24 
    25 !jg+ temporary
    26   USE mod_clvent, ONLY : clvent, save_flux
    27 !jg-
    2824
    2925  IMPLICIT NONE
     
    455451
    456452
    457 !jg+ temporary test
    458     REAL, DIMENSION(klon,klev)         :: y_flux_u_old, y_flux_v_old
    459     REAL, DIMENSION(klon,klev)         :: y_d_u_old, y_d_v_old
    460 !jg-
    461    
    462453!****************************************************************************************
    463454! End of declarations
     
    698689            ycoefm, ycoefh)
    699690       
    700 !jg+
    701 !****************************************************************************************
    702 !    => Old method
    703 ! Calculer la diffusion des vitesses "u" et "v"   
    704 ! Output can be used : y_d_u_old, y_flux_u_old, y_d_v_old, y_flux_v_old
    705 !
    706 !****************************************************************************************
    707        CALL clvent(knon,dtime,yu1,yv1,ycoefm,yt,yu,ypaprs,ypplay,ydelp, &
    708             y_d_u_old, y_flux_u_old)
    709        CALL clvent(knon,dtime,yu1,yv1,ycoefm,yt,yv,ypaprs,ypplay,ydelp, &
    710             y_d_v_old, y_flux_v_old)
    711        ! save_flux est utile pour pouvoir utilise calcul_flux_vent plus tard
    712        CALL save_flux(klon, y_flux_u_old(:,1), y_flux_v_old(:,1))
    713 !jg-
    714 
    715691!****************************************************************************************
    716692!
     
    848824            y_flux_u, y_flux_v, y_d_u, y_d_v)
    849825
    850 !jg+ temporary for testing
    851 ! Use the results from old method
    852        IF (.NOT. newwind) THEN
    853           y_flux_u(:,:) = y_flux_u_old(:,:)
    854           y_flux_v(:,:) = y_flux_v_old(:,:)
    855           y_d_u(:,:)    = y_d_u_old(:,:)
    856           y_d_v(:,:)    = y_d_v_old(:,:)
    857        ENDIF
    858 !jg-
    859    
    860826       DO j = 1, knon
    861827          y_dflux_t(j) = y_dflux_t(j) * ypct(j)
  • LMDZ4/trunk/libf/phylmd/surface_data.F90

    r781 r803  
    1010  REAL, PARAMETER        :: calsno=1./(2.3867e+06*.15)
    1111 
    12   LOGICAL, SAVE          :: debug_surf=.FALSE.
    13   !$OMP THREADPRIVATE(debug_surf)
    14   LOGICAL, SAVE          :: newwind=.FALSE.
    15   !$OMP THREADPRIVATE(newwind)
    16  
    1712  LOGICAL, SAVE          :: ok_veget       ! true for use of vegetation model ORCHIDEE
    1813  !$OMP THREADPRIVATE(ok_veget)
Note: See TracChangeset for help on using the changeset viewer.