Changeset 996 for LMDZ4/trunk/libf/phylmd/surf_ocean_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_ocean_mod.F90 (modified) (8 diffs)

LMDZ4/trunk/libf/phylmd/surf_ocean_mod.F90

@@ -5 +5 @@
 
   USE dimphy
-  USE surface_data, ONLY     : ocean
+  USE surface_data, ONLY     : type_ocean
   USE ocean_forced_mod, ONLY : ocean_forced_noice
   USE ocean_slab_mod, ONLY   : ocean_slab_noice
@@ -17 +17 @@
 !
   SUBROUTINE surf_ocean(rlon, rlat, swnet, lwnet, alb1, &
-       rugos, windsp, rmu0, fder, &
+       rugos, windsp, rmu0, fder, tsurf_in, &
        itime, dtime, jour, knon, knindex, &
        debut, &
@@ -25 +25 @@
        snow, qsurf, agesno, &
        z0_new, alb1_new, alb2_new, evap, fluxsens, fluxlat, &
-       tsurf_new, dflux_s, dflux_l, pctsrf_oce)
+       tsurf_new, dflux_s, dflux_l, lmt_bils)
 !
 ! This subroutine will make a call to ocean_XXX_noice according to the ocean mode (force, 
@@ -47 +47 @@
     REAL, DIMENSION(klon), INTENT(IN)        :: rmu0  
     REAL, DIMENSION(klon), INTENT(IN)        :: fder
+    REAL, DIMENSION(klon), INTENT(IN)        :: tsurf_in
     REAL, DIMENSION(klon), INTENT(IN)        :: p1lay
     REAL, DIMENSION(klon), INTENT(IN)        :: tq_cdrag
@@ -74 +75 @@
     REAL, DIMENSION(klon), INTENT(OUT)       :: tsurf_new
     REAL, DIMENSION(klon), INTENT(OUT)       :: dflux_s, dflux_l      
-    REAL, DIMENSION(klon), INTENT(OUT)       :: pctsrf_oce
-
+    REAL, DIMENSION(klon), INTENT(OUT)       :: lmt_bils
 
 ! Local variables
@@ -97 +97 @@
 ! Switch according to type of ocean (couple, slab or forced)
 !****************************************************************************************
-    SELECT CASE(ocean)
+    SELECT CASE(type_ocean)
     CASE('couple')
        CALL ocean_cpl_noice( &
@@ -106 +106 @@
             p1lay, tq_cdrag, precip_rain, precip_snow,temp_air,spechum,&
             petAcoef, peqAcoef, petBcoef, peqBcoef, &
-            ps, u1_lay, v1_lay, pctsrf, &
+            ps, u1_lay, v1_lay, &
             radsol, snow, agesno, &
             qsurf, evap, fluxsens, fluxlat, &
-            tsurf_new, dflux_s, dflux_l, pctsrf_oce)
+            tsurf_new, dflux_s, dflux_l)
 
     CASE('slab')
        CALL ocean_slab_noice( &
-            dtime, knon, knindex, &
+            itime, dtime, jour, knon, knindex, &
             p1lay, tq_cdrag, precip_rain, precip_snow, temp_air, spechum,&
             petAcoef, peqAcoef, petBcoef, peqBcoef, &
-            ps, u1_lay, v1_lay, &
+            ps, u1_lay, v1_lay, tsurf_in, &
             radsol, snow, agesno, &
             qsurf, evap, fluxsens, fluxlat, &
-            tsurf_new, dflux_s, dflux_l, pctsrf_oce)
+            tsurf_new, dflux_s, dflux_l, lmt_bils)
        
     CASE('force')
@@ -131 +131 @@
             radsol, snow, agesno, &
             qsurf, evap, fluxsens, fluxlat, &
-            tsurf_new, dflux_s, dflux_l, pctsrf_oce)
+            tsurf_new, dflux_s, dflux_l)
     END SELECT