Changeset 2542 for LMDZ5/branches/testing/libf/phylmd/ocean_forced_mod.F90

Timestamp:

Jun 6, 2016, 4:04:57 PM (9 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2487:2541 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/ocean_forced_mod.F90 (modified) (12 diffs, 1 prop)

LMDZ5/branches/testing/libf/phylmd/ocean_forced_mod.F90

@@ +1 @@
+!
+! $Id$
 !
 MODULE ocean_forced_mod
@@ -32 +34 @@
     USE mod_grid_phy_lmdz
     USE indice_sol_mod
+    USE phys_output_var_mod, ONLY : sens_prec_liq_o, sens_prec_sol_o, lat_prec_liq_o, lat_prec_sol_o
+
     INCLUDE "YOMCST.h"
     INCLUDE "clesphys.h"
@@ -66 +70 @@
 ! Local variables
 !****************************************************************************************
-    INTEGER                     :: i
+    INTEGER                     :: i, j
     REAL, DIMENSION(klon)       :: cal, beta, dif_grnd
     REAL, DIMENSION(klon)       :: alb_neig, tsurf_lim, zx_sl
@@ -72 +76 @@
     REAL, DIMENSION(klon)       :: u1_lay, v1_lay
     LOGICAL                     :: check=.FALSE.
+    REAL, DIMENSION(klon) :: sens_prec_liq, sens_prec_sol    
+    REAL, DIMENSION(klon) :: lat_prec_liq, lat_prec_sol    
 
 !****************************************************************************************
@@ -103 +109 @@
     alb_neig(:) = 0.
     agesno(:) = 0.
+    sens_prec_liq = 0.; sens_prec_sol = 0.; lat_prec_liq = 0.; lat_prec_sol = 0.
+
 ! Suppose zero surface speed
     u0(:)=0.0
@@ -115 +123 @@
          radsol, dif_grnd, temp_air, spechum, u1_lay, v1_lay, gustiness, &
          f_qsat_oce,AcoefH, AcoefQ, BcoefH, BcoefQ, &
-         tsurf_new, evap, fluxlat, fluxsens, dflux_s, dflux_l)
+         tsurf_new, evap, fluxlat, fluxsens, dflux_s, dflux_l, &
+         sens_prec_liq, sens_prec_sol, lat_prec_liq, lat_prec_sol)
+
+    do j = 1, knon
+      i = knindex(j)
+      sens_prec_liq_o(i,1) = sens_prec_liq(j)
+      sens_prec_sol_o(i,1) = sens_prec_sol(j)
+      lat_prec_liq_o(i,1) = lat_prec_liq(j)
+      lat_prec_sol_o(i,1) = lat_prec_sol(j)
+    enddo
+
 
 ! - Flux calculation at first modele level for U and V
@@ -148 +166 @@
     USE fonte_neige_mod,  ONLY : fonte_neige
     USE indice_sol_mod
+    USE phys_output_var_mod, ONLY : sens_prec_liq_o, sens_prec_sol_o, lat_prec_liq_o, lat_prec_sol_o
 
 !    INCLUDE "indicesol.h"
@@ -189 +208 @@
 !****************************************************************************************
     LOGICAL                     :: check=.FALSE.
-    INTEGER                     :: i
+    INTEGER                     :: i, j
     REAL                        :: zfra
     REAL, PARAMETER             :: t_grnd=271.35
@@ -197 +216 @@
     REAL, DIMENSION(klon)       :: u0, v0
     REAL, DIMENSION(klon)       :: u1_lay, v1_lay
+    REAL, DIMENSION(klon)       :: sens_prec_liq, sens_prec_sol    
+    REAL, DIMENSION(klon)       :: lat_prec_liq, lat_prec_sol    
+
 
 !****************************************************************************************
@@ -208 +230 @@
 !                    dflux_s, dflux_l and qsurf
 !****************************************************************************************
+
     tsurf_tmp(:) = tsurf_in(:)
 
@@ -227 +250 @@
 
     beta = 1.0
+    sens_prec_liq = 0.; sens_prec_sol = 0.; lat_prec_liq = 0.; lat_prec_sol = 0.
+
 ! Suppose zero surface speed
     u0(:)=0.0
@@ -237 +262 @@
          radsol, dif_grnd, temp_air, spechum, u1_lay, v1_lay, gustiness, &
          f_qsat_oce,AcoefH, AcoefQ, BcoefH, BcoefQ, &
-         tsurf_new, evap, fluxlat, fluxsens, dflux_s, dflux_l)
+         tsurf_new, evap, fluxlat, fluxsens, dflux_s, dflux_l, &
+         sens_prec_liq, sens_prec_sol, lat_prec_liq, lat_prec_sol)
+    do j = 1, knon
+      i = knindex(j)
+      sens_prec_liq_o(i,2) = sens_prec_liq(j)
+      sens_prec_sol_o(i,2) = sens_prec_sol(j)
+      lat_prec_liq_o(i,2) = lat_prec_liq(j)
+      lat_prec_sol_o(i,2) = lat_prec_sol(j)
+    enddo
 
 ! - Flux calculation at first modele level for U and V