Changeset 827 for branches/dev_002_LIM/NEMO/LIM_SRC_2

Timestamp:

2008-03-06T15:39:49+01:00 (16 years ago)

Author:

ctlod

Message:

dev_002_LIM : adapt ocean modules to both LIM 2.0 & 3.0 using key_lim2 & key_lim3

Location:

branches/dev_002_LIM/NEMO/LIM_SRC_2

Files:

• albedo_2.F90 (deleted)
• flxblk_2.F90 (deleted)
• limflx_2.F90 (modified) (2 diffs)

branches/dev_002_LIM/NEMO/LIM_SRC_2/limflx_2.F90

@@ -17 +17 @@
    USE flx_oce          ! sea-ice/ocean forcings variables
    USE ice_2             ! LIM sea-ice variables
-   USE flxblk_2           ! bulk formulea
+   USE flxblk             ! bulk formulea
    USE lbclnk           ! ocean lateral boundary condition
    USE in_out_manager   ! I/O manager
-   USE albedo_2         ! albedo parameters
+   USE albedo           ! albedo parameters
    USE prtctl           ! Print control
 
@@ -193 +193 @@
       !  2) Computation of snow/ice and ocean albedo   !
       !------------------------------------------------!
-      CALL flx_blk_albedo_2( zalb, zalcn, zalbp, zaldum )
+      CALL flx_blk_albedo( zalb, zalcn, zalbp, zaldum )
 
       alb_ice(:,:) =  0.5 * zalbp(:,:) + 0.5 * zalb (:,:)   ! Ice albedo