Changeset 1125

Timestamp:

Mar 17, 2009, 11:32:56 AM (16 years ago)

Author:

jghattas

Message:

Ajout de la possiblite de couplage de vitesse de glace de mer, uniquement avec NEMO et cpl_current=true.

JG

Location:

LMDZ4/branches/LMDZ4-dev/libf/phylmd

Files:

• cpl_mod.F90 (modified) (4 diffs)
• ocean_cpl_mod.F90 (modified) (2 diffs)

LMDZ4/branches/LMDZ4-dev/libf/phylmd/cpl_mod.F90

@@ -359 +359 @@
                read_u0(:,:), read_v0(:,:), tmp_r0(:,:))
 !$OMP END MASTER
-          CALL WriteField('read_u0',read_u0)
-          CALL WriteField('read_v0',read_v0)
-          CALL WriteField('read_r0',tmp_r0)
+
        ELSE
           read_u0(:,:) = 0.
@@ -442 +440 @@
 
   SUBROUTINE cpl_receive_seaice_fields(knon, knindex, &
-       tsurf_new, alb_new)
+       tsurf_new, alb_new, u0_new, v0_new)
 !
 ! This routine returns the fields for the seaice that have been read from the coupler
@@ -459 +457 @@
     REAL, DIMENSION(klon), INTENT(OUT)      :: tsurf_new
     REAL, DIMENSION(klon), INTENT(OUT)      :: alb_new
+    REAL, DIMENSION(klon), INTENT(OUT)      :: u0_new
+    REAL, DIMENSION(klon), INTENT(OUT)      :: v0_new
 
 ! Local variables
@@ -472 +472 @@
     CALL cpl2gath(read_alb_sic, alb_new, knon, knindex)
     CALL cpl2gath(read_sic, sic_new, knon, knindex)
+    CALL cpl2gath(read_u0, u0_new, knon, knindex)
+    CALL cpl2gath(read_v0, v0_new, knon, knindex)
 
 !*************************************************************************************

LMDZ4/branches/LMDZ4-dev/libf/phylmd/ocean_cpl_mod.F90

@@ -259 +259 @@
 
     CALL cpl_receive_seaice_fields(knon, knindex, &
-         tsurf_cpl, alb_cpl)
+         tsurf_cpl, alb_cpl, u0, v0)
 
     alb1_new(1:knon) = alb_cpl(1:knon)
@@ -273 +273 @@
     beta = 1.0
     
-! Suppose zero surface speed
-    u0(:)=0.0
-    v0(:)=0.0
-    u1_lay(:) = u1(:) - u0(:)
-    v1_lay(:) = v1(:) - v0(:)
+    DO i = 1, knon
+       u1_lay(i) = u1(i) - u0(i)
+       v1_lay(i) = v1(i) - v0(i)
+    END DO
 
     CALL calcul_fluxs(knon, is_sic, dtime, &