Changeset 2057 for LMDZ5/trunk/libf/phylmd/surf_seaice_mod.F90

Timestamp:

Jun 16, 2014, 4:33:38 PM (10 years ago)

Author:

Ehouarn Millour

Message:

Preparatory stuff to fix and improve the slab ocean model.
FC

File:

• LMDZ5/trunk/libf/phylmd/surf_seaice_mod.F90 (modified) (2 diffs)

LMDZ5/trunk/libf/phylmd/surf_seaice_mod.F90

@@ -108 +108 @@
             tsurf_new, dflux_s, dflux_l)
        
-    ELSE IF (type_ocean == 'force' .OR. (type_ocean == 'slab' .AND. version_ocean=='sicOBS')) THEN
+!    ELSE IF (type_ocean == 'slab'.AND.version_ocean=='sicINT') THEN
+!       CALL ocean_slab_ice( & 
+!          itime, dtime, jour, knon, knindex, &
+!          debut, &
+!          tsurf, p1lay, cdragh, precip_rain, precip_snow, temp_air, spechum,&
+!          AcoefH, AcoefQ, BcoefH, BcoefQ, &
+!          ps, u1, v1, &
+!          radsol, snow, qsurf, qsol, agesno, tsoil, &
+!          alb1_new, alb2_new, evap, fluxsens, fluxlat, &
+!          tsurf_new, dflux_s, dflux_l)
+!
+      ELSE ! type_ocean=force or slab +sicOBS or sicNO
        CALL ocean_forced_ice( &
             itime, dtime, jour, knon, knindex, &
@@ -118 +129 @@
             qsurf, alb1_new, alb2_new, evap, fluxsens, fluxlat, flux_u1, flux_v1, &
             tsurf_new, dflux_s, dflux_l)
-
-    ELSE IF (type_ocean == 'slab') THEN
-!!$       CALL ocean_slab_ice( & 
-!!$          itime, dtime, jour, knon, knindex, &
-!!$          debut, &
-!!$          tsurf, p1lay, cdragh, precip_rain, precip_snow, temp_air, spechum,&
-!!$          AcoefH, AcoefQ, BcoefH, BcoefQ, &
-!!$          ps, u1, v1, pctsrf, &
-!!$          radsol, snow, qsurf, qsol, agesno, tsoil, &
-!!$          alb1_new, alb2_new, evap, fluxsens, fluxlat, &
-!!$          tsurf_new, dflux_s, dflux_l)
 
     END IF