Changeset 3463
- Timestamp:
- Feb 8, 2019, 2:28:03 PM (6 years ago)
- Location:
- LMDZ6/branches/Ocean_skin/libf/phylmd
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
LMDZ6/branches/Ocean_skin/libf/phylmd/ocean_cpl_mod.F90
r3102 r3463 52 52 AcoefH, AcoefQ, BcoefH, BcoefQ, & 53 53 AcoefU, AcoefV, BcoefU, BcoefV, & 54 ps, u1, v1, gustiness, &54 ps, u1, v1, gustiness, tsurf_in, & 55 55 radsol, snow, agesno, & 56 56 qsurf, evap, fluxsens, fluxlat, flux_u1, flux_v1, & … … 68 68 USE phys_output_var_mod, ONLY : sens_prec_liq_o, sens_prec_sol_o, lat_prec_liq_o, lat_prec_sol_o 69 69 USE cpl_mod, ONLY : gath2cpl 70 use config_ocean_skin_m, only: activate_ocean_skin 70 71 71 72 INCLUDE "YOMCST.h" … … 90 91 REAL, DIMENSION(klon), INTENT(IN) :: ps 91 92 REAL, DIMENSION(klon), INTENT(IN) :: u1, v1, gustiness 93 REAL, DIMENSION(klon), INTENT(IN) :: tsurf_in 92 94 93 95 ! In/Output arguments … … 147 149 148 150 CALL calcul_fluxs(knon, is_oce, dtime, & 149 tsurf_cpl, p1lay, cal, beta, cdragh, cdragq, ps, & 151 merge(tsurf_in, tsurf_cpl, activate_ocean_skin == 2), p1lay, cal, & 152 beta, cdragh, cdragq, ps, & 150 153 precip_rain, precip_snow, snow, qsurf, & 151 154 radsol, dif_grnd, temp_air, spechum, u1_lay, v1_lay, gustiness, & … … 153 156 tsurf_new, evap, fluxlat, fluxsens, dflux_s, dflux_l, & 154 157 sens_prec_liq, sens_prec_sol, lat_prec_liq, lat_prec_sol) 158 if (activate_ocean_skin == 2) tsurf_new = tsurf_cpl 159 155 160 do j = 1, knon 156 161 i = knindex(j) -
LMDZ6/branches/Ocean_skin/libf/phylmd/ocean_forced_mod.F90
r3327 r3463 19 19 AcoefH, AcoefQ, BcoefH, BcoefQ, & 20 20 AcoefU, AcoefV, BcoefU, BcoefV, & 21 ps, u1, v1, gustiness, &21 ps, u1, v1, gustiness, tsurf_in, & 22 22 radsol, snow, agesno, & 23 23 qsurf, evap, fluxsens, fluxlat, flux_u1, flux_v1, & … … 35 35 USE indice_sol_mod 36 36 USE phys_output_var_mod, ONLY : sens_prec_liq_o, sens_prec_sol_o, lat_prec_liq_o, lat_prec_sol_o 37 use config_ocean_skin_m, only: activate_ocean_skin 37 38 38 39 INCLUDE "YOMCST.h" … … 53 54 REAL, DIMENSION(klon), INTENT(IN) :: ps 54 55 REAL, DIMENSION(klon), INTENT(IN) :: u1, v1, gustiness 56 REAL, DIMENSION(klon), INTENT(IN) :: tsurf_in 55 57 56 58 ! In/Output arguments … … 119 121 ! Calcul de tsurf_new, evap, fluxlat, fluxsens, dflux_s, dflux_l and qsurf 120 122 CALL calcul_fluxs(knon, is_oce, dtime, & 121 tsurf_lim, p1lay, cal, beta, cdragh, cdragq, ps, & 123 merge(tsurf_in, tsurf_lim, activate_ocean_skin == 2), p1lay, cal, & 124 beta, cdragh, cdragq, ps, & 122 125 precip_rain, precip_snow, snow, qsurf, & 123 126 radsol, dif_grnd, temp_air, spechum, u1_lay, v1_lay, gustiness, & … … 125 128 tsurf_new, evap, fluxlat, fluxsens, dflux_s, dflux_l, & 126 129 sens_prec_liq, sens_prec_sol, lat_prec_liq, lat_prec_sol) 130 if (activate_ocean_skin == 2) tsurf_new = tsurf_lim 127 131 128 132 do j = 1, knon -
LMDZ6/branches/Ocean_skin/libf/phylmd/surf_ocean_mod.F90
r3458 r3463 182 182 AcoefH, AcoefQ, BcoefH, BcoefQ, & 183 183 AcoefU, AcoefV, BcoefU, BcoefV, & 184 ps, u1, v1, gustiness, &184 ps, u1, v1, gustiness, tsurf_in, & 185 185 radsol, snow, agesno, & 186 186 qsurf, evap, fluxsens, fluxlat, flux_u1, flux_v1, & … … 205 205 AcoefH, AcoefQ, BcoefH, BcoefQ, & 206 206 AcoefU, AcoefV, BcoefU, BcoefV, & 207 ps, u1, v1, gustiness, &207 ps, u1, v1, gustiness, tsurf_in, & 208 208 radsol, snow, agesno, & 209 209 qsurf, evap, fluxsens, fluxlat, flux_u1, flux_v1, & … … 317 317 precip_tot = precip_rain(:knon) + precip_snow(:knon) 318 318 rf = sens_heat_rain(precip_tot, temp_air(:knon), spechum(:knon), rhoa, & 319 xlv, tsurf_ new(:knon), ps(:knon))319 xlv, tsurf_in(:knon), ps(:knon)) 320 320 s1 = 35. 321 321 call bulk_flux(tkt, tks, taur, dter, dser, t_int, s_int, ds_ns, dt_ns, &
Note: See TracChangeset
for help on using the changeset viewer.