Changeset 5101 for LMDZ6/branches/Amaury_dev/libf/phylmd/Ocean_skin
- Timestamp:
- Jul 23, 2024, 8:22:55 AM (4 months ago)
- Location:
- LMDZ6/branches/Amaury_dev/libf/phylmd/Ocean_skin
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
LMDZ6/branches/Amaury_dev/libf/phylmd/Ocean_skin/bulk_flux_m.F90
r5086 r5101 108 108 if (Jwarm) then 109 109 if (rain_effect) then 110 callNear_Surface(al, t_subskin, s_subskin, ds_ns, dt_ns, &110 CALL Near_Surface(al, t_subskin, s_subskin, ds_ns, dt_ns, & 111 111 tau_with_min, taur, hlb, rhoa, xlv, dtime, t_ocean_1, s1, rain, & 112 112 q_pwp = fxp * rns - (hf + hlb + rnl + rf)) 113 113 else 114 callNear_Surface(al, t_subskin, s_subskin, ds_ns, dt_ns, &114 CALL Near_Surface(al, t_subskin, s_subskin, ds_ns, dt_ns, & 115 115 tau_with_min, taur, hlb, rhoa, xlv, dtime, t_ocean_1, s1, & 116 116 rain = null_array, q_pwp = fxp * rns - (hf + hlb + rnl)) … … 132 132 * (1. - exp(- tkt / 8e-4))) ! equation 16 Ohlmann 133 133 if (rain_effect) then 134 callMicrolayer(dter, dser, tkt, tks, hlb, tau_with_min, &134 CALL Microlayer(dter, dser, tkt, tks, hlb, tau_with_min, & 135 135 s_subskin, al, xlv, taur, rf, rain, & 136 136 qcol = rnl + hf + hlb - dels) 137 137 else 138 callMicrolayer(dter, dser, tkt, tks, hlb, tau_with_min, &138 CALL Microlayer(dter, dser, tkt, tks, hlb, tau_with_min, & 139 139 s_subskin, al, xlv, taur, rf = null_array, & 140 140 rain = null_array, qcol = rnl + hf + hlb - dels) -
LMDZ6/branches/Amaury_dev/libf/phylmd/Ocean_skin/config_ocean_skin_m.F90
r4176 r5101 42 42 43 43 #ifdef IN_LMDZ 44 callgetin_p("activate_ocean_skin", activate_ocean_skin)45 callassert(activate_ocean_skin >= 0 .and. activate_ocean_skin <= 2, &44 CALL getin_p("activate_ocean_skin", activate_ocean_skin) 45 CALL assert(activate_ocean_skin >= 0 .and. activate_ocean_skin <= 2, & 46 46 "config_ocean_skin bad value of activate_ocean_skin") 47 47 if (activate_ocean_skin >= 1) then 48 callgetin_p("flag_ocean_skin", flag_ocean_skin)49 callgetin_p("depth_1", depth_1)48 CALL getin_p("flag_ocean_skin", flag_ocean_skin) 49 CALL getin_p("depth_1", depth_1) 50 50 end if 51 51 #else
Note: See TracChangeset
for help on using the changeset viewer.