Changeset 2258 for LMDZ5/branches/testing/libf/phylmd/surf_ocean_mod.F90

Timestamp:

Apr 13, 2015, 10:21:09 AM (10 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes 2216:2237 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/surf_ocean_mod.F90 (modified) (5 diffs)

LMDZ5/branches/testing/libf/phylmd/surf_ocean_mod.F90

@@ -16 +16 @@
        ps, u1, v1, rugoro, pctsrf, &
        snow, qsurf, agesno, &
-       z0_new, alb1_new, alb2_new, evap, fluxsens, fluxlat, &
+!albedo SB >>>
+!      z0_new, alb1_new, alb2_new, evap, fluxsens, fluxlat, &
+       z0_new, SFRWL, alb_dir_new, alb_dif_new, evap, fluxsens, fluxlat, & 
+!albedo SB <<<
        tsurf_new, dflux_s, dflux_l, lmt_bils, &
        flux_u1, flux_v1)
@@ -72 +75 @@
 !****************************************************************************************
     REAL, DIMENSION(klon), INTENT(OUT)       :: z0_new
-    REAL, DIMENSION(klon), INTENT(OUT)       :: alb1_new  ! new albedo in visible SW interval
-    REAL, DIMENSION(klon), INTENT(OUT)       :: alb2_new  ! new albedo in near IR interval
+!albedo SB >>>
+!    REAL, DIMENSION(klon), INTENT(OUT)       :: alb1_new  ! new albedo in visible SW interval
+!    REAL, DIMENSION(klon), INTENT(OUT)       :: alb2_new  ! new albedo in near IR interval
+    REAL, DIMENSION(6), INTENT(IN)          :: SFRWL 
+    REAL, DIMENSION(klon,nsw), INTENT(OUT)       :: alb_dir_new,alb_dif_new
+!albedo SB <<<     
     REAL, DIMENSION(klon), INTENT(OUT)       :: evap, fluxsens, fluxlat
     REAL, DIMENSION(klon), INTENT(OUT)       :: tsurf_new
@@ -82 +89 @@
 ! Local variables
 !****************************************************************************************
-    INTEGER               :: i
+    INTEGER               :: i, k
     REAL                  :: tmp
     REAL, PARAMETER       :: cepdu2=(0.1)**2
@@ -155 +162 @@
 !
 !****************************************************************************************
+!albedo SB >>>
+
+
+  if(iflag_albedo==1)then
+    call ocean_albedo(knon,rmu0,knindex,windsp,SFRWL,alb_dir_new,alb_dif_new)
+  else
     IF (cycle_diurne) THEN
        CALL alboc_cd(rmu0,alb_eau)
@@ -162 +175 @@
 
     DO i =1, knon
-       alb1_new(i) = alb_eau(knindex(i))
+      do  k=1,nsw
+       alb_dir_new(i,k) = alb_eau(knindex(i))
+      enddo
     ENDDO
-    alb2_new(1:knon) = alb1_new(1:knon)
+     alb_dif_new=0.05 !alb_dir_new
+endif
+
+!albedo SB <<<
 
 !****************************************************************************************