Changeset 996 for LMDZ4/trunk/libf/phylmd/surf_seaice_mod.F90

Timestamp:

Sep 9, 2008, 3:22:23 PM (16 years ago)

Author:

lsce

Message:

• Modifications liées au calcul des nouveau sous-fractions
• Nettoyage de ocean slab : il reste uniquement la version avec glace de mer forcé
• Nouveaux variables pour distiguer la version et type d'ocean : type_ocean=force/slab/couple, version_ocean=opa8/nemo pour couplé ou version_ocean=sicOBS pour slab

JG

File:

• LMDZ4/trunk/libf/phylmd/surf_seaice_mod.F90 (modified) (4 diffs)

LMDZ4/trunk/libf/phylmd/surf_seaice_mod.F90

@@ -5 +5 @@
 
   USE dimphy
-  USE surface_data, ONLY     : ocean
-  USE ocean_slab_mod, ONLY   : ocean_slab_ice
+  USE surface_data
   USE ocean_forced_mod, ONLY : ocean_forced_ice
   USE ocean_cpl_mod, ONLY    : ocean_cpl_ice
@@ -24 +23 @@
        snow, qsurf, qsol, agesno, tsoil, &
        z0_new, alb1_new, alb2_new, evap, fluxsens, fluxlat, &
-       tsurf_new, dflux_s, dflux_l, pctsrf_sic)
+       tsurf_new, dflux_s, dflux_l)
 !
 ! This subroutine will make a call to ocean_XXX_ice according to the ocean mode (force, 
@@ -70 +69 @@
     REAL, DIMENSION(klon), INTENT(OUT)       :: tsurf_new
     REAL, DIMENSION(klon), INTENT(OUT)       :: dflux_s, dflux_l      
-    REAL, DIMENSION(klon), INTENT(OUT)       :: pctsrf_sic
 
 ! Local arguments
@@ -91 +89 @@
 !
 !****************************************************************************************
-    SELECT CASE(ocean)
-    CASE('couple')
+    IF (type_ocean == 'couple') THEN
+       
        CALL ocean_cpl_ice( &
-          rlon, rlat, swnet, lwnet, alb1, & 
-          fder, & 
-          itime, dtime, knon, knindex, &
-          lafin,&
-          p1lay, tq_cdrag, precip_rain, precip_snow, temp_air, spechum,&
-          petAcoef, peqAcoef, petBcoef, peqBcoef, &
-          ps, u1_lay, v1_lay, pctsrf, &
-          radsol, snow, qsurf, &
-          alb1_new, alb2_new, evap, fluxsens, fluxlat, &
-          tsurf_new, dflux_s, dflux_l, pctsrf_sic)
+            rlon, rlat, swnet, lwnet, alb1, & 
+            fder, & 
+            itime, dtime, knon, knindex, &
+            lafin,&
+            p1lay, tq_cdrag, precip_rain, precip_snow, temp_air, spechum,&
+            petAcoef, peqAcoef, petBcoef, peqBcoef, &
+            ps, u1_lay, v1_lay, pctsrf, &
+            radsol, snow, qsurf, &
+            alb1_new, alb2_new, evap, fluxsens, fluxlat, &
+            tsurf_new, dflux_s, dflux_l)
+       
+    ELSE IF (type_ocean == 'force' .OR. (type_ocean == 'slab' .AND. version_ocean=='sicOBS')) THEN
+       CALL ocean_forced_ice(itime, dtime, jour, knon, knindex, &
+            debut, &
+            tsurf, p1lay, tq_cdrag, precip_rain, precip_snow, temp_air, spechum,&
+            petAcoef, peqAcoef, petBcoef, peqBcoef, &
+            ps, u1_lay, v1_lay, &
+            radsol, snow, qsol, agesno, tsoil, &
+            qsurf, alb1_new, alb2_new, evap, fluxsens, fluxlat, &
+            tsurf_new, dflux_s, dflux_l)
 
-    CASE('slab')
-       CALL ocean_slab_ice( & 
-          itime, dtime, jour, knon, knindex, &
-          debut, &
-          tsurf, p1lay, tq_cdrag, precip_rain, precip_snow, temp_air, spechum,&
-          petAcoef, peqAcoef, petBcoef, peqBcoef, &
-          ps, u1_lay, v1_lay, &
-          radsol, snow, qsurf, qsol, agesno, tsoil, &
-          alb1_new, alb2_new, evap, fluxsens, fluxlat, &
-          tsurf_new, dflux_s, dflux_l, pctsrf_sic)
-    
-    CASE('force')
-       CALL ocean_forced_ice(itime, dtime, jour, knon, knindex, &
-          debut, &
-          tsurf, p1lay, tq_cdrag, precip_rain, precip_snow, temp_air, spechum,&
-          petAcoef, peqAcoef, petBcoef, peqBcoef, &
-          ps, u1_lay, v1_lay, &
-          radsol, snow, qsol, agesno, tsoil, &
-          qsurf, alb1_new, alb2_new, evap, fluxsens, fluxlat, &
-          tsurf_new, dflux_s, dflux_l, pctsrf_sic)
-    END SELECT
+    ELSE IF (type_ocean == 'slab') THEN
+!!$       CALL ocean_slab_ice( & 
+!!$          itime, dtime, jour, knon, knindex, &
+!!$          debut, &
+!!$          tsurf, p1lay, tq_cdrag, precip_rain, precip_snow, temp_air, spechum,&
+!!$          petAcoef, peqAcoef, petBcoef, peqBcoef, &
+!!$          ps, u1_lay, v1_lay, pctsrf, &
+!!$          radsol, snow, qsurf, qsol, agesno, tsoil, &
+!!$          alb1_new, alb2_new, evap, fluxsens, fluxlat, &
+!!$          tsurf_new, dflux_s, dflux_l)
+
+    END IF
 
 !****************************************************************************************